auto add search path for cmd tools.

10 files changed, 44 insertions, 32 deletions

diff --git a/makefile b/makefile
index 6582e0a..bf5298a 100644
--- a/makefile
+++ b/makefile
@@ -266,7 +266,7 @@ test: release
         @mkdir -p $(TEST_OUTPUT)
         @echo "Compiling Yuescript codes..."
         @$(START_TIME)
-        @./$(BIN_NAME) $(TEST_INPUT) -t $(TEST_OUTPUT) -tl_enabled=true
+        @./$(BIN_NAME) $(TEST_INPUT) -t $(TEST_OUTPUT) -tl_enabled
         @./$(BIN_NAME) $(TEST_INPUT)/teal-lang.yue -o $(TEST_OUTPUT)/teal-lang.lua
         @echo -en "Compile time: "
         @$(END_TIME)
@@ -279,7 +279,7 @@ test: release
 gen: release
         @echo "Compiling Yuescript codes..."
         @$(START_TIME)
-        @./$(BIN_NAME) $(TEST_INPUT) -t $(GEN_OUTPUT) -tl_enabled=true
+        @./$(BIN_NAME) $(TEST_INPUT) -t $(GEN_OUTPUT) -tl_enabled
         @./$(BIN_NAME) $(TEST_INPUT)/teal-lang.yue -o $(GEN_OUTPUT)/teal-lang.lua
         @echo -en "Compile time: "
         @$(END_TIME)
diff --git a/spec/inputs/macro-export.yue b/spec/inputs/macro-export.yue
index adc71da..ff0d273 100644
--- a/spec/inputs/macro-export.yue
+++ b/spec/inputs/macro-export.yue
@@ -1,5 +1,3 @@
-$ -> package.path = "?.lua;./spec/inputs/?.lua"
-
 import "macro-todo" as $
 
 import "macro-todo" as {$, :$todo}
diff --git a/spec/inputs/macro-teal.yue b/spec/inputs/macro-teal.yue
index 951e882..a443614 100644
--- a/spec/inputs/macro-teal.yue
+++ b/spec/inputs/macro-teal.yue
@@ -2,7 +2,7 @@ $ ->
         import "yue" as {:options}
         if options.tl_enabled
                 options.target_extension = "tl"
-        package.path ..= "?.lua;./spec/lib/?.lua"
+        package.path ..= ";./spec/lib/?.lua"
 
 macro to_lua = (code)->
         "require('yue').to_lua(#{code}, reserve_line_number:false, same_module:true)"
