Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Unterminated comment now errors #227

Merged
merged 5 commits into from
Sep 27, 2021
Merged

Unterminated comment now errors #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9d88032
Update GHA platforms and R versions
gaborcsardi Sep 25, 2021
c9f9cf9
Make untermiated quotes error
gaborcsardi Sep 25, 2021
1fbb9a3
Unterminated comments error now
gaborcsardi Sep 25, 2021
8bdd627
Merge remote-tracking branch 'origin/master' into fix/unterminated-co…
jimhester Sep 27, 2021
e5016fa
Add note to news
jimhester Sep 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# glue 1.4.2

* Unterminated comments in glue expression now throw an error (#227, @gaborcsardi)
* Unterminated quotes in glue expressions now throw an error (#226, @gaborcsardi)
* `glue_safe()` gives a slightly nicer error message
* The required version of R is now 3.2 (#189)
Expand Down
3 changes: 3 additions & 0 deletions src/glue.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,9 @@ SEXP glue_(SEXP x, SEXP f, SEXP open_arg, SEXP close_arg) {
} else if (state == double_quote) {
free(str);
Rf_error("Unterminated quote (\")");
} else if (state == comment) {
free(str);
Rf_error("Unterminated comment");
}

free(str);
Expand Down
7 changes: 7 additions & 0 deletions tests/testthat/test-glue.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,3 +429,10 @@ test_that("unterminated quotes are error", {
expect_error(glue("{this doesn\"t work}"), "Unterminated quote")
expect_error(glue("{this doesn't work}"), "Unterminated quote")
})

test_that("unterminated comment", {
expect_error(glue("pre {1 + 5 # comment} post"), "Unterminated comment")
expect_error(glue("pre {1 + 5 # comment"), "Unterminated comment")

expect_equal(glue("pre {1 + 5 + #comment\n 4} post"), "pre 10 post")
})