Make Call with arguments work

Author: ncw

ast/ast.go

@@ -429,7 +429,7 @@ type UnaryOp struct{
 
 typeLambdastruct{
 ExprBase
-ArgsArguments
+Args*Arguments
 BodyExpr
 }
 

ast/dump.go

@@ -19,6 +19,8 @@ func dumpItem(v interface{}) string{
 returnfmt.Sprintf("b'%s'", string(x))
 caseIdentifier:
 returnfmt.Sprintf("'%s'", string(x))
+case*Keyword:
+returndump(x, "keyword")
 caseModBase:
 caseStmtBase:
 caseExprBase:
@@ -43,7 +45,7 @@ func dump(ast interface{}, name string) string{
 fieldType:=astType.Field(i)
 fieldValue:=astValue.Field(i)
 fname:=strings.ToLower(fieldType.Name)
-iffname=="stmtbase"||fname=="exprbase"||fname=="modbase"||fname=="slicebase"{
+iffname=="stmtbase"||fname=="exprbase"||fname=="modbase"||fname=="slicebase"||fname=="pos"{
 continue
  }
 iffieldValue.Kind() ==reflect.Slice&&fieldValue.Type().Elem().Kind() !=reflect.Uint8{

parser/grammar.y

@@ -59,19 +59,21 @@ func applyTrailers(expr ast.Expr, trailers []ast.Expr) ast.Expr{
  comprehensions []ast.Comprehension
  isExpr bool
  slice ast.Slicer
+ call *ast.Call
 }
 
 %type<obj>strings
 %type<mod>inputsfile_inputsingle_inputeval_input
 %type<stmts>simple_stmtstmtnl_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_exprdictorsetmakersliceop
+%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_exprdictorsetmakersliceoparglist
 %type<exprs>exprlisttestlistrawcomp_ifcomp_iterexpr_or_star_exprstest_or_star_exprsteststest_colon_teststrailers
 %type<cmpop>comp_op
 %type<comma>optional_comma
 %type<comprehensions>comp_for
 %type<slice>subscriptsubscriptlistsubscripts
+%type<call>argumentargumentsoptional_argumentsarguments2
 
 %tokenNEWLINE
 %tokenENDMARKER
@@ -1142,8 +1144,7 @@ trailer:
  }
 | '(' arglist ')'
 {
-// FIXME
-$$ = nil
+$$ = $2
  }
 | '[' subscriptlist ']'
 {
@@ -1329,26 +1330,92 @@ classdef:
 
 arguments:
  argument
+{
+$$ = $1
+ }
 | arguments ',' argument
+{
+$$.Args = append($$.Args, $3.Args...)
+$$.Keywords = append($$.Keywords, $3.Keywords...)
+ }
 
 optional_arguments:
+{
+$$ = &ast.Call{}
+ }
 | arguments ','
+{
+$$ = $1
+ }
 
 arguments2:
+{
+$$ = &ast.Call{}
+ }
 | arguments2 ',' argument
+{
+$$.Args = append($$.Args, $3.Args...)
+$$.Keywords = append($$.Keywords, $3.Keywords...)
+ }
 
 arglist:
  arguments optional_comma
+{
+$$ = $1
+ }
 | optional_arguments '*' test arguments2
+{
+ call := $1
+ call.Starargs = $3
+iflen($4.Args) != 0{
+ yylex.Error("SyntaxError: only named arguments may follow *expression")
+ }
+ call.Keywords = append(call.Keywords, $4.Keywords...)
+$$ = call
+ }
 | optional_arguments '*' test arguments2 ',' STARSTAR test
+{
+ call := $1
+ call.Starargs = $3
+ call.Kwargs = $7
+iflen($4.Args) != 0{
+ yylex.Error("SyntaxError: only named arguments may follow *expression")
+ }
+ call.Keywords = append(call.Keywords, $4.Keywords...)
+$$ = call
+ }
 | optional_arguments STARSTAR test
+{
+ call := $1
+ call.Kwargs = $3
+$$ = call
+ }
 
 // The reason that keywords are test nodes instead of NAME is that using NAME
 // results in an ambiguity. ast.c makes sure it's a NAME.
 argument:
  test
+{
+$$ = &ast.Call{}
+$$.Args = []ast.Expr{$1}
+ }
 | test comp_for
+{
+$$ = &ast.Call{}
+$$.Args = []ast.Expr{
+ &ast.GeneratorExp{ExprBase: ast.ExprBase{$<pos>$}, Elt: $1, Generators: $2},
+ }
+ }
 | test '=' test // Really [keyword '='] test
+{
+$$ = &ast.Call{}
+ test := $1
+if name, ok := test.(*ast.Name); ok{
+$$.Keywords = []*ast.Keyword{&ast.Keyword{Pos: name.Pos, Arg: name.Id, Value: $3}}
+ } else{
+ yylex.Error("SyntaxError: keyword can't be an expression")
+ }
+ }
 
 comp_iter:
  comp_for

parser/grammar_test.go

@@ -131,6 +131,15 @@ func TestGrammar(t *testing.T){
 {"a==(b<c)", "eval", "Expression(body=Compare(left=Name(id='a', ctx=Load()), ops=[Eq()], comparators=[Compare(left=Name(id='b', ctx=Load()), ops=[Lt()], comparators=[Name(id='c', ctx=Load())])]))"},
 {"(a==b)<(c>d)>e", "eval", "Expression(body=Compare(left=Compare(left=Name(id='a', ctx=Load()), ops=[Eq()], comparators=[Name(id='b', ctx=Load())]), ops=[Lt(), Gt()], comparators=[Compare(left=Name(id='c', ctx=Load()), ops=[Gt()], comparators=[Name(id='d', ctx=Load())]), Name(id='e', ctx=Load())]))"},
 {"a()", "eval", "Expression(body=Call(func=Name(id='a', ctx=Load()), args=[], keywords=[], starargs=None, kwargs=None))"},
+{"a(b)", "eval", "Expression(body=Call(func=Name(id='a', ctx=Load()), args=[Name(id='b', ctx=Load())], keywords=[], starargs=None, kwargs=None))"},
+{"a(b,)", "eval", "Expression(body=Call(func=Name(id='a', ctx=Load()), args=[Name(id='b', ctx=Load())], keywords=[], starargs=None, kwargs=None))"},
+{"a(b,c)", "eval", "Expression(body=Call(func=Name(id='a', ctx=Load()), args=[Name(id='b', ctx=Load()), Name(id='c', ctx=Load())], keywords=[], starargs=None, kwargs=None))"},
+{"a(b,*c)", "eval", "Expression(body=Call(func=Name(id='a', ctx=Load()), args=[Name(id='b', ctx=Load())], keywords=[], starargs=Name(id='c', ctx=Load()), kwargs=None))"},
+{"a(b,*c,**d)", "eval", "Expression(body=Call(func=Name(id='a', ctx=Load()), args=[Name(id='b', ctx=Load())], keywords=[], starargs=Name(id='c', ctx=Load()), kwargs=Name(id='d', ctx=Load())))"},
+{"a(b,**c)", "eval", "Expression(body=Call(func=Name(id='a', ctx=Load()), args=[Name(id='b', ctx=Load())], keywords=[], starargs=None, kwargs=Name(id='c', ctx=Load())))"},
+{"a(a=b)", "eval", "Expression(body=Call(func=Name(id='a', ctx=Load()), args=[], keywords=[keyword(arg='a', value=Name(id='b', ctx=Load()))], starargs=None, kwargs=None))"},
+{"a(a,a=b,*args,**kwargs)", "eval", "Expression(body=Call(func=Name(id='a', ctx=Load()), args=[Name(id='a', ctx=Load())], keywords=[keyword(arg='a', value=Name(id='b', ctx=Load()))], starargs=Name(id='args', ctx=Load()), kwargs=Name(id='kwargs', ctx=Load())))"},
+{"a(a,a=b,*args,e=f,**kwargs)", "eval", "Expression(body=Call(func=Name(id='a', ctx=Load()), args=[Name(id='a', ctx=Load())], keywords=[keyword(arg='a', value=Name(id='b', ctx=Load())), keyword(arg='e', value=Name(id='f', ctx=Load()))], starargs=Name(id='args', ctx=Load()), kwargs=Name(id='kwargs', ctx=Load())))"},
 {"a.b", "eval", "Expression(body=Attribute(value=Name(id='a', ctx=Load()), attr='b', ctx=Load()))"},
 {"a.b.c.d", "eval", "Expression(body=Attribute(value=Attribute(value=Attribute(value=Name(id='a', ctx=Load()), attr='b', ctx=Load()), attr='c', ctx=Load()), attr='d', ctx=Load()))"},
 {"a.b().c.d()()", "eval", "Expression(body=Call(func=Call(func=Attribute(value=Attribute(value=Call(func=Attribute(value=Name(id='a', ctx=Load()), attr='b', ctx=Load()), args=[], keywords=[], starargs=None, kwargs=None), attr='c', ctx=Load()), attr='d', ctx=Load()), args=[], keywords=[], starargs=None, kwargs=None), args=[], keywords=[], starargs=None, kwargs=None))"},

parser/make_grammar_test.py

@@ -134,6 +134,17 @@
 
 # trailers
  ("a()", "eval"),
+ ("a(b)", "eval"),
+ ("a(b,)", "eval"),
+ ("a(b,c)", "eval"),
+ ("a(b,*c)", "eval"),
+ ("a(*b)", "eval"),
+#("a(*b,c)", "eval"), -test error
+ ("a(b,*c,**d)", "eval"),
+ ("a(b,**c)", "eval"),
+ ("a(a=b)", "eval"),
+ ("a(a,a=b,*args,**kwargs)", "eval"),
+ ("a(a,a=b,*args,e=f,**kwargs)", "eval"),
  ("a.b", "eval"),
  ("a.b.c.d", "eval"),
  ("a.b().c.d()()", "eval"),