Merge pull request #102 from z7zmey/issue-101

fix constant string fail "{\"
2020-01-08 09:35:32 +02:00
parent 2bf270c61b 003ee67a86
commit 7ad2a2c24f
3 changed files with 344 additions and 340 deletions
--- a/scanner/scanner.go
+++ b/scanner/scanner.go
--- a/scanner/scanner.rl
+++ b/scanner/scanner.rl
@@ -120,9 +120,10 @@ func (lex *Lexer) Lex(lval Lval) int {
                | "\n" @constant_string_new_line   -> double_qoute
            ),
            double_qoute_nondollar: (
-                (any - [$"\r\n])                   -> double_qoute
+                (any - [\\$"\r\n])                 -> double_qoute
                | "\r" @constant_string_new_line   -> double_qoute
                | "\n" @constant_string_new_line   -> double_qoute
+                | "\\"                             -> double_qoute_any
                | '"'                              -> final
            ),
            double_qoute_nonvarname: (
--- a/scanner/scanner_test.go
+++ b/scanner/scanner_test.go
@@ -496,6 +496,7 @@ func TestConstantStrings(t *testing.T) {
 		"{"
 		"{a"
 		"\{$"
+		"{\""
 	`

 	expected := []string{