symtable: fix functions with no normal arguments (only *args etc)

ncw · ncw · commit b306413190ae · 2015-05-26T15:20:16.000+01:00
diff --git a/symtable/make_symtable_test.py b/symtable/make_symtable_test.py
@@ -23,6 +23,7 @@
     # Functions
     ('''def fn(): pass''', "exec"),
     ('''def fn(a,b):\n e=1\n return a*b*c*d*e''', "exec"),
+    ('''def fn(*args,a=2,b=3,**kwargs): return (args,a,b,kwargs)''', "exec"),
     ('''def fn(a,b):\n def nested(c,d):\n  return a*b*c*d*e''', "exec"),
     ('''\
 def fn(a:A,*arg:ARG,b:B=BB,c:C=CC,**kwargs:KW) -> RET:
diff --git a/symtable/symtable.go b/symtable/symtable.go
@@ -177,9 +177,6 @@ func (st *SymTable) GetScope(name string) Scope {
 
 // Add arguments to the symbol table
 func (st *SymTable) addArgumentsToSymbolTable(node *ast.Arguments) {
-	if node.Args == nil {
-		return
-	}
 	// skip default arguments inside function block
 	// XXX should ast be different?
 	for _, arg := range node.Args {
diff --git a/symtable/symtable_data_test.go b/symtable/symtable_data_test.go
@@ -161,6 +161,63 @@ var symtableTestData = []struct {
 			},
 		},
 	}, nil, ""},
+	{"def fn(*args,a=2,b=3,**kwargs): return (args,a,b,kwargs)", "exec", &SymTable{
+		Type:              ModuleBlock,
+		Name:              "top",
+		Lineno:            0,
+		Unoptimized:       optTopLevel,
+		Nested:            false,
+		Free:              false,
+		ChildFree:         false,
+		Generator:         false,
+		Varargs:           false,
+		Varkeywords:       false,
+		ReturnsValue:      false,
+		NeedsClassClosure: false,
+		Varnames:          []string{},
+		Symbols: Symbols{
+			"fn": Symbol{
+				Flags: DefLocal,
+				Scope: ScopeLocal,
+			},
+		},
+		Children: Children{
+			&SymTable{
+				Type:              FunctionBlock,
+				Name:              "fn",
+				Lineno:            1,
+				Unoptimized:       0,
+				Nested:            false,
+				Free:              false,
+				ChildFree:         false,
+				Generator:         false,
+				Varargs:           true,
+				Varkeywords:       true,
+				ReturnsValue:      true,
+				NeedsClassClosure: false,
+				Varnames:          []string{"a", "b", "args", "kwargs"},
+				Symbols: Symbols{
+					"a": Symbol{
+						Flags: DefParam | DefUse,
+						Scope: ScopeLocal,
+					},
+					"args": Symbol{
+						Flags: DefParam | DefUse,
+						Scope: ScopeLocal,
+					},
+					"b": Symbol{
+						Flags: DefParam | DefUse,
+						Scope: ScopeLocal,
+					},
+					"kwargs": Symbol{
+						Flags: DefParam | DefUse,
+						Scope: ScopeLocal,
+					},
+				},
+				Children: Children{},
+			},
+		},
+	}, nil, ""},
 	{"def fn(a,b):\n def nested(c,d):\n  return a*b*c*d*e", "exec", &SymTable{
 		Type:              ModuleBlock,
 		Name:              "top",
