@@ -268,12 +268,18 @@ def process_line(i, line):
268
268
new_line = process_name (new_line , def1_pat , "BLOCK_TILE_" , "," , 1 )
269
269
new_line = process_name (new_line , def2_pat , "BLOCK_IN_" , " =" , 1 )
270
270
else :
271
- definitions = def_qual_pat .findall (new_line )
271
+ def_qual_pat2 = re .compile (r"((?:%(?:[a-zA-Z0-9][a-zA-Z0-9_\-]*)(?::\d+)?,?\s+)*)=" )
272
+ definitions = def_qual_pat2 .findall (new_line )
272
273
for d in definitions :
273
- (name , num ) = d
274
- x = use_name (name , num , " =" )
275
- y = record_name_def (name , num , "VAR_" + name , " =" , 0 , new_line )
276
- new_line = new_line .replace (x , y )
274
+ arg_def_pat = re .compile (r"%([a-zA-Z0-9][a-zA-Z0-9_\-]*)(:\d+)?" )
275
+ arg_defs = d .split ("," )
276
+ for arg_def in arg_defs :
277
+ args = arg_def_pat .findall (arg_def )
278
+ for arg in args :
279
+ (name , num ) = arg
280
+ x = use_name (name , num , "" )
281
+ y = record_name_def (name , num , "VAR_" + name , "" , 0 , new_line )
282
+ new_line = new_line .replace (x , y )
277
283
278
284
# Process uses and map use.
279
285
uses = use_qual_pat .findall (new_line )
0 commit comments