OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases 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.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
[add 'import string']
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
This commit is contained in:
Markus Armbruster 2015-05-14 06:50:47 -06:00
parent 777abdfe7b
commit 47299262de
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/qapi.py
View File

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