X-Git-Url: http://git.efficios.com/?p=ctf.git;a=blobdiff_plain;f=common-trace-format-proposal.txt;h=8e79b738f62f3e0ae64107daea7da72c4e620d26;hp=8d8fb7ca04d2582fdf7522c0e54e8f07ff7143fc;hb=cfc73fdcfb61cbfea3831c79f602825f87865878;hpb=4fa992a5b44f9c2eecd93c2c12820428f5d7c36f

diff --git a/common-trace-format-proposal.txt b/common-trace-format-proposal.txt
index 8d8fb7c..8e79b73 100644
--- a/common-trace-format-proposal.txt
+++ b/common-trace-format-proposal.txt
@@ -273,7 +273,7 @@ repeating the start and end values with the value = string declaration.
 If a numeric value is encountered between < >, it represents the integer type
 size used to hold the enumeration, in bits.
 
-enum <integer_type OR size> name {
+enum name <integer_type OR size> {
   string              = start_value1 ... end_value1,
   "other string"      = start_value2 ... end_value2,
   yet_another_string,	/* will be assigned to end_value2 + 1 */
@@ -284,7 +284,7 @@ enum <integer_type OR size> name {
 If the values are omitted, the enumeration starts at 0 and increment of 1 for
 each entry:
 
-enum <32> name {
+enum name <32> {
   ZERO,
   ONE,
   TWO,
@@ -848,7 +848,7 @@ variant name {
   ...
 };
 
-enum <integer_type or size> name {
+enum name <integer_type or size> {
   ...
 };
 
@@ -981,6 +981,7 @@ stream
 string
 struct
 trace
+typealias
 typedef
 unsigned
 variant
@@ -1152,9 +1153,6 @@ unary-expression:
 unary-operator: one of
 	+ -
 
-assignment-expression:
-	unary-expression assignment-operator unary-expression
-
 assignment-operator:
 	=
 
@@ -1194,7 +1192,8 @@ type-specifier:
 	unsigned
 	_Bool
 	_Complex
-	struct-or-variant-specifier
+	struct-specifier
+	variant-specifier
 	enum-specifier
 	typedef-name
 	ctf-type-specifier
@@ -1269,10 +1268,6 @@ type-qualifier-list:
 	type-qualifier
 	type-qualifier-list type-qualifier
 
-identifier-list:
-	identifier
-	identifier-list , identifier
-
 typedef-name:
 	identifier