decorators

Author: ncw

parser/grammar.y

@@ -260,7 +260,7 @@ nls:
 
 optional_arglist:
 	{
-		$$ = nil
+		$$ = &ast.Call{ExprBase: ast.ExprBase{$<pos>$}}
 	}
 |	arglist
 	{
@@ -279,7 +279,14 @@ optional_arglist_call:
 decorator:
 	'@' dotted_name optional_arglist_call NEWLINE
 	{
-		// FIXME
+		fn := &ast.Name{ExprBase: ast.ExprBase{$<pos>$}, Id: ast.Identifier($2), Ctx: ast.Load}
+		if $3 == nil {
+			$$ = fn
+		} else {
+			call := *$3
+			call.Func = fn
+			$$ = &call
+		}
 	}
 
 decorators:

parser/grammar_test.go

@@ -267,6 +267,10 @@ func TestGrammar(t *testing.T) {
 		{"class A(B,C): pass", "exec", "Module(body=[ClassDef(name='A', bases=[Name(id='B', ctx=Load()), Name(id='C', ctx=Load())], keywords=[], starargs=None, kwargs=None, body=[Pass()], decorator_list=[])])"},
 		{"class A(B,C,D=F): pass", "exec", "Module(body=[ClassDef(name='A', bases=[Name(id='B', ctx=Load()), Name(id='C', ctx=Load())], keywords=[keyword(arg='D', value=Name(id='F', ctx=Load()))], starargs=None, kwargs=None, body=[Pass()], decorator_list=[])])"},
 		{"class A(B,C,D=F,*AS,**KWS): pass", "exec", "Module(body=[ClassDef(name='A', bases=[Name(id='B', ctx=Load()), Name(id='C', ctx=Load())], keywords=[keyword(arg='D', value=Name(id='F', ctx=Load()))], starargs=Name(id='AS', ctx=Load()), kwargs=Name(id='KWS', ctx=Load()), body=[Pass()], decorator_list=[])])"},
+		{"@dec\ndef fn():\n    pass\n", "exec", "Module(body=[FunctionDef(name='fn', args=arguments(args=[], vararg=None, kwonlyargs=[], kw_defaults=[], kwarg=None, defaults=[]), body=[Pass()], decorator_list=[Name(id='dec', ctx=Load())], returns=None)])"},
+		{"@dec()\ndef fn():\n    pass\n", "exec", "Module(body=[FunctionDef(name='fn', args=arguments(args=[], vararg=None, kwonlyargs=[], kw_defaults=[], kwarg=None, defaults=[]), body=[Pass()], decorator_list=[Call(func=Name(id='dec', ctx=Load()), args=[], keywords=[], starargs=None, kwargs=None)], returns=None)])"},
+		{"@dec(a,b,c=d,*args,**kwargs)\ndef fn():\n    pass\n", "exec", "Module(body=[FunctionDef(name='fn', args=arguments(args=[], vararg=None, kwonlyargs=[], kw_defaults=[], kwarg=None, defaults=[]), body=[Pass()], decorator_list=[Call(func=Name(id='dec', ctx=Load()), args=[Name(id='a', ctx=Load()), Name(id='b', ctx=Load())], keywords=[keyword(arg='c', value=Name(id='d', ctx=Load()))], starargs=Name(id='args', ctx=Load()), kwargs=Name(id='kwargs', ctx=Load()))], returns=None)])"},
+		{"@dec1\n@dec2()\n@dec3(a)\n@dec4(a,b)\ndef fn():\n    pass\n", "exec", "Module(body=[FunctionDef(name='fn', args=arguments(args=[], vararg=None, kwonlyargs=[], kw_defaults=[], kwarg=None, defaults=[]), body=[Pass()], decorator_list=[Name(id='dec1', ctx=Load()), Call(func=Name(id='dec2', ctx=Load()), args=[], keywords=[], starargs=None, kwargs=None), Call(func=Name(id='dec3', ctx=Load()), args=[Name(id='a', ctx=Load())], keywords=[], starargs=None, kwargs=None), Call(func=Name(id='dec4', ctx=Load()), args=[Name(id='a', ctx=Load()), Name(id='b', ctx=Load())], keywords=[], starargs=None, kwargs=None)], returns=None)])"},
 		// END TESTS
 	} {
 		Ast, err := ParseString(test.in, test.mode)

parser/make_grammar_test.py

@@ -376,6 +376,29 @@
     ("class A(B,C,D=F,*AS,**KWS): pass", "exec"),
 
     # decorators
+    ("""\
+@dec
+def fn():
+    pass
+""", "exec"),
+    ("""\
+@dec()
+def fn():
+    pass
+""", "exec"),
+    ("""\
+@dec(a,b,c=d,*args,**kwargs)
+def fn():
+    pass
+""", "exec"),
+    ("""\
+@dec1
+@dec2()
+@dec3(a)
+@dec4(a,b)
+def fn():
+    pass
+""", "exec"),
 ]
 
 def dump(source, mode):