Make simple set and dict literals work

Author: ncw

parser/grammar.y

@@ -83,6 +83,8 @@ func (es *stmtsStack) Add(stmt ...ast.Stmt){
  exprsStack exprsStack
  trailers []ast.Expr// list of trailer expressions
  comma bool
+ comprehension ast.Comprehension
+ comprehensions []ast.Comprehension
 }
 
 %type<obj>strings
@@ -91,12 +93,13 @@ func (es *stmtsStack) Add(stmt ...ast.Stmt){
 %type<stmtsStack>nl_or_stmtsmall_stmtsstmts
 %type<stmt>compound_stmtsmall_stmtexpr_stmtdel_stmtpass_stmtflow_stmtimport_stmtglobal_stmtnonlocal_stmtassert_stmtbreak_stmtcontinue_stmtreturn_stmtraise_stmtyield_stmt
 %type<op>augassign
-%type<expr>expr_or_star_exprexprstar_exprxor_exprand_exprshift_exprarith_exprtermfactorpowertraileratomtest_or_star_exprtestnot_testlambdeftest_nocondlambdef_nocondor_testand_testcomparisontestlisttestlist_star_expryield_expr_or_testlistyield_expryield_expr_or_testlist_star_expr
+%type<expr>expr_or_star_exprexprstar_exprxor_exprand_exprshift_exprarith_exprtermfactorpowertraileratomtest_or_star_exprtestnot_testlambdeftest_nocondlambdef_nocondor_testand_testcomparisontestlisttestlist_star_expryield_expr_or_testlistyield_expryield_expr_or_testlist_star_exprdictorsetmaker
 %type<exprs>exprlist
-%type<exprsStack>expr_or_star_exprstest_or_star_exprstests
+%type<exprsStack>expr_or_star_exprstest_or_star_exprsteststest_colon_tests
 %type<trailers>trailers
 %type<cmpop>comp_op
 %type<comma>optional_comma
+%type<comprehensions>comp_for
 
 %tokenNEWLINE
 %tokenENDMARKER
@@ -1108,8 +1111,7 @@ atom:
  }
 |'{'dictorsetmaker'}'
 {
-// FIXME
-$$ = nil
+$$ = $2
  }
 |NAME
 {
@@ -1242,13 +1244,46 @@ testlist:
 // (',' test ':' test)*
 test_colon_tests:
  test ':' test
+{
+$$.Push()
+$$.Add($1, $3) // key, value order
+ }
 | test_colon_tests ',' test ':' test
+{
+$$.Add($3, $5)
+ }
 
 dictorsetmaker:
  test_colon_tests optional_comma
+{
+ keyValues := $1.Pop()
+ d := &ast.Dict{ExprBase: ast.ExprBase{$<pos>$}, Keys: nil, Values: nil}
+for i := 0; i < len(keyValues)-1; i += 2{
+ d.Keys = append(d.Keys, keyValues[i])
+ d.Values = append(d.Values, keyValues[i+1])
+ }
+$$ = d
+ }
 | test ':' test comp_for
+{
+// FIXME DictComp
+$$ = &ast.DictComp{ExprBase: ast.ExprBase{$<pos>$}, Key: $1, Value: $3, Generators: $4}
+ }
 | testlist
+{
+ var elts []ast.Expr
+if x, ok := $1.(*ast.Tuple); ok{
+ elts = x.Elts
+ } else{
+ elts = []ast.Expr{$1}
+ }
+$$ = &ast.Set{ExprBase: ast.ExprBase{$<pos>$}, Elts: elts}
+ }
 | test comp_for
+{
+// FIXME SetComp
+$$ = &ast.SetComp{ExprBase: ast.ExprBase{$<pos>$}, Elt: $1, Generators: $2}
+ }
 
 classdef:
  CLASS NAME optional_arglist_call ':' suite
@@ -1282,7 +1317,15 @@ comp_iter:
 
 comp_for:
  FOR exprlist IN or_test
+{
+// FIXME
+$$ = nil
+ }
 | FOR exprlist IN or_test comp_iter
+{
+// FIXME
+$$ = nil
+ }
 
 comp_if:
  IF test_nocond

parser/grammar_test.go

@@ -33,6 +33,12 @@ func TestGrammar(t *testing.T){
 {"0x1234", "eval", "Expression(body=Num(n=4660))"},
 {"12.34", "eval", "Expression(body=Num(n=12.34))"},
 {"{}", "eval", "Expression(body=Dict(keys=[], values=[]))"},
+{"{1}", "eval", "Expression(body=Set(elts=[Num(n=1)]))"},
+{"{1,2}", "eval", "Expression(body=Set(elts=[Num(n=1), Num(n=2)]))"},
+{"{1,2,3,}", "eval", "Expression(body=Set(elts=[Num(n=1), Num(n=2), Num(n=3)]))"},
+{"{'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)])]))"},
 // END TESTS
  }{
 Ast, err:=ParseString(test.in, test.mode)

parser/make_grammar_test.py

@@ -25,6 +25,12 @@
  ("0x1234", "eval"),
  ("12.34", "eval"),
  ("{}", "eval"),
+ ("{1}", "eval"),
+ ("{1,2}", "eval"),
+ ("{1,2,3,}", "eval"),
+ ("{'a':1 }", "eval"),
+ ("{'a':1, 'b':2 }", "eval"),
+ ("{'a':{'aa':11, 'bb':{'aa':11, 'bb':22}}, 'b':{'aa':11, 'bb':22} }", "eval"),
 ]
 
 defdump(source, mode):