diff options
| -rw-r--r-- | tests/test9.in | 4 | ||||
| -rw-r--r-- | tests/test9.out | 2 | ||||
| -rw-r--r-- | tokenizer.cpp | 5 |
3 files changed, 9 insertions, 2 deletions
diff --git a/tests/test9.in b/tests/test9.in index e85c64b1..3adc1ca4 100644 --- a/tests/test9.in +++ b/tests/test9.in @@ -116,4 +116,8 @@ try_unbalanced_block 'if false' # BOM checking (see #1518) echo \uFEFF"echo bom_test" | source +# Comments abutting text (#953) +echo not#a#comment +echo is # a # comment + false diff --git a/tests/test9.out b/tests/test9.out index 9fe347de..f33c85ac 100644 --- a/tests/test9.out +++ b/tests/test9.out @@ -18,3 +18,5 @@ bar baz psub file was deleted bom_test +not#a#comment +is diff --git a/tokenizer.cpp b/tokenizer.cpp index dca22281..17999356 100644 --- a/tokenizer.cpp +++ b/tokenizer.cpp @@ -138,6 +138,8 @@ int tok_has_next(tokenizer_t *tok) /** Tests if this character can be a part of a string. The redirect ^ is allowed unless it's the first character. + Hash (#) starts a comment if it's the first character in a token; otherwise it is considered a string character. + See #953. */ bool tok_is_string_character(wchar_t c, bool is_first) { @@ -150,7 +152,6 @@ bool tok_is_string_character(wchar_t c, bool is_first) case L'|': case L'\t': case L';': - case L'#': case L'\r': case L'<': case L'>': @@ -689,7 +690,7 @@ void tok_next(tokenizer_t *tok) } else { - /* Not a redirection or pipe, so just a stirng */ + /* Not a redirection or pipe, so just a string */ read_string(tok); } } |