Skip to content

Commit 776f3fc

Browse files
committed
Minor clean-up of outdated code.
1 parent d8c92e2 commit 776f3fc

2 files changed

Lines changed: 0 additions & 29 deletions

File tree

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,6 @@ ModuleStatus rascalTModelForLocs(
244244
recheck = !all(m <- component, hasAnyProperty(m, ms, tpl_uptodate(), checked()));
245245
for(m <- component){
246246

247-
// if(m notin ms.status){
248-
// ms.status[m] = {};
249-
// }
250247
mi += 1;
251248
if(!recheck){
252249
if(hasNotProperty(m, ms, tpl_uptodate())){
@@ -288,7 +285,6 @@ ModuleStatus rascalTModelForLocs(
288285

289286
any_rsc_changed = any(m <- component, hasProperty(m, ms, rsc_changed()));
290287
all_rsc_found = all(m <- component, hasNotProperty(m, ms, rsc_not_found()));
291-
// all_rsc_found = !any(m <- component, rsc_not_found() in ms.status[m]);
292288
any_from_lib = any(m <- component, hasProperty(m, ms, tpl_from_library()));
293289
all_tmodels_uptodate = true;
294290
for(m <- component){
@@ -328,9 +324,6 @@ ModuleStatus rascalTModelForLocs(
328324
for(imod <- pt.header.imports, imod has \module){
329325
iname = unescape("<imod.\module.name>");
330326
inameId = moduleName2moduleId(iname);
331-
// if(!ms.status[inameId]?){
332-
// ms.status[inameId] = {};
333-
// }
334327
if(hasProperty(inameId, ms, tpl_version_error(), rsc_not_found())){
335328
imsgs += error("Rascal TPL version error for `<iname>`, no source found", imod@\loc);
336329
}
@@ -384,10 +377,6 @@ ModuleStatus rascalTModelForLocs(
384377
ms = deleteProperty(m, ms, rsc_changed());
385378
ms = addProperty(m, ms, tpl_uptodate());
386379
}
387-
} else {
388-
;// for(m <- component){
389-
// ms.status[m] += bom_update_needed();
390-
// }
391380
}
392381
}
393382
} catch ParseError(loc src): {
@@ -458,8 +447,6 @@ tuple[TModel, ModuleStatus] rascalTModelComponent(set[MODID] moduleIds, ModuleSt
458447
map[MODID, Module] idTrees = ();
459448
for(MODID mid <- moduleIds){
460449
mname = moduleId2moduleName(mid);
461-
//ms.status[mid] = {};
462-
//ms.messages[mid] = {};
463450
ms = removeTModel(mid, ms);
464451
mloc = |unknown:///|(0,0,<0,0>,<0,0>);
465452
try {

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,6 @@ ModuleStatus getImportAndExtendGraph(MODID moduleId, ModuleStatus ms){
134134
pcfg = ms.pathConfig;
135135
qualifiedModuleName = moduleId2moduleName(moduleId);
136136

137-
// if(!ms.status[moduleId]?){
138-
// ms.status[moduleId] = {};
139-
// }
140-
141137
if(hasProperty(moduleId, ms, module_dependencies_extracted())){
142138
return ms;
143139
}
@@ -156,9 +152,6 @@ ModuleStatus getImportAndExtendGraph(MODID moduleId, ModuleStatus ms){
156152
if(tm.store[key_bom]? && rel[str,datetime,PathRole] bom := tm.store[key_bom]){
157153
for(<str m, datetime timestampInBom, PathRole pathRole> <- bom){
158154
mid = moduleName2moduleId(m);
159-
// if(!ms.status[mid]?){
160-
// ms.status[mid] = {};
161-
// }
162155
if(mid != moduleId){
163156
localImportsAndExtends += <mid, pathRole>;
164157
}
@@ -361,15 +354,6 @@ tuple[ModuleStatus, rel[loc, PathRole, loc]] getModulePaths(Module m, ModuleStat
361354
iname = unescape("<imod.\module.name>");
362355
inameId = moduleName2moduleId(iname);
363356
imports_and_extends += <moduleId, imod is \default ? importPath() : extendPath(), inameId>;
364-
//ms.status[inameId] = ms.status[inameId] ? {};
365-
// try {
366-
// // mloc = getRascalModuleLocation(iname, ms);
367-
// ms.paths += {<moduleId, imod is \default ? importPath() : extendPath(), inameId>};
368-
// } catch Message err: {
369-
// err.at = imod@\loc;
370-
// ms.messages[moduleId] ? {} += { err };
371-
// ms.status[inameId] += { rsc_not_found() };
372-
// }
373357
}
374358
ms.paths += imports_and_extends;
375359
return <ms, imports_and_extends>;

0 commit comments

Comments
 (0)