Merge pull request #2564 from usethesource/fix/better-change-detection-for-extend

Fix/better-change-detection-for-extend

Author: PaulKlint

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

@@ -155,12 +155,27 @@ datetime getLastModified(str qualifiedModuleName, map[str, datetime] moduleLastM
     }
 }
 
-// Check if a module is modified compared to a given timestamp
-bool isModuleModified(str qualifiedModuleName, datetime timestamp, PathConfig pcfg){
+// Check if a module is modified compared to a given timestamp in BOM
+bool isModuleModified(str qualifiedModuleName, datetime timestamp, PathRole pathRole, ModuleStatus ms){
     qualifiedModuleName = unescape(qualifiedModuleName);
+    pcfg = ms.pathConfig;
     try {
         mloc = getRascalModuleLocation(qualifiedModuleName, pcfg);
-        return lastModified(mloc) != timestamp;
+        bool modifiedChanged = lastModified(mloc) != timestamp;
+        if(pathRole == importPath()){
+            return modifiedChanged;
+        } else {    // extendPath
+            <found, tm, ms> = getTModelForModule(qualifiedModuleName, ms, convert=false);
+            if(found && tm.store[key_bom]? && rel[str,datetime,PathRole] bom := tm.store[key_bom]){
+                 for(<str m, datetime timestampInBom, PathRole pathRole> <- bom){
+                    if(isModuleModified(m, timestampInBom, pathRole, ms)){
+                        return true;
+                    }
+                 }
+                 return false;
+            }
+            return false;
+        }
     } catch value _: {
         return false;
     }

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

@@ -167,7 +167,7 @@ ModuleStatus getImportAndExtendGraph(str qualifiedModuleName, ModuleStatus ms){
                     
                dependencyChanged = (m != qualifiedModuleName) && !isEmpty(ms.changedModules & range(ms.strPaths[m]));
                //if(dependencyChanged) println("processing BOM of <qualifiedModuleName> and consider <m>, dependencyChanged: <dependencyChanged>");
-               if(dependencyChanged || isModuleModified(m, timestampInBom, pcfg)){
+               if(dependencyChanged || isModuleModified(m, timestampInBom, pathRole, ms)){
                     allImportsAndExtendsValid = false;
                     ms.status[m] += rsc_changed();
                     ms.status[m] -= {tpl_uptodate(), checked()};

src/org/rascalmpl/compiler/lang/rascalcore/check/tests/ChangeScenarioTests.rsc

@@ -597,6 +597,20 @@ test bool changedExtendedModule(){
     return checkModuleOK(ScratchLoc);
 }
 
+// Issue #2562, ht @sungshik (Sung-Shik Jongmans)
+
+test bool changedExtendedModules(){
+    ALoc = writeModule("module A extend B;");
+    BLoc = writeModule("module B extend C;");
+    CLoc = writeModule("module C");
+  
+    assert checkModuleOK(ALoc);
+    writeModule("module A extend B; "); // extra space
+    writeModule("module C "); // extra space
+   
+    return checkModulesOK([ALoc, ALoc]);
+}
+
 @ignore{Can no longer test in this way since all "Checked .." messages are preserved}
 test bool onlyChangedModulesAreReChecked1(){
     clearMemory();

src/org/rascalmpl/compiler/lang/rascalcore/check/tests/StaticTestingUtils.rsc

@@ -115,12 +115,12 @@ set[Message] getAllMessages(ModuleStatus r)
 ModuleStatus checkStatements(str stmts) {
 	clearMemory();
 	mloc = composeModule(stmts);
-  return  	rascalTModelForLocs([mloc], rascalCompilerConfig(pathConfigForTesting())[infoModuleChecked=true], dummy_compile1);
+  return  	rascalTModelForLocs([mloc], rascalCompilerConfig(pathConfigForTesting())[infoModuleChecked=true][verbose=verbose], dummy_compile1);
 }
 
 ModuleStatus checkModule(str moduleText){
 	mloc = writeModule(moduleText);
-	return  rascalTModelForLocs([mloc], rascalCompilerConfig(pathConfigForTesting())[infoModuleChecked=true], dummy_compile1);
+	return  rascalTModelForLocs([mloc], rascalCompilerConfig(pathConfigForTesting())[infoModuleChecked=true][verbose=verbose], dummy_compile1);
 }
 
 bool checkStatementsAndFilter(str stmts, list[str] expected) {
@@ -139,7 +139,7 @@ bool checkModuleAndFilter(str moduleText, list[str] expected, bool matchAll = fa
 	return checkModuleAndFilter([mloc], expected, matchAll=matchAll, errorsAllowed=errorsAllowed, pathConfig=pathConfig);
 }
 bool checkModuleAndFilter(list[loc] mlocs, list[str] expected, bool matchAll = false, bool errorsAllowed = true, PathConfig pathConfig = pathConfigForTesting()) {
-	ms = rascalTModelForLocs(mlocs, rascalCompilerConfig(pathConfig)[infoModuleChecked=true], dummy_compile1);
+	ms = rascalTModelForLocs(mlocs, rascalCompilerConfig(pathConfig)[infoModuleChecked=true][verbose=verbose], dummy_compile1);
 	msgs = getAllMessages(ms);
 	if (verbose) {
      	println(msgs);
@@ -168,7 +168,14 @@ bool checkOK(str stmts) {
 }
 
 bool checkModuleOK(loc moduleToCheck, PathConfig pathConfig = pathConfigForTesting()) {
-     errors = getErrorMessages(rascalTModelForLocs([moduleToCheck], rascalCompilerConfig(pathConfig)[infoModuleChecked=true], dummy_compile1));
+     errors = getErrorMessages(rascalTModelForLocs([moduleToCheck], rascalCompilerConfig(pathConfig)[infoModuleChecked=true][verbose=verbose], dummy_compile1));
+     if(size(errors) == 0)
+        return true;
+     throw abbrev("<errors>");
+}
+
+bool checkModulesOK(list[loc] modulesToCheck, PathConfig pathConfig = pathConfigForTesting()) {
+     errors = getErrorMessages(rascalTModelForLocs(modulesToCheck, rascalCompilerConfig(pathConfig)[infoModuleChecked=true][verbose=verbose], dummy_compile1));
      if(size(errors) == 0)
         return true;
      throw abbrev("<errors>");
@@ -222,7 +229,7 @@ bool useDefOK(str moduleText, map[str, tuple[int, set[int]]] usedefs, PathConfig
 	<mname, mbody> = extractModuleNameAndBody(moduleText);
 	pathConfig.srcs += pathConfigForTesting().srcs;
 	mloc = writeModule(moduleText);
-	ms = rascalTModelForLocs([mloc], rascalCompilerConfig(pathConfig), dummy_compile1);
+	ms = rascalTModelForLocs([mloc], rascalCompilerConfig(pathConfig)[verbose=verbose], dummy_compile1);
 
     errors = getErrorMessages(ms);
     if(size(errors) != 0){