vm: class definitions

Author: ncw

vm/eval.go

@@ -1163,7 +1163,19 @@ func do_LOAD_DEREF(vm *Vm, i int32){
 // class bodies.
 funcdo_LOAD_CLASSDEREF(vm*Vm, iint32){
 defervm.CheckException()
-vm.NotImplemented("LOAD_CLASSDEREF", i)
+name, _:=_var_name(vm, i)
+
+// Lookup in locals
+ifobj, ok:=vm.frame.Locals[name]; ok{
+vm.PUSH(obj)
+ }
+// If that failed look at the cell
+res:=vm.frame.CellAndFreeVars[i].(*py.Cell).Get()
+ifres==nil{
+unboundDeref(vm, i)
+ } else{
+vm.PUSH(res)
+ }
 }
 
 // Stores TOS into the cell contained in slot i of the cell and free

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
 }

vm/tests/class.py

@@ -0,0 +1,48 @@
+#!/usr/bin/env python3.4
+
+# Test class definitions
+
+classC1:
+"Test 1"
+defmethod1(self, x):
+"method1"
+returnx+1
+defmethod2(self, m2):
+"method2"
+returnself.method1(m2)+m2
+
+c=C1()
+assertc.method1(1) ==2
+assertc.method2(1) ==3
+
+classC2:
+"Test 2"
+_VAR=1
+VAR=_VAR+1
+defmethod1(self, x):
+"method1"
+returnself.VAR+x
+defmethod2(self, m2):
+"method2"
+returnself.method1(m2)+m2
+
+c=C2()
+assertc.method1(1) ==3
+assertc.method2(1) ==4
+
+# CLASS_DEREF
+
+# FIXME corner cases in CLASS_DEREF
+defclassderef(y):
+# FIXME should work on parameter of classderef - y - but doesn't
+x=y
+classDeRefTest:
+VAR=x
+defmethod1(self, x):
+"method1"
+returnself.VAR+x
+returnDeRefTest
+x=classderef(1)
+c=x()
+assertc.method1(1) ==2
+

vm/tests/functions.py

@@ -150,3 +150,6 @@ def fn12(*args,a=2,b=3,**kwargs) -> "RET":
 returnargs
 # FIXME this blows up: assert fn12() == ()
 # FIXME check kwargs passing
+
+
+#FIXME decorators