Skip to content

Commit 98eb948

Browse files
authored
Update misc.py
Modify usage of configuration in stringConcatInArrayInit funcion of misc.py
1 parent bd5e9ac commit 98eb948

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

addons/misc.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,13 @@ def getArguments(ftok):
4848
def isStringLiteral(tokenString):
4949
return tokenString.startswith('"')
5050

51+
5152
# check data
52-
def stringConcatInArrayInit(configurations, rawTokens):
53+
def stringConcatInArrayInit(data):
5354
# Get all string macros
5455
stringMacros = []
5556
for cfg in configurations:
57+
cfg = data.Configuration(cfg)
5658
for directive in cfg.directives:
5759
res = re.match(r'#define[ ]+([A-Za-z0-9_]+)[ ]+".*', directive.str)
5860
if res:
@@ -62,6 +64,7 @@ def stringConcatInArrayInit(configurations, rawTokens):
6264

6365
# Check code
6466
arrayInit = False
67+
rawTokens = data.rawTokens
6568
for i in range(len(rawTokens)):
6669
if i < 2:
6770
continue
@@ -151,7 +154,7 @@ def ellipsisStructArg(data):
151154
if word in ['stringConcatInArrayInit', 'implicitlyVirtual', 'ellipsisStructArg']:
152155
VERIFY_EXPECTED.append(str(tok.linenr) + ':' + word)
153156

154-
stringConcatInArrayInit(data.configurations, data.rawTokens)
157+
stringConcatInArrayInit(data)
155158
implicitlyVirtual(data)
156159
ellipsisStructArg(data)
157160

0 commit comments

Comments
 (0)