Merge branch 'main' into cleanup-subtype-for-prods

Author: jurgenvinju

.github/workflows/build.yaml

@@ -16,7 +16,7 @@ env:
 jobs:
   test-linux:
     if: ${{ !(github.ref == 'refs/heads/main' && contains(github.event.head_commit.message, '[maven-release-plugin]')) }}
-    runs-on: buildjet-4vcpu-ubuntu-2204
+    runs-on: ubicloud-standard-4
     steps: 
       - uses: actions/checkout@v4
 
@@ -53,7 +53,7 @@ jobs:
     needs: [test-linux]
     permissions:
       contents: write
-    runs-on: buildjet-4vcpu-ubuntu-2204
+    runs-on: ubicloud-standard-4
     environment: ${{ startsWith(github.ref, 'refs/tags/v') && 'deployment' || '' }} 
     steps:
       - uses: browser-actions/setup-chrome@latest
@@ -88,7 +88,7 @@ jobs:
 
       - name: Test if release # just to be extra sure for a release
         if: startsWith(github.ref, 'refs/tags/v')
-        run: mvn -Drascal.test.memory=10 -Drascal.compile.skip -Drascal.tutor.skip test 
+        run: mvn -Drascal.test.memory=14 -Drascal.compile.skip -Drascal.tutor.skip test 
 
       - name: Attach artifact 
         id: build-artifact
@@ -191,7 +191,7 @@ jobs:
   compiler-tests:
     if: ${{ !(github.ref == 'refs/heads/main' && contains(github.event.head_commit.message, '[maven-release-plugin]')) }}
     needs: [test-linux]
-    runs-on: buildjet-4vcpu-ubuntu-2204
+    runs-on: ubicloud-standard-4
     env:
       MAVEN_OPTS: "-Xmx512M -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
     steps: 

pom.xml

@@ -3,7 +3,7 @@
 
     <groupId>org.rascalmpl</groupId>
     <artifactId>rascal</artifactId>
-    <version>0.42.0-RC2-SNAPSHOT</version>
+    <version>0.42.2-RC2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <scm>
@@ -28,7 +28,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven-version>3.9.11</maven-version>
+        <maven-version>3.9.12</maven-version>
         <exec.mainClass>org.rascalmpl.shell.RascalShell</exec.mainClass>
         <rascal.test.memory>3</rascal.test.memory>
         <maven.compiler.release>11</maven.compiler.release>
@@ -131,7 +131,7 @@
                 <artifactId>rascal-maven-plugin</artifactId>
                 <version>${rascal-maven.version}</version>
                 <configuration>
-                    <bootstrapRascalVersion>0.42.0-RC1</bootstrapRascalVersion>
+                    <bootstrapRascalVersion>0.42.0</bootstrapRascalVersion>
                     <parallel>true</parallel>
                     <parallelPreChecks>
                         <pre>${project.basedir}/src/org/rascalmpl/library/Prelude.rsc</pre>
@@ -458,7 +458,7 @@
         <dependency>
             <groupId>org.rascalmpl</groupId>
             <artifactId>typepal</artifactId>
-            <version>0.16.4</version>
+            <version>0.16.6-RC2</version>
            <!-- <scope>provided</scope> for shade plugin it can't be provided. At least the rascal dependency in typepal should be provided -->
            <scope>compile</scope>
         </dependency>

src/org/rascalmpl/compiler/CheckTestSources.rsc

@@ -36,6 +36,7 @@ import util::FileSystem;
 import util::Benchmark;
 import lang::rascalcore::compile::util::Names;
 import lang::rascalcore::check::RascalConfig;
+import lang::rascalcore::check::TestConfigs;
 
 
 void main() = checkTestSources([]);

src/org/rascalmpl/compiler/CompileTestSources.rsc

@@ -40,6 +40,7 @@ import lang::rascalcore::compile::Compile;
 import util::FileSystem;
 import util::Benchmark;
 import lang::rascalcore::compile::util::Names;
+import lang::rascalcore::check::TestConfigs;
 
 loc GIT_REPO = |file:///Users/paulklint/git/|;
 

