In case of circular imports, the reuse of TModels was incorect.

Fixes Issue #2148

Author: PaulKlint

src/org/rascalmpl/core/library/lang/rascalcore/check/Checker.rsc

@@ -222,18 +222,26 @@ ModuleStatus rascalTModelForLocs(
             }
 
             compatible_with_all_imports = true;
-            for(m <- component){
-                m_compatible = false;
-                <found, tm, ms> = getTModelForModule(m, ms);
-                if(found && !tplOutdated(m, pcfg)){
-                    imports_extends_m = imports_and_extends[m];
+            any_tpl_outdated = any(m <- component, tplOutdated(m, pcfg));
+            if(any_tpl_outdated){
+                for(m <- component){
+                    ms.status[m] -= {tpl_uptodate(), checked()};
+                    ms.status[m] += {rsc_changed()};
+                }
+            } else {
+                for(m <- component){
+                    m_compatible = false;
+                    <found, tm, ms> = getTModelForModule(m, ms);
+                    if(found && !tplOutdated(m, pcfg)){
+                        imports_extends_m = imports_and_extends[m];
 
-                    <m_compatible, ms> = importsAndExtendsAreBinaryCompatible(tm, imports_extends_m, ms);
-                    if(m_compatible){
-                        ms.status[m] += {tpl_uptodate(), checked(), bom_update_needed()};
+                        <m_compatible, ms> = importsAndExtendsAreBinaryCompatible(tm, imports_extends_m, ms);
+                        if(m_compatible){
+                            ms.status[m] += {tpl_uptodate(), checked(), bom_update_needed()};
+                        }
                     }
+                    compatible_with_all_imports = compatible_with_all_imports && m_compatible;
                 }
-                compatible_with_all_imports = compatible_with_all_imports && m_compatible;
             }
 
             any_rsc_changed = any(m <- component, rsc_changed() in ms.status[m]);

src/org/rascalmpl/core/library/lang/rascalcore/check/TestConfigs.rsc

@@ -114,6 +114,22 @@ public RascalCompilerConfig getAllSrcCompilerConfig(bool compiler=true){
     return rascalCompilerConfig(getAllSrcPathConfig(compiler=compiler))[verbose = true][logWrittenFiles=true];
 }
 
+// ----
+public PathConfig getAllSrcREPOPathConfig(bool compiler = true) {
+    return makePathConfig(COMPILED_RASCAL,
+                          [ REPO + "rascal/src/org/rascalmpl/library",
+                            REPO + "rascal/test/org/rascalmpl/benchmark/",
+                            REPO + "rascal-core/src/org/rascalmpl/core/library",
+                            REPO + "typepal/src"
+                        ],
+                        [ ], 
+                        compiler=compiler);
+}
+
+public RascalCompilerConfig getAllSrcREPOCompilerConfig(bool compiler=true){
+    return rascalCompilerConfig(getAllSrcREPOPathConfig(compiler=compiler))[verbose = true][logWrittenFiles=true];
+}
+// ----
 public PathConfig getAllSrcWritablePathConfig(bool compiler = true) {
     TMP_RASCAL = |tmp:///rascal/|;
     TMP_RASCAL_CORE = |tmp:///rascal-core/|;
@@ -190,11 +206,11 @@ public RascalCompilerConfig getRascalCoreCompilerConfig(bool compiler=true){
 * has the standard library and typepal on the library path, in case you accidentally want to test a module in rascal-core which depends on typepal.
 * Included projects: rascal-tutor, flybytes, rascal-lsp
 }
-public PathConfig getRascalCorePathConfigDev() {
+public PathConfig getRascalCorePathConfigDev(bool compiler = false) {
     return makePathConfig(RASCAL_CORE, [ RASCAL_CORE ], [ RASCAL, TYPEPAL ], compiler=compiler);
 }
 
-public RascalCompilerConfig getRascalCoreCompilerConfigDev(){
+public RascalCompilerConfig getRascalCoreCompilerConfigDev(bool compiler=true){
     return rascalCompilerConfig(getRascalCorePathConfigDev())[verbose = true][logWrittenFiles=true];
 }
 
@@ -236,7 +252,7 @@ public RascalCompilerConfig getSalixCompilerConfig(bool compiler = true){
 
 // ---- drambiguity -----------------------------------------------------------
 
-public PathConfig getDrAmbiguityPathConfig() {
+public PathConfig getDrAmbiguityPathConfig(bool compiler = false) {
     return makePathConfig(DRAMBIGUITY,
                           [ DRAMBIGUITY, SALIX_CORE + "src/main/rascal" ],
                           [ RASCAL ],