From bd5044add2fd7c6d526adf429fbcf109329ae640 Mon Sep 17 00:00:00 2001
From: ValKmjolnir <lhk101lhk101@qq.com>
Date: Wed, 6 Jul 2022 22:21:01 +0800
Subject: [PATCH] :rocket: add a new way to import other files:

`import("./stl/queue.nas");` now has same function as `import.stl.queue;`
---
 lib.nas              |  6 -----
 nasal.h              |  8 +++---
 nasal_builtin.h      | 15 +----------
 nasal_import.h       | 59 +++++++++++++++++++++++++++++++++-----------
 stl/lib.nas          |  6 -----
 test/auto_crash.nas  |  2 +-
 test/bfconvertor.nas |  2 --
 test/bfs.nas         |  2 +-
 test/coroutine.nas   |  3 ++-
 test/httptest.nas    |  2 +-
 test/md5compare.nas  |  4 +--
 test/occupation.nas  |  4 +--
 test/snake.nas       |  2 +-
 test/tetris.nas      |  2 +-
 14 files changed, 60 insertions(+), 57 deletions(-)

diff --git a/lib.nas b/lib.nas
index 7000d43..a24fef1 100644
--- a/lib.nas
+++ b/lib.nas
@@ -1,11 +1,5 @@
 # lib.nas
 
-# import is used to link another file, this lib function will do nothing.
-# because nasal_import will recognize this and link files before generating bytecode.
-var import=func(filename){
-    return __builtin_import(filename);
-}
-
 # print is used to print all things in nasal, try and see how it works.
 # this function uses std::cout/printf to output logs.
 var print=func(elems...){
diff --git a/nasal.h b/nasal.h
index 6946ca1..d8c6ab5 100644
--- a/nasal.h
+++ b/nasal.h
@@ -158,7 +158,7 @@ std::string rawstr(const std::string& str)
     {
 #ifdef _WIN32
         // windows ps or cmd doesn't output unicode normally
-        // if 'chcp65001' is not enabled, so we output the hex
+        // if 'chcp65001' is not enabled, we output the hex
         if(i<=0)
         {
             ret+="\\x";
@@ -171,15 +171,15 @@ std::string rawstr(const std::string& str)
             case '\0': ret+="\\0"; break;
             case '\a': ret+="\\a"; break;
             case '\b': ret+="\\b"; break;
-            case '\e': ret+="\\e"; break;
             case '\t': ret+="\\t"; break;
             case '\n': ret+="\\n"; break;
             case '\v': ret+="\\v"; break;
             case '\f': ret+="\\f"; break;
             case '\r': ret+="\\r"; break;
-            case '\\': ret+="\\\\";break;
-            case '\'': ret+="\\\'";break;
+            case '\e': ret+="\\e"; break;
             case '\"': ret+="\\\"";break;
+            case '\'': ret+="\\\'";break;
+            case '\\': ret+="\\\\";break;
             default:   ret+=i;     break;
         }
     }
diff --git a/nasal_builtin.h b/nasal_builtin.h
index 4340462..13450a0 100644
--- a/nasal_builtin.h
+++ b/nasal_builtin.h
@@ -51,7 +51,6 @@ nas_native(builtin_time);
 nas_native(builtin_contains);
 nas_native(builtin_delete);
 nas_native(builtin_keys);
-nas_native(builtin_import);
 nas_native(builtin_die);
 nas_native(builtin_find);
 nas_native(builtin_type);
@@ -158,7 +157,6 @@ struct
     {"__builtin_contains",builtin_contains},
     {"__builtin_delete",  builtin_delete  },
     {"__builtin_keys",    builtin_keys    },
-    {"__builtin_import",  builtin_import  },
     {"__builtin_die",     builtin_die     },
     {"__builtin_find",    builtin_find    },
     {"__builtin_type",    builtin_type    },
@@ -653,24 +651,13 @@ nasal_ref builtin_keys(nasal_ref* local,nasal_gc& gc)
     --gc.top;
     return gc.top[1];
 }
