From 0ba402f7146040f47e051ca64ea377b84455705f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludvig=20Gunne=20Lindstr=C3=B6m?=
 <ludviggunnelindstrom@gmail.com>
Date: Fri, 3 Apr 2026 12:49:43 +0200
Subject: [PATCH] Refs #638: Avoid shadowing arguments

---
 simplecpp.cpp | 6 +++---
 simplecpp.h   | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/simplecpp.cpp b/simplecpp.cpp
index b59f773c..cfa1da9a 100644
--- a/simplecpp.cpp
+++ b/simplecpp.cpp
@@ -635,10 +635,10 @@ static bool isStringLiteralPrefix(const std::string &str)
            str == "R" || str == "uR" || str == "UR" || str == "LR" || str == "u8R";
 }
 
-void simplecpp::TokenList::lineDirective(unsigned int fileIndex, unsigned int line, Location &location)
+void simplecpp::TokenList::lineDirective(unsigned int fileId, unsigned int line, Location &location)
 {
-    if (fileIndex != location.fileIndex || line >= location.line) {
-        location.fileIndex = fileIndex;
+    if (fileId != location.fileIndex || line >= location.line) {
+        location.fileIndex = fileId;
         location.line = line;
         return;
     }
diff --git a/simplecpp.h b/simplecpp.h
index 54f6a90c..66329e9a 100644
--- a/simplecpp.h
+++ b/simplecpp.h
@@ -174,9 +174,9 @@ namespace simplecpp {
         bool isOneOf(const char ops[]) const;
         bool startsWithOneOf(const char c[]) const;
         bool endsWithOneOf(const char c[]) const;
-        static bool isNumberLike(const std::string& str) {
-            return std::isdigit(static_cast<unsigned char>(str[0])) ||
-                   (str.size() > 1U && (str[0] == '-' || str[0] == '+') && std::isdigit(static_cast<unsigned char>(str[1])));
+        static bool isNumberLike(const std::string& s) {
+            return std::isdigit(static_cast<unsigned char>(s[0])) ||
+                   (s.size() > 1U && (s[0] == '-' || s[0] == '+') && std::isdigit(static_cast<unsigned char>(s[1])));
         }
 
         TokenString macro;
@@ -396,7 +396,7 @@ namespace simplecpp {
         void constFoldQuestionOp(Token *&tok1);
 
         std::string readUntil(Stream &stream, const Location &location, char start, char end, OutputList *outputList);
-        void lineDirective(unsigned int fileIndex, unsigned int line, Location &location);
+        void lineDirective(unsigned int fileId, unsigned int line, Location &location);
 
         const Token* lastLineTok(int maxsize=1000) const;
         const Token* isLastLinePreprocessor(int maxsize=1000) const;