INSANEMODE/OpenAssetTools
1
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-06-11 07:18:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix not supporting nullptr scriptstrings

Browse Source
This commit is contained in:
Jan
2021-12-30 16:51:16 +01:00
parent 7283cc5640
commit 538c4be839
20 changed files with 209 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
src/ZoneCommon/Zone/ZoneScriptStrings.cpp
View File

@ -1,8 +1,51 @@
#include "ZoneScriptStrings.h"
#include <cassert>
#include <stdexcept>
#include <sstream>
ZoneScriptStrings::ZoneScriptStrings()
: m_null_entry_pos(0)
{
// Make script string 0 a nullptr string
m_scr_strings.emplace_back();
}
void ZoneScriptStrings::InitializeForExistingZone()
{
m_null_entry_pos = -1;
m_scr_strings.clear();
}
void ZoneScriptStrings::InitializeForExistingZone(const char** scrStrList, const size_t scrStrCount)
{
InitializeForExistingZone();
if (!scrStrList)
return;
for (auto i = 0u; i < scrStrCount; i++)
AddScriptString(scrStrList[i]);
}
void ZoneScriptStrings::AddScriptString(const char* value)
{
const auto newStringIndex = m_scr_strings.size();
const auto newScrStringIndex = static_cast<scr_string_t>(newStringIndex);
if (value != nullptr)
{
m_scr_strings.emplace_back(value);
m_scr_string_lookup[value] = newScrStringIndex;
}
else
{
assert(m_null_entry_pos < 0); // If null index is already set, the previous cost will not be considered null string anymore.
m_scr_strings.emplace_back();
m_null_entry_pos = static_cast<int>(newStringIndex);
}
}
void ZoneScriptStrings::AddScriptString(const std::string& value)
{
const auto newScrStringIndex = static_cast<scr_string_t>(m_scr_strings.size());
@ -10,20 +53,36 @@ void ZoneScriptStrings::AddScriptString(const std::string& value)
m_scr_string_lookup[value] = newScrStringIndex;
}
scr_string_t ZoneScriptStrings::AddOrGetScriptString(const std::string& value)
scr_string_t ZoneScriptStrings::AddOrGetScriptString(const char* value)
{
if (m_scr_strings.empty())
{
m_scr_strings.emplace_back("");
m_scr_string_lookup[""] = static_cast<scr_string_t>(0);
}
else
if (value != nullptr)
{
const auto existingScriptString = m_scr_string_lookup.find(value);
if (existingScriptString != m_scr_string_lookup.end())
return existingScriptString->second;
const auto newScrStringIndex = static_cast<scr_string_t>(m_scr_strings.size());
m_scr_strings.emplace_back(value);
m_scr_string_lookup[value] = newScrStringIndex;
return newScrStringIndex;
}
if (m_null_entry_pos < 0)
{
const auto newStringIndex = m_scr_strings.size();
m_scr_strings.emplace_back();
m_null_entry_pos = static_cast<int>(newStringIndex);
return static_cast<scr_string_t>(newStringIndex);
}
return static_cast<scr_string_t>(m_null_entry_pos);
}
scr_string_t ZoneScriptStrings::AddOrGetScriptString(const std::string& value)
{
const auto existingScriptString = m_scr_string_lookup.find(value);
if (existingScriptString != m_scr_string_lookup.end())
return existingScriptString->second;
const auto newScrStringIndex = static_cast<scr_string_t>(m_scr_strings.size());
m_scr_strings.emplace_back(value);
m_scr_string_lookup[value] = newScrStringIndex;
@ -31,6 +90,27 @@ scr_string_t ZoneScriptStrings::AddOrGetScriptString(const std::string& value)
return newScrStringIndex;
}
scr_string_t ZoneScriptStrings::GetScriptString(const char* value) const
{
if (value == nullptr)
{
if (m_null_entry_pos >= 0)
return static_cast<scr_string_t>(m_null_entry_pos);
std::ostringstream str;
str << "Unable to find script string nullptr";
throw std::runtime_error(str.str());
}
const auto existingScriptString = m_scr_string_lookup.find(value);
if (existingScriptString != m_scr_string_lookup.end())
return existingScriptString->second;
std::ostringstream str;
str << "Unable to find script string \"" << value << "\"";
throw std::runtime_error(str.str());
}
scr_string_t ZoneScriptStrings::GetScriptString(const std::string& value) const
{
const auto existingScriptString = m_scr_string_lookup.find(value);
@ -52,9 +132,42 @@ bool ZoneScriptStrings::Empty() const
return m_scr_strings.empty();
}
const char* ZoneScriptStrings::CValue(const size_t index) const
{
if (index > m_scr_strings.size())
{
std::ostringstream str;
str << "Script string index '" << index << "' is not inside range of zone script strings (count: " << m_scr_strings.size() << ")";
throw std::runtime_error(str.str());
}
if (m_null_entry_pos == static_cast<int>(index))
return nullptr;
return m_scr_strings[index].c_str();
}
const std::string& ZoneScriptStrings::Value(const size_t index) const
{
return (*this)[index];
}
const std::string& ZoneScriptStrings::Value(const size_t index, bool& isNull) const
{
if (index > m_scr_strings.size())
{
std::ostringstream str;
str << "Script string index '" << index << "' is not inside range of zone script strings (count: " << m_scr_strings.size() << ")";
throw std::runtime_error(str.str());
}
isNull = m_null_entry_pos == static_cast<int>(index);
return m_scr_strings[index];
}
const std::string& ZoneScriptStrings::operator[](const size_t index) const
{
if(index > m_scr_strings.size())
if (index > m_scr_strings.size())
{
std::ostringstream str;
str << "Script string index '" << index << "' is not inside range of zone script strings (count: " << m_scr_strings.size() << ")";

13
src/ZoneCommon/Zone/ZoneScriptStrings.h
View File

@ -10,16 +10,29 @@
class ZoneScriptStrings
{
int m_null_entry_pos;
std::vector<std::string> m_scr_strings;
std::unordered_map<std::string, scr_string_t> m_scr_string_lookup;
public:
ZoneScriptStrings();
void InitializeForExistingZone();
void InitializeForExistingZone(const char** scrStrList, size_t scrStrCount);
void AddScriptString(const char* value);
void AddScriptString(const std::string& value);
scr_string_t AddOrGetScriptString(const char* value);
scr_string_t AddOrGetScriptString(const std::string& value);
_NODISCARD scr_string_t GetScriptString(const char* value) const;
_NODISCARD scr_string_t GetScriptString(const std::string& value) const;
_NODISCARD size_t Count() const;
_NODISCARD bool Empty() const;
_NODISCARD const char* CValue(size_t index) const;
_NODISCARD const std::string& Value(size_t index) const;
_NODISCARD const std::string& Value(size_t index, bool& isNull) const;
_NODISCARD const std::string& operator[](size_t index) const;
_NODISCARD std::vector<std::string>::const_iterator begin() const;
_NODISCARD std::vector<std::string>::const_iterator end() const;