Merge pull request #21 from 1c-syntax/fix/dobleQuote

fix #20 double quote
1c-syntax · Feb 25, 2019 · cfce187 · cfce187
2 parents 700f88d + dae749a
commit cfce187
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/main/antlr/BSLLexer.g4 b/src/main/antlr/BSLLexer.g4
@@ -149,7 +149,7 @@ DECIMAL: DIGIT+;
 DATETIME: SQUOTE(~['\n\r])*SQUOTE?; // TODO: Честная регулярка
 
 FLOAT : DIGIT+ '.' DIGIT*;
-STRING: '"' ~["\n\r]* '"';
+STRING: '"' (~[\r\n"] | '""')* '"';
 STRINGSTART: '"' ~["\n\r]*;
 STRINGTAIL: BAR ~["\n\r]* '"';
 STRINGPART: BAR ~["\n\r]*;

diff --git a/src/test/java/org/github/_1c_syntax/bsl/parser/BSLLexerTest.java b/src/test/java/org/github/_1c_syntax/bsl/parser/BSLLexerTest.java
@@ -140,6 +140,15 @@ void testString() {
     assertMatch("|", BSLLexer.BAR);
     assertMatch("|\"", BSLLexer.STRINGTAIL);
     assertMatch("|aaa\"", BSLLexer.STRINGTAIL);
+    assertMatch("А = \"строка\" + \"строка\";",
+            BSLLexer.IDENTIFIER,
+            BSLLexer.ASSIGN,
+            BSLLexer.STRING,
+            BSLLexer.PLUS,
+            BSLLexer.STRING,
+            BSLLexer.SEMICOLON
+    );
+    assertMatch("\"\"\"\"", BSLLexer.STRING);
   }
 
   @Test