X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fmetadata%2Fctf-test%2Fsucceed%2Fctf-test.txt;h=34dd8274f863a321637935765be44fa37a1c5444;hp=034f8f52819a5a12065e8a61262edae39cc83827;hb=6743829ac9d7ae22c8bcc28b6ad162dd3d0b2104;hpb=5039b4cc7e13ee486939c06381432ea35ed77bfa

diff --git a/formats/ctf/metadata/ctf-test/succeed/ctf-test.txt b/formats/ctf/metadata/ctf-test/succeed/ctf-test.txt
index 034f8f52..34dd8274 100644
--- a/formats/ctf/metadata/ctf-test/succeed/ctf-test.txt
+++ b/formats/ctf/metadata/ctf-test/succeed/ctf-test.txt
@@ -1,9 +1,9 @@
 
-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 <int> {
+enum name1 : int {
   ZERO,
   ONE,
   TWO,
@@ -11,30 +11,32 @@ enum name1 <int> {
   ELEVEN,
 };
 
-enum name2 <long> { ONE, TWO };
+enum name2 : long { ONE, TWO };
 
-enum name3 <unsigned long> { ONE, TWO };
+enum name3 : unsigned long { ONE, TWO };
 
-enum name4 <unsigned long> {
+enum name4 : unsigned long {
   string          = 1 ... 2,
   "other string"      = 3...4,
   yet_another_string,   /* will be assigned to end_value2 + 1 */
   "some other string" = 10,
 };
 
-enum name5 <long> { "int" = 1, };
+enum name5 : long { "int" = 1, };
+
+enum name6 { "int" = 1, };
 
 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 +46,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,14 +64,14 @@ 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;
-
-  enum <uint2_t> { a, b, c, d } choice;
+  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 : uint2_t { a, b, c, d } choice;
   /* Unrelated fields can be added between the variant and its tag */
   int32_t somevalue;
   variant <choice> {
@@ -87,13 +89,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 +103,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,16 +123,16 @@ 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.
    * id 31 is reserved to indicate an extended header.
    */
-  enum <uint5_t> { compact = 0 ... 30, extended = 31 } id;
+  enum : uint5_t { compact = 0 ... 30, extended = 31 } id;
   variant <id> {
     struct {
       uint27_t timestamp;
@@ -143,15 +145,15 @@ 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.
    * id 65535 is reserved to indicate an extended header.
    */
-  enum <uint16_t> { compact = 0 ... 65534, extended = 65535 } id;
+  enum : uint16_t { compact = 0 ... 65534, extended = 65535 } id;
   variant <id> {
     struct {
       uint32_t timestamp;
@@ -175,4 +177,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 *;