Added check for 'regular' ambiguities when allowAmbiguities=false but…

… allowRecovery=true
usethesource · Nov 11, 2024 · ae9aa76 · ae9aa76
1 parent e1a9cd9
commit ae9aa76
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/org/rascalmpl/library/util/ErrorRecovery.java b/src/org/rascalmpl/library/util/ErrorRecovery.java
@@ -217,4 +217,8 @@ private void collectAmbErrors(ITree amb, IListWriter errors, Set<IConstructor> p
             collectErrors((ITree) alt, errors, processedTrees);
         }
     }
+
+    public void checkForRegularAmbiguities(IConstructor parseForest) {
+        disambiguate(parseForest, false, new HashMap<>());
+    }
 }
diff --git a/src/org/rascalmpl/values/RascalFunctionValueFactory.java b/src/org/rascalmpl/values/RascalFunctionValueFactory.java
@@ -583,7 +583,15 @@ private ITree parseObject(String methodName, ISourceLocation location, char[] in
             if (allowRecovery) {
                 recoverer = new ToTokenRecoverer(uri, parserInstance, new StackNodeIdDispenser(parserInstance));
             }
-            return (ITree) parserInstance.parse(methodName, uri, input, exec, new DefaultNodeFlattener<>(), new UPTRNodeFactory(allowRecovery || allowAmbiguity), recoverer, debugListener);
+            ITree parseForest = (ITree) parserInstance.parse(methodName, uri, input, exec, new DefaultNodeFlattener<>(), new UPTRNodeFactory(allowRecovery || allowAmbiguity), recoverer, debugListener);
+
+            if (!allowAmbiguity && allowRecovery) {
+                // Check for 'regular' (non-error) ambiguities
+                RascalValueFactory valueFactory = (RascalValueFactory) ValueFactoryFactory.getValueFactory();
+                new ErrorRecovery(valueFactory).checkForRegularAmbiguities(parseForest);
+            }
+
+            return parseForest;
         }
     }