3 files changed, 27 insertions, 14 deletions

diff --git a/src/yuescript/yue_compiler.cpp b/src/yuescript/yue_compiler.cpp
index e061604..d0f2dbb 100644
--- a/src/yuescript/yue_compiler.cpp
+++ b/src/yuescript/yue_compiler.cpp
@@ -14,7 +14,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 #include <unordered_map>
 #include <unordered_set>
 #include <vector>
-#include <optional>
 
 #include "yuescript/yue_compiler.h"
 #include "yuescript/yue_parser.h"
@@ -60,7 +59,7 @@ namespace yue {
 
 typedef std::list<std::string> str_list;
 
-const std::string_view version = "0.15.8"sv;
+const std::string_view version = "0.15.9"sv;
 const std::string_view extension = "yue"sv;
 
 class YueCompilerImpl {
@@ -2122,7 +2121,8 @@ private:
                                                         keyIndex = key;
                                                 } else if (auto key = np->key.as<String_t>()) {
                                                         keyIndex = newExp(key, np->key).get();
-                                                } else throw std::logic_error(_info.errorMessage("unsupported key for destructuring"sv, np));
+                                                } else
+                                                        throw std::logic_error(_info.errorMessage("unsupported key for destructuring"sv, np));
                                         }
                                         if (auto exp = np->value.as<Exp_t>()) {
                                                 if (!isAssignable(exp)) throw std::logic_error(_info.errorMessage("can't do destructure value"sv, exp));
@@ -2211,7 +2211,8 @@ private:
                                                         chain->items.push_back(newExp(key, dp));
                                                 } else if (auto key = dp->key.as<Exp_t>()) {
                                                         chain->items.push_back(key);
-                                                } else throw std::logic_error(_info.errorMessage("unsupported key for destructuring"sv, dp));
+                                                } else
+                                                        throw std::logic_error(_info.errorMessage("unsupported key for destructuring"sv, dp));
                                         }
                                         if (auto exp = dp->value.get()) {
                                                 if (!isAssignable(exp)) throw std::logic_error(_info.errorMessage("can't destructure value"sv, exp));
@@ -6520,6 +6521,13 @@ private:
                         _buf << "\t\t"sv << baseVar << '[' << key << "]="sv << val << " if "sv << baseVar << '[' << key << "]==nil and (not "sv << cls << " or not "sv << key << "\\match \"^__\")"sv;
                         transformBlock(toAst<Block_t>(clearBuf(), x), temp, ExpUsage::Common);
                 }
+                if (!parentVar.empty()) {
+                        auto key = getUnusedName("_key_"sv);
+                        auto val = getUnusedName("_val_"sv);
+                        _buf << "for "sv << key << ',' << val << " in pairs "sv << parentVar << ".__base"sv << '\n'
+                                 << '\t' << baseVar << '[' << key << "]="sv << val << " if "sv << baseVar << '[' << key << "]==nil and "sv << key << "\\match(\"^__\") and not ("sv << key << "==\"__index\" and "sv << val << "=="sv << parentVar << ".__base)"sv;
+                        transformBlock(toAst<Block_t>(clearBuf(), x), temp, ExpUsage::Common);
+                }
                 transformAssignment(toAst<ExpListAssign_t>(baseVar + ".__index ?\?= "s + baseVar, classDecl), temp);
                 str_list tmp;
                 if (usage == ExpUsage::Assignment) {
diff --git a/src/yuescript/yue_parser.cpp b/src/yuescript/yue_parser.cpp
index 4aeb79a..e4de0b5 100644
--- a/src/yuescript/yue_parser.cpp
+++ b/src/yuescript/yue_parser.cpp
@@ -71,7 +71,7 @@ YueParser::YueParser() {
         Cut = false_();
         Seperator = true_();
 
-        invalid_empty_block = pl::user(true_(), [](const item_t& item) {
+        empty_block_error = pl::user(true_(), [](const item_t& item) {
                 throw ParserError("must be followed by a statement or an indented block", *item.begin, *item.end);
                 return false;
         });
@@ -84,9 +84,9 @@ YueParser::YueParser() {
         #define disable_chain(patt) (DisableChain >> ((patt) >> EnableChain | EnableChain >> Cut))
         #define disable_do_chain_arg_table_block(patt) (DisableDoChainArgTableBlock >> ((patt) >> EnableDoChainArgTableBlock | EnableDoChainArgTableBlock >> Cut))
         #define disable_arg_table_block(patt) (DisableArgTableBlock >> ((patt) >> EnableArgTableBlock | EnableArgTableBlock >> Cut))
-        #define body_with(str) (Space >> (key(str) >> Space >> (InBlock | Statement) | InBlock | invalid_empty_block))
+        #define body_with(str) (Space >> (key(str) >> Space >> (InBlock | Statement) | InBlock | empty_block_error))
         #define opt_body_with(str) (Space >> (key(str) >> Space >> (InBlock | Statement) | InBlock))
-        #define body (Space >> (InBlock | Statement | invalid_empty_block))
+        #define body (Space >> (InBlock | Statement | empty_block_error))
 
         Variable = pl::user(Name, [](const item_t& item) {
                 State* st = reinterpret_cast<State*>(item.user_data);
@@ -630,15 +630,17 @@ YueParser::YueParser() {
                         SpaceBreak >> Advance >> ArgBlock >> -arg_table_block
                 ) | arg_table_block;
 
+        leading_spaces_error = pl::user(+space_one >> expr('(') >> Exp >> +(sym(',') >> Exp) >> sym(')'), [](const item_t& item) {
+                throw ParserError("write invoke arguments in parentheses without leading spaces or leading spaces without parentheses", *item.begin, *item.end);
+                return false;
+        });
+
         InvokeArgs =
                 not_(set("-~")) >> Seperator >>
                 (
                         (Exp >> *(sym(',') >> Exp) >> -invoke_args_with_table) |
                         arg_table_block |
-                        pl::user(+space_one >> expr('(') >> Exp >> +(sym(',') >> Exp) >> sym(')'), [](const item_t& item) {
-                                throw ParserError("write invoke arguments in parentheses without spaces or space seperated without parentheses", *item.begin, *item.end);
-                                return false;
-                        })
+                        leading_spaces_error
                 );
 
         const_value = (expr("nil") | expr("true") | expr("false")) >> not_(AlphaNum);
@@ -666,7 +668,7 @@ YueParser::YueParser() {
                 Return | Local | Global | Export | Macro |
                 MacroInPlace | BreakLoop | Label | Goto | ShortTabAppending |
                 LocalAttrib | Backcall | PipeBody | ExpListAssign |
-                statement_appendix >> invalid_empty_block
+                statement_appendix >> empty_block_error
         ) >> Space >>
         -statement_appendix >> -statement_sep;
 
diff --git a/src/yuescript/yue_parser.h b/src/yuescript/yue_parser.h
index 461b381..9e2a621 100644
--- a/src/yuescript/yue_parser.h
+++ b/src/yuescript/yue_parser.h
@@ -48,7 +48,9 @@ public:
 };
 
 template <typename T>
-struct identity { typedef T type; };
+struct identity {
+        typedef T type;
+};
 
 #define AST_RULE(type) \
         rule type; \
@@ -113,7 +115,8 @@ private:
                 return Cut;
         }
 
-        rule invalid_empty_block;
+        rule empty_block_error;
+        rule leading_spaces_error;
 
         rule num_char;
         rule num_char_hex;