1 files changed, 23 insertions, 3 deletions

diff --git a/src/MoonP/moon_compiler.cpp b/src/MoonP/moon_compiler.cpp
index c9d9c78..f79df07 100644
--- a/src/MoonP/moon_compiler.cpp
+++ b/src/MoonP/moon_compiler.cpp
@@ -43,7 +43,7 @@ inline std::string s(std::string_view sv) {
 }
 
 const std::string_view version() {
-        return "0.3.10"sv;
+        return "0.3.11"sv;
 }
 
 // name of table stored in lua registry
@@ -741,6 +741,7 @@ private:
                 switch (content->getId()) {
                         case id<Import_t>(): transformImport(static_cast<Import_t*>(content), out); break;
                         case id<While_t>(): transformWhile(static_cast<While_t*>(content), out); break;
+                        case id<Repeat_t>(): transformRepeat(static_cast<Repeat_t*>(content), out); break;
                         case id<For_t>(): transformFor(static_cast<For_t*>(content), out); break;
                         case id<ForEach_t>(): transformForEach(static_cast<ForEach_t*>(content), out); break;
                         case id<Return_t>(): transformReturn(static_cast<Return_t*>(content), out); break;
@@ -4251,7 +4252,7 @@ private:
                                 transformAssignment(assignment, temp);
                         }
                 }
-                if (!scoped && !returnValue) {
+                if (!with->eop && !scoped && !returnValue) {
                         pushScope();
                         scoped = traversal::Stop == with->body->traverse([&](ast_node* node) {
                                 if (auto statement = ast_cast<Statement_t>(node)) {
@@ -4297,7 +4298,14 @@ private:
                         }
                 }
                 _withVars.push(withVar);
-                transformBody(with->body, temp, ExpUsage::Common);
+                if (with->eop) {
+                        auto ifNode = x->new_ptr<If_t>();
+                        ifNode->nodes.push_back(toAst<IfCond_t>(withVar + s("~=nil"sv), x));
+                        ifNode->nodes.push_back(with->body);
+                        transformIf(ifNode, temp, ExpUsage::Common);
+                } else {
+                        transformBody(with->body, temp, ExpUsage::Common);
+                }
                 _withVars.pop();
                 if (assignList) {
                         auto assignment = x->new_ptr<ExpListAssign_t>();
@@ -4914,6 +4922,18 @@ private:
                 out.push_back(clearBuf());
         }
 
+        void transformRepeat(Repeat_t* repeat, str_list& out) {
+                str_list temp;
+                pushScope();
+                transformLoopBody(repeat->body, temp, Empty, ExpUsage::Common);
+                transformExp(repeat->condition, temp, ExpUsage::Closure);
+                popScope();
+                _buf << indent() << "repeat"sv << nll(repeat);
+                _buf << temp.front();
+                _buf << indent() << "until "sv << temp.back() << nlr(repeat);
+                out.push_back(clearBuf());
+        }
+
         void transformSwitch(Switch_t* switchNode, str_list& out, ExpUsage usage, ExpList_t* assignList = nullptr) {
                 str_list temp;
                 if (usage == ExpUsage::Closure) {