fix issue #97 by line decorator.

4 files changed, 111 insertions, 4 deletions

diff --git a/spec/inputs/attrib.yue b/spec/inputs/attrib.yue
index 7e9a42c..500ef0f 100644
--- a/spec/inputs/attrib.yue
+++ b/spec/inputs/attrib.yue
@@ -14,6 +14,14 @@ do
         close f = with io.open "file.txt"
                 \write "Hello"
 
+do
+        const a = 1 if true
+        close b = (if x then 1) unless false
+        const c = (switch x
+                when "abc" then 998) if true
+        close d =
+                :value if a ?? b
+
 macro defer = (item)-> "close _ = #{item}"
 macro defer_f = (func)-> "close _ = setmetatable {},__close:#{func}"
 
diff --git a/spec/outputs/attrib.lua b/spec/outputs/attrib.lua
index d9ac3f2..aed549d 100644
--- a/spec/outputs/attrib.lua
+++ b/spec/outputs/attrib.lua
@@ -25,6 +25,45 @@ do
         end)()
 end
 do
+        local a <const> = (function()
+                if true then
+                        return 1
+                end
+        end)()
+        local b <close> = (function()
+                if not false then
+                        return ((function()
+                                if x then
+                                        return 1
+                                end
+                        end)())
+                end
+        end)()
+        local c <const> = (function()
+                if true then
+                        return ((function()
+                                local _exp_0 = x
+                                if "abc" == _exp_0 then
+                                        return 998
+                                end
+                        end)())
+                end
+        end)()
+        local d <close> = (function()
+                if (function()
+                        if a ~= nil then
+                                return a
+                        else
+                                return b
+                        end
+                end)() then
+                        return {
+                                value = value
+                        }
+                end
+        end)()
+end
+do
         local _ <close> = (function()
                 local _with_0 = io.open("file.txt")
                 _with_0:write("Hello")
diff --git a/spec/outputs/loops.lua b/spec/outputs/loops.lua
index bcd559c..7f87b2d 100644
--- a/spec/outputs/loops.lua
+++ b/spec/outputs/loops.lua
@@ -187,7 +187,7 @@ for i = 1, 10 do
 end
 local a = 1
 repeat
-        local _cond_0
+        local _cond_0 = false
         local _continue_0 = false
         repeat
                 a = a + 1
@@ -208,7 +208,7 @@ repeat
 until _cond_0
 x = 0
 repeat
-        local _cond_0
+        local _cond_0 = false
         local _continue_0 = false
         repeat
                 x = x + 1
diff --git a/src/yuescript/yue_compiler.cpp b/src/yuescript/yue_compiler.cpp
index 6f641d9..6d90d24 100755
--- a/src/yuescript/yue_compiler.cpp
+++ b/src/yuescript/yue_compiler.cpp
@@ -60,7 +60,7 @@ using namespace parserlib;
 
 typedef std::list<std::string> str_list;
 
-const std::string_view version = "0.10.20"sv;
+const std::string_view version = "0.10.21"sv;
 const std::string_view extension = "yue"sv;
 
 class YueCompilerImpl {
@@ -925,6 +925,66 @@ private:
                                         local->defined = true;
                                         transformLocalDef(local, out);
                                 }
+                        } else if (auto attrib = statement->content.as<LocalAttrib_t>()) {
+                                auto appendix = statement->appendix.get();
+                                switch (appendix->item->getId()) {
+                                        case id<if_line_t>(): {
+                                                auto if_line = static_cast<if_line_t*>(appendix->item.get());
+                                                auto ifNode = x->new_ptr<If_t>();
+                                                ifNode->type.set(if_line->type);
+                                                ifNode->nodes.push_back(if_line->condition);
+
+                                                auto expList = x->new_ptr<ExpList_t>();
+                                                for (auto val : attrib->assign->values.objects()) {
+                                                        switch (val->getId()) {
+                                                                case id<If_t>():
+                                                                case id<Switch_t>():
+                                                                case id<With_t>(): {
+                                                                        auto simpleValue = x->new_ptr<SimpleValue_t>();
+                                                                        simpleValue->value.set(val);
+                                                                        auto value = x->new_ptr<Value_t>();
+                                                                        value->item.set(simpleValue);
+                                                                        auto exp = newExp(value, x);
+                                                                        expList->exprs.push_back(exp);
+                                                                        break;
+                                                                }
+                                                                case id<TableBlock_t>(): {
+                                                                        auto tableBlock = static_cast<TableBlock_t*>(val);
+                                                                        auto tabLit = x->new_ptr<TableLit_t>();
+                                                                        tabLit->values.dup(tableBlock->values);
+                                                                        auto simpleValue = x->new_ptr<SimpleValue_t>();
+                                                                        simpleValue->value.set(tabLit);
+                                                                        auto value = x->new_ptr<Value_t>();
+                                                                        value->item.set(simpleValue);
+                                                                        auto exp = newExp(value, x);
+                                                                        expList->exprs.push_back(exp);
+                                                                        break;
+                                                                }
+                                                                case id<Exp_t>(): {
+                                                                        expList->exprs.push_back(val);
+                                                                        break;
+                                                                }
+                                                                default: YUEE("AST node mismatch", val); break;
+                                                        }
+                                                }
+                                                auto expListAssign = x->new_ptr<ExpListAssign_t>();
+                                                expListAssign->expList.set(expList);
+                                                auto stmt = x->new_ptr<Statement_t>();
+                                                stmt->content.set(expListAssign);
+                                                ifNode->nodes.push_back(stmt);
+
+                                                statement->appendix.set(nullptr);
+                                                attrib->assign->values.clear();
+                                                attrib->assign->values.push_back(ifNode);
+                                                transformStatement(statement, out);
+                                                return;
+                                        }
+                                        case id<CompInner_t>(): {
+                                                throw std::logic_error(_info.errorMessage("for-loop line decorator is not supported here"sv, appendix->item.get()));
+                                                break;
+                                        }
+                                        default: YUEE("AST node mismatch", appendix->item.get()); break;
+                                }
                         }
                         auto appendix = statement->appendix.get();
                         switch (appendix->item->getId()) {
@@ -5345,7 +5405,7 @@ private:
                         auto continueVar = getUnusedName("_continue_"sv);
                         forceAddToScope(continueVar);
                         _continueVars.push(continueVar);
-                        _buf << indent() << "local "sv << conditionVar << nll(body);
+                        _buf << indent() << "local "sv << conditionVar << " = false"sv << nll(body);
                         _buf << indent() << "local "sv << continueVar << " = false"sv << nll(body);
                         _buf << indent() << "repeat"sv << nll(body);
                         pushScope();