Fix Ctx

ncw · ncw · commit f8f4d5e57e33 · 2014-11-30T17:06:00.000Z
diff --git a/parser/grammar.y b/parser/grammar.y
@@ -1206,7 +1206,7 @@ test:
 	}
 |	or_test IF or_test ELSE test
 	{
-		$$ = &ast.IfExp{ExprBase: ast.ExprBase{$<pos>$}, Test:$1, Body: $3, Orelse: $5} // FIXME Ctx
+		$$ = &ast.IfExp{ExprBase: ast.ExprBase{$<pos>$}, Test:$3, Body: $1, Orelse: $5}
 	}
 |	lambdef
 	{
@@ -1258,7 +1258,7 @@ or_test:
 			boolop := $$.(*ast.BoolOp)
 			boolop.Values = append(boolop.Values, $3)
 		} else {
-			$$ = &ast.BoolOp{ExprBase: ast.ExprBase{$<pos>$}, Op: ast.Or, Values: []ast.Expr{$$, $3}} // FIXME Ctx
+			$$ = &ast.BoolOp{ExprBase: ast.ExprBase{$<pos>$}, Op: ast.Or, Values: []ast.Expr{$$, $3}}
 		}
 		$<isExpr>$ = false
 	}
@@ -1275,7 +1275,7 @@ and_test:
 			boolop := $$.(*ast.BoolOp)
 			boolop.Values = append(boolop.Values, $3)
 		} else {
-			$$ = &ast.BoolOp{ExprBase: ast.ExprBase{$<pos>$}, Op: ast.And, Values: []ast.Expr{$$, $3}} // FIXME Ctx
+			$$ = &ast.BoolOp{ExprBase: ast.ExprBase{$<pos>$}, Op: ast.And, Values: []ast.Expr{$$, $3}}
 		}
 		$<isExpr>$ = false
 	}
@@ -1359,7 +1359,7 @@ comp_op:
 star_expr:
 	'*' expr
 	{
-		$$ = &ast.Starred{ExprBase: ast.ExprBase{$<pos>$}, Value: $2} // FIXME Ctx
+		$$ = &ast.Starred{ExprBase: ast.ExprBase{$<pos>$}, Value: $2, Ctx: ast.Load}
 	}
 
 expr:
