Cheap and nasty BINARY_ADD, fix LOAD_GLOBAL and vm.call()

ncw · ncw · commit 21cd9f2ff967 · 2013-11-19T12:06:37.000Z
diff --git a/vm/eval.go b/vm/eval.go
@@ -141,6 +141,11 @@ func do_BINARY_MODULO(vm *Vm, arg int32) {
 
 // Implements TOS = TOS1 + TOS.
 func do_BINARY_ADD(vm *Vm, arg int32) {
+	// FIXME not a very good implementation ;-)
+	b := vm.POP().(py.Int64)
+	a := vm.POP().(py.Int64)
+	c := a + b
+	vm.PUSH(py.Int64(c))
 	vm.NotImplemented("BINARY_ADD", arg)
 }
 
@@ -533,8 +538,8 @@ func do_FOR_ITER(vm *Vm, delta int32) {
 
 // Loads the global named co_names[namei] onto the stack.
 func do_LOAD_GLOBAL(vm *Vm, namei int32) {
-	// FIXME what if global doesn't exist?
-	vm.PUSH(vm.globals[vm.co.Names[namei]])
+	// FIXME this is looking in local scope too - is that correct?
+	vm.PUSH(vm.lookup(vm.co.Names[namei]))
 }
 
 // Pushes a block for a loop onto the block stack. The block spans
diff --git a/vm/lookup.go b/vm/lookup.go
@@ -50,11 +50,17 @@ func (vm *Vm) lookupMethod(name string) py.Callable {
 
 // Calls function fn with args and kwargs
 //
+// fn can be a string in which case it will be looked up or something
+// which satisfies the py.Callable interface
+//
 // kwargs is a sequence of name, value pairs
 func (vm *Vm) call(fn py.Object, args []py.Object, kwargs []py.Object) py.Object {
 	fmt.Printf("Call %v with args = %v, kwargs = %v\n", fn, args, kwargs)
-	fn_name := string(fn.(py.String))
-	method := vm.lookupMethod(fn_name)
+	method, ok := fn.(py.Callable)
+	if !ok {
+		fn_name := string(fn.(py.String))
+		method = vm.lookupMethod(fn_name)
+	}
 	self := py.None // FIXME should be the module
 	if len(kwargs) > 0 {
 		// Convert kwargs into dictionary