diff --git a/spec/inputs/macro.yue b/spec/inputs/macro.yue
index e4b0fc8..7bbb06d 100644
--- a/spec/inputs/macro.yue
+++ b/spec/inputs/macro.yue
@@ -1,6 +1,3 @@
-$ ->
-        package.path = "?.lua;./spec/inputs/?.lua"
-
 import "macro-export" as {
         $, -- import all macros
         $config: $myconfig, -- rename macro $config to $myconfig
diff --git a/spec/inputs/teal-lang.yue b/spec/inputs/teal-lang.yue
index 68b2dd1..b28c915 100644
--- a/spec/inputs/teal-lang.yue
+++ b/spec/inputs/teal-lang.yue
@@ -1,7 +1,4 @@
-$ ->
-        package.path = "?.lua;./spec/inputs/?.lua"
-
-import "macro-teal" as {$}
+import "macro-teal" as $
 
 $local "a:{string:number}", {value:123}
 $local "b:number", a.value
diff --git a/spec/outputs/macro.lua b/spec/outputs/macro.lua
index 5917f43..c19b2d7 100644
--- a/spec/outputs/macro.lua
+++ b/spec/outputs/macro.lua
@@ -277,7 +277,7 @@ print((setmetatable({
                 return 998
         end
 }))
-print("current line: " .. tostring(271));
+print("current line: " .. tostring(268));
 -- TODO
 do
         print(1)
diff --git a/src/yue.cpp b/src/yue.cpp
index 96649c4..7b2ad0b 100644
--- a/src/yue.cpp
+++ b/src/yue.cpp
@@ -272,6 +272,7 @@ int main(int narg, const char** args) {
         bool dumpCompileTime = false;
         std::string targetPath;
         std::string resultFile;
+        std::string workPath;
         std::list<std::pair<std::string,std::string>> files;
         for (int i = 1; i < narg; ++i) {
                 std::string arg = args[i];
@@ -414,10 +415,11 @@ int main(int narg, const char** args) {
                                 yue::Utils::trim(value);
                                 config.options[key] = value;
                         } else {
-                                config.options[argStr] = '1';
+                                config.options[argStr] = "";
                         }
                 } else {
                         if (fs::is_directory(arg)) {
+                                workPath = arg;
                                 for (auto item : fs::recursive_directory_iterator(arg)) {
                                         if (!item.is_directory()) {
                                                 auto ext = item.path().extension().string();
@@ -428,6 +430,7 @@ int main(int narg, const char** args) {
                                         }
                                 }
                         } else {
+                                workPath = fs::path(arg).parent_path().string();
                                 files.emplace_back(arg, arg);
                         }
                 }
@@ -450,6 +453,9 @@ int main(int narg, const char** args) {
                                         std::istreambuf_iterator<char>());
                                 auto conf = config;
                                 conf.module = file.first;
+                                if (!workPath.empty()) {
+                                        conf.options["path"] = (fs::path(workPath) / "?.lua").string();
+                                }
                                 if (dumpCompileTime) {
                                         auto start = std::chrono::high_resolution_clock::now();
                                         auto result = yue::YueCompiler{YUE_ARGS}.compile(s, conf);
@@ -467,7 +473,7 @@ int main(int narg, const char** args) {
                                                 return std::tuple{0, file.first, buf.str()};
                                         } else {
                                                 std::ostringstream buf;
-                                                buf << "Fail to compile: "sv << file.first << ".\n"sv;
+                                                buf << "Failed to compile: "sv << file.first << ".\n"sv;
                                                 buf << result.error << '\n';
                                                 return std::tuple{1, file.first, buf.str()};
                                         }
@@ -511,17 +517,17 @@ int main(int narg, const char** args) {
                                                         output.write(codes.c_str(), codes.size());
                                                         return std::tuple{0, targetFile.string(), std::string("Built "sv) + file.first + '\n'};
                                                 } else {
-                                                        return std::tuple{1, std::string(), std::string("Fail to write file: "sv) + targetFile.string() + '\n'};
+                                                        return std::tuple{1, std::string(), std::string("Failed to write file: "sv) + targetFile.string() + '\n'};
                                                 }
                                         }
                                 } else {
                                         std::ostringstream buf;
-                                        buf << "Fail to compile: "sv << file.first << ".\n";
+                                        buf << "Failed to compile: "sv << file.first << ".\n";
                                         buf << result.error << '\n';
                                         return std::tuple{1, std::string(), buf.str()};
                                 }
                         } else {
-                                return std::tuple{1, std::string(), std::string("Fail to read file: "sv) + file.first + ".\n"};
+                                return std::tuple{1, std::string(), std::string("Failed to read file: "sv) + file.first + ".\n"};
                         }
                 });
                 results.push_back(std::move(task));
