def __str__(self):
if self.len is None:
- return "name: %s, type: %s" % (self.name, self.type)
+ return "Field(name: %s, type: %s)" % (self.name, self.type)
elif self.len > 0:
- return "name: %s, type: %s, length: %s" % (self.name, self.type,
- self.len)
+ return "Field(name: %s, type: %s, length: %s)" % (self.name,
+ self.type,
+ self.len)
else:
- return ("name: %s, type: %s, variable length stored in: %s" %
- (self.name, self.type, self.nelem_field))
+ return (
+ "Field(name: %s, type: %s, variable length stored in: %s)" %
+ (self.name, self.type, self.nelem_field))
+
+ def is_vla(self):
+ return self.nelem_field is not None
+
+ def has_vla(self):
+ return self.is_vla() or self.type.has_vla()
+
+
+class Alias(Field):
+ pass
class Type(object):
class SimpleType (Type):
- def __init__(self, name):
- super(SimpleType, self).__init__(name)
-
- def __str__(self):
- return self.name
+ def has_vla(self):
+ return False
def get_msg_header_defs(struct_type_class, field_class, json_parser, logger):
def __str__(self):
return "[%s]" % "], [".join([str(f) for f in self.fields])
+ def has_vla(self):
+ for f in self.fields:
+ if f.has_vla():
+ return True
+ return False
+
class Enum(SimpleType):
def __init__(self, name, value_pairs, enumtype):
"], [" .join(["%s %s" % (i, j) for i, j in self.type_pairs])
)
+ def has_vla(self):
+ return False
+
class Message(object):
else:
field_type = json_parser.lookup_type_like_id(field[0])
logger.debug("Parsing message field `%s'" % field)
- if len(field) == 2:
+ l = len(field)
+ if any(type(n) is dict for n in field):
+ l -= 1
+ if l == 2:
if self.header is not None and\
self.header.has_field(field[1]):
continue
p = field_class(field_name=field[1],
field_type=field_type)
- elif len(field) == 3:
- if field[2] == 0:
+ elif l == 3:
+ if field[2] == 0 and field[0] != 'string':
raise ParseError(
"While parsing message `%s': variable length "
"array `%s' doesn't have reference to member "
"containing the actual length" % (
name, field[1]))
+ if field[0] == 'string' and field[2] > 0:
+ field_type = json_parser.lookup_type_like_id('u8')
+
p = field_class(
field_name=field[1],
field_type=field_type,
array_len=field[2])
- elif len(field) == 4:
+ elif l == 4:
nelem_field = None
for f in fields:
if f.name == field[3]:
fields.append(p)
self.fields = fields
self.depends = [f.type for f in self.fields]
+ logger.debug("Parsed message: %s" % self)
+
+ def __str__(self):
+ return "Message(%s, [%s], {crc: %s}" % \
+ (self.name,
+ "], [".join([str(f) for f in self.fields]),
+ self.crc)
class StructType (Type, Struct):
def __init__(self, logger, files, simple_type_class=SimpleType,
enum_class=Enum, union_class=Union,
struct_type_class=StructType, field_class=Field,
- message_class=Message):
+ message_class=Message, alias_class=Alias):
self.services = {}
self.messages = {}
self.enums = {}
self.unions = {}
+ self.aliases = {}
self.types = {
x: simple_type_class(x) for x in [
'i8', 'i16', 'i32', 'i64',
'u8', 'u16', 'u32', 'u64',
- 'f64'
+ 'f64', 'bool'
]
}
+ self.types['string'] = simple_type_class('vl_api_string_t')
self.replies = set()
self.events = set()
self.simple_type_class = simple_type_class
self.union_class = union_class
self.struct_type_class = struct_type_class
self.field_class = field_class
+ self.alias_class = alias_class
self.message_class = message_class
self.exceptions = []
self.types_by_json = {}
self.enums_by_json = {}
self.unions_by_json = {}
+ self.aliases_by_json = {}
self.messages_by_json = {}
self.logger = logger
for f in files:
self.types_by_json[path] = []
self.enums_by_json[path] = []
self.unions_by_json[path] = []
+ self.aliases_by_json[path] = []
self.messages_by_json[path] = {}
with open(path) as f:
j = json.load(f)
continue
try:
type_pairs = [[self.lookup_type_like_id(t), n]
- for t, n in u[1:-1]]
- crc = u[-1]["crc"]
- union = self.union_class(name, type_pairs, crc)
+ for t, n in u[1:]]
+ union = self.union_class(name, type_pairs, 0)
progress = progress + 1
except ParseError as e:
exceptions.append(e)
self.types[type_.name] = type_
self.types_by_json[path].append(type_)
self.logger.debug("Parsed type: %s" % type_)
+ for name, body in j['aliases'].iteritems():
+ if name in self.aliases:
+ progress = progress + 1
+ continue
+ if 'length' in body:
+ array_len = body['length']
+ else:
+ array_len = None
+ try:
+ t = self.lookup_type_like_id(body['type'])
+ except ParseError as e:
+ exceptions.append(e)
+ continue
+ alias = self.alias_class(name, t, array_len)
+ self.aliases[name] = alias
+ self.logger.debug("Parsed alias: %s" % alias)
+ self.aliases_by_json[path].append(alias)
if not exceptions:
# finished parsing
break
if progress <= last_progress:
# cannot make forward progress
self.exceptions.extend(exceptions)
+ break
exceptions = []
last_progress = progress
progress = 0
return self.enums[name]
elif name in self.unions:
return self.unions[name]
+ elif name in self.aliases:
+ return self.aliases[name]
elif mundane_name in self.types:
return self.types[mundane_name]
elif mundane_name in self.enums:
return self.enums[mundane_name]
elif mundane_name in self.unions:
return self.unions[mundane_name]
+ elif mundane_name in self.aliases:
+ return self.aliases[mundane_name]
raise ParseError(
"Could not find type, enum or union by magic name `%s' nor by "
"mundane name `%s'" % (name, mundane_name))
Code Review / vpp.git / blobdiff