Merge pull request #17 from levno-710/develop

Author: levno-710

src/prometheus/ast.lua

@@ -248,18 +248,19 @@ function Ast.WhileStatement(body, condition, parentScope)
 	}
 end
 
-function Ast.ForInStatement(scope, vars, expressions, body)
+function Ast.ForInStatement(scope, vars, expressions, body, parentScope)
 	return {
 		kind = AstKind.ForInStatement,
 		scope = scope,
 		ids = vars,
 		vars = vars,
 		expressions = expressions,
 		body = body,
+		parentScope = parentScope,
 	}
 end
 
-function Ast.ForStatement(scope, id, initialValue, finalValue, incrementBy, body)
+function Ast.ForStatement(scope, id, initialValue, finalValue, incrementBy, body, parentScope)
 	return {
 		kind = AstKind.ForStatement,
 		scope = scope,
@@ -268,6 +269,7 @@ function Ast.ForStatement(scope, id, initialValue, finalValue, incrementBy, body
 		finalValue = finalValue,
 		incrementBy = incrementBy,
 		body = body,
+		parentScope = parentScope,
 	}
 end
 

src/prometheus/compiler_secure/compiler.lua

@@ -371,6 +371,9 @@ function Compiler:compileStatement(statement)
         ir:instruction(IR:JMP(endNop));
         ir:instruction(IR:PUSHTEMPSTACK());
 
+        statement.__endnop = endNop;
+        statement.__startnop = fskip;
+
         table.insert(self.scopeStack, self.currentScope);
         self.currentScope = statement.body.scope;
 
@@ -398,6 +401,9 @@ function Compiler:compileStatement(statement)
         local fskip = IR:FORINSKIP();
         local endNop   = IR:NOP();
 
+        statement.__endnop = endNop;
+        statement.__endnop = endNop;
+
         ir:instruction(fskip);
         ir:instruction(IR:JMP(endNop));
 

src/prometheus/parser.lua

@@ -355,7 +355,7 @@ function Parser:statement(scope, currentLoop)
 				incrementBy = self:expression(scope);
 			end
 
-			local stat = Ast.ForStatement(forScope, varId, initialValue, finalValue, incrementBy, nil);
+			local stat = Ast.ForStatement(forScope, varId, initialValue, finalValue, incrementBy, nil, scope);
 			forScope:enableVariable(varId);
 			expect(self, TokenKind.Keyword, "do");
 			stat.body = self:block(nil, stat, forScope);
@@ -376,8 +376,8 @@ function Parser:statement(scope, currentLoop)
 		-- 	end
 		self:enableNameList(forScope, ids);
 		expect(self, TokenKind.Keyword, "do");
-		local stat = Ast.ForInStatement(forScope, ids, expressions, nil);
-		stat.body = self:block(nil, true, forScope);
+		local stat = Ast.ForInStatement(forScope, ids, expressions, nil, scope);
+		stat.body = self:block(nil, stat, forScope);
 		expect(self, TokenKind.Keyword, "end");
 
 		return stat;