X-Git-Url: http://git.efficios.com/?p=ctf.git;a=blobdiff_plain;f=common-trace-format-proposal.txt;h=ff48de91266ad3029be23003f4f7216e91bf18d1;hp=e10c3dcc271f3e88ecf92ba5dfea00b3aefbbbe7;hb=73d61ac34ca7bcfab6935b041aa52da3d73907b0;hpb=1ab22b2a8ccbc0766c46f4d5a5a15931644c3caa

diff --git a/common-trace-format-proposal.txt b/common-trace-format-proposal.txt
index e10c3dc..ff48de9 100644
--- a/common-trace-format-proposal.txt
+++ b/common-trace-format-proposal.txt
@@ -1392,11 +1392,8 @@ assignment-operator:
 type-assignment-operator:
 	:=
 
-constant-expression:
-	unary-expression
-
 constant-expression-range:
-	constant-expression ... constant-expression
+	unary-expression ... unary-expression
 
 2.2) Declarations:
 
@@ -1440,7 +1437,7 @@ type-specifier:
 	ctf-type-specifier
 
 align-attribute:
-	align ( constant-expression )
+	align ( unary-expression )
 
 struct-specifier:
 	struct identifier-opt { struct-or-variant-declaration-list-opt } align-attribute-opt
@@ -1466,7 +1463,7 @@ struct-or-variant-declarator-list:
 
 struct-or-variant-declarator:
 	declarator
-	declarator-opt : constant-expression
+	declarator-opt : unary-expression
 
 variant-specifier:
 	variant identifier-opt variant-tag-opt { struct-or-variant-declaration-list }
@@ -1488,7 +1485,7 @@ enumerator-list:
 
 enumerator:
 	enumeration-constant
-	enumeration-constant = constant-expression
+	enumeration-constant = unary-expression
 	enumeration-constant = constant-expression-range
 
 type-qualifier:
@@ -1501,7 +1498,6 @@ direct-declarator:
 	identifier
 	( declarator )
 	direct-declarator [ unary-expression ]
-	direct-declarator [ constant-expression ]
 
 abstract-declarator:
 	pointer-opt direct-abstract-declarator
@@ -1510,7 +1506,6 @@ direct-abstract-declarator:
 	identifier-opt
 	( abstract-declarator )
 	direct-abstract-declarator [ unary-expression ]
-	direct-abstract-declarator [ constant-expression ]
 	direct-abstract-declarator [ ]
 
 pointer: