mirrors-yuzu-emu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn synced 2024-11-25 19:46:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

qapi: Simplify guardname()

Browse source 
The guards around built-in declarations lose their _H. It never made
much sense anyway.

Backports commit 00dfc3b2c272d98556ec6095d56bdd8b036babf9 from qemu
This commit is contained in:
Markus Armbruster 2018-02-19 16:05:50 -05:00 committed by Lioncash
parent e100831af9
commit 6dcb71a788
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
qemu/scripts/qapi.py
View file

@ -957,14 +957,8 @@ def mcgen(code, **kwds):
code = code[1:] code = code[1:]
return cgen(code, **kwds) return cgen(code, **kwds)
def basename(filename):
return filename.split("/")[-1]
def guardname(filename): def guardname(filename):
guard = basename(filename).rsplit(".", 1)[0] return c_name(filename, protect=False).upper()
for substr in [".", " ", "-"]:
guard = guard.replace(substr, "_")
return guard.upper() + '_H'
def guardstart(name): def guardstart(name):
return mcgen(''' return mcgen('''
@ -1034,6 +1028,7 @@ def parse_command_line(extra_options = "", extra_long_options = []):
def open_output(output_dir, do_c, do_h, prefix, c_file, h_file, def open_output(output_dir, do_c, do_h, prefix, c_file, h_file,
c_comment, h_comment): c_comment, h_comment):
guard = guardname(prefix + h_file)
c_file = output_dir + prefix + c_file c_file = output_dir + prefix + c_file
h_file = output_dir + prefix + h_file h_file = output_dir + prefix + h_file
@ -1066,7 +1061,7 @@ def open_output(output_dir, do_c, do_h, prefix, c_file, h_file,
#define %(guard)s #define %(guard)s
''', ''',
comment = h_comment, guard = guardname(h_file))) comment = h_comment, guard = guard))
return (fdef, fdecl) return (fdef, fdecl)