From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55709) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zdw51-0002nI-JP for qemu-devel@nongnu.org; Mon, 21 Sep 2015 04:04:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zdw4y-0004ti-Pq for qemu-devel@nongnu.org; Mon, 21 Sep 2015 04:04:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38649) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zdw4y-0004tS-ID for qemu-devel@nongnu.org; Mon, 21 Sep 2015 04:04:04 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 33665425A3 for ; Mon, 21 Sep 2015 08:04:04 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-38.ams2.redhat.com [10.36.116.38]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t8L841PT012447 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Mon, 21 Sep 2015 04:04:03 -0400 From: Markus Armbruster Date: Mon, 21 Sep 2015 10:03:38 +0200 Message-Id: <1442822640-29912-5-git-send-email-armbru@redhat.com> In-Reply-To: <1442822640-29912-1-git-send-email-armbru@redhat.com> References: <1442822640-29912-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PULL 04/26] qapi: New QAPISchemaVisitor List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org The visitor will help keeping the code generation code simple and reasonably separated from QAPISchema details. Signed-off-by: Markus Armbruster Message-Id: <1442401589-24189-5-git-send-email-armbru@redhat.com> Reviewed-by: Daniel P. Berrange Reviewed-by: Eric Blake --- scripts/qapi.py | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/scripts/qapi.py b/scripts/qapi.py index 401b87d..36e0702 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -772,6 +772,39 @@ class QAPISchemaEntity(object): def check(self, schema): pass + def visit(self, visitor): + pass + + +class QAPISchemaVisitor(object): + def visit_begin(self, schema): + pass + + def visit_end(self): + pass + + def visit_builtin_type(self, name, info, json_type): + pass + + def visit_enum_type(self, name, info, values, prefix): + pass + + def visit_array_type(self, name, info, element_type): + pass + + def visit_object_type(self, name, info, base, members, variants): + pass + + def visit_alternate_type(self, name, info, variants): + pass + + def visit_command(self, name, info, arg_type, ret_type, + gen, success_response): + pass + + def visit_event(self, name, info, arg_type): + pass + class QAPISchemaType(QAPISchemaEntity): def c_type(self, is_param=False): @@ -818,6 +851,9 @@ class QAPISchemaBuiltinType(QAPISchemaType): def json_type(self): return self._json_type_name + def visit(self, visitor): + visitor.visit_builtin_type(self.name, self.info, self.json_type()) + class QAPISchemaEnumType(QAPISchemaType): def __init__(self, name, info, values, prefix): @@ -841,6 +877,10 @@ class QAPISchemaEnumType(QAPISchemaType): def json_type(self): return 'string' + def visit(self, visitor): + visitor.visit_enum_type(self.name, self.info, + self.values, self.prefix) + class QAPISchemaArrayType(QAPISchemaType): def __init__(self, name, info, element_type): @@ -856,6 +896,9 @@ class QAPISchemaArrayType(QAPISchemaType): def json_type(self): return 'array' + def visit(self, visitor): + visitor.visit_array_type(self.name, self.info, self.element_type) + class QAPISchemaObjectType(QAPISchemaType): def __init__(self, name, info, base, local_members, variants): @@ -904,6 +947,10 @@ class QAPISchemaObjectType(QAPISchemaType): def json_type(self): return 'object' + def visit(self, visitor): + visitor.visit_object_type(self.name, self.info, + self.base, self.local_members, self.variants) + class QAPISchemaObjectTypeMember(object): def __init__(self, name, typ, optional): @@ -971,6 +1018,9 @@ class QAPISchemaAlternateType(QAPISchemaType): def json_type(self): return 'value' + def visit(self, visitor): + visitor.visit_alternate_type(self.name, self.info, self.variants) + class QAPISchemaCommand(QAPISchemaEntity): def __init__(self, name, info, arg_type, ret_type, gen, success_response): @@ -993,6 +1043,11 @@ class QAPISchemaCommand(QAPISchemaEntity): self.ret_type = schema.lookup_type(self._ret_type_name) assert isinstance(self.ret_type, QAPISchemaType) + def visit(self, visitor): + visitor.visit_command(self.name, self.info, + self.arg_type, self.ret_type, + self.gen, self.success_response) + class QAPISchemaEvent(QAPISchemaEntity): def __init__(self, name, info, arg_type): @@ -1007,6 +1062,9 @@ class QAPISchemaEvent(QAPISchemaEntity): assert isinstance(self.arg_type, QAPISchemaObjectType) assert not self.arg_type.variants # not implemented + def visit(self, visitor): + visitor.visit_event(self.name, self.info, self.arg_type) + class QAPISchema(object): def __init__(self, fname): @@ -1204,6 +1262,12 @@ class QAPISchema(object): for ent in self._entity_dict.values(): ent.check(self) + def visit(self, visitor): + visitor.visit_begin(self) + for name in sorted(self._entity_dict.keys()): + self._entity_dict[name].visit(visitor) + visitor.visit_end() + # # Code generation helpers -- 2.4.3