Rooba
/
ImHex
mirror of https://github.com/WerWolv/ImHex.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added character literals to pattern language

This commit is contained in:
WerWolv 2020-11-27 14:18:28 +01:00
parent 2efe326fdb
commit d55bea7c46
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
source/lang/lexer.cpp
View File

@ -131,6 +131,37 @@ namespace hex::lang {
} else if (c == '*') {
tokens.push_back({ .type = Token::Type::Operator, .operatorToken = { .op = Token::OperatorToken::Operator::Star } });
offset += 1;
} else if (c == '\'') {
offset += 1;
if (offset >= code.length())
return { ResultLexicalError, { } };
char character = code[offset];
if (character == '\\') {
offset += 1;
if (offset >= code.length())
return { ResultLexicalError, { } };
if (code[offset] != '\\' && code[offset] != '\'')
return { ResultLexicalError, { } };
character = code[offset];
} else {
if (code[offset] == '\\' || code[offset] == '\'')
return { ResultLexicalError, { } };
}
offset += 1;
if (offset >= code.length() || code[offset] != '\'')
return { ResultLexicalError, { } };
tokens.push_back({ .type = Token::Type::Integer, .integerToken = { .integer = character } });
offset += 1;
} else if (std::isalpha(c)) {
std::string identifier = matchTillInvalid(&code[offset], [](char c) -> bool { return std::isalnum(c) || c == '_'; });

2
source/views/view_pattern.cpp
View File

@ -48,6 +48,8 @@ namespace hex {
paletteIndex = TextEditor::PaletteIndex::Identifier;
else if (TokenizeCStyleNumber(inBegin, inEnd, outBegin, outEnd))
paletteIndex = TextEditor::PaletteIndex::Number;
else if (TokenizeCStyleCharacterLiteral(inBegin, inEnd, outBegin, outEnd))
paletteIndex = TextEditor::PaletteIndex::CharLiteral;
return paletteIndex != TextEditor::PaletteIndex::Max;
};