Remove std scheme

.github/workflows/build.yaml

@@ -8,7 +8,8 @@ on:
   pull_request:
     branches:
       - main
-      - 'feat/*'
+      - 'feat/**'
+      - 'feature/**'
 env:
   MAVEN_OPTS: "-Xmx4G -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
   IS_OWN_PR: "${{ secrets.MAVEN_MIRROR_URL }}"

pom.xml

@@ -3,12 +3,12 @@
 
     <groupId>org.rascalmpl</groupId>
     <artifactId>rascal</artifactId>
-    <version>0.43.0-RC13</version>
+    <version>0.43.0-RC13-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <scm>
         <developerConnection>scm:git:ssh://git@github.com/usethesource/rascal.git</developerConnection>
-        <tag>v0.43.0-RC14-PREVIEW-REGULAR-PARSERS</tag>
+        <tag>v0.43.0-RC13-SNAPSHOT</tag>
     </scm>
 
     <!-- dependency resolution configuration (usethesource) -->
@@ -201,7 +201,6 @@
                             <srcs>
                                 <src>${project.basedir}/src/org/rascalmpl/library</src>
                             </srcs>
-                            <sourceLookup>|std:///|</sourceLookup>
                         </configuration>
                     </execution> 
                 </executions>

src/org/rascalmpl/compiler/CheckTestSources.rsc

