doing the mixing after the class object initialized.

2 files changed, 24 insertions, 23 deletions

diff --git a/spec/outputs/class.lua b/spec/outputs/class.lua
index 8db5a8a..bb14ad8 100644
--- a/spec/outputs/class.lua
+++ b/spec/outputs/class.lua
@@ -1090,19 +1090,6 @@ do
         if _base_0.__index == nil then
                 _base_0.__index = _base_0
         end
-        local _list_0 = {
-                B,
-                C,
-                D
-        }
-        for _index_0 = 1, #_list_0 do
-                local _mixin_0 = _list_0[_index_0]
-                for _key_0, _val_0 in pairs(_mixin_0.__base) do
-                        if _key_0 ~= "__class" then
-                                _base_0[_key_0] = _val_0
-                        end
-                end
-        end
         _class_0 = setmetatable({
                 __init = function() end,
                 __base = _base_0,
@@ -1117,6 +1104,19 @@ do
         })
         _base_0.__class = _class_0
         A = _class_0
+        local _list_0 = {
+                B,
+                C,
+                D
+        }
+        for _index_0 = 1, #_list_0 do
+                local _mixin_0 = _list_0[_index_0]
+                for _key_0, _val_0 in pairs(_mixin_0.__base) do
+                        if _base_0[_key_0] == nil then
+                                _base_0[_key_0] = _val_0
+                        end
+                end
+        end
 end
 do
         local _class_0
diff --git a/src/yuescript/yue_compiler.cpp b/src/yuescript/yue_compiler.cpp
index 3394f1f..3e9c048 100755
--- a/src/yuescript/yue_compiler.cpp
+++ b/src/yuescript/yue_compiler.cpp
@@ -5338,16 +5338,6 @@ private:
                         temp.back() += "{ }"s + nll(classDecl);
                 }
                 transformAssignment(toAst<ExpListAssign_t>(baseVar + ".__index ?\?= "s + baseVar, classDecl), temp);
-                if (classDecl->mixes) {
-                        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\n"sv;
-                        _buf << "\t\t"sv << baseVar << '[' << key << "]="sv << val << " if "sv << key << "~=\"__class\""sv;
-                        transformBlock(toAst<Block_t>(clearBuf(), x), temp, ExpUsage::Common);
-                }
                 str_list tmp;
                 if (usage == ExpUsage::Assignment) {
                         auto assign = x->new_ptr<Assign_t>();
@@ -5421,6 +5411,17 @@ private:
                 if (!assignItem.empty()) {
                         _buf << indent() << assignItem << " = "sv << classVar << nll(classDecl);
                 }
+                temp.push_back(clearBuf());
+                if (classDecl->mixes) {
+                        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\n"sv;
+                        _buf << "\t\t"sv << baseVar << '[' << key << "]="sv << val << " if "sv << baseVar << '[' << key << "]==nil"sv;
+                        transformBlock(toAst<Block_t>(clearBuf(), x), temp, ExpUsage::Common);
+                }
                 switch (usage) {
                         case ExpUsage::Return: {
                                 _buf << indent() << "return "sv << classVar << nlr(classDecl);