diff --git a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/Xtext.xtext b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/Xtext.xtext index 22437b58d..22989a4e1 100644 --- a/plugins/org.eclipse.xtext/src/org/eclipse/xtext/Xtext.xtext +++ b/plugins/org.eclipse.xtext/src/org/eclipse/xtext/Xtext.xtext @@ -116,11 +116,7 @@ RuleCall : NamedArgument: ( parameter=[Parameter|ID] calledByName?= '=')? - ( value=ConditionOrLiteral ) -; - -ConditionOrLiteral returns Condition: - LiteralCondition | Disjunction + ( value=Disjunction ) ; LiteralCondition: @@ -140,7 +136,7 @@ Negation returns Condition: ; Atom returns Condition: - ParameterReference | ParenthesizedCondition + ParameterReference | ParenthesizedCondition | LiteralCondition ; ParenthesizedCondition returns Condition: @@ -163,10 +159,6 @@ ValidID returns ecore::EString: ID | 'true' | 'false' ; -Boolean returns ecore::EBoolean: - 'true' | 'false' -; - PredicatedKeyword returns Keyword: (predicated?='=>' | firstSetPredicated?='->') value=STRING ;