vm: implement in, not in; py: changed args to Iterate

ncw · ncw · commit a20d4436d079 · 2015-05-23T10:29:19.000+01:00
diff --git a/py/bytes.go b/py/bytes.go
@@ -104,12 +104,13 @@ func BytesFromObject(x Object) Bytes {
 	}
 	// Otherwise iterate through the whatever converting it into ints
 	b := Bytes{}
-	Iterate(x, func(item Object) {
+	Iterate(x, func(item Object) bool {
 		value := IndexInt(item)
 		if value < 0 || value >= 256 {
 			panic(ExceptionNewf(ValueError, "bytes must be in range(0, 256)"))
 		}
 		b = append(b, byte(value))
+		return false
 	})
 	return b
 }
diff --git a/py/list.go b/py/list.go
@@ -76,6 +76,14 @@ func (l *List) Extend(items []Object) {
 	l.Items = append(l.Items, items...)
 }
 
+// Extends the list with the sequence passed in
+func (l *List) ExtendSequence(seq Object) {
+	Iterate(seq, func(item Object) bool {
+		l.Append(item)
+		return false
+	})
+}
+
 // Len of list
 func (l *List) Len() int {
 	return len(l.Items)
@@ -115,9 +123,7 @@ func (l *List) M__setitem__(key, value Object) Object {
 			tail := make([]Object, len(tailSlice))
 			copy(tail, tailSlice)
 			l.Items = l.Items[:start]
-			Iterate(value, func(item Object) {
-				l.Append(item)
-			})
+			l.ExtendSequence(value)
 			l.Items = append(l.Items, tail...)
 		} else {
 			newItems := SequenceTuple(value)
diff --git a/py/sequence.go b/py/sequence.go
@@ -11,8 +11,9 @@ func SequenceTuple(v Object) Tuple {
 		return Tuple(x.Items).Copy()
 	default:
 		t := Tuple{}
-		Iterate(v, func(item Object) {
+		Iterate(v, func(item Object) bool {
 			t = append(t, item)
+			return false
 		})
 		return t
 	}
@@ -27,9 +28,7 @@ func SequenceList(v Object) *List {
 		return x.Copy()
 	default:
 		l := NewList()
-		Iterate(v, func(item Object) {
-			l.Append(item)
-		})
+		l.ExtendSequence(v)
 		return l
 	}
 }
@@ -61,25 +60,34 @@ func Next(self Object) (obj Object, finished Object) {
 }
 
 // Create an iterator from obj and iterate the iterator until finished
-// calling the function passed in on each object
-func Iterate(obj Object, fn func(Object)) {
+// calling the function passed in on each object.  The iteration is
+// finished if the function returns true
+func Iterate(obj Object, fn func(Object) bool) {
 	// Some easy cases
 	switch x := obj.(type) {
 	case Tuple:
 		for _, item := range x {
-			fn(item)
+			if fn(item) {
+				break
+			}
 		}
 	case *List:
 		for _, item := range x.Items {
-			fn(item)
+			if fn(item) {
+				break
+			}
 		}
 	case String:
 		for _, item := range x {
-			fn(String(item))
+			if fn(String(item)) {
+				break
+			}
 		}
 	case Bytes:
 		for _, item := range x {
-			fn(Int(item))
+			if fn(Int(item)) {
+				break
+			}
 		}
 	default:
 		iterator := Iter(obj)
@@ -88,7 +96,9 @@ func Iterate(obj Object, fn func(Object)) {
 			if finished != nil {
 				break
 			}
-			fn(item)
+			if fn(item) {
+				break
+			}
 		}
 	}
 }
@@ -103,3 +113,15 @@ func Send(self, value Object) Object {
 
 	panic(ExceptionNewf(TypeError, "'%s' object doesn't have send method", self.Type().Name))
 }
+
+// SequenceContains returns True if obj is in seq
+func SequenceContains(seq, obj Object) (found bool) {
+	Iterate(seq, func(item Object) bool {
+		if Eq(item, obj) == True {
+			found = true
+			return true
+		}
+		return false
+	})
+	return
+}
diff --git a/vm/eval.go b/vm/eval.go
@@ -943,9 +943,9 @@ func do_COMPARE_OP(vm *Vm, opname int32) {
 	case PyCmp_GE:
 		r = py.Ge(a, b)
 	case PyCmp_IN:
-		vm.NotImplemented("COMPARE_OP PyCmp_IN", opname)
+		r = py.NewBool(py.SequenceContains(b, a))
 	case PyCmp_NOT_IN:
-		vm.NotImplemented("COMPARE_OP PyCmp_NOT_IN", opname)
+		r = py.NewBool(!py.SequenceContains(b, a))
 	case PyCmp_IS:
 		r = py.NewBool(a == b)
 	case PyCmp_IS_NOT:
diff --git a/vm/tests/ops.py b/vm/tests/ops.py
@@ -87,8 +87,8 @@
 assert _10 > _2
 assert _10 >= _2
 assert _2 >= _2
-# FIXME in
-# FIXME not in
+assert _2 in (1,2,3)
+assert _100 not in (1,2,3)
 assert True is True
 assert True is not False
 # FIXME EXC_MATCH

Original file line number	Diff line number	Diff line change
`@@ -104,12 +104,13 @@ func BytesFromObject(x Object) Bytes {`
`104`	`104`	`}`
`105`	`105`	`// Otherwise iterate through the whatever converting it into ints`
`106`	`106`	`b := Bytes{}`
`107`		`- Iterate(x, func(item Object) {`
	`107`	`+ Iterate(x, func(item Object) bool {`
`108`	`108`	`value := IndexInt(item)`
`109`	`109`	`if value < 0 \|\| value >= 256 {`
`110`	`110`	`panic(ExceptionNewf(ValueError, "bytes must be in range(0, 256)"))`
`111`	`111`	`}`
`112`	`112`	`b = append(b, byte(value))`
	`113`	`+ return false`
`113`	`114`	`})`
`114`	`115`	`return b`
`115`	`116`	`}`