Handle RecognitionException in Flux varDef. (#421)

Author: blackwinter

metafacture-flux/src/main/antlr/org/metafacture/flux/parser/Flux.g

@@ -60,6 +60,12 @@ varDef
     ->
       ^(ASSIGN Identifier exp)
   ;
+catch [RecognitionException re] {
+    reportError(re);
+    recover(input,re);
+    retval.tree = (CommonTree)adaptor.errorNode(input, retval.start, input.LT(-1), re);
+    throw re;
+}
 
 flow
   :

metafacture-flux/src/test/java/org/metafacture/flux/FluxGrammarTest.java

@@ -90,7 +90,7 @@ public void shouldReplaceJavaEscapeSequences()
     }
 
     @Test(expected = RuntimeException.class)
-    public void issue421_shouldThrowRuntimeExceptionWhenSemicolonIsMissing()
+    public void issue421_shouldThrowRuntimeExceptionWhenSemicolonInFlowIsMissing()
         throws RecognitionException, IOException {
         final String script = "\"test\"|print";
         try {
@@ -101,6 +101,18 @@ public void issue421_shouldThrowRuntimeExceptionWhenSemicolonIsMissing()
         }
     }
 
+    @Test(expected = RuntimeException.class)
+    public void issue421_shouldThrowRuntimeExceptionWhenSemicolonInVarDefIsMissing()
+        throws RecognitionException, IOException {
+        final String script = "foo=42";
+        try {
+            FluxCompiler.compile(createInputStream(script), emptyMap());
+        } catch (RuntimeException re) {
+            assertEquals("mismatched input '<EOF>' expecting ';' in Flux", re.getMessage());
+            throw re;
+        }
+    }
+
     private ByteArrayInputStream createInputStream(String script) {
         return new ByteArrayInputStream(script.getBytes(StandardCharsets.UTF_8));
     }