Some minor improvements; ready for release!

usethesource · Mar 7, 2024 · 57c5851 · 57c5851
1 parent d017d93
commit 57c5851
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/src/org/rascalmpl/core/library/CheckTestSources.rsc b/src/org/rascalmpl/core/library/CheckTestSources.rsc
@@ -28,7 +28,7 @@ void checkTestSources(PathConfig pcfg) {
      libs = [ ]
      );
 
-   println("PathConfig for generating test sources:\n");
+   println("PathConfig for type checking test sources:\n");
    iprintln(testConfig);
 
    testCompilerConfig = getRascalCompilerConfig();
@@ -92,7 +92,7 @@ void checkTestSources(PathConfig pcfg) {
                  | loc file <- find(testFolder, "rsc")     // all Rascal source files
                  ];
 
-   ignored = ["lang::rascal::tests::concrete::Patterns3"
+   ignored = ["lang::rascal::tests::concrete::Patterns3" // takes too long
              ];           
    testModules -= ignored; 
 

diff --git a/src/org/rascalmpl/core/library/CompileTestSources.rsc b/src/org/rascalmpl/core/library/CompileTestSources.rsc
@@ -1,5 +1,10 @@
 module CompileTestSources
 
+// Compile:
+// - selected standard libraries
+// - all tests in the lang/rascal/tests folder
+// - all type checker tests in "lang::rascalcore::check::tests (for now disabled)
+
 import IO;
 import String;
 import Set;
@@ -21,16 +26,14 @@ void main() = compileTestSources(manualTestConfig);
 
 void compileTestSources(PathConfig pcfg) {
      testConfig = pathConfig(
-     bin=pcfg.bin,
-     generatedSources=|project://rascal-core/target/generated-test-sources2|,
-     resources = |project://rascal-core/target/generated-test-resources2|,
-     srcs=[ |project://rascal/src/org/rascalmpl/library|, |std:///|, |project://rascal-core/src/org/rascalmpl/core/library|],
-     libs = [ ]
+        bin=pcfg.bin,
+        generatedSources=|project://rascal-core/target/generated-test-sources2|,
+        resources = |project://rascal-core/target/generated-test-resources2|,
+        srcs=[ |project://rascal/src/org/rascalmpl/library|, |std:///|, |project://rascal-core/src/org/rascalmpl/core/library|],
+        libs = [ ]
      );
 
-
-
-   println("PathConfig for generating test sources:\n");
+   println("PathConfig for compiling test sources:\n");
    iprintln(testConfig);
 
    testCompilerConfig = getRascalCompilerConfig();
@@ -133,7 +136,7 @@ void compileTestSources(PathConfig pcfg) {
                  | loc file <- find(testFolder, "rsc")     // all Rascal source files
                  ];  
 
-   ignored = ["lang::rascal::tests::concrete::Patterns3"
+   ignored = ["lang::rascal::tests::concrete::Patterns3" // takes too long
              ];           
    testModules -= ignored;    
 

diff --git a/src/org/rascalmpl/core/library/lang/rascalcore/check/Checker.rsc b/src/org/rascalmpl/core/library/lang/rascalcore/check/Checker.rsc
@@ -416,7 +416,8 @@ list[ModuleMessages] checkAll(loc root, PathConfig pcfg, CompilerConfig compiler
 // ---- Convenience check function during development -------------------------
 
 map[str, list[Message]] checkModules(list[str] moduleNames, TypePalConfig config, PathConfig pcfg) {
-    <tmodels, moduleLocs, modules> = rascalTModelForNames(moduleNames, pcfg, config);
+    ModuleStatus ms = rascalTModelForNames(moduleNames, config, getRascalCompilerConfig(), dummy_compile1);
+    tmodels = ms.tmodels;
     return (mname : tmodels[mname].messages | mname <- tmodels, !isEmpty(tmodels[mname].messages));
 }