X-Git-Url: http://git.efficios.com/?p=ctf.git;a=blobdiff_plain;f=common-trace-format-proposal.txt;h=746d0762633e741b2fbc523da1ae2b448d06a05c;hp=e54166954fc41b244567c240bda6ab29515159ab;hb=b12919a589a631b26fb9eecd4bfbecefa7744bb4;hpb=6143bab734320f8e21b4a177c5cefee78fd9afe6

diff --git a/common-trace-format-proposal.txt b/common-trace-format-proposal.txt
index e541669..746d076 100644
--- a/common-trace-format-proposal.txt
+++ b/common-trace-format-proposal.txt
@@ -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 type-assignment-operator declaration-specifiers abstract-declarator-list ;
-	typealias declaration-specifiers abstract-declarator-list type-assignment-operator 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 ;