Skip to content

Fix function definition regex bug #6547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 21, 2022
Merged

Fix function definition regex bug #6547

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3fdbd0
scripts: unity: Fix function definition regex bug
gregersrygg Jan 14, 2022
12fc8ed
tests: unity: Separate example test and wrap tests
gregersrygg Jan 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/unity/func_name_list.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion scripts/unity/header_prepare.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down