change file extension moonp.

41 files changed, 34 insertions, 27 deletions

diff --git a/spec/inputs/ambiguous.moon b/spec/inputs/ambiguous.mp
index a5980db..a5980db 100644
--- a/spec/inputs/ambiguous.moon
+++ b/spec/inputs/ambiguous.mp
diff --git a/spec/inputs/assign.moon b/spec/inputs/assign.mp
index dac2ba3..dac2ba3 100644
--- a/spec/inputs/assign.moon
+++ b/spec/inputs/assign.mp
diff --git a/spec/inputs/attrib.moon b/spec/inputs/attrib.mp
index bc1e67e..bc1e67e 100644
--- a/spec/inputs/attrib.moon
+++ b/spec/inputs/attrib.mp
diff --git a/spec/inputs/backcall.moon b/spec/inputs/backcall.mp
index a648b16..a648b16 100644
--- a/spec/inputs/backcall.moon
+++ b/spec/inputs/backcall.mp
diff --git a/spec/inputs/bubbling.moon b/spec/inputs/bubbling.mp
index 23a85d4..23a85d4 100644
--- a/spec/inputs/bubbling.moon
+++ b/spec/inputs/bubbling.mp
diff --git a/spec/inputs/class.moon b/spec/inputs/class.mp
index ca8b58c..ca8b58c 100644
--- a/spec/inputs/class.moon
+++ b/spec/inputs/class.mp
diff --git a/spec/inputs/comprehension.moon b/spec/inputs/comprehension.mp
index b6adb94..b6adb94 100644
--- a/spec/inputs/comprehension.moon
+++ b/spec/inputs/comprehension.mp
diff --git a/spec/inputs/cond.moon b/spec/inputs/cond.mp
index 3dee99b..3dee99b 100644
--- a/spec/inputs/cond.moon
+++ b/spec/inputs/cond.mp
diff --git a/spec/inputs/destructure.moon b/spec/inputs/destructure.mp
index 49e6393..49e6393 100644
--- a/spec/inputs/destructure.moon
+++ b/spec/inputs/destructure.mp
diff --git a/spec/inputs/do.moon b/spec/inputs/do.mp
index 2fbcbb9..2fbcbb9 100644
--- a/spec/inputs/do.moon
+++ b/spec/inputs/do.mp
diff --git a/spec/inputs/existential.moon b/spec/inputs/existential.mp
index 3055705..3055705 100644
--- a/spec/inputs/existential.moon
+++ b/spec/inputs/existential.mp
diff --git a/spec/inputs/export.moon b/spec/inputs/export.mp
index 9a494d9..9a494d9 100644
--- a/spec/inputs/export.moon
+++ b/spec/inputs/export.mp
diff --git a/spec/inputs/export_default.moon b/spec/inputs/export_default.mp
index 73f43ac..73f43ac 100644
--- a/spec/inputs/export_default.moon
+++ b/spec/inputs/export_default.mp
diff --git a/spec/inputs/funcs.moon b/spec/inputs/funcs.mp
index 4176e33..4176e33 100644
--- a/spec/inputs/funcs.moon
+++ b/spec/inputs/funcs.mp
diff --git a/spec/inputs/global.moon b/spec/inputs/global.mp
index 7d6cfde..7d6cfde 100644
--- a/spec/inputs/global.moon
+++ b/spec/inputs/global.mp
diff --git a/spec/inputs/goto.moon b/spec/inputs/goto.mp
index 3410ca3..3410ca3 100644
--- a/spec/inputs/goto.moon
+++ b/spec/inputs/goto.mp
diff --git a/spec/inputs/import.moon b/spec/inputs/import.mp
index 99981f8..99981f8 100644
--- a/spec/inputs/import.moon
+++ b/spec/inputs/import.mp
diff --git a/spec/inputs/lists.moon b/spec/inputs/lists.mp
index 15eb9ab..15eb9ab 100644
--- a/spec/inputs/lists.moon
+++ b/spec/inputs/lists.mp
diff --git a/spec/inputs/literals.moon b/spec/inputs/literals.mp
index d4b0326..d4b0326 100644
--- a/spec/inputs/literals.moon
+++ b/spec/inputs/literals.mp
diff --git a/spec/inputs/local.moon b/spec/inputs/local.mp
index 33251a9..33251a9 100644
--- a/spec/inputs/local.moon
+++ b/spec/inputs/local.mp
diff --git a/spec/inputs/loops.moon b/spec/inputs/loops.mp
index 24d960f..24d960f 100644
--- a/spec/inputs/loops.moon
+++ b/spec/inputs/loops.mp
diff --git a/spec/inputs/macro.moon b/spec/inputs/macro.mp
index aa8356c..c7ec79c 100644
--- a/spec/inputs/macro.moon
+++ b/spec/inputs/macro.mp
@@ -1,6 +1,6 @@
 macro block init = ->
         with require "moonp"
