Merge pull request RustPython#1146 from RustPython/ast-module

windelbouwman · web-flow · commit 26e3d7fa6fbe · 2019-07-15T17:11:45.000+02:00
Implement more nodes in the ast.
diff --git a/crawl_sourcecode.py b/crawl_sourcecode.py
@@ -0,0 +1,33 @@
+
+import ast
+import sys
+
+filename = sys.argv[1]
+print('Crawling file:', filename)
+
+
+with open(filename, 'r') as f:
+    source = f.read()
+
+t = ast.parse(source)
+print(t)
+
+shift = 3
+def print_node(node, indent=0):
+    if isinstance(node, ast.AST):
+        print(' '*indent, "NODE", node.__class__.__name__)
+        for field in node._fields:
+            print(' '*indent,'-', field)
+            f = getattr(node, field)
+            if isinstance(f, list):
+                for f2 in f:
+                    print_node(f2, indent=indent+shift)
+            else:
+                print_node(f, indent=indent+shift)
+    else:
+        print(' '*indent, 'OBJ', node)
+
+print_node(t)
+
+# print(ast.dump(t))
+
diff --git a/parser/src/ast.rs b/parser/src/ast.rs
@@ -55,7 +55,7 @@ pub enum Statement {
     Break,
     Continue,
     Return {
-        value: Option<Box<Expression>>,
+        value: Option<Expression>,
     },
     Import {
         import_parts: Vec<SingleImport>,
diff --git a/parser/src/python.lalrpop b/parser/src/python.lalrpop
@@ -168,10 +168,10 @@ FlowStatement: ast::LocatedStatement = {
             node: ast::Statement::Continue,
         }
     },
-    <loc:@L> "return" <t:TestList?> => {
+    <loc:@L> "return" <value:TestList?> => {
         ast::LocatedStatement {
             location: loc,
-            node: ast::Statement::Return { value: t.map(Box::new) },
+            node: ast::Statement::Return { value },
         }
     },
     <loc:@L> <y:YieldExpr> => {
diff --git a/vm/src/stdlib/ast.rs b/vm/src/stdlib/ast.rs

Original file line number	Diff line number	Diff line change
`@@ -168,10 +168,10 @@ FlowStatement: ast::LocatedStatement = {`
`168`	`168`	`node: ast::Statement::Continue,`
`169`	`169`	`}`
`170`	`170`	`},`
`171`		`- <loc:@L> "return" <t:TestList?> => {`
	`171`	`+ <loc:@L> "return" <value:TestList?> => {`
`172`	`172`	`ast::LocatedStatement {`
`173`	`173`	`location: loc,`
`174`		`- node: ast::Statement::Return { value: t.map(Box::new) },`
	`174`	`+ node: ast::Statement::Return { value },`
`175`	`175`	`}`
`176`	`176`	`},`
`177`	`177`	`<loc:@L> <y:YieldExpr> => {`