Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@ list[ModuleMessages] check(list[loc] moduleLocs, RascalCompilerConfig compilerCo
list[ModuleMessages] reportModuleMessages(ModuleStatus ms){
moduleIds = domain(ms.moduleLocs);
messagesNoModule = {*ms.messages[mid] | MODID mid <- ms.messages, (mid notin moduleIds || mid notin ms.moduleLocs)} + toSet(ms.pathConfig.messages);
msgs = [ program(ms.moduleLocs[mid], (ms.messages[mid] ? {}) + messagesNoModule) | MODID mid <- moduleIds ];
msgs = [ program(mid, (ms.messages[mid] ? {}) + messagesNoModule) | MODID mid <- moduleIds ];
if(isEmpty(msgs) && !isEmpty(messagesNoModule)){
msgs = [ program(|unknown:///|, messagesNoModule) ];
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,6 @@ ModuleStatus removeTModel(MODID candidate, ModuleStatus ms, bool updateBOMneeded
ms = deleteProperty(candidate, ms, bom_update_needed());
<found, tplLoc> = getTPLWriteLoc(candidate, pcfg);
tm = ms.tmodels[candidate];
//tm.messages = toList(toSet(tm.messages) + ms.messages[candidate]); // TODO needed ?
ms = addProperty(candidate, ms, tpl_saved());
if(ms.compilerConfig.verbose) println("Saving tmodel for <moduleId2moduleName(candidate)> before removing from cache");
try {
Expand Down
3 changes: 1 addition & 2 deletions src/org/rascalmpl/compiler/lang/rascalcore/check/Import.rsc
Original file line number Diff line number Diff line change
Expand Up @@ -458,8 +458,7 @@ ModuleStatus doSaveModule(set[MODID] component, map[MODID,set[MODID]] m_imports,
m1.specializedFacts = (key : tm.specializedFacts[key] | key <- tm.specializedFacts, isContainedInComponentScopes(key, tm.logical2physical), any(fms <- filteredModuleScopes, isContainedIn(key, fms)));
m1.facts += m1.specializedFacts;

// m1.messages = [ msg | msg <- tm.messages, msg.at.path == currentModule.path || msg is error ];
m1.messages = tm.messages;
m1.messages = [msg | msg <- tm.messages, isContainedIn(msg.at, currentModule, tm.logical2physical)];
ms.messages[currentModule] = toSet(m1.messages);

filteredModuleScopePaths = {ml.path |loc ml <- filteredModuleScopes};
Expand Down
Loading