try fixing overriding issue mentioned in issue #84.

2 files changed, 3 insertions, 3 deletions

diff --git a/spec/outputs/class.lua b/spec/outputs/class.lua
index 85845d3..929c243 100644
--- a/spec/outputs/class.lua
+++ b/spec/outputs/class.lua
@@ -1033,7 +1033,7 @@ 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) do
-                        if not _key_0:match("^__") then
+                        if not _key_0:match("^__") and _base_0[_key_0] == nil then
                                 _base_0[_key_0] = _val_0
                         end
                 end
diff --git a/src/yuescript/yue_compiler.cpp b/src/yuescript/yue_compiler.cpp
index 26a8c5a..3720915 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.8"sv;
+const std::string_view version = "0.10.9"sv;
 const std::string_view extension = "yue"sv;
 
 class YueCompilerImpl {
@@ -5344,7 +5344,7 @@ private:
                         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 not "sv << key << "\\match\"^__\""sv;
+                        _buf << "\t\t"sv << baseVar << '[' << key << "]="sv << val << " if not "sv << key << "\\match\"^__\" and "sv << baseVar << '[' << key << "] == nil"sv;
                         transformBlock(toAst<Block_t>(clearBuf(), x), temp, ExpUsage::Common);
                 }
                 temp.push_back(indent() + baseVar + ".__index = "s + baseVar + nll(classDecl));