Merge branch 'master' into poc_add_line_numbers

Author: boolangery

luaparser/__init__.py

@@ -1 +1 @@
-__version__ = "3.0.0"
+__version__ = "3.0.1"

luaparser/builder.py

@@ -5,6 +5,8 @@
 
 from luaparser.astnodes import *
 from luaparser.parser.LuaLexer import LuaLexer
+from typing import List, Tuple
+from antlr4.Token import Token
 
 
 class SyntaxException(Exception):
@@ -1485,7 +1487,7 @@ def parse_table_constructor(self, render_last_hidden=True) -> Table or bool:
     def parse_field_list(self) -> List[Field] or bool:
         field_list = []
         self.save()
-        field = self.parse_field()
+        field, _ = self.parse_field()
         if field:
             field_list.append(field)
             while True:
@@ -1494,16 +1496,17 @@ def parse_field_list(self) -> List[Field] or bool:
                     inline_com = self.get_inline_comment()
                     if inline_com:
                         field.comments.append(inline_com)
-                    field = self.parse_field()
+                    prev_field = field
+                    field, remaining_comments = self.parse_field()
                     if field:
                         field_list.append(field)
                         self.success()
                     else:
+                        prev_field.comments.extend(remaining_comments)
                         self.success()
                         self.success()
                         return field_list
                 else:
-
                     field.comments.extend(self.get_comments())
                     self.failure()
                     break
@@ -1512,7 +1515,7 @@ def parse_field_list(self) -> List[Field] or bool:
             return field_list
         return self.failure()
 
-    def parse_field(self) -> Field or bool:
+    def parse_field(self) -> Tuple[Field or bool, Comments]:
         self.save()
 
         if self.next_is_rc(Tokens.OBRACK):
@@ -1523,8 +1526,9 @@ def parse_field(self) -> Field or bool:
                     value = self.parse_expr()
                     if value:
                         self.success()
-                        return Field(
-                            key, value, comments=comments, between_brackets=True
+                        return (
+                            Field(key, value, comments=comments, between_brackets=True),
+                            comments,
                         )
 
         self.failure_save()
@@ -1539,19 +1543,20 @@ def parse_field(self) -> Field or bool:
                 value = self.parse_expr()
                 if value:
                     self.success()
-                    return Field(key, value, comments=comments)
+                    return Field(key, value, comments=comments), comments
 
         self.failure_save()
         comments = self.get_comments()
         value = self.parse_expr()
         if value:
             self.success()
             # noinspection PyTypeChecker
-            return Field(
-                None, value, comments=comments
+            return (
+                Field(None, value, comments=comments),
+                [],
             )  # Key will be set in parse_table_constructor
 
-        return self.failure()
+        return self.failure(), comments
 
     def parse_field_sep(self) -> bool:
         self.save()

luaparser/printers.py

@@ -192,6 +192,10 @@ def visit(self, obj):
             xml_nodes.append(self.visit(itemValue))
         return xml_nodes
 
+    @visitor(Enum)
+    def visit(self, node):
+        return str(node)
+
     @visitor(Node)
     def visit(self, node):
         xml_node = ElementTree.Element(node.display_name)

luaparser/tests/test_integration.py

@@ -1,7 +1,8 @@
-from luaparser.utils import tests
+import textwrap
+
 from luaparser import ast
 from luaparser.astnodes import *
-import textwrap
+from luaparser.utils import tests
 
 
 class IntegrationTestCase(tests.TestCase):
@@ -128,7 +129,9 @@ def test_cont_int_3(self):
         exp = Chunk(Block([Index(idx=Name("a"), value=Name("x"))]))
         self.assertEqual(exp, tree)
 
-    # luaparser.utils.visitor.VisitorException: No visitor found for class <enum 'StringDelimiter'> #11
+    # luaparser.utils.visitor.VisitorException: No visitor found for class <enum 'StringDelimiter'>
+    # #11
+    # #14
     def test_cont_int_4(self):
         tree = ast.parse(
             textwrap.dedent(
@@ -174,3 +177,88 @@ def test_cont_int_4(self):
                             args: [] 0 item"""
         )
         self.assertEqual(exp, pretty_str)
+        ast.to_xml_str(tree)
+
+    # Cant walk the ast tree if lua file has semicolon(;) or repeat until loop and multiple args(...) #9
+    def test_cont_int_5(self):
+        tree = ast.parse(
+            textwrap.dedent(
+                """
+            function table.pack(...)
+                repeat
+                   print("value of a:", a)
+                   a = a + 1;
+                until( a > 15 )
+            end
+            """
+            )
+        )
+        nodes = ast.walk(tree)
+        expected_cls = [
+            Chunk,
+            Block,
+            Function,
+            Index,
+            Name,
+            Name,
+            Varargs,
+            Block,
+            Repeat,
+            Block,
+            Call,
+            Name,
+            String,
+            Name,
+            Assign,
+            Name,
+            AddOp,
+            Name,
+            Number,
+            SemiColon,
+            GreaterThanOp,
+            Name,
+            Number,
+        ]
+        for node, exp in zip(nodes, expected_cls):
+            self.assertIsInstance(node, exp)
+
+    # Comments are ignored if they are written after the last line of a table ending with a comma #15
+    def test_cont_int_6(self):
+        tree = ast.parse(
+            textwrap.dedent(
+                """
+            foo = {
+                mykey = "myvalue",
+                -- this comment is ignored if previous line ends with a comma
+            }
+            """
+            )
+        )
+        exp = Chunk(
+            Block(
+                [
+                    Assign(
+                        [Name("foo")],
+                        [
+                            Table(
+                                [
+                                    Field(
+                                        Name("mykey"),
+                                        String(
+                                            "myvalue",
+                                            delimiter=StringDelimiter.DOUBLE_QUOTE,
+                                        ),
+                                        comments=[
+                                            Comment(
+                                                "-- this comment is ignored if previous line ends with a comma"
+                                            )
+                                        ],
+                                    ),
+                                ]
+                            )
+                        ],
+                    )
+                ]
+            )
+        )
+        self.assertEqual(exp, tree)