Merge branch 'main' into fix/issue-2496

Author: PaulKlint

src/org/rascalmpl/compiler/CheckTestSources.rsc

@@ -74,9 +74,9 @@ void checkTestSources(list[str] cmdLineArgs) {
                       ];
     }
                  
-   ignored = ["lang::rascal::tests::concrete::Patterns3" // takes too long
+   ignoredModules = ["lang::rascal::tests::concrete::Patterns3" // takes too long
              ];           
-   modulesToCheck -= ignored; 
+   modulesToCheck -= ignoredModules; 
    
    list[str] exceptions = [];
    int n = size(modulesToCheck);
@@ -91,7 +91,7 @@ void checkTestSources(list[str] cmdLineArgs) {
    }
    println("Checked <n> test modules");
    println("<size(exceptions)> failed to check: <exceptions>");
-   if(!isEmpty(ignored)) { println("Ignored: <ignored>"); }
+   if(!isEmpty(ignoredModules)) { println("Ignored: <ignoredModules>"); }
    secs = total/1000000000;
    println("Time: <secs> seconds");
 }

src/org/rascalmpl/compiler/CompileTestSources.rsc

@@ -150,9 +150,9 @@ void compileTestSources(PathConfig pcfg) {
                  | loc file <- find(testFolder, "rsc")     // all Rascal source files
                  ];  
                  
-   ignored = ["lang::rascal::tests::concrete::Patterns3" // takes too long
+   ignoredModules = ["lang::rascal::tests::concrete::Patterns3" // takes too long
              ];           
-   testModules -= ignored;
+   testModules -= ignoredModules;
    println("Compiling test modules:");
    println(testModules);   
    
@@ -169,7 +169,7 @@ void compileTestSources(PathConfig pcfg) {
    }
    println("Compiled <n> test modules");
    println("<size(exceptions)> failed to compile: <exceptions>");
-   if(!isEmpty(ignored)) { println("Ignored: <ignored>"); }
+   if(!isEmpty(ignoredModules)) { println("Ignored: <ignoredModules>"); }
    secs = total/1000000000;
    println("Time: <secs> seconds");
 }

src/org/rascalmpl/compiler/GenerateTestSources.rsc

@@ -79,12 +79,12 @@ void generateTestSources(list[str] cmdLineArgs) {
                           ];
    }  
 
-   ignored = ["lang::rascal::tests::concrete::Patterns3",
+   ignoredModules = ["lang::rascal::tests::concrete::Patterns3",
                "lang::rascal::syntax::tests::ExpressionGrammars",
                "lang::sdf2::util::SDF2Grammar",
                "lang::sdf2::util::Importer"
               ];           
-   modulesToCompile -= ignored;    
+   modulesToCompile -= ignoredModules;    
    
    list[str] exceptions = [];
    int n = size(modulesToCompile);
@@ -98,7 +98,7 @@ void generateTestSources(list[str] cmdLineArgs) {
    }
    println("Compiled <n> modules");
    println("<size(exceptions)> failed to compile:"); iprintln(exceptions);
-   if(!isEmpty(ignored)) { println("Ignored: <ignored>"); }
+   if(!isEmpty(ignoredModules)) { println("Ignored: <ignoredModules>"); }
    secs = isEmpty(durations) ? 0 : sum(range(durations))/1000000000;
    println("Time: <secs/60> minutes");
    //iprintln(sort({ <m, durations[m] / 1000000000> | m <- durations}, bool (<_,int i>, <_, int j>) { return i < j; }));