Merge branch 'main' into fix/issues-2880-2881-newrascalpom

Author: sungshik

.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-RC15-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</tag>
     </scm>
 
     <!-- dependency resolution configuration (usethesource) -->
@@ -157,7 +157,7 @@
                                 <ignore>${project.basedir}/src/org/rascalmpl/library/experiments</ignore>
                                 <ignore>${project.basedir}/src/org/rascalmpl/library/resource</ignore>
                                 <ignore>${project.basedir}/src/org/rascalmpl/library/lang/rascal/tests</ignore>
-                              <ignore>${project.basedir}/src/org/rascalmpl/library/lang/rascal/grammar/tests</ignore>
+                                <ignore>${project.basedir}/src/org/rascalmpl/library/lang/rascal/grammar/tests</ignore>
                                 <ignore>${project.basedir}/src/org/rascalmpl/library/lang/rascal/syntax/tests</ignore>
                             </ignores>
                         </configuration>
@@ -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;
 	}