Make py.Iter and make FOR_ITER use it

ncw · ncw · commit 7619a72d3229 · 2013-11-26T17:44:04.000Z
diff --git a/py/internal.go b/py/internal.go
@@ -220,3 +220,15 @@ func SetAttr(self Object, keyObj Object, value Object) Object {
 	// FIXME should be TypeError
 	panic(fmt.Sprintf("TypeError: attribute name must be string, not '%s'", self.Type().Name))
 }
+
+// Call __next__ for the python object
+func Next(self Object) Object {
+	if I, ok := self.(I__next__); ok {
+		return I.M__next__()
+	} else if res, ok := TypeCall0(self, "__next__"); ok {
+		return res
+	}
+
+	// FIXME should be TypeError
+	panic(fmt.Sprintf("TypeError: '%s' object is not iterable", self.Type().Name))
+}
diff --git a/vm/eval.go b/vm/eval.go
@@ -667,8 +667,7 @@ func do_FOR_ITER(vm *Vm, delta int32) {
 		}
 	}()
 	// FIXME should look in instance dictionary
-	it := vm.TOP().(py.I__next__)
-	r := it.M__next__()
+	r := py.Next(vm.TOP())
 	vm.PUSH(r)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -667,8 +667,7 @@ func do_FOR_ITER(vm *Vm, delta int32) {`
`667`	`667`	`}`
`668`	`668`	`}()`
`669`	`669`	`// FIXME should look in instance dictionary`
`670`		`- it := vm.TOP().(py.I__next__)`
`671`		`- r := it.M__next__()`
	`670`	`+ r := py.Next(vm.TOP())`
`672`	`671`	`vm.PUSH(r)`
`673`	`672`	`}`
`674`	`673`