From 0b91bf654b5074e36c6cbb8a089b2fdc16d37216 Mon Sep 17 00:00:00 2001
From: Rangi <sylvie.oukaour+rangi42@gmail.com>
Date: Tue, 9 Jun 2026 17:55:35 -0400
Subject: [PATCH] Rename `BaseV` to `ValidBaseV`

---
 include/util.hpp   | 6 +++---
 src/asm/lexer.cpp  | 4 ++--
 src/link/lexer.cpp | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/util.hpp b/include/util.hpp
index f03bcbe5..cf3459e8 100644
--- a/include/util.hpp
+++ b/include/util.hpp
@@ -39,10 +39,10 @@ bool startsIdentifier(int c);
 bool continuesIdentifier(int c);
 
 template<uint32_t Base>
-inline constexpr bool BaseV = Base > 0 && Base <= 36;
+inline constexpr bool ValidBaseV = Base > 0 && Base <= 36;
 
 template<uint32_t Base>
-    requires BaseV<Base>
+    requires ValidBaseV<Base>
 bool isDigit(int c) {
 	if constexpr (Base <= 10) {
 		return c >= '0' && c < static_cast<int>('0' + Base);
@@ -53,7 +53,7 @@ bool isDigit(int c) {
 }
 
 template<uint32_t Base>
-    requires BaseV<Base>
+    requires ValidBaseV<Base>
 uint8_t parseDigit(int c) {
 	assume(isDigit<Base>(c));
 	if constexpr (Base <= 10) {
diff --git a/src/asm/lexer.cpp b/src/asm/lexer.cpp
index f744c59e..dd97c630 100644
--- a/src/asm/lexer.cpp
+++ b/src/asm/lexer.cpp
@@ -529,7 +529,7 @@ static void shiftChar();
 static int bumpChar();
 static int nextChar();
 template<uint32_t Base>
-    requires BaseV<Base>
+    requires ValidBaseV<Base>
 static uint32_t readNumber(int initial, char const *prefix);
 
 static uint32_t readBracketedMacroArgNum() {
@@ -1075,7 +1075,7 @@ void lexer_SetGfxDigits(char const digits[4]) {
 }
 
 template<uint32_t Base>
-    requires BaseV<Base>
+    requires ValidBaseV<Base>
 static uint32_t readNumber(int initial, char const *prefix) {
 	auto isSomeDigit = [](int c) {
 		if constexpr (Base == 2) {
diff --git a/src/link/lexer.cpp b/src/link/lexer.cpp
index f5fdb9bb..1dffd3aa 100644
--- a/src/link/lexer.cpp
+++ b/src/link/lexer.cpp
@@ -96,7 +96,7 @@ static std::string readKeyword(int initial) {
 }
 
 template<uint32_t Base>
-    requires BaseV<Base>
+    requires ValidBaseV<Base>
 static yy::parser::symbol_type readNumber(int initial, char const *prefix, char const *name) {
 	LexerStackEntry &context = lexerStack.back();
 	uint32_t number;