From 5385c21e76a3a6f52fbc2d8efea49fb9c437239f Mon Sep 17 00:00:00 2001 From: paulklint Date: Wed, 10 Jul 2024 14:26:00 +0200 Subject: [PATCH] Cleanup --- .../library/lang/rascalcore/check/Import.rsc | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/org/rascalmpl/core/library/lang/rascalcore/check/Import.rsc b/src/org/rascalmpl/core/library/lang/rascalcore/check/Import.rsc index be30bf02..b916c49b 100644 --- a/src/org/rascalmpl/core/library/lang/rascalcore/check/Import.rsc +++ b/src/org/rascalmpl/core/library/lang/rascalcore/check/Import.rsc @@ -133,8 +133,8 @@ ModuleStatus getImportAndExtendGraph(str qualifiedModuleName, ModuleStatus ms){ } catch value _:{ allImportsAndExtendsValid = true; println("--- reusing tmodel of (source not accessible)"); - isCompatible(tm, domain(localImportsAndExtends), ms); - //throw rascalSourceMissing("Source of is not accessible"); + //isCompatible(tm, domain(localImportsAndExtends), ms); + throw rascalSourceMissing("Source of is not accessible"); } } if(allImportsAndExtendsValid){ @@ -191,23 +191,23 @@ str getModuleFromLogical(loc l){ return i >= 0 ? l.path[1..i+1] : l.path[1..]; } -bool isCompatible(TModel lib, set[str] otherImportsAndExtends, ModuleStatus ms){ - provides = { | l <- domain(lib.logical2physical), m := getModuleFromLogical(l) }; - println(" provides:"); iprintln(provides); - requires = {}; - for(m <- otherImportsAndExtends){ - = getTModelForModule(m, ms); - if(found){ - println(":"); iprintln(domain(tm.logical2physical)); - requires += { | l <- domain(tm.logical2physical), m := getModuleFromLogical(l) }; - } - } - println("requires:"); iprintln(requires); - - println("unstatisfied: "); - - return true; -} +//bool isCompatible(TModel lib, set[str] otherImportsAndExtends, ModuleStatus ms){ +// provides = { | l <- domain(lib.logical2physical), m := getModuleFromLogical(l) }; +// println(" provides:"); iprintln(provides); +// requires = {}; +// for(m <- otherImportsAndExtends){ +// = getTModelForModule(m, ms); +// if(found){ +// println(":"); iprintln(domain(tm.logical2physical)); +// requires += { | l <- domain(tm.logical2physical), m := getModuleFromLogical(l) }; +// } +// } +// println("requires:"); iprintln(requires); +// +// println("unstatisfied: "); +// +// return true; +//} rel[str, PathRole, str] getModulePathsAsStr(Module m){ moduleName = unescape("");