@@ -568,7 +574,7 @@ int main(int narg, const char** args) {
                                         if (lua_pcall(L, 1, 1, 0) != 0) {
                                                 ret = 2;
                                                 std::string err = lua_tostring(L, -1);
-                                                errs.push_back(std::string("Fail to minify: "sv) + file + '\n' + err + '\n');
+                                                errs.push_back(std::string("Failed to minify: "sv) + file + '\n' + err + '\n');
                                         } else {
                                                 size_t size = 0;
                                                 const char* minifiedCodes = lua_tolstring(L, -1, &size);
@@ -583,7 +589,7 @@ int main(int narg, const char** args) {
                                         }
                                 } else {
                                         ret = 2;
-                                        errs.push_back(std::string("Fail to minify: "sv) + file + '\n');
+                                        errs.push_back(std::string("Failed to minify: "sv) + file + '\n');
                                 }
                         } else {
                                 std::cout << msg;
diff --git a/src/yuescript/yue_compiler.cpp b/src/yuescript/yue_compiler.cpp
index c7ceeb4..c68746c 100755
--- a/src/yuescript/yue_compiler.cpp
+++ b/src/yuescript/yue_compiler.cpp
@@ -56,7 +56,7 @@ using namespace parserlib;
 
 typedef std::list<std::string> str_list;
 
-const std::string_view version = "0.13.2"sv;
+const std::string_view version = "0.13.3"sv;
 const std::string_view extension = "yue"sv;
 
 class YueCompilerImpl {
@@ -6887,13 +6887,23 @@ private:
                                 DEFER(lua_settop(L, top));
                                 pushYue("find_modulepath"sv); // cur find_modulepath
                                 lua_pushlstring(L, moduleName.c_str(), moduleName.size()); // cur find_modulepath moduleName
-                                if (lua_pcall(L, 1, 1, 0) != 0) {
+                                if (lua_pcall(L, 1, 2, 0) != 0) {
                                         std::string err = lua_tostring(L, -1);
                                         throw std::logic_error(_info.errorMessage("failed to resolve module path\n"s + err, x));
                                 }
-                                if (lua_isnil(L, -1) != 0) {
-                                        throw std::logic_error(_info.errorMessage("failed to find module '"s + moduleName + '\'', x));
+                                if (lua_isnil(L, -2) != 0) {
+                                        str_list files;
+                                        if (lua_istable(L, -1) != 0) {
+                                                int size = static_cast<int>(lua_objlen(L, -1));
+                                                for (int i = 0; i < size; i++) {
+                                                        lua_rawgeti(L, -1, i + 1);
+                                                        files.push_back("no file \""s + lua_tostring(L, -1) + "\""s);
+                                                        lua_pop(L, 1);
+                                                }
+                                        }
+                                        throw std::logic_error(_info.errorMessage("module '"s + moduleName + "\' not found:\n\t"s + join(files, "\n\t"sv), x));
                                 }
+                                lua_pop(L, 1);
                                 std::string moduleFullName = lua_tostring(L, -1);
                                 lua_pop(L, 1); // cur
                                 if (!isModuleLoaded(moduleFullName)) {
diff --git a/src/yuescript/yue_compiler.h b/src/yuescript/yue_compiler.h
index 6f5170f..903cb3d 100644
--- a/src/yuescript/yue_compiler.h
+++ b/src/yuescript/yue_compiler.h
@@ -21,7 +21,7 @@ namespace yue {
 extern const std::string_view version;
 extern const std::string_view extension;
 
-using Options = std::unordered_map<std::string,std::string>;
+using Options = std::unordered_map<std::string, std::string>;
 
 struct YueConfig {
         bool lintGlobalVariable = false;
diff --git a/src/yuescript/yuescript.h b/src/yuescript/yuescript.h
index 1430758..2d2d660 100644
--- a/src/yuescript/yuescript.h
+++ b/src/yuescript/yuescript.h
@@ -59,13 +59,17 @@ local function find_modulepath(name)
         local name_path = name:match("[\\/]") and name or name:gsub("%.", dirsep)
         local file_exist, file_path
         local tried = {}
-        for path in package.path:gmatch("[^;]+") do
-                file_path = path:gsub("?", name_path):gsub("%.lua$", suffix)
-                file_exist = yue.file_exist(file_path)
-                if file_exist then
-                        break
-                else
-                        tried[#tried + 1] = file_path
+        local paths = {package.path, yue.options.path}
+        for i = 1, #paths do
+                local yue_path = paths[i]
+                for path in yue_path:gmatch("[^;]+") do
+                        file_path = path:gsub("?", name_path):gsub("%.lua$", suffix)
+                        file_exist = yue.file_exist(file_path)
+                        if file_exist then
+                                break
+                        else
+                                tried[#tried + 1] = file_path
+                        end
                 end
         end
         if file_exist then