Work around circular import - now calls python functions

ncw · ncw · commit af9a450760e0 · 2013-11-19T09:28:19.000Z
diff --git a/py/function.go b/py/function.go
@@ -15,6 +15,11 @@ import (
 	"fmt"
 )
 
+var (
+	// Function pointer for vm call to avoid circular reference
+	VmRun func(StringDict, StringDict, *Code) (error)
+)
+
 // A python Function object
 type Function struct {
 	Code        *Code      // A code object, the __code__ attribute
@@ -86,9 +91,9 @@ func NewFunction(code *Code, globals StringDict, qualname String) *Function {
 // Call the function with the given arguments
 func (f *Function) Call(self Object, args Tuple) Object {
 	fmt.Printf("call f %#v with %v and %v\n", f, self, args)
-	if len(f.Code.Varnames) < len(args) {
-		panic("Too many args!")
+	if len(args) != int(f.Code.Argcount) {
 		// FIXME don't know how to deal with default args
+		panic("Wrong number of arguments")
 	}
 	// FIXME not sure this is right!
 	// Copy the args into the local variables
@@ -97,7 +102,8 @@ func (f *Function) Call(self Object, args Tuple) Object {
 		locals[string(f.Code.Varnames[i].(String))] = args[i]
 	}
 	fmt.Printf("locals = %v\n", locals)
-	// FIXME return vm.Run(f.Globals, locals, f.Code)
+	// FIXME return?
+	VmRun(f.Globals, locals, f.Code)
 	return None
 }
 
diff --git a/vm/eval.go b/vm/eval.go
@@ -744,7 +744,12 @@ func do_CALL_FUNCTION_VAR_KW(vm *Vm, argc int32) {
 
 // NotImplemented
 func (vm *Vm) NotImplemented(name string, arg int32) {
-	fmt.Printf("%s %d Not implemented\n", name, arg)
+	fmt.Printf("%s %d NOT IMPLEMENTED\n", name, arg)
+}
+
+// Poke the vm.Run into py
+func init() {
+	py.VmRun = Run
 }
 
 // Run the virtual machine on the code object in the module
