@@ -2079,6 +2079,24 @@ def replace_vars(line: str):
2079
2079
else :
2080
2080
return line_res
2081
2081
2082
+ def expand_func_macro (def_name : str , def_value : tuple [str , str ]):
2083
+ def_args , sub = def_value
2084
+ def_args = def_args .split ("," )
2085
+ regex = re .compile (rf"\b{ def_name } \s*\({ ',' .join (['(.*)' ]* len (def_args ))} \)" )
2086
+
2087
+ for i , arg in enumerate (def_args ):
2088
+ arg = arg .strip ()
2089
+ sub = re .sub (rf"\b({ arg } )\b" , rf"\\ { i + 1 } " , sub )
2090
+
2091
+ return regex , sub
2092
+
2093
+ def append_multiline_macro (def_value : str | tuple , line : str ):
2094
+ if isinstance (def_value , tuple ):
2095
+ def_args , def_value = def_value
2096
+ def_value += line
2097
+ return (def_args , def_value )
2098
+ return def_value + line
2099
+
2082
2100
if pp_defs is None :
2083
2101
pp_defs = {}
2084
2102
if include_dirs is None :
@@ -2290,23 +2308,3 @@ def replace_vars(line: str):
2290
2308
line = line_new
2291
2309
output_file .append (line )
2292
2310
return output_file , pp_skips , pp_defines , defs_tmp
2293
-
2294
-
2295
- def expand_func_macro (def_name : str , def_value : tuple [str , str ]):
2296
- def_args , sub = def_value
2297
- def_args = def_args .split ("," )
2298
- regex = re .compile (rf"\b{ def_name } \s*\({ ',' .join (['(.*)' ]* len (def_args ))} \)" )
2299
-
2300
- for i , arg in enumerate (def_args ):
2301
- arg = arg .strip ()
2302
- sub = re .sub (rf"\b({ arg } )\b" , rf"\\ { i + 1 } " , sub )
2303
-
2304
- return regex , sub
2305
-
2306
-
2307
- def append_multiline_macro (def_value : str | tuple , line : str ):
2308
- if isinstance (def_value , tuple ):
2309
- def_args , def_value = def_value
2310
- def_value += line
2311
- return (def_args , def_value )
2312
- return def_value + line
0 commit comments