diff --git a/src/org/rascalmpl/core/library/lang/rascalcore/check/Checker.rsc b/src/org/rascalmpl/core/library/lang/rascalcore/check/Checker.rsc index e77fce99..b7e3b2cd 100644 --- a/src/org/rascalmpl/core/library/lang/rascalcore/check/Checker.rsc +++ b/src/org/rascalmpl/core/library/lang/rascalcore/check/Checker.rsc @@ -208,8 +208,8 @@ public PathConfig getTypePalProjectPathConfig() { bin = git + "generated-sources/target/classes", generatedSources = git + "generated-sources/target/generated-sources/src/main/java/", generatedTestSources = git + "generated-sources/target/generated-sources/src/main/java/", - resources = git + "generated-sources/target/generated-resources/src/main/java/", //|project://rascal-core/target/generated-test-resources|, - libs = [ |lib://rascal/| ] + resources = git + "generated-sources/target/generated-resources/src/main/java/", + libs = [ |jar+file:///Users/paulklint/.m2/repository/org/rascalmpl/rascal/0.40.8-SNAPSHOT/rascal-0.40.8-SNAPSHOT.jar!/| ] ); } diff --git a/src/org/rascalmpl/core/library/lang/rascalcore/check/RascalConfig.rsc b/src/org/rascalmpl/core/library/lang/rascalcore/check/RascalConfig.rsc index 94b45f17..e3269ae0 100644 --- a/src/org/rascalmpl/core/library/lang/rascalcore/check/RascalConfig.rsc +++ b/src/org/rascalmpl/core/library/lang/rascalcore/check/RascalConfig.rsc @@ -440,44 +440,6 @@ void rascalPostSolver(map[str,Tree] namedTrees, Solver s){ bool isLogicalLoc(loc l) = startsWith(l.scheme, "rascal+"); - -// TODO: temporary, fix should be in util::Reflective -str getModuleName(loc moduleLoc, PathConfig pcfg, set[str] extensions = {"tc", "tpl"}){ - modulePath = moduleLoc.path; - - if(!endsWith(modulePath, "rsc")){ - throw "Not a Rascal source file: "; - } - - for(loc dir <- pcfg.srcs + pcfg.libs){ - if(startsWith(modulePath, dir.path) && moduleLoc.scheme == dir.scheme && moduleLoc.authority == dir.authority){ - moduleName = replaceFirst(modulePath, dir.path, ""); - moduleName = replaceLast(moduleName, ".rsc", ""); - if(moduleName[0] == "/"){ - moduleName = moduleName[1..]; - } - moduleName = replaceAll(moduleName, "/", "::"); - return moduleName; - } - } - - for(loc dir <- pcfg.libs){ - if(startsWith(modulePath, dir.path) && moduleLoc.scheme == dir.scheme && moduleLoc.authority == dir.authority){ - moduleName = replaceFirst(modulePath, dir.path, ""); - = splitFileExtension(moduleName); - if(ext in extensions){ - if(moduleName[0] == "/"){ - moduleName = moduleName[1..]; - } - moduleName = replaceAll(moduleName, "/", "::"); - return moduleName; - } - } - } - - - throw "No module name found for ;\nsrcs=;\nlibs="; -} loc rascalCreateLogicalLoc(Define def, str modelName, PathConfig pcfg){ if(def.idRole in keepInTModelRoles){