mirror of
https://github.com/yuzu-emu/unicorn
synced 2024-11-25 23:38:04 +00:00
qapi: Fix c_name() munging
The method c_name() is supposed to do two different actions: munge '-' into '_', and add a 'q_' prefix to ticklish names. But it did these steps out of order, making it possible to submit input that is not ticklish until after munging, where the output then lacked the desired prefix. The failure is exposed easily if you have a compiler that recognizes C11 keywords, and try to name a member '_Thread-local', as it would result in trying to compile the declaration 'uint64_t _Thread_local;' which is not valid. However, this name violates our conventions (ultimately, want to enforce that no qapi names start with single underscore), so the test is slightly weaker by instead testing 'wchar-t'; the declaration 'uint64_t wchar_t;' is valid in C (where wchar_t is only a typedef) but would fail with a C++ compiler (where it is a keyword). Fix things by reversing the order of actions within c_name(). Backports commit c43567c12042cf401b039bfc94a5f85e1cc1e796 from qemu
This commit is contained in:
parent
bc1e31663e
commit
bacaf613b1
1 changed files with 2 additions and 1 deletions
|
@ -1479,10 +1479,11 @@ def c_name(name, protect=True):
|
|||
'not_eq', 'or', 'or_eq', 'xor', 'xor_eq'])
|
||||
# namespace pollution:
|
||||
polluted_words = set(['unix', 'errno'])
|
||||
name = name.translate(c_name_trans)
|
||||
if protect and (name in c89_words | c99_words | c11_words | gcc_words
|
||||
| cpp_words | polluted_words):
|
||||
return "q_" + name
|
||||
return name.translate(c_name_trans)
|
||||
return name
|
||||
|
||||
eatspace = '\033EATSPACE.'
|
||||
pointer_suffix = ' *' + eatspace
|
||||
|
|
Loading…
Reference in a new issue