From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44152) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAOWs-0003Mz-IG for qemu-devel@nongnu.org; Wed, 01 Jul 2015 16:22:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZAOWq-00064Y-B4 for qemu-devel@nongnu.org; Wed, 01 Jul 2015 16:22:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47406) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAOWq-000649-72 for qemu-devel@nongnu.org; Wed, 01 Jul 2015 16:22:44 -0400 From: Markus Armbruster Date: Wed, 1 Jul 2015 22:22:13 +0200 Message-Id: <1435782155-31412-26-git-send-email-armbru@redhat.com> In-Reply-To: <1435782155-31412-1-git-send-email-armbru@redhat.com> References: <1435782155-31412-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH RFC v2 25/47] qapi: Make generators work on sorted schema expressions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, berto@igalia.com, mdroth@linux.vnet.ibm.com Order of expressions doesn't matter. QAPISchema().get_exprs() returns expressions in the order they're parsed. I'm going to refactor this code. To check refactorings, I want to diff the generated code, and for that I need to preserve its order. Since I don't feel like preserving parse order, I'm changing get_expr() to return the expressions sorted by name. This order will be trivial to preserve. It also makes the generated code slightly easier to navigate. Signed-off-by: Markus Armbruster --- scripts/qapi.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index cac7ab5..20ffdaf 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -1017,7 +1017,14 @@ class QAPISchema(object): self.check() def get_exprs(self): - return [expr_elem['expr'] for expr_elem in self.exprs] + def expr_name(expr): + name = expr.get('enum') or expr.get('union') \ + or expr.get('alternate') or expr.get('struct') \ + or expr.get('command') or expr.get('event') + assert name + return name + return sorted([expr_elem['expr'] for expr_elem in self.exprs], + key=expr_name) def _def_entity(self, ent): assert ent.name not in self.entity_dict -- 1.9.3