added `from import` for issue #149.

7 files changed, 104 insertions, 13 deletions

diff --git a/spec/inputs/import.yue b/spec/inputs/import.yue
index eb2a487..7a21995 100644
--- a/spec/inputs/import.yue
+++ b/spec/inputs/import.yue
@@ -47,6 +47,35 @@ do
         import x1, y1, \z1 from "mymodule"
 
 do
+        from 'yue' import p
+        from 'mymodule' import x1, y1, \z1
+
+do
+        from z import a, b, c
+
+do
+        from z import a,
+                b, c
+
+do
+        from z import a
+                b
+                c
+
+do
+        from z import
+                a
+                b
+                c
+
+do
+        from z
+        import
+                a
+                b
+                c
+
+do
         import 'module'
         import 'module_x'
         import "d-a-s-h-e-s"
diff --git a/spec/outputs/import.lua b/spec/outputs/import.lua
index b384d9d..ef83f2d 100644
--- a/spec/outputs/import.lua
+++ b/spec/outputs/import.lua
@@ -80,6 +80,39 @@ do
         end
 end
 do
+        local p
+        do
+                local _obj_1 = require('yue')
+                p = _obj_1.p
+        end
+        local x1, y1, z1
+        do
+                local _obj_1 = require('mymodule')
+                x1, y1, z1 = _obj_1.x1, _obj_1.y1, (function()
+                        local _base_0 = _obj_1
+                        local _fn_0 = _base_0.z1
+                        return _fn_0 and function(...)
+                                return _fn_0(_base_0, ...)
+                        end
+                end)()
+        end
+end
+do
+        local a, b, c = z.a, z.b, z.c
+end
+do
+        local a, b, c = z.a, z.b, z.c
+end
+do
+        local a, b, c = z.a, z.b, z.c
+end
+do
+        local a, b, c = z.a, z.b, z.c
+end
+do
+        local a, b, c = z.a, z.b, z.c
+end
+do
         local module = require('module')
         local module_x = require('module_x')
         local d_a_s_h_e_s = require("d-a-s-h-e-s")
diff --git a/src/yuescript/yue_ast.cpp b/src/yuescript/yue_ast.cpp
index 39f19ea..ed34274 100644
--- a/src/yuescript/yue_ast.cpp
+++ b/src/yuescript/yue_ast.cpp
@@ -271,6 +271,13 @@ std::string ImportFrom_t::to_string(void* ud) const {
         }
         return join(temp, ", "sv) + " from "s + item->to_string(ud);
 }
+std::string FromImport_t::to_string(void* ud) const {
+        str_list temp;
+        for (auto name : names.objects()) {
+                temp.emplace_back(name->to_string(ud));
+        }
+        return "from "s + item->to_string(ud) + " import "s + join(temp, ", "sv);
+}
 std::string MacroNamePair_t::to_string(void* ud) const {
         return key->to_string(ud) + ": "s + value->to_string(ud);
 }
@@ -294,6 +301,9 @@ std::string ImportAs_t::to_string(void* ud) const {
         return join(temp, " "s);
 }
 std::string Import_t::to_string(void* ud) const {
+        if (ast_is<FromImport_t>(content)) {
+                return content->to_string(ud);
+        }
         return "import "s + content->to_string(ud);
 }
 std::string Label_t::to_string(void* ud) const {
diff --git a/src/yuescript/yue_ast.h b/src/yuescript/yue_ast.h
index 78f6c9f..a02f548 100644
--- a/src/yuescript/yue_ast.h
+++ b/src/yuescript/yue_ast.h
@@ -195,6 +195,13 @@ AST_NODE(ImportFrom)
         AST_MEMBER(ImportFrom, &sep, &names, &item)
 AST_END(ImportFrom, "import_from"sv)
 
+AST_NODE(FromImport)
+        ast_sel<true, ImportLiteral_t, Exp_t> item;
+        ast_ptr<true, Seperator_t> sep;
+        ast_sel_list<true, ColonImportName_t, Variable_t> names;
+        AST_MEMBER(FromImport, &item, &sep, &names)
+AST_END(FromImport, "from_import"sv)
+
 AST_NODE(MacroNamePair)
         ast_ptr<true, MacroName_t> key;
         ast_ptr<true, MacroName_t> value;
@@ -217,7 +224,7 @@ AST_NODE(ImportAs)
 AST_END(ImportAs, "import_as"sv)
 
 AST_NODE(Import)
-        ast_sel<true, ImportAs_t, ImportFrom_t> content;
+        ast_sel<true, ImportAs_t, ImportFrom_t, FromImport_t> content;
         AST_MEMBER(Import, &content)
 AST_END(Import, "import"sv)
 
diff --git a/src/yuescript/yue_compiler.cpp b/src/yuescript/yue_compiler.cpp
index 3c11429..b81764f 100644
--- a/src/yuescript/yue_compiler.cpp
+++ b/src/yuescript/yue_compiler.cpp
@@ -74,7 +74,7 @@ static std::unordered_set<std::string> Metamethods = {
         "close"s // Lua 5.4
 };
 
-const std::string_view version = "0.19.3"sv;
+const std::string_view version = "0.19.4"sv;
 const std::string_view extension = "yue"sv;
 
 class CompileError : public std::logic_error {
@@ -8372,19 +8372,19 @@ private:
                 }
         }
 
