More grammar

Author: ncw

parser/grammar.y

@@ -1091,7 +1091,7 @@ atom:
 	}
 |	NAME
 	{
-		$$ = &ast.Name{ExprBase: ast.ExprBase{$<pos>$}, Id: ast.Identifier($1)}
+		$$ = &ast.Name{ExprBase: ast.ExprBase{$<pos>$}, Id: ast.Identifier($1), Ctx: ast.Load}
 	}
 |	NUMBER
 	{
@@ -1105,22 +1105,19 @@ atom:
 	}
 |	ELIPSIS
 	{
-		// FIXME
-		$$ = nil
+		$$ = &ast.Ellipsis{ExprBase: ast.ExprBase{$<pos>$}}
 	}
 |	NONE
 	{
-		// FIXME
-		$$ = nil
+		$$ = &ast.NameConstant{ExprBase: ast.ExprBase{$<pos>$}, Value: py.None}
 	}
 |	TRUE
 	{
 		$$ = &ast.NameConstant{ExprBase: ast.ExprBase{$<pos>$}, Value: py.True}
 	}
 |	FALSE
 	{
-		// FIXME
-		$$ = nil
+		$$ = &ast.NameConstant{ExprBase: ast.ExprBase{$<pos>$}, Value: py.False}
 	}
 
 testlist_comp:

parser/grammar_test.go

@@ -21,6 +21,10 @@ func TestGrammar(t *testing.T) {
 		{"()", "exec", "Module(body=[Expr(value=Tuple(elts=[], ctx=Load()))])"},
 		{"[ ]", "exec", "Module(body=[Expr(value=List(elts=[], ctx=Load()))])"},
 		{"True\n", "eval", "Expression(body=NameConstant(value=True))"},
+		{"False\n", "eval", "Expression(body=NameConstant(value=False))"},
+		{"None\n", "eval", "Expression(body=NameConstant(value=None))"},
+		{"...", "eval", "Expression(body=Ellipsis())"},
+		{"abc123", "eval", "Expression(body=Name(id='abc123', ctx=Load()))"},
 		// END TESTS
 	} {
 		Ast, err := ParseString(test.in, test.mode)

parser/make_grammar_test.py

@@ -13,6 +13,10 @@
     ("()", "exec"),
     ("[ ]", "exec"),
     ("True\n", "eval"),
+    ("False\n", "eval"),
+    ("None\n", "eval"),
+    ("...", "eval"),
+    ("abc123", "eval"),
 ]
 
 def dump(source, mode):