scripts: unity: Fix function definition regex bug

The whitespace fix to this regex last week triggered another bug in
libmodem. They have a typedef that the regex parsed as a function
definition because it accepted too many character in the argument
list of a function. This fix updates the regex to only allow
characters you would expect in an argument list of a function def.

Characters expected in the argument list of a function def:
\w A-Z a-z 0-9 and _
\s All whitespace
,  Argument separator
*  Pointers
\. Variadic argument
\[ Array start
\] Array end

Signed-off-by: Gregers Gram Rygg <[email protected]>

Author: gregersrygg

scripts/unity/func_name_list.py

@@ -14,7 +14,7 @@ def func_names_from_header(in_file, out_file):
 
     with open(out_file, 'w') as f_out:
         # Regex match all function names in the header file
-        x = re.findall(r"^\s*(?:\w+[*\s]+)+(\w+?)\s*\([^\\]*?\)\s*;",
+        x = re.findall(r"^\s*(?:\w+[*\s]+)+(\w+?)\s*\([\w\s,*\.\[\]]*?\)\s*;",
                        content, re.M | re.S)
         for item in x:
             f_out.write(item + "\n")

scripts/unity/header_prepare.py

@@ -63,7 +63,7 @@ def header_prepare(in_file, out_file, out_wrap_file):
     # Prepare file with functions prefixed with __wrap_ that will be used for
     # mock generation.
     func_pattern = re.compile(
-        r"^\s*((?:\w+[*\s]+)+)(\w+?\s*\([^\\{}#]*?\)\s*;)", re.M)
+        r"^\s*((?:\w+[*\s]+)+)(\w+?\s*\([\w\s,*\.\[\]]*?\)\s*;)", re.M)
     content2 = func_pattern.sub(r"\n\1__wrap_\2", content)
 
     with open(out_wrap_file, 'w') as f_wrap: