support continue and more lua fixes!

Author: Frotty

de.peeeq.wurstscript/parserspec/wurstscript.parseq

@@ -147,6 +147,7 @@ ControlflowStatement =
 	  CompoundStatement
 	| StmtReturn(@ignoreForEquality de.peeeq.wurstscript.parser.WPos source, OptExpr returnedObj)
 	| StmtExitwhen(@ignoreForEquality de.peeeq.wurstscript.parser.WPos source, Expr cond)
+	| StmtContinue(de.peeeq.wurstscript.parser.WPos source)
 
 CompoundStatement =
 	  StmtIf(@ignoreForEquality de.peeeq.wurstscript.parser.WPos source, Expr cond, WStatements thenBlock, WStatements elseBlock, boolean hasElse)
@@ -1073,4 +1074,4 @@ Annotation.getAnnotationType()
 
 Annotation.getAnnotationMessage()
     returns String
-    implemented by de.peeeq.wurstscript.attributes.Annotations.annotationMessage
+    implemented by de.peeeq.wurstscript.attributes.Annotations.annotationMessage

de.peeeq.wurstscript/src/main/antlr/de/peeeq/wurstscript/antlr/Wurst.g4

@@ -260,6 +260,7 @@ statement:
 		 | stmtSet (externalLambda|NL)
 		 | stmtReturn (externalLambda|NL)
 		 | stmtBreak NL
+		 | stmtContinue NL
 		 | stmtSkip NL
 		 | expr (externalLambda|NL)
 		 | stmtIf
@@ -435,6 +436,7 @@ forIteratorLoop:
 
 
 stmtBreak:'break';
+stmtContinue:'continue';
 stmtSkip:'skip';
 
 
@@ -461,6 +463,7 @@ WHILE: 'while';
 FOR: 'for';
 IN: 'in';
 BREAK: 'break';
+CONTINUE: 'continue';
 NEW: 'new';
 NULL: 'null';
 PACKAGE: 'package';

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/requests/HoverInfo.java

@@ -422,6 +422,11 @@ public List<Either<String, MarkedString>> case_StmtExitwhen(StmtExitwhen stmtExi
             return string("exitwhen: exits the current loop when the condition is true.");
         }
 
