mirror of
https://github.com/Laupetin/OpenAssetTools.git
synced 2025-09-07 09:17:26 +00:00
Reformat code with clang format
This commit is contained in:
@@ -15,19 +15,15 @@ LocalizeFileParser::LocalizeFileParser(SimpleLexer* lexer, GameLanguage language
|
||||
|
||||
const std::vector<AbstractParser<SimpleParserValue, LocalizeFileParserState>::sequence_t*>& LocalizeFileParser::GetTestsForState()
|
||||
{
|
||||
static std::vector<sequence_t*> tests({
|
||||
new SequenceLocalizeFileReference(),
|
||||
new SequenceLocalizeFileConfig(),
|
||||
new SequenceLocalizeFileNotes(),
|
||||
new SequenceLocalizeFileVersion(),
|
||||
new SequenceLocalizeFileEndMarker(),
|
||||
new SequenceLocalizeFileLanguageValue(),
|
||||
new SequenceLocalizeFileConsumeEmptyLines()
|
||||
});
|
||||
static std::vector<sequence_t*> tests({new SequenceLocalizeFileReference(),
|
||||
new SequenceLocalizeFileConfig(),
|
||||
new SequenceLocalizeFileNotes(),
|
||||
new SequenceLocalizeFileVersion(),
|
||||
new SequenceLocalizeFileEndMarker(),
|
||||
new SequenceLocalizeFileLanguageValue(),
|
||||
new SequenceLocalizeFileConsumeEmptyLines(),});
|
||||
|
||||
static std::vector<sequence_t*> noTests({
|
||||
new SequenceLocalizeFileConsumeEmptyLines()
|
||||
});
|
||||
static std::vector<sequence_t*> noTests({new SequenceLocalizeFileConsumeEmptyLines(),});
|
||||
|
||||
return !m_state->m_end ? tests : noTests;
|
||||
}
|
||||
|
@@ -1,10 +1,10 @@
|
||||
#pragma once
|
||||
|
||||
#include "LocalizeFileParserState.h"
|
||||
#include "Game/GameLanguage.h"
|
||||
#include "LocalizeFileParserState.h"
|
||||
#include "Parsing/Impl/AbstractParser.h"
|
||||
#include "Parsing/Simple/SimpleLexer.h"
|
||||
#include "Parsing/Simple/SimpleParserValue.h"
|
||||
#include "Parsing/Impl/AbstractParser.h"
|
||||
|
||||
class LocalizeFileParser final : public AbstractParser<SimpleParserValue, LocalizeFileParserState>
|
||||
{
|
||||
|
@@ -1,10 +1,10 @@
|
||||
#pragma once
|
||||
#include <unordered_set>
|
||||
#include <vector>
|
||||
|
||||
#include "Game/GameLanguage.h"
|
||||
#include "Localize/LocalizeFile.h"
|
||||
|
||||
#include <unordered_set>
|
||||
#include <vector>
|
||||
|
||||
class LocalizeFileParserState
|
||||
{
|
||||
public:
|
||||
|
@@ -1,13 +1,13 @@
|
||||
#pragma once
|
||||
|
||||
#include <memory>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include "Game/GameLanguage.h"
|
||||
#include "Localize/LocalizeFile.h"
|
||||
#include "Parsing/IParserLineStream.h"
|
||||
|
||||
#include <memory>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
class LocalizeFileReader
|
||||
{
|
||||
std::string m_file_name;
|
||||
|
@@ -9,10 +9,8 @@ SequenceLocalizeFileConfig::SequenceLocalizeFileConfig()
|
||||
AddMatchers({
|
||||
create.Keyword("CONFIG"),
|
||||
create.String(),
|
||||
create.Type(SimpleParserValueType::NEW_LINE)
|
||||
create.Type(SimpleParserValueType::NEW_LINE),
|
||||
});
|
||||
}
|
||||
|
||||
void SequenceLocalizeFileConfig::ProcessMatch(LocalizeFileParserState* state, SequenceResult<SimpleParserValue>& result) const
|
||||
{
|
||||
}
|
||||
void SequenceLocalizeFileConfig::ProcessMatch(LocalizeFileParserState* state, SequenceResult<SimpleParserValue>& result) const {}
|
||||
|
@@ -7,10 +7,8 @@ SequenceLocalizeFileConsumeEmptyLines::SequenceLocalizeFileConsumeEmptyLines()
|
||||
const SimpleMatcherFactory create(this);
|
||||
|
||||
AddMatchers({
|
||||
create.Type(SimpleParserValueType::NEW_LINE)
|
||||
create.Type(SimpleParserValueType::NEW_LINE),
|
||||
});
|
||||
}
|
||||
|
||||
void SequenceLocalizeFileConsumeEmptyLines::ProcessMatch(LocalizeFileParserState* state, SequenceResult<SimpleParserValue>& result) const
|
||||
{
|
||||
}
|
||||
void SequenceLocalizeFileConsumeEmptyLines::ProcessMatch(LocalizeFileParserState* state, SequenceResult<SimpleParserValue>& result) const {}
|
||||
|
@@ -7,7 +7,7 @@ SequenceLocalizeFileEndMarker::SequenceLocalizeFileEndMarker()
|
||||
const SimpleMatcherFactory create(this);
|
||||
|
||||
AddMatchers({
|
||||
create.Keyword("ENDMARKER")
|
||||
create.Keyword("ENDMARKER"),
|
||||
});
|
||||
}
|
||||
|
||||
|
@@ -1,9 +1,9 @@
|
||||
#include "SequenceLocalizeFileLanguageValue.h"
|
||||
|
||||
#include <sstream>
|
||||
|
||||
#include "Parsing/Simple/Matcher/SimpleMatcherFactory.h"
|
||||
|
||||
#include <sstream>
|
||||
|
||||
SequenceLocalizeFileLanguageValue::SequenceLocalizeFileLanguageValue()
|
||||
{
|
||||
const SimpleMatcherFactory create(this);
|
||||
@@ -11,7 +11,7 @@ SequenceLocalizeFileLanguageValue::SequenceLocalizeFileLanguageValue()
|
||||
AddMatchers({
|
||||
create.KeywordPrefix("LANG_").Capture(CAPTURE_LANGUAGE_NAME),
|
||||
create.String().Capture(CAPTURE_ENTRY_VALUE),
|
||||
create.Type(SimpleParserValueType::NEW_LINE)
|
||||
create.Type(SimpleParserValueType::NEW_LINE),
|
||||
});
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@ void SequenceLocalizeFileLanguageValue::ProcessMatch(LocalizeFileParserState* st
|
||||
|
||||
const auto langName = langToken.IdentifierValue().substr(std::char_traits<char>::length("LANG_"));
|
||||
const auto alreadyDefinedLanguage = state->m_current_reference_languages.find(langName);
|
||||
if(alreadyDefinedLanguage != state->m_current_reference_languages.end())
|
||||
if (alreadyDefinedLanguage != state->m_current_reference_languages.end())
|
||||
{
|
||||
std::ostringstream str;
|
||||
str << "Value for reference \"" << state->m_current_reference << "\" already defined for language \"" << langToken.IdentifierValue() << "\"";
|
||||
@@ -30,6 +30,6 @@ void SequenceLocalizeFileLanguageValue::ProcessMatch(LocalizeFileParserState* st
|
||||
}
|
||||
state->m_current_reference_languages.emplace(langName);
|
||||
|
||||
if(langName == state->m_language_name_caps)
|
||||
if (langName == state->m_language_name_caps)
|
||||
state->m_entries.emplace_back(state->m_current_reference, valueToken.StringValue());
|
||||
}
|
||||
|
@@ -9,10 +9,8 @@ SequenceLocalizeFileNotes::SequenceLocalizeFileNotes()
|
||||
AddMatchers({
|
||||
create.Keyword("FILENOTES"),
|
||||
create.String(),
|
||||
create.Type(SimpleParserValueType::NEW_LINE)
|
||||
create.Type(SimpleParserValueType::NEW_LINE),
|
||||
});
|
||||
}
|
||||
|
||||
void SequenceLocalizeFileNotes::ProcessMatch(LocalizeFileParserState* state, SequenceResult<SimpleParserValue>& result) const
|
||||
{
|
||||
}
|
||||
void SequenceLocalizeFileNotes::ProcessMatch(LocalizeFileParserState* state, SequenceResult<SimpleParserValue>& result) const {}
|
||||
|
@@ -8,11 +8,8 @@ SequenceLocalizeFileReference::SequenceLocalizeFileReference()
|
||||
|
||||
AddMatchers({
|
||||
create.Keyword("REFERENCE"),
|
||||
create.Or({
|
||||
create.Identifier(),
|
||||
create.String()
|
||||
}).Capture(CAPTURE_REFERENCE_NAME),
|
||||
create.Type(SimpleParserValueType::NEW_LINE)
|
||||
create.Or({create.Identifier(), create.String(),}).Capture(CAPTURE_REFERENCE_NAME),
|
||||
create.Type(SimpleParserValueType::NEW_LINE),
|
||||
});
|
||||
}
|
||||
|
||||
|
@@ -9,14 +9,14 @@ SequenceLocalizeFileVersion::SequenceLocalizeFileVersion()
|
||||
AddMatchers({
|
||||
create.Keyword("VERSION"),
|
||||
create.String().Capture(CAPTURE_VERSION),
|
||||
create.Type(SimpleParserValueType::NEW_LINE)
|
||||
create.Type(SimpleParserValueType::NEW_LINE),
|
||||
});
|
||||
}
|
||||
|
||||
void SequenceLocalizeFileVersion::ProcessMatch(LocalizeFileParserState* state, SequenceResult<SimpleParserValue>& result) const
|
||||
{
|
||||
const auto& versionCapture = result.NextCapture(CAPTURE_VERSION);
|
||||
if(versionCapture.StringValue() != "1")
|
||||
if (versionCapture.StringValue() != "1")
|
||||
{
|
||||
throw ParsingException(versionCapture.GetPos(), "Localize file needs to be version 1");
|
||||
}
|
||||
|
Reference in New Issue
Block a user