compiler: implement call

ncw · ncw · commit ff5d1143aebd · 2015-04-07T19:23:14.000+01:00
diff --git a/compile/compile.go b/compile/compile.go
@@ -135,7 +135,7 @@ func CompileAst(Ast ast.Ast, filename string, flags int, dont_inherit bool) *py.
 		// add a return
 		if !valueOnStack {
 			// return None if there is nothing on the stack
-			c.OpArg(vm.LOAD_CONST, c.Const(py.None))
+			c.LoadConst(py.None)
 		}
 		c.Op(vm.RETURN_VALUE)
 	}
@@ -192,6 +192,11 @@ func (c *compiler) Const(obj py.Object) uint32 {
 	return uint32(len(c.Code.Consts) - 1)
 }
 
+// Loads a constant
+func (c *compiler) LoadConst(obj py.Object) {
+	c.OpArg(vm.LOAD_CONST, c.Const(obj))
+}
+
 // Compiles a python name
 //
 // Returns the index into the Name tuple
@@ -562,8 +567,8 @@ func (c *compiler) Expr(expr ast.Expr) {
 		// newC := Compiler
 		code := CompileAst(node.Body, c.Code.Filename, int(c.Code.Flags)|py.CO_OPTIMIZED|py.CO_NEWLOCALS, false) // FIXME pass on compile args
 		code.Argcount = int32(len(node.Args.Args))
-		c.OpArg(vm.LOAD_CONST, c.Const(code))
-		c.OpArg(vm.LOAD_CONST, c.Const(py.String("<lambda>")))
+		c.LoadConst(code)
+		c.LoadConst(py.String("<lambda>"))
 		// FIXME node.Args
 		c.OpArg(vm.MAKE_FUNCTION, 0)
 	case *ast.IfExp:
@@ -685,19 +690,43 @@ func (c *compiler) Expr(expr ast.Expr) {
 		// Keywords []*Keyword
 		// Starargs Expr
 		// Kwargs   Expr
-		panic("FIXME compile: Call not implemented")
+		c.Expr(node.Func)
+		args := len(node.Args)
+		for i := range node.Args {
+			c.Expr(node.Args[i])
+		}
+		kwargs := len(node.Keywords)
+		for i := range node.Keywords {
+			kw := node.Keywords[i]
+			c.LoadConst(py.String(kw.Arg))
+			c.Expr(kw.Value)
+		}
+		op := byte(vm.CALL_FUNCTION)
+		if node.Starargs != nil {
+			c.Expr(node.Starargs)
+			if node.Kwargs != nil {
+				c.Expr(node.Kwargs)
+				op = vm.CALL_FUNCTION_VAR_KW
+			} else {
+				op = vm.CALL_FUNCTION_VAR
+			}
+		} else if node.Kwargs != nil {
+			c.Expr(node.Kwargs)
+			op = vm.CALL_FUNCTION_KW
+		}
+		c.OpArg(op, uint32(args+kwargs<<8))
 	case *ast.Num:
 		// N Object
-		c.OpArg(vm.LOAD_CONST, c.Const(node.N))
+		c.LoadConst(node.N)
 	case *ast.Str:
 		// S py.String
-		c.OpArg(vm.LOAD_CONST, c.Const(node.S))
+		c.LoadConst(node.S)
 	case *ast.Bytes:
 		// S py.Bytes
-		c.OpArg(vm.LOAD_CONST, c.Const(node.S))
+		c.LoadConst(node.S)
 	case *ast.NameConstant:
 		// Value Singleton
-		c.OpArg(vm.LOAD_CONST, c.Const(node.Value))
+		c.LoadConst(node.Value)
 	case *ast.Ellipsis:
 		panic("FIXME compile: Ellipsis not implemented")
 	case *ast.Attribute:
diff --git a/compile/compile_data_test.go b/compile/compile_data_test.go
@@ -1151,7 +1151,7 @@ var compileTestData = []struct {
 		Name:        "<module>",
 		Firstlineno: 1,
 		Lnotab:      "",
-	}, "  1           0 LOAD_CONST               0 (<code object <lambda> at 0x7f37b1535db0, file \"<string>\", line 1>)\n              3 LOAD_CONST               1 ('<lambda>')\n              6 MAKE_FUNCTION            0\n              9 RETURN_VALUE\n", nil, ""},
+	}, "  1           0 LOAD_CONST               0 (<code object <lambda> at 0x7f94f9f31db0, file \"<string>\", line 1>)\n              3 LOAD_CONST               1 ('<lambda>')\n              6 MAKE_FUNCTION            0\n              9 RETURN_VALUE\n", nil, ""},
 	{"pass", "exec", &py.Code{
 		Argcount:       0,
 		Kwonlyargcount: 0,
@@ -1732,4 +1732,191 @@ var compileTestData = []struct {
 		Firstlineno:    1,
 		Lnotab:         "\x0d\x01\x06\x01\x06\x01\x0a\x01",
 	}, "  1           0 SETUP_LOOP              38 (to 41)\n              3 LOAD_NAME                0 (b)\n              6 GET_ITER\n        >>    7 FOR_ITER                24 (to 34)\n             10 STORE_NAME               1 (a)\n\n  2          13 LOAD_NAME                1 (a)\n             16 POP_JUMP_IF_FALSE       25\n\n  3          19 JUMP_ABSOLUTE            7\n             22 JUMP_FORWARD             0 (to 25)\n\n  4     >>   25 LOAD_NAME                2 (e)\n             28 STORE_NAME               3 (c)\n             31 JUMP_ABSOLUTE            7\n        >>   34 POP_BLOCK\n\n  5          35 LOAD_NAME                4 (d)\n             38 STORE_NAME               3 (c)\n        >>   41 LOAD_CONST               0 (None)\n             44 RETURN_VALUE\n", nil, ""},
+	{"f()", "eval", &py.Code{
+		Argcount:       0,
+		Kwonlyargcount: 0,
+		Nlocals:        0,
+		Stacksize:      1,
+		Flags:          64,
+		Code:           "\x65\x00\x00\x83\x00\x00\x53",
+		Consts:         []py.Object{},
+		Names:          []string{"f"},
+		Varnames:       []string{},
+		Freevars:       []string{},
+		Cellvars:       []string{},
+		Filename:       "<string>",
+		Name:           "<module>",
+		Firstlineno:    1,
+		Lnotab:         "",
+	}, "  1           0 LOAD_NAME                0 (f)\n              3 CALL_FUNCTION            0 (0 positional, 0 keyword pair)\n              6 RETURN_VALUE\n", nil, ""},
+	{"f(a)", "eval", &py.Code{
+		Argcount:       0,
+		Kwonlyargcount: 0,
+		Nlocals:        0,
+		Stacksize:      2,
+		Flags:          64,
+		Code:           "\x65\x00\x00\x65\x01\x00\x83\x01\x00\x53",
+		Consts:         []py.Object{},
+		Names:          []string{"f", "a"},
+		Varnames:       []string{},
+		Freevars:       []string{},
+		Cellvars:       []string{},
+		Filename:       "<string>",
+		Name:           "<module>",
+		Firstlineno:    1,
+		Lnotab:         "",
+	}, "  1           0 LOAD_NAME                0 (f)\n              3 LOAD_NAME                1 (a)\n              6 CALL_FUNCTION            1 (1 positional, 0 keyword pair)\n              9 RETURN_VALUE\n", nil, ""},
+	{"f(a,b,c)", "eval", &py.Code{
+		Argcount:       0,
+		Kwonlyargcount: 0,
+		Nlocals:        0,
+		Stacksize:      4,
+		Flags:          64,
+		Code:           "\x65\x00\x00\x65\x01\x00\x65\x02\x00\x65\x03\x00\x83\x03\x00\x53",
+		Consts:         []py.Object{},
+		Names:          []string{"f", "a", "b", "c"},
+		Varnames:       []string{},
+		Freevars:       []string{},
+		Cellvars:       []string{},
+		Filename:       "<string>",
+		Name:           "<module>",
+		Firstlineno:    1,
+		Lnotab:         "",
+	}, "  1           0 LOAD_NAME                0 (f)\n              3 LOAD_NAME                1 (a)\n              6 LOAD_NAME                2 (b)\n              9 LOAD_NAME                3 (c)\n             12 CALL_FUNCTION            3 (3 positional, 0 keyword pair)\n             15 RETURN_VALUE\n", nil, ""},
+	{"f(A=a)", "eval", &py.Code{
+		Argcount:       0,
+		Kwonlyargcount: 0,
+		Nlocals:        0,
+		Stacksize:      3,
+		Flags:          64,
+		Code:           "\x65\x00\x00\x64\x00\x00\x65\x01\x00\x83\x00\x01\x53",
+		Consts:         []py.Object{py.String("A")},
+		Names:          []string{"f", "a"},
+		Varnames:       []string{},
+		Freevars:       []string{},
+		Cellvars:       []string{},
+		Filename:       "<string>",
+		Name:           "<module>",
+		Firstlineno:    1,
+		Lnotab:         "",
+	}, "  1           0 LOAD_NAME                0 (f)\n              3 LOAD_CONST               0 ('A')\n              6 LOAD_NAME                1 (a)\n              9 CALL_FUNCTION          256 (0 positional, 1 keyword pair)\n             12 RETURN_VALUE\n", nil, ""},
+	{"f(a, b, C=d, D=d)", "eval", &py.Code{
+		Argcount:       0,
+		Kwonlyargcount: 0,
+		Nlocals:        0,
+		Stacksize:      7,
+		Flags:          64,
+		Code:           "\x65\x00\x00\x65\x01\x00\x65\x02\x00\x64\x00\x00\x65\x03\x00\x64\x01\x00\x65\x03\x00\x83\x02\x02\x53",
+		Consts:         []py.Object{py.String("C"), py.String("D")},
+		Names:          []string{"f", "a", "b", "d"},
+		Varnames:       []string{},
+		Freevars:       []string{},
+		Cellvars:       []string{},
+		Filename:       "<string>",
+		Name:           "<module>",
+		Firstlineno:    1,
+		Lnotab:         "",
+	}, "  1           0 LOAD_NAME                0 (f)\n              3 LOAD_NAME                1 (a)\n              6 LOAD_NAME                2 (b)\n              9 LOAD_CONST               0 ('C')\n             12 LOAD_NAME                3 (d)\n             15 LOAD_CONST               1 ('D')\n             18 LOAD_NAME                3 (d)\n             21 CALL_FUNCTION          514 (2 positional, 2 keyword pair)\n             24 RETURN_VALUE\n", nil, ""},
+	{"f(*args)", "eval", &py.Code{
+		Argcount:       0,
+		Kwonlyargcount: 0,
+		Nlocals:        0,
+		Stacksize:      2,
+		Flags:          64,
+		Code:           "\x65\x00\x00\x65\x01\x00\x8c\x00\x00\x53",
+		Consts:         []py.Object{},
+		Names:          []string{"f", "args"},
+		Varnames:       []string{},
+		Freevars:       []string{},
+		Cellvars:       []string{},
+		Filename:       "<string>",
+		Name:           "<module>",
+		Firstlineno:    1,
+		Lnotab:         "",
+	}, "  1           0 LOAD_NAME                0 (f)\n              3 LOAD_NAME                1 (args)\n              6 CALL_FUNCTION_VAR        0 (0 positional, 0 keyword pair)\n              9 RETURN_VALUE\n", nil, ""},
+	{"f(*args, **kwargs)", "eval", &py.Code{
+		Argcount:       0,
+		Kwonlyargcount: 0,
+		Nlocals:        0,
+		Stacksize:      3,
+		Flags:          64,
+		Code:           "\x65\x00\x00\x65\x01\x00\x65\x02\x00\x8e\x00\x00\x53",
+		Consts:         []py.Object{},
+		Names:          []string{"f", "args", "kwargs"},
+		Varnames:       []string{},
+		Freevars:       []string{},
+		Cellvars:       []string{},
+		Filename:       "<string>",
+		Name:           "<module>",
+		Firstlineno:    1,
+		Lnotab:         "",
+	}, "  1           0 LOAD_NAME                0 (f)\n              3 LOAD_NAME                1 (args)\n              6 LOAD_NAME                2 (kwargs)\n              9 CALL_FUNCTION_VAR_KW     0 (0 positional, 0 keyword pair)\n             12 RETURN_VALUE\n", nil, ""},
+	{"f(**kwargs)", "eval", &py.Code{
+		Argcount:       0,
+		Kwonlyargcount: 0,
+		Nlocals:        0,
+		Stacksize:      2,
+		Flags:          64,
+		Code:           "\x65\x00\x00\x65\x01\x00\x8d\x00\x00\x53",
+		Consts:         []py.Object{},
+		Names:          []string{"f", "kwargs"},
+		Varnames:       []string{},
+		Freevars:       []string{},
+		Cellvars:       []string{},
+		Filename:       "<string>",
+		Name:           "<module>",
+		Firstlineno:    1,
+		Lnotab:         "",
+	}, "  1           0 LOAD_NAME                0 (f)\n              3 LOAD_NAME                1 (kwargs)\n              6 CALL_FUNCTION_KW         0 (0 positional, 0 keyword pair)\n              9 RETURN_VALUE\n", nil, ""},
+	{"f(a, b, *args)", "eval", &py.Code{
+		Argcount:       0,
+		Kwonlyargcount: 0,
+		Nlocals:        0,
+		Stacksize:      4,
+		Flags:          64,
+		Code:           "\x65\x00\x00\x65\x01\x00\x65\x02\x00\x65\x03\x00\x8c\x02\x00\x53",
+		Consts:         []py.Object{},
+		Names:          []string{"f", "a", "b", "args"},
+		Varnames:       []string{},
+		Freevars:       []string{},
+		Cellvars:       []string{},
+		Filename:       "<string>",
+		Name:           "<module>",
+		Firstlineno:    1,
+		Lnotab:         "",
+	}, "  1           0 LOAD_NAME                0 (f)\n              3 LOAD_NAME                1 (a)\n              6 LOAD_NAME                2 (b)\n              9 LOAD_NAME                3 (args)\n             12 CALL_FUNCTION_VAR        2 (2 positional, 0 keyword pair)\n             15 RETURN_VALUE\n", nil, ""},
+	{"f(a, b, *args, d=e, **kwargs)", "eval", &py.Code{
+		Argcount:       0,
+		Kwonlyargcount: 0,
+		Nlocals:        0,
+		Stacksize:      7,
+		Flags:          64,
+		Code:           "\x65\x00\x00\x65\x01\x00\x65\x02\x00\x64\x00\x00\x65\x03\x00\x65\x04\x00\x65\x05\x00\x8e\x02\x01\x53",
+		Consts:         []py.Object{py.String("d")},
+		Names:          []string{"f", "a", "b", "e", "args", "kwargs"},
+		Varnames:       []string{},
+		Freevars:       []string{},
+		Cellvars:       []string{},
+		Filename:       "<string>",
+		Name:           "<module>",
+		Firstlineno:    1,
+		Lnotab:         "",
+	}, "  1           0 LOAD_NAME                0 (f)\n              3 LOAD_NAME                1 (a)\n              6 LOAD_NAME                2 (b)\n              9 LOAD_CONST               0 ('d')\n             12 LOAD_NAME                3 (e)\n             15 LOAD_NAME                4 (args)\n             18 LOAD_NAME                5 (kwargs)\n             21 CALL_FUNCTION_VAR_KW   258 (2 positional, 1 keyword pair)\n             24 RETURN_VALUE\n", nil, ""},
+	{"f(a, d=e, **kwargs)", "eval", &py.Code{
+		Argcount:       0,
+		Kwonlyargcount: 0,
+		Nlocals:        0,
+		Stacksize:      5,
+		Flags:          64,
+		Code:           "\x65\x00\x00\x65\x01\x00\x64\x00\x00\x65\x02\x00\x65\x03\x00\x8d\x01\x01\x53",
+		Consts:         []py.Object{py.String("d")},
+		Names:          []string{"f", "a", "e", "kwargs"},
+		Varnames:       []string{},
+		Freevars:       []string{},
+		Cellvars:       []string{},
+		Filename:       "<string>",
+		Name:           "<module>",
+		Firstlineno:    1,
+		Lnotab:         "",
+	}, "  1           0 LOAD_NAME                0 (f)\n              3 LOAD_NAME                1 (a)\n              6 LOAD_CONST               0 ('d')\n              9 LOAD_NAME                2 (e)\n             12 LOAD_NAME                3 (kwargs)\n             15 CALL_FUNCTION_KW       257 (1 positional, 1 keyword pair)\n             18 RETURN_VALUE\n", nil, ""},
 }
