feat(WIP): file imports

whistle-lang · Sep 28, 2023 · df75f3a · df75f3a
1 parent e8fe453
commit df75f3a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/examples/import.whi b/examples/import.whi
@@ -1,5 +1,5 @@
 import "./add.whi"
-
+import "@std/math/mod.whi"
 export fn helloWorld(): i32 {
     return add(1, 2)
 }
diff --git a/preprocessor/Cargo.toml b/preprocessor/Cargo.toml
@@ -10,4 +10,6 @@ whistle_lexer = { path = "../lexer" }
 whistle_common ={ path = "../common"}
 reqwest = { version = "0.11.20", features = ["blocking"] }
 url = "2.4.1"
-resolve-path = "0.1.0"
+resolve-path = "0.1.0"
+async-recursion = "1.0.5"
+lazy_static = "1.4.0"
diff --git a/preprocessor/src/lib.rs b/preprocessor/src/lib.rs
@@ -27,7 +27,6 @@ impl Preprocessor {
   pub fn process(&mut self, src: &str, path: &path::Path) {
     let mut lexer = Lexer::new(src);
     let mut tokens: Vec<TokenItem> = Vec::new();
-
     let mut imports: Vec<String> = Vec::new();
     loop {
       let item = match lexer.next() {
@@ -64,6 +63,7 @@ impl Preprocessor {
         tokens.push(item);
       }
     }
+
     for mut file_name in imports {
       if file_name.starts_with("@") {
         file_name.remove(0);
@@ -72,6 +72,7 @@ impl Preprocessor {
       }
 
       let new_file_name = if url::Url::parse(&file_name).is_err() {
+        println!("{}", file_name);
         match file_name.resolve_in(&path.canonicalize().unwrap()) {
           std::borrow::Cow::Owned(v) => v,
           std::borrow::Cow::Borrowed(v) => v.to_owned(),