fix #72: Incorrectly parsing strings

boolangery · boolangery · commit ee643e014e02 · 2025-12-06T14:58:08.000+01:00
diff --git a/luaparser/builder.py b/luaparser/builder.py
@@ -15,6 +15,8 @@
 TNode = TypeVar("TNode", bound=Node)
 
 
+LUA_DOUBLE_SQUARE_RE = re.compile(r'^\[(?P<eq>=*)\[(?P<body>[\s\S]*?)\]\1\]$')
+
 def _listify(obj):
     if not isinstance(obj, list):
         return [obj]
@@ -643,22 +645,19 @@ def visitString(self, ctx: LuaParser.StringContext):
         lua_str = ctx.getText()
 
         delimiter: StringDelimiter = StringDelimiter.SINGLE_QUOTE
-        p = re.compile(r"^\[=+\[(.*)]=+]")  # nested quote pattern
-        # try remove double quote:
+
+        # try to remove double quote:
         if lua_str.startswith('"') and lua_str.endswith('"'):
             lua_str = lua_str[1:-1]
             delimiter = StringDelimiter.DOUBLE_QUOTE
-        # try remove single quote:
+        # try to remove single quote:
         elif lua_str.startswith("'") and lua_str.endswith("'"):
             lua_str = lua_str[1:-1]
             delimiter = StringDelimiter.SINGLE_QUOTE
-        # try remove double square bracket:
-        elif lua_str.startswith("[[") and lua_str.endswith("]]"):
-            lua_str = lua_str[2:-2]
+        # double square brackets notation:
+        elif m := LUA_DOUBLE_SQUARE_RE.match(lua_str):
+            lua_str = m.group("body")
             delimiter = StringDelimiter.DOUBLE_SQUARE
-        # nested quote
-        elif p.match(lua_str):
-            lua_str = p.search(lua_str).group(1)
 
         if delimiter == StringDelimiter.DOUBLE_QUOTE or delimiter == StringDelimiter.SINGLE_QUOTE:
             unescaped_str = unescape_lua_string(lua_str)
diff --git a/luaparser/tests/test_types_values.py b/luaparser/tests/test_types_values.py
@@ -136,7 +136,28 @@ def test_string_dbl_square(self):
     def test_string_dbl_square_equal(self):
         tree = ast.parse(r"b = [=[one [[two]] one]=]")
         exp = Chunk(
-            Block([Assign(targets=[Name("b")], values=[String(b"one [[two]] one", "one [[two]] one")])])
+            Block([Assign(targets=[Name("b")], values=[String(b"one [[two]] one", "one [[two]] one", delimiter=StringDelimiter.DOUBLE_SQUARE)])])
+        )
+        self.assertEqual(exp, tree)
+
+    def test_string_dbl_square_equal_newlines(self):
+        tree = ast.parse(
+            textwrap.dedent(
+            r"""
+                a = [=[
+                four
+                ]=]
+                b = [===[
+                five
+                ]===]
+            """
+            )
+        )
+        exp = Chunk(
+            Block([
+                Assign(targets=[Name("a")], values=[String(b"\nfour\n", "\nfour\n", delimiter=StringDelimiter.DOUBLE_SQUARE)]),
+                Assign(targets=[Name("b")], values=[String(b"\nfive\n", "\nfive\n", delimiter=StringDelimiter.DOUBLE_SQUARE)]),
+            ])
         )
         self.assertEqual(exp, tree)
 
