Username404-59/Yerbacon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the characters placed next to identifiers/numbers being skipped in lexer.cpp.

Browse Source
This commit is contained in:
Username404-59 2021-07-06 14:32:50 +02:00
parent 46a3964596
commit a222e8a165
Signed by: Username404-59
GPG Key ID: 7AB361FBB257A5D1
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/etc/lexer.cpp
View File

@ -32,16 +32,19 @@ vector<tok> lex(const string& in)
case '\n': break; case '\n': break;
default: { default: {
tok::type type = getIdentifierCharType(current); tok::type type = getIdentifierCharType(current);
bool isTypeString = (type == tok::STRING);
switch (type) { switch (type) {
case tok::UNEXPECTED: break; case tok::UNEXPECTED: break;
case tok::STRING: ++i; case tok::STRING: ++i;
case tok::IDENTIFIER: case tok::NUMBER: { case tok::IDENTIFIER: case tok::NUMBER: {
string formedString; string formedString;
for (;i < in.size(); ++i) { for (;i < in.size(); ++i) {
bool isString = getIdentifierCharType(in[i]) == tok::STRING; tok::type currentCharType = getIdentifierCharType(in[i]);
if ((getIdentifierCharType(in[i]) == type || type == tok::STRING) && !isString) { bool isString = currentCharType == tok::STRING;
if ((currentCharType == type || isTypeString) && !isString) {
formedString += string(1, in[i]); formedString += string(1, in[i]);
} else { } else {
if (not isTypeString) --i;
resVal.emplace_back(type, formedString); resVal.emplace_back(type, formedString);
break; break;
} }