Minor fix in continue statement

Ruk33 · May 25, 2016 · f0f8047 · f0f8047
1 parent 1386702
commit f0f8047
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/src/main/java/com/ruke/vrjassc/translator/expression/LoopStatement.java b/src/main/java/com/ruke/vrjassc/translator/expression/LoopStatement.java
@@ -1,6 +1,7 @@
 package com.ruke.vrjassc.translator.expression;
 
 import com.ruke.vrjassc.vrjassc.symbol.BuiltInTypeSymbol;
+import com.ruke.vrjassc.vrjassc.symbol.Modifier;
 import com.ruke.vrjassc.vrjassc.symbol.Symbol;
 
 /**
@@ -19,6 +20,7 @@ protected void registerContinue() {
 
 		this._continue = new Symbol("vr_c_" + LOOP_CONTINUE_COUNTER, null, null);
 		this._continue.setType(new BuiltInTypeSymbol("boolean", null, null));
+		this._continue.setModifier(Modifier.LOCAL, true);
 
 		this.add(new VariableStatement(this._continue, null));
 

diff --git a/src/test/java/com/ruke/vrjassc/vrjassc/autocomplete/AutoCompleteTest.java b/src/test/java/com/ruke/vrjassc/vrjassc/autocomplete/AutoCompleteTest.java
@@ -4,7 +4,6 @@
 import com.ruke.vrjassc.vrjassc.symbol.Symbol;
 import org.junit.Assert;
 import org.junit.Test;
-import sun.java2d.SunGraphicsEnvironment;
 
 import java.util.ArrayList;
 

diff --git a/src/test/java/com/ruke/vrjassc/vrjassc/compiler/FunctionTest.java b/src/test/java/com/ruke/vrjassc/vrjassc/compiler/FunctionTest.java
@@ -12,9 +12,9 @@ public class FunctionTest extends TestHelper {
 	public void continueStatement() {
 		String code =
 			"function foo\n" +
-				"local integer i\n" +
-				"set i = 1\n" +
+				"local integer i = 0\n" +
 				"loop\n" +
+					"set i = i + 1\n" +
 					"exitwhen i > 9\n" +
 					"if i == 3 then\n" +
 						"continue\n" +
@@ -23,20 +23,19 @@ public void continueStatement() {
 						"continue\n" +
 					"endif\n" +
 					"call BJDebugMsg(I2S(i))\n" +
-					"set i = i + 1\n" +
 				"endloop\n" +
 			"end";
 
 		String expected =
 			"globals\n" +
 			"endglobals\n" +
 			"function foo takes nothing returns nothing\n" +
-				"boolean vr_c_0=false\n" +
+				"local boolean vr_c_0=false\n" +
 				"local integer i=0\n" +
-				"set i=1\n" +
 				"loop\n" +
 					"set vr_c_0=false\n" +
 					"loop\n" +
+						"set i=i+1\n" +
 						"exitwhen i>9\n" +
 						"if i==3 then\n" +
 							"set vr_c_0=true\n" +
@@ -47,7 +46,6 @@ public void continueStatement() {
 							"exitwhen true\n" +
 						"endif\n" +
 						"call BJDebugMsg(I2S(i))\n" +
-						"set i=i+1\n" +
 					"endloop\n" +
 					"exitwhen vr_c_0==false\n" +
 				"endloop\n" +