From 10a12401edd9b42cb8c4412a24ae2f8365ef95c3 Mon Sep 17 00:00:00 2001 From: William Jakobsson <50847546+wjakobsson@users.noreply.github.com> Date: Fri, 30 Oct 2026 14:49:14 +0100 Subject: [PATCH 1/3] test --- test/testvarid.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/testvarid.cpp b/test/testvarid.cpp index b65d35db489..50841ac0828 100644 --- a/test/testvarid.cpp +++ b/test/testvarid.cpp @@ -1632,12 +1632,14 @@ class TestVarID : public TestFixture { "A f(3);\n" "A f2(true);\n" "A g();\n" - "A e(int c);\n", dinit(TokenizeOptions, $.cpp = false)); + "A e(int c);\n" + "A h(T (*p)[16]);\n", dinit(TokenizeOptions, $.cpp = false)); const char expected[] = "1: A f@1 ( 3 ) ;\n" "2: A f2@2 ( true ) ;\n" "3: A g ( ) ;\n" - "4: A e ( int c@3 ) ;\n"; + "4: A e ( int c@3 ) ;\n" + "5: A h ( T ( * p@4 ) [ 16 ] ) ;\n"; ASSERT_EQUALS(expected, actual); } From 742bf44ae5cec1b170888b32d95ac7005ec2ef0a Mon Sep 17 00:00:00 2001 From: William Jakobsson <50847546+wjakobsson@users.noreply.github.com> Date: Fri, 30 Oct 2026 14:49:16 +0100 Subject: [PATCH 2/3] fix --- lib/tokenize.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp index 60fbe92968c..7ce4ec49da1 100644 --- a/lib/tokenize.cpp +++ b/lib/tokenize.cpp @@ -5058,7 +5058,7 @@ void Tokenizer::setVarIdPass1() if (tok3->isLiteral() || (tok3->isName() && (variableMap.hasVariable(tok3->str()) || - (tok3->strAt(-1) == "(" && Token::simpleMatch(tok3->next(), "(") && !Token::simpleMatch(tok3->linkAt(1)->next(), "(")))) || + (tok3->strAt(-1) == "(" && Token::simpleMatch(tok3->next(), "(") && !Token::Match(tok3->linkAt(1)->next(), "(|[")))) || tok3->isOp() || tok3->str() == "(" || notstart.find(tok3->str()) != notstart.end()) { From 84aa8d9cb78918fca52e314a4514cd58362235db Mon Sep 17 00:00:00 2001 From: William Jakobsson <50847546+wjakobsson@users.noreply.github.com> Date: Wed, 4 Nov 2026 09:14:02 +0100 Subject: [PATCH 3/3] nits --- lib/tokenize.cpp | 3 ++- test/testvarid.cpp | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp index 7ce4ec49da1..425d2b4e992 100644 --- a/lib/tokenize.cpp +++ b/lib/tokenize.cpp @@ -5058,7 +5058,8 @@ void Tokenizer::setVarIdPass1() if (tok3->isLiteral() || (tok3->isName() && (variableMap.hasVariable(tok3->str()) || - (tok3->strAt(-1) == "(" && Token::simpleMatch(tok3->next(), "(") && !Token::Match(tok3->linkAt(1)->next(), "(|[")))) || + (tok3->strAt(-1) == "(" && Token::simpleMatch(tok3->next(), "(") && !Token::simpleMatch(tok3->linkAt(1)->next(), "(") && + !(Token::Match(tok3->next(), "( *|&|&& %name%| ) [") && !variableMap.hasVariable(tok3->strAt(3)))))) || tok3->isOp() || tok3->str() == "(" || notstart.find(tok3->str()) != notstart.end()) { diff --git a/test/testvarid.cpp b/test/testvarid.cpp index 50841ac0828..bc1b93caa8d 100644 --- a/test/testvarid.cpp +++ b/test/testvarid.cpp @@ -1633,13 +1633,17 @@ class TestVarID : public TestFixture { "A f2(true);\n" "A g();\n" "A e(int c);\n" - "A h(T (*p)[16]);\n", dinit(TokenizeOptions, $.cpp = false)); + "A h(T (*p)[16]);\n" + "int x(g(1)[0]);\n" + "A u(T (*)[16]);\n", dinit(TokenizeOptions, $.cpp = false)); const char expected[] = "1: A f@1 ( 3 ) ;\n" "2: A f2@2 ( true ) ;\n" "3: A g ( ) ;\n" "4: A e ( int c@3 ) ;\n" - "5: A h ( T ( * p@4 ) [ 16 ] ) ;\n"; + "5: A h ( T ( * p@4 ) [ 16 ] ) ;\n" + "6: int x@5 ( g ( 1 ) [ 0 ] ) ;\n" + "7: A u ( T ( * ) [ 16 ] ) ;\n"; ASSERT_EQUALS(expected, actual); }