-nasal_ref builtin_import(nasal_ref* local,nasal_gc& gc)
-{
-    // this function is used in preprocessing.
-    // this function will return nothing when running.
-    return builtin_err(
-        "import",
-        "\n\tthis function is used to link files together. "
-        "\n\tmake sure it is used in global scope. "
-        "\n\tmake sure it has correct argument(only one arg allowed)"
-    );
-}
 nasal_ref builtin_die(nasal_ref* local,nasal_gc& gc)
 {
     nasal_ref str=local[1];
     if(str.type!=vm_str)
         return builtin_err("die","\"str\" must be string");
     std::cerr<<"[vm] error: "<<str.str()<<'\n';
-    return nasal_ref(vm_none);
+    return {vm_none};
 }
 nasal_ref builtin_find(nasal_ref* local,nasal_gc& gc)
 {
diff --git a/nasal_import.h b/nasal_import.h
index 6b5c898..94d4277 100644
--- a/nasal_import.h
+++ b/nasal_import.h
@@ -7,11 +7,12 @@ private:
     bool lib_loaded;
     nasal_err& nerr;
     std::vector<std::string> files;
-    bool check_import(const nasal_ast&);
-    bool check_exist(const std::string&);
+    bool imptchk(const nasal_ast&);
+    bool exist(const std::string&);
     void linker(nasal_ast&,nasal_ast&&);
-    nasal_ast file_import(nasal_ast&);
-    nasal_ast lib_import();
+    std::string path(const nasal_ast&);
+    nasal_ast fimpt(nasal_ast&);
+    nasal_ast libimpt();
     nasal_ast load(nasal_ast&,uint16_t);
 public:
     nasal_import(nasal_err& e):lib_loaded(false),nerr(e){}
@@ -19,10 +20,38 @@ public:
     const std::vector<std::string>& get_file() const {return files;}
 };
 