@@ -66,7 +66,7 @@ void checkTestSources(list[str] cmdLineArgs) {
    if("all" in cmdLineArgs){
       modulesToCheck = getRascalModules(REPO + "rascal/src/org/rascalmpl/library", pcfg);         
    } else {         
-      testFolders = [ //|std:///lang/rascal/tests|,
+      testFolders = [ //|project://rascal/src/org/rascalmpl/library/lang/rascal/tests|,
                        //REPO + "/rascal-core/lang/rascalcore/check::tests",
                        REPO + "/typepal/src/"
                     ];

src/org/rascalmpl/compiler/CompileTestSources.rsc

@@ -145,7 +145,7 @@ void compileTestSources(PathConfig pcfg) {
    //  total += d;
    //}
 
-   testFolder = |std:///lang/rascal/|;
+   testFolder = |project://rascal/src/org/rascalmpl/library/lang/rascal/|;
 
    testModules = [ replaceAll(file[extension=""].path[1..], "/", "::") 
                  | loc file <- find(testFolder, "rsc")     // all Rascal source files

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

@@ -75,14 +75,14 @@ public loc testModulesRoot = testRoot + "src";
 private int npc = 0;
 @synopsis{PathConfig for testing generated modules in |memory://test-modules/| in memory file system, not depending on any outside libraries.}
 @description{
-* gets source files exclusively from |memory://test-modules/| and |std:///| (for library code)
+* gets source files exclusively from |memory://test-modules/| and |project://rascal/src/org/rascalmpl/library/| (for library code)
 * generates bin files in the in-memory file system
 }
 public PathConfig getDefaultTestingPathConfig() {
     npc += 1;
     snpc = "<npc>";
     return pathConfig(
-        srcs = [ testModulesRoot, |std:///|  ],
+        srcs = [ testModulesRoot, |project://rascal/src/org/rascalmpl/library/|  ],
         bin = testRoot + "rascal-tests-bin-<snpc>",
         generatedSources = testRoot + "generated-test-sources-<snpc>",
         generatedResources = testRoot + "generated-test-resources-<snpc>",

src/org/rascalmpl/compiler/lang/rascalcore/compile/AREADME.txt

@@ -71,13 +71,13 @@ config			void config(						// Inspect type checker configuration file
             		Query select = none())			// Query to define what to show
 Examples:
 
-compile(|std:///experiments/Compiler/Examples/Fac.rsc|);
+compile(|project://rascal/src/org/rascalmpl/library/experiments/Compiler/Examples/Fac.rsc|);
 
-execute(|std:///experiments/Compiler/Examples/Fac.rsc|, []);
-execute(|std:///experiments/Compiler/Examples/Fac.rsc|, [], recompile=true);
-execute(|std:///experiments/Compiler/Examples/Fac.rsc|, [], profile=true);
+execute(|project://rascal/src/org/rascalmpl/library/experiments/Compiler/Examples/Fac.rsc|, []);
+execute(|project://rascal/src/org/rascalmpl/library/experiments/Compiler/Examples/Fac.rsc|, [], recompile=true);
+execute(|project://rascal/src/org/rascalmpl/library/experiments/Compiler/Examples/Fac.rsc|, [], profile=true);
 
-inspect(|std:///experiments/Compiler/Examples/Fac.rsc|)
+inspect(|project://rascal/src/org/rascalmpl/library/experiments/Compiler/Examples/Fac.rsc|)
 
 
 Directory structure:

src/org/rascalmpl/compiler/lang/rascalcore/compile/Examples/RascalExtraction.rsc

@@ -37,7 +37,7 @@ import util::Reflective;
 value main() = compareAll();
 
 value compareAll() {
-	moduleLoc = |std:///experiments/Compiler/Rascal2muRascal/RascalExpression.rsc|;
+	moduleLoc = |project://rascal/src/org/rascalmpl/library/experiments/Compiler/Rascal2muRascal/RascalExpression.rsc|;
 	//moduleLoc = |project://rascal/src/org/rascalmpl/library/experiments/Compiler/Examples/Tst3.rsc|;
 	m = parse(#start[Module], moduleLoc).top;
 	t = cpuTime();

src/org/rascalmpl/compiler/lang/rascalcore/compile/Examples/RascalMetrics.rsc

@@ -45,13 +45,13 @@ value main()
 
 value measure(){
 
-     //moduleLoc = |std:///lang/rascal/syntax/Rascal.rsc|;
-    moduleLoc = |std:///experiments/Compiler/RVM/AST.rsc|;
-    //moduleLoc = |std:///experiments/Compiler/RVM/Syntax.rsc|;
-    //moduleLoc = |std:///experiments/Compiler/muRascal/Syntax.rsc|;
-     //moduleLoc = |std:///experiments/Compiler/muRascal/AST.rsc|;
-    //moduleLoc = |std:///demo/lang/Pico/Syntax.rsc|;
-    //moduleLoc = |std:///demo/lang/Exp/Concrete/NoLayout/Syntax.rsc|;
+     //moduleLoc = |project://rascal/src/org/rascalmpl/library/lang/rascal/syntax/Rascal.rsc|;
+    moduleLoc = |project://rascal/src/org/rascalmpl/library/experiments/Compiler/RVM/AST.rsc|;
+    //moduleLoc = |project://rascal/src/org/rascalmpl/library/experiments/Compiler/RVM/Syntax.rsc|;
+    //moduleLoc = |project://rascal/src/org/rascalmpl/library/experiments/Compiler/muRascal/Syntax.rsc|;
+     //moduleLoc = |project://rascal/src/org/rascalmpl/library/experiments/Compiler/muRascal/AST.rsc|;
+    //moduleLoc = |project://rascal/src/org/rascalmpl/library/demo/lang/Pico/Syntax.rsc|;
+    //moduleLoc = |project://rascal/src/org/rascalmpl/library/demo/lang/Exp/Concrete/NoLayout/Syntax.rsc|;
     m = parse(#start[Module], moduleLoc).top;
     stats = ();
     nonterm = {};

src/org/rascalmpl/interpreter/load/IRascalSearchPathContributor.java

@@ -11,11 +11,11 @@
 *******************************************************************************/
 package org.rascalmpl.interpreter.load;
 
-import java.util.List;
+import java.util.Collection;
 
 import io.usethesource.vallang.ISourceLocation;
 
 public interface IRascalSearchPathContributor {
-	void contributePaths(List<ISourceLocation> path);
+	Collection<ISourceLocation> contributePaths();
 	String getName();
 }

src/org/rascalmpl/interpreter/load/RascalSearchPath.java

@@ -17,13 +17,15 @@
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
 import org.rascalmpl.interpreter.Configuration;
 import org.rascalmpl.uri.URIResolverRegistry;
 import org.rascalmpl.uri.URIUtil;
+
 import io.usethesource.vallang.ISourceLocation;
 
 /**
@@ -41,7 +43,8 @@ public RascalSearchPath() {
 	}
 
 	public void addPathContributor(IRascalSearchPathContributor contrib) {
-		if(!contributors.contains(contrib)){
+		if (!contributors.contains(contrib)) {
+			// Later contributors take precedence over earlier ones. Insert at the front.
 			contributors.add(0, contrib);
 		}
 	}
@@ -103,12 +106,12 @@ public ISourceLocation getRootForModule(String module) {
 		}
 	}
 
-	public List<ISourceLocation> collect() { 
-		List<ISourceLocation> paths = new LinkedList<ISourceLocation>();
+	public Collection<ISourceLocation> collect() {
+		var paths = new LinkedList<ISourceLocation>();
 		for (IRascalSearchPathContributor c : contributors) {
-			c.contributePaths(paths);
+			paths.addAll(c.contributePaths());
 		}
-		
+
 		return paths;
 	}
 

src/org/rascalmpl/interpreter/load/SourceLocationListContributor.java

@@ -1,10 +1,10 @@
 package org.rascalmpl.interpreter.load;
 
-import java.util.List;
+import java.util.Collection;
+import java.util.stream.Collectors;
 
 import io.usethesource.vallang.IList;
 import io.usethesource.vallang.ISourceLocation;
-import io.usethesource.vallang.IValue;
 import io.usethesource.vallang.type.TypeFactory;
 
 public class SourceLocationListContributor implements IRascalSearchPathContributor {
@@ -18,10 +18,8 @@ public SourceLocationListContributor(String label, IList sourceLocations) {
   }
 
   @Override
-  public void contributePaths(List<ISourceLocation> path) {
-    for (IValue elem : locs) {
-      path.add(((ISourceLocation) elem));
-    }
+  public Collection<ISourceLocation> contributePaths() {
+    return locs.stream().map(ISourceLocation.class::cast).collect(Collectors.toList());
   }
 
   @Override

src/org/rascalmpl/interpreter/load/URIContributor.java

@@ -12,6 +12,7 @@
 *******************************************************************************/
 package org.rascalmpl.interpreter.load;
 
+import java.util.Collection;
 import java.util.List;
 
 import io.usethesource.vallang.ISourceLocation;
@@ -30,8 +31,8 @@ public String getName() {
 	}
 
 	@Override
-	public void contributePaths(List<ISourceLocation> path) {
-		path.add(0, uri);
+	public Collection<ISourceLocation> contributePaths() {
+		return List.of(uri);
 	}
 
 	@Override

src/org/rascalmpl/library/IO.rsc

@@ -204,7 +204,7 @@ import IO;
 
 Does the library file `IO.rsc` exist?
 ```rascal-shell,continue
-exists(|std:///IO.rsc|);
+exists(|project://rascal/src/org/rascalmpl/library/IO.rsc|);
 ```
 }
 @javaClass{org.rascalmpl.library.Prelude}
@@ -218,7 +218,7 @@ import IO;
 ```
 Find the file `IO.rsc` in the standard library:
 ```rascal-shell,continue
-find("IO.rsc", [|std:///|]);
+find("IO.rsc", [|project://rascal/src/org/rascalmpl/library/|]);
 ```
 }
 public loc find(str name, list[loc] path) throws PathNotFound {
@@ -367,7 +367,7 @@ import IO;
 ```
 Determine the last modification date of the Rascal standard library:
 ```rascal-shell,continue
-lastModified(|std:///IO.rsc|);
+lastModified(|project://rascal/src/org/rascalmpl/library/IO.rsc|);
 ```
 }
 @javaClass{org.rascalmpl.library.Prelude}
@@ -384,7 +384,7 @@ import IO;
 ```
 Determine the last modification date of the Rascal standard library:
 ```rascal-shell,continue
-created(|std:///IO.rsc|);
+created(|project://rascal/src/org/rascalmpl/library/IO.rsc|);
 ```
 }
 @javaClass{org.rascalmpl.library.Prelude}
@@ -412,7 +412,7 @@ import IO;
 ```
 List all entries in the standard library:
 ```rascal-shell,continue
-listEntries(|std:///|);
+listEntries(|project://rascal/src/org/rascalmpl/library/|);
 ```
 }
 @javaClass{org.rascalmpl.library.Prelude}

src/org/rascalmpl/library/index.md

@@ -21,13 +21,6 @@ println("Hello Rascal!");
 
 The ((Library:module:IO)) module is otherwise most commonly used, because it contains ((println)).
 
-The standard library has its own location scheme `std:///` which can be used to explore
-its folder structure on the REPL. Note that source locations have auto-complete for the path component.
-
-```rascal-shell
-|std:///|.ls
-```
-
 These are the entry points to the entire library:
 (((TOC)))
 

src/org/rascalmpl/library/lang/rascal/grammar/tests/Compare.rsc

@@ -8,8 +8,8 @@ import Set;
 value main() = compare3();
 
 value compare1() {
- INT = split("\n", readFile(|std:///lang/rascal/grammar/tests/generated_parsers/CParserINT.java|));
- COMP = split("\n", readFile(|std://lang/rascal/grammar/tests/generated_parsers/CParserCOMP.java|));
+ INT = split("\n", readFile(|project://rascal/src/org/rascalmpl/library/lang/rascal/grammar/tests/generated_parsers/CParserINT.java|));
+ COMP = split("\n", readFile(|project://rascal/src/org/rascalmpl/library/lang/rascal/grammar/tests/generated_parsers/CParserCOMP.java|));
 
  INTSET = toSet(INT);
  COMPSET = toSet(COMP);

src/org/rascalmpl/library/lang/rascal/grammar/tests/ParserGeneratorTests.rsc

@@ -307,16 +307,16 @@ bool sameLines(str s1, str s2) = size(removeEmptyLines(s1) - removeEmptyLines(s2
 
 test bool tstNewGenerateGEMPTY() = 
 	sameLines(newGenerate("org.rascalmpl.library.lang.rascal.grammar.tests.generated_parsers", "GEMPTYParser", GEMPTY), 
-		      readFile(|std:///lang/rascal/grammar/tests/generated_parsers/GEMPTYParser.java.gz|));
+		      readFile(|project://rascal/src/org/rascalmpl/library/lang/rascal/grammar/tests/generated_parsers/GEMPTYParser.java.gz|));
 
 test bool tstNewGenerateG0() = 
 	sameLines(newGenerate("org.rascalmpl.library.lang.rascal.grammar.tests.generated_parsers", "G0Parser", G0), 
-	          readFile(|std:///lang/rascal/grammar/tests/generated_parsers/G0Parser.java.gz|));
+	          readFile(|project://rascal/src/org/rascalmpl/library/lang/rascal/grammar/tests/generated_parsers/G0Parser.java.gz|));
 
 test bool tstNewGenerateGEXP() = 
 	sameLines(newGenerate("org.rascalmpl.library.lang.rascal.grammar.tests.generated_parsers", "GEXPParser", GEXP), 
-	readFile(|std:///lang/rascal/grammar/tests/generated_parsers/GEXPParser.java.gz|));
+	readFile(|project://rascal/src/org/rascalmpl/library/lang/rascal/grammar/tests/generated_parsers/GEXPParser.java.gz|));
 
 test bool tstNewGenerateGEXPPRIO() = 
 	sameLines(newGenerate("org.rascalmpl.library.lang.rascal.grammar.tests.generated_parsers", "GEXPPRIOParser", GEXPPRIO), 
-		      readFile(|std:///lang/rascal/grammar/tests/generated_parsers/GEXPPRIOParser.java.gz|));
+		      readFile(|project://rascal/src/org/rascalmpl/library/lang/rascal/grammar/tests/generated_parsers/GEXPPRIOParser.java.gz|));

src/org/rascalmpl/library/lang/rascal/syntax/tests/ParsingRegressionTests.rsc

@@ -40,7 +40,7 @@ public bool testModules(list[loc] files, list[loc] _) {
 }
 
 
-public test bool StandardLibrary() = testModules([f |  /file(f) <- crawl(|std:///|), f.extension == "rsc", /experiments/ !:= f.path], []);
+public test bool StandardLibrary() = testModules([f |  /file(f) <- crawl(|project://rascal/src/org/rascalmpl/library/|), f.extension == "rsc", /experiments/ !:= f.path], []);
 
 public test bool testTutor() = testModules([f |  /file(f) <- crawl(|tutor:///|), f.extension == "rsc"], [|tutor:///|]);
 

src/org/rascalmpl/library/lang/rascal/tests/basic/IsDefined.rsc

@@ -19,8 +19,8 @@ test bool isDefinedLoc1() = |project://x/y.txt|(5,4,<1,5>,<1,9>).begin?;
 test bool isDefinedLoc2() = |project://x/y.txt|(5,4,<1,5>,<1,9>).end?;
 test bool isDefinedLoc3() = !(|project://x/y.txt|(5,4,<1,5>,<1,9>).host?);
 
-test bool isDefinedLoc4() = !(|std:///List.rsc|.ls?);
-test bool isDefinedLoc5() = |std:///util|.ls?;
+test bool isDefinedLoc4() = !(|project://rascal/src/org/rascalmpl/library/List.rsc|.ls?);
+test bool isDefinedLoc5() = |project://rascal/src/org/rascalmpl/library/util|.ls?;
 
 // Lists
 

src/org/rascalmpl/library/lang/rascal/tests/concrete/ModulesWithStoredParsers.rsc

@@ -29,7 +29,7 @@ PathConfig getTestPathConfig(loc root) {
     pcfg = getProjectPathConfig(root);
     pcfg.bin = root + "target/classes";
     // remove std to avoid generating parsers for all modules in the library that contain syntax definitions
-    pcfg.srcs -= [|std:///|];
+    pcfg.srcs -= [|project://rascal/src/org/rascalmpl/library/|];
     return pcfg;
 }