From d2f55fe3ba7b4bbc95ecdce2c06347cf2314ca4e Mon Sep 17 00:00:00 2001
From: Erez Shinan <erezshin+git@gmail.com>
Date: Fri, 1 Feb 2019 00:03:45 +0200
Subject: [PATCH] BUGFIX: Fixed common.ESCAPED_STRING (Issue #309)

---
 lark/grammars/common.lark |  7 ++++---
 tests/test_parser.py      | 35 ++++++++++++++++++++++++++---------
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/lark/grammars/common.lark b/lark/grammars/common.lark
index 8bc8079..a675ca4 100644
--- a/lark/grammars/common.lark
+++ b/lark/grammars/common.lark
@@ -20,9 +20,10 @@ SIGNED_NUMBER: ["+"|"-"] NUMBER
 //
 // Strings
 //
-//STRING: /"(\\\"|\\\\|[^"\n])*?"i?/
-STRING_INNER: ("\\\""|/[^"]/)
-ESCAPED_STRING: "\"" STRING_INNER* "\""
+_STRING_INNER: /.*?/
+_STRING_ESC_INNER: _STRING_INNER /(?<!\\)(\\\\)*?/ 
+
+ESCAPED_STRING : "\"" _STRING_ESC_INNER "\""
 
 
 //
diff --git a/tests/test_parser.py b/tests/test_parser.py
index 8fcfbf2..54fb288 100644
--- a/tests/test_parser.py
+++ b/tests/test_parser.py
@@ -741,15 +741,6 @@ def _make_parser_test(LEXER, PARSER):
                       """)
             x = g.parse(r'\a')
 
-        def test_special_chars(self):
-            g = _Lark(r"""start: "\n"
-                      """)
-            x = g.parse('\n')
-
-            g = _Lark(r"""start: /\n/
-                      """)
-            x = g.parse('\n')
-
 
         def test_backslash2(self):
             g = _Lark(r"""start: "\"" "-"
@@ -760,6 +751,18 @@ def _make_parser_test(LEXER, PARSER):
                       """)
             x = g.parse('/-')
 
+
+
+        def test_special_chars(self):
+            g = _Lark(r"""start: "\n"
+                      """)
+            x = g.parse('\n')
+
+            g = _Lark(r"""start: /\n/
+                      """)
+            x = g.parse('\n')
+
+
         # def test_token_recurse(self):
         #     g = _Lark("""start: A
         #                  A: B
@@ -1322,6 +1325,20 @@ def _make_parser_test(LEXER, PARSER):
             self.assertEqual(p.parse("cbbbb").children, [None, 'c', 'b', 'b', 'b', 'b', None, None])
 
 
+        def test_escaped_string(self):
+            "Tests common.ESCAPED_STRING"
+            grammar = r"""
+            start: ESCAPED_STRING+
+
+            %import common (WS_INLINE, ESCAPED_STRING)
+            %ignore WS_INLINE
+            """
+
+            parser = _Lark(grammar)
+            parser.parse(r'"\\" "b" "c"')
+
+            parser.parse(r'"That" "And a \"b"')
+
 
     _NAME = "Test" + PARSER.capitalize() + LEXER.capitalize()
     _TestParser.__name__ = _NAME