Make Iter() and Iterator type and implement GET_ITER, FOR_ITER, BUILD_LIST/TUPLE

Author: ncw

py/arithmetic.go

@@ -133,6 +133,22 @@ func MakeFloat(a Object) Object{
 panic(fmt.Sprintf("TypeError: unsupported operand type(s) for float: '%s'", a.Type().Name))
 }
 
+// Iter the python Object returning an Object
+//
+// Will raise TypeError if Iter can't be run on this object
+funcIter(aObject) Object{
+
+ifA, ok:=a.(I__iter__); ok{
+res:=A.M__iter__()
+ifres!=NotImplemented{
+returnres
+ }
+ }
+
+// FIXME should be TypeError
+panic(fmt.Sprintf("TypeError: unsupported operand type(s) for iter: '%s'", a.Type().Name))
+}
+
 // Add two python objects together returning an Object
 //
 // Will raise TypeError if can't be add can't be run on these objects

py/gen.go

@@ -40,6 +40,7 @@ var data = Data{
 {Name: "complex", Title: "MakeComplex", Operator: "complex", Unary: true, Conversion: "Complex"},
 {Name: "int", Title: "MakeInt", Operator: "int", Unary: true, Conversion: "Int"},
 {Name: "float", Title: "MakeFloat", Operator: "float", Unary: true, Conversion: "Float"},
+{Name: "iter", Title: "Iter", Operator: "iter", Unary: true},
  },
 BinaryOps: Ops{
 {Name: "add", Title: "Add", Operator: "+", Binary: true},

py/list.go

@@ -10,3 +10,25 @@ type List []Object
 func (oList) Type() *Type{
 returnListType
 }
+
+func (tList) M__len__() Object{
+returnInt(len(t))
+}
+
+func (tList) M__bool__() Object{
+iflen(t) >0{
+returnTrue
+ }
+returnFalse
+}
+
+func (tList) M__iter__() Object{
+returnNewIterator(t)
+}
+
+// Check interface is satisfied
+var_I__len__=List(nil)
+var_I__bool__=List(nil)
+var_I__iter__=List(nil)
+
+// var _ richComparison = List(nil)

py/py.go

@@ -546,6 +546,17 @@ type I__iter__ interface{
 M__iter__() Object
 }
 
+// The next method for iterators
+typeI__next__interface{
+M__next__() Object
+}
+
+// Interface all iterators must satisfy
+typeI_iteratorinterface{
+I__iter__
+I__next__
+}
+
 // Called (if present) by the reversed() built-in to implement reverse
 // iteration. It should return a new iterator object that iterates
 // over all the objects in the container in reverse order.

py/tuple.go

@@ -10,3 +10,25 @@ type Tuple []Object
 func (oTuple) Type() *Type{
 returnTupleType
 }
+
+func (tTuple) M__len__() Object{
+returnInt(len(t))
+}
+
+func (tTuple) M__bool__() Object{
+iflen(t) >0{
+returnTrue
+ }
+returnFalse
+}
+
+func (tTuple) M__iter__() Object{
+returnNewIterator(t)
+}
+
+// Check interface is satisfied
+var_I__len__=Tuple(nil)
+var_I__bool__=Tuple(nil)
+var_I__iter__=Tuple(nil)
+
+// var _ richComparison = Tuple(nil)

vm/eval.go

@@ -87,27 +87,27 @@ func do_DUP_TOP_TWO(vm *Vm, arg int32){
 
 // Implements TOS = +TOS.
 funcdo_UNARY_POSITIVE(vm*Vm, argint32){
-vm.PUSH(py.Pos(vm.POP()))
+vm.SET_TOP(py.Pos(vm.TOP()))
 }
 
 // Implements TOS = -TOS.
 funcdo_UNARY_NEGATIVE(vm*Vm, argint32){
-vm.PUSH(py.Neg(vm.POP()))
+vm.SET_TOP(py.Neg(vm.TOP()))
 }
 
 // Implements TOS = not TOS.
 funcdo_UNARY_NOT(vm*Vm, argint32){
-vm.PUSH(py.Not(vm.POP()))
+vm.SET_TOP(py.Not(vm.TOP()))
 }
 
 // Implements TOS = ~TOS.
 funcdo_UNARY_INVERT(vm*Vm, argint32){
-vm.PUSH(py.Invert(vm.POP()))
+vm.SET_TOP(py.Invert(vm.TOP()))
 }
 
 // Implements TOS = iter(TOS).
 funcdo_GET_ITER(vm*Vm, argint32){
-vm.NotImplemented("GET_ITER", arg)
+vm.SET_TOP(py.Iter(vm.TOP()))
 }
 
 // Binary operations remove the top of the stack (TOS) and the second
@@ -315,7 +315,10 @@ func do_PRINT_EXPR(vm *Vm, arg int32){
 
 // Terminates a loop due to a break statement.
 funcdo_BREAK_LOOP(vm*Vm, argint32){
+// Jump
 vm.frame.Lasti=vm.frame.Block.Handler
+// Reset the stack (FIXME?)
+vm.stack=vm.stack[:vm.frame.Block.Level]
 vm.frame.PopBlock()
 }
 
@@ -505,7 +508,13 @@ func do_LOAD_NAME(vm *Vm, namei int32){
 // Creates a tuple consuming count items from the stack, and pushes
 // the resulting tuple onto the stack.
 funcdo_BUILD_TUPLE(vm*Vm, countint32){
-vm.NotImplemented("BUILD_TUPLE", count)
+tuple:=make(py.Tuple, count)
+p:=len(vm.stack) -int(count)
+fori:=rangetuple{
+tuple[i] =vm.stack[p+i]
+ }
+vm.DROPN(int(count))
+vm.PUSH(tuple)
 }
 
 // Works as BUILD_TUPLE, but creates a set.
@@ -515,7 +524,13 @@ func do_BUILD_SET(vm *Vm, count int32){
 
 // Works as BUILD_TUPLE, but creates a list.
 funcdo_BUILD_LIST(vm*Vm, countint32){
-vm.NotImplemented("BUILD_LIST", count)
+list:=make(py.List, count)
+p:=len(vm.stack) -int(count)
+fori:=rangelist{
+list[i] =vm.stack[p+i]
+ }
+vm.DROPN(int(count))
+vm.PUSH(list)
 }
 
 // Pushes a new dictionary object onto the stack. The dictionary is
@@ -619,7 +634,21 @@ func do_JUMP_ABSOLUTE(vm *Vm, target int32){
 // iterator indicates it is exhausted TOS is popped, and the bytecode
 // counter is incremented by delta.
 funcdo_FOR_ITER(vm*Vm, deltaint32){
-vm.NotImplemented("FOR_ITER", delta)
+deferfunc(){
+ifr:=recover(); r!=nil{
+ifex, ok:=r.(*py.Exception); ok&&ex==py.StopIteration{
+// StopIteration raised
+vm.DROP()
+vm.frame.Lasti+=delta
+ } else{
+// re-raise the panic
+panic(r)
+ }
+ }
+ }()
+it:=vm.TOP().(*py.Iterator)
+r:=it.M__next__()
+vm.PUSH(r)
 }
 
 // Loads the global named co_names[namei] onto the stack.