fix: fix molang & hashedstring bugs

LiteLDev · Feb 8, 2024 · 4e53ed4 · 4e53ed4
1 parent 4e0391f
commit 4e53ed4
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 13 deletions.
diff --git a/src/mc/deps/core/string/HashedString.h b/src/mc/deps/core/string/HashedString.h
@@ -27,11 +27,10 @@ class HashedString {
       str(str),
       lastMatch(nullptr) {} // NOLINT
 
-    [[nodiscard]] constexpr HashedString(std::string&& str) noexcept // NOLINT
-    : str(std::move(str)),
-      lastMatch(nullptr) {
-        hash = computeHash(str);
-    }
+    [[nodiscard]] constexpr HashedString(std::string&& s) noexcept // NOLINT
+    : hash(computeHash(s)),
+      str(std::move(s)),
+      lastMatch(nullptr) {}
     [[nodiscard]] constexpr HashedString(char const* str) noexcept : HashedString(std::string{str}) {} // NOLINT
 
     [[nodiscard]] constexpr HashedString(HashedString const& other) noexcept

diff --git a/src/mc/util/molang/MolangMemberArray.h b/src/mc/util/molang/MolangMemberArray.h
@@ -26,7 +26,7 @@ namespace mce { class Color; }
 
 struct MolangMemberArray {
 public:
-    std::unique_ptr<std::vector<MolangMemberVariable>> mMembers;
+    std::vector<MolangMemberVariable> mMembers;
 
 public:
     // prevent constructor by default

diff --git a/src/mc/util/molang/MolangScriptArg.h b/src/mc/util/molang/MolangScriptArg.h
@@ -45,16 +45,21 @@ struct MolangScriptArg {
     MolangScriptArgPOD  mPOD;
     MolangScriptArgData mData;
 
+    template <class T>
+    MolangScriptArg(T const&) = delete;
+
+    MCTAPI MolangScriptArg(MolangMemberArray const&);
+
 public:
     // NOLINTBEGIN
     // symbol: ??0MolangScriptArg@@QEAA@XZ
     MCAPI MolangScriptArg();
 
     // symbol: ??0MolangScriptArg@@QEAA@M@Z
-    MCAPI explicit MolangScriptArg(float);
+    MCAPI MolangScriptArg(float);
 
     // symbol: ??0MolangScriptArg@@QEAA@H@Z
-    MCAPI explicit MolangScriptArg(int);
+    MCAPI MolangScriptArg(int);
 
     // symbol: ??0MolangScriptArg@@QEAA@$$QEAU0@@Z
     MCAPI MolangScriptArg(struct MolangScriptArg&&);

diff --git a/src/mc/util/molang/MolangVariable.h b/src/mc/util/molang/MolangVariable.h
@@ -1,12 +1,20 @@
 #pragma once
 
 #include "mc/_HeaderOutputPredefine.h"
+#include "mc/deps/core/string/HashedString.h"
+#include "mc/util/molang/MolangScriptArg.h"
+#include "mc/util/molang/MolangVariableSettings.h"
 
 // auto generated inclusion list
 #include "mc/util/molang/MolangVariableIndex.h"
 
 class MolangVariable {
 public:
+    HashedString           mName;
+    MolangScriptArg        mValue;
+    MolangScriptArg        mPublicValue;
+    MolangVariableSettings mSettings;
+
     // prevent constructor by default
     MolangVariable& operator=(MolangVariable const&);
     MolangVariable(MolangVariable const&);

diff --git a/src/mc/util/molang/MolangVariableSettings.h b/src/mc/util/molang/MolangVariableSettings.h
@@ -1,11 +1,13 @@
 #pragma once
 
 #include "mc/_HeaderOutputPredefine.h"
+#include "mc/util/molang/MolangVariableIndex.h"
 
 struct MolangVariableSettings {
-public:
-    // prevent constructor by default
-    MolangVariableSettings& operator=(MolangVariableSettings const&);
-    MolangVariableSettings(MolangVariableSettings const&);
-    MolangVariableSettings();
+    enum AccessSpecifier : int {
+        Private = 0,
+        Public  = 1,
+    };
+    MolangVariableIndex mIndex;
+    AccessSpecifier     mAccessSpecifier;
 };