Class definition

ncw · ncw · commit 8ed83d04715b · 2014-11-29T09:13:15.000Z
diff --git a/parser/grammar.y b/parser/grammar.y
@@ -86,13 +86,13 @@ func setCtx(exprs []ast.Expr, ctx ast.ExprContext) {
 %type <stmts> simple_stmt stmt nl_or_stmt small_stmts stmts suite optional_else
 %type <stmt> compound_stmt small_stmt expr_stmt del_stmt pass_stmt flow_stmt import_stmt global_stmt nonlocal_stmt assert_stmt break_stmt continue_stmt return_stmt raise_stmt yield_stmt import_name import_from while_stmt if_stmt for_stmt try_stmt with_stmt funcdef classdef classdef_or_funcdef decorated
 %type <op> augassign
-%type <expr> expr_or_star_expr expr star_expr xor_expr and_expr shift_expr arith_expr term factor power trailer atom test_or_star_expr test not_test lambdef test_nocond lambdef_nocond or_test and_test comparison testlist testlist_star_expr yield_expr_or_testlist yield_expr yield_expr_or_testlist_star_expr dictorsetmaker sliceop arglist except_clause optional_return_type decorator
+%type <expr> expr_or_star_expr expr star_expr xor_expr and_expr shift_expr arith_expr term factor power trailer atom test_or_star_expr test not_test lambdef test_nocond lambdef_nocond or_test and_test comparison testlist testlist_star_expr yield_expr_or_testlist yield_expr yield_expr_or_testlist_star_expr dictorsetmaker sliceop except_clause optional_return_type decorator
 %type <exprs> exprlist testlistraw comp_if comp_iter expr_or_star_exprs test_or_star_exprs tests test_colon_tests trailers equals_yield_expr_or_testlist_star_expr decorators
 %type <cmpop> comp_op
 %type <comma> optional_comma
 %type <comprehensions> comp_for
 %type <slice> subscript subscriptlist subscripts
-%type <call> argument arguments optional_arguments arguments2
+%type <call> argument arguments optional_arguments arguments2 arglist optional_arglist_call optional_arglist
 %type <level> dot dots
 %type <str> dotted_name from_arg
 %type <identifiers> names
@@ -260,20 +260,20 @@ nls:
 
 optional_arglist:
 	{
-		// FIXME
+		$$ = nil
 	}
 |	arglist
 	{
-		// FIXME
+		$$ = $1
 	}
 
 optional_arglist_call:
 	{
-		// FIXME
+		$$ = nil
 	}
 |	'(' optional_arglist ')'
 	{
-		// FIXME
+		$$ = $2
 	}
 
 decorator:
@@ -1763,8 +1763,15 @@ dictorsetmaker:
 classdef:
 	CLASS NAME optional_arglist_call ':' suite
 	{
-		// FIXME
-		// $$ = &ast.ClassDef{StmtBase: ast.StmtBase{$<pos>$}, Name: ast.Identifier($2), Args: $3, Body: $5}
+		classDef := &ast.ClassDef{StmtBase: ast.StmtBase{$<pos>$}, Name: ast.Identifier($2), Body: $5}
+		$$ = classDef
+		args := $3
+		if args != nil {
+			classDef.Bases = args.Args
+			classDef.Keywords = args.Keywords
+			classDef.Starargs = args.Starargs
+			classDef.Kwargs = args.Kwargs
+		}
 	}
 
 arguments:
diff --git a/parser/grammar_test.go b/parser/grammar_test.go
@@ -261,6 +261,12 @@ func TestGrammar(t *testing.T) {
 		{"def fn(*args, c=d): pass", "exec", "Module(body=[FunctionDef(name='fn', args=arguments(args=[], vararg=arg(arg='args', annotation=None), kwonlyargs=[arg(arg='c', annotation=None)], kw_defaults=[Name(id='d', ctx=Load())], kwarg=None, defaults=[]), body=[Pass()], decorator_list=[], returns=None)])"},
 		{"def fn(*args, c=d, **kws): pass", "exec", "Module(body=[FunctionDef(name='fn', args=arguments(args=[], vararg=arg(arg='args', annotation=None), kwonlyargs=[arg(arg='c', annotation=None)], kw_defaults=[Name(id='d', ctx=Load())], kwarg=arg(arg='kws', annotation=None), defaults=[]), body=[Pass()], decorator_list=[], returns=None)])"},
 		{"def fn(**kws): pass", "exec", "Module(body=[FunctionDef(name='fn', args=arguments(args=[], vararg=None, kwonlyargs=[], kw_defaults=[], kwarg=arg(arg='kws', annotation=None), defaults=[]), body=[Pass()], decorator_list=[], returns=None)])"},
+		{"class A: pass", "exec", "Module(body=[ClassDef(name='A', bases=[], keywords=[], starargs=None, kwargs=None, body=[Pass()], decorator_list=[])])"},
+		{"class A(): pass", "exec", "Module(body=[ClassDef(name='A', bases=[], keywords=[], starargs=None, kwargs=None, body=[Pass()], decorator_list=[])])"},
+		{"class A(B): pass", "exec", "Module(body=[ClassDef(name='A', bases=[Name(id='B', ctx=Load())], keywords=[], starargs=None, kwargs=None, body=[Pass()], decorator_list=[])])"},
+		{"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=[])])"},
 		// END TESTS
 	} {
 		Ast, err := ParseString(test.in, test.mode)
diff --git a/parser/make_grammar_test.py b/parser/make_grammar_test.py
@@ -366,6 +366,16 @@
     ("def fn(*args, c=d): pass", "exec"),
     ("def fn(*args, c=d, **kws): pass", "exec"),
     ("def fn(**kws): pass", "exec"),
+
+    # class
+    ("class A: pass", "exec"),
+    ("class A(): pass", "exec"),
+    ("class A(B): pass", "exec"),
+    ("class A(B,C): pass", "exec"),
+    ("class A(B,C,D=F): pass", "exec"),
+    ("class A(B,C,D=F,*AS,**KWS): pass", "exec"),
+
+    # decorators
 ]
 
 def dump(source, mode):

Original file line number	Diff line number	Diff line change
`@@ -86,13 +86,13 @@ func setCtx(exprs []ast.Expr, ctx ast.ExprContext) {`
`86`	`86`	`%type <stmts> simple_stmt stmt nl_or_stmt small_stmts stmts suite optional_else`
`87`	`87`	`%type <stmt> compound_stmt small_stmt expr_stmt del_stmt pass_stmt flow_stmt import_stmt global_stmt nonlocal_stmt assert_stmt break_stmt continue_stmt return_stmt raise_stmt yield_stmt import_name import_from while_stmt if_stmt for_stmt try_stmt with_stmt funcdef classdef classdef_or_funcdef decorated`
`88`	`88`	`%type <op> augassign`
`89`		`-%type <expr> expr_or_star_expr expr star_expr xor_expr and_expr shift_expr arith_expr term factor power trailer atom test_or_star_expr test not_test lambdef test_nocond lambdef_nocond or_test and_test comparison testlist testlist_star_expr yield_expr_or_testlist yield_expr yield_expr_or_testlist_star_expr dictorsetmaker sliceop arglist except_clause optional_return_type decorator`
	`89`	`+%type <expr> expr_or_star_expr expr star_expr xor_expr and_expr shift_expr arith_expr term factor power trailer atom test_or_star_expr test not_test lambdef test_nocond lambdef_nocond or_test and_test comparison testlist testlist_star_expr yield_expr_or_testlist yield_expr yield_expr_or_testlist_star_expr dictorsetmaker sliceop except_clause optional_return_type decorator`
`90`	`90`	`%type <exprs> exprlist testlistraw comp_if comp_iter expr_or_star_exprs test_or_star_exprs tests test_colon_tests trailers equals_yield_expr_or_testlist_star_expr decorators`
`91`	`91`	`%type <cmpop> comp_op`
`92`	`92`	`%type <comma> optional_comma`
`93`	`93`	`%type <comprehensions> comp_for`
`94`	`94`	`%type <slice> subscript subscriptlist subscripts`
`95`		`-%type <call> argument arguments optional_arguments arguments2`
	`95`	`+%type <call> argument arguments optional_arguments arguments2 arglist optional_arglist_call optional_arglist`
`96`	`96`	`%type <level> dot dots`
`97`	`97`	`%type <str> dotted_name from_arg`
`98`	`98`	`%type <identifiers> names`
`@@ -260,20 +260,20 @@ nls:`
`260`	`260`
`261`	`261`	`optional_arglist:`
`262`	`262`	`{`
`263`		`- // FIXME`
	`263`	`+ $$ = nil`
`264`	`264`	`}`
`265`	`265`	`\| arglist`
`266`	`266`	`{`
`267`		`- // FIXME`
	`267`	`+ $$ = $1`
`268`	`268`	`}`
`269`	`269`
`270`	`270`	`optional_arglist_call:`
`271`	`271`	`{`
`272`		`- // FIXME`
	`272`	`+ $$ = nil`
`273`	`273`	`}`
`274`	`274`	`\| '(' optional_arglist ')'`
`275`	`275`	`{`
`276`		`- // FIXME`
	`276`	`+ $$ = $2`
`277`	`277`	`}`
`278`	`278`
`279`	`279`	`decorator:`
`@@ -1763,8 +1763,15 @@ dictorsetmaker:`
`1763`	`1763`	`classdef:`
`1764`	`1764`	`CLASS NAME optional_arglist_call ':' suite`
`1765`	`1765`	`{`
`1766`		`- // FIXME`
`1767`		`- // $$ = &ast.ClassDef{StmtBase: ast.StmtBase{$<pos>$}, Name: ast.Identifier($2), Args: $3, Body: $5}`
	`1766`	`+ classDef := &ast.ClassDef{StmtBase: ast.StmtBase{$<pos>$}, Name: ast.Identifier($2), Body: $5}`
	`1767`	`+ $$ = classDef`
	`1768`	`+ args := $3`
	`1769`	`+ if args != nil {`
	`1770`	`+ classDef.Bases = args.Args`
	`1771`	`+ classDef.Keywords = args.Keywords`
	`1772`	`+ classDef.Starargs = args.Starargs`
	`1773`	`+ classDef.Kwargs = args.Kwargs`
	`1774`	`+ }`
`1768`	`1775`	`}`
`1769`	`1776`
`1770`	`1777`	`arguments:`