fix parsing multiline strings in jass

fix was only in jurst grammar
wurstscript · Jan 15, 2020 · 04f2567 · 04f2567
1 parent c8b3a7e
commit 04f2567
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/de.peeeq.wurstscript/src/main/antlr/de/peeeq/wurstscript/antlr/Jass.g4 b/de.peeeq.wurstscript/src/main/antlr/de/peeeq/wurstscript/antlr/Jass.g4
@@ -188,7 +188,7 @@ JASS_ELSEIF: 'elseif';
 NL: [\r\n]+;
 ID: [a-zA-Z_][a-zA-Z0-9_]* ;
 
-STRING: '"' ( EscapeSequence | ~('\\'|'"'|'\r'|'\n') )* '"';
+STRING: '"' ( EscapeSequence | ~('\\'|'"'|'\r'|'\n') | NL )* '"';
 REAL: [0-9]+ '.' [0-9]* | '.'[0-9]+;
 
 fragment HexInt: '$'[0-9a-fA-F]+ | '0'[xX][0-9a-fA-F]+;

diff --git a/de.peeeq.wurstscript/src/test/java/tests/wurstscript/tests/JurstTests.java b/de.peeeq.wurstscript/src/test/java/tests/wurstscript/tests/JurstTests.java
@@ -185,6 +185,35 @@ public void returnDetection() { // #641
         testJurstWithJass(true, false, jassCode, jurstCode);
     }
 
+    @Test
+    public void jassMultilineString() {
+        String jassCode =
+            "function bar takes string s returns nothing\r" +
+            "endfunction\r" +
+            "function foo takes integer a returns integer\r" +
+            "   call bar(\"Bla\r" +
+            "string continues\")\r" +
+            "	if false then\r" +
+            "		return a\r" +
+            "	else\r" +
+            "		return -a\r" +
+            "	endif\r" +
+            "endfunction\r";
+
+
+        String jurstCode = Utils.string(
+            "package test",
+            "	native testSuccess()",
+            "	init",
+            "		if foo(1) == -1",
+            "			testSuccess()",
+            "		end",
+            "	end",
+            "endpackage");
+
+        testJurstWithJass(true, false, jassCode, jurstCode);
+    }
+
     @Test
     public void testBigJassScript() throws IOException {
         String jassCode = new String(Files.readAllBytes(Paths.get(Utils.getResourceFile("test.j"))));