ANTLR code cleanup

Author: hazzik

src/NHibernate/Hql/Ast/ANTLR/Exec/AbstractStatementExecutor.cs

@@ -63,22 +63,9 @@ protected SqlString GenerateIdInsertSelect(IQueryable persister, string tableAli
 
 			string rootTableName = persister.TableName;
 			SqlString fromJoinFragment = persister.FromJoinFragment(tableAlias, true, false);
-			SqlString whereJoinFragment = persister.WhereJoinFragment(tableAlias, true, false);
-
-			select.SetFromClause(rootTableName + ' ' + tableAlias + fromJoinFragment);
-
-			if (whereJoinFragment == null)
-			{
-				whereJoinFragment = SqlString.Empty;
-			}
-			else
-			{
-				whereJoinFragment = whereJoinFragment.Trim();
-				if (whereJoinFragment.StartsWithCaseInsensitive("and "))
-				{
-					whereJoinFragment = whereJoinFragment.Substring(4);
-				}
-			}
+			select.SetFromClause(rootTableName + " " + tableAlias + fromJoinFragment);
+			
+			var whereJoinFragment = GetWhereJoinFragment(persister, tableAlias);
 
 			SqlString userWhereClause = SqlString.Empty;
 			if (whereClause.ChildCount != 0)
@@ -114,6 +101,24 @@ protected SqlString GenerateIdInsertSelect(IQueryable persister, string tableAli
 			return insert.ToSqlString();
 		}
 
+		private static SqlString GetWhereJoinFragment(IJoinable persister, string tableAlias)
+		{
+			SqlString whereJoinFragment = persister.WhereJoinFragment(tableAlias, true, false);
+			if (whereJoinFragment == null)
+			{
+				whereJoinFragment = SqlString.Empty;
+			}
+			else
+			{
+				whereJoinFragment = whereJoinFragment.Trim();
+				if (whereJoinFragment.StartsWithCaseInsensitive("and "))
+				{
+					whereJoinFragment = whereJoinFragment.Substring(4);
+				}
+			}
+			return whereJoinFragment;
+		}
+
 		protected string GenerateIdSubselect(IQueryable persister)
 		{
 			return "select " + StringHelper.Join(", ", persister.IdentifierColumnNames) + " from " + persister.TemporaryIdTableName;

src/NHibernate/Hql/Ast/ANTLR/Tree/AbstractNullnessCheckNode.cs

@@ -96,13 +96,18 @@ private void MutateRowValueConstructorSyntax(int operandColumnSpan)
 		private static IType ExtractDataType(IASTNode operand) 
 		{
 			IType type = null;
-			if ( operand is SqlNode ) 
+			var sqlNode = operand as SqlNode;
+			if ( sqlNode != null ) 
 			{
-				type = ( ( SqlNode ) operand ).DataType;
+				type = sqlNode.DataType;
 			}
-			if ( type == null && operand is IExpectedTypeAwareNode )
+			if (type == null)
 			{
-				type = ( ( IExpectedTypeAwareNode ) operand ).ExpectedType;
+				var expectedTypeAwareNode = operand as IExpectedTypeAwareNode;
+				if (expectedTypeAwareNode != null)
+				{
+					type = expectedTypeAwareNode.ExpectedType;
+				}
 			}
 			return type;
 		}

src/NHibernate/Hql/Ast/ANTLR/Tree/CaseNode.cs

@@ -29,18 +29,24 @@ public override IType  DataType
 					{
 						// WHEN Child(0) THEN Child(1)
 						IASTNode thenClause = whenOrElseClause.GetChild(1);
-						if (thenClause is ISelectExpression && !(thenClause is ParameterNode))
+						if (thenClause is ISelectExpression)
 						{
-							return (thenClause as ISelectExpression).DataType;
+							if (!(thenClause is ParameterNode))
+							{
+								return (thenClause as ISelectExpression).DataType;
+							}
 						}
 					}
 					else if (whenOrElseClause.Type == HqlParser.ELSE)
 					{
 						// ELSE Child(0)
 						IASTNode elseClause = whenOrElseClause.GetChild(0);
-                        if (elseClause is ISelectExpression && !(elseClause is ParameterNode))
+						if (elseClause is ISelectExpression)
 						{
-							return (elseClause as ISelectExpression).DataType;
+							if (!(elseClause is ParameterNode))
+							{
+								return (elseClause as ISelectExpression).DataType;
+							}
 						}
 					}
 					else

src/NHibernate/Hql/Ast/ANTLR/Tree/FromClause.cs

@@ -164,7 +164,7 @@ public FromElement AddFromElement(string path, IASTNode alias)
 			// The path may be a reference to an alias defined in the parent query.
 			string classAlias = ( alias == null ) ? null : alias.Text;
 			CheckForDuplicateClassAlias( classAlias );
-			FromElementFactory factory = new FromElementFactory(this, null, path, classAlias, null, false);
+			var factory = new FromElementFactory(this, null, path, classAlias, null, false);
 			return factory.AddFromElement();
 		}
 
@@ -284,7 +284,7 @@ private static bool ProjectionListPredicate(IASTNode node)
 
 		private static bool FromElementPredicate(IASTNode node) 
 		{
-			FromElement fromElement = node as FromElement;
+			var fromElement = node as FromElement;
 
 			if (fromElement != null)
 			{
@@ -296,7 +296,7 @@ private static bool FromElementPredicate(IASTNode node)
 
 		static bool ExplicitFromPredicate(IASTNode node)
 		{
-			FromElement fromElement = node as FromElement;
+			var fromElement = node as FromElement;
 
 			if (fromElement != null)
 			{
@@ -308,7 +308,7 @@ static bool ExplicitFromPredicate(IASTNode node)
 
 		private static bool CollectionFetchPredicate(IASTNode node)
 		{
-			FromElement fromElement = node as FromElement;
+			var fromElement = node as FromElement;
 
 			if (fromElement != null)
 			{
@@ -323,7 +323,7 @@ private FromElement FindIntendedAliasedFromElementBasedOnCrazyJPARequirements(st
 			foreach (var entry in _fromElementByClassAlias)
 			{
 				string alias = entry.Key;
-				if (alias.ToLowerInvariant() == specifiedAlias.ToLowerInvariant())
+				if (string.Equals(alias, specifiedAlias, StringComparison.InvariantCultureIgnoreCase))
 				{
 					return entry.Value;
 				}

src/NHibernate/Hql/Ast/ANTLR/Tree/FromElementType.cs

@@ -36,10 +36,9 @@ public FromElementType(FromElement fromElement, IEntityPersister persister, Enti
 			_persister = persister;
 			_entityType = entityType;
 
-			if (persister != null)
-			{
-				fromElement.Text = ((IQueryable)persister).TableName + " " + TableAlias;
-			}
+			var queryable = persister as IQueryable;
+			if (queryable != null)
+				fromElement.Text = queryable.TableName + " " + fromElement.TableAlias;
 		}
 
 		protected FromElementType(FromElement fromElement)
@@ -111,22 +110,19 @@ public JoinSequence JoinSequence
 		{
 			get
 			{
-				if ( _joinSequence != null ) 
+				if (_joinSequence != null)
 				{
 					return _joinSequence;
 				}
 
 				// Class names in the FROM clause result in a JoinSequence (the old FromParser does this).
-				if ( _persister is IJoinable ) 
-				{
-					IJoinable joinable = ( IJoinable ) _persister;
-					return _fromElement.SessionFactoryHelper.CreateJoinSequence().SetRoot(joinable, TableAlias );
-				}
-				else 
+				var joinable = _persister as IJoinable;
+				if (joinable != null)
 				{
-					return null;	// TODO: Should this really return null?  If not, figure out something better to do here.
+					return _fromElement.SessionFactoryHelper.CreateJoinSequence().SetRoot(joinable, TableAlias);
 				}
 
+				return null; // TODO: Should this really return null?  If not, figure out something better to do here.
 			}
 			set { _joinSequence = value; }
 		}
@@ -144,11 +140,14 @@ public string RenderIdentifierSelect(int size, int k)
 			// Render the identifier select fragment using the table alias.
 			if (_fromElement.FromClause.IsSubQuery)
 			{
+				var queryable = Queryable;
+				if (queryable == null)
+					return string.Empty;
+
 				// TODO: Replace this with a more elegant solution.
-				string[] idColumnNames = (_persister != null) ?
-						((IQueryable)_persister).IdentifierColumnNames : new String[0];
+				string[] idColumnNames = queryable.IdentifierColumnNames;
 
-				StringBuilder buf = new StringBuilder();
+				var buf = new StringBuilder();
 				for (int i = 0; i < idColumnNames.Length; i++)
 				{
 					buf.Append(_fromElement.TableAlias).Append('.').Append(idColumnNames[i]);
@@ -158,11 +157,11 @@ public string RenderIdentifierSelect(int size, int k)
 			}
 			else
 			{
-				if (_persister == null)
-				{
+				var queryable = Queryable;
+				if (queryable == null)
 					throw new QueryException("not an entity");
-				}
-				string fragment = ((IQueryable)_persister).IdentifierSelectFragment(TableAlias, GetSuffix(size, k));
+				
+				string fragment = queryable.IdentifierSelectFragment(TableAlias, GetSuffix(size, k));
 				return TrimLeadingCommaAndSpaces(fragment);
 			}
 		}
@@ -202,53 +201,37 @@ public string RenderPropertySelect(int size, int k, bool allProperties)
 		{
 			CheckInitialized();
 
-			if (_persister == null)
-			{
+			var queryable = Queryable;
+			if (queryable == null)
 				return "";
-			}
-			else
-			{
-				string fragment = ((IQueryable)_persister).PropertySelectFragment(
-						TableAlias,
-						GetSuffix(size, k),
-						allProperties
-					);
-				return TrimLeadingCommaAndSpaces(fragment);
-			}
+
+			string fragment = queryable.PropertySelectFragment(TableAlias, GetSuffix(size, k), allProperties);
+
+			return TrimLeadingCommaAndSpaces(fragment);
 		}
 
 		public string RenderCollectionSelectFragment(int size, int k)
 		{
 			if (_queryableCollection == null)
-			{
 				return "";
-			}
-			else
-			{
-				if (_collectionSuffix == null)
-				{
-					_collectionSuffix = GenerateSuffix(size, k);
-				}
-				string fragment = _queryableCollection.SelectFragment(CollectionTableAlias, _collectionSuffix);
-				return TrimLeadingCommaAndSpaces(fragment);
-			}
+
+			if (_collectionSuffix == null)
+				_collectionSuffix = GenerateSuffix(size, k);
+
+			string fragment = _queryableCollection.SelectFragment(CollectionTableAlias, _collectionSuffix);
+			return TrimLeadingCommaAndSpaces(fragment);
 		}
 
 		public string RenderValueCollectionSelectFragment(int size, int k)
 		{
 			if (_queryableCollection == null)
-			{
 				return "";
-			}
-			else
-			{
-				if (_collectionSuffix == null)
-				{
-					_collectionSuffix = GenerateSuffix(size, k);
-				}
-				string fragment = _queryableCollection.SelectFragment(TableAlias, _collectionSuffix);
-				return TrimLeadingCommaAndSpaces(fragment);
-			}
+
+			if (_collectionSuffix == null)
+				_collectionSuffix = GenerateSuffix(size, k);
+
+			string fragment = _queryableCollection.SelectFragment(TableAlias, _collectionSuffix);
+			return TrimLeadingCommaAndSpaces(fragment);
 		}
 
 		public bool IsEntity
@@ -258,23 +241,15 @@ public bool IsEntity
 
 		public bool IsCollectionOfValuesOrComponents
 		{
-			get 
+			get
 			{
-				if (_persister == null)
-				{
-					if (_queryableCollection == null)
-					{
-						return false;
-					}
-					else
-					{
-						return !_queryableCollection.ElementType.IsEntityType;
-					}
-				}
-				else
-				{
+				if (_persister != null)
 					return false;
-				}
+
+				if (_queryableCollection == null)
+					return false;
+				
+				return !_queryableCollection.ElementType.IsEntityType;
 			}
 		}
 
@@ -361,7 +336,7 @@ public string[] ToColumns(string tableAlias, string path, bool inSelect)
 		/// </summary>
 		public IQueryable Queryable
 		{
-			get { return (_persister is IQueryable) ? (IQueryable) _persister : null; }
+			get { return _persister as IQueryable; }
 		}
 
 		public virtual IQueryableCollection QueryableCollection
@@ -379,7 +354,6 @@ public virtual IQueryableCollection QueryableCollection
 					// For many-to-many joins, use the tablename from the queryable collection for the default text.
 					_fromElement.Text = _queryableCollection.TableName + " " + TableAlias;
 				}
-				
 			}
 		}
 
@@ -481,7 +455,7 @@ private bool IsCorrelation
 			{
 				FromClause top = _fromElement.Walker.GetFinalFromClause();
 				return _fromElement.FromClause != _fromElement.Walker.CurrentFromClause &&
-				       _fromElement.FromClause == top;
+					   _fromElement.FromClause == top;
 			}
 		}
 
@@ -491,7 +465,7 @@ private bool IsMultiTable
 			{
 				// should be safe to only ever expect EntityPersister references here
 				return _fromElement.Queryable != null &&
-				       _fromElement.Queryable.IsMultiTable;
+					   _fromElement.Queryable.IsMultiTable;
 			}
 		}
 
@@ -516,6 +490,5 @@ private static string TrimLeadingCommaAndSpaces(String fragment)
 			fragment = fragment.Trim();
 			return fragment.Trim();
 		}
-
 	}
 }

src/NHibernate/Hql/Ast/ANTLR/Tree/FromReferenceNode.cs

@@ -85,12 +85,7 @@ public void RecursiveResolve(int level, bool impliedAtRoot, string classAlias, I
 			}
 
 			ResolveFirstChild();
-			bool impliedJoin = true;
-
-			if ( level == RootLevel && !impliedAtRoot ) 
-			{
-				impliedJoin = false;
-			}
+			bool impliedJoin = !(level == RootLevel && !impliedAtRoot);
 
 			Resolve( true, impliedJoin, classAlias, parent );
 		}