C++: Simplify local variable names

Author: jketema

cpp/ql/test/library-tests/ir/ir/PrintAST.expected

@@ -24100,19 +24100,19 @@ ir.cpp:
 # 2721|         Type = [IntType] int
 # 2724| [TopLevelFunction] char UseBracketOperator(WithBracketOperator const, int)
 # 2724|   <params>: 
-# 2724|     getParameter(0): [Parameter] line
+# 2724|     getParameter(0): [Parameter] x
 # 2724|         Type = [SpecifiedType] const WithBracketOperator
-# 2724|     getParameter(1): [Parameter] indent
+# 2724|     getParameter(1): [Parameter] i
 # 2724|         Type = [IntType] int
 # 2724|   getEntryPoint(): [BlockStmt] { ... }
 # 2725|     getStmt(0): [ReturnStmt] return ...
 # 2725|       getExpr(): [OverloadedArrayExpr] call to operator[]
 # 2725|           Type = [LValueReferenceType] const char &
 # 2725|           ValueCategory = prvalue
-# 2725|         getArrayBase(): [VariableAccess] line
+# 2725|         getArrayBase(): [VariableAccess] x
 # 2725|             Type = [SpecifiedType] const WithBracketOperator
 # 2725|             ValueCategory = lvalue
-# 2725|         getArrayOffset(): [VariableAccess] indent
+# 2725|         getArrayOffset(): [VariableAccess] i
 # 2725|             Type = [IntType] int
 # 2725|             ValueCategory = prvalue(load)
 # 2725|       getExpr().getFullyConverted(): [ReferenceDereferenceExpr] (reference dereference)

cpp/ql/test/library-tests/ir/ir/aliased_ir.expected

@@ -19719,16 +19719,16 @@ ir.cpp:
 # 2724|     m2724_2(unknown)                    = AliasedDefinition           : 
 # 2724|     m2724_3(unknown)                    = InitializeNonLocal          : 
 # 2724|     m2724_4(unknown)                    = Chi                         : total:m2724_2, partial:m2724_3
-# 2724|     r2724_5(glval<WithBracketOperator>) = VariableAddress[line]       : 
-# 2724|     m2724_6(WithBracketOperator)        = InitializeParameter[line]   : &:r2724_5
+# 2724|     r2724_5(glval<WithBracketOperator>) = VariableAddress[x]          : 
+# 2724|     m2724_6(WithBracketOperator)        = InitializeParameter[x]      : &:r2724_5
 # 2724|     m2724_7(unknown)                    = Chi                         : total:m2724_4, partial:m2724_6
-# 2724|     r2724_8(glval<int>)                 = VariableAddress[indent]     : 
-# 2724|     m2724_9(int)                        = InitializeParameter[indent] : &:r2724_8
+# 2724|     r2724_8(glval<int>)                 = VariableAddress[i]          : 
+# 2724|     m2724_9(int)                        = InitializeParameter[i]      : &:r2724_8
 # 2725|     r2725_1(glval<char>)                = VariableAddress[#return]    : 
-# 2725|     r2725_2(glval<WithBracketOperator>) = VariableAddress[line]       : 
+# 2725|     r2725_2(glval<WithBracketOperator>) = VariableAddress[x]          : 
 # 2725|     r2725_3(glval<unknown>)             = FunctionAddress[operator[]] : 
-# 2725|     r2725_4(glval<int>)                 = VariableAddress[indent]     : 
-# 2725|     r2725_5(int)                        = Load[indent]                : &:r2725_4, m2724_9
+# 2725|     r2725_4(glval<int>)                 = VariableAddress[i]          : 
+# 2725|     r2725_5(int)                        = Load[i]                     : &:r2725_4, m2724_9
 # 2725|     r2725_6(char &)                     = Call[operator[]]            : func:r2725_3, this:r2725_2, 0:r2725_5
 # 2725|     m2725_7(unknown)                    = ^CallSideEffect             : ~m2724_7
 # 2725|     m2725_8(unknown)                    = Chi                         : total:m2724_7, partial:m2725_7

cpp/ql/test/library-tests/ir/ir/ir.cpp

@@ -2721,8 +2721,8 @@ struct WithBracketOperator {
   const char& operator[](int pos) const;
 };
 
-char UseBracketOperator(const WithBracketOperator line, int indent) {
-  return line[indent];
+char UseBracketOperator(const WithBracketOperator x, int i) {
+  return x[i];
 }
 
 // semmle-extractor-options: -std=c++20 --clang

cpp/ql/test/library-tests/ir/ir/raw_ir.expected

@@ -18036,15 +18036,15 @@ ir.cpp:
 # 2724|     v2724_1(void)                       = EnterFunction               : 
 # 2724|     mu2724_2(unknown)                   = AliasedDefinition           : 
 # 2724|     mu2724_3(unknown)                   = InitializeNonLocal          : 
-# 2724|     r2724_4(glval<WithBracketOperator>) = VariableAddress[line]       : 
-# 2724|     mu2724_5(WithBracketOperator)       = InitializeParameter[line]   : &:r2724_4
-# 2724|     r2724_6(glval<int>)                 = VariableAddress[indent]     : 
-# 2724|     mu2724_7(int)                       = InitializeParameter[indent] : &:r2724_6
+# 2724|     r2724_4(glval<WithBracketOperator>) = VariableAddress[x]          : 
+# 2724|     mu2724_5(WithBracketOperator)       = InitializeParameter[x]      : &:r2724_4
+# 2724|     r2724_6(glval<int>)                 = VariableAddress[i]          : 
+# 2724|     mu2724_7(int)                       = InitializeParameter[i]      : &:r2724_6
 # 2725|     r2725_1(glval<char>)                = VariableAddress[#return]    : 
-# 2725|     r2725_2(glval<WithBracketOperator>) = VariableAddress[line]       : 
+# 2725|     r2725_2(glval<WithBracketOperator>) = VariableAddress[x]          : 
 # 2725|     r2725_3(glval<unknown>)             = FunctionAddress[operator[]] : 
-# 2725|     r2725_4(glval<int>)                 = VariableAddress[indent]     : 
-# 2725|     r2725_5(int)                        = Load[indent]                : &:r2725_4, ~m?
+# 2725|     r2725_4(glval<int>)                 = VariableAddress[i]          : 
+# 2725|     r2725_5(int)                        = Load[i]                     : &:r2725_4, ~m?
 # 2725|     r2725_6(char &)                     = Call[operator[]]            : func:r2725_3, this:r2725_2, 0:r2725_5
 # 2725|     mu2725_7(unknown)                   = ^CallSideEffect             : ~m?
 # 2725|     v2725_8(void)                       = ^IndirectReadSideEffect[-1] : &:r2725_2, ~m?