src/org/rascalmpl/compiler/GenerateTestSources.rsc

@@ -38,6 +38,7 @@ import util::Monitor;
 import util::Benchmark;
 import lang::rascalcore::compile::util::Names;
 import util::SystemAPI;
+import lang::rascalcore::check::TestConfigs;
 
 // if cmdLineArgs contains "all", then all files in the rascal project are used (~400 files)
 // otherwise only standard library and test files (~200 files) 

src/org/rascalmpl/compiler/lang/rascalcore/check/ADTandGrammar.rsc

@@ -165,7 +165,7 @@ list[&T <: node ] unsetRec(list[&T <: node] args) = [unsetRec(a) | a <- args];
 
 bool isManualLayout(AProduction p) = (p has attributes && atag("manual"()) in p.attributes);
 
-tuple[TModel, ModuleStatus] addGrammar(MODID moduleId, set[MODID] imports, set[MODID] extends, map[MODID,TModel] transient_tms, ModuleStatus ms){
+tuple[bool, TModel, ModuleStatus] addGrammar(MODID moduleId, set[MODID] imports, set[MODID] extends, map[MODID,TModel] transient_tms, ModuleStatus ms){
     try {
         rel[AType,AProduction] definedProductions = {};
         allStarts = {};
@@ -177,10 +177,11 @@ tuple[TModel, ModuleStatus] addGrammar(MODID moduleId, set[MODID] imports, set[M
             } else {
                 <found, tm1, ms> = getTModelForModule(m, ms);
                 if(!found) {
-                    msg = error("Cannot add grammar, tmodel for <m> not found", ms.moduleLocs[moduleId] ? |unknown:///|);
+                    msg = error("Cannot add grammar or tmodel since `<moduleId2moduleName(m)>` is not found", ms.moduleLocs[moduleId] ? |unknown:///|);
+                    //println(msg); // TODO: Just to record this event; this should probably go to a log file
                     ms.messages[moduleId] ? {} += { msg };
                     tm1 = tmodel(modelName=qualifiedModuleName, messages=[msg]);
-                    return <tm1, ms>;
+                    return <false, tm1, ms>;
                 }
             }
             facts = tm1.facts;
@@ -317,10 +318,10 @@ tuple[TModel, ModuleStatus] addGrammar(MODID moduleId, set[MODID] imports, set[M
         tm = tmlayouts(tm, definedLayout, allManualLayouts);
         //println("ADTandGrammar:"); iprintln(g, lineLimit=10000);
         tm.store[key_grammar] = [g];
-        return <tm, ms>;
+        return <true, tm, ms>;
     } catch TypeUnavailable(): {
         // protect against undefined entities in the grammar that have not yet been reported.
-        return <tmodel(), ms>;
+        return <false, tmodel(), ms>;
     }
 }
 

src/org/rascalmpl/compiler/lang/rascalcore/check/ATypeInstantiation.rsc

@@ -233,16 +233,13 @@ AType instantiateRascalTypeParameters(Tree selector, AType t, Bindings bindings,
         return t;
     else
         return visit(t) { case param:aparameter(str pname, AType bound): {
-                                if(bindings[pname]?){
-                                    if(asubtype(bindings[pname], bound)){
-                                        repl = param.alabel? ? bindings[pname][alabel=param.alabel] :  bindings[pname]; //TODO simplified for compiler
-                                        insert repl;
-                                    }
-                                    else {
-                                        s.report(error(selector, "Type parameter &%q should be less than %t, found %t", deUnique(pname), deUnique(bound), deUnique(bindings[pname])));
+                                if(pname in bindings){
+                                    ult = bindings[pname];
+                                    if(asubtype(ult, bound)){
+                                        insert param.alabel? ? ult[alabel=param.alabel] : ult;
+                                    } else {
+                                        s.report(error(selector, "Type parameter &%q should be less than %t, found %t", deUnique(pname), deUnique(bound), deUnique(ult)));
                                     }
-                                  } else {
-                                        insert param;
                                   }
                                }
                         };