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

qapi: Concentrate QAPISchemaParser.exprs updates in .__init__() 



Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20180211093607.27351-15-armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarMichael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: default avatarEric Blake <eblake@redhat.com>
parent 181feaf3

scripts/qapi/common.py

+9 −6
Original line number Diff line number Diff line
@@ -290,8 +290,12 @@ class QAPISchemaParser(object): 
                if not isinstance(include, str):

                    raise QAPISemError(info,

                                       "Value of 'include' must be a string")

                self._include(include, info, os.path.dirname(self.fname),

                exprs_include = self._include(include, info,

                                              os.path.dirname(self.fname),

                                              previously_included)

                if exprs_include:

                    self.exprs.extend(exprs_include.exprs)

                    self.docs.extend(exprs_include.docs)

            elif "pragma" in expr:

                self.reject_expr_doc(cur_doc)

                if len(expr) != 1:
@@ -334,14 +338,13 @@ class QAPISchemaParser(object): 


        # skip multiple include of the same file

        if incl_abs_fname in previously_included:

            return

            return None



        try:

            fobj = open(incl_fname, 'r')

        except IOError as e:

            raise QAPISemError(info, '%s: %s' % (e.strerror, incl_fname))

        exprs_include = QAPISchemaParser(fobj, previously_included, info)

        self.exprs.extend(exprs_include.exprs)

        self.docs.extend(exprs_include.docs)

        return QAPISchemaParser(fobj, previously_included, info)



    def _pragma(self, name, value, info):

        global doc_required, returns_whitelist, name_case_whitelist