py: Fix errors are suppressed in generator comprehensions

corona10 · corona10 · commit bddb908118b5 · 2018-11-29T01:52:32.000+09:00
Sequence.Iterate does not handle exceptions.
Iterate() should return error except StopIteration.
diff --git a/py/sequence.go b/py/sequence.go
@@ -93,10 +93,13 @@ func Iterate(obj Object, fn func(Object) bool) error{
 			return err
 		}
 		for{
-			item, finished := Next(iterator)
-			if finished != nil{
+			item, err := Next(iterator)
+			if err == StopIteration{
 				break
 			}
+			if err != nil{
+				return err
+			}
 			if fn(item){
 				break
 			}
diff --git a/vm/tests/generators.py b/vm/tests/generators.py
@@ -25,6 +25,14 @@ def g2():
 yield i
 assert tuple(g2()) == (0,1,2,3,4)
 
+doc="generator 3"
+ok = False
+try:
+ list(ax for x in range(10))
+except NameError:
+ ok = True
+assert ok, "NameError not raised"
+
 doc="yield from"
 def g3():
 yield "potato"

Original file line number	Diff line number	Diff line change
`@@ -93,10 +93,13 @@ func Iterate(obj Object, fn func(Object) bool) error{`
`93`	`93`	`returnerr`
`94`	`94`	`}`
`95`	`95`	`for{`
`96`		`-item, finished:=Next(iterator)`
`97`		`-iffinished!=nil{`
	`96`	`+item, err:=Next(iterator)`
	`97`	`+iferr==StopIteration{`
`98`	`98`	`break`
`99`	`99`	`}`
	`100`	`+iferr!=nil{`
	`101`	`+returnerr`
	`102`	`+ }`
`100`	`103`	`iffn(item){`
`101`	`104`	`break`
`102`	`105`	`}`
-Original file line number
+Diff line change
 yieldi
 asserttuple(g2()) == (0,1,2,3,4)
 +doc="generator 3"
 +ok=False
 +try:
 +list(axforxinrange(10))
 +exceptNameError:
 +ok=True
 +assertok, "NameError not raised"
++
 doc="yield from"
 defg3():
 yield"potato"