Sep 4, 2025 · Sep 4, 2025 · Sep 4, 2025 · Sep 4, 2025 · Sep 4, 2025 · Sep 5, 2025
diff --git a/src/org/rascalmpl/interpreter/env/GlobalEnvironment.java b/src/org/rascalmpl/interpreter/env/GlobalEnvironment.java
 .collect(Collectors.toList());
    }

 /**
 * This starts with an edge that is not yet in the graph because we are loading these
 * modules. Then the rest of graph is loaded from what we already have in memory.
 * @param parent the first and last node of a detected cycle.
 * @return
 */
    public List<String> findCyclicImportPathFrom(String parent, String child) {
        SetMultimap.Transient<String, String> graph = getImportGraphFrom(child);
 graph.__put(parent, child); // add the last edge that was not yet registered
 IRascalValueFactory vf = IRascalValueFactory.getInstance();
 return depthFirstSearch(parent, new HashSet<>(), vf.list(vf.string(parent)), graph)
 .stream()
 .map(IString.class::cast)
 .map(IString::getValue)
 .collect(Collectors.toList());
    }

 /*
 * dfs uses an immutable IList for the path such that we don't have to maintain a stack, next to the
 * recursion.
 * otherwise this is a standard depth-first search for a directed graph
 */
 private IList depthFirstSearch(String parent, Set<String> visited, IList path,  SetMultimap.Transient<String, String> graph) {
 public IList depthFirstSearch(String parent, Set<String> visited, IList path,  SetMultimap.Transient<String, String> graph) {
 visited.add(parent);
 var vf = IRascalValueFactory.getInstance();

diff --git a/src/org/rascalmpl/interpreter/env/ModuleEnvironment.java b/src/org/rascalmpl/interpreter/env/ModuleEnvironment.java
 return Collections.<String>emptySet();
 }

 /**
 * This collects only "extends" edges starting from the current module
 * @return
 */
 public SetMultimap.Transient<String, String> collectExtendsGraph() {
 List<String> todo = new LinkedList<String>();
 Set<String> done = new HashSet<String>();
 return result;
 }

 /**
 * This collects only "extends" edges starting from the current module
 * @return
 */
 public SetMultimap.Transient<String, String> collectModuleDependencyGraph() {
 List<String> todo = new LinkedList<String>();
 Set<String> done = new HashSet<String>();
 SetMultimap.Transient<String, String> result = PersistentTrieSetMultimap.transientOf();
 todo.add(this.getName());
 GlobalEnvironment heap = getHeap();

 while (!todo.isEmpty()) {
   String mod = todo.remove(0);
   done.add(mod);
   ModuleEnvironment env = heap.getModule(mod);
   if (env != null) {
  for (String e : env.getExtends()) {
  result.__put(mod, e);
  if (!done.contains(e)) {
  todo.add(e);
  }
  }

  for (String e : env.getImports()) {
  result.__put(mod, e);
  if (!done.contains(e)) {
  todo.add(e);
  }
  }
   }
 }

 return result;
 }



 public Set<String> getExtendsTransitive() {
 List<String> todo = new LinkedList<String>();
 Set<String> done = new HashSet<String>();
diff --git a/src/org/rascalmpl/semantics/dynamic/Import.java b/src/org/rascalmpl/semantics/dynamic/Import.java
 import java.io.OutputStreamWriter;
 import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.SortedMap;
        // abort the extend and the loading of the current module alltogether
        throw new CyclicExtend(thisEnv.getName(), path, x);
    }
    else if (!other.isInitialized()) {
        // TODO if this really happens we have to find a way to fix it.
        // A user can't fix this.
        throw new ModuleImport(other.getName(), "Internal error: extending a module which is not fully initialized yet.", x);
    }
    // else if (other.collectModuleDependencyGraph().values().contains(thisEnv.getName())) {
    //   // TODO THIS WHOLE BLOCK IS DEBUG CODE TO BE REMOVED
    //     // import+extend cycle
    //     var parent = other.getName();
    //     var cycle = heap.depthFirstSearch(other.getName(), new HashSet<>(), eval.getValueFactory().list(eval.getValueFactory().string(parent)) , other.collectModuleDependencyGraph());
    //     throw new CyclicExtend(thisEnv.getName(), cycle.stream().map(IString.class::cast).map(IString::getValue).collect(Collectors.toList()), x);
    // }
    else {
        // good to go!
        // good to go
        thisEnv.extend(other);
    }
 }
          handleLoadError(eval, name, e.getMessage(), x);
      }
      finally {
          env.setInitialized();
          eval.jobStep(jobName, name, 1);
      }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -245,12 +245,29 @@ public List<String> findCyclicExtendPathFrom(String parent, String child) {
		.collect(Collectors.toList());
		}

		/**
		* This starts with an edge that is not yet in the graph because we are loading these
		* modules. Then the rest of graph is loaded from what we already have in memory.
		* @param parent the first and last node of a detected cycle.
		* @return
		*/
		public List<String> findCyclicImportPathFrom(String parent, String child) {
		SetMultimap.Transient<String, String> graph = getImportGraphFrom(child);
		graph.__put(parent, child); // add the last edge that was not yet registered
		IRascalValueFactory vf = IRascalValueFactory.getInstance();
		return depthFirstSearch(parent, new HashSet<>(), vf.list(vf.string(parent)), graph)
		.stream()
		.map(IString.class::cast)
		.map(IString::getValue)
		.collect(Collectors.toList());
		}

		/*
		* dfs uses an immutable IList for the path such that we don't have to maintain a stack, next to the
		* recursion.
		* otherwise this is a standard depth-first search for a directed graph
		*/
		private IList depthFirstSearch(String parent, Set<String> visited, IList path, SetMultimap.Transient<String, String> graph) {
		public IList depthFirstSearch(String parent, Set<String> visited, IList path, SetMultimap.Transient<String, String> graph) {
		visited.add(parent);
		var vf = IRascalValueFactory.getInstance();

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -999,6 +999,10 @@ public Set<String> getExtends() {
		return Collections.<String>emptySet();
		}

		/**
		* This collects only "extends" edges starting from the current module
		* @return
		*/
		public SetMultimap.Transient<String, String> collectExtendsGraph() {
		List<String> todo = new LinkedList<String>();
		Set<String> done = new HashSet<String>();
Expand All		@@ -1023,6 +1027,43 @@ public SetMultimap.Transient<String, String> collectExtendsGraph() {
		return result;
		}

		/**
		* This collects only "extends" edges starting from the current module
		* @return
		*/
		public SetMultimap.Transient<String, String> collectModuleDependencyGraph() {
		List<String> todo = new LinkedList<String>();
		Set<String> done = new HashSet<String>();
		SetMultimap.Transient<String, String> result = PersistentTrieSetMultimap.transientOf();
		todo.add(this.getName());
		GlobalEnvironment heap = getHeap();

		while (!todo.isEmpty()) {
		String mod = todo.remove(0);
		done.add(mod);
		ModuleEnvironment env = heap.getModule(mod);
		if (env != null) {
		for (String e : env.getExtends()) {
		result.__put(mod, e);
		if (!done.contains(e)) {
		todo.add(e);
		}
		}

		for (String e : env.getImports()) {
		result.__put(mod, e);
		if (!done.contains(e)) {
		todo.add(e);
		}
		}
		}
		}

		return result;
		}



		public Set<String> getExtendsTransitive() {
		List<String> todo = new LinkedList<String>();
		Set<String> done = new HashSet<String>();
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,6 +20,7 @@
		import java.io.OutputStreamWriter;
		import java.net.URISyntaxException;
		import java.util.HashMap;
		import java.util.HashSet;
		import java.util.List;
		import java.util.Map;
		import java.util.SortedMap;
Expand DownExpand Up		@@ -305,8 +306,20 @@ else if (eval.getCurrentEnvt() == eval.__getRootScope()) {
		// abort the extend and the loading of the current module alltogether
		throw new CyclicExtend(thisEnv.getName(), path, x);
		}
		else if (!other.isInitialized()) {
		// TODO if this really happens we have to find a way to fix it.
		// A user can't fix this.
		throw new ModuleImport(other.getName(), "Internal error: extending a module which is not fully initialized yet.", x);
		}
		// else if (other.collectModuleDependencyGraph().values().contains(thisEnv.getName())) {
		// // TODO THIS WHOLE BLOCK IS DEBUG CODE TO BE REMOVED
		// // import+extend cycle
		// var parent = other.getName();
		// var cycle = heap.depthFirstSearch(other.getName(), new HashSet<>(), eval.getValueFactory().list(eval.getValueFactory().string(parent)) , other.collectModuleDependencyGraph());
		// throw new CyclicExtend(thisEnv.getName(), cycle.stream().map(IString.class::cast).map(IString::getValue).collect(Collectors.toList()), x);
		// }
		else {
		// good to go!
		// good to go
		thisEnv.extend(other);
		}
		}
Expand DownExpand Up		@@ -356,6 +369,7 @@ public static ModuleEnvironment loadModule(ISourceLocation x, String name, IEval
		handleLoadError(eval, name, e.getMessage(), x);
		}
		finally {
		env.setInitialized();
		eval.jobStep(jobName, name, 1);
		}

Expand Down