diff --git a/compile/compile_test.go b/compile/compile_test.go
@@ -122,9 +122,10 @@ func TestCompile(t *testing.T) {
 			code, ok := codeObj.(*py.Code)
 			if !ok {
 				t.Errorf("%s: Expecting *py.Code but got %T", test.in, codeObj)
+			} else {
+				//t.Logf("Testing %q", test.in)
+				EqCode(t, test.in, test.out, code)
 			}
-			//t.Logf("Testing %q", test.in)
-			EqCode(t, test.in, test.out, code)
 		}
 	}
 }
diff --git a/compile/make_compile_test.py b/compile/make_compile_test.py
@@ -144,6 +144,18 @@
     ('''for a in b: pass''', "exec"),
     ('''for a in b:\n if a:\n  break\n c = e\nelse: c = d\n''', "exec"),
     ('''for a in b:\n if a:\n  continue\n c = e\nelse: c = d\n''', "exec"),
+    # call
+    ('''f()''', "eval"),
+    ('''f(a)''', "eval"),
+    ('''f(a,b,c)''', "eval"),
+    ('''f(A=a)''', "eval"),
+    ('''f(a, b, C=d, D=d)''', "eval"),
+    ('''f(*args)''', "eval"),
+    ('''f(*args, **kwargs)''', "eval"),
+    ('''f(**kwargs)''', "eval"),
+    ('''f(a, b, *args)''', "eval"),
+    ('''f(a, b, *args, d=e, **kwargs)''', "eval"),
+    ('''f(a, d=e, **kwargs)''', "eval"),
 
 ]
 

Original file line number	Diff line number	Diff line change
`@@ -122,9 +122,10 @@ func TestCompile(t *testing.T) {`
`122`	`122`	`code, ok := codeObj.(*py.Code)`
`123`	`123`	`if !ok {`
`124`	`124`	`t.Errorf("%s: Expecting *py.Code but got %T", test.in, codeObj)`
	`125`	`+ } else {`
	`126`	`+ //t.Logf("Testing %q", test.in)`
	`127`	`+ EqCode(t, test.in, test.out, code)`
`125`	`128`	`}`
`126`		`- //t.Logf("Testing %q", test.in)`
`127`		`- EqCode(t, test.in, test.out, code)`
`128`	`129`	`}`
`129`	`130`	`}`
`130`	`131`	`}`