Skip to content
Snippets Groups Projects
Commit 8121f8cc authored by Serge Bazanski's avatar Serge Bazanski
Browse files

appease annoyatron

parent 5f59e1ae
Branches q3k/fb3
No related tags found
No related merge requests found
Pipeline #1651 passed
...@@ -15,13 +15,10 @@ MATCH_ISR_EXPANSION = re.compile( ...@@ -15,13 +15,10 @@ MATCH_ISR_EXPANSION = re.compile(
re.DOTALL | re.MULTILINE, re.DOTALL | re.MULTILINE,
) )
MATCH_DECLARATION = re.compile( MATCH_DECLARATION = re.compile(r"^(?P<typename>.*?)\s*\((?P<args>.*)\)$", re.DOTALL)
r"^(?P<typename>.*?)\s*\((?P<args>.*)\)$",
re.DOTALL,
)
MATCH_TYPENAME = re.compile( MATCH_TYPENAME = re.compile(
r"^(?P<type>(?:const )?(?:struct |enum |union )?\w+[*\s]+)(?P<name>\w+)$", r"^(?P<type>(?:const )?(?:struct |enum |union )?\w+[*\s]+)(?P<name>\w+)$"
) )
...@@ -63,20 +60,24 @@ def parse_declarations(source): ...@@ -63,20 +60,24 @@ def parse_declarations(source):
if arg is None: if arg is None:
bailout("Failed to parse argument '{}'", arg_str.strip()) bailout("Failed to parse argument '{}'", arg_str.strip())
args.append({ args.append(
{
"type": arg.group("type").strip(), "type": arg.group("type").strip(),
"name": arg.group("name"), "name": arg.group("name"),
"sizeof": "sizeof({})".format(arg.group("type").strip()), "sizeof": "sizeof({})".format(arg.group("type").strip()),
"offset": sizeof(args), "offset": sizeof(args),
}) }
)
declarations.append({ declarations.append(
{
"id": id, "id": id,
"return_type": typename.group("type").strip(), "return_type": typename.group("type").strip(),
"name": typename.group("name"), "name": typename.group("name"),
"args": args, "args": args,
"args_str": args_str, "args_str": args_str,
}) }
)
return declarations return declarations
...@@ -88,10 +89,7 @@ def parse_interrupts(source): ...@@ -88,10 +89,7 @@ def parse_interrupts(source):
id = exp.group("id") id = exp.group("id")
isr = exp.group("isr") isr = exp.group("isr")
interrupts.append({ interrupts.append({"id": id, "isr": isr})
"id": id,
"isr": isr,
})
return interrupts return interrupts
...@@ -132,9 +130,7 @@ def main(): ...@@ -132,9 +130,7 @@ def main():
declarations = parse_declarations(source) declarations = parse_declarations(source)
interrupts = parse_interrupts(source) interrupts = parse_interrupts(source)
fmt_header = { fmt_header = {"header": os.path.basename(args.header)}
"header": os.path.basename(args.header)
}
# Generate Client {{{ # Generate Client {{{
with open(args.client, "w") as f_client: with open(args.client, "w") as f_client:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment