Update ANTLR reader to consume all input in readAll. Fixes #244

Convex-Dev · Dec 15, 2023 · 6bcf124 · 6bcf124
1 parent 42dec36
commit 6bcf124
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/convex-core/src/main/antlr4/convex/core/lang/reader/antlr/Convex.g4 b/convex-core/src/main/antlr4/convex/core/lang/reader/antlr/Convex.g4
@@ -12,7 +12,9 @@ form
 
 singleForm: form EOF;
 
-forms: (form | commented) * ;
+forms: (form | commented) *;
+
+allForms: forms EOF;
 
 dataStructure:
 	list | vector | set | map;

diff --git a/convex-core/src/main/java/convex/core/lang/reader/AntlrReader.java b/convex-core/src/main/java/convex/core/lang/reader/AntlrReader.java
@@ -36,6 +36,7 @@
 import convex.core.lang.reader.antlr.ConvexListener;
 import convex.core.lang.reader.antlr.ConvexParser;
 import convex.core.lang.reader.antlr.ConvexParser.AddressContext;
+import convex.core.lang.reader.antlr.ConvexParser.AllFormsContext;
 import convex.core.lang.reader.antlr.ConvexParser.BlobContext;
 import convex.core.lang.reader.antlr.ConvexParser.BoolContext;
 import convex.core.lang.reader.antlr.ConvexParser.CharacterContext;
@@ -440,8 +441,16 @@ public void exitSingleForm(SingleFormContext ctx) {
 			// Nothing
 		}
 
+		@Override
+		public void enterAllForms(AllFormsContext ctx) {
+			// Nothing	
+
+		}
 
-
+		@Override
+		public void exitAllForms(AllFormsContext ctx) {
+			// Nothing	
+		}
 
 	}
 
@@ -500,7 +509,7 @@ public static ParseTree getParseTree(CharStream cs) {
 		CommonTokenStream tokens = new CommonTokenStream(lexer);
 		ConvexParser parser = new ConvexParser(tokens);
 		parser.removeErrorListeners();
-		ParseTree tree = parser.forms();
+		ParseTree tree = parser.allForms();
 		return tree;
 	}
 

diff --git a/convex-core/src/test/java/convex/core/lang/ReaderTest.java b/convex-core/src/test/java/convex/core/lang/ReaderTest.java
@@ -122,6 +122,11 @@ public void testColonIssue462() {
 		assertThrows(ParseException.class,()->Reader.readAll(s462));
 
 	}
+
+	@Test
+	public void testExtraInputRegression244() {
+		assertThrows(ParseException.class,()->Reader.readAll("'(42))))"));
+	}
 
 	@Test
 	public void testSymbolsRegressionCases() {