To-be-closed variable in 'for' loop separated from the state

The variable to be closed in a generic 'for' loop now is the
4th value produced in the loop initialization, instead of being
the loop state (the 2nd value produced). That allows a loop to
use a state with a '__toclose' metamethod but do not close it.
(As an example, 'f:lines()' might use the file 'f' as a state
for the loop, but it should not close the file when the loop ends.)

1 files changed, 3 insertions, 3 deletions

diff --git a/lopcodes.h b/lopcodes.h
index 5a38f767..7bb83a1e 100644
--- a/lopcodes.h
+++ b/lopcodes.h
@@ -279,9 +279,9 @@ OP_FORLOOP,/*	A Bx	R(A)+=R(A+2);
                         if R(A) <?= R(A+1) then { pc-=Bx; R(A+3)=R(A) } */
 OP_FORPREP,/*   A Bx    R(A)-=R(A+2); pc+=Bx                            */
 
-OP_TFORPREP,/*  A Bx    create upvalue A; pc+=Bx                        */
-OP_TFORCALL,/*  A C     R(A+3), ... ,R(A+2+C) := R(A)(R(A+1), R(A+2));  */
-OP_TFORLOOP,/*  A Bx    if R(A+1) ~= nil then { R(A)=R(A+1); pc -= Bx } */
+OP_TFORPREP,/*  A Bx    create upvalue for R(A + 3); pc+=Bx             */
+OP_TFORCALL,/*  A C     R(A+4), ... ,R(A+3+C) := R(A)(R(A+1), R(A+2));  */
+OP_TFORLOOP,/*  A Bx    if R(A+2) ~= nil then { R(A)=R(A+2); pc -= Bx } */
 
 OP_SETLIST,/*   A B C   R(A)[(C-1)*FPF+i] := R(A+i), 1 <= i <= B        */