Fix: Repeat until scope

Chg: Version

Author: neolithos

NeoLua.NuGet/common.targets

@@ -14,7 +14,7 @@
 		<AssemblyVersion>5.3.0.0</AssemblyVersion>
 		<FileVersion>1.3.11.0</FileVersion>
 
-		<VersionAdd>beta.0</VersionAdd>
+		<!--<VersionAdd>beta.0</VersionAdd>-->
 		<SimpleVersionPattern>^(\d+)\.(\d+)\.(\d+)</SimpleVersionPattern>
 		<SimpleVersion>$([System.Text.RegularExpressions.Regex]::Match($(FileVersion), $(SimpleVersionPattern)))</SimpleVersion>
 

NeoLua.Test/ControlStructures.cs

@@ -356,6 +356,12 @@ public void Control18()
 			);
 		}
 
+		[TestMethod]
+		public void Control19()
+		{
+			TestCode(GetLines("Lua.Control19.lua"), 4);
+		}
+
 		[TestMethod]
 		public void TestVariableAssign01()
 		{

NeoLua.Test/Lua/Control19.lua

@@ -0,0 +1,12 @@
+local i : int = 0;
+repeat
+	local l : string;
+	if i < 3 then
+	   l = "test " .. i;
+	else
+	   l = nil;
+	end;
+	print(l);
+	i = i + 1;
+until l == nil;
+return i;

NeoLua.Test/NeoLua.Test.csproj

@@ -24,6 +24,7 @@
 	  <None Remove="Lua\Control10.lua" />
 	  <None Remove="Lua\Control11.lua" />
 	  <None Remove="Lua\Control12.lua" />
+	  <None Remove="Lua\Control19.lua" />
 	  <None Remove="Lua\Coroutines01.lua" />
 	  <None Remove="Lua\EnvDynamicCall01.lua" />
 	  <None Remove="Lua\Function08.lua" />
@@ -49,6 +50,7 @@
 	  <EmbeddedResource Include="Lua\Control10.lua" />
 	  <EmbeddedResource Include="Lua\Control11.lua" />
 	  <EmbeddedResource Include="Lua\Control12.lua" />
+	  <EmbeddedResource Include="Lua\Control19.lua" />
 	  <EmbeddedResource Include="Lua\Coroutines01.lua" />
 	  <EmbeddedResource Include="Lua\EnvDynamicCall01.lua" />
 	  <EmbeddedResource Include="Lua\Function08.lua" />

NeoLua/Parser.cs

@@ -1938,7 +1938,7 @@ private static void ParseRepeatLoop(Scope scope, ILuaLexer code)
 			FetchToken(LuaToken.KwUntil, code);
 			loopScope.AddExpression(
 				Expression.IfThenElse(
-					ConvertExpression(scope.Runtime, code.Current, ParseExpression(scope, code, InvokeResult.Object, scope.EmitExpressionDebug), typeof(bool)),
+					ConvertExpression(scope.Runtime, code.Current, ParseExpression(loopScope, code, InvokeResult.Object, loopScope.EmitExpressionDebug), typeof(bool)),
 					Expression.Empty(),
 					Expression.Goto(loopScope.ContinueLabel)
 				)