Parse numbers

ncw · ncw · commit 1950ac478e6b · 2014-11-20T08:58:05.000Z
diff --git a/parser/grammar.y b/parser/grammar.y
@@ -1117,8 +1117,7 @@ atom:
 	}
 |	NUMBER
 	{
-		// FIXME
-		$$ = nil
+		$$ = &ast.Num{ExprBase: ast.ExprBase{$<pos>$}, N: $1}
 	}
 |	strings
 	{
diff --git a/parser/grammar_test.go b/parser/grammar_test.go
@@ -29,6 +29,9 @@ func TestGrammar(t *testing.T) {
 		{"\"abc\" \"\"\"123\"\"\"", "eval", "Expression(body=Str(s='abc123'))"},
 		{"b'abc'", "eval", "Expression(body=Bytes(s=b'abc'))"},
 		{"b'abc' b'''123'''", "eval", "Expression(body=Bytes(s=b'abc123'))"},
+		{"1234", "eval", "Expression(body=Num(n=1234))"},
+		{"0x1234", "eval", "Expression(body=Num(n=4660))"},
+		{"12.34", "eval", "Expression(body=Num(n=12.34))"},
 		// END TESTS
 	} {
 		Ast, err := ParseString(test.in, test.mode)
diff --git a/parser/make_grammar_test.py b/parser/make_grammar_test.py
@@ -21,6 +21,9 @@
     ('"abc" """123"""', "eval"),
     ("b'abc'", "eval"),
     ("b'abc' b'''123'''", "eval"),
+    ("1234", "eval"),
+    ("0x1234", "eval"),
+    ("12.34", "eval"),
 ]
 
 def dump(source, mode):

Original file line number	Diff line number	Diff line change
`@@ -1117,8 +1117,7 @@ atom:`
`1117`	`1117`	`}`
`1118`	`1118`	`\| NUMBER`
`1119`	`1119`	`{`
`1120`		`- // FIXME`
`1121`		`- $$ = nil`
	`1120`	`+ $$ = &ast.Num{ExprBase: ast.ExprBase{$<pos>$}, N: $1}`
`1122`	`1121`	`}`
`1123`	`1122`	`\| strings`
`1124`	`1123`	`{`