Fix LOAD_NAME and remove incorrect workaround

ncw · ncw · commit bc5ac4a200a1 · 2013-11-27T23:51:02.000Z
diff --git a/vm/eval.go b/vm/eval.go
@@ -557,7 +557,8 @@ func do_LOAD_CONST(vm *Vm, consti int32) {
 
 // Pushes the value associated with co_names[namei] onto the stack.
 func do_LOAD_NAME(vm *Vm, namei int32) {
-	vm.PUSH(py.String(vm.frame.Code.Names[namei]))
+	fmt.Printf("LOAD_NAME %v\n", vm.frame.Code.Names[namei])
+	vm.PUSH(vm.frame.Lookup(vm.frame.Code.Names[namei]))
 }
 
 // Creates a tuple consuming count items from the stack, and pushes
@@ -952,11 +953,6 @@ func (vm *Vm) Call(fnObj py.Object, args []py.Object, kwargsTuple []py.Object) {
 		}
 	}
 
-	// Lookup if string
-	if fn, ok := fnObj.(py.String); ok {
-		fnObj = vm.frame.Lookup(string(fn))
-	}
-
 	// Call the function pushing the return on the stack
 	vm.PUSH(py.Call(fnObj, args, kwargs))
 }

Original file line number	Diff line number	Diff line change
`@@ -557,7 +557,8 @@ func do_LOAD_CONST(vm *Vm, consti int32) {`
`557`	`557`
`558`	`558`	`// Pushes the value associated with co_names[namei] onto the stack.`
`559`	`559`	`func do_LOAD_NAME(vm *Vm, namei int32) {`
`560`		`- vm.PUSH(py.String(vm.frame.Code.Names[namei]))`
	`560`	`+ fmt.Printf("LOAD_NAME %v\n", vm.frame.Code.Names[namei])`
	`561`	`+ vm.PUSH(vm.frame.Lookup(vm.frame.Code.Names[namei]))`
`561`	`562`	`}`
`562`	`563`
`563`	`564`	`// Creates a tuple consuming count items from the stack, and pushes`
`@@ -952,11 +953,6 @@ func (vm *Vm) Call(fnObj py.Object, args []py.Object, kwargsTuple []py.Object) {`
`952`	`953`	`}`
`953`	`954`	`}`
`954`	`955`
`955`		`- // Lookup if string`
`956`		`- if fn, ok := fnObj.(py.String); ok {`
`957`		`- fnObj = vm.frame.Lookup(string(fn))`
`958`		`- }`
`959`		`-`
`960`	`956`	`// Call the function pushing the return on the stack`
`961`	`957`	`vm.PUSH(py.Call(fnObj, args, kwargs))`
`962`	`958`	`}`