+        @Override
+        public List<Either<String, MarkedString>> case_StmtContinue(StmtContinue stmtContinue) {
+            return string("continue: skips the rest of the current loop iteration.");
+        }
+
         @Override
         public List<Either<String, MarkedString>> case_ConstructorDef(ConstructorDef constr) {
             return description(constr);

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/requests/MapRequest.java

@@ -27,6 +27,7 @@
 import de.peeeq.wurstscript.jassprinter.JassPrinter;
 import de.peeeq.wurstscript.luaAst.LuaCompilationUnit;
 import de.peeeq.wurstscript.parser.WPos;
+import de.peeeq.wurstscript.translation.lua.translation.LuaTranslator;
 import de.peeeq.wurstscript.utils.LineOffsets;
 import de.peeeq.wurstscript.utils.Utils;
 import net.moonlightflower.wc3libs.bin.app.W3I;
@@ -167,6 +168,7 @@ protected File compileMap(File projectFolder, WurstGui gui, Optional<File> mapCo
                 luaCode.get().print(sb, 0);
 
                 String compiledMapScript = sb.toString();
+                LuaTranslator.assertNoLeakedHashtableNativeCalls(compiledMapScript);
                 File buildDir = getBuildDir();
                 File outFile = new File(buildDir, BUILD_COMPILED_LUA_NAME);
                 Files.write(compiledMapScript.getBytes(Charsets.UTF_8), outFile);

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/WurstKeywords.java

@@ -1,7 +1,7 @@
 package de.peeeq.wurstscript;
 
 public class WurstKeywords {
-    public static final String[] KEYWORDS = new String[]{"class", "return", "if", "else", "while", "for", "in", "break", "new", "null",
+    public static final String[] KEYWORDS = new String[]{"class", "return", "if", "else", "while", "for", "in", "break", "continue", "new", "null",
             "package", "endpackage", "function", "returns", "public", "private", "protected", "import", "initlater", "native", "nativetype", "extends",
             "interface", "implements", "module", "use", "abstract", "static", "thistype", "override", "immutable", "it", "array", "and",
             "or", "not", "this", "construct", "ondestroy", "destroy", "type", "constant", "endfunction", "nothing", "init", "castTo",

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/attributes/DescriptionHtml.java

@@ -326,6 +326,10 @@ public static String description(StmtSkip stmtSkip) {
         return "The skip statement does nothing. Just skip this line.";
     }
 
+    public static String description(StmtContinue stmtContinue) {
+        return "continue: Skips the rest of the current loop iteration.";
+    }
+
     public static String description(StmtWhile stmtWhile) {
         return "While Statement: Repeat while the condition is true.";
     }

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/attributes/Flow.java

@@ -59,6 +59,17 @@ public static List<WStatement> getNext(StmtExitwhen s) {
         return next;
     }
 
+    public static List<WStatement> getNext(StmtContinue s) {
+        LoopStatement loop = getParentLoopStatement(s);
+        if (loop == null) {
+            s.addError("Continue statements must be used inside a loop.");
+            return Collections.emptyList();
+        }
+        List<WStatement> next = loop.attrAfterBodyStatements();
+        setPrevios(s, next);
+        return next;
+    }
+
     private static boolean isConstantBool(Expr cond, boolean value) {
         return cond instanceof ExprBoolVal && ((ExprBoolVal) cond).getValB() == value;
     }

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/attributes/InitOrder.java

@@ -7,6 +7,7 @@
 import de.peeeq.wurstscript.ast.WImport;
 import de.peeeq.wurstscript.ast.WImports;
 import de.peeeq.wurstscript.ast.WPackage;
+import de.peeeq.wurstscript.ast.WurstModel;
 
 import java.util.*;
 
@@ -19,7 +20,8 @@ public static ImmutableList<WPackage> initDependencies(WPackage p) {
         packages.addAll(p.attrImportedPackagesTransitive());
 
         // add config package if it exists:
-        WPackage configPackage = p.getModel().attrConfigOverridePackages().get(p);
+        WurstModel model = safeModel(p);
+        WPackage configPackage = model == null ? null : model.attrConfigOverridePackages().get(p);
         if (configPackage != null) {
             packages.add(configPackage);
         }
@@ -70,8 +72,11 @@ private static String getCyclicDependencyString(List<WPackage> callStack, WPacka
         StringBuilder msg = new StringBuilder();
         Map<WPackage, WPackage> configuredPackage = new HashMap<>();
         if (considerConfig) {
-            for (WPackage configured : imported.getModel().attrConfigOverridePackages().keySet()) {
-                configuredPackage.put(imported.getModel().attrConfigOverridePackages().get(configured), configured);
+            WurstModel model = safeModel(imported);
+            if (model != null) {
+                for (WPackage configured : model.attrConfigOverridePackages().keySet()) {
+                    configuredPackage.put(model.attrConfigOverridePackages().get(configured), configured);
+                }
             }
         }
         for (WPackage p : callStack) {
@@ -152,7 +157,8 @@ private static void addCollectImportedPackage(List<WPackage> callStack, WPackage
             // add imports of configured package to config package
             // that way cyclic dependencies are checked for the config package and errors will be reported for the config package
             if (considerConfig) {
-                WPackage configPackage = p.getModel().attrConfigOverridePackages().get(imported);
+                WurstModel model = safeModel(p);
+                WPackage configPackage = model == null ? null : model.attrConfigOverridePackages().get(imported);
                 if (configPackage != null && configPackage != p) {
                     if (configPackage == callStack.get(0)) {
                         reportCyclicDependency(callStack, configPackage, reportedErrors, useWarnings);
@@ -168,6 +174,10 @@ private static void addCollectImportedPackage(List<WPackage> callStack, WPackage
     }
 
     private static void collectImportedPackages(List<WPackage> callStack, WPackage p, Collection<WPackage> result, Set<String> reportedErrors, boolean considerConfig, boolean useWarnings) {
+        if (safeModel(p) == null) {
+            // Detached packages can occur transiently in language-server workflows; ignore them for init-order analysis.
+            return;
+        }
         callStack.add(p);
         addCollectImportedPackage(callStack, p, result, p.getImports(), reportedErrors, considerConfig, useWarnings);
         /*
@@ -178,7 +188,8 @@ private static void collectImportedPackages(List<WPackage> callStack, WPackage p
         even though the configured package will be initialized after the config package.
          */
         if (considerConfig) {
-            for (Map.Entry<WPackage, WPackage> e : p.getModel().attrConfigOverridePackages().entrySet()) {
+            WurstModel model = safeModel(p);
+            if (model != null) for (Map.Entry<WPackage, WPackage> e : model.attrConfigOverridePackages().entrySet()) {
                 if (e.getValue().equals(p)) {
                     addCollectImportedPackage(callStack, e.getKey(), result, e.getKey().getImports(), reportedErrors, considerConfig, useWarnings);
                 }
@@ -187,4 +198,12 @@ private static void collectImportedPackages(List<WPackage> callStack, WPackage p
         callStack.remove(callStack.size() - 1);
     }
 
+    private static WurstModel safeModel(WPackage p) {
+        try {
+            return p.getModel();
+        } catch (Error ignored) {
+            return null;
+        }
+    }
+
 }

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/attributes/prettyPrint/PrettyPrinter.java

@@ -1146,6 +1146,12 @@ public static void prettyPrint(StmtSkip e, Spacer spacer, StringBuilder sb, int
         sb.append("\n");
     }
 
+    public static void prettyPrint(StmtContinue e, Spacer spacer, StringBuilder sb, int indent) {
+        printIndent(sb, indent);
+        sb.append("continue");
+        sb.append("\n");
+    }
+
     public static void prettyPrint(StmtWhile e, Spacer spacer, StringBuilder sb, int indent) {
         printIndent(sb, indent);
         sb.append("while");

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/parser/antlr/AntlrWurstParseTreeTransformer.java

@@ -747,6 +747,8 @@ private WStatement transformStatement2(StatementContext s) {
         } else if (s.stmtBreak() != null) {
             return Ast
                     .StmtExitwhen(source(s), Ast.ExprBoolVal(source(s), true));
+        } else if (s.stmtContinue() != null) {
+            return Ast.StmtContinue(source(s));
         } else if (s.stmtSkip() != null) {
             return Ast.StmtSkip(source(s));
         } else if (s.stmtSwitch() != null) {