Fix import compilation of none-project #38

wu-lang · Jul 7, 2020 · 043f504 · 043f504
1 parent c038489
commit 043f504
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/src/wu/compiler/compiler.rs b/src/wu/compiler/compiler.rs
@@ -1,7 +1,8 @@
 use super::*;
 
 use std::collections::HashMap;
-use std::path::Path;
+use std::path::{Path, Component};
+use std::ffi::OsStr;
 
 #[derive(Clone, PartialEq)]
 pub enum FlagImplicit {
@@ -182,7 +183,7 @@ impl<'g> Generator<'g> {
             }
 
             Import(ref name, ref specifics) => {
-                let file_path = if let Some(new_path) = self.import_map.get(&statement.pos) {
+                let mut file_path = if let Some(new_path) = self.import_map.get(&statement.pos) {
                     format!(
                         "{}",
                         new_path
@@ -197,6 +198,16 @@ impl<'g> Generator<'g> {
                     format!("{}/{}", my_folder.to_str().unwrap(), name)
                 };
 
+                if file_path.starts_with("./") {
+                    file_path = file_path[2..].to_string()
+                }
+
+                let real_path = &Path::new(&file_path)
+                    .iter()
+                    .map(|x: &OsStr| format!("{}", x.to_str().unwrap()))
+                    .collect::<Vec<String>>()
+                    .join(".");
+
                 let mut result = String::new();
 
                 if let Some(abs_path) = self.import_map.get(&statement.pos) {
@@ -207,7 +218,7 @@ impl<'g> Generator<'g> {
                     );
                     result.push_str(&format!("local {0} = require('{0}')\n", name))
                 } else {
-                    result = format!("local {} = require('{}')\n", name, file_path)
+                    result = format!("local {} = require('{}')\n", name, real_path)
                 }
 
                 for specific in specifics {