[Nhibernate-commit] SF.net SVN: nhibernate:[5345] trunk/nhibernate

[<pa...@us...>]

Revision: 5345
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5345&view=rev
Author:   patearl
Date:     2011-01-13 17:55:17 +0000 (Thu, 13 Jan 2011)

Log Message:
-----------
Added Antlr tool to regenerate lexer and parser from grammar.
Regenerated from Hql.g with no other changes to clean up path to grammar file.

Modified Paths:
--------------
    trunk/nhibernate/ShowBuildMenu.bat
    trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlLexer.cs
    trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlParser.cs

Added Paths:
-----------
    trunk/nhibernate/Tools/Antlr/
    trunk/nhibernate/Tools/Antlr/AntlrHql.bat
    trunk/nhibernate/Tools/Antlr/antlr-3.2.jar

Modified: trunk/nhibernate/ShowBuildMenu.bat
===================================================================
--- trunk/nhibernate/ShowBuildMenu.bat	2011-01-13 01:12:33 UTC (rev 5344)
+++ trunk/nhibernate/ShowBuildMenu.bat	2011-01-13 17:55:17 UTC (rev 5345)
@@ -1,6 +1,5 @@
 @echo off
-set OLD_CD=%CD%
-cd %~dp0
+pushd %~dp0
 
 set NANT=Tools\nant\bin\NAnt.exe -t:net-3.5
 
@@ -16,15 +15,17 @@
 echo E.  Build NHibernate (Debug)
 echo F.  Build NHibernate (Release)
 echo G.  Build Release Package (Also runs tests and creates documentation)
+echo H.  Run Antlr on Hql.g to regenerate HqlParser.cs and HqlLexer.cs.
 echo.
 
 if exist %SYSTEMROOT%\System32\choice.exe ( goto prompt-choice )
 goto prompt-set
 
 :prompt-choice
-choice /C:abcdefg
+choice /C:abcdefgh
 
 if errorlevel 255 goto end
+if errorlevel 8 goto antlr-hql
 if errorlevel 7 goto build-release-package
 if errorlevel 6 goto build-release
 if errorlevel 5 goto build-debug
@@ -35,7 +36,7 @@
 if errorlevel 0 goto end
 
 :prompt-set
-set /p OPT=[A, B, C, D, E, F, G]? 
+set /p OPT=[A, B, C, D, E, F, G, H]? 
 
 if /I "%OPT%"=="A" goto build-visual-studio
 if /I "%OPT%"=="B" goto help-test-setup
@@ -44,6 +45,7 @@
 if /I "%OPT%"=="E" goto build-debug
 if /I "%OPT%"=="F" goto build-release
 if /I "%OPT%"=="G" goto build-release-package
+if /I "%OPT%"=="H" goto antlr-hql
 goto prompt-set
 
 :help-test-setup
@@ -105,6 +107,11 @@
 %NANT% test
 goto end
 
