From d54619a453061f8f508ed5fef0715be812cafdae Mon Sep 17 00:00:00 2001
From: Rangi42 <sylvie.oukaour+rangi42@gmail.com>
Date: Tue, 28 Jan 2025 01:12:18 -0500
Subject: [PATCH] Remove `colNo` column tracking from lexer

This was added as part of 71f88717 just for debug and fstack trace
output, but we no longer output it anyway.
---
 include/asm/lexer.hpp |  2 --
 src/asm/lexer.cpp     | 14 +-------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/include/asm/lexer.hpp b/include/asm/lexer.hpp
index 0052cab10..3eadf5f7c 100644
--- a/include/asm/lexer.hpp
+++ b/include/asm/lexer.hpp
@@ -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 {
diff --git a/src/asm/lexer.cpp b/src/asm/lexer.cpp
index d27364bc9..0911273ad 100644
--- a/src/asm/lexer.cpp
+++ b/src/asm/lexer.cpp
@@ -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 @@ static void shiftChar() {
 		}
 	} 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();