-                package.moonpath = "?.moon;./spec/inputs/?.moon"
+                package.moonpath = "?.mp;./spec/inputs/?.mp"
         ""
 
 $init!
@@ -25,7 +25,7 @@ if $and f1!, f2!, f3!
 
 macro expr in = (target, ...)->
         values = [value for value in *{...}]
-        $showMacro "in", "#{ table.concat ["#{target} == #{item}" for item in *values], " or " }"
+        $showMacro "in", table.concat ["#{target} == #{item}" for item in *values], " or "
 
 if x |> $in "Apple", "Pig", "Dog"
         print "exist"
@@ -55,7 +55,7 @@ macro expr pipe = (...)->
                 when 1 then return ...
         ops = {...}
         last = ops[1]
-        stmts = for i = 2,#ops
+        stmts = for i = 2, #ops
                 stmt = "\tlocal _#{i} = #{last} |> #{ops[i]}"
                 last = "_#{i}"
                 stmt
@@ -164,15 +164,17 @@ macro block chainB = (...)->
         last = nil
         stmts = for i = 1,#items
                 stmt = if i == #items
-                        "\t#{last and "#{last}\\" or ""}#{items[i]}"
+                        lastStr = last and "#{last}\\" or ""
+                        "\t#{lastStr}#{items[i]}"
                 else
-                        "\tlocal _#{i} = #{last and "#{last}\\" or ""}#{items[i]}"
+                        lastStr = last and "#{last}\\" or ""
+                        "\tlocal _#{i} = #{lastStr}#{items[i]}"
                 last = "_#{i}"
                 stmt
         res = "do
-#{table.concat stmts, "\n"}
+#{table.concat stmts, '\n'}
 "
