Commit 268a1c5e authored by Eric Blake's avatar Eric Blake Committed by Markus Armbruster
Browse files

qapi: Prepare for catching more semantic parse errors 



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: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent 44bd1276

scripts/qapi.py

+20 −17
Original line number Diff line number Diff line
@@ -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,6 +408,8 @@ def parse_schema(input_file): 


    exprs = []



    try:

        # Next pass: learn the types.

        for expr_elem in schema.exprs:

            expr = expr_elem['expr']

            if expr.has_key('enum'):
@@ -424,7 +427,7 @@ def parse_schema(input_file): 
                if not discriminator_find_enum_define(expr):

                    add_enum('%sKind' % expr['union'])



    try:

        # Final pass - validate that exprs make sense

        check_exprs(schema)

    except QAPIExprError, e:

        print >>sys.stderr, e