fix class initializing procedure.

1 files changed, 11 insertions, 11 deletions

diff --git a/src/yuescript/yue_compiler.cpp b/src/yuescript/yue_compiler.cpp
index 3c2f809..5afeaba 100755
--- a/src/yuescript/yue_compiler.cpp
+++ b/src/yuescript/yue_compiler.cpp
@@ -5399,6 +5399,17 @@ private:
                 _buf << indent(1) << "end"sv << nll(classDecl);
                 _buf << indent() << "})"sv << nll(classDecl);
                 _buf << indent() << baseVar << ".__class = "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 or "sv << mixin << '\n';
+                        _buf << "\t\t"sv << baseVar << '[' << key << "]="sv << val << " if "sv << baseVar << '[' << key << "]==nil"sv;
+                        transformBlock(toAst<Block_t>(clearBuf(), x), temp, ExpUsage::Common);
+                }
                 if (!statements.empty()) {
                         _buf << indent() << "local self = "sv << classVar << ';' << nll(classDecl);
                 }
@@ -5411,17 +5422,6 @@ 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 << ".__class and "sv << mixin << ".__base or "sv << mixin << '\n';
-                        _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);