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

Remove colNo column tracking from lexer

Browse Source 
This was added as part of 71f88717 just for debug and fstack trace
output, but we no longer output it anyway.
This commit is contained in:
Rangi42
2025-01-28 01:12:18 -05:00
parent e49291b7cf
commit d54619a453
2 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/asm/lexer.hpp
View File

@@ -83,7 +83,6 @@ struct LexerState {
LexerMode mode;
bool atLineStart;
uint32_t lineNo;
uint32_t colNo;
int lastToken;
std::deque<IfStackEntry> ifStack;
@@ -147,7 +146,6 @@ void lexer_ReachELSEBlock();
void lexer_CheckRecursionDepth();
uint32_t lexer_GetLineNo();
uint32_t lexer_GetColNo();
void lexer_DumpStringExpansions();
struct Capture {

14
src/asm/lexer.cpp
View File

@@ -345,7 +345,7 @@ bool lexer_AtTopLevel() {
void LexerState::clear(uint32_t lineNo_) {
mode = LEXER_NORMAL;
atLineStart = true; // yylex() will init colNo due to this
atLineStart = true;
lastToken = T_(YYEOF);
ifStack.clear();
@@ -365,7 +365,6 @@ void LexerState::clear(uint32_t lineNo_) {
static void nextLine() {
lexerState->lineNo++;
lexerState->colNo = 1;
}
uint32_t lexer_GetIFDepth() {
@@ -852,7 +851,6 @@ restart:
}
} else {
// Advance within the file contents
lexerState->colNo++;
if (lexerState->content.holds<ViewedContent>()) {
lexerState->content.get<ViewedContent>().offset++;
} else {
@@ -892,10 +890,6 @@ uint32_t lexer_GetLineNo() {
return lexerState->lineNo;
}
uint32_t lexer_GetColNo() {
return lexerState->colNo;
}
void lexer_DumpStringExpansions() {
if (!lexerState) {
return;
@@ -921,7 +915,6 @@ static void discardBlockComment() {
error("Unterminated block comment\n");
return;
case '\r':
// Handle CRLF before nextLine() since shiftChar updates colNo
handleCRLF(c);
[[fallthrough]];
case '\n':
@@ -965,7 +958,6 @@ static void discardLineContinuation() {
shiftChar();
} else if (c == '\r' || c == '\n') {
shiftChar();
// Handle CRLF before nextLine() since shiftChar updates colNo
handleCRLF(c);
if (lexerState->expansions.empty()) {
nextLine();
@@ -1376,7 +1368,6 @@ static std::string readString(bool raw) {
// Handle '\r' or '\n' (in multiline strings only, already handled above otherwise)
if (c == '\r' || c == '\n') {
// Handle CRLF before nextLine() since shiftChar updates colNo
handleCRLF(c);
nextLine();
c = '\n';
@@ -1521,7 +1512,6 @@ static void appendStringLiteral(std::string &str, bool raw) {
// Handle '\r' or '\n' (in multiline strings only, already handled above otherwise)
if (c == '\r' || c == '\n') {
// Handle CRLF before nextLine() since shiftChar updates colNo
handleCRLF(c);
nextLine();
c = '\n';
@@ -2212,7 +2202,6 @@ static Token skipIfBlock(bool toEndc) {
}
if (c == '\r' || c == '\n') {
// Handle CRLF before nextLine() since shiftChar updates colNo
handleCRLF(c);
// Do this both on line continuations and plain EOLs
nextLine();
@@ -2294,7 +2283,6 @@ static Token yylex_SKIP_TO_ENDR() {
}
if (c == '\r' || c == '\n') {
// Handle CRLF before nextLine() since shiftChar updates colNo
handleCRLF(c);
// Do this both on line continuations and plain EOLs
nextLine();