Implement tuple and list in ast - comprehensions still to go

ncw · ncw · commit 69f12ffe0a06 · 2014-11-23T15:39:31.000Z
diff --git a/parser/grammar.y b/parser/grammar.y
@@ -65,6 +65,16 @@ func (es *stmtsStack) Add(stmt ...ast.Stmt) {
 	(*es)[i] = append((*es)[i], stmt...)
 }
 
+// Returns a Tuple if > 1 items or a trailing comma, otherwise returns
+// the first item in elts
+func tupleOrExpr(pos ast.Pos, elts []ast.Expr, optional_comma bool) ast.Expr {
+	if optional_comma || len(elts) > 1 {
+		return &ast.Tuple{ExprBase: ast.ExprBase{pos}, Elts: elts, Ctx: ast.Load}
+	} else {
+		return  elts[0]
+	}
+}
+
 %}
 
 %union {
@@ -492,12 +502,7 @@ optional_comma:
 testlist_star_expr:
 	test_or_star_exprs optional_comma
 	{
-		elts := $1.Pop()
-		if $2 || len(elts) > 1 {
-			$$ = &ast.Tuple{ExprBase: ast.ExprBase{$<pos>$}, Elts: elts} // FIXME Ctx
-		} else {
-			$$ = elts[0]
-		}
+		$$ = tupleOrExpr($<pos>$, $1.Pop(), $2)
 	}
 
 augassign:
@@ -1096,22 +1101,30 @@ atom:
 		panic("yield_expr not implemented")
 		$$ = nil
 	}
-|	'(' testlist_comp ')'
+|	'(' test_or_star_expr comp_for ')'
 	{
 		// FIXME
-		panic("testlist_comp not implemented")
+		panic("not implemented")
 		$$ = nil
 	}
+|	'(' test_or_star_exprs optional_comma ')' 
+	{
+		$$ = tupleOrExpr($<pos>$, $2.Pop(), $3)
+	}
 |	'[' ']'
 	{
 		$$ = &ast.List{ExprBase: ast.ExprBase{$<pos>$}, Ctx: ast.Load}
 	}
-|	'[' testlist_comp ']'
+|	'[' test_or_star_expr comp_for ']'
 	{
 		// FIXME
-		panic("testlist_comp not implemented")
+		panic("not implemented")
 		$$ = nil
 	}
+|	'[' test_or_star_exprs optional_comma ']'
+	{
+		$$ = &ast.List{ExprBase: ast.ExprBase{$<pos>$}, Elts: $2.Pop(), Ctx: ast.Load}
+	}
 |	'{' '}'
 	{
 		$$ = &ast.Dict{ExprBase: ast.ExprBase{$<pos>$}}
@@ -1156,17 +1169,6 @@ atom:
 		$$ = &ast.NameConstant{ExprBase: ast.ExprBase{$<pos>$}, Value: py.False}
 	}
 
-testlist_comp:
-	test_or_star_expr comp_for
-	{
-		// FIXME
-	}
-|	test_or_star_exprs optional_comma
-	{
-		// FIXME
-		// $1.Pop()
-	}
-
 // Trailers are half made Call, Attribute or Subscript
 trailer:
 	'(' ')'
