Merge pull request #87 from juanjux/fix/issue_77

Fix/issue 77

Author: juanjux

native/python_package/python_driver/astimprove.py

@@ -114,7 +114,6 @@ def sync_node_pos(self, nodedict, add = 0):
         the same name will not consume that token again (except for fstrings that are
         a special case of a token mapping to several possible AST nodes).
         """
-
         node_line = nodedict.get('lineno')
         if node_line is None:
             return
@@ -359,6 +358,8 @@ def __init__(self, codestr, astdict):
         # on parse()
         self._node2endpos = None
 
+        self.visit_Global = self.visit_Nonlocal = self._promote_names
+
     def _add_noops(self, node, visit_dict, root):
         if not isinstance(visit_dict, dict):
             return visit_dict
@@ -485,25 +486,16 @@ def visit_NoneType(self, node):
                      "ast_type": "NoneLiteral"})
         return node
 
-    def visit_Global(self, node):
+    def _promote_names(self, node):
         # Python AST by default stores global and nonlocal variable names
         # in a "names" array of strings. That breaks the structure of everything
         # else in the AST (dictionaries, properties or list of objects) so we
         # convert those names to Name objects
-        names_as_nodes = [{"ast_type": "Name",
-                          "id": i,
-                          "lineno": node["lineno"],
-                          "col_offset": node["col_offset"]} for i in node["names"]]
-
-        node["names"] = names_as_nodes
-        return node
+        names_as_nodes = [self.visit({"ast_type": "Name",
+                                      "id": i,
+                                      "lineno": node["lineno"]})
+                          for i in node["names"]]
 
-    def visit_Nonlocal(self, node):
-        # ditto
-        names_as_nodes = [{"ast_type": "Name",
-                          "id": i,
-                          "lineno": node["lineno"],
-                          "col_offset": node["col_offset"]} for i in node["names"]]
         node["names"] = names_as_nodes
         return node
 

tests/other_statements.py.native

@@ -94,7 +94,9 @@
                             "names": [
                                 {
                                     "ast_type": "Name",
-                                    "col_offset": 4,
+                                    "col_offset": 12,
+                                    "end_col_offset": 12,
+                                    "end_lineno": 5,
                                     "id": "a",
                                     "lineno": 5
                                 }
@@ -109,7 +111,9 @@
                             "names": [
                                 {
                                     "ast_type": "Name",
-                                    "col_offset": 4,
+                                    "col_offset": 14,
+                                    "end_col_offset": 14,
+                                    "end_lineno": 6,
                                     "id": "b",
                                     "lineno": 6
                                 }

tests/other_statements.py.uast

@@ -181,9 +181,14 @@ Module {
 .  .  .  .  .  .  .  .  .  Roles: SimpleIdentifier,Expression
 .  .  .  .  .  .  .  .  .  TOKEN "a"
 .  .  .  .  .  .  .  .  .  StartPosition: {
-.  .  .  .  .  .  .  .  .  .  Offset: 30
+.  .  .  .  .  .  .  .  .  .  Offset: 38
 .  .  .  .  .  .  .  .  .  .  Line: 5
-.  .  .  .  .  .  .  .  .  .  Col: 4
+.  .  .  .  .  .  .  .  .  .  Col: 12
+.  .  .  .  .  .  .  .  .  }
+.  .  .  .  .  .  .  .  .  EndPosition: {
+.  .  .  .  .  .  .  .  .  .  Offset: 38
+.  .  .  .  .  .  .  .  .  .  Line: 5
+.  .  .  .  .  .  .  .  .  .  Col: 12
 .  .  .  .  .  .  .  .  .  }
 .  .  .  .  .  .  .  .  .  Properties: {
 .  .  .  .  .  .  .  .  .  .  internalRole: names
@@ -209,9 +214,14 @@ Module {
 .  .  .  .  .  .  .  .  .  Roles: SimpleIdentifier,Expression
 .  .  .  .  .  .  .  .  .  TOKEN "b"
 .  .  .  .  .  .  .  .  .  StartPosition: {
-.  .  .  .  .  .  .  .  .  .  Offset: 43
+.  .  .  .  .  .  .  .  .  .  Offset: 53
+.  .  .  .  .  .  .  .  .  .  Line: 6
+.  .  .  .  .  .  .  .  .  .  Col: 14
+.  .  .  .  .  .  .  .  .  }
+.  .  .  .  .  .  .  .  .  EndPosition: {
+.  .  .  .  .  .  .  .  .  .  Offset: 53
 .  .  .  .  .  .  .  .  .  .  Line: 6
-.  .  .  .  .  .  .  .  .  .  Col: 4
+.  .  .  .  .  .  .  .  .  .  Col: 14
 .  .  .  .  .  .  .  .  .  }
 .  .  .  .  .  .  .  .  .  Properties: {
 .  .  .  .  .  .  .  .  .  .  internalRole: names