mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-07-27 12:23:53 -06:00
qapi: do not protect enum values from namespace pollution
Enum values are always preceded by the uppercase name of the enum, so they do not conflict with reserved words. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
parent
f513cbf750
commit
eda50a656f
3 changed files with 7 additions and 7 deletions
|
@ -141,7 +141,7 @@ def camel_case(name):
|
|||
new_name += ch.lower()
|
||||
return new_name
|
||||
|
||||
def c_var(name):
|
||||
def c_var(name, protect=True):
|
||||
# ANSI X3J11/88-090, 3.1.1
|
||||
c89_words = set(['auto', 'break', 'case', 'char', 'const', 'continue',
|
||||
'default', 'do', 'double', 'else', 'enum', 'extern', 'float',
|
||||
|
@ -156,12 +156,12 @@ def c_var(name):
|
|||
# GCC http://gcc.gnu.org/onlinedocs/gcc-4.7.1/gcc/C-Extensions.html
|
||||
# excluding _.*
|
||||
gcc_words = set(['asm', 'typeof'])
|
||||
if name in c89_words | c99_words | c11_words | gcc_words:
|
||||
if protect and (name in c89_words | c99_words | c11_words | gcc_words):
|
||||
return "q_" + name
|
||||
return name.replace('-', '_').lstrip("*")
|
||||
|
||||
def c_fun(name):
|
||||
return c_var(name).replace('.', '_')
|
||||
def c_fun(name, protect=True):
|
||||
return c_var(name, protect).replace('.', '_')
|
||||
|
||||
def c_list_type(name):
|
||||
return '%sList' % name
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue