From 4ab2e6c22ba087a94e447830f139450bd06de4a2 Mon Sep 17 00:00:00 2001 From: paulklint Date: Thu, 29 Jan 2026 19:27:59 +0100 Subject: [PATCH] Guard against physical locs in outdated library tpls --- src/org/rascalmpl/compiler/lang/rascalcore/check/Checker.rsc | 1 + src/org/rascalmpl/compiler/lang/rascalcore/check/Import.rsc | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/org/rascalmpl/compiler/lang/rascalcore/check/Checker.rsc b/src/org/rascalmpl/compiler/lang/rascalcore/check/Checker.rsc index 8f8683318e..416e3312a7 100644 --- a/src/org/rascalmpl/compiler/lang/rascalcore/check/Checker.rsc +++ b/src/org/rascalmpl/compiler/lang/rascalcore/check/Checker.rsc @@ -476,6 +476,7 @@ tuple[TModel, ModuleStatus] rascalTModelComponent(set[MODID] moduleIds, ModuleSt // ms.messages[mid] += error("Cannot get parse tree for module ``", ms.moduleLocs[mid]); //} } + if(!isEmpty(idTrees)){ if(compilerConfig.verbose) { println("Checking ... "); } diff --git a/src/org/rascalmpl/compiler/lang/rascalcore/check/Import.rsc b/src/org/rascalmpl/compiler/lang/rascalcore/check/Import.rsc index a4ab3f0ca1..043a0a7be3 100644 --- a/src/org/rascalmpl/compiler/lang/rascalcore/check/Import.rsc +++ b/src/org/rascalmpl/compiler/lang/rascalcore/check/Import.rsc @@ -99,7 +99,10 @@ ModuleStatus reportCycles(rel[MODID, PathRole, MODID]paths, rel[MODID,MODID] ext //- by checking circular dependencies // TODO: reuse enhancePathRelation from RascalConfig here ModuleStatus completeModuleStatus(ModuleStatus ms){ - paths = ms.paths; + pcfg = ms.pathConfig; + paths = visit(ms.paths){ + case loc mloc => moduleName2moduleId(getRascalModuleName(mloc, pcfg)) when !isModuleId(mloc) + }; ms = reportSelfImport(paths, ms);