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

Allow NUL characters in strings (#1405)

Browse Source
This commit is contained in:
Sylvie
2024-06-18 14:26:18 -04:00
committed by GitHub
parent 9cc595b2cc
commit 623c3f662c
15 changed files with 91 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/asm/lexer.cpp
View File

@@ -566,7 +566,7 @@ void lexer_CheckRecursionDepth() {
}
static bool isMacroChar(char c) {
return c == '@' || c == '#' || c == '<' || (c >= '0' && c <= '9');
return c == '@' || c == '#' || c == '<' || (c > '0' && c <= '9');
}
// forward declarations for readBracketedMacroArgNum
@@ -1245,6 +1245,9 @@ static void appendEscapedString(std::string &str, std::string const &escape) {
case '\t':
str += "\\t";
break;
case '\0':
str += "\\0";
break;
}
}
}
@@ -1325,6 +1328,10 @@ static std::string readString(bool raw) {
c = '\t';
shiftChar();
break;
case '0':
c = '\0';
shiftChar();
break;
// Line continuation
case ' ':
@@ -1336,7 +1343,6 @@ static std::string readString(bool raw) {
// Macro arg
case '@':
case '#':
case '0':
case '1':
case '2':
case '3':
@@ -1453,6 +1459,7 @@ static void appendStringLiteral(std::string &str, bool raw) {
case 'n':
case 'r':
case 't':
case '0':
// Return that character unchanged
str += '\\';
shiftChar();
@@ -1468,7 +1475,6 @@ static void appendStringLiteral(std::string &str, bool raw) {
// Macro arg
case '@':
case '#':
case '0':
case '1':
case '2':
case '3':
@@ -1916,6 +1922,9 @@ backslash:
case 't':
c = '\t';
break;
case '0':
c = '\0';
break;
case ' ':
case '\r':