zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-19 15:52:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #60 from Laupetin/fix/custom-menu-function-case-sensitivity

Browse Source 
Fix custom menu function case sensitivity
This commit is contained in:
Jan 2023-12-14 19:47:44 +01:00 committed by GitHub
commit e8a22f3968
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ObjLoading/Game/IW4/Menu/MenuConverterIW4.cpp
View File

@ -12,6 +12,7 @@
#include "Parsing/Simple/Expression/SimpleExpressionConditionalOperator.h" #include "Parsing/Simple/Expression/SimpleExpressionConditionalOperator.h"
#include "Parsing/Simple/Expression/SimpleExpressionUnaryOperation.h" #include "Parsing/Simple/Expression/SimpleExpressionUnaryOperation.h"
#include "Utils/ClassUtils.h" #include "Utils/ClassUtils.h"
#include "Utils/StringUtils.h"
#include <cassert> #include <cassert>
#include <cstring> #include <cstring>
@ -204,12 +205,15 @@ namespace IW4
const CommonMenuDef* menu, const CommonMenuDef* menu,
const CommonItemDef* item) const const CommonItemDef* item) const
{ {
Statement_s* functionStatement = m_conversion_zone_state->FindFunction(functionCall->m_function_name); std::string lowerCaseFunctionName(functionCall->m_function_name);
utils::MakeStringLowerCase(lowerCaseFunctionName);
Statement_s* functionStatement = m_conversion_zone_state->FindFunction(lowerCaseFunctionName);
if (functionStatement == nullptr) if (functionStatement == nullptr)
{ {
// Function was not converted yet: Convert it now // Function was not converted yet: Convert it now
const auto foundCommonFunction = m_parsing_zone_state->m_functions_by_name.find(functionCall->m_function_name); const auto foundCommonFunction = m_parsing_zone_state->m_functions_by_name.find(lowerCaseFunctionName);
if (foundCommonFunction == m_parsing_zone_state->m_functions_by_name.end()) if (foundCommonFunction == m_parsing_zone_state->m_functions_by_name.end())
throw MenuConversionException("Failed to find definition for custom function \"" + functionCall->m_function_name + "\"", menu, item); throw MenuConversionException("Failed to find definition for custom function \"" + functionCall->m_function_name + "\"", menu, item);

10
src/ObjLoading/Game/IW5/Menu/MenuConverterIW5.cpp
View File

@ -12,6 +12,7 @@
#include "Parsing/Simple/Expression/SimpleExpressionConditionalOperator.h" #include "Parsing/Simple/Expression/SimpleExpressionConditionalOperator.h"
#include "Parsing/Simple/Expression/SimpleExpressionUnaryOperation.h" #include "Parsing/Simple/Expression/SimpleExpressionUnaryOperation.h"
#include "Utils/ClassUtils.h" #include "Utils/ClassUtils.h"
#include "Utils/StringUtils.h"
#include <cassert> #include <cassert>
#include <cstring> #include <cstring>
@ -204,18 +205,21 @@ namespace IW5
const CommonMenuDef* menu, const CommonMenuDef* menu,
const CommonItemDef* item) const const CommonItemDef* item) const
{ {
Statement_s* functionStatement = m_conversion_zone_state->FindFunction(functionCall->m_function_name); std::string lowerCaseFunctionName(functionCall->m_function_name);
utils::MakeStringLowerCase(lowerCaseFunctionName);
Statement_s* functionStatement = m_conversion_zone_state->FindFunction(lowerCaseFunctionName);
if (functionStatement == nullptr) if (functionStatement == nullptr)
{ {
// Function was not converted yet: Convert it now // Function was not converted yet: Convert it now
const auto foundCommonFunction = m_parsing_zone_state->m_functions_by_name.find(functionCall->m_function_name); const auto foundCommonFunction = m_parsing_zone_state->m_functions_by_name.find(lowerCaseFunctionName);
if (foundCommonFunction == m_parsing_zone_state->m_functions_by_name.end()) if (foundCommonFunction == m_parsing_zone_state->m_functions_by_name.end())
throw MenuConversionException("Failed to find definition for custom function \"" + functionCall->m_function_name + "\"", menu, item); throw MenuConversionException("Failed to find definition for custom function \"" + functionCall->m_function_name + "\"", menu, item);
functionStatement = ConvertExpression(foundCommonFunction->second->m_value.get(), menu, item); functionStatement = ConvertExpression(foundCommonFunction->second->m_value.get(), menu, item);
functionStatement = m_conversion_zone_state->AddFunction(foundCommonFunction->second->m_name, functionStatement); functionStatement = m_conversion_zone_state->AddFunction(lowerCaseFunctionName, functionStatement);
} }
expressionEntry functionEntry{}; expressionEntry functionEntry{};

12
src/ObjLoading/Parsing/Menu/Matcher/MenuExpressionMatchers.cpp
View File

@ -58,7 +58,11 @@ const std::map<std::string, size_t>& MenuExpressionMatchers::GetBaseFunctionMapF
if (!iw4FunctionMapInitialized) if (!iw4FunctionMapInitialized)
{ {
for (size_t i = IW4::expressionFunction_e::EXP_FUNC_DYN_START; i < std::extent_v<decltype(IW4::g_expFunctionNames)>; i++) for (size_t i = IW4::expressionFunction_e::EXP_FUNC_DYN_START; i < std::extent_v<decltype(IW4::g_expFunctionNames)>; i++)
iw4FunctionMap.emplace(std::make_pair(IW4::g_expFunctionNames[i], i)); {
std::string functionName(IW4::g_expFunctionNames[i]);
utils::MakeStringLowerCase(functionName);
iw4FunctionMap.emplace(std::make_pair(functionName, i));
}
} }
return iw4FunctionMap; return iw4FunctionMap;
@ -71,7 +75,11 @@ const std::map<std::string, size_t>& MenuExpressionMatchers::GetBaseFunctionMapF
if (!iw5FunctionMapInitialized) if (!iw5FunctionMapInitialized)
{ {
for (size_t i = IW5::expressionFunction_e::EXP_FUNC_DYN_START; i < std::extent_v<decltype(IW5::g_expFunctionNames)>; i++) for (size_t i = IW5::expressionFunction_e::EXP_FUNC_DYN_START; i < std::extent_v<decltype(IW5::g_expFunctionNames)>; i++)
iw5FunctionMap.emplace(std::make_pair(IW5::g_expFunctionNames[i], i)); {
std::string functionName(IW5::g_expFunctionNames[i]);
utils::MakeStringLowerCase(functionName);
iw5FunctionMap.emplace(std::make_pair(std::move(functionName), i));
}
} }
return iw5FunctionMap; return iw5FunctionMap;

7
src/ObjLoading/Parsing/Menu/MenuAssetZoneState.cpp
View File

@ -1,10 +1,15 @@
#include "MenuAssetZoneState.h" #include "MenuAssetZoneState.h"
#include "Utils/StringUtils.h"
using namespace menu; using namespace menu;
void MenuAssetZoneState::AddFunction(std::unique_ptr<CommonFunctionDef> function) void MenuAssetZoneState::AddFunction(std::unique_ptr<CommonFunctionDef> function)
{ {
m_functions_by_name.emplace(std::make_pair(function->m_name, function.get())); std::string lowerCaseFunctionName(function->m_name);
utils::MakeStringLowerCase(lowerCaseFunctionName);
m_functions_by_name.emplace(std::make_pair(lowerCaseFunctionName, function.get()));
m_functions.emplace_back(std::move(function)); m_functions.emplace_back(std::move(function));
} }

6
src/ObjLoading/Parsing/Menu/MenuFileParserState.cpp
View File

@ -1,5 +1,7 @@
#include "MenuFileParserState.h" #include "MenuFileParserState.h"
#include "Utils/StringUtils.h"
using namespace menu; using namespace menu;
MenuFileParserState::EventHandlerConditionState::EventHandlerConditionState(CommonEventHandlerCondition* condition) MenuFileParserState::EventHandlerConditionState::EventHandlerConditionState(CommonEventHandlerCondition* condition)
@ -32,7 +34,9 @@ MenuFileParserState::MenuFileParserState(const FeatureLevel featureLevel, const
{ {
for (const auto& function : zoneState->m_functions) for (const auto& function : zoneState->m_functions)
{ {
m_functions_by_name.emplace(std::make_pair(function->m_name, function.get())); std::string lowerCaseName(function->m_name);
utils::MakeStringLowerCase(lowerCaseName);
m_functions_by_name.emplace(std::make_pair(lowerCaseName, function.get()));
} }
for (const auto& menu : zoneState->m_menus) for (const auto& menu : zoneState->m_menus)

2
src/ObjLoading/Parsing/Menu/MenuFileParserState.h
View File

@ -36,7 +36,9 @@ namespace menu
std::vector<std::unique_ptr<CommonFunctionDef>> m_functions; std::vector<std::unique_ptr<CommonFunctionDef>> m_functions;
std::vector<std::unique_ptr<CommonMenuDef>> m_menus; std::vector<std::unique_ptr<CommonMenuDef>> m_menus;
// Function names are case-insensitive, therefore keys are always lowercase
std::map<std::string, CommonFunctionDef*> m_functions_by_name; std::map<std::string, CommonFunctionDef*> m_functions_by_name;
std::map<std::string, CommonMenuDef*> m_menus_by_name; std::map<std::string, CommonMenuDef*> m_menus_by_name;
bool m_in_global_scope; bool m_in_global_scope;

7
src/ObjLoading/Parsing/Menu/Sequence/FunctionScopeSequences.cpp
View File

@ -34,10 +34,13 @@ namespace menu::function_scope_sequences
throw ParsingException(result.NextCapture(CAPTURE_TOKEN).GetPos(), ss.str()); throw ParsingException(result.NextCapture(CAPTURE_TOKEN).GetPos(), ss.str());
} }
const auto existingFunction = state->m_functions_by_name.find(state->m_current_function->m_name); auto lowerCaseName = state->m_current_function->m_name;
utils::MakeStringLowerCase(lowerCaseName);
const auto existingFunction = state->m_functions_by_name.find(lowerCaseName);
if (existingFunction == state->m_functions_by_name.end()) if (existingFunction == state->m_functions_by_name.end())
{ {
state->m_functions_by_name.emplace(std::make_pair(state->m_current_function->m_name, state->m_current_function)); state->m_functions_by_name.emplace(std::make_pair(lowerCaseName, state->m_current_function));
state->m_current_function = nullptr; state->m_current_function = nullptr;
} }
else if (!state->m_current_function->m_value->Equals(existingFunction->second->m_value.get())) else if (!state->m_current_function->m_value->Equals(existingFunction->second->m_value.get()))