From eb065658e6632c51b07a380b26d5c9d27f2a03b1 Mon Sep 17 00:00:00 2001 From: Jan Date: Sun, 31 Dec 2023 13:40:51 +0100 Subject: [PATCH] Use CommonLocalizeEntry in parser --- src/ObjLoading/Localize/LocalizeCommonAssetLoader.cpp | 3 +-- src/ObjLoading/Localize/Parsing/LocalizeFileParser.cpp | 2 +- src/ObjLoading/Localize/Parsing/LocalizeFileParser.h | 2 +- src/ObjLoading/Localize/Parsing/LocalizeFileParserState.cpp | 4 ++-- src/ObjLoading/Localize/Parsing/LocalizeFileParserState.h | 5 +++-- src/ObjLoading/Localize/Parsing/LocalizeFileReader.cpp | 6 +++--- src/ObjLoading/Localize/Parsing/LocalizeFileReader.h | 3 ++- .../Parsing/Sequence/SequenceLocalizeFileLanguageValue.cpp | 2 +- 8 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/ObjLoading/Localize/LocalizeCommonAssetLoader.cpp b/src/ObjLoading/Localize/LocalizeCommonAssetLoader.cpp index ab39dff55..b4153dd1f 100644 --- a/src/ObjLoading/Localize/LocalizeCommonAssetLoader.cpp +++ b/src/ObjLoading/Localize/LocalizeCommonAssetLoader.cpp @@ -30,9 +30,8 @@ bool LocalizeCommonAssetLoader::LoadLocalizeAsset(const std::string& assetName, LocalizeFileReader reader(*file.m_stream, assetName, zone->m_language, zoneState); const auto localizeEntries = reader.ReadLocalizeFile(); - for (const auto& [key, value] : localizeEntries) + for (const auto& entry : localizeEntries) { - CommonLocalizeEntry entry(key, value); m_entry_callback(entry); } diff --git a/src/ObjLoading/Localize/Parsing/LocalizeFileParser.cpp b/src/ObjLoading/Localize/Parsing/LocalizeFileParser.cpp index 56413ac65..35958c067 100644 --- a/src/ObjLoading/Localize/Parsing/LocalizeFileParser.cpp +++ b/src/ObjLoading/Localize/Parsing/LocalizeFileParser.cpp @@ -32,7 +32,7 @@ const std::vector::se return !m_state->m_end ? tests : noTests; } -std::map LocalizeFileParser::GetParsedValues() +std::vector LocalizeFileParser::GetParsedValues() { return std::move(m_state->m_entries); } diff --git a/src/ObjLoading/Localize/Parsing/LocalizeFileParser.h b/src/ObjLoading/Localize/Parsing/LocalizeFileParser.h index e9072cf2f..20b5b39bc 100644 --- a/src/ObjLoading/Localize/Parsing/LocalizeFileParser.h +++ b/src/ObjLoading/Localize/Parsing/LocalizeFileParser.h @@ -13,5 +13,5 @@ class LocalizeFileParser final : public AbstractParser GetParsedValues(); + std::vector GetParsedValues(); }; diff --git a/src/ObjLoading/Localize/Parsing/LocalizeFileParserState.cpp b/src/ObjLoading/Localize/Parsing/LocalizeFileParserState.cpp index 35dbc8086..0a52c5f8b 100644 --- a/src/ObjLoading/Localize/Parsing/LocalizeFileParserState.cpp +++ b/src/ObjLoading/Localize/Parsing/LocalizeFileParserState.cpp @@ -1,6 +1,7 @@ #include "LocalizeFileParserState.h" #include "Localize/LocalizeCommon.h" +#include "Utils/StringUtils.h" LocalizeFileParserState::LocalizeFileParserState(const GameLanguage language, LocalizeReadingZoneState* zoneState) : m_end(false), @@ -8,6 +9,5 @@ LocalizeFileParserState::LocalizeFileParserState(const GameLanguage language, Lo m_zone_state(zoneState) { m_language_name_caps = LocalizeCommon::GetNameOfLanguage(m_language); - for (auto& c : m_language_name_caps) - c = static_cast(toupper(c)); + utils::MakeStringUpperCase(m_language_name_caps); } diff --git a/src/ObjLoading/Localize/Parsing/LocalizeFileParserState.h b/src/ObjLoading/Localize/Parsing/LocalizeFileParserState.h index ad83741ea..bee910d78 100644 --- a/src/ObjLoading/Localize/Parsing/LocalizeFileParserState.h +++ b/src/ObjLoading/Localize/Parsing/LocalizeFileParserState.h @@ -1,17 +1,18 @@ #pragma once #include "Game/GameLanguage.h" +#include "Localize/CommonLocalizeEntry.h" #include "Localize/LocalizeReadingZoneState.h" -#include #include +#include class LocalizeFileParserState { public: bool m_end; - std::map m_entries; + std::vector m_entries; GameLanguage m_language; LocalizeReadingZoneState* m_zone_state; diff --git a/src/ObjLoading/Localize/Parsing/LocalizeFileReader.cpp b/src/ObjLoading/Localize/Parsing/LocalizeFileReader.cpp index a2c1a3444..5621bc88e 100644 --- a/src/ObjLoading/Localize/Parsing/LocalizeFileReader.cpp +++ b/src/ObjLoading/Localize/Parsing/LocalizeFileReader.cpp @@ -28,7 +28,7 @@ void LocalizeFileReader::SetupStreamProxies() m_stream = m_open_streams.back().get(); } -std::map LocalizeFileReader::ReadLocalizeFile() +std::vector LocalizeFileReader::ReadLocalizeFile() { SimpleLexer::Config lexerConfig; lexerConfig.m_emit_new_line_tokens = true; @@ -43,6 +43,6 @@ std::map LocalizeFileReader::ReadLocalizeFile() if (parser->Parse()) return parser->GetParsedValues(); - std::cout << "Parsing localization file failed!" << std::endl; - return std::map(); + std::cerr << "Parsing localization file failed!" << std::endl; + return std::vector(); } diff --git a/src/ObjLoading/Localize/Parsing/LocalizeFileReader.h b/src/ObjLoading/Localize/Parsing/LocalizeFileReader.h index cf4572bc8..da0ac2f2d 100644 --- a/src/ObjLoading/Localize/Parsing/LocalizeFileReader.h +++ b/src/ObjLoading/Localize/Parsing/LocalizeFileReader.h @@ -1,6 +1,7 @@ #pragma once #include "Game/GameLanguage.h" +#include "Localize/CommonLocalizeEntry.h" #include "Localize/LocalizeReadingZoneState.h" #include "Parsing/IParserLineStream.h" @@ -23,5 +24,5 @@ class LocalizeFileReader public: LocalizeFileReader(std::istream& stream, std::string fileName, GameLanguage language, LocalizeReadingZoneState* zoneState); - std::map ReadLocalizeFile(); + std::vector ReadLocalizeFile(); }; diff --git a/src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileLanguageValue.cpp b/src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileLanguageValue.cpp index 064a5fcd6..fbf8110bf 100644 --- a/src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileLanguageValue.cpp +++ b/src/ObjLoading/Localize/Parsing/Sequence/SequenceLocalizeFileLanguageValue.cpp @@ -38,6 +38,6 @@ void SequenceLocalizeFileLanguageValue::ProcessMatch(LocalizeFileParserState* st std::cout << "Localize: a value for reference \"" << currentReference << "\" was already defined\n"; } - state->m_entries[currentReference] = valueToken.StringValue(); + state->m_entries.emplace_back(currentReference, valueToken.StringValue()); } }