gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 18:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Port some cleanup from the WIP 'strings' branch

Browse Source 
This is mostly variable renaming
This commit is contained in:
Rangi
2021-04-25 19:50:54 -04:00
committed by Rangi
parent bba532193b
commit d37aa93a7d
5 changed files with 81 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/asm/lexer.c
View File

@@ -943,10 +943,10 @@ restart:
} else if (c == '{' && !lexerState->disableInterpolation) {
/* If character is an open brace, do symbol interpolation */
shiftChar();
char const *ptr = readInterpolation(0);
char const *str = readInterpolation(0);
if (ptr && ptr[0])
beginExpansion(ptr, false, ptr);
if (str && str[0])
beginExpansion(str, false, str);
goto restart;
}
@@ -1381,10 +1381,10 @@ static char const *readInterpolation(size_t depth)
if (c == '{') { /* Nested interpolation */
shiftChar();
char const *ptr = readInterpolation(depth + 1);
char const *str = readInterpolation(depth + 1);
if (ptr && ptr[0])
beginExpansion(ptr, false, ptr);
if (str && str[0])
beginExpansion(str, false, str);
continue; /* Restart, reading from the new buffer */
} else if (c == EOF || c == '\r' || c == '\n' || c == '"') {
error("Missing }\n");
@@ -1490,6 +1490,7 @@ static void readString(void)
size_t i = 0;
bool multiline = false;
char const *str;
// We reach this function after reading a single quote, but we also support triple quotes
if (peek() == '"') {
@@ -1584,8 +1585,7 @@ static void readString(void)
case '9':
case '<':
shiftChar();
char const *str = readMacroArg(c);
str = readMacroArg(c);
if (str) {
while (*str)
append_yylval_string(*str++);
@@ -1608,11 +1608,10 @@ static void readString(void)
// We'll be exiting the string scope, so re-enable expansions
// (Not interpolations, since they're handled by the function itself...)
lexerState->disableMacroArgs = false;
char const *ptr = readInterpolation(0);
if (ptr) {
while (*ptr)
append_yylval_string(*ptr++);
str = readInterpolation(0);
if (str) {
while (*str)
append_yylval_string(*str++);
}
lexerState->disableMacroArgs = true;
continue; // Do not copy an additional character
@@ -1642,6 +1641,7 @@ static size_t appendStringLiteral(size_t i)
lexerState->disableInterpolation = true;
bool multiline = false;
char const *str;
// We reach this function after reading a single quote, but we also support triple quotes
append_yylval_string('"');
@@ -1733,9 +1733,8 @@ static size_t appendStringLiteral(size_t i)
case '9':
case '<':
shiftChar();
char const *str = readMacroArg(c);
if (str)
str = readMacroArg(c);
if (str && str[0])
i = appendEscapedSubstring(str, i);
continue; // Do not copy an additional character
@@ -1761,10 +1760,9 @@ static size_t appendStringLiteral(size_t i)
// We'll be exiting the string scope, so re-enable expansions
// (Not interpolations, since they're handled by the function itself...)
lexerState->disableMacroArgs = false;
char const *ptr = readInterpolation(0);
if (ptr && ptr[0])
i = appendEscapedSubstring(ptr, i);
str = readInterpolation(0);
if (str && str[0])
i = appendEscapedSubstring(str, i);
lexerState->disableMacroArgs = true;
continue; // Do not copy an additional character