diff --git a/parser/grammar_test.go b/parser/grammar_test.go
@@ -114,6 +114,8 @@ func TestGrammar(t *testing.T) {
 		{"a+b-c/d//e%f", "eval", "Expression(body=BinOp(left=BinOp(left=Name(id='a', ctx=Load()), op=Add(), right=Name(id='b', ctx=Load())), op=Sub(), right=BinOp(left=BinOp(left=BinOp(left=Name(id='c', ctx=Load()), op=Div(), right=Name(id='d', ctx=Load())), op=FloorDiv(), right=Name(id='e', ctx=Load())), op=Mod(), right=Name(id='f', ctx=Load()))))"},
 		{"a+b-c/d//e%f**g", "eval", "Expression(body=BinOp(left=BinOp(left=Name(id='a', ctx=Load()), op=Add(), right=Name(id='b', ctx=Load())), op=Sub(), right=BinOp(left=BinOp(left=BinOp(left=Name(id='c', ctx=Load()), op=Div(), right=Name(id='d', ctx=Load())), op=FloorDiv(), right=Name(id='e', ctx=Load())), op=Mod(), right=BinOp(left=Name(id='f', ctx=Load()), op=Pow(), right=Name(id='g', ctx=Load())))))"},
 		{"a+b-c/d//e%f**g|h&i^k<<l>>m", "eval", "Expression(body=BinOp(left=BinOp(left=BinOp(left=Name(id='a', ctx=Load()), op=Add(), right=Name(id='b', ctx=Load())), op=Sub(), right=BinOp(left=BinOp(left=BinOp(left=Name(id='c', ctx=Load()), op=Div(), right=Name(id='d', ctx=Load())), op=FloorDiv(), right=Name(id='e', ctx=Load())), op=Mod(), right=BinOp(left=Name(id='f', ctx=Load()), op=Pow(), right=Name(id='g', ctx=Load())))), op=BitOr(), right=BinOp(left=BinOp(left=Name(id='h', ctx=Load()), op=BitAnd(), right=Name(id='i', ctx=Load())), op=BitXor(), right=BinOp(left=BinOp(left=Name(id='k', ctx=Load()), op=LShift(), right=Name(id='l', ctx=Load())), op=RShift(), right=Name(id='m', ctx=Load())))))"},
+		{"a if b else c", "eval", "Expression(body=IfExp(test=Name(id='b', ctx=Load()), body=Name(id='a', ctx=Load()), orelse=Name(id='c', ctx=Load())))"},
+		{"a, b = *a", "exec", "Module(body=[Assign(targets=[Tuple(elts=[Name(id='a', ctx=Store()), Name(id='b', ctx=Store())], ctx=Store())], value=Starred(value=Name(id='a', ctx=Load()), ctx=Load()))])"},
 		{"a==b", "eval", "Expression(body=Compare(left=Name(id='a', ctx=Load()), ops=[Eq()], comparators=[Name(id='b', ctx=Load())]))"},
 		{"a!=b", "eval", "Expression(body=Compare(left=Name(id='a', ctx=Load()), ops=[NotEq()], comparators=[Name(id='b', ctx=Load())]))"},
 		{"a<b", "eval", "Expression(body=Compare(left=Name(id='a', ctx=Load()), ops=[Lt()], comparators=[Name(id='b', ctx=Load())]))"},
diff --git a/parser/make_grammar_test.py b/parser/make_grammar_test.py
@@ -113,6 +113,7 @@
     ("a+b-c/d//e%f", "eval"),
     ("a+b-c/d//e%f**g", "eval"),
     ("a+b-c/d//e%f**g|h&i^k<<l>>m", "eval"),
+    ("a if b else c", "eval"),
 
     ("a==b", "eval"),
     ("a!=b", "eval"),
@@ -335,6 +336,7 @@
     ("a = b = c", "exec"),
     ("a, b = 1, 2", "exec"),
     ("a, b = c, d = 1, 2", "exec"),
+    ("a, b = *a", "exec"),
 
     # lambda
     ("lambda: a", "eval"),

Original file line number	Diff line number	Diff line change
`@@ -1206,7 +1206,7 @@ test:`
`1206`	`1206`	`}`
`1207`	`1207`	`\| or_test IF or_test ELSE test`
`1208`	`1208`	`{`
`1209`		`- $$ = &ast.IfExp{ExprBase: ast.ExprBase{$<pos>$}, Test:$1, Body: $3, Orelse: $5} // FIXME Ctx`
	`1209`	`+ $$ = &ast.IfExp{ExprBase: ast.ExprBase{$<pos>$}, Test:$3, Body: $1, Orelse: $5}`
`1210`	`1210`	`}`
`1211`	`1211`	`\| lambdef`
`1212`	`1212`	`{`
`@@ -1258,7 +1258,7 @@ or_test:`
`1258`	`1258`	`boolop := $$.(*ast.BoolOp)`
`1259`	`1259`	`boolop.Values = append(boolop.Values, $3)`
`1260`	`1260`	`} else {`
`1261`		`- $$ = &ast.BoolOp{ExprBase: ast.ExprBase{$<pos>$}, Op: ast.Or, Values: []ast.Expr{$$, $3}} // FIXME Ctx`
	`1261`	`+ $$ = &ast.BoolOp{ExprBase: ast.ExprBase{$<pos>$}, Op: ast.Or, Values: []ast.Expr{$$, $3}}`
`1262`	`1262`	`}`
`1263`	`1263`	`$<isExpr>$ = false`
`1264`	`1264`	`}`
`@@ -1275,7 +1275,7 @@ and_test:`
`1275`	`1275`	`boolop := $$.(*ast.BoolOp)`
`1276`	`1276`	`boolop.Values = append(boolop.Values, $3)`
`1277`	`1277`	`} else {`
`1278`		`- $$ = &ast.BoolOp{ExprBase: ast.ExprBase{$<pos>$}, Op: ast.And, Values: []ast.Expr{$$, $3}} // FIXME Ctx`
	`1278`	`+ $$ = &ast.BoolOp{ExprBase: ast.ExprBase{$<pos>$}, Op: ast.And, Values: []ast.Expr{$$, $3}}`
`1279`	`1279`	`}`
`1280`	`1280`	`$<isExpr>$ = false`
`1281`	`1281`	`}`
`@@ -1359,7 +1359,7 @@ comp_op:`
`1359`	`1359`	`star_expr:`
`1360`	`1360`	`'*' expr`
`1361`	`1361`	`{`
`1362`		`- $$ = &ast.Starred{ExprBase: ast.ExprBase{$<pos>$}, Value: $2} // FIXME Ctx`
	`1362`	`+ $$ = &ast.Starred{ExprBase: ast.ExprBase{$<pos>$}, Value: $2, Ctx: ast.Load}`
`1363`	`1363`	`}`
`1364`	`1364`
`1365`	`1365`	`expr:`