From a030d0842e2f7f6d88fbcd496d9e9287a8d5b78e Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Thu, 28 Apr 2011 15:17:55 -0400 Subject: [PATCH] Change typealias separator from ":" to ":=" Signed-off-by: Mathieu Desnoyers --- formats/ctf/metadata/ctf-parser.y | 6 +- .../ctf-test/succeed/ctf-embedded-1.txt | 6 +- .../ctf-test/succeed/ctf-embedded-2.txt | 8 +-- .../metadata/ctf-test/succeed/ctf-test.txt | 60 +++++++++---------- 4 files changed, 40 insertions(+), 40 deletions(-) diff --git a/formats/ctf/metadata/ctf-parser.y b/formats/ctf/metadata/ctf-parser.y index 1f4aa9e4..ad23ac64 100644 --- a/formats/ctf/metadata/ctf-parser.y +++ b/formats/ctf/metadata/ctf-parser.y @@ -1177,7 +1177,7 @@ declaration: _cds_list_splice_tail(&($1)->u.type_specifier_list.head, &list->u.type_specifier_list.head); _cds_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.type_declarators); } - | TYPEALIAS declaration_specifiers abstract_declarator_list COLON alias_declaration_specifiers alias_abstract_declarator_list SEMICOLON + | TYPEALIAS declaration_specifiers abstract_declarator_list TYPEASSIGN alias_declaration_specifiers alias_abstract_declarator_list SEMICOLON { struct ctf_node *list; @@ -1803,7 +1803,7 @@ struct_or_variant_declaration: ($$)->u.struct_or_variant_declaration.type_specifier_list = list; _cds_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.type_declarators); } - | TYPEALIAS declaration_specifiers abstract_declarator_list COLON alias_declaration_specifiers alias_abstract_declarator_list SEMICOLON + | TYPEALIAS declaration_specifiers abstract_declarator_list TYPEASSIGN alias_declaration_specifiers alias_abstract_declarator_list SEMICOLON { struct ctf_node *list; @@ -2231,7 +2231,7 @@ ctf_assignment_expression: ($$)->u.struct_or_variant_declaration.type_specifier_list = list; _cds_list_splice_tail(&($3)->tmp_head, &($$)->u._typedef.type_declarators); } - | TYPEALIAS declaration_specifiers abstract_declarator_list COLON alias_declaration_specifiers alias_abstract_declarator_list + | TYPEALIAS declaration_specifiers abstract_declarator_list TYPEASSIGN alias_declaration_specifiers alias_abstract_declarator_list { struct ctf_node *list; diff --git a/formats/ctf/metadata/ctf-test/succeed/ctf-embedded-1.txt b/formats/ctf/metadata/ctf-test/succeed/ctf-embedded-1.txt index 503083ae..114c70f2 100644 --- a/formats/ctf/metadata/ctf-test/succeed/ctf-embedded-1.txt +++ b/formats/ctf/metadata/ctf-test/succeed/ctf-embedded-1.txt @@ -8,9 +8,9 @@ trace { /* Architecture with 32-bit pointers, 32-bit integers, 32-bit longs */ -typealias integer { size = 32; align = 32; signed = false; } : uint32_t; -typealias integer { size = 64; align = 64; signed = false; } : uint64_t; -typealias integer { size = 32; align = 32; signed = false; } : void *; +typealias integer { size = 32; align = 32; signed = false; } := uint32_t; +typealias integer { size = 64; align = 64; signed = false; } := uint64_t; +typealias integer { size = 32; align = 32; signed = false; } := void *; stream { id = 0; diff --git a/formats/ctf/metadata/ctf-test/succeed/ctf-embedded-2.txt b/formats/ctf/metadata/ctf-test/succeed/ctf-embedded-2.txt index 127ccead..ccb62184 100644 --- a/formats/ctf/metadata/ctf-test/succeed/ctf-embedded-2.txt +++ b/formats/ctf/metadata/ctf-test/succeed/ctf-embedded-2.txt @@ -8,11 +8,11 @@ trace { /* Architecture with 32-bit pointers, 32-bit integers, 32-bit longs */ -typealias integer { size = 1; align = 1; signed = false; } : uint1_t; -typealias integer { size = 63; align = 1; signed = false; } : timestamp_t; +typealias integer { size = 1; align = 1; signed = false; } := uint1_t; +typealias integer { size = 63; align = 1; signed = false; } := timestamp_t; -typealias integer { size = 32; align = 32; signed = false; } : uint32_t; -typealias integer { size = 32; align = 32; signed = false; } : void *; +typealias integer { size = 32; align = 32; signed = false; } := uint32_t; +typealias integer { size = 32; align = 32; signed = false; } := void *; stream { id = 0; diff --git a/formats/ctf/metadata/ctf-test/succeed/ctf-test.txt b/formats/ctf/metadata/ctf-test/succeed/ctf-test.txt index 034f8f52..c148a436 100644 --- a/formats/ctf/metadata/ctf-test/succeed/ctf-test.txt +++ b/formats/ctf/metadata/ctf-test/succeed/ctf-test.txt @@ -1,7 +1,7 @@ -typealias integer { size = 32; align = 32; signed = true; } : int; -typealias integer { size = 64; align = 64; signed = true; } : long; -typealias integer { size = 64; align = 64; } : unsigned long; +typealias integer { size = 32; align = 32; signed = true; } := int; +typealias integer { size = 64; align = 64; signed = true; } := long; +typealias integer { size = 64; align = 64; } := unsigned long; enum name1 { ZERO, @@ -28,13 +28,13 @@ typealias floating_point { exp_dig = 8; /* sizeof(float) * CHAR_BIT - FLT_MANT_DIG */ mant_dig = 24; /* FLT_MANT_DIG */ byte_order = native; -} : float; +} := float; typealias integer { size = 32; align = 32; signed = false; -} : struct page *; +} := struct page *; trace { major = 66; @@ -44,9 +44,9 @@ trace { }; stream { - typealias integer { size = 64; align = 64; signed = false; } : uint64_t; - typealias integer { size = 16; align = 16; signed = false; } : uint16_t; - typealias integer { size = 32; align = 32; signed = true; } : int; + typealias integer { size = 64; align = 64; signed = false; } := uint64_t; + typealias integer { size = 16; align = 16; signed = false; } := uint16_t; + typealias integer { size = 32; align = 32; signed = true; } := int; typedef int pid_t; id = 5; @@ -62,12 +62,12 @@ struct example { }; struct name { - typealias integer { size = 64; align = 64; signed = false; } : uint64_t; - typealias integer { size = 32; align = 32; signed = false; } : uint32_t; - typealias integer { size = 32; align = 32; signed = true; } : int32_t; - typealias integer { size = 2; align = 8; signed = false; } : uint2_t; - typealias integer { size = 16; align = 16; signed = true; } : short; - typealias uint32_t : unsigned int; + typealias integer { size = 64; align = 64; signed = false; } := uint64_t; + typealias integer { size = 32; align = 32; signed = false; } := uint32_t; + typealias integer { size = 32; align = 32; signed = true; } := int32_t; + typealias integer { size = 2; align = 8; signed = false; } := uint2_t; + typealias integer { size = 16; align = 16; signed = true; } := short; + typealias uint32_t := unsigned int; enum { a, b, c, d } choice; /* Unrelated fields can be added between the variant and its tag */ @@ -87,13 +87,13 @@ typealias integer { size = 32; signed = false; align = 32; -} : uint32_t; +} := uint32_t; -typealias string { encoding = UTF8; } : test; +typealias string { encoding = UTF8; } := test; struct event_packet_header { - typealias integer { size = 32; align = 32; signed = false; } : uint32_t; - typealias integer { size = 8; align = 8; signed = false; } : uint8_t; + typealias integer { size = 32; align = 32; signed = false; } := uint32_t; + typealias integer { size = 8; align = 8; signed = false; } := uint8_t; uint32_t magic; uint8_t trace_uuid[16]; @@ -101,10 +101,10 @@ struct event_packet_header { }; struct event_packet_context { - typealias integer { size = 64; align = 64; signed = false; } : uint64_t; - typealias integer { size = 32; align = 32; signed = false; } : uint32_t; - typealias integer { size = 16; align = 16; signed = false; } : uint16_t; - typealias integer { size = 8; align = 8; signed = false; } : uint8_t; + typealias integer { size = 64; align = 64; signed = false; } := uint64_t; + typealias integer { size = 32; align = 32; signed = false; } := uint32_t; + typealias integer { size = 16; align = 16; signed = false; } := uint16_t; + typealias integer { size = 8; align = 8; signed = false; } := uint8_t; uint64_t timestamp_begin; uint64_t timestamp_end; @@ -121,10 +121,10 @@ struct event_packet_context { }; struct event_header_1 { - typealias integer { size = 64; align = 64; signed = false; } : uint64_t; - typealias integer { size = 32; align = 32; signed = false; } : uint32_t; - typealias integer { size = 5; align = 1; signed = false; } : uint5_t; - typealias integer { size = 27; align = 1; signed = false; } : uint27_t; + typealias integer { size = 64; align = 64; signed = false; } := uint64_t; + typealias integer { size = 32; align = 32; signed = false; } := uint32_t; + typealias integer { size = 5; align = 1; signed = false; } := uint5_t; + typealias integer { size = 27; align = 1; signed = false; } := uint27_t; /* * id: range: 0 - 30. @@ -143,9 +143,9 @@ struct event_header_1 { }; struct event_header_2 { - typealias integer { size = 64; align = 64; signed = false; } : uint64_t; - typealias integer { size = 32; align = 32; signed = false; } : uint32_t; - typealias integer { size = 16; align = 16; signed = false; } : uint16_t; + typealias integer { size = 64; align = 64; signed = false; } := uint64_t; + typealias integer { size = 32; align = 32; signed = false; } := uint32_t; + typealias integer { size = 16; align = 16; signed = false; } := uint16_t; /* * id: range: 0 - 65534. @@ -175,4 +175,4 @@ event { payload := struct {}; }; -typealias integer { size = 32; align = 32; signed = false; } : unsigned long long *; +typealias integer { size = 32; align = 32; signed = false; } := unsigned long long *; -- 2.34.1