[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 10/14] tests/qapi-schema: Rename a few conditionals
From: |
Markus Armbruster |
Subject: |
[PATCH 10/14] tests/qapi-schema: Rename a few conditionals |
Date: |
Thu, 16 Mar 2023 08:13:21 +0100 |
Positive test case
{ 'enum': 'TestIfEnum',
'data': [ 'foo', { 'name' : 'bar', 'if': 'TEST_IF_ENUM_BAR' } ],
'if': 'TEST_IF_ENUM' }
generates
#if defined(TEST_IF_ENUM)
typedef enum TestIfEnum {
TEST_IF_ENUM_FOO,
#if defined(TEST_IF_ENUM_BAR)
TEST_IF_ENUM_BAR,
#endif /* defined(TEST_IF_ENUM_BAR) */
TEST_IF_ENUM__MAX,
} TestIfEnum;
Macro TEST_IF_ENUM_BAR clashes with the enumeration constant.
Wouldn't compile with -DTEST_IF_BAR.
Rename the macro to TEST_IF_ENUM_MEMBER. For consistency, rename
similar macros elsewhere as well.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
tests/qapi-schema/qapi-schema-test.json | 12 ++++++------
tests/qapi-schema/qapi-schema-test.out | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/tests/qapi-schema/qapi-schema-test.json
b/tests/qapi-schema/qapi-schema-test.json
index ba7302f42b..5728d4de38 100644
--- a/tests/qapi-schema/qapi-schema-test.json
+++ b/tests/qapi-schema/qapi-schema-test.json
@@ -220,18 +220,18 @@
{ 'struct': 'TestIfStruct',
'data': { 'foo': 'int',
- 'bar': { 'type': 'int', 'if': 'TEST_IF_STRUCT_BAR'} },
+ 'bar': { 'type': 'int', 'if': 'TEST_IF_STRUCT_MEMBER'} },
'if': 'TEST_IF_STRUCT' }
{ 'enum': 'TestIfEnum',
- 'data': [ 'foo', { 'name' : 'bar', 'if': 'TEST_IF_ENUM_BAR' } ],
+ 'data': [ 'foo', { 'name' : 'bar', 'if': 'TEST_IF_ENUM_MEMBER' } ],
'if': 'TEST_IF_ENUM' }
{ 'union': 'TestIfUnion',
'base': { 'type': 'TestIfEnum' },
'discriminator': 'type',
'data': { 'foo': 'TestStruct',
- 'bar': { 'type': 'UserDefZero', 'if': 'TEST_IF_ENUM_BAR'} },
+ 'bar': { 'type': 'UserDefZero', 'if': 'TEST_IF_ENUM_MEMBER'} },
'if': { 'all': ['TEST_IF_UNION', 'TEST_IF_STRUCT'] } }
{ 'command': 'test-if-union-cmd',
@@ -240,7 +240,7 @@
{ 'alternate': 'TestIfAlternate',
'data': { 'foo': 'int',
- 'bar': { 'type': 'TestStruct', 'if': 'TEST_IF_ALT_BAR'} },
+ 'bar': { 'type': 'TestStruct', 'if': 'TEST_IF_ALT_MEMBER'} },
'if': { 'all': ['TEST_IF_ALT', 'TEST_IF_STRUCT'] } }
{ 'command': 'test-if-alternate-cmd',
@@ -250,7 +250,7 @@
{ 'command': 'test-if-cmd',
'data': {
'foo': 'TestIfStruct',
- 'bar': { 'type': 'TestIfEnum', 'if': 'TEST_IF_CMD_BAR' } },
+ 'bar': { 'type': 'TestIfEnum', 'if': 'TEST_IF_CMD_ARG' } },
'returns': 'UserDefThree',
'if': { 'all': ['TEST_IF_CMD', 'TEST_IF_STRUCT'] } }
@@ -258,7 +258,7 @@
{ 'event': 'TEST_IF_EVENT',
'data': { 'foo': 'TestIfStruct',
- 'bar': { 'type': ['TestIfEnum'], 'if': 'TEST_IF_EVT_BAR' } },
+ 'bar': { 'type': ['TestIfEnum'], 'if': 'TEST_IF_EVT_ARG' } },
'if': { 'all': ['TEST_IF_EVT', 'TEST_IF_STRUCT'] } }
{ 'event': 'TEST_IF_EVENT2', 'data': {},
diff --git a/tests/qapi-schema/qapi-schema-test.out
b/tests/qapi-schema/qapi-schema-test.out
index 043d75c655..cbd96f0b24 100644
--- a/tests/qapi-schema/qapi-schema-test.out
+++ b/tests/qapi-schema/qapi-schema-test.out
@@ -246,12 +246,12 @@ command __org.qemu_x-command
q_obj___org.qemu_x-command-arg -> None
object TestIfStruct
member foo: int optional=False
member bar: int optional=False
- if TEST_IF_STRUCT_BAR
+ if TEST_IF_STRUCT_MEMBER
if TEST_IF_STRUCT
enum TestIfEnum
member foo
member bar
- if TEST_IF_ENUM_BAR
+ if TEST_IF_ENUM_MEMBER
if TEST_IF_ENUM
object q_obj_TestIfUnion-base
member type: TestIfEnum optional=False
@@ -261,7 +261,7 @@ object TestIfUnion
tag type
case foo: TestStruct
case bar: UserDefZero
- if TEST_IF_ENUM_BAR
+ if TEST_IF_ENUM_MEMBER
if {'all': ['TEST_IF_UNION', 'TEST_IF_STRUCT']}
object q_obj_test-if-union-cmd-arg
member union-cmd-arg: TestIfUnion optional=False
@@ -273,7 +273,7 @@ alternate TestIfAlternate
tag type
case foo: int
case bar: TestStruct
- if TEST_IF_ALT_BAR
+ if TEST_IF_ALT_MEMBER
if {'all': ['TEST_IF_ALT', 'TEST_IF_STRUCT']}
object q_obj_test-if-alternate-cmd-arg
member alt-cmd-arg: TestIfAlternate optional=False
@@ -284,7 +284,7 @@ command test-if-alternate-cmd
q_obj_test-if-alternate-cmd-arg -> None
object q_obj_test-if-cmd-arg
member foo: TestIfStruct optional=False
member bar: TestIfEnum optional=False
- if TEST_IF_CMD_BAR
+ if TEST_IF_CMD_ARG
if {'all': ['TEST_IF_CMD', 'TEST_IF_STRUCT']}
command test-if-cmd q_obj_test-if-cmd-arg -> UserDefThree
gen=True success_response=True boxed=False oob=False preconfig=False
@@ -296,7 +296,7 @@ array TestIfEnumList TestIfEnum
object q_obj_TEST_IF_EVENT-arg
member foo: TestIfStruct optional=False
member bar: TestIfEnumList optional=False
- if TEST_IF_EVT_BAR
+ if TEST_IF_EVT_ARG
if {'all': ['TEST_IF_EVT', 'TEST_IF_STRUCT']}
event TEST_IF_EVENT q_obj_TEST_IF_EVENT-arg
boxed=False
--
2.39.2
- [PATCH 14/14] qapi: Require boxed for conditional command and event arguments, (continued)
- [PATCH 14/14] qapi: Require boxed for conditional command and event arguments, Markus Armbruster, 2023/03/16
- [PATCH 04/14] qapi: Split up check_type(), Markus Armbruster, 2023/03/16
- [PATCH 03/14] qapi: Clean up after removal of simple unions, Markus Armbruster, 2023/03/16
- [PATCH 06/14] qapi: Simplify code a bit after previous commit, Markus Armbruster, 2023/03/16
- [PATCH 09/14] tests/qapi-schema: Improve union discriminator coverage, Markus Armbruster, 2023/03/16
- [PATCH 07/14] qapi: Fix error message when type name or array is expected, Markus Armbruster, 2023/03/16
- [PATCH 10/14] tests/qapi-schema: Rename a few conditionals,
Markus Armbruster <=