-        void transformImportFrom(ImportFrom_t* import, str_list& out) {
+        void transformImportFrom(ImportFrom_t* importNode, str_list& out) {
                 str_list temp;
-                auto x = import;
-                auto objVar = singleVariableFrom(import->item, true);
+                auto x = importNode;
+                auto objVar = singleVariableFrom(importNode->item, true);
                 ast_ptr<false, ExpListAssign_t> objAssign;
                 if (objVar.empty()) {
                         objVar = getUnusedName("_obj_"sv);
                         auto expList = toAst<ExpList_t>(objVar, x);
                         auto assign = x->new_ptr<Assign_t>();
-                        if (import->item.is<Exp_t>()) {
-                                assign->values.push_back(import->item);
+                        if (importNode->item.is<Exp_t>()) {
+                                assign->values.push_back(importNode->item);
                         } else {
-                                auto exp = toAst<Exp_t>("require "s + _parser.toString(import->item.to<ImportLiteral_t>()), import->item);
+                                auto exp = toAst<Exp_t>("require "s + _parser.toString(importNode->item.to<ImportLiteral_t>()), importNode->item);
                                 assign->values.push_back(exp);
                         }
                         auto assignment = x->new_ptr<ExpListAssign_t>();
@@ -8394,7 +8394,7 @@ private:
                 }
                 auto expList = x->new_ptr<ExpList_t>();
                 auto assign = x->new_ptr<Assign_t>();
-                for (auto name : import->names.objects()) {
+                for (auto name : importNode->names.objects()) {
                         switch (name->get_id()) {
                                 case id<Variable_t>(): {
                                         auto var = static_cast<Variable_t*>(name);
@@ -8443,9 +8443,9 @@ private:
                 if (objAssign) {
                         auto preDef = toLocalDecl(transformAssignDefs(expList, DefOp::Mark));
                         if (!preDef.empty()) {
-                                temp.push_back(preDef + nll(import));
+                                temp.push_back(preDef + nll(importNode));
                         }
-                        temp.push_back(indent() + "do"s + nll(import));
+                        temp.push_back(indent() + "do"s + nll(importNode));
                         pushScope();
                         transformAssignment(objAssign, temp);
                 }
@@ -8455,7 +8455,7 @@ private:
                 transformAssignment(assignment, temp);
                 if (objAssign) {
                         popScope();
-                        temp.push_back(indent() + "end"s + nlr(import));
+                        temp.push_back(indent() + "end"s + nlr(importNode));
                 }
                 out.push_back(join(temp));
                 auto vars = getAssignVars(assignment);
@@ -8464,6 +8464,13 @@ private:
                 }
         }
 
+        void transformFromImport(FromImport_t* importNode, str_list& out) {
+                auto importFrom = importNode->new_ptr<ImportFrom_t>();
+                importFrom->names.dup(importNode->names);
+                importFrom->item.set(importNode->item);
+                transformImportFrom(importFrom, out);
+        }
+
         std::string moduleNameFrom(ImportLiteral_t* literal) {
                 auto name = _parser.toString(literal->inners.back());
                 Utils::replace(name, "-"sv, "_"sv);
@@ -8679,6 +8686,9 @@ private:
                         case id<ImportFrom_t>():
                                 transformImportFrom(static_cast<ImportFrom_t*>(content), out);
                                 break;
+                        case id<FromImport_t>():
+                                transformFromImport(static_cast<FromImport_t*>(content), out);
+                                break;
                         default: YUEE("AST node mismatch", content); break;
                 }
         }
diff --git a/src/yuescript/yue_parser.cpp b/src/yuescript/yue_parser.cpp
index 6ba9b13..5d2b4c9 100644
--- a/src/yuescript/yue_parser.cpp
+++ b/src/yuescript/yue_parser.cpp
@@ -286,6 +286,7 @@ YueParser::YueParser() {
         import_name = ColonImportName | Variable;
         import_name_list = Seperator >> *space_break >> space >> import_name >> *((+space_break | space >> ',' >> *space_break) >> space >> import_name);
         ImportFrom = import_name_list >> *space_break >> space >> key("from") >> space >> (ImportLiteral | not_(String) >> Exp);
+        FromImport = key("from") >> space >> (ImportLiteral | not_(String) >> Exp) >> *space_break >> space >> key("import") >> space >> import_name_list;
 
         ImportLiteralInner = (range('a', 'z') | range('A', 'Z') | set("_-") | larger(255)) >> *(alpha_num | '-' | larger(255));
         import_literal_chain = Seperator >> ImportLiteralInner >> *('.' >> ImportLiteralInner);
@@ -324,7 +325,7 @@ YueParser::YueParser() {
 
         ImportAs = ImportLiteral >> -(space >> key("as") >> space >> (ImportTabLit | Variable | ImportAllMacro));
 
-        Import = key("import") >> space >> (ImportAs | ImportFrom);
+        Import = key("import") >> space >> (ImportAs | ImportFrom) | FromImport;
 
         Label = "::" >> LabelName >> "::";
 
diff --git a/src/yuescript/yue_parser.h b/src/yuescript/yue_parser.h
index 72d966d..874bbc8 100644
--- a/src/yuescript/yue_parser.h
+++ b/src/yuescript/yue_parser.h
@@ -277,6 +277,7 @@ private:
         AST_RULE(ImportLiteralInner);
         AST_RULE(ImportLiteral);
         AST_RULE(ImportFrom);
+        AST_RULE(FromImport);
         AST_RULE(MacroNamePair);
         AST_RULE(ImportAllMacro);
         AST_RULE(ImportTabLit);