diff --git a/src/org/rascalmpl/compiler/lang/rascalcore/check/ModuleLocations.rsc b/src/org/rascalmpl/compiler/lang/rascalcore/check/ModuleLocations.rsc index d69f92cafb1..3cbdf21c3ee 100644 --- a/src/org/rascalmpl/compiler/lang/rascalcore/check/ModuleLocations.rsc +++ b/src/org/rascalmpl/compiler/lang/rascalcore/check/ModuleLocations.rsc @@ -99,13 +99,15 @@ int commonPrefix(list[str] rdir, list[str] rm){ } return size(rm); } -@memo{expireAfter(minutes=5),maximumSize(500)} + @synopsis{Find the module name corresponding to a given module location via its (src, tpl or logical) location} -str getRascalModuleName(loc moduleLoc, PathConfig pcfg){ +str getRascalModuleName(loc moduleLoc, PathConfig pcfg) + = getRascalModuleName1(moduleLoc.top, pcfg); + +//@memo{expireAfter(minutes=5),maximumSize(500)} +private str getRascalModuleName1(loc moduleLoc, PathConfig pcfg){ modulePath = moduleLoc.path; - rscFile = endsWith(modulePath, "rsc"); - tplFile = endsWith(modulePath, "tpl"); if(isLogicalLoc(moduleLoc)){ path = moduleLoc.path; if(path[0] == "/"){ @@ -113,9 +115,8 @@ str getRascalModuleName(loc moduleLoc, PathConfig pcfg){ } return replaceAll(path, "/", "::"); } - if(!( rscFile || tplFile )){ - throw "Not a Rascal .rsc or .tpl file: "; - } + + rscFile = endsWith(modulePath, "rsc"); // Find matching .rsc file in source directories if(rscFile){ @@ -127,10 +128,17 @@ str getRascalModuleName(loc moduleLoc, PathConfig pcfg){ moduleName = moduleName[1..]; } moduleName = replaceAll(moduleName, "/", "::"); + // if(moduleName == "library::List"){ + // println("getRascalModuleName: =\> "); + // } return moduleName; } } } + tplFile = endsWith(modulePath, "tpl"); + if(!( rscFile || tplFile )){ + throw "Not a Rascal .rsc or .tpl file: "; + } // Find longest matching .tpl file in library directories @@ -151,17 +159,19 @@ str getRascalModuleName(loc moduleLoc, PathConfig pcfg){ } modulePathReversed = reverse(modulePathAsList); - int longestSuffix = 0; - for(loc dir <- pcfg.libs){ + int largestSuffix = 0; + bool found = false; + for(loc dir <- pcfg.libs, !found){ dir = dir + "rascal"; dpath = dir.path; while(dpath[0] == "/"){ dpath = dpath[1..]; } - + for(loc file <- find(dir, "tpl")){ - candidate = replaceFirst(file.path, dpath, ""); + candidate = replaceFirst(file.path, dpath, ""); + = splitFileExtension(candidate); while(candidate[0] == "/"){ candidate = candidate[1..]; @@ -172,21 +182,25 @@ str getRascalModuleName(loc moduleLoc, PathConfig pcfg){ if(lastName[0] == "$"){ candidateAsList = [*candidateAsList[..-1],lastName[1..]]; } - // println("cand: , modpath: "); + n = commonPrefix(reverse(candidateAsList), modulePathReversed); - - if(n > longestSuffix){ - longestSuffix = n; + + if(n > largestSuffix){ + largestSuffix = n; } } } - if(longestSuffix > 0){ + if(largestSuffix > 0){ lastName = modulePathAsList[-1]; if(lastName[0] == "$"){ modulePathAsList = [*modulePathAsList[..-1],lastName[1..]]; } - return intercalate("::", modulePathAsList[size(modulePathAsList) - longestSuffix .. ]); + res = intercalate("::", modulePathAsList[size(modulePathAsList) - largestSuffix .. ]); + //if(contains(res, "List")){ + //println("getRascalModuleName: =\> "); + //} + return res; } throw "No module name found for ;\nsrcs=;\nlibs="; } diff --git a/src/org/rascalmpl/compiler/lang/rascalcore/check/TestConfigs.rsc b/src/org/rascalmpl/compiler/lang/rascalcore/check/TestConfigs.rsc index 615adb2e86d..747a3c5fece 100644 --- a/src/org/rascalmpl/compiler/lang/rascalcore/check/TestConfigs.rsc +++ b/src/org/rascalmpl/compiler/lang/rascalcore/check/TestConfigs.rsc @@ -266,8 +266,9 @@ public RascalCompilerConfig getFlyBytesCompilerConfig(bool keep=true){ // ---- salix ----------------------------------------------------------------- public PathConfig getSalixPathConfig(bool keep = false) { - return makePathConfig([ REPO + "salix-core/src/main/rascal", REPO + "salix-contrib/src/main/rascal" ], - [ RASCAL ], + return makePathConfig([ REPO + "salix-core/src/main/rascal", REPO + "salix-contrib/src/main/rascal", + REPO + "rascal/src/org/rascalmpl/library"], + [ ], keep=keep); } diff --git a/src/org/rascalmpl/compiler/lang/rascalcore/compile/Examples/Tst1.rsc b/src/org/rascalmpl/compiler/lang/rascalcore/compile/Examples/Tst1.rsc index 73d4a9ca1a8..710e6a551bd 100644 --- a/src/org/rascalmpl/compiler/lang/rascalcore/compile/Examples/Tst1.rsc +++ b/src/org/rascalmpl/compiler/lang/rascalcore/compile/Examples/Tst1.rsc @@ -30,6 +30,7 @@ import util::FileSystem; import util::PathConfig; import IO; import Message; +import lang::rascalcore::check::ModuleLocations; private void runChecker(PathConfig pcfg, bool (loc m) validModule) { result = check([m | src <- pcfg.srcs, m <- find(src, "rsc"), validModule(m)], rascalCompilerConfig(pcfg)); @@ -44,12 +45,46 @@ void main(loc repoRoot = |file:///Users/paulklint/git/|, loc tplRoot = |file:/// salixContribPcfg = pathConfig(srcs=[repoRoot + "salix-contrib/src/main/rascal"], bin=tplRoot + "salix-core", libs=[rascalPcfg.bin, salixCorePcfg.bin]); println("**** Checking rascal"); + // // iprintln(check([|file:///Users/paulklint/git/rascal/src/org/rascalmpl/library/ParseTree.rsc|, + // // |file:///Users/paulklint/git/rascal/src/org/rascalmpl/library/String.rsc| + // // ], rascalCompilerConfig(rascalPcfg))); + + // runChecker(rascalPcfg, bool (loc m) { return true; }); + runChecker(rascalPcfg, bool (loc m) { return /lang.rascal/ !:= m.path && /experiments/ !:= m.path && /lang.rascal.*tests/ !:= m.path; }); + // println(getRascalModuleName(|file:///Users/paulklint/git/rascal/src/org/rascalmpl/library/lang/json/IO.rsc|, salixCorePcfg)); + // println(getRascalModuleName(|file:///Users/paulklint/rascal-tpls/rascal/rascal/lang/json/$IO.tpl|, salixCorePcfg)); + + // println(getRascalModuleName(|file:///Users/paulklint/git/rascal/src/org/rascalmpl/library/IO.rsc|, salixCorePcfg)); + // println(getRascalModuleName(|file:///Users/paulklint/rascal-tpls/rascal/rascal/$IO.tpl|, salixCorePcfg)); + // println(getRascalModuleName(|file:///Users/paulklint/git/rascal/src/org/rascalmpl/library/lang/rascal/tests/libraries/IO.rsc|, salixCorePcfg)); + // println(getRascalModuleName(|file:///Users/paulklint/rascal-tpls/rascal/rascal/$IO.tpl|, salixCorePcfg)); - println("**** Checking salix-core"); - runChecker(salixCorePcfg, bool (loc m) { return true; }); + // println("**** Checking salix-core"); + // runChecker(salixCorePcfg, bool (loc m) { return true; }); println("**** Checking salix-contrib"); + //iprintln(check([|file:///Users/paulklint/git/salix-contrib/src/main/rascal/salix/util/Mode.rsc|], rascalCompilerConfig(salixContribPcfg))); + // iprintln(check([ + // // |file:///Users/paulklint/git/salix-contrib/src/main/rascal/salix/mermaid/Mermaid.rsc|, + // // |file:///Users/paulklint/git/salix-contrib/src/main/rascal/salix/mermaid/Demo.rsc|, + // // |file:///Users/paulklint/git/salix-contrib/src/main/rascal/salix/jsplumb/Demo.rsc|, + // // |file:///Users/paulklint/git/salix-contrib/src/main/rascal/salix/mermaid/FlowChart.rsc|, + // |file:///Users/paulklint/git/salix-contrib/src/main/rascal/salix/util/Mode.rsc|, + // |file:///Users/paulklint/git/salix-contrib/src/main/rascal/Main.rsc| + // // |file:///Users/paulklint/git/salix-contrib/src/main/rascal/salix/ace/Editor.rsc|, + // // |file:///Users/paulklint/git/salix-contrib/src/main/rascal/salix/cytoscape/Demo.rsc|, + // //|file:///Users/paulklint/git/salix-contrib/src/main/rascal/salix/canvas/Demo.rsc| + // // |file:///Users/paulklint/git/salix-contrib/src/main/rascal/salix/canvas/Heart.rsc|, + // //|file:///Users/paulklint/git/salix-contrib/src/main/rascal/salix/ace/Demo.rsc|, + // // |file:///Users/paulklint/git/salix-contrib/src/main/rascal/salix/canvas/Canvas.rsc|, + // // |file:///Users/paulklint/git/salix-contrib/src/main/rascal/salix/charts/Charts.rsc|, + // // |file:///Users/paulklint/git/salix-contrib/src/main/rascal/salix/jsplumb/JSPlumb.rsc|, + // // |file:///Users/paulklint/git/salix-contrib/src/main/rascal/salix/cytoscape/Cytoscape.rsc|, + // // |file:///Users/paulklint/git/salix-contrib/src/main/rascal/salix/charts/Demo.rsc|, + // // |file:///Users/paulklint/git/salix-contrib/src/main/rascal/salix/mermaid/ClassDiagram.rsc| + // ], rascalCompilerConfig(salixContribPcfg))); + runChecker(salixContribPcfg, bool (loc m) { return true; }); -} \ No newline at end of file + } \ No newline at end of file diff --git a/src/org/rascalmpl/compiler/lang/rascalcore/compile/Examples/Tst2.rsc b/src/org/rascalmpl/compiler/lang/rascalcore/compile/Examples/Tst2.rsc index 60ea506282f..49b2659976d 100644 --- a/src/org/rascalmpl/compiler/lang/rascalcore/compile/Examples/Tst2.rsc +++ b/src/org/rascalmpl/compiler/lang/rascalcore/compile/Examples/Tst2.rsc @@ -27,10 +27,35 @@ POSSIBILITY OF SUCH DAMAGE. //@bootstrapParser module lang::rascalcore::compile::Examples::Tst2 - +import IO; +import util::UUID; +import util::PathConfig; +import lang::rascalcore::check::ModuleLocations; + +private loc testLibraryLoc = |memory://myTestLibrary-/|; + +void showName(loc m, PathConfig pcfg){ + println(" =\> "); +} +void confusion() { + listTPL = testLibraryLoc + "/rascal/$List.tpl"; + writeFile( listTPL, "$List.tpl (only file name matters, content irrelevant)"); + testListTPL = testLibraryLoc + "/rascal/lang/rascal/tests/library/$List.tpl"; + writeFile(testListTPL, "lang/rascal/tests/library/$List.tpl (content irrelevant)"); + pcfg = pathConfig(srcs = [], libs=[testLibraryLoc]); -int N = 0; + listSrc = |project://rascal/src/org/rascalmpl/library/List.rsc|; + testListSrc = |project://rascal/src/org/rascalmpl/library/lang/rascal/tests/library/List.rsc|; + println("\nConfusion"); + showName(listSrc, pcfg); + showName(testListSrc, pcfg); + + //rename library => libraries + remove(testListTPL); + renamedTestListTPL = testLibraryLoc + "/rascal/lang/rascal/tests/libraries/$List.tpl"; + writeFile(renamedTestListTPL, "lang/rascal/tests/libraries/$List.tpl (content irrelevant)"); -void main(){ - N += 1; + println("\nNo confusion after renaming library to libraries"); + showName(listSrc, pcfg); + showName(testListSrc, pcfg); } \ No newline at end of file diff --git a/src/org/rascalmpl/compiler/lang/rascalcore/compile/Examples/Tst4.rsc b/src/org/rascalmpl/compiler/lang/rascalcore/compile/Examples/Tst4.rsc index a4db5fcfb4a..eb4005deba5 100644 --- a/src/org/rascalmpl/compiler/lang/rascalcore/compile/Examples/Tst4.rsc +++ b/src/org/rascalmpl/compiler/lang/rascalcore/compile/Examples/Tst4.rsc @@ -25,8 +25,25 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. } module lang::rascalcore::compile::Examples::Tst4 -import lang::rascalcore::compile::Examples::Tst2; - + +import IO; + +data R = r(void(value) f, + void(value,value) g) + ; + +R makeR(){ + void f1(int x){ println("f1()"); } + + void f2(str x){ println("f2()"); } + + void f3(int x, int y) { println("f3(,)"); } + + void f4(str x, str y) { println("f4(,)"); } + + return r(f1 + f2, f3 + f4); +} + void main(){ - N = "a"; -} \ No newline at end of file + makeR().g("a", "b"); +} diff --git a/src/org/rascalmpl/library/lang/rascal/tests/concrete/recovery/bugs/OvertakenNullableBug.rsc b/src/org/rascalmpl/library/lang/rascal/tests/concrete/recovery/bugs/OvertakenNullableBug.rsc index 340aa6f4690..47069c28ca5 100644 --- a/src/org/rascalmpl/library/lang/rascal/tests/concrete/recovery/bugs/OvertakenNullableBug.rsc +++ b/src/org/rascalmpl/library/lang/rascal/tests/concrete/recovery/bugs/OvertakenNullableBug.rsc @@ -22,7 +22,7 @@ import IO; test bool testOvertakeNullableBug() { standardParser = parser(#start[Module], allowRecovery=false, allowAmbiguity=true); recoveryParser = parser(#start[Module], allowRecovery=true, allowAmbiguity=true); - loc source = |std:///lang/rascal/tests/library/analysis/statistics/DescriptiveTests.rsc|; + loc source = |std:///lang/rascal/tests/libraries/analysis/statistics/DescriptiveTests.rsc|; input = readFile(source); testDeleteUntilEol(standardParser, recoveryParser, source, input, 200, 100, 100, 100, begin=561, end=561); diff --git a/src/org/rascalmpl/library/lang/rascal/tests/library/Boolean.rsc b/src/org/rascalmpl/library/lang/rascal/tests/libraries/Boolean.rsc similarity index 96% rename from src/org/rascalmpl/library/lang/rascal/tests/library/Boolean.rsc rename to src/org/rascalmpl/library/lang/rascal/tests/libraries/Boolean.rsc index b48f9f35b45..670579d3213 100644 --- a/src/org/rascalmpl/library/lang/rascal/tests/library/Boolean.rsc +++ b/src/org/rascalmpl/library/lang/rascal/tests/libraries/Boolean.rsc @@ -1,4 +1,4 @@ - module lang::rascal::tests::library::Boolean + module lang::rascal::tests::libraries::Boolean /******************************************************************************* * Copyright (c) 2009-2015 CWI * All rights reserved. This program and the accompanying materials diff --git a/src/org/rascalmpl/library/lang/rascal/tests/library/DateTime.rsc b/src/org/rascalmpl/library/lang/rascal/tests/libraries/DateTime.rsc similarity index 98% rename from src/org/rascalmpl/library/lang/rascal/tests/library/DateTime.rsc rename to src/org/rascalmpl/library/lang/rascal/tests/libraries/DateTime.rsc index 55271a03e75..bf5575e1503 100644 --- a/src/org/rascalmpl/library/lang/rascal/tests/library/DateTime.rsc +++ b/src/org/rascalmpl/library/lang/rascal/tests/libraries/DateTime.rsc @@ -6,7 +6,7 @@ http://www.eclipse.org/legal/epl-v10.html } @contributor{Jouke Stoel - Jouke.Stoel@cwi.nl - CWI} -module lang::rascal::tests::library::DateTime +module lang::rascal::tests::libraries::DateTime import DateTime; diff --git a/src/org/rascalmpl/library/lang/rascal/tests/library/IO.rsc b/src/org/rascalmpl/library/lang/rascal/tests/libraries/IO.rsc similarity index 98% rename from src/org/rascalmpl/library/lang/rascal/tests/library/IO.rsc rename to src/org/rascalmpl/library/lang/rascal/tests/libraries/IO.rsc index 75540347a92..afb9ea30075 100644 --- a/src/org/rascalmpl/library/lang/rascal/tests/library/IO.rsc +++ b/src/org/rascalmpl/library/lang/rascal/tests/libraries/IO.rsc @@ -1,4 +1,4 @@ -module lang::rascal::tests::library::IO +module lang::rascal::tests::libraries::IO import IO; import DateTime; diff --git a/src/org/rascalmpl/library/lang/rascal/tests/library/Integer.rsc b/src/org/rascalmpl/library/lang/rascal/tests/libraries/Integer.rsc similarity index 95% rename from src/org/rascalmpl/library/lang/rascal/tests/library/Integer.rsc rename to src/org/rascalmpl/library/lang/rascal/tests/libraries/Integer.rsc index 04bd7c035e6..904ff72361c 100644 --- a/src/org/rascalmpl/library/lang/rascal/tests/library/Integer.rsc +++ b/src/org/rascalmpl/library/lang/rascal/tests/libraries/Integer.rsc @@ -8,7 +8,7 @@ @contributor{Jurgen J. Vinju - Jurgen.Vinju@cwi.nl - CWI} @contributor{Paul Klint - Paul.Klint@cwi.nl - CWI} @contributor{Bert Lisser - Bert.Lisser@cwi.nl - CWI} -module lang::rascal::tests::library::Integer +module lang::rascal::tests::libraries::Integer import util::Math; diff --git a/src/org/rascalmpl/library/lang/rascal/tests/library/List.rsc b/src/org/rascalmpl/library/lang/rascal/tests/libraries/List.rsc similarity index 99% rename from src/org/rascalmpl/library/lang/rascal/tests/library/List.rsc rename to src/org/rascalmpl/library/lang/rascal/tests/libraries/List.rsc index 8a7814fc13d..123bc1dc039 100644 --- a/src/org/rascalmpl/library/lang/rascal/tests/library/List.rsc +++ b/src/org/rascalmpl/library/lang/rascal/tests/libraries/List.rsc @@ -9,7 +9,7 @@ @contributor{Paul Klint - Paul.Klint@cwi.nl - CWI} @contributor{Bert Lisser - Bert.Lisser@cwi.nl - CWI} @contributor{Vadim Zaytsev - vadim@grammarware.net - UvA} -module lang::rascal::tests::library::List +module lang::rascal::tests::libraries::List import Exception; import List; diff --git a/src/org/rascalmpl/library/lang/rascal/tests/library/ListRelation.rsc b/src/org/rascalmpl/library/lang/rascal/tests/libraries/ListRelation.rsc similarity index 99% rename from src/org/rascalmpl/library/lang/rascal/tests/library/ListRelation.rsc rename to src/org/rascalmpl/library/lang/rascal/tests/libraries/ListRelation.rsc index 92b9fda93c1..65feb15c060 100644 --- a/src/org/rascalmpl/library/lang/rascal/tests/library/ListRelation.rsc +++ b/src/org/rascalmpl/library/lang/rascal/tests/libraries/ListRelation.rsc @@ -7,7 +7,7 @@ } @contributor{Paul Klint - Paul.Klint@cwi.nl - CWI} @contributor{Vadim Zaytsev - vadim@grammarware.net - UvA} -module lang::rascal::tests::library::ListRelation +module lang::rascal::tests::libraries::ListRelation import ListRelation; import List; // needed for slices used for dynamic type checks diff --git a/src/org/rascalmpl/library/lang/rascal/tests/library/Map.rsc b/src/org/rascalmpl/library/lang/rascal/tests/libraries/Map.rsc similarity index 99% rename from src/org/rascalmpl/library/lang/rascal/tests/library/Map.rsc rename to src/org/rascalmpl/library/lang/rascal/tests/libraries/Map.rsc index 77d963906c0..d0937ce8ca2 100644 --- a/src/org/rascalmpl/library/lang/rascal/tests/library/Map.rsc +++ b/src/org/rascalmpl/library/lang/rascal/tests/libraries/Map.rsc @@ -11,7 +11,7 @@ @contributor{Anastasia Izmaylova - A.Izmaylova@cwi.nl - CWI} @contributor{Bert Lisser - Bert.Lisser@cwi.nl - CWI} @contributor{Vadim Zaytsev - vadim@grammarware.net - UvA} -module lang::rascal::tests::library::Map +module lang::rascal::tests::libraries::Map import Map; import Set; diff --git a/src/org/rascalmpl/library/lang/rascal/tests/library/Math.rsc b/src/org/rascalmpl/library/lang/rascal/tests/libraries/Math.rsc similarity index 99% rename from src/org/rascalmpl/library/lang/rascal/tests/library/Math.rsc rename to src/org/rascalmpl/library/lang/rascal/tests/libraries/Math.rsc index a73d3492e5c..19a5d713952 100644 --- a/src/org/rascalmpl/library/lang/rascal/tests/library/Math.rsc +++ b/src/org/rascalmpl/library/lang/rascal/tests/libraries/Math.rsc @@ -8,7 +8,7 @@ @contributor{Jurgen J. Vinju - Jurgen.Vinju@cwi.nl - CWI} @contributor{Paul Klint - Paul.Klint@cwi.nl - CWI} @contributor{Bert Lisser - Bert.Lisser@cwi.nl - CWI} -module lang::rascal::tests::library::Math +module lang::rascal::tests::libraries::Math import util::Math; diff --git a/src/org/rascalmpl/library/lang/rascal/tests/library/Node.rsc b/src/org/rascalmpl/library/lang/rascal/tests/libraries/Node.rsc similarity index 99% rename from src/org/rascalmpl/library/lang/rascal/tests/library/Node.rsc rename to src/org/rascalmpl/library/lang/rascal/tests/libraries/Node.rsc index 95ccda6cd5c..9e345943842 100644 --- a/src/org/rascalmpl/library/lang/rascal/tests/library/Node.rsc +++ b/src/org/rascalmpl/library/lang/rascal/tests/libraries/Node.rsc @@ -1,4 +1,4 @@ -module lang::rascal::tests::library::Node +module lang::rascal::tests::libraries::Node import Node; import ValueIO; diff --git a/src/org/rascalmpl/library/lang/rascal/tests/library/Number.rsc b/src/org/rascalmpl/library/lang/rascal/tests/libraries/Number.rsc similarity index 98% rename from src/org/rascalmpl/library/lang/rascal/tests/library/Number.rsc rename to src/org/rascalmpl/library/lang/rascal/tests/libraries/Number.rsc index e79c9aeda17..1e5d62dab37 100644 --- a/src/org/rascalmpl/library/lang/rascal/tests/library/Number.rsc +++ b/src/org/rascalmpl/library/lang/rascal/tests/libraries/Number.rsc @@ -1,4 +1,4 @@ - module lang::rascal::tests::library::Number + module lang::rascal::tests::libraries::Number /******************************************************************************* * Copyright (c) 2009-2015 CWI * All rights reserved. This program and the accompanying materials diff --git a/src/org/rascalmpl/library/lang/rascal/tests/library/Relation.rsc b/src/org/rascalmpl/library/lang/rascal/tests/libraries/Relation.rsc similarity index 99% rename from src/org/rascalmpl/library/lang/rascal/tests/library/Relation.rsc rename to src/org/rascalmpl/library/lang/rascal/tests/libraries/Relation.rsc index 5fb9e80acdf..ffec9f98f03 100644 --- a/src/org/rascalmpl/library/lang/rascal/tests/library/Relation.rsc +++ b/src/org/rascalmpl/library/lang/rascal/tests/libraries/Relation.rsc @@ -1,4 +1,4 @@ - module lang::rascal::tests::library::Relation + module lang::rascal::tests::libraries::Relation /******************************************************************************* * Copyright (c) 2009-2015 CWI * All rights reserved. This program and the accompanying materials diff --git a/src/org/rascalmpl/library/lang/rascal/tests/library/Set.rsc b/src/org/rascalmpl/library/lang/rascal/tests/libraries/Set.rsc similarity index 99% rename from src/org/rascalmpl/library/lang/rascal/tests/library/Set.rsc rename to src/org/rascalmpl/library/lang/rascal/tests/libraries/Set.rsc index b3374c5e52b..3e760541b53 100644 --- a/src/org/rascalmpl/library/lang/rascal/tests/library/Set.rsc +++ b/src/org/rascalmpl/library/lang/rascal/tests/libraries/Set.rsc @@ -1,4 +1,4 @@ - module lang::rascal::tests::library::Set + module lang::rascal::tests::libraries::Set /******************************************************************************* * Copyright (c) 2009-2015 CWI * All rights reserved. This program and the accompanying materials diff --git a/src/org/rascalmpl/library/lang/rascal/tests/library/String.rsc b/src/org/rascalmpl/library/lang/rascal/tests/libraries/String.rsc similarity index 99% rename from src/org/rascalmpl/library/lang/rascal/tests/library/String.rsc rename to src/org/rascalmpl/library/lang/rascal/tests/libraries/String.rsc index f806220cb4b..49d75373799 100644 --- a/src/org/rascalmpl/library/lang/rascal/tests/library/String.rsc +++ b/src/org/rascalmpl/library/lang/rascal/tests/libraries/String.rsc @@ -1,4 +1,4 @@ - module lang::rascal::tests::library::String + module lang::rascal::tests::libraries::String /******************************************************************************* * Copyright (c) 2009-2015 CWI * All rights reserved. This program and the accompanying materials diff --git a/src/org/rascalmpl/library/lang/rascal/tests/library/Type.rsc b/src/org/rascalmpl/library/lang/rascal/tests/libraries/Type.rsc similarity index 90% rename from src/org/rascalmpl/library/lang/rascal/tests/library/Type.rsc rename to src/org/rascalmpl/library/lang/rascal/tests/libraries/Type.rsc index 6053e722b37..1e367f0ac3f 100644 --- a/src/org/rascalmpl/library/lang/rascal/tests/library/Type.rsc +++ b/src/org/rascalmpl/library/lang/rascal/tests/libraries/Type.rsc @@ -1,4 +1,4 @@ -module lang::rascal::tests::library::Type +module lang::rascal::tests::libraries::Type import Type; diff --git a/src/org/rascalmpl/library/lang/rascal/tests/library/ValueIO.rsc b/src/org/rascalmpl/library/lang/rascal/tests/libraries/ValueIO.rsc similarity index 99% rename from src/org/rascalmpl/library/lang/rascal/tests/library/ValueIO.rsc rename to src/org/rascalmpl/library/lang/rascal/tests/libraries/ValueIO.rsc index 1bbdd8707a2..4e0537f2c8a 100644 --- a/src/org/rascalmpl/library/lang/rascal/tests/library/ValueIO.rsc +++ b/src/org/rascalmpl/library/lang/rascal/tests/libraries/ValueIO.rsc @@ -9,7 +9,7 @@ @contributor{Paul Klint - Paul.Klint@cwi.nl - CWI} @contributor{Arnold Lankamp - Arnold.Lankamp@cwi.nl} @contributor{Bert Lisser - Bert.Lisser@cwi.nl - CWI} -module lang::rascal::tests::library::ValueIO +module lang::rascal::tests::libraries::ValueIO import ValueIO; import util::UUID; diff --git a/src/org/rascalmpl/library/lang/rascal/tests/library/analysis/diff/edits/HiFiTreeDiffTests.rsc b/src/org/rascalmpl/library/lang/rascal/tests/libraries/analysis/diff/edits/HiFiTreeDiffTests.rsc similarity index 99% rename from src/org/rascalmpl/library/lang/rascal/tests/library/analysis/diff/edits/HiFiTreeDiffTests.rsc rename to src/org/rascalmpl/library/lang/rascal/tests/libraries/analysis/diff/edits/HiFiTreeDiffTests.rsc index 59342dc2b62..3dcbe56f50c 100644 --- a/src/org/rascalmpl/library/lang/rascal/tests/library/analysis/diff/edits/HiFiTreeDiffTests.rsc +++ b/src/org/rascalmpl/library/lang/rascal/tests/libraries/analysis/diff/edits/HiFiTreeDiffTests.rsc @@ -1,4 +1,4 @@ -module lang::rascal::tests::library::analysis::diff::edits::HiFiTreeDiffTests +module lang::rascal::tests::libraries::analysis::diff::edits::HiFiTreeDiffTests extend analysis::diff::edits::ExecuteTextEdits; extend analysis::diff::edits::HiFiLayoutDiff; diff --git a/src/org/rascalmpl/library/lang/rascal/tests/library/analysis/formalconcepts/FCATest.rsc b/src/org/rascalmpl/library/lang/rascal/tests/libraries/analysis/formalconcepts/FCATest.rsc similarity index 90% rename from src/org/rascalmpl/library/lang/rascal/tests/library/analysis/formalconcepts/FCATest.rsc rename to src/org/rascalmpl/library/lang/rascal/tests/libraries/analysis/formalconcepts/FCATest.rsc index 8045ac7e812..0e9f0b140d3 100644 --- a/src/org/rascalmpl/library/lang/rascal/tests/library/analysis/formalconcepts/FCATest.rsc +++ b/src/org/rascalmpl/library/lang/rascal/tests/libraries/analysis/formalconcepts/FCATest.rsc @@ -1,5 +1,5 @@ @ignoreCompiler{Fix failing tests} -module lang::rascal::tests::library::analysis::formalconcepts::FCATest +module lang::rascal::tests::libraries::analysis::formalconcepts::FCATest import util::Math; import Set; @@ -71,7 +71,7 @@ bool checkNoUnRelatedConcepts(rel[&TObject, &TAttribute] input) { } test bool fcaHasExpectedOutput() { - result = fca(readCxt(|std:///lang/rascal/tests/library/analysis/formalconcepts/FCxt1.cxt|)); - reference = readBinaryValueFile(#ConceptLattice[str,str], |std:///lang/rascal/tests/library/analysis/formalconcepts/FCxt1.fca|); + result = fca(readCxt(|std:///lang/rascal/tests/libraries/analysis/formalconcepts/FCxt1.cxt|)); + reference = readBinaryValueFile(#ConceptLattice[str,str], |std:///lang/rascal/tests/libraries/analysis/formalconcepts/FCxt1.fca|); return result == reference; } diff --git a/src/org/rascalmpl/library/lang/rascal/tests/library/analysis/formalconcepts/FCxt1.cxt b/src/org/rascalmpl/library/lang/rascal/tests/libraries/analysis/formalconcepts/FCxt1.cxt similarity index 100% rename from src/org/rascalmpl/library/lang/rascal/tests/library/analysis/formalconcepts/FCxt1.cxt rename to src/org/rascalmpl/library/lang/rascal/tests/libraries/analysis/formalconcepts/FCxt1.cxt diff --git a/src/org/rascalmpl/library/lang/rascal/tests/library/analysis/formalconcepts/FCxt1.fca b/src/org/rascalmpl/library/lang/rascal/tests/libraries/analysis/formalconcepts/FCxt1.fca similarity index 100% rename from src/org/rascalmpl/library/lang/rascal/tests/library/analysis/formalconcepts/FCxt1.fca rename to src/org/rascalmpl/library/lang/rascal/tests/libraries/analysis/formalconcepts/FCxt1.fca diff --git a/src/org/rascalmpl/library/lang/rascal/tests/library/analysis/graphs/GraphTests.rsc b/src/org/rascalmpl/library/lang/rascal/tests/libraries/analysis/graphs/GraphTests.rsc similarity index 99% rename from src/org/rascalmpl/library/lang/rascal/tests/library/analysis/graphs/GraphTests.rsc rename to src/org/rascalmpl/library/lang/rascal/tests/libraries/analysis/graphs/GraphTests.rsc index 7abc1fac012..56b6550ea5e 100644 --- a/src/org/rascalmpl/library/lang/rascal/tests/library/analysis/graphs/GraphTests.rsc +++ b/src/org/rascalmpl/library/lang/rascal/tests/libraries/analysis/graphs/GraphTests.rsc @@ -1,4 +1,4 @@ - module lang::rascal::tests::library::analysis::graphs::GraphTests + module lang::rascal::tests::libraries::analysis::graphs::GraphTests /******************************************************************************* * Copyright (c) 2009-2015 CWI * All rights reserved. This program and the accompanying materials diff --git a/src/org/rascalmpl/library/lang/rascal/tests/library/analysis/statistics/DescriptiveTests.rsc b/src/org/rascalmpl/library/lang/rascal/tests/libraries/analysis/statistics/DescriptiveTests.rsc similarity index 89% rename from src/org/rascalmpl/library/lang/rascal/tests/library/analysis/statistics/DescriptiveTests.rsc rename to src/org/rascalmpl/library/lang/rascal/tests/libraries/analysis/statistics/DescriptiveTests.rsc index 6be61b2b829..f5a25126854 100644 --- a/src/org/rascalmpl/library/lang/rascal/tests/library/analysis/statistics/DescriptiveTests.rsc +++ b/src/org/rascalmpl/library/lang/rascal/tests/libraries/analysis/statistics/DescriptiveTests.rsc @@ -1,10 +1,10 @@ -module lang::rascal::tests::library::analysis::statistics::DescriptiveTests +module lang::rascal::tests::libraries::analysis::statistics::DescriptiveTests import IO; import List; import util::Math; import analysis::statistics::Descriptive; -import lang::rascal::tests::library::analysis::statistics::RangeUtils; +import lang::rascal::tests::libraries::analysis::statistics::RangeUtils; bool eq(num a, num b) { error = 1 / pow(10, min(scale(a), scale(b)) - 1); diff --git a/src/org/rascalmpl/library/lang/rascal/tests/library/analysis/statistics/RangeUtils.rsc b/src/org/rascalmpl/library/lang/rascal/tests/libraries/analysis/statistics/RangeUtils.rsc similarity index 96% rename from src/org/rascalmpl/library/lang/rascal/tests/library/analysis/statistics/RangeUtils.rsc rename to src/org/rascalmpl/library/lang/rascal/tests/libraries/analysis/statistics/RangeUtils.rsc index 8fc77fc990b..2281a8729ba 100644 --- a/src/org/rascalmpl/library/lang/rascal/tests/library/analysis/statistics/RangeUtils.rsc +++ b/src/org/rascalmpl/library/lang/rascal/tests/libraries/analysis/statistics/RangeUtils.rsc @@ -1,5 +1,5 @@ @synopsis{Conversions and assertions on numerical ranges, for testing and sampling purposes.} -module lang::rascal::tests::library::analysis::statistics::RangeUtils +module lang::rascal::tests::libraries::analysis::statistics::RangeUtils import util::Math; import IO; diff --git a/src/org/rascalmpl/library/lang/rascal/tests/library/lang/csv/CSVIOTests.rsc b/src/org/rascalmpl/library/lang/rascal/tests/libraries/lang/csv/CSVIOTests.rsc similarity index 98% rename from src/org/rascalmpl/library/lang/rascal/tests/library/lang/csv/CSVIOTests.rsc rename to src/org/rascalmpl/library/lang/rascal/tests/libraries/lang/csv/CSVIOTests.rsc index 39ce357e2d2..3cbccc2f91d 100644 --- a/src/org/rascalmpl/library/lang/rascal/tests/library/lang/csv/CSVIOTests.rsc +++ b/src/org/rascalmpl/library/lang/rascal/tests/libraries/lang/csv/CSVIOTests.rsc @@ -1,4 +1,4 @@ -module lang::rascal::tests::library::lang::csv::CSVIOTests +module lang::rascal::tests::libraries::lang::csv::CSVIOTests import IO; import Type; diff --git a/src/org/rascalmpl/library/lang/rascal/tests/library/lang/html/IOTests.rsc b/src/org/rascalmpl/library/lang/rascal/tests/libraries/lang/html/IOTests.rsc similarity index 95% rename from src/org/rascalmpl/library/lang/rascal/tests/library/lang/html/IOTests.rsc rename to src/org/rascalmpl/library/lang/rascal/tests/libraries/lang/html/IOTests.rsc index b4e5d5aacf2..95abf0274ff 100644 --- a/src/org/rascalmpl/library/lang/rascal/tests/library/lang/html/IOTests.rsc +++ b/src/org/rascalmpl/library/lang/rascal/tests/libraries/lang/html/IOTests.rsc @@ -1,4 +1,4 @@ -module lang::rascal::tests::library::lang::html::IOTests +module lang::rascal::tests::libraries::lang::html::IOTests import lang::html::IO; import IO; diff --git a/src/org/rascalmpl/library/lang/rascal/tests/library/lang/json/JSONIOTests.rsc b/src/org/rascalmpl/library/lang/rascal/tests/libraries/lang/json/JSONIOTests.rsc similarity index 97% rename from src/org/rascalmpl/library/lang/rascal/tests/library/lang/json/JSONIOTests.rsc rename to src/org/rascalmpl/library/lang/rascal/tests/libraries/lang/json/JSONIOTests.rsc index 1c889cb2baf..99c3b0b8e17 100644 --- a/src/org/rascalmpl/library/lang/rascal/tests/library/lang/json/JSONIOTests.rsc +++ b/src/org/rascalmpl/library/lang/rascal/tests/libraries/lang/json/JSONIOTests.rsc @@ -1,4 +1,4 @@ -module lang::rascal::tests::library::lang::json::JSONIOTests +module lang::rascal::tests::libraries::lang::json::JSONIOTests import String; import lang::json::IO; @@ -89,8 +89,8 @@ test bool json3() = writeRead(#DATA3, data3(123,kw="123")); test bool json4(Enum e) = writeRead(#DATA4, data4(e=e)); test bool originTracking() { - ex2 = readJSON(#node, |std:///lang/rascal/tests/library/lang/json/glossary.json|, trackOrigins=true); - content = readFile(|std:///lang/rascal/tests/library/lang/json/glossary.json|); + ex2 = readJSON(#node, |std:///lang/rascal/tests/libraries/lang/json/glossary.json|, trackOrigins=true); + content = readFile(|std:///lang/rascal/tests/libraries/lang/json/glossary.json|); poss = [ | /node x := ex2, x.line?]; // every node has a .src field, otherwise this fails with an exception @@ -173,7 +173,7 @@ value toDefaultValue(real r) = r - round(r) == 0 default value toDefaultValue(value x) = x; test bool accurateParseErrors() { - ex = readFile(|std:///lang/rascal/tests/library/lang/json/glossary.json|); + ex = readFile(|std:///lang/rascal/tests/libraries/lang/json/glossary.json|); broken = ex[..size(ex)/2] + ex[size(ex)/2+10..]; try { diff --git a/src/org/rascalmpl/library/lang/rascal/tests/library/lang/json/glossary.json b/src/org/rascalmpl/library/lang/rascal/tests/libraries/lang/json/glossary.json similarity index 100% rename from src/org/rascalmpl/library/lang/rascal/tests/library/lang/json/glossary.json rename to src/org/rascalmpl/library/lang/rascal/tests/libraries/lang/json/glossary.json diff --git a/src/org/rascalmpl/library/lang/rascal/tests/library/lang/xml/XMLIOTests.rsc b/src/org/rascalmpl/library/lang/rascal/tests/libraries/lang/xml/XMLIOTests.rsc similarity index 89% rename from src/org/rascalmpl/library/lang/rascal/tests/library/lang/xml/XMLIOTests.rsc rename to src/org/rascalmpl/library/lang/rascal/tests/libraries/lang/xml/XMLIOTests.rsc index 5513ca7018b..fe4c65fb0d0 100644 --- a/src/org/rascalmpl/library/lang/rascal/tests/library/lang/xml/XMLIOTests.rsc +++ b/src/org/rascalmpl/library/lang/rascal/tests/libraries/lang/xml/XMLIOTests.rsc @@ -1,4 +1,4 @@ -module lang::rascal::tests::library::lang::xml::XMLIOTests +module lang::rascal::tests::libraries::lang::xml::XMLIOTests import IO; import String; @@ -73,12 +73,12 @@ test bool namespacesMultiple() test bool originTrackingElements() { - loc l = |std:///lang/rascal/tests/library/lang/xml/glossary.xml|; + loc l = |std:///lang/rascal/tests/libraries/lang/xml/glossary.xml|; return originTracking(readXML(l, trackOrigins=true), readFile(l)); } test bool originTrackingElementsWithEndTags() { - loc l = |std:///lang/rascal/tests/library/lang/xml/glossary.xml|; + loc l = |std:///lang/rascal/tests/libraries/lang/xml/glossary.xml|; return originTracking(readXML(l, trackOrigins=true, includeEndTags=true), readFile(l)); } @@ -100,8 +100,8 @@ private bool originTracking(node example, str content) { } test bool streamingAPI() { - loc l = |std:///lang/rascal/tests/library/lang/xml/glossary.xml|; - next = streamXML(|std:///lang/rascal/tests/library/lang/xml/glossary.xml|, "GlossEntry"); + loc l = |std:///lang/rascal/tests/libraries/lang/xml/glossary.xml|; + next = streamXML(|std:///lang/rascal/tests/libraries/lang/xml/glossary.xml|, "GlossEntry"); return just(node _) := next() && nothing() := next(); } \ No newline at end of file diff --git a/src/org/rascalmpl/library/lang/rascal/tests/library/lang/xml/glossary.xml b/src/org/rascalmpl/library/lang/rascal/tests/libraries/lang/xml/glossary.xml similarity index 100% rename from src/org/rascalmpl/library/lang/rascal/tests/library/lang/xml/glossary.xml rename to src/org/rascalmpl/library/lang/rascal/tests/libraries/lang/xml/glossary.xml diff --git a/src/org/rascalmpl/library/lang/rascal/tests/library/util/MaybeTests.rsc b/src/org/rascalmpl/library/lang/rascal/tests/libraries/util/MaybeTests.rsc similarity index 95% rename from src/org/rascalmpl/library/lang/rascal/tests/library/util/MaybeTests.rsc rename to src/org/rascalmpl/library/lang/rascal/tests/libraries/util/MaybeTests.rsc index 0551b1434f4..11fed874145 100644 --- a/src/org/rascalmpl/library/lang/rascal/tests/library/util/MaybeTests.rsc +++ b/src/org/rascalmpl/library/lang/rascal/tests/libraries/util/MaybeTests.rsc @@ -1,4 +1,4 @@ -module lang::rascal::tests::library::util::MaybeTests +module lang::rascal::tests::libraries::util::MaybeTests import util::Maybe; diff --git a/src/org/rascalmpl/library/lang/rascal/tests/library/util/PriorityQueueTests.rsc b/src/org/rascalmpl/library/lang/rascal/tests/libraries/util/PriorityQueueTests.rsc similarity index 85% rename from src/org/rascalmpl/library/lang/rascal/tests/library/util/PriorityQueueTests.rsc rename to src/org/rascalmpl/library/lang/rascal/tests/libraries/util/PriorityQueueTests.rsc index fd017f9a44c..9a6e3beb335 100644 --- a/src/org/rascalmpl/library/lang/rascal/tests/library/util/PriorityQueueTests.rsc +++ b/src/org/rascalmpl/library/lang/rascal/tests/libraries/util/PriorityQueueTests.rsc @@ -1,4 +1,4 @@ -module lang::rascal::tests::library::util::PriorityQueueTests +module lang::rascal::tests::libraries::util::PriorityQueueTests import List; import util::PriorityQueue; diff --git a/src/org/rascalmpl/library/lang/rascal/tests/library/util/ReflectiveTests.rsc b/src/org/rascalmpl/library/lang/rascal/tests/libraries/util/ReflectiveTests.rsc similarity index 98% rename from src/org/rascalmpl/library/lang/rascal/tests/library/util/ReflectiveTests.rsc rename to src/org/rascalmpl/library/lang/rascal/tests/libraries/util/ReflectiveTests.rsc index d19248017eb..5a56af4d858 100644 --- a/src/org/rascalmpl/library/lang/rascal/tests/library/util/ReflectiveTests.rsc +++ b/src/org/rascalmpl/library/lang/rascal/tests/libraries/util/ReflectiveTests.rsc @@ -1,4 +1,4 @@ -module lang::rascal::tests::library::util::ReflectiveTests +module lang::rascal::tests::libraries::util::ReflectiveTests import IO; import List; diff --git a/src/org/rascalmpl/library/lang/rascal/tests/library/util/SemVerTests.rsc b/src/org/rascalmpl/library/lang/rascal/tests/libraries/util/SemVerTests.rsc similarity index 99% rename from src/org/rascalmpl/library/lang/rascal/tests/library/util/SemVerTests.rsc rename to src/org/rascalmpl/library/lang/rascal/tests/libraries/util/SemVerTests.rsc index c90b984f25a..90714b2eb52 100644 --- a/src/org/rascalmpl/library/lang/rascal/tests/library/util/SemVerTests.rsc +++ b/src/org/rascalmpl/library/lang/rascal/tests/libraries/util/SemVerTests.rsc @@ -1,4 +1,4 @@ -module lang::rascal::tests::library::util::SemVerTests +module lang::rascal::tests::libraries::util::SemVerTests import util::SemVer; import Exception; diff --git a/src/org/rascalmpl/library/lang/rascal/tests/library/util/UUIDTests.rsc b/src/org/rascalmpl/library/lang/rascal/tests/libraries/util/UUIDTests.rsc similarity index 53% rename from src/org/rascalmpl/library/lang/rascal/tests/library/util/UUIDTests.rsc rename to src/org/rascalmpl/library/lang/rascal/tests/libraries/util/UUIDTests.rsc index 847273a22da..881573fcc27 100644 --- a/src/org/rascalmpl/library/lang/rascal/tests/library/util/UUIDTests.rsc +++ b/src/org/rascalmpl/library/lang/rascal/tests/libraries/util/UUIDTests.rsc @@ -1,4 +1,4 @@ -module lang::rascal::tests::library::util::UUIDTests +module lang::rascal::tests::libraries::util::UUIDTests import util::UUID; diff --git a/test/org/rascalmpl/test/functionality/ParallelEvaluatorsTests.java b/test/org/rascalmpl/test/functionality/ParallelEvaluatorsTests.java index 6f5737b9b56..e8ec39aaca7 100644 --- a/test/org/rascalmpl/test/functionality/ParallelEvaluatorsTests.java +++ b/test/org/rascalmpl/test/functionality/ParallelEvaluatorsTests.java @@ -26,8 +26,8 @@ public class ParallelEvaluatorsTests { private static final IRascalMonitor monitor = new NullRascalMonitor(); private static final String[] testModules = new String[] { - "lang::rascal::tests::library::ValueIO", - "lang::rascal::tests::library::Map", + "lang::rascal::tests::libraries::ValueIO", + "lang::rascal::tests::libraries::Map", "lang::rascal::tests::concrete::Parsing" }; diff --git a/test/org/rascalmpl/test/library/RunRascalTestModules.java b/test/org/rascalmpl/test/library/RunRascalTestModules.java index d616320ed04..2cf4d5d6113 100644 --- a/test/org/rascalmpl/test/library/RunRascalTestModules.java +++ b/test/org/rascalmpl/test/library/RunRascalTestModules.java @@ -5,6 +5,6 @@ import org.rascalmpl.test.infrastructure.RascalJUnitTestRunner; @RunWith(RascalJUnitTestRunner.class) -@RascalJUnitTestPrefix("lang::rascal::tests::library") +@RascalJUnitTestPrefix("lang::rascal::tests::libraries") public class RunRascalTestModules { } diff --git a/test/org/rascalmpl/test/parallel/AllSuiteParallel.java b/test/org/rascalmpl/test/parallel/AllSuiteParallel.java index c358bcafd2b..c8a94facbca 100644 --- a/test/org/rascalmpl/test/parallel/AllSuiteParallel.java +++ b/test/org/rascalmpl/test/parallel/AllSuiteParallel.java @@ -12,7 +12,7 @@ "lang::rascal::tests::demo", "lang::rascal::tests::functionality", "lang::rascal::tests::imports", - "lang::rascal::tests::library" + "lang::rascal::tests::libraries" }) public class AllSuiteParallel { } diff --git a/test/org/rascalmpl/test/util/library/RunRascalTestModules.java b/test/org/rascalmpl/test/util/library/RunRascalTestModules.java index b5f36bcf3b0..d08cb738ff7 100644 --- a/test/org/rascalmpl/test/util/library/RunRascalTestModules.java +++ b/test/org/rascalmpl/test/util/library/RunRascalTestModules.java @@ -5,6 +5,6 @@ import org.rascalmpl.test.infrastructure.RascalJUnitTestRunner; @RunWith(RascalJUnitTestRunner.class) -@RascalJUnitTestPrefix("lang::rascal::tests::library") +@RascalJUnitTestPrefix("lang::rascal::tests::libraries") public class RunRascalTestModules { }