+:antlr-hql
+rem NANT is 32-bit and refuses to run 64-bit Java, so we just use a batch file instead. :(
+call Tools\Antlr\AntlrHql.bat
+goto end
+
 :end
-cd %OLD_CD%
+popd
 pause


Property changes on: trunk/nhibernate/Tools/Antlr
___________________________________________________________________
Added: bugtraq:url
   + http://jira.nhibernate.org/browse/%BUGID%
Added: bugtraq:logregex
   + NH-\d+


Added: trunk/nhibernate/Tools/Antlr/AntlrHql.bat
===================================================================
--- trunk/nhibernate/Tools/Antlr/AntlrHql.bat	                        (rev 0)
+++ trunk/nhibernate/Tools/Antlr/AntlrHql.bat	2011-01-13 17:55:17 UTC (rev 5345)
@@ -0,0 +1,4 @@
+@echo off
+pushd %~dp0\..\..\src\NHibernate\Hql\Ast\ANTLR
+java.exe -cp ..\..\..\..\..\Tools\Antlr\antlr-3.2.jar org.antlr.Tool -o Generated Hql.g
+popd
\ No newline at end of file

Added: trunk/nhibernate/Tools/Antlr/antlr-3.2.jar
===================================================================
(Binary files differ)


Property changes on: trunk/nhibernate/Tools/Antlr/antlr-3.2.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlLexer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlLexer.cs	2011-01-13 01:12:33 UTC (rev 5344)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlLexer.cs	2011-01-13 17:55:17 UTC (rev 5345)
@@ -1,4 +1,4 @@
-// $ANTLR 3.2 Sep 23, 2009 12:02:23 C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g 2010-05-01 20:41:02
+// $ANTLR 3.2 Sep 23, 2009 12:02:23 Hql.g 2011-01-13 10:47:55
 
 // The variable 'variable' is assigned but its value is never used.
 #pragma warning disable 168, 219
@@ -166,7 +166,7 @@
     
     override public string GrammarFileName
     {
-    	get { return "C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g";} 
+    	get { return "Hql.g";} 
     }
 
     // $ANTLR start "ALL"
@@ -176,8 +176,8 @@
     		{
             int _type = ALL;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:9:5: ( 'all' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:9:7: 'all'
+            // Hql.g:9:5: ( 'all' )
+            // Hql.g:9:7: 'all'
             {
             	Match("all"); if (state.failed) return ;
 
@@ -200,8 +200,8 @@
     		{
             int _type = ANY;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:10:5: ( 'any' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:10:7: 'any'
+            // Hql.g:10:5: ( 'any' )
+            // Hql.g:10:7: 'any'
             {
             	Match("any"); if (state.failed) return ;
 
@@ -224,8 +224,8 @@
     		{
             int _type = AND;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:11:5: ( 'and' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:11:7: 'and'
+            // Hql.g:11:5: ( 'and' )
+            // Hql.g:11:7: 'and'
             {
             	Match("and"); if (state.failed) return ;
 
@@ -248,8 +248,8 @@
     		{
             int _type = AS;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:12:4: ( 'as' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:12:6: 'as'
+            // Hql.g:12:4: ( 'as' )
+            // Hql.g:12:6: 'as'
             {
             	Match("as"); if (state.failed) return ;
 
@@ -272,8 +272,8 @@
     		{
             int _type = ASCENDING;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:13:11: ( 'asc' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:13:13: 'asc'
+            // Hql.g:13:11: ( 'asc' )
+            // Hql.g:13:13: 'asc'
             {
             	Match("asc"); if (state.failed) return ;
 
@@ -296,8 +296,8 @@
     		{
             int _type = AVG;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:14:5: ( 'avg' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:14:7: 'avg'
+            // Hql.g:14:5: ( 'avg' )
+            // Hql.g:14:7: 'avg'
             {
             	Match("avg"); if (state.failed) return ;
 
@@ -320,8 +320,8 @@
     		{
             int _type = BETWEEN;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:15:9: ( 'between' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:15:11: 'between'
+            // Hql.g:15:9: ( 'between' )
+            // Hql.g:15:11: 'between'
             {
             	Match("between"); if (state.failed) return ;
 
@@ -344,8 +344,8 @@
     		{
             int _type = CLASS;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:16:7: ( 'class' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:16:9: 'class'
+            // Hql.g:16:7: ( 'class' )
+            // Hql.g:16:9: 'class'
             {
             	Match("class"); if (state.failed) return ;
 
@@ -368,8 +368,8 @@
     		{
             int _type = COUNT;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:17:7: ( 'count' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:17:9: 'count'
+            // Hql.g:17:7: ( 'count' )
+            // Hql.g:17:9: 'count'
             {
             	Match("count"); if (state.failed) return ;
 
@@ -392,8 +392,8 @@
     		{
             int _type = DELETE;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:18:8: ( 'delete' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:18:10: 'delete'
+            // Hql.g:18:8: ( 'delete' )
+            // Hql.g:18:10: 'delete'
             {
             	Match("delete"); if (state.failed) return ;
 
@@ -416,8 +416,8 @@
     		{
             int _type = DESCENDING;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:19:12: ( 'desc' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:19:14: 'desc'
+            // Hql.g:19:12: ( 'desc' )
+            // Hql.g:19:14: 'desc'
             {
             	Match("desc"); if (state.failed) return ;
 
@@ -440,8 +440,8 @@
     		{
             int _type = DISTINCT;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:20:10: ( 'distinct' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:20:12: 'distinct'
+            // Hql.g:20:10: ( 'distinct' )
+            // Hql.g:20:12: 'distinct'
             {
             	Match("distinct"); if (state.failed) return ;
 
@@ -464,8 +464,8 @@
     		{
             int _type = ELEMENTS;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:21:10: ( 'elements' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:21:12: 'elements'
+            // Hql.g:21:10: ( 'elements' )
+            // Hql.g:21:12: 'elements'
             {
             	Match("elements"); if (state.failed) return ;
 
@@ -488,8 +488,8 @@
     		{
             int _type = ESCAPE;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:22:8: ( 'escape' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:22:10: 'escape'
+            // Hql.g:22:8: ( 'escape' )
+            // Hql.g:22:10: 'escape'
             {
             	Match("escape"); if (state.failed) return ;
 
@@ -512,8 +512,8 @@
     		{
             int _type = EXISTS;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:23:8: ( 'exists' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:23:10: 'exists'
+            // Hql.g:23:8: ( 'exists' )
+            // Hql.g:23:10: 'exists'
             {
             	Match("exists"); if (state.failed) return ;
 
@@ -536,8 +536,8 @@
     		{
             int _type = FALSE;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:24:7: ( 'false' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:24:9: 'false'
+            // Hql.g:24:7: ( 'false' )
+            // Hql.g:24:9: 'false'
             {
             	Match("false"); if (state.failed) return ;
 
@@ -560,8 +560,8 @@
     		{
             int _type = FETCH;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:25:7: ( 'fetch' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:25:9: 'fetch'
+            // Hql.g:25:7: ( 'fetch' )
+            // Hql.g:25:9: 'fetch'
             {
             	Match("fetch"); if (state.failed) return ;
 
@@ -584,8 +584,8 @@
     		{
             int _type = FROM;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:26:6: ( 'from' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:26:8: 'from'
+            // Hql.g:26:6: ( 'from' )
+            // Hql.g:26:8: 'from'
             {
             	Match("from"); if (state.failed) return ;
 
@@ -608,8 +608,8 @@
     		{
             int _type = FULL;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:27:6: ( 'full' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:27:8: 'full'
+            // Hql.g:27:6: ( 'full' )
+            // Hql.g:27:8: 'full'
             {
             	Match("full"); if (state.failed) return ;
 
@@ -632,8 +632,8 @@
     		{
             int _type = GROUP;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:28:7: ( 'group' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:28:9: 'group'
+            // Hql.g:28:7: ( 'group' )
+            // Hql.g:28:9: 'group'
             {
             	Match("group"); if (state.failed) return ;
 
@@ -656,8 +656,8 @@
     		{
             int _type = HAVING;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:29:8: ( 'having' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:29:10: 'having'
+            // Hql.g:29:8: ( 'having' )
+            // Hql.g:29:10: 'having'
             {
             	Match("having"); if (state.failed) return ;
 
@@ -680,8 +680,8 @@
     		{
             int _type = IN;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:30:4: ( 'in' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:30:6: 'in'
+            // Hql.g:30:4: ( 'in' )
+            // Hql.g:30:6: 'in'
             {
             	Match("in"); if (state.failed) return ;
 
@@ -704,8 +704,8 @@
     		{
             int _type = INDICES;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:31:9: ( 'indices' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:31:11: 'indices'
+            // Hql.g:31:9: ( 'indices' )
+            // Hql.g:31:11: 'indices'
             {
             	Match("indices"); if (state.failed) return ;
 
@@ -728,8 +728,8 @@
     		{
             int _type = INNER;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:32:7: ( 'inner' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:32:9: 'inner'
+            // Hql.g:32:7: ( 'inner' )
+            // Hql.g:32:9: 'inner'
             {
             	Match("inner"); if (state.failed) return ;
 
@@ -752,8 +752,8 @@
     		{
             int _type = INSERT;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:33:8: ( 'insert' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:33:10: 'insert'
+            // Hql.g:33:8: ( 'insert' )
+            // Hql.g:33:10: 'insert'
             {
             	Match("insert"); if (state.failed) return ;
 
@@ -776,8 +776,8 @@
     		{
             int _type = INTO;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:34:6: ( 'into' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:34:8: 'into'
+            // Hql.g:34:6: ( 'into' )
+            // Hql.g:34:8: 'into'
             {
             	Match("into"); if (state.failed) return ;
 
@@ -800,8 +800,8 @@
     		{
             int _type = IS;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:35:4: ( 'is' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:35:6: 'is'
+            // Hql.g:35:4: ( 'is' )
+            // Hql.g:35:6: 'is'
             {
             	Match("is"); if (state.failed) return ;
 
@@ -824,8 +824,8 @@
     		{
             int _type = JOIN;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:36:6: ( 'join' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:36:8: 'join'
+            // Hql.g:36:6: ( 'join' )
+            // Hql.g:36:8: 'join'
             {
             	Match("join"); if (state.failed) return ;
 
@@ -848,8 +848,8 @@
     		{
             int _type = LEFT;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:37:6: ( 'left' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:37:8: 'left'
+            // Hql.g:37:6: ( 'left' )
+            // Hql.g:37:8: 'left'
             {
             	Match("left"); if (state.failed) return ;
 
@@ -872,8 +872,8 @@
     		{
             int _type = LIKE;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:38:6: ( 'like' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:38:8: 'like'
+            // Hql.g:38:6: ( 'like' )
+            // Hql.g:38:8: 'like'
             {
             	Match("like"); if (state.failed) return ;
 
@@ -896,8 +896,8 @@
     		{
             int _type = MAX;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:39:5: ( 'max' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:39:7: 'max'
+            // Hql.g:39:5: ( 'max' )
+            // Hql.g:39:7: 'max'
             {
             	Match("max"); if (state.failed) return ;
 
@@ -920,8 +920,8 @@
     		{
             int _type = MIN;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:40:5: ( 'min' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:40:7: 'min'
+            // Hql.g:40:5: ( 'min' )
+            // Hql.g:40:7: 'min'
             {
             	Match("min"); if (state.failed) return ;
 
@@ -944,8 +944,8 @@
     		{
             int _type = NEW;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:41:5: ( 'new' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:41:7: 'new'
+            // Hql.g:41:5: ( 'new' )
+            // Hql.g:41:7: 'new'
             {
             	Match("new"); if (state.failed) return ;
 
@@ -968,8 +968,8 @@
     		{
             int _type = NOT;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:42:5: ( 'not' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:42:7: 'not'
+            // Hql.g:42:5: ( 'not' )
+            // Hql.g:42:7: 'not'
             {
             	Match("not"); if (state.failed) return ;
 
@@ -992,8 +992,8 @@
     		{
             int _type = NULL;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:43:6: ( 'null' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:43:8: 'null'
+            // Hql.g:43:6: ( 'null' )
+            // Hql.g:43:8: 'null'
             {
             	Match("null"); if (state.failed) return ;
 
@@ -1016,8 +1016,8 @@
     		{
             int _type = OR;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:44:4: ( 'or' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:44:6: 'or'
+            // Hql.g:44:4: ( 'or' )
+            // Hql.g:44:6: 'or'
             {
             	Match("or"); if (state.failed) return ;
 
@@ -1040,8 +1040,8 @@
     		{
             int _type = ORDER;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:45:7: ( 'order' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:45:9: 'order'
+            // Hql.g:45:7: ( 'order' )
+            // Hql.g:45:9: 'order'
             {
             	Match("order"); if (state.failed) return ;
 
@@ -1064,8 +1064,8 @@
     		{
             int _type = OUTER;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:46:7: ( 'outer' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:46:9: 'outer'
+            // Hql.g:46:7: ( 'outer' )
+            // Hql.g:46:9: 'outer'
             {
             	Match("outer"); if (state.failed) return ;
 
@@ -1088,8 +1088,8 @@
     		{
             int _type = PROPERTIES;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:47:12: ( 'properties' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:47:14: 'properties'
+            // Hql.g:47:12: ( 'properties' )
+            // Hql.g:47:14: 'properties'
             {
             	Match("properties"); if (state.failed) return ;
 
@@ -1112,8 +1112,8 @@
     		{
             int _type = RIGHT;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:48:7: ( 'right' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:48:9: 'right'
+            // Hql.g:48:7: ( 'right' )
+            // Hql.g:48:9: 'right'
             {
             	Match("right"); if (state.failed) return ;
 
@@ -1136,8 +1136,8 @@
     		{
             int _type = SELECT;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:49:8: ( 'select' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:49:10: 'select'
+            // Hql.g:49:8: ( 'select' )
+            // Hql.g:49:10: 'select'
             {
             	Match("select"); if (state.failed) return ;
 
@@ -1160,8 +1160,8 @@
     		{
             int _type = SET;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:50:5: ( 'set' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:50:7: 'set'
+            // Hql.g:50:5: ( 'set' )
+            // Hql.g:50:7: 'set'
             {
             	Match("set"); if (state.failed) return ;
 
@@ -1184,8 +1184,8 @@
     		{
             int _type = SOME;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:51:6: ( 'some' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:51:8: 'some'
+            // Hql.g:51:6: ( 'some' )
+            // Hql.g:51:8: 'some'
             {
             	Match("some"); if (state.failed) return ;
 
@@ -1208,8 +1208,8 @@
     		{
             int _type = SUM;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:52:5: ( 'sum' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:52:7: 'sum'
+            // Hql.g:52:5: ( 'sum' )
+            // Hql.g:52:7: 'sum'
             {
             	Match("sum"); if (state.failed) return ;
 
@@ -1232,8 +1232,8 @@
     		{
             int _type = TRUE;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:53:6: ( 'true' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:53:8: 'true'
+            // Hql.g:53:6: ( 'true' )
+            // Hql.g:53:8: 'true'
             {
             	Match("true"); if (state.failed) return ;
 
@@ -1256,8 +1256,8 @@
     		{
             int _type = UNION;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:54:7: ( 'union' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:54:9: 'union'
+            // Hql.g:54:7: ( 'union' )
+            // Hql.g:54:9: 'union'
             {
             	Match("union"); if (state.failed) return ;
 
@@ -1280,8 +1280,8 @@
     		{
             int _type = UPDATE;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:55:8: ( 'update' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:55:10: 'update'
+            // Hql.g:55:8: ( 'update' )
+            // Hql.g:55:10: 'update'
             {
             	Match("update"); if (state.failed) return ;
 
@@ -1304,8 +1304,8 @@
     		{
             int _type = VERSIONED;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:56:11: ( 'versioned' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:56:13: 'versioned'
+            // Hql.g:56:11: ( 'versioned' )
+            // Hql.g:56:13: 'versioned'
             {
             	Match("versioned"); if (state.failed) return ;
 
@@ -1328,8 +1328,8 @@
     		{
             int _type = WHERE;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:57:7: ( 'where' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:57:9: 'where'
+            // Hql.g:57:7: ( 'where' )
+            // Hql.g:57:9: 'where'
             {
             	Match("where"); if (state.failed) return ;
 
@@ -1352,8 +1352,8 @@
     		{
             int _type = LITERAL_by;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:58:12: ( 'by' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:58:14: 'by'
+            // Hql.g:58:12: ( 'by' )
+            // Hql.g:58:14: 'by'
             {
             	Match("by"); if (state.failed) return ;
 
@@ -1376,8 +1376,8 @@
     		{
             int _type = CASE;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:59:6: ( 'case' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:59:8: 'case'
+            // Hql.g:59:6: ( 'case' )
+            // Hql.g:59:8: 'case'
             {
             	Match("case"); if (state.failed) return ;
 
@@ -1400,8 +1400,8 @@
     		{
             int _type = END;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:60:5: ( 'end' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:60:7: 'end'
+            // Hql.g:60:5: ( 'end' )
+            // Hql.g:60:7: 'end'
             {
             	Match("end"); if (state.failed) return ;
 
@@ -1424,8 +1424,8 @@
     		{
             int _type = ELSE;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:61:6: ( 'else' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:61:8: 'else'
+            // Hql.g:61:6: ( 'else' )
+            // Hql.g:61:8: 'else'
             {
             	Match("else"); if (state.failed) return ;
 
@@ -1448,8 +1448,8 @@
     		{
             int _type = THEN;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:62:6: ( 'then' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:62:8: 'then'
+            // Hql.g:62:6: ( 'then' )
+            // Hql.g:62:8: 'then'
             {
             	Match("then"); if (state.failed) return ;
 
@@ -1472,8 +1472,8 @@
     		{
             int _type = WHEN;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:63:6: ( 'when' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:63:8: 'when'
+            // Hql.g:63:6: ( 'when' )
+            // Hql.g:63:8: 'when'
             {
             	Match("when"); if (state.failed) return ;
 
@@ -1496,8 +1496,8 @@
     		{
             int _type = ON;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:64:4: ( 'on' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:64:6: 'on'
+            // Hql.g:64:4: ( 'on' )
+            // Hql.g:64:6: 'on'
             {
             	Match("on"); if (state.failed) return ;
 
@@ -1520,8 +1520,8 @@
     		{
             int _type = WITH;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:65:6: ( 'with' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:65:8: 'with'
+            // Hql.g:65:6: ( 'with' )
+            // Hql.g:65:8: 'with'
             {
             	Match("with"); if (state.failed) return ;
 
@@ -1544,8 +1544,8 @@
     		{
             int _type = BOTH;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:66:6: ( 'both' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:66:8: 'both'
+            // Hql.g:66:6: ( 'both' )
+            // Hql.g:66:8: 'both'
             {
             	Match("both"); if (state.failed) return ;
 
@@ -1568,8 +1568,8 @@
     		{
             int _type = EMPTY;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:67:7: ( 'empty' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:67:9: 'empty'
+            // Hql.g:67:7: ( 'empty' )
+            // Hql.g:67:9: 'empty'
             {
             	Match("empty"); if (state.failed) return ;
 
@@ -1592,8 +1592,8 @@
     		{
             int _type = LEADING;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:68:9: ( 'leading' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:68:11: 'leading'
+            // Hql.g:68:9: ( 'leading' )
+            // Hql.g:68:11: 'leading'
             {
             	Match("leading"); if (state.failed) return ;
 
@@ -1616,8 +1616,8 @@
     		{
             int _type = MEMBER;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:69:8: ( 'member' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:69:10: 'member'
+            // Hql.g:69:8: ( 'member' )
+            // Hql.g:69:10: 'member'
             {
             	Match("member"); if (state.failed) return ;
 
@@ -1640,8 +1640,8 @@
     		{
             int _type = OBJECT;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:70:8: ( 'object' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:70:10: 'object'
+            // Hql.g:70:8: ( 'object' )
+            // Hql.g:70:10: 'object'
             {
             	Match("object"); if (state.failed) return ;
 
@@ -1664,8 +1664,8 @@
     		{
             int _type = OF;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:71:4: ( 'of' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:71:6: 'of'
+            // Hql.g:71:4: ( 'of' )
+            // Hql.g:71:6: 'of'
             {
             	Match("of"); if (state.failed) return ;
 
@@ -1688,8 +1688,8 @@
     		{
             int _type = TRAILING;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:72:10: ( 'trailing' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:72:12: 'trailing'
+            // Hql.g:72:10: ( 'trailing' )
+            // Hql.g:72:12: 'trailing'
             {
             	Match("trailing"); if (state.failed) return ;
 
@@ -1712,8 +1712,8 @@
     		{
             int _type = T__131;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:73:8: ( 'ascending' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:73:10: 'ascending'
+            // Hql.g:73:8: ( 'ascending' )
+            // Hql.g:73:10: 'ascending'
             {
             	Match("ascending"); if (state.failed) return ;
 
@@ -1736,8 +1736,8 @@
     		{
             int _type = T__132;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:74:8: ( 'descending' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:74:10: 'descending'
+            // Hql.g:74:8: ( 'descending' )
+            // Hql.g:74:10: 'descending'
             {
             	Match("descending"); if (state.failed) return ;
 
@@ -1760,8 +1760,8 @@
     		{
             int _type = EQ;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:672:3: ( '=' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:672:5: '='
+            // Hql.g:672:3: ( '=' )
+            // Hql.g:672:5: '='
             {
             	Match('='); if (state.failed) return ;
 
@@ -1783,8 +1783,8 @@
     		{
             int _type = LT;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:673:3: ( '<' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:673:5: '<'
+            // Hql.g:673:3: ( '<' )
+            // Hql.g:673:5: '<'
             {
             	Match('<'); if (state.failed) return ;
 
@@ -1806,8 +1806,8 @@
     		{
             int _type = GT;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:674:3: ( '>' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:674:5: '>'
+            // Hql.g:674:3: ( '>' )
+            // Hql.g:674:5: '>'
             {
             	Match('>'); if (state.failed) return ;
 
@@ -1829,8 +1829,8 @@
     		{
             int _type = SQL_NE;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:675:7: ( '<>' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:675:9: '<>'
+            // Hql.g:675:7: ( '<>' )
+            // Hql.g:675:9: '<>'
             {
             	Match("<>"); if (state.failed) return ;
 
@@ -1853,7 +1853,7 @@
     		{
             int _type = NE;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:676:3: ( '!=' | '^=' )
+            // Hql.g:676:3: ( '!=' | '^=' )
             int alt1 = 2;
             int LA1_0 = input.LA(1);
 
@@ -1876,7 +1876,7 @@
             switch (alt1) 
             {
                 case 1 :
-                    // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:676:5: '!='
+                    // Hql.g:676:5: '!='
                     {
                     	Match("!="); if (state.failed) return ;
 
@@ -1884,7 +1884,7 @@
                     }
                     break;
                 case 2 :
-                    // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:676:12: '^='
+                    // Hql.g:676:12: '^='
                     {
                     	Match("^="); if (state.failed) return ;
 
@@ -1909,8 +1909,8 @@
     		{
             int _type = LE;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:677:3: ( '<=' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:677:5: '<='
+            // Hql.g:677:3: ( '<=' )
+            // Hql.g:677:5: '<='
             {
             	Match("<="); if (state.failed) return ;
 
@@ -1933,8 +1933,8 @@
     		{
             int _type = GE;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:678:3: ( '>=' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:678:5: '>='
+            // Hql.g:678:3: ( '>=' )
+            // Hql.g:678:5: '>='
             {
             	Match(">="); if (state.failed) return ;
 
@@ -1957,8 +1957,8 @@
     		{
             int _type = BOR;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:680:5: ( '|' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:680:8: '|'
+            // Hql.g:680:5: ( '|' )
+            // Hql.g:680:8: '|'
             {
             	Match('|'); if (state.failed) return ;
 
@@ -1980,8 +1980,8 @@
     		{
             int _type = BXOR;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:681:6: ( '^' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:681:8: '^'
+            // Hql.g:681:6: ( '^' )
+            // Hql.g:681:8: '^'
             {
             	Match('^'); if (state.failed) return ;
 
@@ -2003,8 +2003,8 @@
     		{
             int _type = BAND;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:682:6: ( '&' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:682:8: '&'
+            // Hql.g:682:6: ( '&' )
+            // Hql.g:682:8: '&'
             {
             	Match('&'); if (state.failed) return ;
 
@@ -2026,8 +2026,8 @@
     		{
             int _type = BNOT;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:683:6: ( '!' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:683:8: '!'
+            // Hql.g:683:6: ( '!' )
+            // Hql.g:683:8: '!'
             {
             	Match('!'); if (state.failed) return ;
 
@@ -2049,8 +2049,8 @@
     		{
             int _type = COMMA;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:685:6: ( ',' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:685:8: ','
+            // Hql.g:685:6: ( ',' )
+            // Hql.g:685:8: ','
             {
             	Match(','); if (state.failed) return ;
 
@@ -2072,8 +2072,8 @@
     		{
             int _type = OPEN;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:687:5: ( '(' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:687:7: '('
+            // Hql.g:687:5: ( '(' )
+            // Hql.g:687:7: '('
             {
             	Match('('); if (state.failed) return ;
 
@@ -2095,8 +2095,8 @@
     		{
             int _type = CLOSE;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:688:6: ( ')' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:688:8: ')'
+            // Hql.g:688:6: ( ')' )
+            // Hql.g:688:8: ')'
             {
             	Match(')'); if (state.failed) return ;
 
@@ -2118,8 +2118,8 @@
     		{
             int _type = OPEN_BRACKET;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:689:13: ( '[' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:689:15: '['
+            // Hql.g:689:13: ( '[' )
+            // Hql.g:689:15: '['
             {
             	Match('['); if (state.failed) return ;
 
@@ -2141,8 +2141,8 @@
     		{
             int _type = CLOSE_BRACKET;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:690:14: ( ']' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:690:16: ']'
+            // Hql.g:690:14: ( ']' )
+            // Hql.g:690:16: ']'
             {
             	Match(']'); if (state.failed) return ;
 
@@ -2164,8 +2164,8 @@
     		{
             int _type = CONCAT;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:692:7: ( '||' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:692:9: '||'
+            // Hql.g:692:7: ( '||' )
+            // Hql.g:692:9: '||'
             {
             	Match("||"); if (state.failed) return ;
 
@@ -2188,8 +2188,8 @@
     		{
             int _type = PLUS;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:693:5: ( '+' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:693:7: '+'
+            // Hql.g:693:5: ( '+' )
+            // Hql.g:693:7: '+'
             {
             	Match('+'); if (state.failed) return ;
 
@@ -2211,8 +2211,8 @@
     		{
             int _type = MINUS;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:694:6: ( '-' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:694:8: '-'
+            // Hql.g:694:6: ( '-' )
+            // Hql.g:694:8: '-'
             {
             	Match('-'); if (state.failed) return ;
 
@@ -2234,8 +2234,8 @@
     		{
             int _type = STAR;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:695:5: ( '*' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:695:7: '*'
+            // Hql.g:695:5: ( '*' )
+            // Hql.g:695:7: '*'
             {
             	Match('*'); if (state.failed) return ;
 
@@ -2257,8 +2257,8 @@
     		{
             int _type = DIV;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:696:4: ( '/' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:696:6: '/'
+            // Hql.g:696:4: ( '/' )
+            // Hql.g:696:6: '/'
             {
             	Match('/'); if (state.failed) return ;
 
@@ -2280,8 +2280,8 @@
     		{
             int _type = COLON;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:697:6: ( ':' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:697:8: ':'
+            // Hql.g:697:6: ( ':' )
+            // Hql.g:697:8: ':'
             {
             	Match(':'); if (state.failed) return ;
 
@@ -2303,8 +2303,8 @@
     		{
             int _type = PARAM;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:698:6: ( '?' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:698:8: '?'
+            // Hql.g:698:6: ( '?' )
+            // Hql.g:698:8: '?'
             {
             	Match('?'); if (state.failed) return ;
 
@@ -2326,11 +2326,11 @@
     		{
             int _type = IDENT;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:701:2: ( ID_START_LETTER ( ID_LETTER )* )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:701:4: ID_START_LETTER ( ID_LETTER )*
+            // Hql.g:701:2: ( ID_START_LETTER ( ID_LETTER )* )
+            // Hql.g:701:4: ID_START_LETTER ( ID_LETTER )*
             {
             	mID_START_LETTER(); if (state.failed) return ;
-            	// C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:701:20: ( ID_LETTER )*
+            	// Hql.g:701:20: ( ID_LETTER )*
             	do 
             	{
             	    int alt2 = 2;
@@ -2345,7 +2345,7 @@
             	    switch (alt2) 
             		{
             			case 1 :
-            			    // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:701:22: ID_LETTER
+            			    // Hql.g:701:22: ID_LETTER
             			    {
             			    	mID_LETTER(); if (state.failed) return ;
 
@@ -2377,8 +2377,8 @@
     {
     		try
     		{
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:706:5: ( '_' | '$' | 'a' .. 'z' | 'A' .. 'Z' | '\\u0080' .. '\\ufffe' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:
+            // Hql.g:706:5: ( '_' | '$' | 'a' .. 'z' | 'A' .. 'Z' | '\\u0080' .. '\\ufffe' )
+            // Hql.g:
             {
             	if ( input.LA(1) == '$' || (input.LA(1) >= 'A' && input.LA(1) <= 'Z') || input.LA(1) == '_' || (input.LA(1) >= 'a' && input.LA(1) <= 'z') || (input.LA(1) >= '\u0080' && input.LA(1) <= '\uFFFE') ) 
             	{
@@ -2407,8 +2407,8 @@
     {
     		try
     		{
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:715:5: ( ID_START_LETTER | '0' .. '9' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:
+            // Hql.g:715:5: ( ID_START_LETTER | '0' .. '9' )
+            // Hql.g:
             {
             	if ( input.LA(1) == '$' || (input.LA(1) >= '0' && input.LA(1) <= '9') || (input.LA(1) >= 'A' && input.LA(1) <= 'Z') || input.LA(1) == '_' || (input.LA(1) >= 'a' && input.LA(1) <= 'z') || (input.LA(1) >= '\u0080' && input.LA(1) <= '\uFFFE') ) 
             	{
@@ -2439,11 +2439,11 @@
     		{
             int _type = QUOTED_String;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:720:4: ( '\\'' ( ( ESCqs )=> ESCqs | ~ '\\'' )* '\\'' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:720:6: '\\'' ( ( ESCqs )=> ESCqs | ~ '\\'' )* '\\''
+            // Hql.g:720:4: ( '\\'' ( ( ESCqs )=> ESCqs | ~ '\\'' )* '\\'' )
+            // Hql.g:720:6: '\\'' ( ( ESCqs )=> ESCqs | ~ '\\'' )* '\\''
             {
             	Match('\''); if (state.failed) return ;
-            	// C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:720:11: ( ( ESCqs )=> ESCqs | ~ '\\'' )*
+            	// Hql.g:720:11: ( ( ESCqs )=> ESCqs | ~ '\\'' )*
             	do 
             	{
             	    int alt3 = 3;
@@ -2469,14 +2469,14 @@
             	    switch (alt3) 
             		{
             			case 1 :
-            			    // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:720:13: ( ESCqs )=> ESCqs
+            			    // Hql.g:720:13: ( ESCqs )=> ESCqs
             			    {
             			    	mESCqs(); if (state.failed) return ;
 
             			    }
             			    break;
             			case 2 :
-            			    // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:720:31: ~ '\\''
+            			    // Hql.g:720:31: ~ '\\''
             			    {
             			    	if ( (input.LA(1) >= '\u0000' && input.LA(1) <= '&') || (input.LA(1) >= '(' && input.LA(1) <= '\uFFFF') ) 
             			    	{
@@ -2520,8 +2520,8 @@
     {
     		try
     		{
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:725:2: ( '\\'' '\\'' )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:726:3: '\\'' '\\''
+            // Hql.g:725:2: ( '\\'' '\\'' )
+            // Hql.g:726:3: '\\'' '\\''
             {
             	Match('\''); if (state.failed) return ;
             	Match('\''); if (state.failed) return ;
@@ -2542,10 +2542,10 @@
     		{
             int _type = WS;
     	int _channel = DEFAULT_TOKEN_CHANNEL;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:729:5: ( ( ' ' | '\\t' | '\\r' '\\n' | '\\n' | '\\r' ) )
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:729:9: ( ' ' | '\\t' | '\\r' '\\n' | '\\n' | '\\r' )
+            // Hql.g:729:5: ( ( ' ' | '\\t' | '\\r' '\\n' | '\\n' | '\\r' ) )
+            // Hql.g:729:9: ( ' ' | '\\t' | '\\r' '\\n' | '\\n' | '\\r' )
             {
-            	// C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:729:9: ( ' ' | '\\t' | '\\r' '\\n' | '\\n' | '\\r' )
+            	// Hql.g:729:9: ( ' ' | '\\t' | '\\r' '\\n' | '\\n' | '\\r' )
             	int alt4 = 5;
             	switch ( input.LA(1) ) 
             	{
@@ -2588,21 +2588,21 @@
             	switch (alt4) 
             	{
             	    case 1 :
-            	        // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:729:13: ' '
+            	        // Hql.g:729:13: ' '
             	        {
             	        	Match(' '); if (state.failed) return ;
 
             	        }
             	        break;
             	    case 2 :
-            	        // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:730:7: '\\t'
+            	        // Hql.g:730:7: '\\t'
             	        {
             	        	Match('\t'); if (state.failed) return ;
 
             	        }
             	        break;
             	    case 3 :
-            	        // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:731:7: '\\r' '\\n'
+            	        // Hql.g:731:7: '\\r' '\\n'
             	        {
             	        	Match('\r'); if (state.failed) return ;
             	        	Match('\n'); if (state.failed) return ;
@@ -2610,14 +2610,14 @@
             	        }
             	        break;
             	    case 4 :
-            	        // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:732:7: '\\n'
+            	        // Hql.g:732:7: '\\n'
             	        {
             	        	Match('\n'); if (state.failed) return ;
 
             	        }
             	        break;
             	    case 5 :
-            	        // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:733:7: '\\r'
+            	        // Hql.g:733:7: '\\r'
             	        {
             	        	Match('\r'); if (state.failed) return ;
 
@@ -2655,7 +2655,7 @@
             IToken f4 = null;
 
             bool isDecimal=false; IToken t=null;
-            // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:742:2: ( '.' ( ( '0' .. '9' )+ ( EXPONENT )? (f1= FLOAT_SUFFIX )? )? | ( '0' ( ( 'x' ) ( HEX_DIGIT )+ | ( '0' .. '7' )+ )? | ( '1' .. '9' ) ( '0' .. '9' )* ) ( ( 'l' ) | {...}? ( '.' ( '0' .. '9' )* ( EXPONENT )? (f2= FLOAT_SUFFIX )? | EXPONENT (f3= FLOAT_SUFFIX )? | f4= FLOAT_SUFFIX ) )? )
+            // Hql.g:742:2: ( '.' ( ( '0' .. '9' )+ ( EXPONENT )? (f1= FLOAT_SUFFIX )? )? | ( '0' ( ( 'x' ) ( HEX_DIGIT )+ | ( '0' .. '7' )+ )? | ( '1' .. '9' ) ( '0' .. '9' )* ) ( ( 'l' ) | {...}? ( '.' ( '0' .. '9' )* ( EXPONENT )? (f2= FLOAT_SUFFIX )? | EXPONENT (f3= FLOAT_SUFFIX )? | f4= FLOAT_SUFFIX ) )? )
             int alt20 = 2;
             int LA20_0 = input.LA(1);
 
@@ -2678,14 +2678,14 @@
             switch (alt20) 
             {
                 case 1 :
-                    // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:742:6: '.' ( ( '0' .. '9' )+ ( EXPONENT )? (f1= FLOAT_SUFFIX )? )?
+                    // Hql.g:742:6: '.' ( ( '0' .. '9' )+ ( EXPONENT )? (f1= FLOAT_SUFFIX )? )?
                     {
                     	Match('.'); if (state.failed) return ;
                     	if ( (state.backtracking==0) )
                     	{
                     	  _type = DOT;
                     	}
-                    	// C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:743:4: ( ( '0' .. '9' )+ ( EXPONENT )? (f1= FLOAT_SUFFIX )? )?
+                    	// Hql.g:743:4: ( ( '0' .. '9' )+ ( EXPONENT )? (f1= FLOAT_SUFFIX )? )?
                     	int alt8 = 2;
                     	int LA8_0 = input.LA(1);
 
@@ -2696,9 +2696,9 @@
                     	switch (alt8) 
                     	{
                     	    case 1 :
-                    	        // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:743:6: ( '0' .. '9' )+ ( EXPONENT )? (f1= FLOAT_SUFFIX )?
+                    	        // Hql.g:743:6: ( '0' .. '9' )+ ( EXPONENT )? (f1= FLOAT_SUFFIX )?
                     	        {
-                    	        	// C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:743:6: ( '0' .. '9' )+
+                    	        	// Hql.g:743:6: ( '0' .. '9' )+
                     	        	int cnt5 = 0;
                     	        	do 
                     	        	{
@@ -2714,7 +2714,7 @@
                     	        	    switch (alt5) 
                     	        		{
                     	        			case 1 :
-                    	        			    // C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:743:7: '0' .. '9'
+                    	        			    // Hql.g:743:7: '0' .. '9'
                     	        			    {
                     	        			    	MatchRange('0','9'); if (state.failed) return ;
 
@@ -2734,7 +2734,7 @@
                     	        	loop5:
                     	        		;	// Stops C# compiler whining that label 'loop5' has no statements
 
-                    	        	// C:\\Users\\Steve\\Documents\\NHibernate\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\Hql.g:743:18: ( EXPONENT )?
+                    	        	// Hql.g:743:18: ( EXPONENT )?
                     	        	int alt6 = 2;
                     	        	int LA6_0 = input.LA(1);
 
@@ -2745,7 +2745,7 @@
    ...
 
[truncated message content]