Fix multiple entry points causing infinite loop

Botffy · Oct 23, 2019 · 1b5a9eb · 1b5a9eb
1 parent c0a971e
commit 1b5a9eb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/main/java/ppke/itk/xplang/lang/RootParser.java b/src/main/java/ppke/itk/xplang/lang/RootParser.java
@@ -80,10 +80,11 @@ private static void parseForwardDeclaration(Parser parser, State state) throws P
     }
 
     private static void parseProgram(Parser parser, State state) throws ParseError {
+        Program program = ProgramParser.parse(parser);
         if (state.program != null) {
-            throw new ParseError(parser.actual().location(), ErrorCode.ENTRY_POINT_ALREADY_DEFINED);
+            throw new ParseError(program.location(), ErrorCode.ENTRY_POINT_ALREADY_DEFINED);
         }
-        state.program = ProgramParser.parse(parser);
+        state.program = program;
     }
 
 

diff --git a/src/test/resources/plang-strict/parse-error/020_program_defined_twice.plang b/src/test/resources/plang-strict/parse-error/020_program_defined_twice.plang
@@ -0,0 +1,8 @@
+**#Two programs in one file
+**FirstErrorLoc:6,1
+program t
+  ki: "hello"
+program_vége
+program t2
+  ki: "world"
+program_vége