diff --git a/parser/grammar_test.go b/parser/grammar_test.go
@@ -19,6 +19,7 @@ func TestGrammar(t *testing.T) {
 		out  string
 	}{
 		// START TESTS
+		// *** Tests auto generated by make_grammar_test.py - do not edit ***
 		{"", "exec", "Module(body=[])"},
 		{"pass", "exec", "Module(body=[Pass()])"},
 		{"()", "eval", "Expression(body=Tuple(elts=[], ctx=Load()))"},
@@ -47,6 +48,17 @@ func TestGrammar(t *testing.T) {
 		{"{ 'a':1 }", "eval", "Expression(body=Dict(keys=[Str(s='a')], values=[Num(n=1)]))"},
 		{"{ 'a':1, 'b':2 }", "eval", "Expression(body=Dict(keys=[Str(s='a'), Str(s='b')], values=[Num(n=1), Num(n=2)]))"},
 		{"{ 'a':{'aa':11, 'bb':{'aa':11, 'bb':22}}, 'b':{'aa':11, 'bb':22} }", "eval", "Expression(body=Dict(keys=[Str(s='a'), Str(s='b')], values=[Dict(keys=[Str(s='aa'), Str(s='bb')], values=[Num(n=11), Dict(keys=[Str(s='aa'), Str(s='bb')], values=[Num(n=11), Num(n=22)])]), Dict(keys=[Str(s='aa'), Str(s='bb')], values=[Num(n=11), Num(n=22)])]))"},
+		{"(1)", "eval", "Expression(body=Num(n=1))"},
+		{"(1,)", "eval", "Expression(body=Tuple(elts=[Num(n=1)], ctx=Load()))"},
+		{"(1,2)", "eval", "Expression(body=Tuple(elts=[Num(n=1), Num(n=2)], ctx=Load()))"},
+		{"(1,2,)", "eval", "Expression(body=Tuple(elts=[Num(n=1), Num(n=2)], ctx=Load()))"},
+		{"{(1,2)}", "eval", "Expression(body=Set(elts=[Tuple(elts=[Num(n=1), Num(n=2)], ctx=Load())]))"},
+		{"(((((1,),(2,),),(2,),),((1,),(2,),),),((1,),(2,),))", "eval", "Expression(body=Tuple(elts=[Tuple(elts=[Tuple(elts=[Tuple(elts=[Tuple(elts=[Num(n=1)], ctx=Load()), Tuple(elts=[Num(n=2)], ctx=Load())], ctx=Load()), Tuple(elts=[Num(n=2)], ctx=Load())], ctx=Load()), Tuple(elts=[Tuple(elts=[Num(n=1)], ctx=Load()), Tuple(elts=[Num(n=2)], ctx=Load())], ctx=Load())], ctx=Load()), Tuple(elts=[Tuple(elts=[Num(n=1)], ctx=Load()), Tuple(elts=[Num(n=2)], ctx=Load())], ctx=Load())], ctx=Load()))"},
+		{"(((1)))", "eval", "Expression(body=Num(n=1))"},
+		{"[1]", "eval", "Expression(body=List(elts=[Num(n=1)], ctx=Load()))"},
+		{"[1,]", "eval", "Expression(body=List(elts=[Num(n=1)], ctx=Load()))"},
+		{"[1,2]", "eval", "Expression(body=List(elts=[Num(n=1), Num(n=2)], ctx=Load()))"},
+		{"[1,2,]", "eval", "Expression(body=List(elts=[Num(n=1), Num(n=2)], ctx=Load()))"},
 		// END TESTS
 	} {
 		Ast, err := ParseString(test.in, test.mode)
diff --git a/parser/make_grammar_test.py b/parser/make_grammar_test.py
@@ -32,10 +32,20 @@
     ("{1,}", "eval"),
     ("{1,2}", "eval"),
     ("{1,2,3,}", "eval"),
-    # Need to implement tuple first ("{(1,2)}", "eval"),
     ("{ 'a':1 }", "eval"),
     ("{ 'a':1, 'b':2 }", "eval"),
     ("{ 'a':{'aa':11, 'bb':{'aa':11, 'bb':22}}, 'b':{'aa':11, 'bb':22} }", "eval"),
+    ("(1)", "eval"),
+    ("(1,)", "eval"),
+    ("(1,2)", "eval"),
+    ("(1,2,)", "eval"),
+    ("{(1,2)}", "eval"),
+    ("(((((1,),(2,),),(2,),),((1,),(2,),),),((1,),(2,),))", "eval"),
+    ("(((1)))", "eval"),
+    ("[1]", "eval"),
+    ("[1,]", "eval"),
+    ("[1,2]", "eval"),
+    ("[1,2,]", "eval"),
 ]
 
 def dump(source, mode):
@@ -60,6 +70,7 @@ def main():
     for line in lines:
         if "START TESTS" in line:
             out.append(line)
+            out.append("\t\t// *** Tests auto generated by make_grammar_test.py - do not edit ***")
             for source, mode in inp:
                 out.append('\t\t{"%s", "%s", "%s"},' % (escape(source), mode, escape(dump(source, mode))))
             in_tests = True
