yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2024-12-23 09:35:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

qapi: Fix C identifiers generated for names containing '.'

Browse source 
c_fun() maps '.' to '_', c_var() doesn't. Nothing prevents '.' in
QAPI names that get passed to c_var().

Which QAPI names get passed to c_fun(), to c_var(), or to both is not
obvious. Names of command parameters and struct type members get
passed to c_var().

c_var() strips a leading '*', but this cannot happen. c_fun()
doesn't.

Fix c_var() to work exactly like c_fun().

Perhaps they should be replaced by a single mapping function.

Backports commit 47299262de424af0cb69965d082e5e70b2314183 from qemu
This commit is contained in:
Markus Armbruster 2018-02-19 14:40:55 -05:00 committed by Lioncash
parent 7a82e7ff73
commit baab1986a3
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
qemu/scripts/qapi.py
View file

@ -15,6 +15,7 @@ import re
from ordereddict import OrderedDict
import os
import sys
import string
builtin_types = {
'str': 'QTYPE_QSTRING',
@ -751,6 +752,8 @@ def camel_case(name):
new_name += ch.lower()
return new_name
c_var_trans = string.maketrans('.-', '__')
def c_var(name, protect=True):
# ANSI X3J11/88-090, 3.1.1
c89_words = set(['auto', 'break', 'case', 'char', 'const', 'continue',
@ -780,10 +783,10 @@ def c_var(name, protect=True):
polluted_words = set(['unix', 'errno'])
if protect and (name in c89_words | c99_words | c11_words | gcc_words | cpp_words | polluted_words):
return "q_" + name
return name.replace('-', '_').lstrip("*")
return name.translate(c_var_trans)
def c_fun(name, protect=True):
return c_var(name, protect).replace('.', '_')
return c_var(name, protect)
def c_list_type(name):
return '%sList' % name