3 files changed, 14 insertions, 6 deletions

diff --git a/spec/inputs/existential.moon b/spec/inputs/existential.moon
index 831383b..7ee3bde 100644
--- a/spec/inputs/existential.moon
+++ b/spec/inputs/existential.moon
@@ -43,3 +43,5 @@ len = utf8?.len or string?.len or (o) -> #o
 
 a = tb1?\end? 123 + tb2?\then 456
 
+b = tb1?\end? or tb2?\then
+
diff --git a/src/MoonP/moon_compiler.cpp b/src/MoonP/moon_compiler.cpp
index db2e278..c854f58 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 char* version() {
-        return "0.3.6";
+        return "0.3.7";
 }
 
 // name of table stored in lua registry
@@ -3129,15 +3129,15 @@ private:
                         return;
                 }
                 const auto& chainList = chainValue->items.objects();
-                if (transformChainEndWithColonItem(chainList, out, usage, assignList)) {
-                        return;
-                }
                 if (transformChainEndWithEOP(chainList, out, usage, assignList)) {
                         return;
                 }
                 if (transformChainWithEOP(chainList, out, usage, assignList)) {
                         return;
                 }
+                if (transformChainEndWithColonItem(chainList, out, usage, assignList)) {
+                        return;
+                }
                 transformChainList(chainList, out, usage, assignList);
         }
 
diff --git a/src/moonp.cpp b/src/moonp.cpp
index 18eb059..795e6d2 100644
--- a/src/moonp.cpp
+++ b/src/moonp.cpp
@@ -434,14 +434,20 @@ int main(int narg, const char** args) {
                 results.push_back(std::move(task));
         }
         int ret = 0;
-        std::string msg;
+        std::list<std::string> errs;
         for (auto& result : results) {
                 int val = 0;
+                std::string msg;
                 std::tie(val, msg) = result.get();
                 if (val != 0) {
                         ret = val;
+                        errs.push_back(msg);
+                } else {
+                        std::cout << msg;
                 }
-                std::cout << msg;
+        }
+        for (const auto& err : errs) {
+                std::cout << err;
         }
         return ret;
 }