Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
VAPI: support VLAs in type definitions
[vpp.git]
/
src
/
vpp-api
/
vapi
/
vapi_c_gen.py
diff --git
a/src/vpp-api/vapi/vapi_c_gen.py
b/src/vpp-api/vapi/vapi_c_gen.py
index
60c54e4
..
b85f1e9
100755
(executable)
--- a/
src/vpp-api/vapi/vapi_c_gen.py
+++ b/
src/vpp-api/vapi/vapi_c_gen.py
@@
-9,15
+9,6
@@
from vapi_json_parser import Field, Struct, Message, JsonParser,\
class CField(Field):
class CField(Field):
- def __init__(
- self,
- field_name,
- field_type,
- array_len=None,
- nelem_field=None):
- super(CField, self).__init__(
- field_name, field_type, array_len, nelem_field)
-
def get_c_def(self):
if self.len is not None:
return "%s %s[%d]" % (self.type.get_c_name(), self.name, self.len)
def get_c_def(self):
if self.len is not None:
return "%s %s[%d]" % (self.type.get_c_name(), self.name, self.len)
@@
-67,9
+58,6
@@
class CField(Field):
class CStruct(Struct):
class CStruct(Struct):
- def __init__(self, name, fields):
- super(CStruct, self).__init__(name, fields)
-
def duplicate_barrier(func):
def func_wrapper(self):
name = self.get_c_name()
def duplicate_barrier(func):
def func_wrapper(self):
name = self.get_c_name()
@@
-99,9
+87,6
@@
class CSimpleType (SimpleType):
'i64': 'be64toh', 'u64': 'be64toh',
}
'i64': 'be64toh', 'u64': 'be64toh',
}
- def __init__(self, name):
- super(CSimpleType, self).__init__(name)
-
def get_c_name(self):
return self.name
def get_c_name(self):
return self.name
@@
-129,9
+114,6
@@
class CSimpleType (SimpleType):
class CStructType (StructType, CStruct):
class CStructType (StructType, CStruct):
- def __init__(self, definition, typedict, field_class):
- super(CStructType, self).__init__(definition, typedict, field_class)
-
def get_c_name(self):
return "vapi_type_%s" % self.name
def get_c_name(self):
return "vapi_type_%s" % self.name
@@
-586,7
+568,7
@@
def gen_json_unified_header(parser, logger, j, io, name):
]))
print("")
print("")
]))
print("")
print("")
- for t in parser.types_by_json[j]
.values()
:
+ for t in parser.types_by_json[j]:
try:
print("%s" % t.get_c_def())
print("")
try:
print("%s" % t.get_c_def())
print("")
@@
-598,7
+580,7
@@
def gen_json_unified_header(parser, logger, j, io, name):
print("")
function_attrs = "static inline "
print("")
function_attrs = "static inline "
- for t in parser.types_by_json[j]
.values()
:
+ for t in parser.types_by_json[j]:
print("#ifndef defined_inline_%s" % t.get_c_name())
print("#define defined_inline_%s" % t.get_c_name())
print("%s%s" % (function_attrs, t.get_swap_to_be_func_def()))
print("#ifndef defined_inline_%s" % t.get_c_name())
print("#define defined_inline_%s" % t.get_c_name())
print("%s%s" % (function_attrs, t.get_swap_to_be_func_def()))