[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 08/15] qapi: Move exprs checking from parse_schem
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 08/15] qapi: Move exprs checking from parse_schema() to check_exprs() |
Date: |
Tue, 16 Jun 2015 16:40:51 +0200 |
To have expression semantic analysis in one place rather than two.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
scripts/qapi.py | 142 ++++++++++++++++++++++++++------------------------------
1 file changed, 66 insertions(+), 76 deletions(-)
diff --git a/scripts/qapi.py b/scripts/qapi.py
index 6faa897..34a5e8d 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -603,26 +603,6 @@ def check_struct(expr, expr_info):
if expr.get('base'):
check_member_clash(expr_info, expr['base'], expr['data'])
-def check_exprs(schema):
- for expr_elem in schema.exprs:
- expr = expr_elem['expr']
- info = expr_elem['info']
-
- if expr.has_key('enum'):
- check_enum(expr, info)
- elif expr.has_key('union'):
- check_union(expr, info)
- elif expr.has_key('alternate'):
- check_alternate(expr, info)
- elif expr.has_key('struct'):
- check_struct(expr, info)
- elif expr.has_key('command'):
- check_command(expr, info)
- elif expr.has_key('event'):
- check_event(expr, info)
- else:
- assert False, 'unexpected meta type'
-
def check_keys(expr_elem, meta, required, optional=[]):
expr = expr_elem['expr']
info = expr_elem['info']
@@ -646,70 +626,80 @@ def check_keys(expr_elem, meta, required, optional=[]):
"Key '%s' is missing from %s '%s'"
% (key, meta, name))
+def check_exprs(exprs):
+ global all_names
+
+ # Learn the types and check for valid expression keys
+ for builtin in builtin_types.keys():
+ all_names[builtin] = 'built-in'
+ for expr_elem in exprs:
+ expr = expr_elem['expr']
+ info = expr_elem['info']
+ if expr.has_key('enum'):
+ check_keys(expr_elem, 'enum', ['data'])
+ add_enum(expr['enum'], info, expr['data'])
+ elif expr.has_key('union'):
+ check_keys(expr_elem, 'union', ['data'],
+ ['base', 'discriminator'])
+ add_union(expr, info)
+ elif expr.has_key('alternate'):
+ check_keys(expr_elem, 'alternate', ['data'])
+ add_name(expr['alternate'], info, 'alternate')
+ elif expr.has_key('struct'):
+ check_keys(expr_elem, 'struct', ['data'], ['base'])
+ add_struct(expr, info)
+ elif expr.has_key('command'):
+ check_keys(expr_elem, 'command', [],
+ ['data', 'returns', 'gen', 'success-response'])
+ add_name(expr['command'], info, 'command')
+ elif expr.has_key('event'):
+ check_keys(expr_elem, 'event', [], ['data'])
+ add_name(expr['event'], info, 'event')
+ else:
+ raise QAPIExprError(expr_elem['info'],
+ "Expression is missing metatype")
+
+ # Try again for hidden UnionKind enum
+ for expr_elem in exprs:
+ expr = expr_elem['expr']
+ if expr.has_key('union'):
+ if not discriminator_find_enum_define(expr):
+ add_enum('%sKind' % expr['union'], expr_elem['info'],
+ implicit=True)
+ elif expr.has_key('alternate'):
+ add_enum('%sKind' % expr['alternate'], expr_elem['info'],
+ implicit=True)
+
+ # Validate that exprs make sense
+ for expr_elem in exprs:
+ expr = expr_elem['expr']
+ info = expr_elem['info']
+
+ if expr.has_key('enum'):
+ check_enum(expr, info)
+ elif expr.has_key('union'):
+ check_union(expr, info)
+ elif expr.has_key('alternate'):
+ check_alternate(expr, info)
+ elif expr.has_key('struct'):
+ check_struct(expr, info)
+ elif expr.has_key('command'):
+ check_command(expr, info)
+ elif expr.has_key('event'):
+ check_event(expr, info)
+ else:
+ assert False, 'unexpected meta type'
+
+ return map(lambda expr_elem: expr_elem['expr'], exprs)
def parse_schema(fname):
- global all_names
- exprs = []
-
- # First pass: read entire file into memory
try:
schema = QAPISchema(open(fname, "r"))
+ return check_exprs(schema.exprs)
except (QAPISchemaError, QAPIExprError), e:
print >>sys.stderr, e
exit(1)
- try:
- # Next pass: learn the types and check for valid expression keys. At
- # this point, top-level 'include' has already been flattened.
- for builtin in builtin_types.keys():
- all_names[builtin] = 'built-in'
- for expr_elem in schema.exprs:
- expr = expr_elem['expr']
- info = expr_elem['info']
- if expr.has_key('enum'):
- check_keys(expr_elem, 'enum', ['data'])
- add_enum(expr['enum'], info, expr['data'])
- elif expr.has_key('union'):
- check_keys(expr_elem, 'union', ['data'],
- ['base', 'discriminator'])
- add_union(expr, info)
- elif expr.has_key('alternate'):
- check_keys(expr_elem, 'alternate', ['data'])
- add_name(expr['alternate'], info, 'alternate')
- elif expr.has_key('struct'):
- check_keys(expr_elem, 'struct', ['data'], ['base'])
- add_struct(expr, info)
- elif expr.has_key('command'):
- check_keys(expr_elem, 'command', [],
- ['data', 'returns', 'gen', 'success-response'])
- add_name(expr['command'], info, 'command')
- elif expr.has_key('event'):
- check_keys(expr_elem, 'event', [], ['data'])
- add_name(expr['event'], info, 'event')
- else:
- raise QAPIExprError(expr_elem['info'],
- "Expression is missing metatype")
- exprs.append(expr)
-
- # Try again for hidden UnionKind enum
- for expr_elem in schema.exprs:
- expr = expr_elem['expr']
- if expr.has_key('union'):
- if not discriminator_find_enum_define(expr):
- add_enum('%sKind' % expr['union'], expr_elem['info'],
- implicit=True)
- elif expr.has_key('alternate'):
- add_enum('%sKind' % expr['alternate'], expr_elem['info'],
- implicit=True)
-
- # Final pass - validate that exprs make sense
- check_exprs(schema)
- except QAPIExprError, e:
- print >>sys.stderr, e
- exit(1)
-
- return exprs
-
def parse_args(typeinfo):
if isinstance(typeinfo, str):
struct = find_struct(typeinfo)
--
1.9.3
- [Qemu-devel] [PATCH v2 00/15] qapi: Miscellaneous fixes and cleanups, Markus Armbruster, 2015/06/16
- [Qemu-devel] [PATCH v2 05/15] qapi: Fix file name in error messages for included files, Markus Armbruster, 2015/06/16
- [Qemu-devel] [PATCH v2 12/15] qapi-types: Don't filter out expressions with 'gen', Markus Armbruster, 2015/06/16
- [Qemu-devel] [PATCH v2 09/15] qapi: Better separate the different kinds of helpers, Markus Armbruster, 2015/06/16
- [Qemu-devel] [PATCH v2 01/15] MAINTAINERS: Fix up QAPI and QAPI schema file patterns, Markus Armbruster, 2015/06/16
- [Qemu-devel] [PATCH v2 08/15] qapi: Move exprs checking from parse_schema() to check_exprs(),
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 13/15] qapi-types: Drop unused members parameters, Markus Armbruster, 2015/06/16
- [Qemu-devel] [PATCH v2 07/15] qapi: Fix to reject stray 't', 'f' and 'n', Markus Armbruster, 2015/06/16
- [Qemu-devel] [PATCH v2 06/15] qapi: Simplify inclusion cycle detection, Markus Armbruster, 2015/06/16
- [Qemu-devel] [PATCH v2 02/15] qapi: Drop bogus command from docs, Markus Armbruster, 2015/06/16
- [Qemu-devel] [PATCH v2 04/15] qapi: Improve a couple of confusing variable names, Markus Armbruster, 2015/06/16
- [Qemu-devel] [PATCH v2 14/15] qapi-types: Split generate_fwd_builtin() off generate_fwd_struct(), Markus Armbruster, 2015/06/16
- [Qemu-devel] [PATCH v2 11/15] qapi: Catch and reject flat union branch of array type, Markus Armbruster, 2015/06/16
- [Qemu-devel] [PATCH v2 15/15] qapi-types: Bury code dead since commit 6b5abc7, Markus Armbruster, 2015/06/16
- [Qemu-devel] [PATCH v2 10/15] tests/qapi-schema: New flat union array branch test case, Markus Armbruster, 2015/06/16