fix: Accept filenames that start with ./.. as modules

Marwes · Jan 11, 2020 · 01e450b · 01e450b
1 parent 9bbf452
commit 01e450b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/base/src/lib.rs b/base/src/lib.rs
@@ -110,7 +110,8 @@ pub fn filename_to_module(filename: &str) -> String {
             .unwrap_or(filename)
     });
 
-    name.replace(|c: char| c == '/' || c == '\\', ".")
+    name.trim_start_matches(|c: char| c == '.' || c == '/')
+        .replace(|c: char| c == '/' || c == '\\', ".")
 }
 
 #[derive(Debug, Clone)]
@@ -153,3 +154,17 @@ impl fmt::Display for DebugLevel {
         )
     }
 }
+
+#[cfg(test)]
+mod tests {
+
+    use super::*;
+
+    #[test]
+    fn filename_to_module_test() {
+        assert_eq!(filename_to_module("./main.glu"), "main");
+        assert_eq!(filename_to_module("main.glu"), "main");
+        assert_eq!(filename_to_module("./main/test.glu"), "main.test");
+        assert_eq!(filename_to_module("main/test.glu"), "main.test");
+    }
+}
diff --git a/base/src/resolve.rs b/base/src/resolve.rs
@@ -110,7 +110,6 @@ impl<T> AliasRemover<T> {
                 Some((typ, args)) => match *typ {
                     Type::Builtin(..)
                     | Type::Function(..)
-                    | Type::Function(..)
                     | Type::Record(..)
                     | Type::Variant(..)
                     | Type::Effect(..)