Revert "Added support for deprecated and packed field options" This reverts commit 52e1a837ec914e008b882ad6d67c1cb17fd22c2a.
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 90e1061..a2e91e7 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
@@ -60,7 +60,7 @@ Group: modifier=Modifier 'group' name=Name '=' index=(LONG | HEX) - ('[' (fieldOptions+=BoolOrValueFieldOption (',' fieldOptions+=BoolOrValueFieldOption)*) ']')? '{' + ('[' (fieldOptions+=FieldOption (',' fieldOptions+=FieldOption)*) ']')? '{' elements+=GroupElement* '}' (';')?; @@ -72,7 +72,7 @@ MessageField: =>modifier=Modifier type=TypeLink name=Name '=' index=(LONG | HEX) - ('[' (fieldOptions+=BoolOrValueFieldOption (',' fieldOptions+=BoolOrValueFieldOption)*)? ']')? (';')+; + ('[' (fieldOptions+=FieldOption (',' fieldOptions+=FieldOption)*)? ']')? (';')+; enum Modifier: required | optional | repeated; @@ -100,7 +100,7 @@ Literal: name=Name '=' index=(LONG | HEX) - ('[' fieldOptions+=BoolOrValueFieldOption (',' fieldOptions+=BoolOrValueFieldOption)* ']')? (';')+; + ('[' fieldOptions+=FieldOption (',' fieldOptions+=FieldOption)* ']')? (';')+; terminal HEX returns ecore::ELong: ('-')? '0x' (NUMBER | 'a'..'f' | 'A'..'F')+; @@ -156,10 +156,7 @@ CustomOption: 'option' '(' source=OptionSource ')' ('.' fields+=OptionField ('.' fields+=OptionField)*)? '=' value=Value (';')+; - -BoolOrValueFieldOption: - FieldOption | DeprecatedFieldOption | PackedFieldOption; - + FieldOption: DefaultValueFieldOption | NativeFieldOption | CustomFieldOption; @@ -173,12 +170,6 @@ '(' source=OptionSource ')' ('.' fields+=OptionField ('.' fields+=OptionField)*)? '=' value=Value; -DeprecatedFieldOption: - 'deprecated' '=' value=BOOL; - -PackedFieldOption: - 'packed' '=' value=BOOL; - OptionSource: target=[IndexedElement|QualifiedName];