ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CSIT-1148: VPPAPIGEN 2nd level import of .api ignored

Browse Source 
Change-Id: I73dcab0c5ff2405b1fcba25975955e1267a4ac4e
Signed-off-by: Ole Troan <ot@cisco.com>
This commit is contained in:
Ole Troan
2018-06-29 11:32:33 +02:00
committed by Damjan Marion
parent c2fc57e8df
commit 10a0989a30
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/tools/vppapigen/vppapigen.py
View File

@ -685,12 +685,13 @@ class VPPAPI(object):
# Only allow the following object types from imported file # Only allow the following object types from imported file
if in_import and not (isinstance(o, Enum) or if in_import and not (isinstance(o, Enum) or
isinstance(o, Union) or isinstance(o, Union) or
isinstance(o, Typedef)): isinstance(o, Typedef) or
isinstance(o, Import)):
continue continue
result.append(o)
if isinstance(o, Import): if isinstance(o, Import):
self.process_imports(o.result, True, result) self.process_imports(o.result, True, result)
else:
result.append(o)
# Add message ids to each message. # Add message ids to each message.
def add_msg_id(s): def add_msg_id(s):
@ -764,7 +765,7 @@ def main():
# Debug # Debug
if args.debug: if args.debug:
import pprint import pprint
pp = pprint.PrettyPrinter(indent=4) pp = pprint.PrettyPrinter(indent=4, stream=sys.stderr)
for t in s['Define']: for t in s['Define']:
pp.pprint([t.name, t.flags, t.block]) pp.pprint([t.name, t.flags, t.block])
for t in s['types']: for t in s['types']: