Another attempt to fix infinite loop in foreach

zsx · zsx · commit d4b51635983c · 2015-03-06T14:04:12.000-05:00
Without this commit, this causes a busy loop:

&gt;&gt; foreach [a:] [1 2 3][ print mold a]

Fix CC#1751
diff --git a/src/core/n-loop.c b/src/core/n-loop.c
@@ -400,7 +400,7 @@
 				else SET_NONE(vars);
 			}
 
-			// var spec is WORD:
+			// var spec is SET_WORD:
 			else if (IS_SET_WORD(words)) {
 				if (ANY_OBJECT(value) || IS_MAP(value)) {
 					*vars = *value;
@@ -413,6 +413,7 @@
 			}
 			else Trap_Arg(words);
 		}
+		if (index == rindex) index++; //the word block has only set-words: foreach [a:] [1 2 3][]
 
 		ds = Do_Blk(body, 0);
 

Original file line number	Diff line number	Diff line change
`@@ -400,7 +400,7 @@`
`400`	`400`	`else SET_NONE(vars);`
`401`	`401`	`}`
`402`	`402`
`403`		`- // var spec is WORD:`
	`403`	`+ // var spec is SET_WORD:`
`404`	`404`	`else if (IS_SET_WORD(words)) {`
`405`	`405`	`if (ANY_OBJECT(value) \|\| IS_MAP(value)) {`
`406`	`406`	`vars = value;`
`@@ -413,6 +413,7 @@`
`413`	`413`	`}`
`414`	`414`	`else Trap_Arg(words);`
`415`	`415`	`}`
	`416`	`+ if (index == rindex) index++; //the word block has only set-words: foreach [a:] [1 2 3][]`
`416`	`417`
`417`	`418`	`ds = Do_Blk(body, 0);`
`418`	`419`