[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/40] qapi: Prepare for catching more semantic parse
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 12/40] qapi: Prepare for catching more semantic parse errors |
Date: |
Tue, 5 May 2015 18:46:58 +0200 |
From: Eric Blake <address@hidden>
This patch widens the scope of a try block (with the attending
reindentation required by Python) in preparation for a future
patch adding more instances of QAPIExprError inside the block.
It's easier to separate indentation from semantic changes, so
this patch has no real behavior change.
Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
scripts/qapi.py | 37 ++++++++++++++++++++-----------------
1 file changed, 20 insertions(+), 17 deletions(-)
diff --git a/scripts/qapi.py b/scripts/qapi.py
index 5f0f699..0c3459b 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -399,6 +399,7 @@ def check_exprs(schema):
check_event(expr, info)
def parse_schema(input_file):
+ # First pass: read entire file into memory
try:
schema = QAPISchema(open(input_file, "r"))
except (QAPISchemaError, QAPIExprError), e:
@@ -407,24 +408,26 @@ def parse_schema(input_file):
exprs = []
- for expr_elem in schema.exprs:
- expr = expr_elem['expr']
- if expr.has_key('enum'):
- add_enum(expr['enum'], expr.get('data'))
- elif expr.has_key('union'):
- add_union(expr)
- elif expr.has_key('type'):
- add_struct(expr)
- 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'])
-
try:
+ # Next pass: learn the types.
+ for expr_elem in schema.exprs:
+ expr = expr_elem['expr']
+ if expr.has_key('enum'):
+ add_enum(expr['enum'], expr.get('data'))
+ elif expr.has_key('union'):
+ add_union(expr)
+ elif expr.has_key('type'):
+ add_struct(expr)
+ 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'])
+
+ # Final pass - validate that exprs make sense
check_exprs(schema)
except QAPIExprError, e:
print >>sys.stderr, e
--
1.9.3
- [Qemu-devel] [PULL 00/40] drop qapi nested structs, Markus Armbruster, 2015/05/05
- [Qemu-devel] [PULL 01/40] qapi: Add copyright declaration on docs, Markus Armbruster, 2015/05/05
- [Qemu-devel] [PULL 05/40] qapi: Require ASCII in schema, Markus Armbruster, 2015/05/05
- [Qemu-devel] [PULL 03/40] qapi: Simplify builtin type handling, Markus Armbruster, 2015/05/05
- [Qemu-devel] [PULL 12/40] qapi: Prepare for catching more semantic parse errors,
Markus Armbruster <=
- [Qemu-devel] [PULL 07/40] qapi: Better error messages for bad enums, Markus Armbruster, 2015/05/05
- [Qemu-devel] [PULL 09/40] qapi: Clean up test coverage of simple unions, Markus Armbruster, 2015/05/05
- [Qemu-devel] [PULL 06/40] qapi: Add some enum tests, Markus Armbruster, 2015/05/05
- [Qemu-devel] [PULL 04/40] qapi: Fix generation of 'size' builtin type, Markus Armbruster, 2015/05/05
- [Qemu-devel] [PULL 10/40] qapi: Forbid base without discriminator in unions, Markus Armbruster, 2015/05/05
- [Qemu-devel] [PULL 14/40] qapi: Rename anonymous union type in test, Markus Armbruster, 2015/05/05
- [Qemu-devel] [PULL 13/40] qapi: Segregate anonymous unions into alternates in generator, Markus Armbruster, 2015/05/05
- [Qemu-devel] [PULL 15/40] qapi: Document new 'alternate' meta-type, Markus Armbruster, 2015/05/05
- [Qemu-devel] [PULL 11/40] qapi: Tighten checking of unions, Markus Armbruster, 2015/05/05
- [Qemu-devel] [PULL 02/40] qapi: Document type-safety considerations, Markus Armbruster, 2015/05/05