From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42555) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WIyr4-0002SZ-KK for qemu-devel@nongnu.org; Thu, 27 Feb 2014 06:10:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WIyqx-0005x5-Tw for qemu-devel@nongnu.org; Thu, 27 Feb 2014 06:10:18 -0500 Received: from mail-pb0-x243.google.com ([2607:f8b0:400e:c01::243]:54369) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WIyqx-0005ws-Nh for qemu-devel@nongnu.org; Thu, 27 Feb 2014 06:10:11 -0500 Received: by mail-pb0-f67.google.com with SMTP id up15so1324391pbc.10 for ; Thu, 27 Feb 2014 03:10:10 -0800 (PST) From: Wenchao Xia Date: Thu, 27 Feb 2014 03:09:28 -0800 Message-Id: <1393499376-4374-3-git-send-email-wenchaoqemu@gmail.com> In-Reply-To: <1393499376-4374-1-git-send-email-wenchaoqemu@gmail.com> References: <1393499376-4374-1-git-send-email-wenchaoqemu@gmail.com> Subject: [Qemu-devel] [PATCH V8 02/10] qapi script: add check for duplicated key List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, Wenchao Xia , mdroth@linux.vnet.ibm.com, armbru@redhat.com, lcapitulino@redhat.com, Wenchao Xia From: Wenchao Xia It is bad that same key was specified twice, especially when a union have two branches with same condition. This patch can prevent it. Signed-off-by: Wenchao Xia Signed-off-by: Wenchao Xia --- scripts/qapi.py | 2 ++ tests/Makefile | 3 ++- tests/qapi-schema/duplicate-key.err | 1 + tests/qapi-schema/duplicate-key.exit | 1 + tests/qapi-schema/duplicate-key.json | 2 ++ 5 files changed, 8 insertions(+), 1 deletions(-) create mode 100644 tests/qapi-schema/duplicate-key.err create mode 100644 tests/qapi-schema/duplicate-key.exit create mode 100644 tests/qapi-schema/duplicate-key.json create mode 100644 tests/qapi-schema/duplicate-key.out diff --git a/scripts/qapi.py b/scripts/qapi.py index 023930e..d0e7934 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -116,6 +116,8 @@ class QAPISchema: if self.tok != ':': raise QAPISchemaError(self, 'Expected ":"') self.accept() + if key in expr: + raise QAPISchemaError(self, 'Duplicate key "%s"' % key) expr[key] = self.get_expr(True) if self.tok == '}': self.accept() diff --git a/tests/Makefile b/tests/Makefile index b17d41e..dfe06eb 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -142,7 +142,8 @@ check-qapi-schema-y := $(addprefix tests/qapi-schema/, \ missing-comma-object.json non-objects.json \ qapi-schema-test.json quoted-structural-chars.json \ trailing-comma-list.json trailing-comma-object.json \ - unclosed-list.json unclosed-object.json unclosed-string.json) + unclosed-list.json unclosed-object.json unclosed-string.json \ + duplicate-key.json) GENERATED_HEADERS += tests/test-qapi-types.h tests/test-qapi-visit.h tests/test-qmp-commands.h diff --git a/tests/qapi-schema/duplicate-key.err b/tests/qapi-schema/duplicate-key.err new file mode 100644 index 0000000..0801c6a --- /dev/null +++ b/tests/qapi-schema/duplicate-key.err @@ -0,0 +1 @@ +:2:10: Duplicate key "key" diff --git a/tests/qapi-schema/duplicate-key.exit b/tests/qapi-schema/duplicate-key.exit new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/qapi-schema/duplicate-key.exit @@ -0,0 +1 @@ +1 diff --git a/tests/qapi-schema/duplicate-key.json b/tests/qapi-schema/duplicate-key.json new file mode 100644 index 0000000..1b55d88 --- /dev/null +++ b/tests/qapi-schema/duplicate-key.json @@ -0,0 +1,2 @@ +{ 'key': 'value', + 'key': 'value' } diff --git a/tests/qapi-schema/duplicate-key.out b/tests/qapi-schema/duplicate-key.out new file mode 100644 index 0000000..e69de29 -- 1.7.1