Merge pull request #2064 from usethesource/recovery/end-of-line-token

Added '\n' end matcher so end-of-line is also seen as skip terminator
usethesource · Oct 31, 2024 · 79267ce · 79267ce
2 parents 93b4205 + 377cb8c
commit 79267ce
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 45 deletions.
diff --git a/src/org/rascalmpl/library/lang/rascal/tests/concrete/recovery/PicoRecoveryTests.rsc b/src/org/rascalmpl/library/lang/rascal/tests/concrete/recovery/PicoRecoveryTests.rsc
@@ -72,8 +72,9 @@ test bool picoMissingSemi() = checkRecovery(#Program, "begin declare input : nat
           od
           input := input - 1
       od
-end", ["input := input - 1
-      od"]);
+end", ["od
+end", "input := input - 1
+"]);
 
 test bool picoTypoSmall() = checkRecovery(#Program, "begin declare;
   while input do

diff --git a/src/org/rascalmpl/library/lang/rascal/tests/concrete/recovery/RascalRecoveryTests.rsc b/src/org/rascalmpl/library/lang/rascal/tests/concrete/recovery/RascalRecoveryTests.rsc
@@ -16,11 +16,6 @@ module lang::rascal::tests::concrete::recovery::RascalRecoveryTests
 
 import lang::rascal::\syntax::Rascal;
 
-import ParseTree;
-import util::ErrorRecovery;
-import IO;
-import util::Maybe;
-
 import lang::rascal::tests::concrete::recovery::RecoveryTestSupport;
 
 bool debugging = false;
@@ -56,40 +51,34 @@ test bool rascalIfMissingExpr() = checkRecovery(#FunctionDeclaration, "void f(){
 
 test bool rascalIfBodyEmpty() = checkRecovery(#start[Module], "module A void f(){1;} void g(){if(1){}} void h(){1;}", ["{", "} "]);
 
-// Not working yet:
-/*
-test bool rascalMissingOpeningParen() {
-    Tree t = parseRascal("module A void f){} void g() { }");
-
-    println("error text: <getErrorText(findFirstError(t))>");
-    return getErrorText(findFirstError(t)) == "a}";
-}
-
-test bool rascalFunFunMissingCloseParen() {
-    Tree t = parseRascal("module A void f(){void g({}} void h(){}");
-
-    println("error text: <getErrorText(findFirstError(t))>");
-    return getErrorText(findFirstError(t)) == "a}";
-}
-
-test bool rascalIfMissingOpeningParen() {
-    Tree t = parseRascal("module A void f(){if 1){}}", visualize=false);
-
-    println("error text: <getErrorText(findFirstError(t))>");
-    return getErrorText(findFirstError(t)) == ";";
-}
-
-test bool rascalIfMissingCloseParen() {
-    Tree t = parseRascal("module A void f(){if(1{}}", visualize=false);
-
-    println("error text: <getErrorText(findFirstError(t))>");
-    return getErrorText(findFirstError(t)) == ";";
-}
-
-test bool rascalIfMissingSemi() {
-    Tree t = parseRascal("module A void f(){if (true) {a}}");
-
-    println("error text: <getErrorText(findFirstError(t))>");
-    return getErrorText(findFirstError(t)) == ";";
-}
-*/
+test bool rascalMissingOpeningParen() = checkRecovery(#start[Module], 
+"module A
+void f) {
+    }
+    void g() { 
+    }", ["}
+",") {"]);
+
+test bool rascalFunFunMissingCloseParen() = checkRecovery(#start[Module], "module A void f(){void g({}} void h(){}", ["void g({}", "} "]);
+
+test bool rascalIfMissingOpeningParen() = checkRecovery(#start[Module], 
+"module A void f() {
+  if 1) {
+    1;
+  }}", ["1) "]);
+
+test bool rascalIfMissingCloseParen() = checkRecovery(#start[Module], 
+"module A
+void f() {
+  if (1 {
+    1;
+  }}", ["1 "]);
+
+test bool rascalIfMissingSemi() = checkRecovery(#start[Module], 
+"module A
+void f() {
+  if (true) {
+    a
+  }
+}", ["{", "}
+"]);
diff --git a/src/org/rascalmpl/library/lang/rascal/tests/concrete/recovery/RecoveryTestSupport.rsc b/src/org/rascalmpl/library/lang/rascal/tests/concrete/recovery/RecoveryTestSupport.rsc
@@ -495,7 +495,7 @@ bool checkErrors(Tree t, list[str] expectedErrors) {
     for (error <- errors) {
         str errorText = getErrorText(error);
         if (errorText notin expectedErrors) {
-            println("Unexpected error: <errorText>");
+            println("Unexpected error: \'<errorText>\'");
             println("All errors found:");
             printErrors(errors);
             return false;

diff --git a/src/org/rascalmpl/parser/uptr/recovery/ToTokenRecoverer.java b/src/org/rascalmpl/parser/uptr/recovery/ToTokenRecoverer.java
@@ -184,6 +184,11 @@ private List<InputMatcher> findEndMatchers(AbstractStackNode<IConstructor> stack
 		AbstractStackNode<IConstructor>[] prod = stackNode.getProduction();
 		addEndMatchers(prod, prod.length-1, matchers, new HashSet<>());
 
+		IConstructor parentProduction = stackNode.getParentProduction();
+		if (parentProduction != null && ProductionAdapter.isContextFree(parentProduction)) {
+			matchers.add(new LiteralMatcher("\n"));
+		}
+
 		return matchers;
 	}