regenerate the grammer based on the new version of Antlr

Author: amroel

src/NHibernate/Hql/Ast/ANTLR/Generated/HqlLexer.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// $ANTLR 3.5.0.2 Hql.g 2014-08-03 19:45:41
+// $ANTLR 3.5.0.2 Hql.g 2014-08-11 17:12:33
 
 // The variable 'variable' is assigned but its value is never used.
 #pragma warning disable 219

src/NHibernate/Hql/Ast/ANTLR/Generated/HqlParser.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// $ANTLR 3.5.0.2 Hql.g 2014-08-03 19:45:40
+// $ANTLR 3.5.0.2 Hql.g 2014-08-11 17:12:33
 
 // The variable 'variable' is assigned but its value is never used.
 #pragma warning disable 219

src/NHibernate/Hql/Ast/ANTLR/SqlGenerator.cs

@@ -346,23 +346,23 @@ private SqlString GetSqlStringWithLimitsIfNeeded(QueryWriter queryWriter)
 			// The dialect can move the given parameters where he need, what it can't do is generates new parameters, losing the BackTrack.
 			var dialect = sessionFactory.Dialect;
 			return dialect.GetLimitString(queryWriter.ToSqlString(),
-			                              queryWriter.Skip.HasValue
-				                              ? (int?) dialect.GetOffsetValue(queryWriter.Skip.Value)
-				                              : null,
-			                              queryWriter.Take.HasValue
-				                              ? (int?) dialect.GetLimitValue(queryWriter.Skip ?? 0, queryWriter.Take.Value)
-				                              : null,
-			                              skipParameter,
-			                              takeParameter);
+										  queryWriter.Skip.HasValue
+											  ? (int?)dialect.GetOffsetValue(queryWriter.Skip.Value)
+											  : null,
+										  queryWriter.Take.HasValue
+											  ? (int?)dialect.GetLimitValue(queryWriter.Skip ?? 0, queryWriter.Take.Value)
+											  : null,
+										  skipParameter,
+										  takeParameter);
 		}
 
 		private void Skip(IASTNode node)
 		{
-			var queryWriter = (QueryWriter) writer;
+			var queryWriter = (QueryWriter)writer;
 			var pnode = node as ParameterNode;
 			if (pnode != null)
 			{
-				queryWriter.SkipParameter = (IPageableParameterSpecification) pnode.HqlParameterSpecification;
+				queryWriter.SkipParameter = (IPageableParameterSpecification)pnode.HqlParameterSpecification;
 				collectedParameters.Add(pnode.HqlParameterSpecification);
 				return;
 			}
@@ -371,11 +371,11 @@ private void Skip(IASTNode node)
 
 		private void Take(IASTNode node)
 		{
-			var queryWriter = (QueryWriter) writer;
+			var queryWriter = (QueryWriter)writer;
 			var pnode = node as ParameterNode;
 			if (pnode != null)
 			{
-				queryWriter.TakeParameter = (IPageableParameterSpecification) pnode.HqlParameterSpecification;
+				queryWriter.TakeParameter = (IPageableParameterSpecification)pnode.HqlParameterSpecification;
 				collectedParameters.Add(pnode.HqlParameterSpecification);
 				return;
 			}
@@ -389,7 +389,7 @@ private void BeginBitwiseOp(string op)
 				return;
 
 			outputStack.Insert(0, writer);
-			writer = new BitwiseOperation();
+			writer = new BitwiseOpWriter();
 		}
 
 		private void EndBitwiseOp(string op)
@@ -398,9 +398,10 @@ private void EndBitwiseOp(string op)
 			if (function == null)
 				return;
 
-			var functionArguments = (BitwiseOperation)writer;
+			var functionArguments = (BitwiseOpWriter)writer;
 			writer = outputStack[0];
 			outputStack.RemoveAt(0);
+
 			Out(function.Render(functionArguments.Args, sessionFactory));
 		}
 
@@ -557,9 +558,31 @@ public void CommaBetweenParameters(string comma)
 
 		#endregion
 
+		#region Nested type: ISqlWriter
+
+		/// <summary>
+		/// Writes SQL fragments.
+		/// </summary>
+		private interface ISqlWriter
+		{
+			void Clause(string clause);
+			void Clause(SqlString clause);
+			void PushParameter(Parameter parameter);
+			/**
+			 * todo remove this hack
+			 * The parameter is either ", " or " , ". This is needed to pass sql generating tests as the old
+			 * sql generator uses " , " in the WHERE and ", " in SELECT.
+			 *
+			 * @param comma either " , " or ", "
+			 */
+			void CommaBetweenParameters(string comma);
+		}
+
+		#endregion
+
 		#region Nested type: BitwiseOperation
 
-		private class BitwiseOperation : ISqlWriter
+		private class BitwiseOpWriter : ISqlWriter
 		{
 			private readonly List<SqlString> _args = new List<SqlString>();
 
@@ -593,27 +616,5 @@ public IList Args
 		}
 
 		#endregion
-
-		#region Nested type: ISqlWriter
-
-		/// <summary>
-		/// Writes SQL fragments.
-		/// </summary>
-		private interface ISqlWriter
-		{
-			void Clause(string clause);
-			void Clause(SqlString clause);
-			void PushParameter(Parameter parameter);
-			/**
-			 * todo remove this hack
-			 * The parameter is either ", " or " , ". This is needed to pass sql generating tests as the old
-			 * sql generator uses " , " in the WHERE and ", " in SELECT.
-			 *
-			 * @param comma either " , " or ", "
-			 */
-			void CommaBetweenParameters(string comma);
-		}
-
-		#endregion
 	}
 }