Make iterate create the iterator itself

ncw · ncw · commit f72f3476847c · 2013-12-07T14:07:45.000Z
diff --git a/py/internal.go b/py/internal.go
@@ -298,8 +298,9 @@ func Next(self Object) Object{
 	panic(ExceptionNewf(TypeError, "'%s' object is not iterable", self.Type().Name))
 }
 
-// Iterate the iterator until finished calling the function passed in on each object
-func Iterate(iterator Object, fn func(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)){
 	defer func(){
 		if r := recover(); r != nil{
 			if IsException(StopIteration, r){
@@ -309,9 +310,30 @@ func Iterate(iterator Object, fn func(Object)){
 			}
 		}
 	}()
-	for{
-		item := Next(iterator)
-		fn(item)
+	// Some easy cases
+	switch x := obj.(type){
+	case Tuple:
+		for _, item := range x{
+			fn(item)
+		}
+	case *List:
+		for _, item := range x.Items{
+			fn(item)
+		}
+	case String:
+		for _, item := range x{
+			fn(String(item))
+		}
+	case Bytes:
+		for _, item := range x{
+			fn(Int(item))
+		}
+	default:
+		iterator := Iter(obj)
+		for{
+			item := Next(iterator)
+			fn(item)
+		}
 	}
 }
 
diff --git a/py/sequence.go b/py/sequence.go
@@ -11,7 +11,7 @@ func SequenceTuple(v Object) Tuple{
 		return Tuple(x.Items).Copy()
 	default:
 		t := Tuple{}
-		Iterate(Iter(v), func(item Object){
+		Iterate(v, func(item Object){
 			t = append(t, item)
 		})
 		return t
@@ -27,7 +27,7 @@ func SequenceList(v Object) *List{
 		return x.Copy()
 	default:
 		l := NewList()
-		Iterate(Iter(v), func(item Object){
+		Iterate(v, func(item Object){
 			l.Append(item)
 		})
 		return l

-Original file line number
+Diff line change
 panic(ExceptionNewf(TypeError, "'%s' object is not iterable", self.Type().Name))
+}
 -// Iterate the iterator until finished calling the function passed in on each object
 -funcIterate(iteratorObject, fnfunc(Object)){
 +// Create an iterator from obj and iterate the iterator until finished
 +// calling the function passed in on each object
 +funcIterate(objObject, fnfunc(Object)){
 deferfunc(){
 ifr:=recover(); r!=nil{
 ifIsException(StopIteration, r){
+ }
+ }
  }()
 -for{
 -item:=Next(iterator)
 -fn(item)
 +// Some easy cases
 +switchx:=obj.(type){
 +caseTuple:
 +for_, item:=rangex{
 +fn(item)
 + }
 +case*List:
 +for_, item:=rangex.Items{
 +fn(item)
 + }
 +caseString:
 +for_, item:=rangex{
 +fn(String(item))
 + }
 +caseBytes:
 +for_, item:=rangex{
 +fn(Int(item))
 + }
 +default:
 +iterator:=Iter(obj)
 +for{
 +item:=Next(iterator)
 +fn(item)
 + }
+ }
+}
-Original file line number
+Diff line change
 returnTuple(x.Items).Copy()
 default:
 t:=Tuple{}
 -Iterate(Iter(v), func(itemObject){
 +Iterate(v, func(itemObject){
 t=append(t, item)
  })
 returnt
 returnx.Copy()
 default:
 l:=NewList()
 -Iterate(Iter(v), func(itemObject){
 +Iterate(v, func(itemObject){
 l.Append(item)
  })
 returnl