commit 114f404b76a5705f12d0711485bdb4fccd0a14c2
author Alex Ruiz <alruiz@google.com> Mon Aug 08 06:25:43 2011 -0700
committer Alex Ruiz <alruiz@google.com> Mon Aug 08 06:25:43 2011 -0700
tree ae159e8556ae29f0330cc9a623c6214722033ba1
parent 693f6ab4b8b9444ce58a2aa680bf3c3a507a4160

Fixed: [Issue 92] Enum Value Options result in a syntax error.

Added support for field options to enum literals.

com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/Protobuf.xtext

diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/Protobuf.xtext b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/Protobuf.xtext
index e5f7485..8386c6d 100644
--- a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/Protobuf.xtext
+++ b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/Protobuf.xtext
@@ -83,15 +83,6 @@
   modifier=Modifier type=AbstractTypeRef name=Name '=' index=(INT | HEX)
   ('[' fieldOptions+=FieldOption (',' fieldOptions+=FieldOption)* ']')? ';';
 
-FieldOption:
-  BuiltInFieldOption | CustomFieldOption;
-
-BuiltInFieldOption:
-  name=Name '=' value=ValueRef;
-
-CustomFieldOption:
-  '(' name=QualifiedName ')' '=' value=ValueRef;
-
 enum Modifier:
   required
   | optional
@@ -180,7 +171,17 @@
   Option | Literal;
 
 Literal:
-  name=Name '=' index=(INT | HEX) ';';
+  name=Name '=' index=(INT | HEX) 
+  ('[' fieldOptions+=FieldOption (',' fieldOptions+=FieldOption)* ']')? ';';
+
+FieldOption:
+  BuiltInFieldOption | CustomFieldOption;
+
+BuiltInFieldOption:
+  name=Name '=' value=ValueRef;
+
+CustomFieldOption:
+  '(' name=QualifiedName ')' '=' value=ValueRef;
 
 terminal HEX returns ecore::EInt:
   '0x' (NUMBER | 'a'..'f' | 'A'..'F')+;