Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2024-09-24 03:28:24 +02:00
Code Releases Wiki Activity

Remove requirement for a comma after the last enum entry

Browse Source
This commit is contained in:
WerWolv 2020-11-14 15:06:27 +01:00
parent 658d4ec478
commit d9f5a974cb
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/parser/parser.cpp
View File

@ -88,17 +88,24 @@ namespace hex::lang {
auto enumNode = new ASTNodeEnum(underlyingType, enumName); auto enumNode = new ASTNodeEnum(underlyingType, enumName);
while (!tryConsume(curr, {Token::Type::ScopeClose})) { while (!tryConsume(curr, {Token::Type::ScopeClose})) {
if (tryConsume(curr, { Token::Type::Identifier, Token::Type::Separator})) { if (tryConsume(curr, { Token::Type::Identifier, Token::Type::Separator }) || tryConsume(curr, { Token::Type::Identifier, Token::Type::ScopeClose })) {
u64 value; u64 value;
if (enumNode->getValues().empty()) if (enumNode->getValues().empty())
value = 0; value = 0;
else else
value = enumNode->getValues().back().first + 1; value = enumNode->getValues().back().first + 1;
enumNode->getValues().push_back({ value, curr[-2].identifierToken.identifier }); enumNode->getValues().emplace_back(value, curr[-2].identifierToken.identifier);
if (curr[-1].type == Token::Type::ScopeClose)
break;
} }
else if (tryConsume(curr, { Token::Type::Identifier, Token::Type::Operator, Token::Type::Integer, Token::Type::Separator})) { else if (tryConsume(curr, { Token::Type::Identifier, Token::Type::Operator, Token::Type::Integer, Token::Type::Separator})) {
enumNode->getValues().push_back({ curr[-2].integerToken.integer, curr[-4].identifierToken.identifier }); enumNode->getValues().emplace_back(curr[-2].integerToken.integer, curr[-4].identifierToken.identifier);
}
else if (tryConsume(curr, { Token::Type::Identifier, Token::Type::Operator, Token::Type::Integer, Token::Type::ScopeClose})) {
enumNode->getValues().emplace_back(curr[-2].integerToken.integer, curr[-4].identifierToken.identifier);
break;
} }
else { else {
delete enumNode; delete enumNode;