change the behavior dealing with class and common table when doing mixin.

2 files changed, 11 insertions, 7 deletions

diff --git a/spec/outputs/class.lua b/spec/outputs/class.lua
index 3ec92d1..8f7c126 100644
--- a/spec/outputs/class.lua
+++ b/spec/outputs/class.lua
@@ -1096,9 +1096,10 @@ do
                 }
         }
         for _index_0 = 1, #_list_0 do
-                local _mixin_0 = _list_0[_index_0]
-                for _key_0, _val_0 in pairs(_mixin_0.__base or _mixin_0) do
-                        if _base_0[_key_0] == nil then
+                local _item_0 = _list_0[_index_0]
+                local _cls_0, _mixin_0 = (_item_0.__base ~= nil), _item_0.__base or _item_0
+                for _key_0, _val_0 in pairs(_mixin_0) do
+                        if _base_0[_key_0] == nil and (not _cls_0 or not _key_0:match("^__")) then
                                 _base_0[_key_0] = _val_0
                         end
                 end
diff --git a/src/yuescript/yue_compiler.cpp b/src/yuescript/yue_compiler.cpp
index 936809f..e7da2dd 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.10"sv;
+const std::string_view version = "0.10.11"sv;
 const std::string_view extension = "yue"sv;
 
 class YueCompilerImpl {
@@ -5338,13 +5338,16 @@ private:
                         temp.back() += "{ }"s + nll(classDecl);
                 }
                 if (classDecl->mixes) {
+                        auto item = getUnusedName("_item_"sv);
+                        auto cls = getUnusedName("_cls_"sv);
                         auto mixin = getUnusedName("_mixin_"sv);
                         auto key = getUnusedName("_key_"sv);
                         auto val = getUnusedName("_val_"sv);
                         auto mixins = _parser.toString(classDecl->mixes);
-                        _buf << "for "sv << mixin << " in *{"sv << mixins << "}\n"sv;
-                        _buf << "\tfor "sv << key << ',' << val << " in pairs "sv << mixin << ".__base or "sv << mixin << '\n';
-                        _buf << "\t\t"sv << baseVar << '[' << key << "]="sv << val << " if "sv << baseVar << '[' << key << "]==nil"sv;
+                        _buf << "for "sv << item << " in *{"sv << mixins << "}\n"sv;
+                        _buf << '\t' << cls << ',' << mixin << '=' << item << ".__base?,"sv << item << ".__base or "sv << item << '\n';
+                        _buf << "\tfor "sv << key << ',' << val << " in pairs "sv << mixin << '\n';
+                        _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);
                 }
                 transformAssignment(toAst<ExpListAssign_t>(baseVar + ".__index ?\?= "s + baseVar, classDecl), temp);