vm: class definitions

ncw · ncw · commit bf0f5234b0d2 · 2015-05-16T17:17:57.000+01:00
diff --git a/vm/eval.go b/vm/eval.go
@@ -1163,7 +1163,19 @@ func do_LOAD_DEREF(vm *Vm, i int32) {
 // class bodies.
 func do_LOAD_CLASSDEREF(vm *Vm, i int32) {
 	defer vm.CheckException()
-	vm.NotImplemented("LOAD_CLASSDEREF", i)
+	name, _ := _var_name(vm, i)
+
+	// Lookup in locals
+	if obj, ok := vm.frame.Locals[name]; ok {
+		vm.PUSH(obj)
+	}
+	// If that failed look at the cell
+	res := vm.frame.CellAndFreeVars[i].(*py.Cell).Get()
+	if res == nil {
+		unboundDeref(vm, i)
+	} else {
+		vm.PUSH(res)
+	}
 }
 
 // Stores TOS into the cell contained in slot i of the cell and free
diff --git a/vm/jumptable.go b/vm/jumptable.go
@@ -138,5 +138,5 @@ func init() {
 	jumpTable[SET_ADD] = do_SET_ADD
 	jumpTable[MAP_ADD] = do_MAP_ADD
 
-	// jumpTable[LOAD_CLASSDEREF] = do_LOAD_CLASSDEREF
+	jumpTable[LOAD_CLASSDEREF] = do_LOAD_CLASSDEREF
 }
diff --git a/vm/tests/class.py b/vm/tests/class.py
@@ -0,0 +1,48 @@
+#!/usr/bin/env python3.4
+
+# Test class definitions
+
+class C1:
+    "Test 1"
+    def method1(self, x):
+        "method1"
+        return x+1
+    def method2(self, m2):
+        "method2"
+        return self.method1(m2)+m2
+
+c = C1()
+assert c.method1(1) == 2
+assert c.method2(1) == 3
+
+class C2:
+    "Test 2"
+    _VAR = 1
+    VAR = _VAR + 1
+    def method1(self, x):
+        "method1"
+        return self.VAR + x
+    def method2(self, m2):
+        "method2"
+        return self.method1(m2)+m2
+
+c = C2()
+assert c.method1(1) == 3
+assert c.method2(1) == 4
+
+# CLASS_DEREF
+
+# FIXME corner cases in CLASS_DEREF
+def classderef(y):
+    # FIXME should work on parameter of classderef - y - but doesn't
+    x = y
+    class DeRefTest:
+        VAR = x
+        def method1(self, x):
+            "method1"
+            return self.VAR+x
+    return DeRefTest
+x = classderef(1)
+c = x()
+assert c.method1(1) == 2
+
diff --git a/vm/tests/functions.py b/vm/tests/functions.py
@@ -150,3 +150,6 @@ def fn12(*args,a=2,b=3,**kwargs) -> "RET":
     return args
 # FIXME this blows up: assert fn12() == ()
 # FIXME check kwargs passing
+
+
+#FIXME decorators

Original file line number	Diff line number	Diff line change
`@@ -138,5 +138,5 @@ func init() {`
`138`	`138`	`jumpTable[SET_ADD] = do_SET_ADD`
`139`	`139`	`jumpTable[MAP_ADD] = do_MAP_ADD`
`140`	`140`
`141`		`- // jumpTable[LOAD_CLASSDEREF] = do_LOAD_CLASSDEREF`
	`141`	`+ jumpTable[LOAD_CLASSDEREF] = do_LOAD_CLASSDEREF`
`142`	`142`	`}`