-bool nasal_import::check_import(const nasal_ast& node)
+std::string nasal_import::path(const nasal_ast& node)
 {
+    if(node[1].type()==ast_callf)
+        return node[1][0].str();
+    std::string fpath=".";
+    for(size_t i=1;i<node.size();++i)
+#ifndef _WIN32
+        fpath+="/"+node[i].str();
+#else
+        fpath+="\\"+node[i].str();
+#endif
+    fpath+=".nas";
+    return fpath;
+}
+
+bool nasal_import::imptchk(const nasal_ast& node)
+{
+// only these two kinds of node can be recognized as 'import':
+/*
+    call
+    |_id:import
+    |_callh:stl
+    |_callh:file
+*/
+    if(node.type()==ast_call && node.size()>=2 && node[0].str()=="import" && node[1].type()==ast_callh)
+    {
+        for(size_t i=1;i<node.size();++i)
+            if(node[i].type()!=ast_callh)
+                return false;
+        return true;
+    }
 /*
-only this kind of node can be recognized as 'import':
     call
     |_id:import
     |_call_func
@@ -38,7 +67,7 @@ only this kind of node can be recognized as 'import':
     );
 }
 
-bool nasal_import::check_exist(const std::string& file)
+bool nasal_import::exist(const std::string& file)
 {
     // avoid importing the same file
     for(auto& fname:files)
@@ -55,16 +84,16 @@ void nasal_import::linker(nasal_ast& root,nasal_ast&& add_root)
         root.add(std::move(i));
 }
 
-nasal_ast nasal_import::file_import(nasal_ast& node)
+nasal_ast nasal_import::fimpt(nasal_ast& node)
 {
     nasal_lexer lex(nerr);
     nasal_parse par(nerr);
     // get filename and set node to ast_null
-    std::string filename=node[1][0].str();
+    std::string filename=path(node);
     node.clear();
 
     // avoid infinite loading loop
-    if(check_exist(filename))
+    if(exist(filename))
         return {0,ast_root};
     if(access(filename.c_str(),F_OK)==-1)
     {
@@ -80,7 +109,7 @@ nasal_ast nasal_import::file_import(nasal_ast& node)
     return load(tmp,files.size()-1);
 }
 
-nasal_ast nasal_import::lib_import()
+nasal_ast nasal_import::libimpt()
 {
     nasal_lexer lex(nerr);
     nasal_parse par(nerr);
@@ -113,7 +142,7 @@ nasal_ast nasal_import::lib_import()
     }
 
     // avoid infinite loading loop
-    if(check_exist(filename))
+    if(exist(filename))
         return {0,ast_root};
     
     // start importing...
@@ -129,12 +158,12 @@ nasal_ast nasal_import::load(nasal_ast& root,uint16_t fileindex)
     nasal_ast new_root(0,ast_root);
     if(!lib_loaded)
     {
-        linker(new_root,lib_import());
+        linker(new_root,libimpt());
         lib_loaded=true;
     }
     for(auto& i:root.child())
-        if(check_import(i))
-            linker(new_root,file_import(i));
+        if(imptchk(i))
+            linker(new_root,fimpt(i));
     // add root to the back of new_root
     nasal_ast file_head(0,ast_file);
     file_head.set_num(fileindex);
diff --git a/stl/lib.nas b/stl/lib.nas
index 7000d43..a24fef1 100644
--- a/stl/lib.nas
+++ b/stl/lib.nas
@@ -1,11 +1,5 @@
 # lib.nas
 
-# import is used to link another file, this lib function will do nothing.
-# because nasal_import will recognize this and link files before generating bytecode.
-var import=func(filename){
-    return __builtin_import(filename);
-}
-
 # print is used to print all things in nasal, try and see how it works.
 # this function uses std::cout/printf to output logs.
 var print=func(elems...){
diff --git a/test/auto_crash.nas b/test/auto_crash.nas
index 8a691f9..2ab0e72 100644
--- a/test/auto_crash.nas
+++ b/test/auto_crash.nas
@@ -1,5 +1,5 @@
 # Road check and auto pilot by ValKmjolnir
-import("stl/fg_env.nas");
+import.stl.fg_env;
 
 var dt=0.01;
 var intergral=0;
diff --git a/test/bfconvertor.nas b/test/bfconvertor.nas
index abdd103..69e92f8 100644
--- a/test/bfconvertor.nas
+++ b/test/bfconvertor.nas
@@ -1,5 +1,3 @@
-import("lib.nas");
-
 var mandelbrot=
 "[A mandelbrot set fractal viewer in brainf*** written by Erik Bosman]
 +++++++++++++[->++>>>+++++>++>+<<<<<<]>>>>>++++++>--->>>>>>>>>>+++++++++++++++[[
diff --git a/test/bfs.nas b/test/bfs.nas
index 8d7ace7..cb112b6 100644
--- a/test/bfs.nas
+++ b/test/bfs.nas
@@ -1,4 +1,4 @@
-import("stl/queue.nas");
+import.stl.queue;
 
 rand(time(0));
 var pixel=[' ','#','.','*'];
diff --git a/test/coroutine.nas b/test/coroutine.nas
index 3db0181..d314fe8 100644
--- a/test/coroutine.nas
+++ b/test/coroutine.nas
@@ -1,6 +1,7 @@
 # coroutine.nas by ValKmjolnir
 # 2022/5/19
-import("stl/process_bar.nas");
+import.stl.process_bar;
+
 var fib=func(){
     var (a,b)=(1,1);
     coroutine.yield(a);
diff --git a/test/httptest.nas b/test/httptest.nas
index 6090c21..3d56fdd 100644
--- a/test/httptest.nas
+++ b/test/httptest.nas
@@ -1,4 +1,4 @@
-import("module/libsock.nas");
+import.module.libsock;
 
 var http=func(){
     var sd=nil;
diff --git a/test/md5compare.nas b/test/md5compare.nas
index 0bc4fab..32b25ba 100644
--- a/test/md5compare.nas
+++ b/test/md5compare.nas
@@ -1,5 +1,5 @@
-import("test/md5.nas");
-import("stl/process_bar.nas");
+import.test.md5;
+import.stl.process_bar;
 srand();
 
 var compare=func(){
diff --git a/test/occupation.nas b/test/occupation.nas
index abf45fe..6c5d38a 100644
--- a/test/occupation.nas
+++ b/test/occupation.nas
@@ -1,5 +1,5 @@
-import("stl/process_bar.nas");
-import("module/libkey.nas");
+import.stl.process_bar;
+import.module.libkey;
 
 var cpu_stat=func(){
     var cpu=split("\n",io.fin("/proc/stat"))[0];
diff --git a/test/snake.nas b/test/snake.nas
index 266f114..00387fa 100644
--- a/test/snake.nas
+++ b/test/snake.nas
@@ -1,4 +1,4 @@
-import("./module/libkey.nas");
+import.module.libkey;
 var list=func(){
     var (begin,end,len)=(nil,nil,0);
     return{
diff --git a/test/tetris.nas b/test/tetris.nas
index 1b0542a..fc581d1 100644
--- a/test/tetris.nas
+++ b/test/tetris.nas
@@ -1,4 +1,4 @@
-import("./module/libkey.nas");
+import.module.libkey;
 var color=[
     "\e[31m","\e[32m","\e[33m","\e[34m","\e[35m","\e[36m",
     "\e[91m","\e[92m","\e[93m","\e[94m","\e[95m","\e[96m",