Merge branch 'main' into error-recovery

usethesource · Oct 3, 2024 · 57862c6 · 57862c6
2 parents 5cf6b57 + fc72dc7
commit 57862c6
Show file tree

Hide file tree

Showing 42 changed files with 59 additions and 1,072 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>org.rascalmpl</groupId>
     <artifactId>rascal</artifactId>
-    <version>0.40.8-SNAPSHOT</version>
+    <version>0.40.9-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <scm>
@@ -32,7 +32,7 @@
         <exec.mainClass>org.rascalmpl.shell.RascalShell</exec.mainClass>
         <rascal.test.memory>2</rascal.test.memory>
         <maven.compiler.release>11</maven.compiler.release>
-        <rascal-maven.version>0.28.1</rascal-maven.version>
+        <rascal-maven.version>0.28.2</rascal-maven.version>
     </properties>
 
     <licenses>

diff --git a/src/org/rascalmpl/library/lang/rascal/tests/basic/Functions.rsc b/src/org/rascalmpl/library/lang/rascal/tests/basic/Functions.rsc
@@ -568,6 +568,7 @@ test bool innerAndOuterFunctionUseSameParameterName2(){
     return outer(3) == 3 && outer(5) == 50;
 }
 
+@ignoreCompiler{"Return type `int` expected, found `str`"}
 test bool innerAndOuterFunctionUseSameParameterName3(){
     int outer(str t) {
         int inner(t:3) = t;