better fix for scope resolution in case of name clashes

7mind · Sep 30, 2024 · 73adf33 · 73adf33
1 parent c713338
commit 73adf33
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/main/scala/io/septimalmind/baboon/typer/BaboonTyper.scala b/src/main/scala/io/septimalmind/baboon/typer/BaboonTyper.scala
@@ -269,7 +269,6 @@ object BaboonTyper {
     ]] = {
       for {
         depmap <- flattened
-          .filterNot(_.defn.defn.isInstanceOf[RawNamespace]) // cheapo fix for namespace id clashes caused by nested namespaces with identical names, namespaces have no deps anyway
           .map(d => deps(pkg, d))
           .biSequence
         asMap <- depmap.toUniqueMap(bad => {

diff --git a/src/main/scala/io/septimalmind/baboon/typer/ScopeSupport.scala b/src/main/scala/io/septimalmind/baboon/typer/ScopeSupport.scala
@@ -268,9 +268,12 @@ object ScopeSupport {
             .orElse(findScope(needles, s.defn.parentOf(s)))
 
         case s: SubScope[ExtendedRawDefn] =>
-          s.nested.toMap
-            .get(head)
-            .orElse(Some(s).filter(_.name == head))
+          Some(s)
+            .filter(_.name == head)
+            .orElse(
+              s.nested.toMap
+                .get(head)
+            )
             .orElse(findScope(needles, s.defn.parentOf(s)))
       }
 

diff --git a/src/main/scala/io/septimalmind/baboon/typer/model/Scope.scala b/src/main/scala/io/septimalmind/baboon/typer/model/Scope.scala
@@ -85,7 +85,7 @@ object Scope {
       list.toMap
     }
 
-    private def index[Def](root: RootScope[Def]): Map[ScopeUID, Scope[Def]] = {
+    private def index(root: RootScope[Def]): Map[ScopeUID, Scope[Def]] = {
       def identifySubParents(
         scope: NestedScope[Def]
       ): List[(ScopeUID, Scope[Def])] = {