eukara
/
fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use unique_ptr for arrays

This commit is contained in:
Vasilii Rogin 2023-04-23 19:31:15 +03:00
parent 5b50673cf6
commit 4ed00c7bc0
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/sfall_arrays.cc
View File

@ -3,6 +3,7 @@
#include "sfall_script_value.h" #include "sfall_script_value.h"
#include <cstdint> #include <cstdint>
#include <memory>
#include <stdexcept> #include <stdexcept>
#include <unordered_map> #include <unordered_map>
#include <unordered_set> #include <unordered_set>
@ -36,9 +37,11 @@ public:
{ {
return values.size(); return values.size();
} }
// virtual void GetArrayKey() = 0;
}; };
using ArraysMap = std::unordered_map<ArrayId, SFallArray>; using ArraysMap = std::unordered_map<ArrayId, std::unique_ptr<SFallArray>>;
ArraysMap arrays; ArraysMap arrays;
std::unordered_set<ArrayId> temporaryArrays; std::unordered_set<ArrayId> temporaryArrays;
@ -61,7 +64,7 @@ ArrayId CreateArray(int len, uint32_t flags)
stackArrayId = array_id; stackArrayId = array_id;
arrays.emplace(std::make_pair(array_id, SFallArray { len, flags })); arrays.emplace(std::make_pair(array_id, std::make_unique<SFallArray>(len, flags)));
return array_id; return array_id;
} }
@ -73,19 +76,10 @@ ArrayId CreateTempArray(int len, uint32_t flags)
return array_id; return array_id;
} }
static SFallArray* get_array_by_id(ArrayId array_id)
{
auto iter = arrays.find(array_id);
if (iter == arrays.end()) {
return nullptr;
};
return &iter->second;
}
ProgramValue GetArrayKey(ArrayId array_id, int index) ProgramValue GetArrayKey(ArrayId array_id, int index)
{ {
auto arr = get_array_by_id(array_id); auto& arr = arrays[array_id];
if (arr == nullptr || index < -1 || index > arr->size()) { if (!arr || index < -1 || index > arr->size()) {
return SFallScriptValue(0); return SFallScriptValue(0);
}; };
if (index == -1) { // special index to indicate if array is associative if (index == -1) { // special index to indicate if array is associative
@ -97,8 +91,8 @@ ProgramValue GetArrayKey(ArrayId array_id, int index)
int LenArray(ArrayId array_id) int LenArray(ArrayId array_id)
{ {
auto arr = get_array_by_id(array_id); auto& arr = arrays[array_id];
if (arr == nullptr) { if (!arr) {
return -1; return -1;
}; };
@ -111,8 +105,9 @@ ProgramValue GetArray(ArrayId array_id, const SFallScriptValue& key)
{ {
// TODO: If type is string then do substr // TODO: If type is string then do substr
auto arr = get_array_by_id(array_id); auto& arr = arrays[array_id];
if (arr == nullptr) {
if (!arr) {
return SFallScriptValue(0); return SFallScriptValue(0);
}; };
@ -127,10 +122,10 @@ ProgramValue GetArray(ArrayId array_id, const SFallScriptValue& key)
void SetArray(ArrayId array_id, const SFallScriptValue& key, const SFallScriptValue& val, bool allowUnset) void SetArray(ArrayId array_id, const SFallScriptValue& key, const SFallScriptValue& val, bool allowUnset)
{ {
auto arr = get_array_by_id(array_id); auto& arr = arrays[array_id];
if (arr == nullptr) { if (!arr) {
return; return;
}; }
// TODO: assoc // TODO: assoc
@ -168,4 +163,5 @@ void sfallArraysReset()
nextArrayID = 1; nextArrayID = 1;
stackArrayId = 1; stackArrayId = 1;
} }
} }