X-Git-Url: http://git.efficios.com/?p=ctf.git;a=blobdiff_plain;f=common-trace-format-proposal.txt;h=3d268c14ae32c280501d00c9821ce991cccdc0da;hp=d2a1f224d69bf8459714b35a3ac735542898d5b7;hb=7609d3c77f6ba49881df5e4294269146546efa4e;hpb=cb108fea0ab07513d3618ae5931d0f0d72a92d6a

diff --git a/common-trace-format-proposal.txt b/common-trace-format-proposal.txt
index d2a1f22..3d268c1 100644
--- a/common-trace-format-proposal.txt
+++ b/common-trace-format-proposal.txt
@@ -233,7 +233,7 @@ defined by the size of the type "unit_type".
 
 TSDL meta-data representation:
 
-  unit_type name:size:
+  unit_type name:size;
 
 As an example, the following structure declared in C compiled by GCC:
 
@@ -1468,8 +1468,8 @@ struct-or-variant-declaration-list:
 struct-or-variant-declaration:
 	specifier-qualifier-list struct-or-variant-declarator-list ;
 	declaration-specifiers-opt storage-class-specifier declaration-specifiers-opt declarator-list ;
-	typealias declaration-specifiers abstract-declarator-list := declaration-specifiers abstract-declarator-list ;
-	typealias declaration-specifiers abstract-declarator-list := declarator-list ;
+	typealias declaration-specifiers abstract-declarator-list type-assignment-operator declaration-specifiers abstract-declarator-list ;
+	typealias declaration-specifiers abstract-declarator-list type-assignment-operator declarator-list ;
 
 specifier-qualifier-list:
 	type-specifier specifier-qualifier-list-opt
@@ -1503,8 +1503,8 @@ enumerator-list:
 
 enumerator:
 	enumeration-constant
-	enumeration-constant = unary-expression
-	enumeration-constant = constant-expression-range
+	enumeration-constant assignment-operator unary-expression
+	enumeration-constant assignment-operator constant-expression-range
 
 type-qualifier:
 	const
@@ -1543,13 +1543,14 @@ ctf-specifier:
 	event { ctf-assignment-expression-list-opt }
 	stream { ctf-assignment-expression-list-opt }
 	trace { ctf-assignment-expression-list-opt }
-	typealias declaration-specifiers abstract-declarator-list := declaration-specifiers abstract-declarator-list ;
-	typealias declaration-specifiers abstract-declarator-list := declarator-list ;
+	typealias declaration-specifiers abstract-declarator-list type-assignment-operator declaration-specifiers abstract-declarator-list ;
+	typealias declaration-specifiers abstract-declarator-list type-assignment-operator declarator-list ;
 
 ctf-type-specifier:
 	floating_point { ctf-assignment-expression-list-opt }
 	integer { ctf-assignment-expression-list-opt }
 	string { ctf-assignment-expression-list-opt }
+	string
 
 ctf-assignment-expression-list:
 	ctf-assignment-expression ;
@@ -1559,5 +1560,5 @@ ctf-assignment-expression:
 	unary-expression assignment-operator unary-expression
 	unary-expression type-assignment-operator type-specifier
 	declaration-specifiers-opt storage-class-specifier declaration-specifiers-opt declarator-list
-	typealias declaration-specifiers abstract-declarator-list := declaration-specifiers abstract-declarator-list
-	typealias declaration-specifiers abstract-declarator-list := declarator-list
+	typealias declaration-specifiers abstract-declarator-list type-assignment-operator declaration-specifiers abstract-declarator-list
+	typealias declaration-specifiers abstract-declarator-list type-assignment-operator declarator-list