-        $showMacro "chainB",res
+        $showMacro "chainB", res
 
 $chainB(
         _{1, 2, 3, 4, -2, 3}
diff --git a/spec/inputs/macro_export.moon b/spec/inputs/macro_export.mp
index 759c6d1..759c6d1 100644
--- a/spec/inputs/macro_export.moon
+++ b/spec/inputs/macro_export.mp
diff --git a/spec/inputs/operators.moon b/spec/inputs/operators.mp
index 57e58d6..57e58d6 100644
--- a/spec/inputs/operators.moon
+++ b/spec/inputs/operators.mp
diff --git a/spec/inputs/plus.moon b/spec/inputs/plus.mp
index ca03499..ca03499 100644
--- a/spec/inputs/plus.moon
+++ b/spec/inputs/plus.mp
diff --git a/spec/inputs/return.moon b/spec/inputs/return.mp
index f170ffd..f170ffd 100644
--- a/spec/inputs/return.moon
+++ b/spec/inputs/return.mp
diff --git a/spec/inputs/string.moon b/spec/inputs/string.mp
index 5d8f772..5d8f772 100644
--- a/spec/inputs/string.moon
+++ b/spec/inputs/string.mp
diff --git a/spec/inputs/stub.moon b/spec/inputs/stub.mp
index 60347e7..60347e7 100644
--- a/spec/inputs/stub.moon
+++ b/spec/inputs/stub.mp
diff --git a/spec/inputs/switch.moon b/spec/inputs/switch.mp
index ac3dbea..ac3dbea 100644
--- a/spec/inputs/switch.moon
+++ b/spec/inputs/switch.mp
diff --git a/spec/inputs/syntax.moon b/spec/inputs/syntax.mp
index af72f73..1bb962f 100644
--- a/spec/inputs/syntax.moon
+++ b/spec/inputs/syntax.mp
@@ -233,12 +233,12 @@ yeah
         sure: sir
 
 hello "no comma"
- yeah: dada
- another: world
+        yeah: dada
+        another: world
 
 hello "comma",
- something: hello_world
- frick: you
+        something: hello_world
+        frick: you
 
 -- creates one table
 another hello, one,
diff --git a/spec/inputs/tables.moon b/spec/inputs/tables.mp
index e816003..e816003 100644
--- a/spec/inputs/tables.moon
+++ b/spec/inputs/tables.mp
diff --git a/spec/inputs/unless_else.moon b/spec/inputs/unless_else.mp
index b421d4d..b421d4d 100644
--- a/spec/inputs/unless_else.moon
+++ b/spec/inputs/unless_else.mp
diff --git a/spec/inputs/using.moon b/spec/inputs/using.mp
index fe0a433..fe0a433 100644
--- a/spec/inputs/using.moon
+++ b/spec/inputs/using.mp
diff --git a/spec/inputs/whitespace.moon b/spec/inputs/whitespace.mp
index 329280f..329280f 100644
--- a/spec/inputs/whitespace.moon
+++ b/spec/inputs/whitespace.mp
diff --git a/spec/inputs/with.moon b/spec/inputs/with.mp
index 704c494..704c494 100644
--- a/spec/inputs/with.moon
+++ b/spec/inputs/with.mp
diff --git a/src/MoonP/moon_compiler.cpp b/src/MoonP/moon_compiler.cpp
index 8c0746f..6e7db2c 100644
--- a/src/MoonP/moon_compiler.cpp
+++ b/src/MoonP/moon_compiler.cpp
@@ -53,9 +53,8 @@ inline std::string s(std::string_view sv) {
         return std::string(sv);
 }
 
-const std::string_view version() {
-        return "0.4.15"sv;
-}
+const std::string_view version = "0.4.16"sv;
+const std::string_view extension = "mp"sv;
 
 class MoonCompilerImpl {
 public:
@@ -4926,7 +4925,7 @@ private:
                                         }
                                         case id<macro_name_pair_t>(): {
                                                 auto pair = static_cast<macro_name_pair_t*>(item);
-                                        macroPairs.emplace_back(_parser.toString(pair->value->name), _parser.toString(pair->key->name));
+                                                macroPairs.emplace_back(_parser.toString(pair->value->name), _parser.toString(pair->key->name));
                                                 break;
                                         }
                                         default:
diff --git a/src/MoonP/moon_compiler.h b/src/MoonP/moon_compiler.h
index 37a79bf..cb57d57 100644
--- a/src/MoonP/moon_compiler.h
+++ b/src/MoonP/moon_compiler.h
@@ -17,7 +17,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 namespace MoonP {
 
-const std::string_view version();
+extern const std::string_view version;
+extern const std::string_view extension;
 
 struct MoonConfig {
         bool lintGlobalVariable = false;
diff --git a/src/MoonP/moonplus.cpp b/src/MoonP/moonplus.cpp
index cb6d3ec..c775d75 100644
--- a/src/MoonP/moonplus.cpp
+++ b/src/MoonP/moonplus.cpp
@@ -122,7 +122,11 @@ int luaopen_moonp(lua_State* L) {
         lua_getfield(L, -1, "loaded"); // package loaded
         lua_createtable(L, 0, 0); // package loaded moonp
         lua_pushcfunction(L, moontolua); // package loaded moonp func
-        lua_setfield(L, -2, "to_lua"); // moonp["to_lua"] = func, package loaded tb
+        lua_setfield(L, -2, "to_lua"); // moonp["to_lua"] = func, package loaded moonp
+        lua_pushlstring(L, &MoonP::version.front(), MoonP::version.size()); // package loaded moonp version
+        lua_setfield(L, -2, "version"); // loaded["version"] = version, package loaded moonp
+        lua_pushlstring(L, &MoonP::extension.front(), MoonP::extension.size()); // package loaded moonp ext
+        lua_setfield(L, -2, "extension"); // loaded["extension"] = ext, package loaded moonp
         lua_pushcfunction(L, init_stacktraceplus); // package loaded moonp func1
         lua_setfield(L, -2, "load_stacktraceplus"); // moonp["load_stacktraceplus"] = func1, package loaded moonp
         lua_setfield(L, -2, "moonp"); // loaded["moonp"] = moonp, package loaded
diff --git a/src/MoonP/moonplus.h b/src/MoonP/moonplus.h
index 83d4c75..b18ab64 100644
--- a/src/MoonP/moonplus.h
+++ b/src/MoonP/moonplus.h
@@ -1,4 +1,4 @@
-R"moonscript_codes(
+R"moonplus_codes(
 --[[
 Copyright (C) 2020 by Leaf Corcoran, modified by Li Jin
 
@@ -73,6 +73,7 @@ get_options = function(...)
         end
 end
 create_moonpath = function(package_path)
+        local extension = moonp.extension
         local moonpaths
         do
                 local _accum_0 = { }
@@ -87,7 +88,7 @@ create_moonpath = function(package_path)
                                         _continue_0 = true
                                         break
                                 end
-                                _accum_0[_len_0] = prefix .. ".moon"
+                                _accum_0[_len_0] = prefix .. "." .. extension
                                 _len_0 = _len_0 + 1
                                 _continue_0 = true
                         until true
@@ -134,7 +135,7 @@ moon_loader = function(name)
                 end
                 return res
         end
-        return nil, "Could not find moon file"
+        return nil, "Could not find moonp file"
 end
 moon_call = function(f, ...)
         local args = {
@@ -148,7 +149,7 @@ moon_call = function(f, ...)
 end
 loadstring = function(...)
         local options, str, chunk_name, mode, env = get_options(...)
-        chunk_name = chunk_name or "=(moonscript.loadstring)"
+        chunk_name = chunk_name or "=(moonplus.loadstring)"
         local code, err = moonp.to_lua(str, options)
         if not code then
                 return nil, err
@@ -247,4 +248,4 @@ for k, v in pairs({
 }) do
         moonp[k] = v
 end
-)moonscript_codes";
+)moonplus_codes";
diff --git a/src/MoonP/stacktraceplus.h b/src/MoonP/stacktraceplus.h
index d658c5c..e884a2c 100644
--- a/src/MoonP/stacktraceplus.h
+++ b/src/MoonP/stacktraceplus.h
@@ -335,7 +335,7 @@ local function getMoonLineNumber(fname, line)
                 end
                 if file_exist then
                         local codes = moonp.read_file(file_path)
-                        local moonFile = codes:match("^%s*--%s*%[moon%]:%s*([^\n]*)")
+                        local moonFile = codes:match("^%s*--%s*%[moonp%]:%s*([^\n]*)")
                         if moonFile then
                                 fname = moonFile:gsub("^%s*(.-)%s*$", "%1")
                                 source = codes
diff --git a/src/moonp.cpp b/src/moonp.cpp
index 68f7b10..25be015 100644
--- a/src/moonp.cpp
+++ b/src/moonp.cpp
@@ -174,7 +174,7 @@ int main(int narg, const char** args) {
                                         break;
                         }
                 });
-                std::cout << "Moonscript+ "sv << MoonP::version() << '\n';
+                std::cout << "Moonscript+ "sv << MoonP::version << '\n';
                 while (true) {
                         count++;
                         std::string codes;
@@ -366,7 +366,7 @@ int main(int narg, const char** args) {
                         std::cout << help;
                         return 0;
                 } else if (arg == "-v"sv) {
-                        std::cout << "Moonscript+ version: "sv << MoonP::version() << '\n';
+                        std::cout << "Moonscript+ version: "sv << MoonP::version << '\n';
                         return 0;
                 } else if (arg == "-o"sv) {
                         ++i;
@@ -382,7 +382,7 @@ int main(int narg, const char** args) {
                                         if (!item.is_directory()) {
                                                 auto ext = item.path().extension().string();
                                                 for (char& ch : ext) ch = std::tolower(ch);
-                                                if (ext == ".moon"sv) {
+                                                if (!ext.empty() && ext.substr(1) == MoonP::extension) {
                                                         files.emplace_back(item.path().string(), item.path().lexically_relative(arg).string());
                                                 }
                                         }
@@ -453,7 +453,7 @@ int main(int narg, const char** args) {
                                                 if (output) {
                                                         const auto& codes = std::get<0>(result);
                                                         if (config.reserveLineNumber) {
-                                                                auto head = std::string("-- [moon]: "sv) + file.first + '\n';
+                                                                auto head = std::string("-- [moonp]: "sv) + file.first + '\n';
                                                                 output.write(head.c_str(), head.size());
                                                         }
                                                         output.write(codes.c_str(), codes.size());