fix: correct invisible import handling

jac3km4 · May 27, 2024 · 4a7f995 · 4a7f995
1 parent edf2689
commit 4a7f995
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/compiler/Cargo.toml b/compiler/Cargo.toml
@@ -15,7 +15,9 @@ flexstr.workspace = true
 enum-as-inner.workspace = true
 peg = "0.8"
 hamt-sync = { git = "https://github.com/jac3km4/hamt-sync", rev = "v0.2.6" }
-sequence_trie = "0.3"
+sequence_trie = { git = "https://github.com/jac3km4/rust_sequence_trie", rev = "a056b4c", features = [
+    "hashbrown",
+] }
 walkdir = "2"
 
 [lints]

diff --git a/compiler/src/symbol.rs b/compiler/src/symbol.rs
@@ -71,8 +71,10 @@ impl SymbolMap {
     pub fn populate_import(&self, import: Import, scope: &mut Scope, visibility: Visibility) -> Result<(), Error> {
         match import {
             Import::Exact(_, path, span) => {
-                if let Some(symbol) = self.get_symbol(&path).with_span(span)?.visible(visibility) {
+                if let Some(symbol) = self.get_symbol(&path).and_then(|s| s.visible(visibility)) {
                     scope.add_symbol(path.last().unwrap(), symbol);
+                } else {
+                    return Err(Cause::UnresolvedImport(path.render()).with_span(span));
                 }
             }
             Import::All(_, path, span) => {
@@ -85,20 +87,20 @@ impl SymbolMap {
             Import::Selected(_, path, names, span) => {
                 for name in names {
                     let path = path.with_child(name);
-                    if let Some(symbol) = self.get_symbol(&path).with_span(span)?.visible(visibility) {
+                    if let Some(symbol) = self.get_symbol(&path).and_then(|s| s.visible(visibility)) {
                         scope.add_symbol(path.last().unwrap(), symbol);
+                    } else {
+                        return Err(Cause::UnresolvedImport(path.render()).with_span(span));
                     }
                 }
             }
         };
         Ok(())
     }
 
-    pub fn get_symbol(&self, path: &ModulePath) -> Result<Symbol, Cause> {
-        self.symbols
-            .get(path)
-            .cloned()
-            .ok_or_else(|| Cause::UnresolvedImport(path.render()))
+    #[inline]
+    pub fn get_symbol(&self, path: &ModulePath) -> Option<Symbol> {
+        self.symbols.get(path).cloned()
     }
 
     fn get_direct_children(&self, path: &ModulePath) -> Result<impl Iterator<Item = (Ident, &Symbol)>, Cause> {
@@ -107,9 +109,8 @@ impl SymbolMap {
             .get_node(path)
             .ok_or_else(|| Cause::UnresolvedModule(path.render()))?;
         let res = node
-            .iter()
-            .filter(|(parts, _)| parts.len() == 1)
-            .map(|(mut parts, sym)| (parts.pop().unwrap().clone(), sym));
+            .children_with_keys()
+            .filter_map(|(k, v)| Some((k.clone(), v.value()?)));
         Ok(res)
     }
 }