releasing moonplus as a lib.

2 files changed, 144 insertions, 14 deletions

diff --git a/src/MoonP/moon_compiler.cpp b/src/MoonP/moon_compiler.cpp
index d3427d3..30adbae 100644
--- a/src/MoonP/moon_compiler.cpp
+++ b/src/MoonP/moon_compiler.cpp
@@ -690,7 +690,7 @@ private:
                                                         break;
                                                 }
                                         }
-                                        throw std::logic_error(_info.errorMessage("Expression list must appear at the end of body block."sv, expList));
+                                        throw std::logic_error(_info.errorMessage("Expression list must appear at the end of body or block."sv, expList));
                                 }
                                 break;
                         }
@@ -1252,26 +1252,31 @@ private:
                                 bool oneLined = defs.size() == expList->exprs.objects().size() &&
                                         traversal::Stop != action->traverse([&](ast_node* n) {
                                         switch (n->getId()) {
-                                                case "Callable"_id: {
-                                                        auto callable = static_cast<Callable_t*>(n);
-                                                        switch (callable->item->getId()) {
-                                                                case "Variable"_id:
-                                                                        for (const auto& def : defs) {
+                                                case "ChainValue"_id: {
+                                                        auto chainValue = static_cast<ChainValue_t*>(n);
+                                                        const auto& items = chainValue->items.objects();
+                                                        BLOCK_START
+                                                        auto callable = ast_cast<Callable_t>(*items.begin());
+                                                        BREAK_IF(!callable);
+                                                        auto next = items.begin(); ++next;
+                                                        BREAK_IF(next == items.end());
+                                                        BREAK_IF((!ast_is<Invoke_t,InvokeArgs_t>(*next)));
+                                                        for (const auto& def : defs) {
+                                                                switch (callable->item->getId()) {
+                                                                        case "Variable"_id:
                                                                                 if (def == _parser.toString(callable->item)) {
                                                                                         return traversal::Stop;
                                                                                 }
-                                                                        }
-                                                                        return traversal::Return;
-                                                                case "SelfName"_id:
-                                                                        for (const auto& def : defs) {
+                                                                                return traversal::Return;
+                                                                        case "SelfName"_id:
                                                                                 if (def == "self"sv) {
                                                                                         return traversal::Stop;
                                                                                 }
-                                                                        }
-                                                                        return traversal::Return;
-                                                                default:
-                                                                        return traversal::Continue;
+                                                                                return traversal::Return;
+                                                                }
                                                         }
+                                                        BLOCK_END
+                                                        return traversal::Continue;
                                                 }
                                                 default:
                                                         return traversal::Continue;
diff --git a/src/MoonPlus.h b/src/MoonPlus.h
new file mode 100644
index 0000000..da5f3ac
--- /dev/null
+++ b/src/MoonPlus.h
@@ -0,0 +1,125 @@
+R"moonscript_codes(
+import "moonp"
+import concat, insert, remove from table
+unpack = unpack or table.unpack
+lua = :loadstring, :load
+
+local *
+
+dirsep = "/"
+
+moonp.moon_compiled = {}
+
+split = (str, delim) ->
+        return {} if str == ""
+        str ..= delim
+        [m for m in str\gmatch("(.-)"..delim)]
+
+get_options = (...) ->
+        count = select "#", ...
+        opts = select count, ...
+        if type(opts) == "table"
+                opts, unpack {...}, nil, count - 1
+        else
+                {}, ...
+
+-- create moon path package from lua package path
+create_moonpath = (package_path) ->
+        moonpaths = for path in *split package_path, ";"
+                prefix = path\match "^(.-)%.lua$"
+                continue unless prefix
+                prefix .. ".moon"
+        concat moonpaths, ";"
+
+moon_loader = (name) ->
+        name_path = name\gsub "%.", dirsep
+
+        local file, file_path
+        for path in package.moonpath\gmatch "[^;]+"
+                file_path = path\gsub "?", name_path
+                file = io.open file_path
+                break if file
+
+        if file
+                text = file\read "*a"
+                file\close!
+                res, err = loadstring text, "@#{file_path}"
+                if not res
+                                error file_path .. ": " .. err
+
+                return res
+
+        return nil, "Could not find moon file"
+
+
+loadstring = (...) ->
+        options, str, chunk_name, mode, env = get_options ...
+        chunk_name or= "=(moonscript.loadstring)"
+
+        code, err = moonp.to_lua str, options
+        unless code
+                return nil, err
+
+        moonp.moon_compiled[chunk_name] = code if chunk_name
+        -- the unpack prevents us from passing nil
+        (lua.loadstring or lua.load) code, chunk_name, unpack { mode, env }
+
+loadfile = (fname, ...) ->
+        file, err = io.open fname
+        return nil, err unless file
+        text = assert file\read "*a"
+        file\close!
+        loadstring text, "@#{fname}", ...
+
+-- throws errros
+dofile = (...) ->
+        f = assert loadfile ...
+        f!
+
+insert_loader = (pos=2) ->
+        if not package.moonpath
+                package.moonpath = create_moonpath package.path
+
+        loaders = package.loaders or package.searchers
+        for loader in *loaders
+                return false if loader == moon_loader
+
+        insert loaders, pos, moon_loader
+        true
+
+remove_loader = ->
+        loaders = package.loaders or package.searchers
+
+        for i, loader in ipairs loaders
+                if loader == moon_loader
+                        remove loaders, i
+                        return true
+
+        false
+
+moon_require = (name)->
+        insert_loader!
+        xpcall (-> require name), (err)->
+                msg = moonp.stp.stacktrace err, 2
+                print msg
+
+setmetatable moonp, {
+        __index: (key)=>
+                return nil unless key == "stp"
+                stp = rawget moonp,"stp"
+                unless stp
+                        stp = with moonp.load_stacktraceplus!
+                                .dump_locals = false
+                                .simplified = true
+                        rawset moonp,"stp",stp
+                        rawset moonp,"load_stacktraceplus",nil
+                stp
+        __call: (name)=> @.require name
+}
+
+moonp[k] = v for k,v in pairs {
+        :insert_loader, :remove_loader, :moon_loader, :dirsep,
+        :dofile, :loadfile, :loadstring, :create_moonpath,
+        require:moon_require
+}
+)moonscript_codes";