From fd0cf968e7481fc28686ea1e155b51d8b5ad16e3 Mon Sep 17 00:00:00 2001
From: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de>
Date: Thu, 13 Aug 2015 11:22:32 +0200
Subject: [PATCH] =?UTF-8?q?[263773]=20Removed=20unused=20rule=20from=20Xte?=
 =?UTF-8?q?xt.xtext,=20made=20guards=20=E2=80=98usual=E2=80=99=20expressio?=
 =?UTF-8?q?n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/org/eclipse/xtext/Xtext.xtext                | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

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  
 ;