'import': 'IMPORT',
'true': 'TRUE',
'false': 'FALSE',
+ 'union': 'UNION',
}
tokens = ['STRING_LITERAL',
t_ignore = ' \t'
+#
+# Side-effect: Sets global_crc
+#
+def crc_block(block):
+ global global_crc
+ s = str(block).encode()
+ global_crc = binascii.crc32(s, global_crc)
+ return binascii.crc32(s) & 0xffffffff
+
+
class Service():
def __init__(self, caller, reply, events=[], stream=False):
self.caller = caller
class Typedef():
def __init__(self, name, flags, block):
- global global_crc
self.name = name
self.flags = flags
self.block = block
- self.crc = binascii.crc32(str(block)) & 0xffffffff
- global_crc = binascii.crc32(str(block), global_crc)
+ self.crc = crc_block(block)
+ self.manual_print = False
+ self.manual_endian = False
+ for f in flags:
+ if f == 'manual_print':
+ self.manual_print = True
+ elif f == 'manual_endian':
+ self.manual_endian = True
global_type_add(name)
def __repr__(self):
return self.name + str(self.flags) + str(self.block)
+class Using():
+ def __init__(self, name, alias):
+ global global_crc
+ self.name = name
+
+ if isinstance(alias, Array):
+ a = { 'type': alias.fieldtype,
+ 'length': alias.length }
+ else:
+ a = { 'type': alias.fieldtype }
+ self.alias = a
+ self.crc = binascii.crc32(str(alias)) & 0xffffffff
+ global_crc = binascii.crc32(str(alias), global_crc)
+ global_type_add(name)
+
+ def __repr__(self):
+ return self.name + str(self.alias)
+
+
+class Union():
+ def __init__(self, name, block):
+ self.type = 'Union'
+ self.manual_print = False
+ self.manual_endian = False
+ global global_crc
+ self.name = name
+ self.block = block
+ self.crc = crc_block(block)
+ global_type_add(name)
+
+ def __repr__(self):
+ return str(self.block)
+
+
class Define():
def __init__(self, name, flags, block):
- global global_crc
self.name = name
self.flags = flags
self.block = block
- self.crc = binascii.crc32(str(block)) & 0xffffffff
- global_crc = binascii.crc32(str(block), global_crc)
- self.typeonly = False
+ self.crc = crc_block(block)
self.dont_trace = False
self.manual_print = False
self.manual_endian = False
self.autoreply = False
self.singular = False
for f in flags:
- if f == 'typeonly':
- self.typeonly = True
- global_type_add(name)
- elif f == 'dont_trace':
+ if f == 'dont_trace':
self.dont_trace = True
elif f == 'manual_print':
self.manual_print = True
class Enum():
def __init__(self, name, block, enumtype='u32'):
- global global_crc
self.name = name
self.enumtype = enumtype
+
count = 0
for i, b in enumerate(block):
if type(b) is list:
block[i] = [b, count]
self.block = block
- self.crc = binascii.crc32(str(block)) & 0xffffffff
- global_crc = binascii.crc32(str(block), global_crc)
+ self.crc = crc_block(block)
global_type_add(name)
def __repr__(self):
f = os.path.join(dir, filename)
if os.path.exists(f):
break
- with open(f) as fd:
- self.result = parser.parse_file(fd, None)
+ if sys.version[0] == '2':
+ with open(f) as fd:
+ self.result = parser.parse_file(fd, None)
+ else:
+ with open(f, encoding='utf-8') as fd:
+ self.result = parser.parse_file(fd, None)
def __repr__(self):
return self.filename
class Option():
def __init__(self, option):
- global global_crc
self.option = option
- self.crc = binascii.crc32(str(option)) & 0xffffffff
- global_crc = binascii.crc32(str(option), global_crc)
+ self.crc = crc_block(option)
def __repr__(self):
return str(self.option)
| option
| import
| enum
+ | union
| service'''
p[0] = p[1]
def p_define_flist(self, p):
'''define : flist DEFINE ID '{' block_statements_opt '}' ';' '''
- p[0] = Define(p[3], p[1], p[5])
+ # Legacy typedef
+ if 'typeonly' in p[1]:
+ p[0] = Typedef(p[3], p[1], p[5])
+ else:
+ p[0] = Define(p[3], p[1], p[5])
def p_flist(self, p):
'''flist : flag
'''typedef : TYPEDEF ID '{' block_statements_opt '}' ';' '''
p[0] = Typedef(p[2], [], p[4])
+ def p_typedef_alias(self, p):
+ '''typedef : TYPEDEF declaration '''
+ p[0] = Using(p[2].fieldname, p[2])
+
def p_block_statements_opt(self, p):
- '''block_statements_opt : block_statements'''
+ '''block_statements_opt : block_statements '''
p[0] = p[1]
def p_block_statements(self, p):
self._token_coord(p, 1))
p[0] = p[1]
+ def p_union(self, p):
+ '''union : UNION ID '{' block_statements_opt '}' ';' '''
+ p[0] = Union(p[2], p[4])
+
# Error rule for syntax errors
def p_error(self, p):
if p:
def process(self, objs):
s = {}
- s['defines'] = []
- s['typedefs'] = []
- s['imports'] = []
- s['options'] = {}
- s['enums'] = []
- s['services'] = []
-
+ s['Option'] = {}
+ s['Define'] = []
+ s['Service'] = []
+ s['types'] = []
+ s['Import'] = []
+ s['Alias'] = {}
for o in objs:
+ tname = o.__class__.__name__
if isinstance(o, Define):
- if o.typeonly:
- s['typedefs'].append(o)
- else:
- s['defines'].append(o)
- if o.autoreply:
- s['defines'].append(self.autoreply_block(o.name))
+ s[tname].append(o)
+ if o.autoreply:
+ s[tname].append(self.autoreply_block(o.name))
elif isinstance(o, Option):
- s['options'][o[1]] = o[2]
- elif isinstance(o, Enum):
- s['enums'].append(o)
- elif isinstance(o, Typedef):
- s['typedefs'].append(o)
+ s[tname][o[1]] = o[2]
elif type(o) is list:
for o2 in o:
if isinstance(o2, Service):
- s['services'].append(o2)
-
- msgs = {d.name: d for d in s['defines']}
- svcs = {s.caller: s for s in s['services']}
- replies = {s.reply: s for s in s['services']}
+ s['Service'].append(o2)
+ elif (isinstance(o, Enum) or
+ isinstance(o, Typedef) or
+ isinstance(o, Union)):
+ s['types'].append(o)
+ elif isinstance(o, Using):
+ s['Alias'][o.name] = o.alias
+ else:
+ if tname not in s:
+ raise ValueError('Unknown class type: {} {}'
+ .format(tname, o))
+ s[tname].append(o)
+
+ msgs = {d.name: d for d in s['Define']}
+ svcs = {s.caller: s for s in s['Service']}
+ replies = {s.reply: s for s in s['Service']}
seen_services = {}
for service in svcs:
if d in svcs:
continue
if d[:-5]+'_details' in msgs:
- s['services'].append(Service(d, d[:-5]+'_details',
- stream=True))
+ s['Service'].append(Service(d, d[:-5]+'_details',
+ stream=True))
else:
raise ValueError('{} missing details message'
.format(d))
if d in svcs:
continue
if d+'_reply' in msgs:
- s['services'].append(Service(d, d+'_reply'))
+ s['Service'].append(Service(d, d+'_reply'))
else:
raise ValueError(
'{} missing reply message ({}) or service definition'
return s
- def process_imports(self, objs, in_import):
+ def process_imports(self, objs, in_import, result):
imported_objs = []
for o in objs:
+ # Only allow the following object types from imported file
+ if in_import and not (isinstance(o, Enum) or
+ isinstance(o, Union) or
+ isinstance(o, Typedef) or
+ isinstance(o, Import) or
+ isinstance(o, Using)):
+ continue
if isinstance(o, Import):
- return objs + self.process_imports(o.result, True)
- if in_import:
- if isinstance(o, Define) and o.typeonly:
- imported_objs.append(o)
- if in_import:
- return imported_objs
- return objs
+ self.process_imports(o.result, True, result)
+ else:
+ result.append(o)
# Add message ids to each message.
cliparser = argparse.ArgumentParser(description='VPP API generator')
cliparser.add_argument('--pluginpath', default=""),
cliparser.add_argument('--includedir', action='append'),
- cliparser.add_argument('--input', type=argparse.FileType('r'),
- default=sys.stdin)
+ if sys.version[0] == '2':
+ cliparser.add_argument('--input', type=argparse.FileType('r'),
+ default=sys.stdin)
+ else:
+ cliparser.add_argument('--input',
+ type=argparse.FileType('r', encoding='UTF-8'),
+ default=sys.stdin)
cliparser.add_argument('--output', nargs='?', type=argparse.FileType('w'),
default=sys.stdout)
log = logging.getLogger('vppapigen')
parser = VPPAPI(debug=args.debug, filename=filename, logger=log)
- result = parser.parse_file(args.input, log)
+ parsed_objects = parser.parse_file(args.input, log)
# Build a list of objects. Hash of lists.
- result = parser.process_imports(result, False)
+ result = []
+ parser.process_imports(parsed_objects, False, result)
s = parser.process(result)
# Add msg_id field
- s['defines'] = add_msg_id(s['defines'])
+ s['Define'] = add_msg_id(s['Define'])
file_crc = global_crc & 0xffffffff
# Debug
if args.debug:
import pprint
- pp = pprint.PrettyPrinter(indent=4)
- for t in s['defines']:
- pp.pprint([t.name, t.flags, t.block])
- for t in s['typedefs']:
+ pp = pprint.PrettyPrinter(indent=4, stream=sys.stderr)
+ for t in s['Define']:
pp.pprint([t.name, t.flags, t.block])
+ for t in s['types']:
+ pp.pprint([t.name, t.block])
#
# Generate representation
'/../share/vpp/')
for c in cand:
c += '/'
- if os.path.isfile(c + args.output_module + '.py'):
+ if os.path.isfile('{}vppapigen_{}.py'
+ .format(c, args.output_module.lower())):
pluginpath = c
break
else:
pluginpath = args.pluginpath + '/'
if pluginpath == '':
raise Exception('Output plugin not found')
- module_path = pluginpath + args.output_module + '.py'
+ module_path = '{}vppapigen_{}.py'.format(pluginpath,
+ args.output_module.lower())
try:
plugin = imp.load_source(args.output_module, module_path)
- except Exception, err:
+ except Exception as err:
raise Exception('Error importing output plugin: {}, {}'
.format(module_path, err))
Code Review / vpp.git / blobdiff