Menu
▾
▴
nhibernate-commit
|
From: <ste...@us...> - 2009-04-23 16:05:13
|
Revision: 4207
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4207&view=rev
Author: steverstrong
Date: 2009-04-23 16:05:01 +0000 (Thu, 23 Apr 2009)
Log Message:
-----------
Updates to get Legacy\FooBarTest.CollectionsInSelect() test case passing
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlLexer.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlParser.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlParser.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/FromClause.cs
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlLexer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlLexer.cs 2009-04-23 06:03:26 UTC (rev 4206)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlLexer.cs 2009-04-23 16:05:01 UTC (rev 4207)
@@ -1,4 +1,4 @@
-// $ANTLR 3.1.2 /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g 2009-04-17 11:12:37
+// $ANTLR 3.1.2 /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g 2009-04-23 17:07:34
// The variable 'variable' is assigned but its value is never used.
#pragma warning disable 168, 219
@@ -161,7 +161,7 @@
override public string GrammarFileName
{
- get { return "/Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g";}
+ get { return "/Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g";}
}
// $ANTLR start "ALL"
@@ -171,8 +171,8 @@
{
int _type = ALL;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:9:5: ( 'all' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:9:7: 'all'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:9:5: ( 'all' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:9:7: 'all'
{
Match("all"); if (state.failed) return ;
@@ -195,8 +195,8 @@
{
int _type = ANY;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:10:5: ( 'any' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:10:7: 'any'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:10:5: ( 'any' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:10:7: 'any'
{
Match("any"); if (state.failed) return ;
@@ -219,8 +219,8 @@
{
int _type = AND;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:11:5: ( 'and' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:11:7: 'and'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:11:5: ( 'and' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:11:7: 'and'
{
Match("and"); if (state.failed) return ;
@@ -243,8 +243,8 @@
{
int _type = AS;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:12:4: ( 'as' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:12:6: 'as'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:12:4: ( 'as' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:12:6: 'as'
{
Match("as"); if (state.failed) return ;
@@ -267,8 +267,8 @@
{
int _type = ASCENDING;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:13:11: ( 'asc' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:13:13: 'asc'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:13:11: ( 'asc' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:13:13: 'asc'
{
Match("asc"); if (state.failed) return ;
@@ -291,8 +291,8 @@
{
int _type = AVG;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:14:5: ( 'avg' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:14:7: 'avg'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:14:5: ( 'avg' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:14:7: 'avg'
{
Match("avg"); if (state.failed) return ;
@@ -315,8 +315,8 @@
{
int _type = BETWEEN;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:15:9: ( 'between' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:15:11: 'between'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:15:9: ( 'between' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:15:11: 'between'
{
Match("between"); if (state.failed) return ;
@@ -339,8 +339,8 @@
{
int _type = CLASS;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:16:7: ( 'class' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:16:9: 'class'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:16:7: ( 'class' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:16:9: 'class'
{
Match("class"); if (state.failed) return ;
@@ -363,8 +363,8 @@
{
int _type = COUNT;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:17:7: ( 'count' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:17:9: 'count'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:17:7: ( 'count' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:17:9: 'count'
{
Match("count"); if (state.failed) return ;
@@ -387,8 +387,8 @@
{
int _type = DELETE;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:18:8: ( 'delete' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:18:10: 'delete'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:18:8: ( 'delete' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:18:10: 'delete'
{
Match("delete"); if (state.failed) return ;
@@ -411,8 +411,8 @@
{
int _type = DESCENDING;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:19:12: ( 'desc' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:19:14: 'desc'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:19:12: ( 'desc' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:19:14: 'desc'
{
Match("desc"); if (state.failed) return ;
@@ -435,8 +435,8 @@
{
int _type = DISTINCT;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:20:10: ( 'distinct' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:20:12: 'distinct'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:20:10: ( 'distinct' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:20:12: 'distinct'
{
Match("distinct"); if (state.failed) return ;
@@ -459,8 +459,8 @@
{
int _type = ELEMENTS;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:21:10: ( 'elements' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:21:12: 'elements'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:21:10: ( 'elements' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:21:12: 'elements'
{
Match("elements"); if (state.failed) return ;
@@ -483,8 +483,8 @@
{
int _type = ESCAPE;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:22:8: ( 'escape' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:22:10: 'escape'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:22:8: ( 'escape' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:22:10: 'escape'
{
Match("escape"); if (state.failed) return ;
@@ -507,8 +507,8 @@
{
int _type = EXISTS;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:23:8: ( 'exists' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:23:10: 'exists'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:23:8: ( 'exists' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:23:10: 'exists'
{
Match("exists"); if (state.failed) return ;
@@ -531,8 +531,8 @@
{
int _type = FALSE;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:24:7: ( 'false' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:24:9: 'false'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:24:7: ( 'false' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:24:9: 'false'
{
Match("false"); if (state.failed) return ;
@@ -555,8 +555,8 @@
{
int _type = FETCH;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:25:7: ( 'fetch' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:25:9: 'fetch'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:25:7: ( 'fetch' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:25:9: 'fetch'
{
Match("fetch"); if (state.failed) return ;
@@ -579,8 +579,8 @@
{
int _type = FROM;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:26:6: ( 'from' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:26:8: 'from'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:26:6: ( 'from' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:26:8: 'from'
{
Match("from"); if (state.failed) return ;
@@ -603,8 +603,8 @@
{
int _type = FULL;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:27:6: ( 'full' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:27:8: 'full'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:27:6: ( 'full' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:27:8: 'full'
{
Match("full"); if (state.failed) return ;
@@ -627,8 +627,8 @@
{
int _type = GROUP;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:28:7: ( 'group' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:28:9: 'group'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:28:7: ( 'group' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:28:9: 'group'
{
Match("group"); if (state.failed) return ;
@@ -651,8 +651,8 @@
{
int _type = HAVING;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:29:8: ( 'having' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:29:10: 'having'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:29:8: ( 'having' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:29:10: 'having'
{
Match("having"); if (state.failed) return ;
@@ -675,8 +675,8 @@
{
int _type = IN;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:30:4: ( 'in' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:30:6: 'in'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:30:4: ( 'in' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:30:6: 'in'
{
Match("in"); if (state.failed) return ;
@@ -699,8 +699,8 @@
{
int _type = INDICES;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:31:9: ( 'indices' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:31:11: 'indices'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:31:9: ( 'indices' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:31:11: 'indices'
{
Match("indices"); if (state.failed) return ;
@@ -723,8 +723,8 @@
{
int _type = INNER;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:32:7: ( 'inner' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:32:9: 'inner'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:32:7: ( 'inner' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:32:9: 'inner'
{
Match("inner"); if (state.failed) return ;
@@ -747,8 +747,8 @@
{
int _type = INSERT;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:33:8: ( 'insert' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:33:10: 'insert'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:33:8: ( 'insert' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:33:10: 'insert'
{
Match("insert"); if (state.failed) return ;
@@ -771,8 +771,8 @@
{
int _type = INTO;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:34:6: ( 'into' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:34:8: 'into'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:34:6: ( 'into' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:34:8: 'into'
{
Match("into"); if (state.failed) return ;
@@ -795,8 +795,8 @@
{
int _type = IS;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:35:4: ( 'is' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:35:6: 'is'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:35:4: ( 'is' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:35:6: 'is'
{
Match("is"); if (state.failed) return ;
@@ -819,8 +819,8 @@
{
int _type = JOIN;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:36:6: ( 'join' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:36:8: 'join'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:36:6: ( 'join' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:36:8: 'join'
{
Match("join"); if (state.failed) return ;
@@ -843,8 +843,8 @@
{
int _type = LEFT;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:37:6: ( 'left' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:37:8: 'left'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:37:6: ( 'left' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:37:8: 'left'
{
Match("left"); if (state.failed) return ;
@@ -867,8 +867,8 @@
{
int _type = LIKE;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:38:6: ( 'like' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:38:8: 'like'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:38:6: ( 'like' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:38:8: 'like'
{
Match("like"); if (state.failed) return ;
@@ -891,8 +891,8 @@
{
int _type = MAX;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:39:5: ( 'max' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:39:7: 'max'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:39:5: ( 'max' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:39:7: 'max'
{
Match("max"); if (state.failed) return ;
@@ -915,8 +915,8 @@
{
int _type = MIN;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:40:5: ( 'min' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:40:7: 'min'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:40:5: ( 'min' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:40:7: 'min'
{
Match("min"); if (state.failed) return ;
@@ -939,8 +939,8 @@
{
int _type = NEW;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:41:5: ( 'new' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:41:7: 'new'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:41:5: ( 'new' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:41:7: 'new'
{
Match("new"); if (state.failed) return ;
@@ -963,8 +963,8 @@
{
int _type = NOT;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:42:5: ( 'not' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:42:7: 'not'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:42:5: ( 'not' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:42:7: 'not'
{
Match("not"); if (state.failed) return ;
@@ -987,8 +987,8 @@
{
int _type = NULL;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:43:6: ( 'null' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:43:8: 'null'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:43:6: ( 'null' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:43:8: 'null'
{
Match("null"); if (state.failed) return ;
@@ -1011,8 +1011,8 @@
{
int _type = OR;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:44:4: ( 'or' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:44:6: 'or'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:44:4: ( 'or' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:44:6: 'or'
{
Match("or"); if (state.failed) return ;
@@ -1035,8 +1035,8 @@
{
int _type = ORDER;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:45:7: ( 'order' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:45:9: 'order'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:45:7: ( 'order' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:45:9: 'order'
{
Match("order"); if (state.failed) return ;
@@ -1059,8 +1059,8 @@
{
int _type = OUTER;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:46:7: ( 'outer' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:46:9: 'outer'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:46:7: ( 'outer' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:46:9: 'outer'
{
Match("outer"); if (state.failed) return ;
@@ -1083,8 +1083,8 @@
{
int _type = PROPERTIES;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:47:12: ( 'properties' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:47:14: 'properties'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:47:12: ( 'properties' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:47:14: 'properties'
{
Match("properties"); if (state.failed) return ;
@@ -1107,8 +1107,8 @@
{
int _type = RIGHT;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:48:7: ( 'right' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:48:9: 'right'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:48:7: ( 'right' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:48:9: 'right'
{
Match("right"); if (state.failed) return ;
@@ -1131,8 +1131,8 @@
{
int _type = SELECT;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:49:8: ( 'select' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:49:10: 'select'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:49:8: ( 'select' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:49:10: 'select'
{
Match("select"); if (state.failed) return ;
@@ -1155,8 +1155,8 @@
{
int _type = SET;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:50:5: ( 'set' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:50:7: 'set'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:50:5: ( 'set' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:50:7: 'set'
{
Match("set"); if (state.failed) return ;
@@ -1179,8 +1179,8 @@
{
int _type = SOME;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:51:6: ( 'some' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:51:8: 'some'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:51:6: ( 'some' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:51:8: 'some'
{
Match("some"); if (state.failed) return ;
@@ -1203,8 +1203,8 @@
{
int _type = SUM;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:52:5: ( 'sum' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:52:7: 'sum'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:52:5: ( 'sum' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:52:7: 'sum'
{
Match("sum"); if (state.failed) return ;
@@ -1227,8 +1227,8 @@
{
int _type = TRUE;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:53:6: ( 'true' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:53:8: 'true'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:53:6: ( 'true' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:53:8: 'true'
{
Match("true"); if (state.failed) return ;
@@ -1251,8 +1251,8 @@
{
int _type = UNION;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:54:7: ( 'union' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:54:9: 'union'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:54:7: ( 'union' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:54:9: 'union'
{
Match("union"); if (state.failed) return ;
@@ -1275,8 +1275,8 @@
{
int _type = UPDATE;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:55:8: ( 'update' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:55:10: 'update'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:55:8: ( 'update' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:55:10: 'update'
{
Match("update"); if (state.failed) return ;
@@ -1299,8 +1299,8 @@
{
int _type = VERSIONED;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:56:11: ( 'versioned' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:56:13: 'versioned'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:56:11: ( 'versioned' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:56:13: 'versioned'
{
Match("versioned"); if (state.failed) return ;
@@ -1323,8 +1323,8 @@
{
int _type = WHERE;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:57:7: ( 'where' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:57:9: 'where'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:57:7: ( 'where' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:57:9: 'where'
{
Match("where"); if (state.failed) return ;
@@ -1347,8 +1347,8 @@
{
int _type = LITERAL_by;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:58:12: ( 'by' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:58:14: 'by'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:58:12: ( 'by' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:58:14: 'by'
{
Match("by"); if (state.failed) return ;
@@ -1371,8 +1371,8 @@
{
int _type = CASE;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:59:6: ( 'case' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:59:8: 'case'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:59:6: ( 'case' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:59:8: 'case'
{
Match("case"); if (state.failed) return ;
@@ -1395,8 +1395,8 @@
{
int _type = END;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:60:5: ( 'end' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:60:7: 'end'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:60:5: ( 'end' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:60:7: 'end'
{
Match("end"); if (state.failed) return ;
@@ -1419,8 +1419,8 @@
{
int _type = ELSE;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:61:6: ( 'else' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:61:8: 'else'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:61:6: ( 'else' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:61:8: 'else'
{
Match("else"); if (state.failed) return ;
@@ -1443,8 +1443,8 @@
{
int _type = THEN;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:62:6: ( 'then' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:62:8: 'then'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:62:6: ( 'then' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:62:8: 'then'
{
Match("then"); if (state.failed) return ;
@@ -1467,8 +1467,8 @@
{
int _type = WHEN;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:63:6: ( 'when' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:63:8: 'when'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:63:6: ( 'when' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:63:8: 'when'
{
Match("when"); if (state.failed) return ;
@@ -1491,8 +1491,8 @@
{
int _type = ON;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:64:4: ( 'on' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:64:6: 'on'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:64:4: ( 'on' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:64:6: 'on'
{
Match("on"); if (state.failed) return ;
@@ -1515,8 +1515,8 @@
{
int _type = WITH;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:65:6: ( 'with' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:65:8: 'with'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:65:6: ( 'with' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:65:8: 'with'
{
Match("with"); if (state.failed) return ;
@@ -1539,8 +1539,8 @@
{
int _type = BOTH;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:66:6: ( 'both' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:66:8: 'both'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:66:6: ( 'both' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:66:8: 'both'
{
Match("both"); if (state.failed) return ;
@@ -1563,8 +1563,8 @@
{
int _type = EMPTY;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:67:7: ( 'empty' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:67:9: 'empty'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:67:7: ( 'empty' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:67:9: 'empty'
{
Match("empty"); if (state.failed) return ;
@@ -1587,8 +1587,8 @@
{
int _type = LEADING;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:68:9: ( 'leading' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:68:11: 'leading'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:68:9: ( 'leading' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:68:11: 'leading'
{
Match("leading"); if (state.failed) return ;
@@ -1611,8 +1611,8 @@
{
int _type = MEMBER;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:69:8: ( 'member' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:69:10: 'member'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:69:8: ( 'member' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:69:10: 'member'
{
Match("member"); if (state.failed) return ;
@@ -1635,8 +1635,8 @@
{
int _type = OBJECT;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:70:8: ( 'object' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:70:10: 'object'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:70:8: ( 'object' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:70:10: 'object'
{
Match("object"); if (state.failed) return ;
@@ -1659,8 +1659,8 @@
{
int _type = OF;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:71:4: ( 'of' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:71:6: 'of'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:71:4: ( 'of' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:71:6: 'of'
{
Match("of"); if (state.failed) return ;
@@ -1683,8 +1683,8 @@
{
int _type = TRAILING;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:72:10: ( 'trailing' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:72:12: 'trailing'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:72:10: ( 'trailing' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:72:12: 'trailing'
{
Match("trailing"); if (state.failed) return ;
@@ -1707,8 +1707,8 @@
{
int _type = T__126;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:73:8: ( 'ascending' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:73:10: 'ascending'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:73:8: ( 'ascending' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:73:10: 'ascending'
{
Match("ascending"); if (state.failed) return ;
@@ -1731,8 +1731,8 @@
{
int _type = T__127;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:74:8: ( 'descending' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:74:10: 'descending'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:74:8: ( 'descending' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:74:10: 'descending'
{
Match("descending"); if (state.failed) return ;
@@ -1755,8 +1755,8 @@
{
int _type = EQ;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:744:3: ( '=' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:744:5: '='
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:746:3: ( '=' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:746:5: '='
{
Match('='); if (state.failed) return ;
@@ -1778,8 +1778,8 @@
{
int _type = LT;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:745:3: ( '<' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:745:5: '<'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:747:3: ( '<' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:747:5: '<'
{
Match('<'); if (state.failed) return ;
@@ -1801,8 +1801,8 @@
{
int _type = GT;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:746:3: ( '>' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:746:5: '>'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:748:3: ( '>' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:748:5: '>'
{
Match('>'); if (state.failed) return ;
@@ -1824,8 +1824,8 @@
{
int _type = SQL_NE;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:747:7: ( '<>' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:747:9: '<>'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:749:7: ( '<>' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:749:9: '<>'
{
Match("<>"); if (state.failed) return ;
@@ -1848,7 +1848,7 @@
{
int _type = NE;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:748:3: ( '!=' | '^=' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:750:3: ( '!=' | '^=' )
int alt1 = 2;
int LA1_0 = input.LA(1);
@@ -1871,7 +1871,7 @@
switch (alt1)
{
case 1 :
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:748:5: '!='
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:750:5: '!='
{
Match("!="); if (state.failed) return ;
@@ -1879,7 +1879,7 @@
}
break;
case 2 :
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:748:12: '^='
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:750:12: '^='
{
Match("^="); if (state.failed) return ;
@@ -1904,8 +1904,8 @@
{
int _type = LE;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:749:3: ( '<=' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:749:5: '<='
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:751:3: ( '<=' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:751:5: '<='
{
Match("<="); if (state.failed) return ;
@@ -1928,8 +1928,8 @@
{
int _type = GE;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:750:3: ( '>=' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:750:5: '>='
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:752:3: ( '>=' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:752:5: '>='
{
Match(">="); if (state.failed) return ;
@@ -1952,8 +1952,8 @@
{
int _type = COMMA;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:752:6: ( ',' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:752:8: ','
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:754:6: ( ',' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:754:8: ','
{
Match(','); if (state.failed) return ;
@@ -1975,8 +1975,8 @@
{
int _type = OPEN;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:754:5: ( '(' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:754:7: '('
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:756:5: ( '(' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:756:7: '('
{
Match('('); if (state.failed) return ;
@@ -1998,8 +1998,8 @@
{
int _type = CLOSE;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:755:6: ( ')' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:755:8: ')'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:757:6: ( ')' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:757:8: ')'
{
Match(')'); if (state.failed) return ;
@@ -2021,8 +2021,8 @@
{
int _type = OPEN_BRACKET;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:756:13: ( '[' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:756:15: '['
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:758:13: ( '[' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:758:15: '['
{
Match('['); if (state.failed) return ;
@@ -2044,8 +2044,8 @@
{
int _type = CLOSE_BRACKET;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:757:14: ( ']' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:757:16: ']'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:759:14: ( ']' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:759:16: ']'
{
Match(']'); if (state.failed) return ;
@@ -2067,8 +2067,8 @@
{
int _type = CONCAT;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:759:7: ( '||' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:759:9: '||'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:761:7: ( '||' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:761:9: '||'
{
Match("||"); if (state.failed) return ;
@@ -2091,8 +2091,8 @@
{
int _type = PLUS;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:760:5: ( '+' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:760:7: '+'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:762:5: ( '+' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:762:7: '+'
{
Match('+'); if (state.failed) return ;
@@ -2114,8 +2114,8 @@
{
int _type = MINUS;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:761:6: ( '-' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:761:8: '-'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:763:6: ( '-' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:763:8: '-'
{
Match('-'); if (state.failed) return ;
@@ -2137,8 +2137,8 @@
{
int _type = STAR;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:762:5: ( '*' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:762:7: '*'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:764:5: ( '*' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:764:7: '*'
{
Match('*'); if (state.failed) return ;
@@ -2160,8 +2160,8 @@
{
int _type = DIV;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:763:4: ( '/' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:763:6: '/'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:765:4: ( '/' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:765:6: '/'
{
Match('/'); if (state.failed) return ;
@@ -2183,8 +2183,8 @@
{
int _type = COLON;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:764:6: ( ':' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:764:8: ':'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:766:6: ( ':' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:766:8: ':'
{
Match(':'); if (state.failed) return ;
@@ -2206,8 +2206,8 @@
{
int _type = PARAM;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:765:6: ( '?' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:765:8: '?'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:767:6: ( '?' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:767:8: '?'
{
Match('?'); if (state.failed) return ;
@@ -2229,11 +2229,11 @@
{
int _type = IDENT;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:768:2: ( ID_START_LETTER ( ID_LETTER )* )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:768:4: ID_START_LETTER ( ID_LETTER )*
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:770:2: ( ID_START_LETTER ( ID_LETTER )* )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:770:4: ID_START_LETTER ( ID_LETTER )*
{
mID_START_LETTER(); if (state.failed) return ;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:768:20: ( ID_LETTER )*
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:770:20: ( ID_LETTER )*
do
{
int alt2 = 2;
@@ -2248,7 +2248,7 @@
switch (alt2)
{
case 1 :
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:768:22: ID_LETTER
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:770:22: ID_LETTER
{
mID_LETTER(); if (state.failed) return ;
@@ -2280,8 +2280,8 @@
{
try
{
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:773:5: ( '_' | '$' | 'a' .. 'z' | 'A' .. 'Z' | '\\u0080' .. '\\ufffe' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:775:5: ( '_' | '$' | 'a' .. 'z' | 'A' .. 'Z' | '\\u0080' .. '\\ufffe' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/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') )
{
@@ -2310,8 +2310,8 @@
{
try
{
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:782:5: ( ID_START_LETTER | '0' .. '9' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:784:5: ( ID_START_LETTER | '0' .. '9' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/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') )
{
@@ -2342,11 +2342,11 @@
{
int _type = QUOTED_String;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:787:4: ( '\\'' ( ( ESCqs )=> ESCqs | ~ '\\'' )* '\\'' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:787:6: '\\'' ( ( ESCqs )=> ESCqs | ~ '\\'' )* '\\''
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:789:4: ( '\\'' ( ( ESCqs )=> ESCqs | ~ '\\'' )* '\\'' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:789:6: '\\'' ( ( ESCqs )=> ESCqs | ~ '\\'' )* '\\''
{
Match('\''); if (state.failed) return ;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:787:11: ( ( ESCqs )=> ESCqs | ~ '\\'' )*
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:789:11: ( ( ESCqs )=> ESCqs | ~ '\\'' )*
do
{
int alt3 = 3;
@@ -2372,14 +2372,14 @@
switch (alt3)
{
case 1 :
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:787:13: ( ESCqs )=> ESCqs
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:789:13: ( ESCqs )=> ESCqs
{
mESCqs(); if (state.failed) return ;
}
break;
case 2 :
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:787:31: ~ '\\''
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:789:31: ~ '\\''
{
if ( (input.LA(1) >= '\u0000' && input.LA(1) <= '&') || (input.LA(1) >= '(' && input.LA(1) <= '\uFFFF') )
{
@@ -2423,8 +2423,8 @@
{
try
{
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:792:2: ( '\\'' '\\'' )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:793:3: '\\'' '\\''
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:794:2: ( '\\'' '\\'' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:795:3: '\\'' '\\''
{
Match('\''); if (state.failed) return ;
Match('\''); if (state.failed) return ;
@@ -2445,10 +2445,10 @@
{
int _type = WS;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:796:5: ( ( ' ' | '\\t' | '\\r' '\\n' | '\\n' | '\\r' ) )
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:796:9: ( ' ' | '\\t' | '\\r' '\\n' | '\\n' | '\\r' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:798:5: ( ( ' ' | '\\t' | '\\r' '\\n' | '\\n' | '\\r' ) )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:798:9: ( ' ' | '\\t' | '\\r' '\\n' | '\\n' | '\\r' )
{
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:796:9: ( ' ' | '\\t' | '\\r' '\\n' | '\\n' | '\\r' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:798:9: ( ' ' | '\\t' | '\\r' '\\n' | '\\n' | '\\r' )
int alt4 = 5;
switch ( input.LA(1) )
{
@@ -2491,21 +2491,21 @@
switch (alt4)
{
case 1 :
- // /Users/Steve/Projects/uNhAddins/Trunk/ANTLR-HQL/ANTLR-HQL/Hql.g:796:13: ' '
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:798:13: ' '
{
Match(' '); if (state.failed) return ;
}
break;
case 2 :
- ...
[truncated message content] |
|
From: <ste...@us...> - 2009-04-26 19:00:56
|
Revision: 4213
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4213&view=rev
Author: steverstrong
Date: 2009-04-26 19:00:45 +0000 (Sun, 26 Apr 2009)
Log Message:
-----------
Updated AST parser to handle test cases 1727 & 1742
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Loader/QueryLoader.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Parameters/ParameterTranslationsImpl.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Loader/QueryLoader.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Loader/QueryLoader.cs 2009-04-24 16:07:40 UTC (rev 4212)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Loader/QueryLoader.cs 2009-04-26 19:00:45 UTC (rev 4213)
@@ -61,36 +61,7 @@
protected override void AdjustNamedParameterLocationsForQueryParameters(QueryParameters parameters)
{
- foreach (int existingParameterLocation in parameters.FilteredParameterLocations)
- {
- Dictionary<string, int> individualUpdates = new Dictionary<string, int>();
-
- foreach (KeyValuePair<string, object> entry in _queryTranslator.NamedParameters)
- {
- if (entry.Value is int)
- {
- int namedParameterLocation = (int) entry.Value;
-
- if (namedParameterLocation == existingParameterLocation)
- individualUpdates.Add(entry.Key, namedParameterLocation);
- }
- else
- {
- List<int> namedParameterLocations = (List<int>) entry.Value;
-
- for (int index = 0; index < namedParameterLocations.Count; index++)
- {
- if (namedParameterLocations[index] == existingParameterLocation)
- namedParameterLocations[index]++;
- }
- }
- }
-
- foreach (KeyValuePair<string, int> entry in individualUpdates)
- {
- _queryTranslator.NamedParameters[entry.Key] = entry.Value;
- }
- }
+ _queryTranslator.AdjustNamedParameterLocationsForQueryParameters(parameters);
}
protected override SqlString ApplyLocks(SqlString sql, IDictionary<string, LockMode> lockModes, Dialect.Dialect dialect)
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Parameters/ParameterTranslationsImpl.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Parameters/ParameterTranslationsImpl.cs 2009-04-24 16:07:40 UTC (rev 4212)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Parameters/ParameterTranslationsImpl.cs 2009-04-26 19:00:45 UTC (rev 4213)
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using NHibernate.Engine;
using NHibernate.Hql.Ast.ANTLR.Util;
using NHibernate.Type;
using NHibernate.Util;
@@ -66,6 +67,23 @@
}
}
+ public void AdjustNamedParameterLocationsForQueryParameters(QueryParameters parameters)
+ {
+ foreach (int existingParameterLocation in parameters.FilteredParameterLocations)
+ {
+ foreach (ParameterInfo entry in _namedParameters.Values)
+ {
+ for (int index = 0; index < entry.SqlLocations.Length; index++)
+ {
+ if (entry.SqlLocations[index] >= existingParameterLocation)
+ {
+ entry.SqlLocations[index]++;
+ }
+ }
+ }
+ }
+ }
+
public int GetOrdinalParameterSqlLocation(int ordinalPosition)
{
return GetOrdinalParameterInfo(ordinalPosition).SqlLocations[0];
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs 2009-04-24 16:07:40 UTC (rev 4212)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs 2009-04-26 19:00:45 UTC (rev 4213)
@@ -27,7 +27,7 @@
private IDictionary<string, IFilter> _enabledFilters;
private readonly ISessionFactoryImplementor _factory;
private QueryLoader _queryLoader;
- private IParameterTranslations _paramTranslations;
+ private ParameterTranslationsImpl _paramTranslations;
private HqlParseEngine _parser;
private HqlSqlTranslator _translator;
@@ -180,17 +180,13 @@
return _translator.SqlStatement.Walker.SelectClause.ColumnNames;
}
- public IDictionary<string, object> NamedParameters
- {
- get { return _translator.NamedParameters; }
- }
-
public IParameterTranslations GetParameterTranslations()
{
if (_paramTranslations == null)
{
_paramTranslations = new ParameterTranslationsImpl(_translator.SqlStatement.Walker.Parameters);
}
+
return _paramTranslations;
}
@@ -400,6 +396,11 @@
throw new QueryExecutionRequestException("Not supported for DML operations", _hql);
}
}
+
+ public void AdjustNamedParameterLocationsForQueryParameters(QueryParameters parameters)
+ {
+ ((ParameterTranslationsImpl) GetParameterTranslations()).AdjustNamedParameterLocationsForQueryParameters(parameters);
+ }
}
public class HqlParseEngine
@@ -524,7 +525,6 @@
private readonly QueryTranslatorImpl _qti;
private readonly ISessionFactoryImplementor _sfi;
private readonly IDictionary<string, string> _tokenReplacements;
- private IDictionary<string, object> _namedParameters;
private readonly string _collectionRole;
private IStatement _resultAst;
@@ -548,12 +548,7 @@
get { return _resultAst; }
}
- public IDictionary<string, object> NamedParameters
- {
- get { return _namedParameters; }
- }
-
- public IStatement Translate()
+ public IStatement Translate()
{
if (_resultAst == null)
{
@@ -566,8 +561,6 @@
// Transform the tree.
_resultAst = (IStatement) hqlSqlWalker.statement().Tree;
- _namedParameters = hqlSqlWalker.NamedParameters;
-
/*
if ( AST_LOG.isDebugEnabled() ) {
ASTPrinter printer = new ASTPrinter( SqlTokenTypes.class );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2009-05-04 22:19:46
|
Revision: 4232
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4232&view=rev
Author: fabiomaulo
Date: 2009-05-04 22:19:42 +0000 (Mon, 04 May 2009)
Log Message:
-----------
Simplified implementation
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Exec/BasicExecutor.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Exec/BasicExecutor.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Exec/BasicExecutor.cs 2009-05-04 22:01:16 UTC (rev 4231)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Exec/BasicExecutor.cs 2009-05-04 22:19:42 UTC (rev 4232)
@@ -3,6 +3,7 @@
using System.Data;
using System.Data.Common;
using Antlr.Runtime;
+using Antlr.Runtime.Tree;
using log4net;
using NHibernate.Engine;
using NHibernate.Exceptions;
@@ -21,17 +22,17 @@
private static readonly ILog log = LogManager.GetLogger(typeof(BasicExecutor));
private readonly SqlString sql;
- public BasicExecutor(IStatement statement, ITokenStream tokenStream, IQueryable persister)
+ public BasicExecutor(IStatement statement, IQueryable persister)
: base(statement, log)
{
this.persister = persister;
try
{
- var generator = new HqlSqlGenerator(statement, tokenStream, Factory);
- generator.Generate();
-
- sql = generator.Sql;
- Parameters = generator.CollectionParameters;
+ var gen = new SqlGenerator(Factory, new CommonTreeNodeStream(statement));
+ gen.statement();
+ sql = gen.GetSQL();
+ gen.ParseErrorHandler.ThrowQueryException();
+ Parameters = gen.GetCollectedParameters();
}
catch (RecognitionException e)
{
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs 2009-05-04 22:01:16 UTC (rev 4231)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs 2009-05-04 22:19:42 UTC (rev 4232)
@@ -407,7 +407,7 @@
}
else
{
- return new BasicExecutor(statement, _parser.Tokens, persister);
+ return new BasicExecutor(statement, persister);
}
}
else if (walker.StatementType == HqlSqlWalker.UPDATE)
@@ -423,7 +423,7 @@
}
else
{
- return new BasicExecutor(statement, _parser.Tokens, persister);
+ return new BasicExecutor(statement, persister);
}
}
else if (walker.StatementType == HqlSqlWalker.INSERT)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ste...@us...> - 2009-05-08 15:37:42
|
Revision: 4268
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4268&view=rev
Author: steverstrong
Date: 2009-05-08 15:37:38 +0000 (Fri, 08 May 2009)
Log Message:
-----------
Fixed bug with "With" clause handling in the AST parser
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlSqlWalker.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/ASTTreeAdaptor.cs
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlSqlWalker.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlSqlWalker.cs 2009-05-08 12:01:51 UTC (rev 4267)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlSqlWalker.cs 2009-05-08 15:37:38 UTC (rev 4268)
@@ -1,9375 +1,9436 @@
-// $ANTLR 3.1.2 C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g 2009-05-06 18:27:40
-
-// The variable 'variable' is assigned but its value is never used.
-#pragma warning disable 168, 219
-// Unreachable code detected.
-#pragma warning disable 162
-namespace NHibernate.Hql.Ast.ANTLR
-{
-
-using System.Text;
-using NHibernate.Hql.Ast.ANTLR.Tree;
-
-
-using System;
-using Antlr.Runtime;
-using Antlr.Runtime.Tree;using IList = System.Collections.IList;
-using ArrayList = System.Collections.ArrayList;
-using Stack = Antlr.Runtime.Collections.StackList;
-
-
-
-public partial class HqlSqlWalker : TreeParser
-{
- public static readonly string[] tokenNames = new string[]
- {
- "<invalid>",
- "<EOR>",
- "<DOWN>",
- "<UP>",
- "ALL",
- "ANY",
- "AND",
- "AS",
- "ASCENDING",
- "AVG",
- "BETWEEN",
- "CLASS",
- "COUNT",
- "DELETE",
- "DESCENDING",
- "DOT",
- "DISTINCT",
- "ELEMENTS",
- "ESCAPE",
- "EXISTS",
- "FALSE",
- "FETCH",
- "FROM",
- "FULL",
- "GROUP",
- "HAVING",
- "IN",
- "INDICES",
- "INNER",
- "INSERT",
- "INTO",
- "IS",
- "JOIN",
- "LEFT",
- "LIKE",
- "MAX",
- "MIN",
- "NEW",
- "NOT",
- "NULL",
- "OR",
- "ORDER",
- "OUTER",
- "PROPERTIES",
- "RIGHT",
- "SELECT",
- "SET",
- "SOME",
- "SUM",
- "TRUE",
- "UNION",
- "UPDATE",
- "VERSIONED",
- "WHERE",
- "LITERAL_by",
- "CASE",
- "END",
- "ELSE",
- "THEN",
- "WHEN",
- "ON",
- "WITH",
- "BOTH",
- "EMPTY",
- "LEADING",
- "MEMBER",
- "OBJECT",
- "OF",
- "TRAILING",
- "AGGREGATE",
- "ALIAS",
- "CONSTRUCTOR",
- "CASE2",
- "EXPR_LIST",
- "FILTER_ENTITY",
- "IN_LIST",
- "INDEX_OP",
- "IS_NOT_NULL",
- "IS_NULL",
- "METHOD_CALL",
- "NOT_BETWEEN",
- "NOT_IN",
- "NOT_LIKE",
- "ORDER_ELEMENT",
- "QUERY",
- "RANGE",
- "ROW_STAR",
- "SELECT_FROM",
- "UNARY_MINUS",
- "UNARY_PLUS",
- "VECTOR_EXPR",
- "WEIRD_IDENT",
- "CONSTANT",
- "NUM_INT",
- "NUM_DOUBLE",
- "NUM_FLOAT",
- "NUM_LONG",
- "JAVA_CONSTANT",
- "COMMA",
- "EQ",
- "OPEN",
- "CLOSE",
- "NE",
- "SQL_NE",
- "LT",
- "GT",
- "LE",
- "GE",
- "CONCAT",
- "PLUS",
- "MINUS",
- "STAR",
- "DIV",
- "OPEN_BRACKET",
- "CLOSE_BRACKET",
- "COLON",
- "PARAM",
- "QUOTED_String",
- "IDENT",
- "ID_START_LETTER",
- "ID_LETTER",
- "ESCqs",
- "WS",
- "EXPONENT",
- "FLOAT_SUFFIX",
- "HEX_DIGIT",
- "'ascending'",
- "'descending'",
- "FROM_FRAGMENT",
- "IMPLIED_FROM",
- "JOIN_FRAGMENT",
- "SELECT_CLAUSE",
- "LEFT_OUTER",
- "RIGHT_OUTER",
- "ALIAS_REF",
- "PROPERTY_REF",
- "SQL_TOKEN",
- "SELECT_COLUMNS",
- "SELECT_EXPR",
- "THETA_JOINS",
- "FILTERS",
- "METHOD_NAME",
- "NAMED_PARAM",
- "BOGUS"
- };
-
- public const int SELECT_COLUMNS = 137;
- public const int LT = 104;
- public const int EXPONENT = 123;
- public const int STAR = 111;
- public const int FLOAT_SUFFIX = 124;
- public const int FILTERS = 140;
- public const int LITERAL_by = 54;
- public const int PROPERTY_REF = 135;
- public const int THETA_JOINS = 139;
- public const int CASE = 55;
- public const int NEW = 37;
- public const int FILTER_ENTITY = 74;
- public const int PARAM = 116;
- public const int COUNT = 12;
- public const int NOT = 38;
- public const int EOF = -1;
- public const int UNARY_PLUS = 89;
- public const int QUOTED_String = 117;
- public const int ESCqs = 121;
- public const int WEIRD_IDENT = 91;
- public const int OPEN_BRACKET = 113;
- public const int FULL = 23;
- public const int ORDER_ELEMENT = 83;
- public const int IS_NULL = 78;
- public const int ESCAPE = 18;
- public const int INSERT = 29;
- public const int FROM_FRAGMENT = 128;
- public const int NAMED_PARAM = 142;
- public const int BOTH = 62;
- public const int SELECT_CLAUSE = 131;
- public const int VERSIONED = 52;
- public const int EQ = 99;
- public const int SELECT = 45;
- public const int INTO = 30;
- public const int NE = 102;
- public const int GE = 107;
- public const int CONCAT = 108;
- public const int ID_LETTER = 120;
- public const int NULL = 39;
- public const int ELSE = 57;
- public const int SELECT_FROM = 87;
- public const int TRAILING = 68;
- public const int ON = 60;
- public const int NUM_LONG = 96;
- public const int NUM_DOUBLE = 94;
- public const int UNARY_MINUS = 88;
- public const int DELETE = 13;
- public const int INDICES = 27;
- public const int OF = 67;
- public const int METHOD_CALL = 79;
- public const int LEADING = 64;
- public const int METHOD_NAME = 141;
- public const int EMPTY = 63;
- public const int T__126 = 126;
- public const int GROUP = 24;
- public const int T__127 = 127;
- public const int WS = 122;
- public const int FETCH = 21;
- public const int VECTOR_EXPR = 90;
- public const int NOT_IN = 81;
- public const int SELECT_EXPR = 138;
- public const int NUM_INT = 93;
- public const int OR = 40;
- public const int ALIAS = 70;
- public const int JAVA_CONSTANT = 97;
- public const int CONSTANT = 92;
- public const int GT = 105;
- public const int QUERY = 84;
- public const int INDEX_OP = 76;
- public const int NUM_FLOAT = 95;
- public const int FROM = 22;
- public const int END = 56;
- public const int FALSE = 20;
- public const int DISTINCT = 16;
- public const int CONSTRUCTOR = 71;
- public const int CLOSE_BRACKET = 114;
- public const int WHERE = 53;
- public const int CLASS = 11;
- public const int MEMBER = 65;
- public const int INNER = 28;
- public const int PROPERTIES = 43;
- public const int BOGUS = 143;
- public const int ORDER = 41;
- public const int MAX = 35;
- public const int UPDATE = 51;
- public const int JOIN_FRAGMENT = 130;
- public const int SQL_NE = 103;
- public const int AND = 6;
- public const int SUM = 48;
- public const int ASCENDING = 8;
- public const int EXPR_LIST = 73;
- public const int AS = 7;
- public const int IN = 26;
- public const int THEN = 58;
- public const int OBJECT = 66;
- public const int COMMA = 98;
- public const int SQL_TOKEN = 136;
- public const int IS = 31;
- public const int LEFT = 33;
- public const int AVG = 9;
- public const int SOME = 47;
- public const int ALL = 4;
- public const int IMPLIED_FROM = 129;
- public const int IDENT = 118;
- public const int CASE2 = 72;
- public const int PLUS = 109;
- public const int EXISTS = 19;
- public const int DOT = 15;
- public const int WITH = 61;
- public const int LIKE = 34;
- public const int OUTER = 42;
- public const int ID_START_LETTER = 119;
- public const int LEFT_OUTER = 132;
- public const int ROW_STAR = 86;
- public const int NOT_LIKE = 82;
- public const int RIGHT_OUTER = 133;
- public const int RANGE = 85;
- public const int NOT_BETWEEN = 80;
- public const int HEX_DIGIT = 125;
- public const int SET = 46;
- public const int RIGHT = 44;
- public const int HAVING = 25;
- public const int MIN = 36;
- public const int IS_NOT_NULL = 77;
- public const int MINUS = 110;
- public const int ELEMENTS = 17;
- public const int TRUE = 49;
- public const int JOIN = 32;
- public const int IN_LIST = 75;
- public const int UNION = 50;
- public const int OPEN = 100;
- public const int COLON = 115;
- public const int ANY = 5;
- public const int CLOSE = 101;
- public const int WHEN = 59;
- public const int ALIAS_REF = 134;
- public const int DIV = 112;
- public const int DESCENDING = 14;
- public const int AGGREGATE = 69;
- public const int BETWEEN = 10;
- public const int LE = 106;
-
- // delegates
- // delegators
-
-
-
- public HqlSqlWalker(ITreeNodeStream input)
- : this(input, new RecognizerSharedState()) {
- }
-
- public HqlSqlWalker(ITreeNodeStream input, RecognizerSharedState state)
- : base(input, state) {
- InitializeCyclicDFAs();
-
-
- }
-
- protected ITreeAdaptor adaptor = new CommonTreeAdaptor();
-
- public ITreeAdaptor TreeAdaptor
- {
- get { return this.adaptor; }
- set {
- this.adaptor = value;
- }
- }
-
- override public string[] TokenNames {
- get { return HqlSqlWalker.tokenNames; }
- }
-
- override public string GrammarFileName {
- get { return "C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g"; }
- }
-
-
- public class statement_return : TreeRuleReturnScope
- {
- private IASTNode tree;
- override public object Tree
- {
- get { return tree; }
- set { tree = (IASTNode) value; }
- }
- };
-
- // $ANTLR start "statement"
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:40:1: statement : ( selectStatement | updateStatement | deleteStatement | insertStatement );
- public HqlSqlWalker.statement_return statement() // throws RecognitionException [1]
- {
- HqlSqlWalker.statement_return retval = new HqlSqlWalker.statement_return();
- retval.Start = input.LT(1);
-
- IASTNode root_0 = null;
-
- IASTNode _first_0 = null;
- IASTNode _last = null;
-
- HqlSqlWalker.selectStatement_return selectStatement1 = default(HqlSqlWalker.selectStatement_return);
-
- HqlSqlWalker.updateStatement_return updateStatement2 = default(HqlSqlWalker.updateStatement_return);
-
- HqlSqlWalker.deleteStatement_return deleteStatement3 = default(HqlSqlWalker.deleteStatement_return);
-
- HqlSqlWalker.insertStatement_return insertStatement4 = default(HqlSqlWalker.insertStatement_return);
-
-
-
- try
- {
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:41:2: ( selectStatement | updateStatement | deleteStatement | insertStatement )
- int alt1 = 4;
- switch ( input.LA(1) )
- {
- case QUERY:
- {
- alt1 = 1;
- }
- break;
- case UPDATE:
- {
- alt1 = 2;
- }
- break;
- case DELETE:
- {
- alt1 = 3;
- }
- break;
- case INSERT:
- {
- alt1 = 4;
- }
- break;
- default:
- NoViableAltException nvae_d1s0 =
- new NoViableAltException("", 1, 0, input);
-
- throw nvae_d1s0;
- }
-
- switch (alt1)
- {
- case 1 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:41:4: selectStatement
- {
- root_0 = (IASTNode)adaptor.GetNilNode();
-
- _last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_selectStatement_in_statement168);
- selectStatement1 = selectStatement();
- state.followingStackPointer--;
-
- adaptor.AddChild(root_0, selectStatement1.Tree);
-
- }
- break;
- case 2 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:41:22: updateStatement
- {
- root_0 = (IASTNode)adaptor.GetNilNode();
-
- _last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_updateStatement_in_statement172);
- updateStatement2 = updateStatement();
- state.followingStackPointer--;
-
- adaptor.AddChild(root_0, updateStatement2.Tree);
-
- }
- break;
- case 3 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:41:40: deleteStatement
- {
- root_0 = (IASTNode)adaptor.GetNilNode();
-
- _last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_deleteStatement_in_statement176);
- deleteStatement3 = deleteStatement();
- state.followingStackPointer--;
-
- adaptor.AddChild(root_0, deleteStatement3.Tree);
-
- }
- break;
- case 4 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:41:58: insertStatement
- {
- root_0 = (IASTNode)adaptor.GetNilNode();
-
- _last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_insertStatement_in_statement180);
- insertStatement4 = insertStatement();
- state.followingStackPointer--;
-
- adaptor.AddChild(root_0, insertStatement4.Tree);
-
- }
- break;
-
- }
- retval.Tree = (IASTNode)adaptor.RulePostProcessing(root_0);
-
- }
- catch (RecognitionException re)
- {
- ReportError(re);
- Recover(input,re);
- }
- finally
- {
- }
- return retval;
- }
- // $ANTLR end "statement"
-
- public class selectStatement_return : TreeRuleReturnScope
- {
- private IASTNode tree;
- override public object Tree
- {
- get { return tree; }
- set { tree = (IASTNode) value; }
- }
- };
-
- // $ANTLR start "selectStatement"
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:44:1: selectStatement : query ;
- public HqlSqlWalker.selectStatement_return selectStatement() // throws RecognitionException [1]
- {
- HqlSqlWalker.selectStatement_return retval = new HqlSqlWalker.selectStatement_return();
- retval.Start = input.LT(1);
-
- IASTNode root_0 = null;
-
- IASTNode _first_0 = null;
- IASTNode _last = null;
-
- HqlSqlWalker.query_return query5 = default(HqlSqlWalker.query_return);
-
-
-
- try
- {
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:45:2: ( query )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:45:4: query
- {
- root_0 = (IASTNode)adaptor.GetNilNode();
-
- _last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_query_in_selectStatement191);
- query5 = query();
- state.followingStackPointer--;
-
- adaptor.AddChild(root_0, query5.Tree);
-
- }
-
- retval.Tree = (IASTNode)adaptor.RulePostProcessing(root_0);
-
- }
- catch (RecognitionException re)
- {
- ReportError(re);
- Recover(input,re);
- }
- finally
- {
- }
- return retval;
- }
- // $ANTLR end "selectStatement"
-
- public class updateStatement_return : TreeRuleReturnScope
- {
- private IASTNode tree;
- override public object Tree
- {
- get { return tree; }
- set { tree = (IASTNode) value; }
- }
- };
-
- // $ANTLR start "updateStatement"
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:51:1: updateStatement : ^(u= UPDATE (v= VERSIONED )? f= fromClause s= setClause (w= whereClause )? ) -> ^( $u $f $s ( $w)? ) ;
- public HqlSqlWalker.updateStatement_return updateStatement() // throws RecognitionException [1]
- {
- HqlSqlWalker.updateStatement_return retval = new HqlSqlWalker.updateStatement_return();
- retval.Start = input.LT(1);
-
- IASTNode root_0 = null;
-
- IASTNode _first_0 = null;
- IASTNode _last = null;
-
- IASTNode u = null;
- IASTNode v = null;
- HqlSqlWalker.fromClause_return f = default(HqlSqlWalker.fromClause_return);
-
- HqlSqlWalker.setClause_return s = default(HqlSqlWalker.setClause_return);
-
- HqlSqlWalker.whereClause_return w = default(HqlSqlWalker.whereClause_return);
-
-
- IASTNode u_tree=null;
- IASTNode v_tree=null;
- RewriteRuleNodeStream stream_UPDATE = new RewriteRuleNodeStream(adaptor,"token UPDATE");
- RewriteRuleNodeStream stream_VERSIONED = new RewriteRuleNodeStream(adaptor,"token VERSIONED");
- RewriteRuleSubtreeStream stream_whereClause = new RewriteRuleSubtreeStream(adaptor,"rule whereClause");
- RewriteRuleSubtreeStream stream_setClause = new RewriteRuleSubtreeStream(adaptor,"rule setClause");
- RewriteRuleSubtreeStream stream_fromClause = new RewriteRuleSubtreeStream(adaptor,"rule fromClause");
- try
- {
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:58:2: ( ^(u= UPDATE (v= VERSIONED )? f= fromClause s= setClause (w= whereClause )? ) -> ^( $u $f $s ( $w)? ) )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:58:4: ^(u= UPDATE (v= VERSIONED )? f= fromClause s= setClause (w= whereClause )? )
- {
- _last = (IASTNode)input.LT(1);
- {
- IASTNode _save_last_1 = _last;
- IASTNode _first_1 = null;
- IASTNode root_1 = (IASTNode)adaptor.GetNilNode();_last = (IASTNode)input.LT(1);
- u=(IASTNode)Match(input,UPDATE,FOLLOW_UPDATE_in_updateStatement215);
- stream_UPDATE.Add(u);
-
-
- BeforeStatement( "update", UPDATE );
-
- Match(input, Token.DOWN, null);
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:58:57: (v= VERSIONED )?
- int alt2 = 2;
- int LA2_0 = input.LA(1);
-
- if ( (LA2_0 == VERSIONED) )
- {
- alt2 = 1;
- }
- switch (alt2)
- {
- case 1 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:58:58: v= VERSIONED
- {
- _last = (IASTNode)input.LT(1);
- v=(IASTNode)Match(input,VERSIONED,FOLLOW_VERSIONED_in_updateStatement222);
- stream_VERSIONED.Add(v);
-
-
- }
- break;
-
- }
-
- _last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_fromClause_in_updateStatement228);
- f = fromClause();
- state.followingStackPointer--;
-
- stream_fromClause.Add(f.Tree);
- _last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_setClause_in_updateStatement232);
- s = setClause();
- state.followingStackPointer--;
-
- stream_setClause.Add(s.Tree);
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:58:97: (w= whereClause )?
- int alt3 = 2;
- int LA3_0 = input.LA(1);
-
- if ( (LA3_0 == WHERE) )
- {
- alt3 = 1;
- }
- switch (alt3)
- {
- case 1 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:58:98: w= whereClause
- {
- _last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_whereClause_in_updateStatement237);
- w = whereClause();
- state.followingStackPointer--;
-
- stream_whereClause.Add(w.Tree);
-
- }
- break;
-
- }
-
-
- Match(input, Token.UP, null); adaptor.AddChild(root_0, root_1);_last = _save_last_1;
- }
-
-
-
- // AST REWRITE
- // elements: u, f, s, w
- // token labels: u
- // rule labels: w, f, retval, s
- // token list labels:
- // rule list labels:
- // wildcard labels:
- retval.Tree = root_0;
- RewriteRuleNodeStream stream_u = new RewriteRuleNodeStream(adaptor, "token u", u);
- RewriteRuleSubtreeStream stream_w = new RewriteRuleSubtreeStream(adaptor, "rule w", w!=null ? w.Tree : null);
- RewriteRuleSubtreeStream stream_f = new RewriteRuleSubtreeStream(adaptor, "rule f", f!=null ? f.Tree : null);
- RewriteRuleSubtreeStream stream_retval = new RewriteRuleSubtreeStream(adaptor, "rule retval", retval!=null ? retval.Tree : null);
- RewriteRuleSubtreeStream stream_s = new RewriteRuleSubtreeStream(adaptor, "rule s", s!=null ? s.Tree : null);
-
- root_0 = (IASTNode)adaptor.GetNilNode();
- // 59:3: -> ^( $u $f $s ( $w)? )
- {
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:59:6: ^( $u $f $s ( $w)? )
- {
- IASTNode root_1 = (IASTNode)adaptor.GetNilNode();
- root_1 = (IASTNode)adaptor.BecomeRoot(stream_u.NextNode(), root_1);
-
- adaptor.AddChild(root_1, stream_f.NextTree());
- adaptor.AddChild(root_1, stream_s.NextTree());
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:59:17: ( $w)?
- if ( stream_w.HasNext() )
- {
- adaptor.AddChild(root_1, stream_w.NextTree());
-
- }
- stream_w.Reset();
-
- adaptor.AddChild(root_0, root_1);
- }
-
- }
-
- retval.Tree = root_0;
- }
-
- retval.Tree = (IASTNode)adaptor.RulePostProcessing(root_0);
-
-
- BeforeStatementCompletion( "update" );
- PrepareVersioned( ((IASTNode)retval.Tree), v );
- PostProcessUpdate( ((IASTNode)retval.Tree) );
- AfterStatementCompletion( "update" );
-
- }
- catch (RecognitionException re)
- {
- ReportError(re);
- Recover(input,re);
- }
- finally
- {
- }
- return retval;
- }
- // $ANTLR end "updateStatement"
-
- public class deleteStatement_return : TreeRuleReturnScope
- {
- private IASTNode tree;
- override public object Tree
- {
- get { return tree; }
- set { tree = (IASTNode) value; }
- }
- };
-
- // $ANTLR start "deleteStatement"
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:62:1: deleteStatement : ^( DELETE fromClause ( whereClause )? ) ;
- public HqlSqlWalker.deleteStatement_return deleteStatement() // throws RecognitionException [1]
- {
- HqlSqlWalker.deleteStatement_return retval = new HqlSqlWalker.deleteStatement_return();
- retval.Start = input.LT(1);
-
- IASTNode root_0 = null;
-
- IASTNode _first_0 = null;
- IASTNode _last = null;
-
- IASTNode DELETE6 = null;
- HqlSqlWalker.fromClause_return fromClause7 = default(HqlSqlWalker.fromClause_return);
-
- HqlSqlWalker.whereClause_return whereClause8 = default(HqlSqlWalker.whereClause_return);
-
-
- IASTNode DELETE6_tree=null;
-
- try
- {
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:68:2: ( ^( DELETE fromClause ( whereClause )? ) )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:68:4: ^( DELETE fromClause ( whereClause )? )
- {
- root_0 = (IASTNode)adaptor.GetNilNode();
-
- _last = (IASTNode)input.LT(1);
- {
- IASTNode _save_last_1 = _last;
- IASTNode _first_1 = null;
- IASTNode root_1 = (IASTNode)adaptor.GetNilNode();_last = (IASTNode)input.LT(1);
- DELETE6=(IASTNode)Match(input,DELETE,FOLLOW_DELETE_in_deleteStatement280);
- DELETE6_tree = (IASTNode)adaptor.DupNode(DELETE6);
-
- root_1 = (IASTNode)adaptor.BecomeRoot(DELETE6_tree, root_1);
-
-
- BeforeStatement( "delete", DELETE );
-
- Match(input, Token.DOWN, null);
- _last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_fromClause_in_deleteStatement284);
- fromClause7 = fromClause();
- state.followingStackPointer--;
-
- adaptor.AddChild(root_1, fromClause7.Tree);
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:68:66: ( whereClause )?
- int alt4 = 2;
- int LA4_0 = input.LA(1);
-
- if ( (LA4_0 == WHERE) )
- {
- alt4 = 1;
- }
- switch (alt4)
- {
- case 1 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:68:67: whereClause
- {
- _last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_whereClause_in_deleteStatement287);
- whereClause8 = whereClause();
- state.followingStackPointer--;
-
- adaptor.AddChild(root_1, whereClause8.Tree);
-
- }
- break;
-
- }
-
-
- Match(input, Token.UP, null); adaptor.AddChild(root_0, root_1);_last = _save_last_1;
- }
-
-
- }
-
- retval.Tree = (IASTNode)adaptor.RulePostProcessing(root_0);
-
-
- BeforeStatementCompletion( "delete" );
- PostProcessDelete( ((IASTNode)retval.Tree) );
- AfterStatementCompletion( "delete" );
-
- }
- catch (RecognitionException re)
- {
- ReportError(re);
- Recover(input,re);
- }
- finally
- {
- }
- return retval;
- }
- // $ANTLR end "deleteStatement"
-
- public class insertStatement_return : TreeRuleReturnScope
- {
- private IASTNode tree;
- override public object Tree
- {
- get { return tree; }
- set { tree = (IASTNode) value; }
- }
- };
-
- // $ANTLR start "insertStatement"
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:71:1: insertStatement : ^( INSERT intoClause query ) ;
- public HqlSqlWalker.insertStatement_return insertStatement() // throws RecognitionException [1]
- {
- HqlSqlWalker.insertStatement_return retval = new HqlSqlWalker.insertStatement_return();
- retval.Start = input.LT(1);
-
- IASTNode root_0 = null;
-
- IASTNode _first_0 = null;
- IASTNode _last = null;
-
- IASTNode INSERT9 = null;
- HqlSqlWalker.intoClause_return intoClause10 = default(HqlSqlWalker.intoClause_return);
-
- HqlSqlWalker.query_return query11 = default(HqlSqlWalker.query_return);
-
-
- IASTNode INSERT9_tree=null;
-
- try
- {
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:80:2: ( ^( INSERT intoClause query ) )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:80:4: ^( INSERT intoClause query )
- {
- root_0 = (IASTNode)adaptor.GetNilNode();
-
- _last = (IASTNode)input.LT(1);
- {
- IASTNode _save_last_1 = _last;
- IASTNode _first_1 = null;
- IASTNode root_1 = (IASTNode)adaptor.GetNilNode();_last = (IASTNode)input.LT(1);
- INSERT9=(IASTNode)Match(input,INSERT,FOLLOW_INSERT_in_insertStatement317);
- INSERT9_tree = (IASTNode)adaptor.DupNode(INSERT9);
-
- root_1 = (IASTNode)adaptor.BecomeRoot(INSERT9_tree, root_1);
-
-
- BeforeStatement( "insert", INSERT );
-
- Match(input, Token.DOWN, null);
- _last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_intoClause_in_insertStatement321);
- intoClause10 = intoClause();
- state.followingStackPointer--;
-
- adaptor.AddChild(root_1, intoClause10.Tree);
- _last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_query_in_insertStatement323);
- query11 = query();
- state.followingStackPointer--;
-
- adaptor.AddChild(root_1, query11.Tree);
-
- Match(input, Token.UP, null); adaptor.AddChild(root_0, root_1);_last = _save_last_1;
- }
-
-
- }
-
- retval.Tree = (IASTNode)adaptor.RulePostProcessing(root_0);
-
-
- BeforeStatementCompletion( "insert" );
- PostProcessInsert( ((IASTNode)retval.Tree) );
- AfterStatementCompletion( "insert" );
-
- }
- catch (RecognitionException re)
- {
- ReportError(re);
- Recover(input,re);
- }
- finally
- {
- }
- return retval;
- }
- // $ANTLR end "insertStatement"
-
- public class intoClause_return : TreeRuleReturnScope
- {
- private IASTNode tree;
- override public object Tree
- {
- get { return tree; }
- set { tree = (IASTNode) value; }
- }
- };
-
- // $ANTLR start "intoClause"
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:83:1: intoClause : ^( INTO (p= path ) ps= insertablePropertySpec ) ;
- public HqlSqlWalker.intoClause_return intoClause() // throws RecognitionException [1]
- {
- HqlSqlWalker.intoClause_return retval = new HqlSqlWalker.intoClause_return();
- retval.Start = input.LT(1);
-
- IASTNode root_0 = null;
-
- IASTNode _first_0 = null;
- IASTNode _last = null;
-
- IASTNode INTO12 = null;
- HqlSqlWalker.path_return p = default(HqlSqlWalker.path_return);
-
- HqlSqlWalker.insertablePropertySpec_return ps = default(HqlSqlWalker.insertablePropertySpec_return);
-
-
- IASTNode INTO12_tree=null;
-
- try
- {
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:87:2: ( ^( INTO (p= path ) ps= insertablePropertySpec ) )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:87:4: ^( INTO (p= path ) ps= insertablePropertySpec )
- {
- root_0 = (IASTNode)adaptor.GetNilNode();
-
- _last = (IASTNode)input.LT(1);
- {
- IASTNode _save_last_1 = _last;
- IASTNode _first_1 = null;
- IASTNode root_1 = (IASTNode)adaptor.GetNilNode();_last = (IASTNode)input.LT(1);
- INTO12=(IASTNode)Match(input,INTO,FOLLOW_INTO_in_intoClause347);
- INTO12_tree = (IASTNode)adaptor.DupNode(INTO12);
-
- root_1 = (IASTNode)adaptor.BecomeRoot(INTO12_tree, root_1);
-
-
- HandleClauseStart( INTO );
-
- Match(input, Token.DOWN, null);
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:87:43: (p= path )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:87:44: p= path
- {
- _last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_path_in_intoClause354);
- p = path();
- state.followingStackPointer--;
-
- adaptor.AddChild(root_1, p.Tree);
-
- }
-
- _last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_insertablePropertySpec_in_intoClause359);
- ps = insertablePropertySpec();
- state.followingStackPointer--;
-
- adaptor.AddChild(root_1, ps.Tree);
-
- Match(input, Token.UP, null); adaptor.AddChild(root_0, root_1);_last = _save_last_1;
- }
-
-
- }
-
- retval.Tree = (IASTNode)adaptor.RulePostProcessing(root_0);
-
-
- retval.Tree = CreateIntoClause(((p != null) ? p.p : default(String)), ((ps != null) ? ((IASTNode)ps.Tree) : null));
-
- }
- catch (RecognitionException re)
- {
- ReportError(re);
- Recover(input,re);
- }
- finally
- {
- }
- return retval;
- }
- // $ANTLR end "intoClause"
-
- public class insertablePropertySpec_return : TreeRuleReturnScope
- {
- private IASTNode tree;
- override public object Tree
- {
- get { return tree; }
- set { tree = (IASTNode) value; }
- }
- };
-
- // $ANTLR start "insertablePropertySpec"
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:90:1: insertablePropertySpec : ^( RANGE ( IDENT )+ ) ;
- public HqlSqlWalker.insertablePropertySpec_return insertablePropertySpec() // throws RecognitionException [1]
- {
- HqlSqlWalker.insertablePropertySpec_return retval = new HqlSqlWalker.insertablePropertySpec_return();
- retval.Start = input.LT(1);
-
- IASTNode root_0 = null;
-
- IASTNode _first_0 = null;
- IASTNode _last = null;
-
- IASTNode RANGE13 = null;
- IASTNode IDENT14 = null;
-
- IASTNode RANGE13_tree=null;
- IASTNode IDENT14_tree=null;
-
- try
- {
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:91:2: ( ^( RANGE ( IDENT )+ ) )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:91:4: ^( RANGE ( IDENT )+ )
- {
- root_0 = (IASTNode)adaptor.GetNilNode();
-
- _last = (IASTNode)input.LT(1);
- {
- IASTNode _save_last_1 = _last;
- IASTNode _first_1 = null;
- IASTNode root_1 = (IASTNode)adaptor.GetNilNode();_last = (IASTNode)input.LT(1);
- RANGE13=(IASTNode)Match(input,RANGE,FOLLOW_RANGE_in_insertablePropertySpec375);
- RANGE13_tree = (IASTNode)adaptor.DupNode(RANGE13);
-
- root_1 = (IASTNode)adaptor.BecomeRoot(RANGE13_tree, root_1);
-
-
-
- Match(input, Token.DOWN, null);
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:91:13: ( IDENT )+
- int cnt5 = 0;
- do
- {
- int alt5 = 2;
- int LA5_0 = input.LA(1);
-
- if ( (LA5_0 == IDENT) )
- {
- alt5 = 1;
- }
-
-
- switch (alt5)
- {
- case 1 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:91:14: IDENT
- {
- _last = (IASTNode)input.LT(1);
- IDENT14=(IASTNode)Match(input,IDENT,FOLLOW_IDENT_in_insertablePropertySpec378);
- IDENT14_tree = (IASTNode)adaptor.DupNode(IDENT14);
-
- adaptor.AddChild(root_1, IDENT14_tree);
-
-
- }
- break;
-
- default:
- if ( cnt5 >= 1 ) goto loop5;
- EarlyExitException eee5 =
- new EarlyExitException(5, input);
- throw eee5;
- }
- cnt5++;
- } while (true);
-
- loop5:
- ; // Stops C# compiler whinging that label 'loop5' has no statements
-
-
- Match(input, Token.UP, null); adaptor.AddChild(root_0, root_1);_last = _save_last_1;
- }
-
-
- }
-
- retval.Tree = (IASTNode)adaptor.RulePostProcessing(root_0);
-
- }
- catch (RecognitionException re)
- {
- ReportError(re);
- Recover(input,re);
- }
- finally
- {
- }
- return retval;
- }
- // $ANTLR end "insertablePropertySpec"
-
- public class setClause_return : TreeRuleReturnScope
- {
- private IASTNode tree;
- override public object Tree
- {
- get { return tree; }
- set { tree = (IASTNode) value; }
- }
- };
-
- // $ANTLR start "setClause"
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:94:1: setClause : ^( SET ( assignment )* ) ;
- public HqlSqlWalker.setClause_return setClause() // throws RecognitionException [1]
- {
- HqlSqlWalker.setClause_return retval = new HqlSqlWalker.setClause_return();
- retval.Start = input.LT(1);
-
- IASTNode root_0 = null;
-
- IASTNode _first_0 = null;
- IASTNode _last = null;
-
- IASTNode SET15 = null;
- HqlSqlWalker.assignment_return assignment16 = default(HqlSqlWalker.assignment_return);
-
-
- IASTNode SET15_tree=null;
-
- try
- {
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:95:2: ( ^( SET ( assignment )* ) )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:95:4: ^( SET ( assignment )* )
- {
- root_0 = (IASTNode)adaptor.GetNilNode();
-
- _last = (IASTNode)input.LT(1);
- {
- IASTNode _save_last_1 = _last;
- IASTNode _first_1 = null;
- IASTNode root_1 = (IASTNode)adaptor.GetNilNode();_last = (IASTNode)input.LT(1);
- SET15=(IASTNode)Match(input,SET,FOLLOW_SET_in_setClause395);
- SET15_tree = (IASTNode)adaptor.DupNode(SET15);
-
- root_1 = (IASTNode)adaptor.BecomeRoot(SET15_tree, root_1);
-
-
- HandleClauseStart( SET );
-
- if ( input.LA(1) == Token.DOWN )
- {
- Match(input, Token.DOWN, null);
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:95:41: ( assignment )*
- do
- {
- int alt6 = 2;
- int LA6_0 = input.LA(1);
-
- if ( (LA6_0 == EQ) )
- {
- alt6 = 1;
- }
-
-
- switch (alt6)
- {
- case 1 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:95:42: assignment
- {
- _last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_assignment_in_setClause400);
- assignment16 = assignment();
- state.followingStackPointer--;
-
- adaptor.AddChild(root_1, assignment16.Tree);
-
- }
- break;
-
- default:
- goto loop6;
- }
- } while (true);
-
- loop6:
- ; // Stops C# compiler whining that label 'loop6' has no statements
-
-
- Match(input, Token.UP, null);
- }adaptor.AddChild(root_0, root_1);_last = _save_last_1;
- }
-
-
- }
-
- retval.Tree = (IASTNode)adaptor.RulePostProcessing(root_0);
-
- }
- catch (RecognitionException re)
- {
- ReportError(re);
- Recover(input,re);
- }
- finally
- {
- }
- return retval;
- }
- // $ANTLR end "setClause"
-
- public class assignment_return : TreeRuleReturnScope
- {
- private IASTNode tree;
- override public object Tree
- {
- get { return tree; }
- set { tree = (IASTNode) value; }
- }
- };
-
- // $ANTLR start "assignment"
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:98:1: assignment : ^( EQ (p= propertyRef ) ( newValue ) ) ;
- public HqlSqlWalker.assignment_return assignment() // throws RecognitionException [1]
- {
- HqlSqlWalker.assignment_return retval = new HqlSqlWalker.assignment_return();
- retval.Start = input.LT(1);
-
- IASTNode root_0 = null;
-
- IASTNode _first_0 = null;
- IASTNode _last = null;
-
- IASTNode EQ17 = null;
- HqlSqlWalker.propertyRef_return p = default(HqlSqlWalker.propertyRef_return);
-
- HqlSqlWalker.newValue_return newValue18 = default(HqlSqlWalker.newValue_return);
-
-
- IASTNode EQ17_tree=null;
-
- try
- {
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:104:2: ( ^( EQ (p= propertyRef ) ( newValue ) ) )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:104:4: ^( EQ (p= propertyRef ) ( newValue ) )
- {
- root_0 = (IASTNode)adaptor.GetNilNode();
-
- _last = (IASTNode)input.LT(1);
- {
- IASTNode _save_last_1 = _last;
- IASTNode _first_1 = null;
- IASTNode root_1 = (IASTNode)adaptor.GetNilNode();_last = (IASTNode)input.LT(1);
- EQ17=(IASTNode)Match(input,EQ,FOLLOW_EQ_in_assignment427);
- EQ17_tree = (IASTNode)adaptor.DupNode(EQ17);
-
- root_1 = (IASTNode)adaptor.BecomeRoot(EQ17_tree, root_1);
-
-
-
- Match(input, Token.DOWN, null);
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:104:10: (p= propertyRef )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:104:11: p= propertyRef
- {
- _last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_propertyRef_in_assignment432);
- p = propertyRef();
- state.followingStackPointer--;
-
- adaptor.AddChild(root_1, p.Tree);
-
- }
-
- Resolve(((p != null) ? ((IASTNode)p.Tree) : null));
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:104:48: ( newValue )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:104:49: newValue
- {
- _last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_newValue_in_assignment438);
- newValue18 = newValue();
- state.followingStackPointer--;
-
- adaptor.AddChild(root_1, newValue18.Tree);
-
- }
-
-
- Match(input, Token.UP, null); adaptor.AddChild(root_0, root_1);_last = _save_last_1;
- }
-
-
- }
-
- retval.Tree = (IASTNode)adaptor.RulePostProcessing(root_0);
-
-
- EvaluateAssignment( ((IASTNode)retval.Tree) );
-
- }
- catch (RecognitionException re)
- {
- ReportError(re);
- Recover(input,re);
- }
- finally
- {
- }
- return retval;
- }
- // $ANTLR end "assignment"
-
- public class newValue_return : TreeRuleReturnScope
- {
- private IASTNode tree;
- override public object Tree
- {
- get { return tree; }
- set { tree = (IASTNode) value; }
- }
- };
-
- // $ANTLR start "newValue"
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:108:1: newValue : ( expr | query );
- public HqlSqlWalker.newValue_return newValue() // throws RecognitionException [1]
- {
- HqlSqlWalker.newValue_return retval = new HqlSqlWalker.newValue_return();
- retval.Start = input.LT(1);
-
- IASTNode root_0 = null;
-
- IASTNode _first_0 = null;
- IASTNode _last = null;
-
- HqlSqlWalker.expr_return expr19 = default(HqlSqlWalker.expr_return);
-
- HqlSqlWalker.query_return query20 = default(HqlSqlWalker.query_return);
-
-
-
- try
- {
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:109:2: ( expr | query )
- int alt7 = 2;
- int LA7_0 = input.LA(1);
-
- if ( (LA7_0 == COUNT || LA7_0 == DOT || LA7_0 == FALSE || LA7_0 == NULL || LA7_0 == TRUE || LA7_0 == CASE || LA7_0 == AGGREGATE || LA7_0 == CASE2 || LA7_0 == INDEX_OP || LA7_0 == METHOD_CALL || LA7_0 == UNARY_MINUS || (LA7_0 >= VECTOR_EXPR && LA7_0 <= WEIRD_IDENT) || (LA7_0 >= NUM_INT && LA7_0 <= JAVA_CONSTANT) || (LA7_0 >= PLUS && LA7_0 <= DIV) || (LA7_0 >= COLON && LA7_0 <= IDENT)) )
- {
- alt7 = 1;
- }
- else if ( (LA7_0 == QUERY) )
- {
- alt7 = 2;
- }
- else
- {
- NoViableAltException nvae_d7s0 =
- new NoViableAltException("", 7, 0, input);
-
- throw nvae_d7s0;
- }
- switch (alt7)
- {
- case 1 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:109:4: expr
- {
- root_0 = (IASTNode)adaptor.GetNilNode();
-
- _last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_expr_in_newValue454);
- expr19 = expr();
- state.followingStackPointer--;
-
- adaptor.AddChild(root_0, expr19.Tree);
-
- }
- break;
- case 2 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:109:11: query
- {
- root_0 = (IASTNode)adaptor.GetNilNode();
-
- _last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_query_in_newValue458);
- query20 = query();
- state.followingStackPointer--;
-
- adaptor.AddChild(root_0, query20.Tree);
-
- }
- break;
-
- }
- retval.Tree = (IASTNode)adaptor.RulePostProcessing(root_0);
-
- }
- catch (RecognitionException re)
- {
- ReportError(re);
- Recover(input,re);
- }
- finally
- {
- }
- return retval;
- }
- // $ANTLR end "newValue"
-
- public class query_return : TreeRuleReturnScope
- {
- private IASTNode tree;
- override public object Tree
- {
- get { return tree; }
- set { tree = (IASTNode) value; }
- }
- };
-
- // $ANTLR start "query"
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:114:1: query : ^( QUERY ^( SELECT_FROM f= fromClause (s= selectClause )? ) (w= whereClause )? (g= groupClause )? (o= orderClause )? ) -> ^( SELECT ( $s)? $f ( $w)? ( $g)? ( $o)? ) ;
- public HqlSqlWalker.query_return query() // throws RecognitionException [1]
- {
- HqlSqlWalker.query_return retval = new HqlSqlWalker.query_return();
- retval.Start = input.LT(1);
-
- IASTNode root_0 = null;
-
- IASTNode _first_0 = null;
- IASTNode _last = null;
-
- IASTNode QUERY21 = null;
- IASTNode SELECT_FROM22 = null;
- HqlSqlWalker.fromClause_return f = default(HqlSqlWalker.fromClause_return);
-
- HqlSqlWalker.selectClause_return s = default(HqlSqlWalker.selectClause_return);
-
- HqlSqlWalker.whereClause_return w = default(HqlSqlWalker.whereClause_return);
-
- HqlSqlWalker.groupClause_return g = default(HqlSqlWalker.groupClause_return);
-
- HqlSqlWalker.orderClause_return o = default(HqlSqlWalker.orderClause_return);
-
-
- IASTNode QUERY21_tree=null;
- IASTNode SELECT_FROM22_tree=null;
- RewriteRuleNodeStream stream_SELECT_FROM = new RewriteRuleNodeStream(adaptor,"token SELECT_FROM");
- RewriteRuleNodeStream stream_QUERY = new RewriteRuleNodeStream(adaptor,"token QUERY");
- RewriteRuleSubtreeStream stream_whereClause = new RewriteRuleSubtreeStream(adaptor,"rule whereClause");
- RewriteRuleSubtreeStream stream_orderClause = new RewriteRuleSubtreeStream(adaptor,"rule orderClause");
- RewriteRuleSubtreeStream stream_groupClause = new RewriteRuleSubtreeStream(adaptor,"rule groupClause");
- RewriteRuleSubtreeStream stream_fromClause = new RewriteRuleSubtreeStream(adaptor,"rule fromClause");
- RewriteRuleSubtreeStream stream_selectClause = new RewriteRuleSubtreeStream(adaptor,"rule selectClause");
- try
- {
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:121:2: ( ^( QUERY ^( SELECT_FROM f= fromClause (s= selectClause )? ) (w= whereClause )? (g= groupClause )? (o= orderClause )? ) -> ^( SELECT ( $s)? $f ( $w)? ( $g)? ( $o)? ) )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:121:4: ^( QUERY ^( SELECT_FROM f= fromClause (s= selectClause )? ) (w= whereClause )? (g= groupClause )? (o= orderClause )? )
- {
- _last = (IASTNode)input.LT(1);
- {
- IASTNode _save_last_1 = _last;
- IASTNode _first_1 = null;
- IASTNode root_1 = (IASTNode)adaptor.GetNilNode();_last = (IASTNode)input.LT(1);
- QUERY21=(IASTNode)Match(input,QUERY,FOLLOW_QUERY_in_query480);
- stream_QUERY.Add(QUERY21);
-
-
- BeforeStatement( "select", SELECT );
-
- Match(input, Token.DOWN, null);
- _last = (IASTNode)input.LT(1);
- {
- IASTNode _save_last_2 = _last;
- IASTNode _first_2 = null;
- IASTNode root_2 = (IASTNode)adaptor.GetNilNode();_last = (IASTNode)input.LT(1);
- SELECT_FROM22=(IASTNode)Match(input,SELECT_FROM,FOLLOW_SELECT_FROM_in_query492);
- stream_SELECT_FROM.Add(SELECT_FROM22);
-
-
-
- Match(input, Token.DOWN, null);
- _last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_fromClause_in_query500);
- f = fromClause();
- state.followingStackPointer--;
-
- stream_fromClause.Add(f.Tree);
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:125:5: (s= selectClause )?
- int alt8 = 2;
- int LA8_0 = input.LA(1);
-
- if ( (LA8_0 == SELECT) )
- {
- alt8 = 1;
- }
- switch (alt8)
- {
- case 1 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:125:6: s= selectClause
- {
- _last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_selectClause_in_query509);
- s = selectClause();
- state.followingStackPointer--;
-
- stream_selectClause.Add(s.Tree);
-
- }
- break;
-
- }
-
-
- Match(input, Token.UP, null); adaptor.AddChild(root_1, root_2);_last = _save_last_2;
- }
-
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:127:4: (w= whereClause )?
- int alt9 = 2;
- int LA9_0 = input.LA(1);
-
- if ( (LA9_0 == WHERE) )
- {
- alt9 = 1;
- }
- switch (alt9)
- {
- case 1 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:127:5: w= whereClause
- {
- _last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_whereClause_in_query524);
- w = whereClause();
- state.followingStackPointer--;
-
- stream_whereClause.Add(w.Tree);
-
- }
- break;
-
- }
-
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:128:4: (g= groupClause )?
- int alt10 = 2;
- int LA10_0 = input.LA(1);
-
- if ( (LA10_0 == GROUP) )
- {
- alt10 = 1;
- }
- switch (alt10)
- {
- case 1 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:128:5: g= groupClause
- {
- _last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_groupClause_in_query534);
- g = groupClause();
- state.followingStackPointer--;
-
- stream_groupClause.Add(g.Tree);
-
- }
- break;
-
- }
-
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:129:4: (o= orderClause )?
- int alt11 = 2;
- int LA11_0 = input.LA(1);
-
- if ( (LA11_0 == ORDER) )
- {
- alt11 = 1;
- }
- switch (alt11)
- {
- case 1 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:129:5: o= orderClause
- {
- _last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_orderClause_in_query544);
- o = orderClause();
- state.followingStackPointer--;
-
- stream_orderClause.Add(o.Tree);
-
- }
- break;
-
- }
-
-
- Match(input, Token.UP, null); adaptor.AddChild(root_0, root_1);_last = _save_last_1;
- }
-
-
-
- // AST REWRITE
- // elements: s, o, w, f, g
- // token labels:
- // rule labels: f, w, g, retval, s, o
- // token list labels:
- // rule list labels:
- // wildcard labels:
- retval.Tree = root_0;
- RewriteRuleSubtreeStream stream_f = new RewriteRuleSubtreeStream(adaptor, "rule f", f!=null ? f.Tree : null);
- RewriteRuleSubtreeStream stream_w = new RewriteRuleSubtreeStream(adaptor, "rule w", w!=null ? w.Tree : null);
- RewriteRuleSubtreeStream stream_g = new RewriteRuleSubtreeStream(adaptor, "rule g", g!=null ? g.Tree : null);
- RewriteRuleSubtreeStream stream_retval = new RewriteRuleSubtreeStream(adaptor, "rule retval", retval!=null ? retval.Tree : null);
- RewriteRuleSubtreeStream stream_s = new RewriteRuleSubtreeStream(adaptor, "rule s", s!=null ? s.Tree : null);
- RewriteRuleSubtreeStream stream_o = new RewriteRuleSubtreeStream(adaptor, "rule o", o!=null ? o.Tree : null);
-
- root_0 = (IASTNode)adaptor.GetNilNode();
- // 131:2: -> ^( SELECT ( $s)? $f ( $w)? ( $g)? ( $o)? )
- {
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:131:5: ^( SELECT ( $s)? $f ( $w)? ( $g)? ( $o)? )
- {
- IASTNode root_1 = (IASTNode)adaptor.GetNilNode();
- root_1 = (IASTNode)adaptor.BecomeRoot((IASTNode)adaptor.Create(SELECT, "SELECT"), root_1);
-
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:131:14: ( $s)?
- if ( stream_s.HasNext() )
- {
- adaptor.AddChild(root_1, stream_s.NextTree());
-
- }
- stream_s.Reset();
- adaptor.AddChild(root_1, stream_f.NextTree());
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:131:21: ( $w)?
- if ( stream_w.HasNext() )
- {
- adaptor.AddChild(root_1, stream_w.NextTree());
-
- }
- stream_w.Reset();
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:131:25: ( $g)?
- if ( stream_g.HasNext() )
- {
- adaptor.AddChild(root_1, stream_g.NextTree());
-
- }
- stream_g.Reset();
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:131:29: ( $o)?
- if ( stream_o.HasNext() )
- {
- adaptor.AddChild(root_1, stream_o.NextTree());
-
- }
- stream_o.Reset();
-
- adaptor.AddChild(root_0, root_1);
- }
-
- }
-
- retval.Tree = root_0;
- }
-
- retval.Tree = (IASTNode)adaptor.RulePostProcessing(root_0);
-
-
- // Antlr note: #x_in refers to the input AST, #x refers to the output AST
- BeforeStatementCompletion( "select" );
- ProcessQuery( ((s != null) ? ((IASTNode)s.Tree) : null), ((IASTNode)retval.Tree) );
- AfterStatementCompletion( "select" );
-
- }
- catch (RecognitionException re)
- {
- ReportError(re);
- Recover(input,re);
- }
- finally
- {
- }
- return retval;
- }
- // $ANTLR end "query"
-
- public class orderClause_return : TreeRuleReturnScope
- {
- private IASTNode tree;
- override public object Tree
- {
- get { return tree; }
- set { tree = (IASTNode) value; }
- }
- };
-
- // $ANTLR start "orderClause"
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:134:1: orderClause : ^( ORDER orderExprs ) ;
- public HqlSqlWalker.orderClause_return orderClause() // throws RecognitionException [1]
- {
- HqlSqlWalker.orderClause_return retval = new HqlSqlWalker.orderClause_return();
- retval.Start = input.LT(1);
-
- IASTNode root_0 = null;
-
- IASTNode _first_0 = null;
- IASTNode _last = null;
-
- IASTNode ORDER23 = null;
- HqlSqlWalker.orderExprs_return orderExprs24 = default(HqlSqlWalker.orderExprs_return);
-
-
- IASTNode ORDER23_tree=null;
-
- try
- {
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:135:2: ( ^( ORDER orderExprs ) )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:135:4: ^( ORDER orderExprs )
- {
- root_0 = (IASTNode)adaptor.GetNilNode();
-
- _last = (IASTNode)input.LT(1);
- {
- IASTNode _save_last_1 = _last;
- IASTNode _first_1 = null;
- IASTNode root_1 = (IASTNode)adaptor.GetNilNode();_last = (IASTNode)input.LT(1);
- ORDER23=(IASTNode)Match(input,ORDER,FOLLOW_ORDER_in_orderClause589);
- ORDER23_tree = (IASTNode)adaptor.DupNode(ORDER23);
-
- root_1 = (IASTNode)...
[truncated message content] |
|
From: <ste...@us...> - 2009-05-13 16:09:03
|
Revision: 4290
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4290&view=rev
Author: steverstrong
Date: 2009-05-13 16:08:36 +0000 (Wed, 13 May 2009)
Log Message:
-----------
Cleaned up some code; a few renames, some reformatting, that sort of thing. No functional changes.
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/AssignmentSpecification.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/BooleanLiteralNode.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/DeleteStatement.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/DotNode.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/FromClause.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/FromElement.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/FromElementFactory.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/FromElementType.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/FromReferenceNode.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/HqlSqlWalkerTreeAdapter.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/HqlSqlWalkerTreeNodeStream.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/HqlTreeAdapter.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/IdentNode.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/ImpliedFromElement.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/InLogicOperatorNode.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/IndexNode.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/IntoClause.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/JavaConstantNode.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/MethodNode.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/ParameterNode.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/QueryNode.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/SelectClause.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/SqlFragment.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/SqlNode.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/UpdateStatement.cs
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs 2009-05-13 15:37:55 UTC (rev 4289)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs 2009-05-13 16:08:36 UTC (rev 4290)
@@ -682,29 +682,9 @@
IASTNode CreateFromElement(string path, IASTNode pathNode, IASTNode alias, IASTNode propertyFetch)
{
- // try
- {
- FromElement fromElement = _currentFromClause.AddFromElement(path, alias);
- fromElement.SetAllPropertyFetch(propertyFetch != null);
- return fromElement;
- }
- /*
- catch (Exception e)
- {
- // Try resolving as if it were a join
- // TODO - clean this up!
- try
- {
- pathNode = PreProcessPathForJoin(pathNode);
-
- CreateFromJoinElement(pathNode, alias, INNER, null, null, null);
- return null;
- }
- catch (Exception)
- {
- throw e;
- }
- }*/
+ FromElement fromElement = _currentFromClause.AddFromElement(path, alias);
+ fromElement.SetAllPropertyFetch(propertyFetch != null);
+ return fromElement;
}
private IASTNode PreProcessPathForJoin(IASTNode node)
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/AssignmentSpecification.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/AssignmentSpecification.cs 2009-05-13 15:37:55 UTC (rev 4289)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/AssignmentSpecification.cs 2009-05-13 16:08:36 UTC (rev 4290)
@@ -17,11 +17,11 @@
[CLSCompliant(false)]
public class AssignmentSpecification
{
- private readonly IASTNode eq;
- private readonly ISessionFactoryImplementor factory;
- private readonly ISet<string> tableNames;
- private readonly IParameterSpecification[] hqlParameters;
- private SqlString sqlAssignmentString;
+ private readonly IASTNode _eq;
+ private readonly ISessionFactoryImplementor _factory;
+ private readonly ISet<string> _tableNames;
+ private readonly IParameterSpecification[] _hqlParameters;
+ private SqlString _sqlAssignmentString;
public AssignmentSpecification(IASTNode eq, IQueryable persister)
{
@@ -30,8 +30,8 @@
throw new QueryException("assignment in set-clause not associated with equals");
}
- this.eq = eq;
- factory = persister.Factory;
+ _eq = eq;
+ _factory = persister.Factory;
// Needed to bump this up to DotNode, because that is the only thing which currently
// knows about the property-ref path in the correct format; it is either this, or
@@ -63,30 +63,30 @@
{
temp.Add(persister.GetSubclassTableName(persister.GetSubclassPropertyTableNumber(propertyPath)));
}
- tableNames = new ImmutableSet<string>(temp);
+ _tableNames = new ImmutableSet<string>(temp);
if (rhs == null)
{
- hqlParameters = new IParameterSpecification[0];
+ _hqlParameters = new IParameterSpecification[0];
}
else if (IsParam(rhs))
{
- hqlParameters = new[] { ((ParameterNode)rhs).HqlParameterSpecification };
+ _hqlParameters = new[] { ((ParameterNode)rhs).HqlParameterSpecification };
}
else
{
var parameterList = ASTUtil.CollectChildren(rhs, IsParam);
- hqlParameters = new IParameterSpecification[parameterList.Count];
+ _hqlParameters = new IParameterSpecification[parameterList.Count];
int i = 0;
foreach (ParameterNode parameterNode in parameterList)
{
- hqlParameters[i++] = parameterNode.HqlParameterSpecification;
+ _hqlParameters[i++] = parameterNode.HqlParameterSpecification;
}
}
}
public bool AffectsTable(string tableName)
{
- return tableNames.Contains(tableName);
+ return _tableNames.Contains(tableName);
}
private static bool IsParam(IASTNode node)
@@ -124,27 +124,27 @@
public IParameterSpecification[] Parameters
{
- get{return hqlParameters;}
+ get{return _hqlParameters;}
}
public SqlString SqlAssignmentFragment
{
get
{
- if (sqlAssignmentString == null)
+ if (_sqlAssignmentString == null)
{
try
{
- var gen = new SqlGenerator(factory, new CommonTreeNodeStream(eq));
+ var gen = new SqlGenerator(_factory, new CommonTreeNodeStream(_eq));
gen.comparisonExpr(false); // false indicates to not generate parens around the assignment
- sqlAssignmentString = gen.GetSQL();
+ _sqlAssignmentString = gen.GetSQL();
}
catch (Exception t)
{
throw new QueryException("cannot interpret set-clause assignment", t);
}
}
- return sqlAssignmentString;
+ return _sqlAssignmentString;
}
}
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/BooleanLiteralNode.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/BooleanLiteralNode.cs 2009-05-13 15:37:55 UTC (rev 4289)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/BooleanLiteralNode.cs 2009-05-13 16:08:36 UTC (rev 4290)
@@ -12,7 +12,7 @@
[CLSCompliant(false)]
public class BooleanLiteralNode : LiteralNode, IExpectedTypeAwareNode
{
- private IType expectedType;
+ private IType _expectedType;
public BooleanLiteralNode(IToken token) : base(token)
{
@@ -22,7 +22,7 @@
{
get
{
- return expectedType ?? NHibernateUtil.Boolean;
+ return _expectedType ?? NHibernateUtil.Boolean;
}
set
{
@@ -46,8 +46,8 @@
*/
public IType ExpectedType
{
- get { return expectedType; }
- set { expectedType = value; }
+ get { return _expectedType; }
+ set { _expectedType = value; }
}
public override SqlString RenderText(ISessionFactoryImplementor sessionFactory)
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/DeleteStatement.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/DeleteStatement.cs 2009-05-13 15:37:55 UTC (rev 4289)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/DeleteStatement.cs 2009-05-13 16:08:36 UTC (rev 4290)
@@ -11,7 +11,7 @@
[CLSCompliant(false)]
public class DeleteStatement : AbstractRestrictableStatement
{
- private static readonly ILog log = LogManager.GetLogger(typeof(DeleteStatement));
+ private static readonly ILog Log = LogManager.GetLogger(typeof(DeleteStatement));
public DeleteStatement(IToken token) : base(token) {}
@@ -27,7 +27,7 @@
protected override ILog GetLog()
{
- return log;
+ return Log;
}
protected override int GetWhereClauseParentTokenType()
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/DotNode.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/DotNode.cs 2009-05-13 15:37:55 UTC (rev 4289)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/DotNode.cs 2009-05-13 16:08:36 UTC (rev 4290)
@@ -20,18 +20,18 @@
[CLSCompliant(false)]
public class DotNode : FromReferenceNode, ISelectExpression
{
- private static readonly ILog log = LogManager.GetLogger(typeof(DotNode));
+ private static readonly ILog Log = LogManager.GetLogger(typeof(DotNode));
- private const int DEREF_UNKNOWN = 0;
- private const int DEREF_ENTITY = 1;
- private const int DEREF_COMPONENT = 2;
- private const int DEREF_COLLECTION = 3;
- private const int DEREF_PRIMITIVE = 4;
- private const int DEREF_IDENTIFIER = 5;
- private const int DEREF_JAVA_CONSTANT = 6;
+ private const int DerefUnknown = 0;
+ private const int DerefEntity = 1;
+ private const int DerefComponent = 2;
+ private const int DerefCollection = 3;
+ private const int DerefPrimitive = 4;
+ private const int DerefIdentifier = 5;
+ private const int DerefJavaConstant = 6;
- public static bool UseThetaStyleImplicitJoins = false;
- public static bool REGRESSION_STYLE_JOIN_SUPPRESSION = false;
+ public static bool UseThetaStyleImplicitJoins;
+ public static bool REGRESSION_STYLE_JOIN_SUPPRESSION;
/// <summary>
/// The full path, to the root alias of this dot node.
@@ -41,7 +41,7 @@
/// <summary>
/// The type of dereference that hapened (DEREF_xxx).
/// </summary>
- private int _dereferenceType = DEREF_UNKNOWN;
+ private int _dereferenceType = DerefUnknown;
/// <summary>
/// The identifier that is the name of the property.
@@ -109,7 +109,7 @@
else
{
SqlNode rhs = (SqlNode) lhs.NextSibling;
- _path = lhs.Path + "." + rhs.getOriginalText();
+ _path = lhs.Path + "." + rhs.OriginalText;
}
}
return _path;
@@ -138,7 +138,7 @@
IType propertyType = PrepareLhs(); // Prepare the left hand side and get the data type.
- DereferenceCollection( ( CollectionType ) propertyType, true, true, null, parent );
+ DereferenceCollection( ( CollectionType ) propertyType, true, true, null);
}
public override void ResolveFirstChild()
@@ -181,7 +181,7 @@
else
{
ResolveFirstChild();
- base.Resolve(generateJoin, implicitJoin);
+ Resolve(generateJoin, implicitJoin);
}
}
@@ -226,7 +226,7 @@
{
// The property is a collection...
CheckLhsIsNotCollection();
- DereferenceCollection((CollectionType)propertyType, implicitJoin, false, classAlias, parent);
+ DereferenceCollection((CollectionType)propertyType, implicitJoin, false, classAlias);
}
else
{
@@ -235,13 +235,14 @@
{
CheckLhsIsNotCollection();
}
- _dereferenceType = DEREF_PRIMITIVE;
+ _dereferenceType = DerefPrimitive;
InitText();
}
IsResolved = true;
}
+
public FromReferenceNode GetLhs()
{
FromReferenceNode lhs = ((FromReferenceNode)GetChild(0));
@@ -252,7 +253,7 @@
return lhs;
}
- public IType getDataType()
+ public IType GetDataType()
{
if (DataType == null)
{
@@ -265,20 +266,21 @@
// If the lhs is a collection, use CollectionPropertyMapping
IType propertyType = fromElement.GetPropertyType(_propertyName, _propertyPath);
- if (log.IsDebugEnabled)
+ if (Log.IsDebugEnabled)
{
- log.Debug("getDataType() : " + _propertyPath + " -> " + propertyType);
+ Log.Debug("getDataType() : " + _propertyPath + " -> " + propertyType);
}
DataType = propertyType;
}
+
return DataType;
}
public void SetResolvedConstant(string text)
{
_path = text;
- _dereferenceType = DEREF_JAVA_CONSTANT;
+ _dereferenceType = DerefJavaConstant;
IsResolved = true; // Don't resolve the node again.
}
@@ -288,13 +290,13 @@
return new QueryException("illegal attempt to dereference collection [" + lhsPath + "] with element property reference [" + propertyName + "]");
}
- private void DereferenceCollection(CollectionType collectionType, bool implicitJoin, bool indexed, string classAlias, IASTNode parent)
+ private void DereferenceCollection(CollectionType collectionType, bool implicitJoin, bool indexed, string classAlias)
{
- _dereferenceType = DEREF_COLLECTION;
+ _dereferenceType = DerefCollection;
string role = collectionType.Role;
//foo.bars.size (also handles deprecated stuff like foo.bars.maxelement for backwardness)
- IASTNode sibling = this.NextSibling;
+ IASTNode sibling = NextSibling;
bool isSizeProperty = sibling != null && CollectionProperties.IsAnyCollectionProperty( sibling.Text );
if (isSizeProperty)
@@ -330,9 +332,9 @@
);
FromElement elem = factory.CreateCollection( queryableCollection, role, _joinType, _fetch, indexed );
- if ( log.IsDebugEnabled )
+ if ( Log.IsDebugEnabled )
{
- log.Debug( "dereferenceCollection() : Created new FROM element for " + propName + " : " + elem );
+ Log.Debug( "dereferenceCollection() : Created new FROM element for " + propName + " : " + elem );
}
SetImpliedJoin( elem );
@@ -422,9 +424,9 @@
{
// special shortcut for id properties, skip the join!
// this must only occur at the _end_ of a path expression
- if (log.IsDebugEnabled)
+ if (Log.IsDebugEnabled)
{
- log.Debug("dereferenceShortcut() : property " +
+ Log.Debug("dereferenceShortcut() : property " +
propertyName + " in " + FromElement.ClassName +
" does not require a join.");
}
@@ -434,7 +436,7 @@
// Set the text for the parent.
if (dotParent != null)
{
- dotParent._dereferenceType = DEREF_IDENTIFIER;
+ dotParent._dereferenceType = DerefIdentifier;
dotParent.Text = Text;
dotParent._columns = GetColumns();
}
@@ -442,10 +444,10 @@
private void DereferenceEntityJoin(string classAlias, EntityType propertyType, bool impliedJoin, IASTNode parent)
{
- _dereferenceType = DEREF_ENTITY;
- if ( log.IsDebugEnabled )
+ _dereferenceType = DerefEntity;
+ if ( Log.IsDebugEnabled )
{
- log.Debug( "dereferenceEntityJoin() : generating join for " + _propertyName + " in "
+ Log.Debug( "dereferenceEntityJoin() : generating join for " + _propertyName + " in "
+ FromElement.ClassName + " "
+ ( ( classAlias == null ) ? "{no alias}" : "(" + classAlias + ")" )
+ " parent = " + ASTUtil.GetDebugstring( parent )
@@ -586,9 +588,9 @@
{
if (IsCorrelatedSubselect)
{
- if (log.IsDebugEnabled)
+ if (Log.IsDebugEnabled)
{
- log.Debug(methodName + "() : correlated subquery");
+ Log.Debug(methodName + "() : correlated subquery");
}
}
}
@@ -612,12 +614,12 @@
{
FromReferenceNode lhs = GetLhs();
lhs.PrepareForDot( _propertyName );
- return getDataType();
+ return GetDataType();
}
private void DereferenceComponent(IASTNode parent)
{
- _dereferenceType = DEREF_COMPONENT;
+ _dereferenceType = DerefComponent;
SetPropertyNameAndPath(parent);
}
@@ -631,16 +633,16 @@
_propertyName = rhs.Text;
_propertyPath = _propertyPath + "." + _propertyName; // Append the new property name onto the unresolved path.
dotNode._propertyPath = _propertyPath;
- if (log.IsDebugEnabled)
+ if (Log.IsDebugEnabled)
{
- log.Debug("Unresolved property path is now '" + dotNode._propertyPath + "'");
+ Log.Debug("Unresolved property path is now '" + dotNode._propertyPath + "'");
}
}
else
{
- if (log.IsDebugEnabled)
+ if (Log.IsDebugEnabled)
{
- log.Debug("terminal propertyPath = [" + _propertyPath + "]");
+ Log.Debug("terminal propertyPath = [" + _propertyPath + "]");
}
}
}
@@ -693,7 +695,7 @@
else
{
Resolve(true, false);
- IType type = getDataType();
+ IType type = GetDataType();
if (type.IsEntityType)
{
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/FromClause.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/FromClause.cs 2009-05-13 15:37:55 UTC (rev 4289)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/FromClause.cs 2009-05-13 16:08:36 UTC (rev 4290)
@@ -16,10 +16,10 @@
[CLSCompliant(false)]
public class FromClause : HqlSqlWalkerNode, IDisplayableNode
{
- private static readonly ILog log = LogManager.GetLogger(typeof(FromClause));
- public static int ROOT_LEVEL = 1;
+ private static readonly ILog Log = LogManager.GetLogger(typeof(FromClause));
+ private const int RootLevel = 1;
- private int _level = ROOT_LEVEL;
+ private int _level = RootLevel;
/// <summary>
/// Counts the from elements as they are added.
@@ -124,9 +124,9 @@
public void AddJoinByPathMap(string path, FromElement destination)
{
- if (log.IsDebugEnabled)
+ if (Log.IsDebugEnabled)
{
- log.Debug("addJoinByPathMap() : " + path + " -> " + destination);
+ Log.Debug("addJoinByPathMap() : " + path + " -> " + destination);
}
_fromElementsByPath.Add(path, destination);
@@ -134,9 +134,9 @@
public void AddCollectionJoinFromElementByPath(string path, FromElement destination)
{
- if (log.IsDebugEnabled)
+ if (Log.IsDebugEnabled)
{
- log.Debug("addCollectionJoinFromElementByPath() : " + path + " -> " + destination);
+ Log.Debug("addCollectionJoinFromElementByPath() : " + path + " -> " + destination);
}
_collectionJoinFromElementsByPath.Add(path, destination); // Add the new node to the map so that we don't create it twice.
}
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/FromElement.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/FromElement.cs 2009-05-13 15:37:55 UTC (rev 4289)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/FromElement.cs 2009-05-13 16:08:36 UTC (rev 4290)
@@ -16,7 +16,7 @@
[CLSCompliant(false)]
public class FromElement : HqlSqlWalkerNode, IDisplayableNode, IParameterContainer
{
- private static readonly ILog log = LogManager.GetLogger(typeof(FromElement));
+ private static readonly ILog Log = LogManager.GetLogger(typeof(FromElement));
private bool _isAllPropertyFetch;
private FromElementType _elementType;
@@ -27,17 +27,15 @@
private FromClause _fromClause;
private string[] _columns;
private FromElement _origin;
- private bool _manyToMany;
private bool _useFromFragment;
private bool _useWhereFragment = true;
private bool _includeSubclasses = true;
- private List<FromElement> _destinations = new List<FromElement>();
+ private readonly List<FromElement> _destinations = new List<FromElement>();
private bool _dereferencedBySubclassProperty;
private bool _dereferencedBySuperclassProperty;
private bool _collectionJoin;
private string _role;
- private int sequence = -1;
- private bool initialized = false;
+ private bool _initialized;
private string _withClauseFragment;
private string _withClauseJoinAlias;
private bool _filter;
@@ -98,7 +96,7 @@
public bool Filter
{
- set { _filter = true; }
+ set { _filter = value; }
}
public bool IsFilter
@@ -307,7 +305,7 @@
return _elementType.RenderPropertySelect(size, k, IsAllPropertyFetch);
}
- public override SqlString RenderText(NHibernate.Engine.ISessionFactoryImplementor sessionFactory)
+ public override SqlString RenderText(Engine.ISessionFactoryImplementor sessionFactory)
{
return SqlString.Parse(Text);
}
@@ -351,9 +349,9 @@
{
if (IsDereferencedBySuperclassOrSubclassProperty)
{
- if (!_includeSubclasses && log.IsInfoEnabled)
+ if (!_includeSubclasses && Log.IsInfoEnabled)
{
- log.Info("attempt to disable subclass-inclusions", new Exception("stack-trace source"));
+ Log.Info("attempt to disable subclass-inclusions", new Exception("stack-trace source"));
}
}
_includeSubclasses = value;
@@ -485,9 +483,9 @@
{
Declarer propertyDeclarer = persister.GetSubclassPropertyDeclarer(propertyName);
- if (log.IsInfoEnabled)
+ if (Log.IsInfoEnabled)
{
- log.Info("handling property dereference [" + persister.EntityName + " (" + ClassAlias + ") -> " + propertyName + " (" + propertyDeclarer + ")]");
+ Log.Info("handling property dereference [" + persister.EntityName + " (" + ClassAlias + ") -> " + propertyName + " (" + propertyDeclarer + ")]");
}
if (propertyDeclarer == Declarer.SubClass)
{
@@ -511,7 +509,6 @@
public void SetOrigin(FromElement origin, bool manyToMany)
{
_origin = origin;
- _manyToMany = manyToMany;
origin.AddDestination(this);
if (origin.FromClause == FromClause)
@@ -551,9 +548,9 @@
{
if (IsDereferencedBySuperclassOrSubclassProperty)
{
- if (!includeSubclasses && log.IsInfoEnabled)
+ if (!includeSubclasses && Log.IsInfoEnabled)
{
- log.Info("attempt to disable subclass-inclusions", new Exception("stack-trace source"));
+ Log.Info("attempt to disable subclass-inclusions", new Exception("stack-trace source"));
}
}
_includeSubclasses = includeSubclasses;
@@ -571,7 +568,7 @@
public void InitializeCollection(FromClause fromClause, string classAlias, string tableAlias)
{
DoInitialize(fromClause, tableAlias, null, classAlias, null, null);
- initialized = true;
+ _initialized = true;
}
public void InitializeEntity(FromClause fromClause,
@@ -582,13 +579,12 @@
string tableAlias)
{
DoInitialize(fromClause, tableAlias, className, classAlias, persister, type);
- this.sequence = fromClause.NextFromElementCounter();
- initialized = true;
+ _initialized = true;
}
public void CheckInitialized()
{
- if (!initialized)
+ if (!_initialized)
{
throw new InvalidOperationException("FromElement has not been initialized!");
}
@@ -632,7 +628,7 @@
private void DoInitialize(FromClause fromClause, string tableAlias, string className, string classAlias,
IEntityPersister persister, EntityType type)
{
- if (initialized)
+ if (_initialized)
{
throw new InvalidOperationException("Already initialized!!");
}
@@ -645,9 +641,9 @@
// Register the FromElement with the FROM clause, now that we have the names and aliases.
fromClause.RegisterFromElement(this);
- if (log.IsDebugEnabled)
+ if (Log.IsDebugEnabled)
{
- log.Debug(fromClause + " : " + className + " ("
+ Log.Debug(fromClause + " : " + className + " ("
+ (classAlias ?? "no alias") + ") -> " + tableAlias);
}
}
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/FromElementFactory.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/FromElementFactory.cs 2009-05-13 15:37:55 UTC (rev 4289)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/FromElementFactory.cs 2009-05-13 16:08:36 UTC (rev 4290)
@@ -13,7 +13,7 @@
[CLSCompliant(false)]
public class FromElementFactory
{
- private static readonly ILog log = LogManager.GetLogger(typeof(FromElementFactory));
+ private static readonly ILog Log = LogManager.GetLogger(typeof(FromElementFactory));
private readonly FromClause _fromClause;
private readonly FromElement _origin;
@@ -107,9 +107,9 @@
FromElement parentFromElement,
string classAlias)
{
- if (log.IsDebugEnabled)
+ if (Log.IsDebugEnabled)
{
- log.Debug("createFromElementInSubselect() : path = " + path);
+ Log.Debug("createFromElementInSubselect() : path = " + path);
}
// Create an DotNode AST for the path and resolve it.
@@ -119,23 +119,16 @@
// If the first identifier in the path referrs to the class alias (not the class name), then this
// is a correlated subselect. If it's a correlated sub-select, use the existing table alias. Otherwise
// generate a new one.
- string tableAlias;
bool correlatedSubselect = pathAlias == parentFromElement.ClassAlias;
- if (correlatedSubselect)
- {
- tableAlias = fromElement.TableAlias;
- }
- else
- {
- tableAlias = null;
- }
+
+ string tableAlias = correlatedSubselect ? fromElement.TableAlias : null;
// If the from element isn't in the same clause, create a new from element.
if (fromElement.FromClause != _fromClause)
{
- if (log.IsDebugEnabled)
+ if (Log.IsDebugEnabled)
{
- log.Debug("createFromElementInSubselect() : creating a new FROM element...");
+ Log.Debug("createFromElementInSubselect() : creating a new FROM element...");
}
fromElement = CreateFromElement(entityPersister);
@@ -148,9 +141,9 @@
tableAlias
);
}
- if (log.IsDebugEnabled)
+ if (Log.IsDebugEnabled)
{
- log.Debug("createFromElementInSubselect() : " + path + " -> " + fromElement);
+ Log.Debug("createFromElementInSubselect() : " + path + " -> " + fromElement);
}
return fromElement;
@@ -234,8 +227,6 @@
public FromElement CreateElementJoin(IQueryableCollection queryableCollection)
{
- FromElement elem;
-
_implied = true; //TODO: always true for now, but not if we later decide to support elements() in the from clause
_inElementsFunction = true;
@@ -249,21 +240,19 @@
_queryableCollection = queryableCollection;
SessionFactoryHelperExtensions sfh = _fromClause.SessionFactoryHelper;
- FromElement destination = null;
- string tableAlias = null;
IEntityPersister entityPersister = queryableCollection.ElementPersister;
- tableAlias = _fromClause.AliasGenerator.CreateName(entityPersister.EntityName);
+ string tableAlias = _fromClause.AliasGenerator.CreateName(entityPersister.EntityName);
string associatedEntityName = entityPersister.EntityName;
IEntityPersister targetEntityPersister = sfh.RequireClassPersister(associatedEntityName);
// Create the FROM element for the target (the elements of the collection).
- destination = CreateAndAddFromElement(
- associatedEntityName,
- _classAlias,
- targetEntityPersister,
- (EntityType)queryableCollection.ElementType,
- tableAlias
- );
+ FromElement destination = CreateAndAddFromElement(
+ associatedEntityName,
+ _classAlias,
+ targetEntityPersister,
+ (EntityType)queryableCollection.ElementType,
+ tableAlias
+ );
// If the join is implied, then don't include sub-classes on the element.
if (_implied)
@@ -284,9 +273,8 @@
IAssociationType elementAssociationType = sfh.GetElementAssociationType(type);
// Create the join element under the from element.
- JoinType joinType = JoinType.InnerJoin;
- JoinSequence joinSequence = sfh.CreateJoinSequence(_implied, elementAssociationType, tableAlias, joinType, targetColumns);
- elem = InitializeJoin(_path, destination, joinSequence, targetColumns, _origin, false);
+ JoinSequence joinSequence = sfh.CreateJoinSequence(_implied, elementAssociationType, tableAlias, JoinType.InnerJoin, targetColumns);
+ FromElement elem = InitializeJoin(_path, destination, joinSequence, targetColumns, _origin, false);
elem.UseFromFragment = true; // The associated entity is implied, but it must be included in the FROM.
elem.CollectionTableAlias = roleAlias; // The collection alias is the role.
return elem;
@@ -310,9 +298,9 @@
// multi-table entity
if (_implied && !elem.UseFromFragment)
{
- if (log.IsDebugEnabled)
+ if (Log.IsDebugEnabled)
{
- log.Debug("createEntityJoin() : Implied entity join");
+ Log.Debug("createEntityJoin() : Implied entity join");
}
elem.UseFromFragment = true;
}
@@ -355,9 +343,9 @@
// Get the class name of the associated entity.
if (_queryableCollection.IsOneToMany)
{
- if (log.IsDebugEnabled)
+ if (Log.IsDebugEnabled)
{
- log.Debug("createEntityAssociation() : One to many - path = " + _path + " role = " + role + " associatedEntityName = " + associatedEntityName);
+ Log.Debug("createEntityAssociation() : One to many - path = " + _path + " role = " + role + " associatedEntityName = " + associatedEntityName);
}
JoinSequence joinSequence = CreateJoinSequence(roleAlias, joinType);
@@ -366,9 +354,9 @@
}
else
{
- if (log.IsDebugEnabled)
+ if (Log.IsDebugEnabled)
{
- log.Debug("createManyToMany() : path = " + _path + " role = " + role + " associatedEntityName = " + associatedEntityName);
+ Log.Debug("createManyToMany() : path = " + _path + " role = " + role + " associatedEntityName = " + associatedEntityName);
}
elem = CreateManyToMany(role, associatedEntityName,
@@ -491,7 +479,7 @@
{
FromReferenceNode pathNode = (FromReferenceNode)PathHelper.ParsePath(path, _fromClause.ASTFactory);
- pathNode.RecursiveResolve(FromReferenceNode.ROOT_LEVEL, // This is the root level node.
+ pathNode.RecursiveResolve(FromReferenceNode.RootLevel, // This is the root level node.
false, // Generate an explicit from clause at the root.
classAlias,
null
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/FromElementType.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/FromElementType.cs 2009-05-13 15:37:55 UTC (rev 4289)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/FromElementType.cs 2009-05-13 16:08:36 UTC (rev 4290)
@@ -19,11 +19,11 @@
[CLSCompliant(false)]
public class FromElementType
{
- private static readonly ILog log = LogManager.GetLogger(typeof(FromElementType));
+ private static readonly ILog Log = LogManager.GetLogger(typeof(FromElementType));
- private FromElement _fromElement;
- private IEntityPersister _persister;
- private EntityType _entityType;
+ private readonly FromElement _fromElement;
+ private readonly IEntityPersister _persister;
+ private readonly EntityType _entityType;
private IQueryableCollection _queryableCollection;
private CollectionPropertyMapping _collectionPropertyMapping;
private JoinSequence _joinSequence;
@@ -170,7 +170,7 @@
public string RenderScalarIdentifierSelect(int i)
{
CheckInitialized();
- string[] cols = GetPropertyMapping(NHibernate.Persister.Entity.EntityPersister.EntityID).ToColumns(TableAlias, NHibernate.Persister.Entity.EntityPersister.EntityID);
+ string[] cols = GetPropertyMapping(Persister.Entity.EntityPersister.EntityID).ToColumns(TableAlias, Persister.Entity.EntityPersister.EntityID);
StringBuilder buf = new StringBuilder();
// For property references generate <tablealias>.<columnname> as <projectionalias>
for (int j = 0; j < cols.Length; j++)
@@ -302,7 +302,7 @@
if (_queryableCollection.ElementType.IsComponentType)
{
// Collection of components.
- if (propertyName == NHibernate.Persister.Entity.EntityPersister.EntityID)
+ if (propertyName == Persister.Entity.EntityPersister.EntityID)
{
return (IPropertyMapping)_queryableCollection.OwnerEntityPersister;
}
@@ -394,11 +394,11 @@
enabledFilters,
propertyMapping.ToColumns(tableAlias, path)
);
- if (log.IsDebugEnabled)
+ if (Log.IsDebugEnabled)
{
- log.Debug("toColumns(" + tableAlias + "," + path + ") : subquery = " + subquery);
+ Log.Debug("toColumns(" + tableAlias + "," + path + ") : subquery = " + subquery);
}
- return new string[] { "(" + subquery + ")" };
+ return new [] { "(" + subquery + ")" };
}
else
{
@@ -429,15 +429,15 @@
// B) otherwise, we need to use the persister's
// table name as the column qualification
// 2) otherwise (not correlated), use the given alias
- if (isCorrelation())
+ if (IsCorrelation)
{
- if (isMultiTable())
+ if (IsMultiTable)
{
return propertyMapping.ToColumns(tableAlias, path);
}
else
{
- return propertyMapping.ToColumns(extractTableName(), path);
+ return propertyMapping.ToColumns(ExtractTableName(), path);
}
}
else
@@ -448,7 +448,7 @@
else
{
string[] columns = propertyMapping.ToColumns(path);
- log.Info("Using non-qualified column reference [" + path + " -> (" + ArrayHelper.ToString(columns) + ")]");
+ Log.Info("Using non-qualified column reference [" + path + " -> (" + ArrayHelper.ToString(columns) + ")]");
return columns;
}
}
@@ -470,21 +470,27 @@
_fromElement.CheckInitialized();
}
- private bool isCorrelation()
+ private bool IsCorrelation
{
- FromClause top = _fromElement.Walker.GetFinalFromClause();
- return _fromElement.FromClause != _fromElement.Walker.CurrentFromClause &&
- _fromElement.FromClause == top;
+ get
+ {
+ FromClause top = _fromElement.Walker.GetFinalFromClause();
+ return _fromElement.FromClause != _fromElement.Walker.CurrentFromClause &&
+ _fromElement.FromClause == top;
+ }
}
- private bool isMultiTable()
+ private bool IsMultiTable
{
- // should be safe to only ever expect EntityPersister references here
- return _fromElement.Queryable != null &&
- _fromElement.Queryable.IsMultiTable;
+ get
+ {
+ // should be safe to only ever expect EntityPersister references here
+ return _fromElement.Queryable != null &&
+ _fromElement.Queryable.IsMultiTable;
+ }
}
- private string extractTableName()
+ private string ExtractTableName()
{
// should be safe to only ever expect EntityPersister references here
return _fromElement.Queryable.TableName;
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/FromReferenceNode.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/FromReferenceNode.cs 2009-05-13 15:37:55 UTC (rev 4289)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/FromReferenceNode.cs 2009-05-13 16:08:36 UTC (rev 4290)
@@ -8,9 +8,9 @@
[CLSCompliant(false)]
public abstract class FromReferenceNode : AbstractSelectExpression, IResolvableNode, IDisplayableNode, IPathNode
{
- private static readonly ILog log = LogManager.GetLogger(typeof(FromReferenceNode));
+ private static readonly ILog Log = LogManager.GetLogger(typeof(FromReferenceNode));
- public static int ROOT_LEVEL = 0;
+ public const int RootLevel = 0;
private FromElement _fromElement;
private bool _resolved;
@@ -35,9 +35,9 @@
set
{
_resolved = true;
- if (log.IsDebugEnabled)
+ if (Log.IsDebugEnabled)
{
- log.Debug("Resolved : " + Path + " -> " + Text);
+ Log.Debug("Resolved : " + Path + " -> " + Text);
}
}
}
@@ -71,7 +71,7 @@
public virtual string Path
{
- get { return getOriginalText(); }
+ get { return OriginalText; }
}
public void RecursiveResolve(int level, bool impliedAtRoot, string classAlias, IASTNode parent)
@@ -87,7 +87,7 @@
ResolveFirstChild();
bool impliedJoin = true;
- if ( level == ROOT_LEVEL && !impliedAtRoot )
+ if ( level == RootLevel && !impliedAtRoot )
{
impliedJoin = false;
}
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/HqlSqlWalkerTreeAdapter.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/HqlSqlWalkerTreeAdapter.cs 2009-05-13 15:37:55 UTC (rev 4289)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/HqlSqlWalkerTreeAdapter.cs 2009-05-13 16:08:36 UTC (rev 4290)
@@ -170,10 +170,8 @@
return dupped;
}
- else
- {
- throw new NotImplementedException();
- }
+
+ throw new NotImplementedException();
}
private void Initialise(object node)
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/HqlSqlWalkerTreeNodeStream.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/HqlSqlWalkerTreeNodeStream.cs 2009-05-13 15:37:55 UTC (rev 4289)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/HqlSqlWalkerTreeNodeStream.cs 2009-05-13 16:08:36 UTC (rev 4290)
@@ -61,33 +61,32 @@
// We are at the end
return 0;
}
- else if (nodes[parentIndex + 1] != down)
+
+ if (nodes[parentIndex + 1] != down)
{
// Next node is not a DOWN node, so we have no children
return 0;
}
- else
+
+ // Count the DOWNs & UPs
+ int downCount = 0;
+ int index = 1;
+ do
{
- // Count the DOWNs & UPs
- int downCount = 0;
- int index = 1;
- do
+ if (nodes[parentIndex + index] == down)
{
- if (nodes[parentIndex + index] == down)
- {
- downCount++;
- }
- else if (nodes[parentIndex + index] == up)
- {
- downCount--;
- }
+ downCount++;
+ }
+ else if (nodes[parentIndex + index] == up)
+ {
+ downCount--;
+ }
- index++;
-
- } while (downCount > 0);
+ index++;
+
+ } while (downCount > 0);
- return index - 1;
- }
+ return index - 1;
}
}
}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/HqlTreeAdapter.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/HqlTreeAdapter.cs 2009-05-13 15:37:55 UTC (rev 4289)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/HqlTreeAdapter.cs 2009-05-13 16:08:36 UTC (rev 4290)
@@ -189,10 +189,8 @@
return dupped;
}
- else
- {
- return base.DupNode(t);
- }
+
+ return base.DupNode(t);
}
void Initialise(object node)
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/IdentNode.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/IdentNode.cs 2009-05-13 15:37:55 UTC (rev 4289)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/IdentNode.cs 2009-05-13 16:08:36 UTC (rev 4290)
@@ -14,10 +14,10 @@
[CLSCompliant(false)]
public class IdentNode : FromReferenceNode, ISelectExpression
{
- private static int UNKNOWN = 0;
- private static int PROPERTY_REF = 1;
- private static int COMPONENT_REF = 2;
- private bool _nakedPropertyRef = false;
+ private const int Unknown = 0;
+ private const int PropertyRef = 1;
+ private const int ComponentRef = 2;
+ private bool _nakedPropertyRef;
public IdentNode(IToken token) : base(token)
{
@@ -81,7 +81,7 @@
throw new InvalidOperationException();
}
- string propertyName = getOriginalText();
+ string propertyName = OriginalText;
if (!DataType.IsCollectionType)
{
throw new SemanticException("Collection expected; [" + propertyName + "] does not refer to a collection property");
@@ -92,21 +92,18 @@
string role = type.Role;
IQueryableCollection queryableCollection = SessionFactoryHelper.RequireQueryableCollection(role);
- string alias = null; // DotNode uses null here...
string columnTableAlias = FromElement.TableAlias;
- JoinType joinType = JoinType.InnerJoin;
- bool fetch = false;
FromElementFactory factory = new FromElementFactory(
Walker.CurrentFromClause,
FromElement,
propertyName,
- alias,
+ null,
FromElement.ToColumns(columnTableAlias, propertyName, false),
true
);
- FromElement elem = factory.CreateCollection(queryableCollection, role, joinType, fetch, true);
+ FromElement elem = factory.CreateCollection(queryableCollection, role, JoinType.InnerJoin, false, true);
FromElement = elem;
Walker.AddQuerySpaces(queryableCollection.CollectionSpaces); // Always add the collection's query spaces.
}
@@ -128,7 +125,7 @@
DotNode dot = (DotNode)parent;
if (parent.GetFirstChild() == this)
{
- if (ResolveAsNakedComponentPropertyRefLHS(dot))
+ if (ResolveAsNakedComponentPropertyRefLhs(dot))
{
// we are the LHS of the DOT representing a naked comp-prop-ref
IsResolved = true;
@@ -136,7 +133,7 @@
}
else
{
- if (ResolveAsNakedComponentPropertyRefRHS(dot))
+ if (ResolveAsNakedComponentPropertyRefRhs(dot))
{
// we are the RHS of the DOT representing a naked comp-prop-ref
IsResolved = true;
@@ -146,12 +143,12 @@
else
{
int result = ResolveAsNakedPropertyRef();
- if (result == PROPERTY_REF)
+ if (result == PropertyRef)
{
// we represent a naked (simple) prop-ref
IsResolved = true;
}
- else if (result == COMPONENT_REF)
+ else if (result == ComponentRef)
{
// EARLY EXIT!!! return so the resolve call explicitly coming from DotNode can
// resolve this...
@@ -184,25 +181,25 @@
if (fromElement == null)
{
- return UNKNOWN;
+ return Unknown;
}
IQueryable persister = fromElement.Queryable;
if (persister == null)
{
- return UNKNOWN;
+ return Unknown;
}
IType propertyType = GetNakedPropertyType(fromElement);
if (propertyType == null)
{
// assume this ident's text does *not* refer to a property on the given persister
- return UNKNOWN;
+ return Unknown;
}
if ((propertyType.IsComponentType || propertyType.IsAssociationType))
{
- return COMPONENT_REF;
+ return ComponentRef;
}
FromElement = fromElement;
@@ -220,10 +217,10 @@
DataType = propertyType;
_nakedPropertyRef = true;
- return PROPERTY_REF;
+ return PropertyRef;
}
- private bool ResolveAsNakedComponentPropertyRefLHS(DotNode parent)
+ private bool ResolveAsNakedComponentPropertyRefLhs(DotNode parent)
{
FromElement fromElement = LocateSingleFromElement();
if (fromElement == null)
@@ -235,15 +232,15 @@
if (componentType == null)
{
- throw new QueryException("Unable to resolve path [" + parent.Path + "], unexpected token [" + getOriginalText() + "]");
+ throw new QueryException("Unable to resolve path [" + parent.Path + "], unexpected token [" + OriginalText + "]");
}
if (!componentType.IsComponentType)
{
- throw new QueryException("Property '" + getOriginalText() + "' is not a component. Use an alias to reference associations or collections.");
+ throw new QueryException("Property '" + OriginalText + "' is not a component. Use an alias to reference associations or collections.");
}
IType propertyType ; // used to set the type of the parent dot node
- string propertyPath = Text + "." + this.NextSibling.Text;
+ string propertyPath = Text + "." + NextSibling.Text;
try
{
// check to see if our "propPath" actually
@@ -263,7 +260,7 @@
return true;
}
- private bool ResolveAsNakedComponentPropertyRefRHS(DotNode parent)
+ private bool ResolveAsNakedComponentPropertyRefRhs(DotNode parent)
{
FromElement fromElement = LocateSingleFromElement();
if (fromElement == null)
@@ -302,7 +299,7 @@
return null;
}
- string property = getOriginalText();
+ string property = OriginalText;
IType propertyType = null;
try
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/ImpliedFromElement.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/ImpliedFromElement.cs 2009-05-13 15:37:55 UTC (rev 4289)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/ImpliedFromElement.cs 2009-05-13 16:08:36 UTC (rev 4290)
@@ -7,8 +7,8 @@
[CLSCompliant(false)]
public class ImpliedFromElement : FromElement
{
- private bool _impliedInFromClause = false;
- private bool _inProjectionList = false;
+ private bool _impliedInFromClause;
+ private bool _inProjectionList;
public ImpliedFromElement(IToken token) : base(token)
{
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/InLogicOperatorNode.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/InLogicOperatorNode.cs 2009-05-13 15:37:55 UTC (rev 4289)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/InLogicOperatorNode.cs 2009-05-13 16:08:36 UTC (rev 4290)
@@ -16,9 +16,9 @@
{
}
- public IASTNode getInList()
+ public IASTNode InList
{
- return RightHandOperand;
+ get { return RightHandOperand; }
}
public override void Initialize()
@@ -29,7 +29,7 @@
throw new SemanticException("left-hand operand of in operator was null");
}
- IASTNode inList = getInList();
+ IASTNode inList = InList;
if (inList == null)
{
throw new SemanticException("right-hand operand of in operator was null");
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/IndexNode.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/IndexNode.cs 2009-05-13 15:37:55 UTC (rev 4289)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/IndexNode.cs 2009-05-13 16:08:36 UTC (rev 4290)
@@ -19,7 +19,7 @@
[CLSCompliant(false)]
public class IndexNode : FromReferenceNode
{
- private static readonly ILog log = LogManager.GetLogger(typeof(IndexNode));
+ private static readonly ILog Log = LogManager.GetLogger(typeof(IndexNode));
public IndexNode(IToken token) : base(token)
{
@@ -49,7 +49,7 @@
IType type = collectionNode.DataType;
if ( !type.IsCollectionType )
{
- throw new SemanticException( "The [] operator cannot be applied to type " + type.ToString() );
+ throw new SemanticException( "The [] operator cannot be applied to type " + type);
}
string collectionRole = ( ( CollectionType ) type ).Role;
@@ -70,17 +70,17 @@
{
FromElementFactory factory = new FromElementFactory( fromClause, fromElement, path );
elem = factory.CreateCollectionElementsJoin( queryableCollection, elementTable );
- if ( log.IsDebugEnabled )
+ if ( Log.IsDebugEnabled )
{
- log.Debug( "No FROM element found for the elements of collection join path " + path
+ Log.Debug( "No FROM element found for the elements of collection join path " + path
+ ", created " + elem );
}
}
else
{
- if ( log.IsDebugEnabled )
+ if ( Log.IsDebugEnabled )
{
- log.Debug( "FROM element found for collection join path " + path );
+ Log.Debug( "FROM element found for collection join path " + path );
}
}
@@ -170,9 +170,9 @@
FromReferenceNode collectionNode = ( FromReferenceNode ) GetChild(0);
String path = collectionNode.Path + "[]." + propertyName;
- if (log.IsDebugEnabled)
+ if (Log.IsDebugEnabled)
{
- log.Debug( "Creating join for many-to-many elements for " + path );
+ Log.Debug( "Creating join for many-to-many elements for " + path );
}
FromElementFactory factory = new FromElementFactory( fromElement.FromClause, fromElement, path );
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/IntoClause.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/IntoClause.cs 2009-05-13 15:37:55 UTC (rev 4289)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/IntoClause.cs 2009-05-13 16:08:36 UTC (rev 4290)
@@ -18,13 +18,13 @@
[CLSCompliant(false)]
public class IntoClause : HqlSqlWalkerNode, IDisplayableNode
{
- private IQueryable persister;
- private String columnSpec = string.Empty;
- private IType[] types;
+ private IQueryable _persister;
+ private String _columnSpec = string.Empty;
+ private IType[] _types;
- private bool discriminated;
- private bool explicitIdInsertion;
- private bool explicitVersionInsertion;
+ private bool _discriminated;
+ private bool _explicitIdInsertion;
+ private bool _explicitVersionInsertion;
public IntoClause(IToken token)
: base(token)
@@ -38,13 +38,13 @@
throw new QueryException("cannot insert into abstract class (no table)");
}
- this.persister = persister;
+ _persister = persister;
InitializeColumns();
if (Walker.SessionFactoryHelper.HasPhysicalDiscriminatorColumn(persister))
{
- discriminated = true;
- columnSpec += ", " + persister.DiscriminatorColumnName;
+ _discriminated = true;
+ _columnSpec += ", " + persister.DiscriminatorColumnName;
}
ResetText();
@@ -52,53 +52,53 @@
private void ResetText()
{
- Text = "into " + TableName + " ( " + columnSpec + " )";
+ Text = "into " + TableName + " ( " + _columnSpec + " )";
}
public string TableName
{
- get { return persister.GetSubclassTableName(0); }
+ get { return _persister.GetSubclassTableName(0); }
}
public IQueryable Queryable
{
- get { return persister; }
+ get { return _persister; }
}
public string EntityName
{
- get { return persister.EntityName; }
+ get { return _persister.EntityName; }
}
public IType[] InsertionTypes
{
- get { return types; }
+ get { return _types; }
}
public bool IsDiscriminated
{
- get { return discriminated; }
+ get { return _discriminated; }
}
public bool IsExplicitIdInsertion
{
- get { return explicitIdInsertion; }
+ get { return _explicitIdInsertion; }
}
public bool IsExplicitVersionInsertion
{
- get { return explicitVersionInsertion; }
+ get { return _explicitVersionInsertion; }
}
public void PrependIdColumnSpec()
{
- columnSpec = persister.IdentifierColumnNames[0] + ", " + columnSpec;
+ _columnSpec = _persister.IdentifierColumnNames[0] + ", " + _columnSpec;
ResetText();
}
public void PrependVersionColumnSpec()
{
- columnSpec = persister.GetPropertyColumnNames(persister.VersionProperty)[0] + ", " + columnSpec;
+ _columnSpec = _persister.GetPropertyColumnNames(_persister.VersionProperty)[0] + ", " + _columnSpec;
ResetText();
}
@@ -106,17 +106,17 @@
{
IType[] selectTypes = selectClause.QueryReturnTypes;
- if (selectTypes.Length != types.Length)
+ if (selectTypes.Length != _types.Length)
{
throw new QueryException("number of select types did not match those for insert");
}
- for (int i = 0; i < types.Length; i++)
+ for (int i = 0; i < _types.Length; i++)
{
- if (!AreCompatible(types[i], selectTypes[i]))
+ if (!AreCompatible(_types[i], selectTypes[i]))
{
throw new QueryException(
- "insertion type [" + types[i] + "] and selection type [" +
+ "insertion type [" + _types[i] + "] and selection type [" +
selectTypes[i] + "] at position " + i + " are not compatible"
);
}
@@ -135,7 +135,7 @@
buf.Append("IntoClause{");
buf.Append("entityName=").Append(EntityName);
buf.Append(",tableName=").Append(TableName);
- buf.Append(",columns={").Append(columnSpec).Append("}");
+ buf.Append(",columns={").Append(_columnSpec).Append("}");
buf.Append("}");
return buf.ToString();
}
@@ -145,8 +145,8 @@
IASTNode propertySpec = GetFirstChild();
var ts = new List<IType>();
VisitPropertySpecNodes(propertySpec.GetFirstChild(), ts);
- types = ts.ToArray();
- columnSpec = columnSpec.Substring(0, columnSpec.Length - 2);
+ _types = ts.ToArray();
+ _columnSpec = _columnSpec.Substring(0, _columnSpec.Length - 2);
}
private void VisitPropertySpecNodes(IASTNode propertyNode, ICollection<IType> types)
@@ -171,22 +171,22 @@
throw new QueryException("INSERT statements cannot refer to superclass/joined properties [" + name + "]");
}
- if (name == persister.IdentifierPropertyName)
+ if (name == _persister.IdentifierPropertyName)
{
- explicitIdInsertion = true;
+ _explicitIdInsertion = true;
}
- if (persister.IsVersioned)
+ if (_persister.IsVersioned)
{
- if (name == persister.PropertyNames[persister.VersionProperty])
+ if (name == _persister.PropertyNames[_persister.VersionProperty])
{
- explicitVersionInsertion = true;
+ _explicitVersionInsertion = true;
}
}
- string[] columnNames = persister.ToColumns(name);
+ string[] columnNames = _persister.ToColumns(name);
RenderColumns(columnNames);
- types.Add(persister.ToType(name));
+ types.Add(_persister.ToType(name));
// visit width-first, then depth
VisitPropertySpecNodes(propertyNode.NextSibling, types);
@@ -197,7 +197,7 @@
{
for (int i = 0; i < columnNames.Length; i++)
{
- columnSpec += columnNames[i] + ", ";
+ _columnSpec += columnNames[i] + ", ";
}
}
@@ -214,7 +214,7 @@
//
// we may want to disallow it for discrim-subclass just for
// consistency-sake (currently does not work anyway)...
- return persister.GetSubclassPropertyTableNumber(propertyName) != 0;
+ return _persister.GetSubclassPropertyTableNumber(propertyName) != 0;
}
/// <summary>
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/JavaConstantNode.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/JavaConstantNode.cs 2009-05-13 15:37:55 UTC (rev 4289)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/JavaConstantNode.cs 2009-05-13 16:08:36 UTC (rev 4290)
@@ -1,5 +1,4 @@
using System;
-using System.Threading;
using Antlr.Runtime;
using NHibernate.Engine;
using NHibernate.Hql.Ast.ANTLR.Util;
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/MethodNode.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/MethodNode.cs 2009-05-13 15:37:55 UTC (rev 4289)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/MethodNode.cs 2009-05-13 16:08:36 UTC (rev 4290)
@@ -16,7 +16,7 @@
[CLSCompliant(false)]
public class MethodNode : AbstractSelectExpression, ISelectExpression
{
- private static readonly ILog log = LogManager.GetLogger(typeof(MethodNode));
+ private static readonly ILog Log = LogManager.GetLogger(typeof(MethodNode));
private string[] _selectColumns;
private string _methodName;
@@ -151,15 +151,15 @@
SqlNode expr = ( SqlNode ) path;
IType type = expr.DataType;
- if ( log.IsDebugEnabled )
+ if ( Log.IsDebugEnabled )
{
- log.Debug( "collectionProperty() : name=" + name + " type=" + type );
+ Log.Debug( "collectionProperty() : name=" + name + " type=" + type );
}
ResolveCollectionProperty( expr );
}
- private void PrepareAnyImplicitJoins(DotNode dotNode)
+ private static void PrepareAnyImplicitJoins(DotNode dotNode)
{
if ( dotNode.GetLhs() is DotNode )
{
@@ -181,7 +181,7 @@
IQueryableCollection queryableCollection = collectionFromElement.QueryableCollection;
String path = collectionNode.Path + "[]." + propertyName;
- log.Debug("Creating elements for " + path);
+ Log.Debug("Creating elements for " + path);
_fromElement = collectionFromElement;
if (!collectionFromElement.IsCollectionOfValuesOrComponents)
@@ -203,14 +203,7 @@
if (exprList != null)
{
- if (_methodName == "iif")
- {
- child = exprList.GetChild(1);
- }
- else
- {
- child = exprList.GetChild(0);
- }
+ child = _methodName == "iif" ? exprList.GetChild(1) : exprList.GetChild(0);
}
DataType = SessionFactoryHelper.FindFunctionReturnType(_methodName, child);
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/ParameterNode.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/ParameterNode.cs 2009-05-13 15:37:55 UTC (rev 4289)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/ParameterNode.cs 2009-05-13 16:08:36 UTC (rev 4290)
@@ -1,5 +1,4 @@
using System;
-using System.Text;
using Antlr.Runtime;
using NHibernate.Engine;
using NHibernate.Param;
@@ -49,7 +48,7 @@
public override SqlString RenderText(ISessionFactoryImplementor sessionFactory)
{
- int count = 0;
+ int count;
if (ExpectedType != null && (count = ExpectedType.GetColumnSpan(sessionFactory)) > 1)
{
SqlStringBuilder buffer = new SqlStringBuilder();
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/QueryNode.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/QueryNode.cs 2009-05-13 15:37:55 UTC (rev 4289)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/QueryNode.cs 2009-05-13 16:08:36 UTC (rev 4290)
@@ -9,7 +9,7 @@
[CLSCompliant(false)]
public class QueryNode : AbstractRestrictableStatement, ISelectExpression
{
- private static readonly ILog log = LogManager.GetLogger(typeof(QueryNode));
+ private static readonly ILog Log = LogManager.GetLogger(typeof(QueryNode));
private OrderByClause _orderByClause;
@@ -19,7 +19,7 @@
protected override ILog GetLog()
{
- return log;
+ return Log;
}
protected override int GetWhereClauseParentTokenType()
@@ -89,17 +89,13 @@
// if there is no order by, make one
if (_orderByClause == null)
{
- log.Debug( "getOrderByClause() : Creating a new ORDER BY clause" );
+ Log.Debug( "getOrderByClause() : Creating a new ORDER BY clause" );
_orderByClause = (OrderByClause) Walker.ASTFactory.CreateNode(HqlSqlWalker.ORDER, "ORDER");
// Find the WHERE; if there is no WHERE, find the FROM...
- IASTNode prevSibling = ASTUtil.FindTypeInChildren(this, HqlSqlWalker.WHERE);
+ IASTNode prevSibling = ASTUtil.FindTypeInChildren(this, HqlSqlWalker.WHERE) ??
+ ASTUtil.FindTypeInChildren(this, HqlSqlWalker.FROM);
- if ( prevSibling == null )
- {
- prevSibling = ASTUtil.FindTypeInChildren(this, HqlSqlWalker.FROM);
- }
-
// Now, inject the newly built ORDER BY into the tree
prevSibling.AddSibling(_orderByClause);
}
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/SelectClause.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/SelectClause.cs 2009-05-13 15:37:55 UTC (rev 4289)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/SelectClause.cs 2009-05-13 16:08:36 UTC (rev 4290)
@@ -25,7 +25,7 @@
private ConstructorNode _constructorNode;
private string[] _aliases;
- public static bool VERSION2_SQL = false;
+ public static bool VERSION2_SQL;
public SelectClause(IToken token) : base(token)
{
@@ -179,7 +179,7 @@
if ( fromElement.IsFetch )
{
FromElement origin;
- if ( fromElement.RealOrigin == null )
+ if ( fromElement.RealOrigin == null )
{
// work around that crazy issue where the tree contains
// "empty" FromElements (no text); afaict, this is caused
@@ -188,10 +188,8 @@
{
throw new QueryException( "Unable to determine origin of join fetch [" + fromElement.GetDisplayText() + "]" );
}
- else
- {
- origin = fromElement.Origin;
- }
+
+ origin = fromElement.Origin;
...
[truncated message content] |
|
From: <ste...@us...> - 2009-05-19 11:57:31
|
Revision: 4347
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4347&view=rev
Author: steverstrong
Date: 2009-05-19 11:57:25 +0000 (Tue, 19 May 2009)
Log Message:
-----------
Some more AST cleanup
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/CaseInsensitiveStringStream.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/CollectionProperties.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/ErrorCounter.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Exec/BasicExecutor.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlLexer.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlParser.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlParser.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlToken.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/SessionFactoryHelperExtensions.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/BetweenOperatorNode.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/DotNode.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/FromClause.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/HqlSqlWalkerNode.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/HqlSqlWalkerTreeNodeStream.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/InLogicOperatorNode.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/IntoClause.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Util/CollectingNodeVisitor.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Util/LiteralProcessor.cs
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/CaseInsensitiveStringStream.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/CaseInsensitiveStringStream.cs 2009-05-19 00:06:44 UTC (rev 4346)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/CaseInsensitiveStringStream.cs 2009-05-19 11:57:25 UTC (rev 4347)
@@ -8,12 +8,8 @@
/// Copied from http://www.antlr.org/wiki/pages/viewpage.action?pageId=1782
///</summary>
[CLSCompliant(false)]
- public class CaseInsensitiveStringStream : ANTLRStringStream
+ internal class CaseInsensitiveStringStream : ANTLRStringStream
{
- public CaseInsensitiveStringStream(char[] data, int numberOfActualCharsInArray) : base(data, numberOfActualCharsInArray) { }
-
- public CaseInsensitiveStringStream() { }
-
public CaseInsensitiveStringStream(string input) : base(input) { }
// Only the lookahead is converted to lowercase. The original case is preserved in the stream.
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/CollectionProperties.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/CollectionProperties.cs 2009-05-19 00:06:44 UTC (rev 4346)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/CollectionProperties.cs 2009-05-19 11:57:25 UTC (rev 4347)
@@ -8,7 +8,7 @@
/// Authoer: josh
/// Ported by: Steve Strong
/// </summary>
- public static class CollectionProperties
+ internal static class CollectionProperties
{
public static Dictionary<string, string> HQL_COLLECTION_PROPERTIES;
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/ErrorCounter.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/ErrorCounter.cs 2009-05-19 00:06:44 UTC (rev 4346)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/ErrorCounter.cs 2009-05-19 11:57:25 UTC (rev 4347)
@@ -10,7 +10,7 @@
/// An error handler that counts parsing errors and warnings.
/// </summary>
[CLSCompliant(false)]
- public class ErrorCounter : IParseErrorHandler
+ internal class ErrorCounter : IParseErrorHandler
{
private static readonly ILog log = LogManager.GetLogger(typeof(ErrorCounter));
private static readonly ILog hqlLog = LogManager.GetLogger("NHibernate.Hql.Parser");
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Exec/BasicExecutor.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Exec/BasicExecutor.cs 2009-05-19 00:06:44 UTC (rev 4346)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Exec/BasicExecutor.cs 2009-05-19 11:57:25 UTC (rev 4347)
@@ -40,7 +40,7 @@
}
}
- protected IList<IParameterSpecification> Parameters{get;private set;}
+ private IList<IParameterSpecification> Parameters { get; set; }
public override SqlString[] SqlStatements
{
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlLexer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlLexer.cs 2009-05-19 00:06:44 UTC (rev 4346)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlLexer.cs 2009-05-19 11:57:25 UTC (rev 4347)
@@ -1,4 +1,4 @@
-// $ANTLR 3.1.2 /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g 2009-05-14 21:14:48
+// $ANTLR 3.1.2 /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g 2009-05-15 10:57:48
// The variable 'variable' is assigned but its value is never used.
#pragma warning disable 168, 219
@@ -1759,8 +1759,8 @@
{
int _type = EQ;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:760:3: ( '=' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:760:5: '='
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:757:3: ( '=' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:757:5: '='
{
Match('='); if (state.failed) return ;
@@ -1782,8 +1782,8 @@
{
int _type = LT;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:761:3: ( '<' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:761:5: '<'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:758:3: ( '<' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:758:5: '<'
{
Match('<'); if (state.failed) return ;
@@ -1805,8 +1805,8 @@
{
int _type = GT;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:762:3: ( '>' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:762:5: '>'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:759:3: ( '>' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:759:5: '>'
{
Match('>'); if (state.failed) return ;
@@ -1828,8 +1828,8 @@
{
int _type = SQL_NE;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:763:7: ( '<>' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:763:9: '<>'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:760:7: ( '<>' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:760:9: '<>'
{
Match("<>"); if (state.failed) return ;
@@ -1852,7 +1852,7 @@
{
int _type = NE;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:764:3: ( '!=' | '^=' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:761:3: ( '!=' | '^=' )
int alt1 = 2;
int LA1_0 = input.LA(1);
@@ -1875,7 +1875,7 @@
switch (alt1)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:764:5: '!='
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:761:5: '!='
{
Match("!="); if (state.failed) return ;
@@ -1883,7 +1883,7 @@
}
break;
case 2 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:764:12: '^='
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:761:12: '^='
{
Match("^="); if (state.failed) return ;
@@ -1908,8 +1908,8 @@
{
int _type = LE;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:765:3: ( '<=' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:765:5: '<='
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:762:3: ( '<=' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:762:5: '<='
{
Match("<="); if (state.failed) return ;
@@ -1932,8 +1932,8 @@
{
int _type = GE;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:766:3: ( '>=' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:766:5: '>='
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:763:3: ( '>=' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:763:5: '>='
{
Match(">="); if (state.failed) return ;
@@ -1956,8 +1956,8 @@
{
int _type = BOR;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:768:5: ( '|' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:768:8: '|'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:765:5: ( '|' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:765:8: '|'
{
Match('|'); if (state.failed) return ;
@@ -1979,8 +1979,8 @@
{
int _type = BXOR;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:769:6: ( '^' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:769:8: '^'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:766:6: ( '^' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:766:8: '^'
{
Match('^'); if (state.failed) return ;
@@ -2002,8 +2002,8 @@
{
int _type = BAND;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:770:6: ( '&' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:770:8: '&'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:767:6: ( '&' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:767:8: '&'
{
Match('&'); if (state.failed) return ;
@@ -2025,8 +2025,8 @@
{
int _type = BNOT;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:771:6: ( '!' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:771:8: '!'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:768:6: ( '!' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:768:8: '!'
{
Match('!'); if (state.failed) return ;
@@ -2048,8 +2048,8 @@
{
int _type = COMMA;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:773:6: ( ',' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:773:8: ','
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:770:6: ( ',' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:770:8: ','
{
Match(','); if (state.failed) return ;
@@ -2071,8 +2071,8 @@
{
int _type = OPEN;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:775:5: ( '(' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:775:7: '('
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:772:5: ( '(' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:772:7: '('
{
Match('('); if (state.failed) return ;
@@ -2094,8 +2094,8 @@
{
int _type = CLOSE;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:776:6: ( ')' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:776:8: ')'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:773:6: ( ')' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:773:8: ')'
{
Match(')'); if (state.failed) return ;
@@ -2117,8 +2117,8 @@
{
int _type = OPEN_BRACKET;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:777:13: ( '[' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:777:15: '['
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:774:13: ( '[' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:774:15: '['
{
Match('['); if (state.failed) return ;
@@ -2140,8 +2140,8 @@
{
int _type = CLOSE_BRACKET;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:778:14: ( ']' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:778:16: ']'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:775:14: ( ']' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:775:16: ']'
{
Match(']'); if (state.failed) return ;
@@ -2163,8 +2163,8 @@
{
int _type = CONCAT;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:780:7: ( '||' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:780:9: '||'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:777:7: ( '||' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:777:9: '||'
{
Match("||"); if (state.failed) return ;
@@ -2187,8 +2187,8 @@
{
int _type = PLUS;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:781:5: ( '+' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:781:7: '+'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:778:5: ( '+' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:778:7: '+'
{
Match('+'); if (state.failed) return ;
@@ -2210,8 +2210,8 @@
{
int _type = MINUS;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:782:6: ( '-' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:782:8: '-'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:779:6: ( '-' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:779:8: '-'
{
Match('-'); if (state.failed) return ;
@@ -2233,8 +2233,8 @@
{
int _type = STAR;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:783:5: ( '*' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:783:7: '*'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:780:5: ( '*' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:780:7: '*'
{
Match('*'); if (state.failed) return ;
@@ -2256,8 +2256,8 @@
{
int _type = DIV;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:784:4: ( '/' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:784:6: '/'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:781:4: ( '/' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:781:6: '/'
{
Match('/'); if (state.failed) return ;
@@ -2279,8 +2279,8 @@
{
int _type = COLON;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:785:6: ( ':' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:785:8: ':'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:782:6: ( ':' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:782:8: ':'
{
Match(':'); if (state.failed) return ;
@@ -2302,8 +2302,8 @@
{
int _type = PARAM;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:786:6: ( '?' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:786:8: '?'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:783:6: ( '?' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:783:8: '?'
{
Match('?'); if (state.failed) return ;
@@ -2325,11 +2325,11 @@
{
int _type = IDENT;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:789:2: ( ID_START_LETTER ( ID_LETTER )* )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:789:4: ID_START_LETTER ( ID_LETTER )*
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:786:2: ( ID_START_LETTER ( ID_LETTER )* )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:786:4: ID_START_LETTER ( ID_LETTER )*
{
mID_START_LETTER(); if (state.failed) return ;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:789:20: ( ID_LETTER )*
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:786:20: ( ID_LETTER )*
do
{
int alt2 = 2;
@@ -2344,7 +2344,7 @@
switch (alt2)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:789:22: ID_LETTER
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:786:22: ID_LETTER
{
mID_LETTER(); if (state.failed) return ;
@@ -2376,7 +2376,7 @@
{
try
{
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:794:5: ( '_' | '$' | 'a' .. 'z' | 'A' .. 'Z' | '\\u0080' .. '\\ufffe' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:791:5: ( '_' | '$' | 'a' .. 'z' | 'A' .. 'Z' | '\\u0080' .. '\\ufffe' )
// /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/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') )
@@ -2406,7 +2406,7 @@
{
try
{
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:803:5: ( ID_START_LETTER | '0' .. '9' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:800:5: ( ID_START_LETTER | '0' .. '9' )
// /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/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') )
@@ -2438,11 +2438,11 @@
{
int _type = QUOTED_String;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:808:4: ( '\\'' ( ( ESCqs )=> ESCqs | ~ '\\'' )* '\\'' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:808:6: '\\'' ( ( ESCqs )=> ESCqs | ~ '\\'' )* '\\''
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:805:4: ( '\\'' ( ( ESCqs )=> ESCqs | ~ '\\'' )* '\\'' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:805:6: '\\'' ( ( ESCqs )=> ESCqs | ~ '\\'' )* '\\''
{
Match('\''); if (state.failed) return ;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:808:11: ( ( ESCqs )=> ESCqs | ~ '\\'' )*
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:805:11: ( ( ESCqs )=> ESCqs | ~ '\\'' )*
do
{
int alt3 = 3;
@@ -2468,14 +2468,14 @@
switch (alt3)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:808:13: ( ESCqs )=> ESCqs
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:805:13: ( ESCqs )=> ESCqs
{
mESCqs(); if (state.failed) return ;
}
break;
case 2 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:808:31: ~ '\\''
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:805:31: ~ '\\''
{
if ( (input.LA(1) >= '\u0000' && input.LA(1) <= '&') || (input.LA(1) >= '(' && input.LA(1) <= '\uFFFF') )
{
@@ -2519,8 +2519,8 @@
{
try
{
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:813:2: ( '\\'' '\\'' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:814:3: '\\'' '\\''
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:810:2: ( '\\'' '\\'' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:811:3: '\\'' '\\''
{
Match('\''); if (state.failed) return ;
Match('\''); if (state.failed) return ;
@@ -2541,10 +2541,10 @@
{
int _type = WS;
int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:817:5: ( ( ' ' | '\\t' | '\\r' '\\n' | '\\n' | '\\r' ) )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:817:9: ( ' ' | '\\t' | '\\r' '\\n' | '\\n' | '\\r' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:814:5: ( ( ' ' | '\\t' | '\\r' '\\n' | '\\n' | '\\r' ) )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:814:9: ( ' ' | '\\t' | '\\r' '\\n' | '\\n' | '\\r' )
{
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:817:9: ( ' ' | '\\t' | '\\r' '\\n' | '\\n' | '\\r' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:814:9: ( ' ' | '\\t' | '\\r' '\\n' | '\\n' | '\\r' )
int alt4 = 5;
switch ( input.LA(1) )
{
@@ -2587,21 +2587,21 @@
switch (alt4)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:817:13: ' '
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:814:13: ' '
{
Match(' '); if (state.failed) return ;
}
break;
case 2 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:818:7: '\\t'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:815:7: '\\t'
{
Match('\t'); if (state.failed) return ;
}
break;
case 3 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:819:7: '\\r' '\\n'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:816:7: '\\r' '\\n'
{
Match('\r'); if (state.failed) return ;
Match('\n'); if (state.failed) return ;
@@ -2609,14 +2609,14 @@
}
break;
case 4 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:820:7: '\\n'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:817:7: '\\n'
{
Match('\n'); if (state.failed) return ;
}
break;
case 5 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:821:7: '\\r'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:818:7: '\\r'
{
Match('\r'); if (state.failed) return ;
@@ -2654,7 +2654,7 @@
IToken f4 = null;
bool isDecimal=false; IToken t=null;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:830: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 ) )? )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:827: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);
@@ -2677,14 +2677,14 @@
switch (alt20)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:830:6: '.' ( ( '0' .. '9' )+ ( EXPONENT )? (f1= FLOAT_SUFFIX )? )?
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:827:6: '.' ( ( '0' .. '9' )+ ( EXPONENT )? (f1= FLOAT_SUFFIX )? )?
{
Match('.'); if (state.failed) return ;
if ( (state.backtracking==0) )
{
_type = DOT;
}
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:831:4: ( ( '0' .. '9' )+ ( EXPONENT )? (f1= FLOAT_SUFFIX )? )?
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:828:4: ( ( '0' .. '9' )+ ( EXPONENT )? (f1= FLOAT_SUFFIX )? )?
int alt8 = 2;
int LA8_0 = input.LA(1);
@@ -2695,9 +2695,9 @@
switch (alt8)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:831:6: ( '0' .. '9' )+ ( EXPONENT )? (f1= FLOAT_SUFFIX )?
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:828:6: ( '0' .. '9' )+ ( EXPONENT )? (f1= FLOAT_SUFFIX )?
{
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:831:6: ( '0' .. '9' )+
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:828:6: ( '0' .. '9' )+
int cnt5 = 0;
do
{
@@ -2713,7 +2713,7 @@
switch (alt5)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:831:7: '0' .. '9'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:828:7: '0' .. '9'
{
MatchRange('0','9'); if (state.failed) return ;
@@ -2733,7 +2733,7 @@
loop5:
; // Stops C# compiler whinging that label 'loop5' has no statements
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:831:18: ( EXPONENT )?
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:828:18: ( EXPONENT )?
int alt6 = 2;
int LA6_0 = input.LA(1);
@@ -2744,7 +2744,7 @@
switch (alt6)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:831:19: EXPONENT
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:828:19: EXPONENT
{
mEXPONENT(); if (state.failed) return ;
@@ -2753,7 +2753,7 @@
}
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:831:30: (f1= FLOAT_SUFFIX )?
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:828:30: (f1= FLOAT_SUFFIX )?
int alt7 = 2;
int LA7_0 = input.LA(1);
@@ -2764,7 +2764,7 @@
switch (alt7)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:831:31: f1= FLOAT_SUFFIX
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:828:31: f1= FLOAT_SUFFIX
{
int f1Start1026 = CharIndex;
mFLOAT_SUFFIX(); if (state.failed) return ;
@@ -2802,9 +2802,9 @@
}
break;
case 2 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:843:4: ( '0' ( ( 'x' ) ( HEX_DIGIT )+ | ( '0' .. '7' )+ )? | ( '1' .. '9' ) ( '0' .. '9' )* ) ( ( 'l' ) | {...}? ( '.' ( '0' .. '9' )* ( EXPONENT )? (f2= FLOAT_SUFFIX )? | EXPONENT (f3= FLOAT_SUFFIX )? | f4= FLOAT_SUFFIX ) )?
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:840:4: ( '0' ( ( 'x' ) ( HEX_DIGIT )+ | ( '0' .. '7' )+ )? | ( '1' .. '9' ) ( '0' .. '9' )* ) ( ( 'l' ) | {...}? ( '.' ( '0' .. '9' )* ( EXPONENT )? (f2= FLOAT_SUFFIX )? | EXPONENT (f3= FLOAT_SUFFIX )? | f4= FLOAT_SUFFIX ) )?
{
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:843:4: ( '0' ( ( 'x' ) ( HEX_DIGIT )+ | ( '0' .. '7' )+ )? | ( '1' .. '9' ) ( '0' .. '9' )* )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:840:4: ( '0' ( ( 'x' ) ( HEX_DIGIT )+ | ( '0' .. '7' )+ )? | ( '1' .. '9' ) ( '0' .. '9' )* )
int alt13 = 2;
int LA13_0 = input.LA(1);
@@ -2827,14 +2827,14 @@
switch (alt13)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:843:6: '0' ( ( 'x' ) ( HEX_DIGIT )+ | ( '0' .. '7' )+ )?
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:840:6: '0' ( ( 'x' ) ( HEX_DIGIT )+ | ( '0' .. '7' )+ )?
{
Match('0'); if (state.failed) return ;
if ( (state.backtracking==0) )
{
isDecimal = true;
}
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:844:4: ( ( 'x' ) ( HEX_DIGIT )+ | ( '0' .. '7' )+ )?
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:841:4: ( ( 'x' ) ( HEX_DIGIT )+ | ( '0' .. '7' )+ )?
int alt11 = 3;
int LA11_0 = input.LA(1);
@@ -2849,16 +2849,16 @@
switch (alt11)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:844:6: ( 'x' ) ( HEX_DIGIT )+
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:841:6: ( 'x' ) ( HEX_DIGIT )+
{
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:844:6: ( 'x' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:844:7: 'x'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:841:6: ( 'x' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:841:7: 'x'
{
Match('x'); if (state.failed) return ;
}
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:845:5: ( HEX_DIGIT )+
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:842:5: ( HEX_DIGIT )+
int cnt9 = 0;
do
{
@@ -2924,7 +2924,7 @@
switch (alt9)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:852:7: HEX_DIGIT
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:849:7: HEX_DIGIT
{
mHEX_DIGIT(); if (state.failed) return ;
@@ -2948,9 +2948,9 @@
}
break;
case 2 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:854:6: ( '0' .. '7' )+
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:851:6: ( '0' .. '7' )+
{
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:854:6: ( '0' .. '7' )+
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:851:6: ( '0' .. '7' )+
int cnt10 = 0;
do
{
@@ -2966,7 +2966,7 @@
switch (alt10)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:854:7: '0' .. '7'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:851:7: '0' .. '7'
{
MatchRange('0','7'); if (state.failed) return ;
@@ -2996,16 +2996,16 @@
}
break;
case 2 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:856:5: ( '1' .. '9' ) ( '0' .. '9' )*
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:853:5: ( '1' .. '9' ) ( '0' .. '9' )*
{
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:856:5: ( '1' .. '9' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:856:6: '1' .. '9'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:853:5: ( '1' .. '9' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:853:6: '1' .. '9'
{
MatchRange('1','9'); if (state.failed) return ;
}
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:856:16: ( '0' .. '9' )*
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:853:16: ( '0' .. '9' )*
do
{
int alt12 = 2;
@@ -3020,7 +3020,7 @@
switch (alt12)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:856:17: '0' .. '9'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:853:17: '0' .. '9'
{
MatchRange('0','9'); if (state.failed) return ;
@@ -3045,7 +3045,7 @@
}
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:858:3: ( ( 'l' ) | {...}? ( '.' ( '0' .. '9' )* ( EXPONENT )? (f2= FLOAT_SUFFIX )? | EXPONENT (f3= FLOAT_SUFFIX )? | f4= FLOAT_SUFFIX ) )?
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:855:3: ( ( 'l' ) | {...}? ( '.' ( '0' .. '9' )* ( EXPONENT )? (f2= FLOAT_SUFFIX )? | EXPONENT (f3= FLOAT_SUFFIX )? | f4= FLOAT_SUFFIX ) )?
int alt19 = 3;
int LA19_0 = input.LA(1);
@@ -3060,10 +3060,10 @@
switch (alt19)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:858:5: ( 'l' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:855:5: ( 'l' )
{
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:858:5: ( 'l' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:858:6: 'l'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:855:5: ( 'l' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:855:6: 'l'
{
Match('l'); if (state.failed) return ;
@@ -3077,14 +3077,14 @@
}
break;
case 2 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:861:5: {...}? ( '.' ( '0' .. '9' )* ( EXPONENT )? (f2= FLOAT_SUFFIX )? | EXPONENT (f3= FLOAT_SUFFIX )? | f4= FLOAT_SUFFIX )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:858:5: {...}? ( '.' ( '0' .. '9' )* ( EXPONENT )? (f2= FLOAT_SUFFIX )? | EXPONENT (f3= FLOAT_SUFFIX )? | f4= FLOAT_SUFFIX )
{
if ( !((isDecimal)) )
{
if ( state.backtracking > 0 ) {state.failed = true; return ;}
throw new FailedPredicateException(input, "NUM_INT", "isDecimal");
}
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:862:4: ( '.' ( '0' .. '9' )* ( EXPONENT )? (f2= FLOAT_SUFFIX )? | EXPONENT (f3= FLOAT_SUFFIX )? | f4= FLOAT_SUFFIX )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:859:4: ( '.' ( '0' .. '9' )* ( EXPONENT )? (f2= FLOAT_SUFFIX )? | EXPONENT (f3= FLOAT_SUFFIX )? | f4= FLOAT_SUFFIX )
int alt18 = 3;
switch ( input.LA(1) )
{
@@ -3115,10 +3115,10 @@
switch (alt18)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:862:8: '.' ( '0' .. '9' )* ( EXPONENT )? (f2= FLOAT_SUFFIX )?
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:859:8: '.' ( '0' .. '9' )* ( EXPONENT )? (f2= FLOAT_SUFFIX )?
{
Match('.'); if (state.failed) return ;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:862:12: ( '0' .. '9' )*
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:859:12: ( '0' .. '9' )*
do
{
int alt14 = 2;
@@ -3133,7 +3133,7 @@
switch (alt14)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:862:13: '0' .. '9'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:859:13: '0' .. '9'
{
MatchRange('0','9'); if (state.failed) return ;
@@ -3148,7 +3148,7 @@
loop14:
; // Stops C# compiler whining that label 'loop14' has no statements
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:862:24: ( EXPONENT )?
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:859:24: ( EXPONENT )?
int alt15 = 2;
int LA15_0 = input.LA(1);
@@ -3159,7 +3159,7 @@
switch (alt15)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:862:25: EXPONENT
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:859:25: EXPONENT
{
mEXPONENT(); if (state.failed) return ;
@@ -3168,7 +3168,7 @@
}
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:862:36: (f2= FLOAT_SUFFIX )?
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:859:36: (f2= FLOAT_SUFFIX )?
int alt16 = 2;
int LA16_0 = input.LA(1);
@@ -3179,7 +3179,7 @@
switch (alt16)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:862:37: f2= FLOAT_SUFFIX
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:859:37: f2= FLOAT_SUFFIX
{
int f2Start1228 = CharIndex;
mFLOAT_SUFFIX(); if (state.failed) return ;
@@ -3198,10 +3198,10 @@
}
break;
case 2 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:863:8: EXPONENT (f3= FLOAT_SUFFIX )?
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:860:8: EXPONENT (f3= FLOAT_SUFFIX )?
{
mEXPONENT(); if (state.failed) return ;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:863:17: (f3= FLOAT_SUFFIX )?
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:860:17: (f3= FLOAT_SUFFIX )?
int alt17 = 2;
int LA17_0 = input.LA(1);
@@ -3212,7 +3212,7 @@
switch (alt17)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:863:18: f3= FLOAT_SUFFIX
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:860:18: f3= FLOAT_SUFFIX
{
int f3Start1246 = CharIndex;
mFLOAT_SUFFIX(); if (state.failed) return ;
@@ -3231,7 +3231,7 @@
}
break;
case 3 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:864:8: f4= FLOAT_SUFFIX
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:861:8: f4= FLOAT_SUFFIX
{
int f4Start1261 = CharIndex;
mFLOAT_SUFFIX(); if (state.failed) return ;
@@ -3284,8 +3284,8 @@
{
try
{
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:882:2: ( ( '0' .. '9' | 'a' .. 'f' ) )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:882:4: ( '0' .. '9' | 'a' .. 'f' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:879:2: ( ( '0' .. '9' | 'a' .. 'f' ) )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:879:4: ( '0' .. '9' | 'a' .. 'f' )
{
if ( (input.LA(1) >= '0' && input.LA(1) <= '9') || (input.LA(1) >= 'a' && input.LA(1) <= 'f') )
{
@@ -3314,17 +3314,17 @@
{
try
{
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:888:2: ( ( 'e' ) ( '+' | '-' )? ( '0' .. '9' )+ )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:888:4: ( 'e' ) ( '+' | '-' )? ( '0' .. '9' )+
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:885:2: ( ( 'e' ) ( '+' | '-' )? ( '0' .. '9' )+ )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:885:4: ( 'e' ) ( '+' | '-' )? ( '0' .. '9' )+
{
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:888:4: ( 'e' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:888:5: 'e'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:885:4: ( 'e' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:885:5: 'e'
{
Match('e'); if (state.failed) return ;
}
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:888:10: ( '+' | '-' )?
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:885:10: ( '+' | '-' )?
int alt21 = 2;
int LA21_0 = input.LA(1);
@@ -3355,7 +3355,7 @@
}
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:888:21: ( '0' .. '9' )+
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:885:21: ( '0' .. '9' )+
int cnt22 = 0;
do
{
@@ -3371,7 +3371,7 @@
switch (alt22)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:888:22: '0' .. '9'
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:885:22: '0' .. '9'
{
MatchRange('0','9'); if (state.failed) return ;
@@ -3406,7 +3406,7 @@
{
try
{
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:893:2: ( 'f' | 'd' )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:890:2: ( 'f' | 'd' )
// /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:
{
if ( input.LA(1) == 'd' || input.LA(1) == 'f' )
@@ -4096,8 +4096,8 @@
// $ANTLR start "synpred1_Hql"
public void synpred1_Hql_fragment() {
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:808:13: ( ESCqs )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:808:14: ESCqs
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:805:13: ( ESCqs )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:805:14: ESCqs
{
mESCqs(); if (state.failed) return ;
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlParser.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlParser.cs 2009-05-19 00:06:44 UTC (rev 4346)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlParser.cs 2009-05-19 11:57:25 UTC (rev 4347)
@@ -1,4 +1,4 @@
-// $ANTLR 3.1.2 /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g 2009-05-14 21:14:48
+// $ANTLR 3.1.2 /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g 2009-05-15 10:57:47
// The variable 'variable' is assigned but its value is never used.
#pragma warning disable 168, 219
@@ -1054,7 +1054,7 @@
// AST REWRITE
- // elements: asAlias, path
+ // elements: path, asAlias
// token labels:
// rule labels: retval
// token list labels:
@@ -1884,7 +1884,7 @@
// AST REWRITE
- // elements: selectClause, fromClause, selectClause
+ // elements: fromClause, selectClause, selectClause
// token labels:
// rule labels: retval
// token list labels:
@@ -2214,7 +2214,7 @@
// AST REWRITE
- // elements: selectedPropertiesList, path
+ // elements: path, selectedPropertiesList
// token labels:
// rule labels: retval
// token list labels:
@@ -3809,7 +3809,7 @@
// AST REWRITE
- // elements: path, alias
+ // elements: alias, path
// token labels:
// rule labels: retval
// token list labels:
@@ -4017,7 +4017,7 @@
// AST REWRITE
- // elements: path, alias
+ // elements: alias, path
// token labels:
// rule labels: retval
// token list labels:
@@ -7779,7 +7779,7 @@
// AST REWRITE
- // elements: whenClause, elseClause, CASE
+ // elements: elseClause, whenClause, CASE
// token labels:
// rule labels: retval
// token list labels:
@@ -7893,7 +7893,7 @@
// AST REWRITE
- // elements: altWhenClause, elseClause, unaryExpression
+ // elements: unaryExpression, altWhenClause, elseClause
// token labels:
...
[truncated message content] |
|
From: <ste...@us...> - 2009-06-10 19:05:32
|
Revision: 4447
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4447&view=rev
Author: steverstrong
Date: 2009-06-10 18:30:18 +0000 (Wed, 10 Jun 2009)
Log Message:
-----------
Fix for NH-1812
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlSqlWalker.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlSqlWalker.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlSqlWalker.cs 2009-06-10 15:56:57 UTC (rev 4446)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlSqlWalker.cs 2009-06-10 18:30:18 UTC (rev 4447)
@@ -1,4 +1,4 @@
-// $ANTLR 3.1.2 /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g 2009-05-14 21:14:52
+// $ANTLR 3.1.2 /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g 2009-06-10 16:43:56
// The variable 'variable' is assigned but its value is never used.
#pragma warning disable 168, 219
@@ -673,7 +673,7 @@
// AST REWRITE
- // elements: f, u, w, s
+ // elements: w, f, s, u
// token labels: u
// rule labels: w, f, retval, s
// token list labels:
@@ -1630,7 +1630,7 @@
// AST REWRITE
- // elements: o, w, f, s, g
+ // elements: f, g, o, s, w
// token labels:
// rule labels: o, w, f, retval, g, s
// token list labels:
@@ -4324,7 +4324,7 @@
// AST REWRITE
- // elements: w, b
+ // elements: b, w
// token labels: w
// rule labels: retval, b
// token list labels:
@@ -4427,7 +4427,7 @@
// AST REWRITE
- // elements: w, b
+ // elements: b, w
// token labels: w
// rule labels: retval, b
// token list labels:
@@ -7372,7 +7372,7 @@
};
// $ANTLR start "functionCall"
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:387:1: functionCall : ( ^(m= METHOD_CALL pathAsIdent ( ^( EXPR_LIST ( expr | comparisonExpr )* ) )? ) | ^( AGGREGATE aggregateExpr ) );
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:387:1: functionCall : ( ^(m= METHOD_CALL pathAsIdent ( ^( EXPR_LIST ( expr | query | comparisonExpr )* ) )? ) | ^( AGGREGATE aggregateExpr ) );
public HqlSqlWalker.functionCall_return functionCall() // throws RecognitionException [1]
{
HqlSqlWalker.functionCall_return retval = new HqlSqlWalker.functionCall_return();
@@ -7385,23 +7385,25 @@
IASTNode m = null;
IASTNode EXPR_LIST180 = null;
- IASTNode AGGREGATE183 = null;
+ IASTNode AGGREGATE184 = null;
HqlSqlWalker.pathAsIdent_return pathAsIdent179 = default(HqlSqlWalker.pathAsIdent_return);
HqlSqlWalker.expr_return expr181 = default(HqlSqlWalker.expr_return);
- HqlSqlWalker.comparisonExpr_return comparisonExpr182 = default(HqlSqlWalker.comparisonExpr_return);
+ HqlSqlWalker.query_return query182 = default(HqlSqlWalker.query_return);
- HqlSqlWalker.aggregateExpr_return aggregateExpr184 = default(HqlSqlWalker.aggregateExpr_return);
+ HqlSqlWalker.comparisonExpr_return comparisonExpr183 = default(HqlSqlWalker.comparisonExpr_return);
+ HqlSqlWalker.aggregateExpr_return aggregateExpr185 = default(HqlSqlWalker.aggregateExpr_return);
+
IASTNode m_tree=null;
IASTNode EXPR_LIST180_tree=null;
- IASTNode AGGREGATE183_tree=null;
+ IASTNode AGGREGATE184_tree=null;
try
{
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:388:2: ( ^(m= METHOD_CALL pathAsIdent ( ^( EXPR_LIST ( expr | comparisonExpr )* ) )? ) | ^( AGGREGATE aggregateExpr ) )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:388:2: ( ^(m= METHOD_CALL pathAsIdent ( ^( EXPR_LIST ( expr | query | comparisonExpr )* ) )? ) | ^( AGGREGATE aggregateExpr ) )
int alt57 = 2;
int LA57_0 = input.LA(1);
@@ -7423,7 +7425,7 @@
switch (alt57)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:388:4: ^(m= METHOD_CALL pathAsIdent ( ^( EXPR_LIST ( expr | comparisonExpr )* ) )? )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:388:4: ^(m= METHOD_CALL pathAsIdent ( ^( EXPR_LIST ( expr | query | comparisonExpr )* ) )? )
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -7447,7 +7449,7 @@
state.followingStackPointer--;
adaptor.AddChild(root_1, pathAsIdent179.Tree);
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:388:57: ( ^( EXPR_LIST ( expr | comparisonExpr )* ) )?
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:388:57: ( ^( EXPR_LIST ( expr | query | comparisonExpr )* ) )?
int alt56 = 2;
int LA56_0 = input.LA(1);
@@ -7458,7 +7460,7 @@
switch (alt56)
{
case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:388:59: ^( EXPR_LIST ( expr | comparisonExpr )* )
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:388:59: ^( EXPR_LIST ( expr | query | comparisonExpr )* )
{
_last = (IASTNode)input.LT(1);
{
@@ -7475,22 +7477,73 @@
if ( input.LA(1) == Token.DOWN )
{
Match(input, Token.DOWN, null);
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:388:71: ( expr | comparisonExpr )*
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:388:71: ( expr | query | comparisonExpr )*
do
{
- int alt55 = 3;
- int LA55_0 = input.LA(1);
-
- if ( (LA55_0 == COUNT || LA55_0 == DOT || LA55_0 == FALSE || LA55_0 == NULL || LA55_0 == TRUE || LA55_0 == CASE || LA55_0 == AGGREGATE || LA55_0 == CASE2 || LA55_0 == INDEX_OP || LA55_0 == METHOD_CALL || LA55_0 == UNARY_MINUS || (LA55_0 >= VECTOR_EXPR && LA55_0 <= WEIRD_IDENT) || (LA55_0 >= NUM_INT && LA55_0 <= JAVA_CONSTANT) || (LA55_0 >= BNOT && LA55_0 <= BAND) || (LA55_0 >= PLUS && LA55_0 <= DIV) || (LA55_0 >= COLON && LA55_0 <= IDENT)) )
+ int alt55 = 4;
+ switch ( input.LA(1) )
{
+ case COUNT:
+ case DOT:
+ case FALSE:
+ case NULL:
+ case TRUE:
+ case CASE:
+ case AGGREGATE:
+ case CASE2:
+ case INDEX_OP:
+ case METHOD_CALL:
+ case UNARY_MINUS:
+ case VECTOR_EXPR:
+ case WEIRD_IDENT:
+ case NUM_INT:
+ case NUM_DOUBLE:
+ case NUM_FLOAT:
+ case NUM_LONG:
+ case JAVA_CONSTANT:
+ case BNOT:
+ case BOR:
+ case BXOR:
+ case BAND:
+ case PLUS:
+ case MINUS:
+ case STAR:
+ case DIV:
+ case COLON:
+ case PARAM:
+ case QUOTED_String:
+ case IDENT:
+ {
alt55 = 1;
- }
- else if ( (LA55_0 == BETWEEN || LA55_0 == EXISTS || LA55_0 == IN || LA55_0 == LIKE || (LA55_0 >= IS_NOT_NULL && LA55_0 <= IS_NULL) || (LA55_0 >= NOT_BETWEEN && LA55_0 <= NOT_LIKE) || LA55_0 == EQ || LA55_0 == NE || (LA55_0 >= LT && LA55_0 <= GE)) )
- {
+ }
+ break;
+ case QUERY:
+ {
alt55 = 2;
+ }
+ break;
+ case BETWEEN:
+ case EXISTS:
+ case IN:
+ case LIKE:
+ case IS_NOT_NULL:
+ case IS_NULL:
+ case NOT_BETWEEN:
+ case NOT_IN:
+ case NOT_LIKE:
+ case EQ:
+ case NE:
+ case LT:
+ case GT:
+ case LE:
+ case GE:
+ {
+ alt55 = 3;
+ }
+ break;
+
}
-
switch (alt55)
{
case 1 :
@@ -7506,18 +7559,30 @@
}
break;
case 2 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:388:79: comparisonExpr
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:388:79: query
{
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_comparisonExpr_in_functionCall2053);
- comparisonExpr182 = comparisonExpr();
+ PushFollow(FOLLOW_query_in_functionCall2053);
+ query182 = query();
state.followingStackPointer--;
- adaptor.AddChild(root_2, comparisonExpr182.Tree);
+ adaptor.AddChild(root_2, query182.Tree);
}
break;
+ case 3 :
+ // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:388:87: comparisonExpr
+ {
+ _last = (IASTNode)input.LT(1);
+ PushFollow(FOLLOW_comparisonExpr_in_functionCall2057);
+ comparisonExpr183 = comparisonExpr();
+ state.followingStackPointer--;
+ adaptor.AddChild(root_2, comparisonExpr183.Tree);
+
+ }
+ break;
+
default:
goto loop55;
}
@@ -7555,20 +7620,20 @@
IASTNode _save_last_1 = _last;
IASTNode _first_1 = null;
IASTNode root_1 = (IASTNode)adaptor.GetNilNode();_last = (IASTNode)input.LT(1);
- AGGREGATE183=(IASTNode)Match(input,AGGREGATE,FOLLOW_AGGREGATE_in_functionCall2072);
- AGGREGATE183_tree = (IASTNode)adaptor.DupNode(AGGREGATE183);
+ AGGREGATE184=(IASTNode)Match(input,AGGREGATE,FOLLOW_AGGREGATE_in_functionCall2076);
+ AGGREGATE184_tree = (IASTNode)adaptor.DupNode(AGGREGATE184);
- root_1 = (IASTNode)adaptor.BecomeRoot(AGGREGATE183_tree, root_1);
+ root_1 = (IASTNode)adaptor.BecomeRoot(AGGREGATE184_tree, root_1);
Match(input, Token.DOWN, null);
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_aggregateExpr_in_functionCall2074);
- aggregateExpr184 = aggregateExpr();
+ PushFollow(FOLLOW_aggregateExpr_in_functionCall2078);
+ aggregateExpr185 = aggregateExpr();
state.followingStackPointer--;
- adaptor.AddChild(root_1, aggregateExpr184.Tree);
+ adaptor.AddChild(root_1, aggregateExpr185.Tree);
Match(input, Token.UP, null); adaptor.AddChild(root_0, root_1);_last = _save_last_1;
}
@@ -7617,15 +7682,15 @@
IASTNode t = null;
IASTNode f = null;
- IASTNode NULL186 = null;
- IASTNode JAVA_CONSTANT187 = null;
- HqlSqlWalker.literal_return literal185 = default(HqlSqlWalker.literal_return);
+ IASTNode NULL187 = null;
+ IASTNode JAVA_CONSTANT188 = null;
+ HqlSqlWalker.literal_return literal186 = default(HqlSqlWalker.literal_return);
IASTNode t_tree=null;
IASTNode f_tree=null;
- IASTNode NULL186_tree=null;
- IASTNode JAVA_CONSTANT187_tree=null;
+ IASTNode NULL187_tree=null;
+ IASTNode JAVA_CONSTANT188_tree=null;
try
{
@@ -7677,11 +7742,11 @@
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_literal_in_constant2087);
- literal185 = literal();
+ PushFollow(FOLLOW_literal_in_constant2091);
+ literal186 = literal();
state.followingStackPointer--;
- adaptor.AddChild(root_0, literal185.Tree);
+ adaptor.AddChild(root_0, literal186.Tree);
}
break;
@@ -7691,10 +7756,10 @@
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- NULL186=(IASTNode)Match(input,NULL,FOLLOW_NULL_in_constant2092);
- NULL186_tree = (IASTNode)adaptor.DupNode(NULL186);
+ NULL187=(IASTNode)Match(input,NULL,FOLLOW_NULL_in_constant2096);
+ NULL187_tree = (IASTNode)adaptor.DupNode(NULL187);
- adaptor.AddChild(root_0, NULL186_tree);
+ adaptor.AddChild(root_0, NULL187_tree);
}
@@ -7705,7 +7770,7 @@
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- t=(IASTNode)Match(input,TRUE,FOLLOW_TRUE_in_constant2099);
+ t=(IASTNode)Match(input,TRUE,FOLLOW_TRUE_in_constant2103);
t_tree = (IASTNode)adaptor.DupNode(t);
adaptor.AddChild(root_0, t_tree);
@@ -7720,7 +7785,7 @@
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- f=(IASTNode)Match(input,FALSE,FOLLOW_FALSE_in_constant2109);
+ f=(IASTNode)Match(input,FALSE,FOLLOW_FALSE_in_constant2113);
f_tree = (IASTNode)adaptor.DupNode(f);
adaptor.AddChild(root_0, f_tree);
@@ -7735,10 +7800,10 @@
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- JAVA_CONSTANT187=(IASTNode)Match(input,JAVA_CONSTANT,FOLLOW_JAVA_CONSTANT_in_constant2116);
- JAVA_CONSTANT187_tree = (IASTNode)adaptor.DupNode(JAVA_CONSTANT187);
+ JAVA_CONSTANT188=(IASTNode)Match(input,JAVA_CONSTANT,FOLLOW_JAVA_CONSTANT_in_constant2120);
+ JAVA_CONSTANT188_tree = (IASTNode)adaptor.DupNode(JAVA_CONSTANT188);
- adaptor.AddChild(root_0, JAVA_CONSTANT187_tree);
+ adaptor.AddChild(root_0, JAVA_CONSTANT188_tree);
}
@@ -7782,9 +7847,9 @@
IASTNode _first_0 = null;
IASTNode _last = null;
- HqlSqlWalker.numericLiteral_return numericLiteral188 = default(HqlSqlWalker.numericLiteral_return);
+ HqlSqlWalker.numericLiteral_return numericLiteral189 = default(HqlSqlWalker.numericLiteral_return);
- HqlSqlWalker.stringLiteral_return stringLiteral189 = default(HqlSqlWalker.stringLiteral_return);
+ HqlSqlWalker.stringLiteral_return stringLiteral190 = default(HqlSqlWalker.stringLiteral_return);
@@ -7817,11 +7882,11 @@
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_numericLiteral_in_literal2127);
- numericLiteral188 = numericLiteral();
+ PushFollow(FOLLOW_numericLiteral_in_literal2131);
+ numericLiteral189 = numericLiteral();
state.followingStackPointer--;
- adaptor.AddChild(root_0, numericLiteral188.Tree);
+ adaptor.AddChild(root_0, numericLiteral189.Tree);
}
break;
@@ -7831,11 +7896,11 @@
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_stringLiteral_in_literal2132);
- stringLiteral189 = stringLiteral();
+ PushFollow(FOLLOW_stringLiteral_in_literal2136);
+ stringLiteral190 = stringLiteral();
state.followingStackPointer--;
- adaptor.AddChild(root_0, stringLiteral189.Tree);
+ adaptor.AddChild(root_0, stringLiteral190.Tree);
}
break;
@@ -7878,9 +7943,9 @@
IASTNode _first_0 = null;
IASTNode _last = null;
- IASTNode set190 = null;
+ IASTNode set191 = null;
- IASTNode set190_tree=null;
+ IASTNode set191_tree=null;
try
{
@@ -7890,14 +7955,14 @@
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- set190 = (IASTNode)input.LT(1);
+ set191 = (IASTNode)input.LT(1);
if ( (input.LA(1) >= NUM_INT && input.LA(1) <= NUM_LONG) )
{
input.Consume();
- set190_tree = (IASTNode)adaptor.DupNode(set190);
+ set191_tree = (IASTNode)adaptor.DupNode(set191);
- adaptor.AddChild(root_0, set190_tree);
+ adaptor.AddChild(root_0, set191_tree);
state.errorRecovery = false;
}
@@ -7951,9 +8016,9 @@
IASTNode _first_0 = null;
IASTNode _last = null;
- IASTNode QUOTED_String191 = null;
+ IASTNode QUOTED_String192 = null;
- IASTNode QUOTED_String191_tree=null;
+ IASTNode QUOTED_String192_tree=null;
try
{
@@ -7963,10 +8028,10 @@
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- QUOTED_String191=(IASTNode)Match(input,QUOTED_String,FOLLOW_QUOTED_String_in_stringLiteral2174);
- QUOTED_String191_tree = (IASTNode)adaptor.DupNode(QUOTED_String191);
+ QUOTED_String192=(IASTNode)Match(input,QUOTED_String,FOLLOW_QUOTED_String_in_stringLiteral2178);
+ QUOTED_String192_tree = (IASTNode)adaptor.DupNode(QUOTED_String192);
- adaptor.AddChild(root_0, QUOTED_String191_tree);
+ adaptor.AddChild(root_0, QUOTED_String192_tree);
}
@@ -8008,9 +8073,9 @@
IASTNode _first_0 = null;
IASTNode _last = null;
- IASTNode set192 = null;
+ IASTNode set193 = null;
- IASTNode set192_tree=null;
+ IASTNode set193_tree=null;
try
{
@@ -8020,14 +8085,14 @@
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- set192 = (IASTNode)input.LT(1);
+ set193 = (IASTNode)input.LT(1);
if ( input.LA(1) == WEIRD_IDENT || input.LA(1) == IDENT )
{
input.Consume();
- set192_tree = (IASTNode)adaptor.DupNode(set192);
+ set193_tree = (IASTNode)adaptor.DupNode(set193);
- adaptor.AddChild(root_0, set192_tree);
+ adaptor.AddChild(root_0, set193_tree);
state.errorRecovery = false;
}
@@ -8077,11 +8142,11 @@
IASTNode _first_0 = null;
IASTNode _last = null;
- HqlSqlWalker.addrExprDot_return addrExprDot193 = default(HqlSqlWalker.addrExprDot_return);
+ HqlSqlWalker.addrExprDot_return addrExprDot194 = default(HqlSqlWalker.addrExprDot_return);
- HqlSqlWalker.addrExprIndex_return addrExprIndex194 = default(HqlSqlWalker.addrExprIndex_return);
+ HqlSqlWalker.addrExprIndex_return addrExprIndex195 = default(HqlSqlWalker.addrExprIndex_return);
- HqlSqlWalker.addrExprIdent_return addrExprIdent195 = default(HqlSqlWalker.addrExprIdent_return);
+ HqlSqlWalker.addrExprIdent_return addrExprIdent196 = default(HqlSqlWalker.addrExprIdent_return);
@@ -8122,11 +8187,11 @@
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_addrExprDot_in_addrExpr2204);
- addrExprDot193 = addrExprDot(root);
+ PushFollow(FOLLOW_addrExprDot_in_addrExpr2208);
+ addrExprDot194 = addrExprDot(root);
state.followingStackPointer--;
- adaptor.AddChild(root_0, addrExprDot193.Tree);
+ adaptor.AddChild(root_0, addrExprDot194.Tree);
}
break;
@@ -8136,11 +8201,11 @@
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_addrExprIndex_in_addrExpr2211);
- addrExprIndex194 = addrExprIndex(root);
+ PushFollow(FOLLOW_addrExprIndex_in_addrExpr2215);
+ addrExprIndex195 = addrExprIndex(root);
state.followingStackPointer--;
- adaptor.AddChild(root_0, addrExprIndex194.Tree);
+ adaptor.AddChild(root_0, addrExprIndex195.Tree);
}
break;
@@ -8150,11 +8215,11 @@
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_addrExprIdent_in_addrExpr2218);
- addrExprIdent195 = addrExprIdent(root);
+ PushFollow(FOLLOW_addrExprIdent_in_addrExpr2222);
+ addrExprIdent196 = addrExprIdent(root);
state.followingStackPointer--;
- adaptor.AddChild(root_0, addrExprIdent195.Tree);
+ adaptor.AddChild(root_0, addrExprIdent196.Tree);
}
break;
@@ -8217,20 +8282,20 @@
IASTNode _save_last_1 = _last;
IASTNode _first_1 = null;
IASTNode root_1 = (IASTNode)adaptor.GetNilNode();_last = (IASTNode)input.LT(1);
- d=(IASTNode)Match(input,DOT,FOLLOW_DOT_in_addrExprDot2242);
+ d=(IASTNode)Match(input,DOT,FOLLOW_DOT_in_addrExprDot2246);
stream_DOT.Add(d);
Match(input, Token.DOWN, null);
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_addrExprLhs_in_addrExprDot2246);
+ PushFollow(FOLLOW_addrExprLhs_in_addrExprDot2250);
lhs = addrExprLhs();
state.followingStackPointer--;
stream_addrExprLhs.Add(lhs.Tree);
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_propertyName_in_addrExprDot2250);
+ PushFollow(FOLLOW_propertyName_in_addrExprDot2254);
rhs = propertyName();
state.followingStackPointer--;
@@ -8242,7 +8307,7 @@
// AST REWRITE
- // elements: rhs, lhs, d
+ // elements: d, lhs, rhs
// token labels: d
// rule labels: lhs, retval, rhs
// token list labels:
@@ -8333,20 +8398,20 @@
IASTNode _save_last_1 = _last;
IASTNode _first_1 = null;
IASTNode root_1 = (IASTNode)adaptor.GetNilNode();_last = (IASTNode)input.LT(1);
- i=(IASTNode)Match(input,INDEX_OP,FOLLOW_INDEX_OP_in_addrExprIndex2289);
+ i=(IASTNode)Match(input,INDEX_OP,FOLLOW_INDEX_OP_in_addrExprIndex2293);
stream_INDEX_OP.Add(i);
Match(input, Token.DOWN, null);
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_addrExprLhs_in_addrExprIndex2293);
+ PushFollow(FOLLOW_addrExprLhs_in_addrExprIndex2297);
lhs2 = addrExprLhs();
state.followingStackPointer--;
stream_addrExprLhs.Add(lhs2.Tree);
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_expr_in_addrExprIndex2297);
+ PushFollow(FOLLOW_expr_in_addrExprIndex2301);
rhs2 = expr();
state.followingStackPointer--;
@@ -8358,7 +8423,7 @@
// AST REWRITE
- // elements: rhs2, lhs2, i
+ // elements: i, rhs2, lhs2
// token labels: i
// rule labels: rhs2, retval, lhs2
// token list labels:
@@ -8439,7 +8504,7 @@
// /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:451:4: p= identifier
{
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_identifier_in_addrExprIdent2329);
+ PushFollow(FOLLOW_identifier_in_addrExprIdent2333);
p = identifier();
state.followingStackPointer--;
@@ -8521,7 +8586,7 @@
IASTNode _first_0 = null;
IASTNode _last = null;
- HqlSqlWalker.addrExpr_return addrExpr196 = default(HqlSqlWalker.addrExpr_return);
+ HqlSqlWalker.addrExpr_return addrExpr197 = default(HqlSqlWalker.addrExpr_return);
@@ -8533,11 +8598,11 @@
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_addrExpr_in_addrExprLhs2357);
- addrExpr196 = addrExpr(false);
+ PushFollow(FOLLOW_addrExpr_in_addrExprLhs2361);
+ addrExpr197 = addrExpr(false);
state.followingStackPointer--;
- adaptor.AddChild(root_0, addrExpr196.Tree);
+ adaptor.AddChild(root_0, addrExpr197.Tree);
}
@@ -8578,15 +8643,15 @@
IASTNode _first_0 = null;
IASTNode _last = null;
- IASTNode CLASS198 = null;
- IASTNode ELEMENTS199 = null;
- IASTNode INDICES200 = null;
- HqlSqlWalker.identifier_return identifier197 = default(HqlSqlWalker.identifier_return);
+ IASTNode CLASS199 = null;
+ IASTNode ELEMENTS200 = null;
+ IASTNode INDICES201 = null;
+ HqlSqlWalker.identifier_return identifier198 = default(HqlSqlWalker.identifier_return);
- IASTNode CLASS198_tree=null;
- IASTNode ELEMENTS199_tree=null;
- IASTNode INDICES200_tree=null;
+ IASTNode CLASS199_tree=null;
+ IASTNode ELEMENTS200_tree=null;
+ IASTNode INDICES201_tree=null;
try
{
@@ -8630,11 +8695,11 @@
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_identifier_in_propertyName2370);
- identifier197 = identifier();
+ PushFollow(FOLLOW_identifier_in_propertyName2374);
+ identifier198 = identifier();
state.followingStackPointer--;
- adaptor.AddChild(root_0, identifier197.Tree);
+ adaptor.AddChild(root_0, identifier198.Tree);
}
break;
@@ -8644,10 +8709,10 @@
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- CLASS198=(IASTNode)Match(input,CLASS,FOLLOW_CLASS_in_propertyName2375);
- CLASS198_tree = (IASTNode)adaptor.DupNode(CLASS198);
+ CLASS199=(IASTNode)Match(input,CLASS,FOLLOW_CLASS_in_propertyName2379);
+ CLASS199_tree = (IASTNode)adaptor.DupNode(CLASS199);
- adaptor.AddChild(root_0, CLASS198_tree);
+ adaptor.AddChild(root_0, CLASS199_tree);
}
@@ -8658,10 +8723,10 @@
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- ELEMENTS199=(IASTNode)Match(input,ELEMENTS,FOLLOW_ELEMENTS_in_propertyName2380);
- ELEMENTS199_tree = (IASTNode)adaptor.DupNode(ELEMENTS199);
+ ELEMENTS200=(IASTNode)Match(input,ELEMENTS,FOLLOW_ELEMENTS_in_propertyName2384);
+ ELEMENTS200_tree = (IASTNode)adaptor.DupNode(ELEMENTS200);
- adaptor.AddChild(root_0, ELEMENTS199_tree);
+ adaptor.AddChild(root_0, ELEMENTS200_tree);
}
@@ -8672,10 +8737,10 @@
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- INDICES200=(IASTNode)Match(input,INDICES,FOLLOW_INDICES_in_propertyName2385);
- INDICES200_tree = (IASTNode)adaptor.DupNode(INDICES200);
+ INDICES201=(IASTNode)Match(input,INDICES,FOLLOW_INDICES_in_propertyName2389);
+ INDICES201_tree = (IASTNode)adaptor.DupNode(INDICES201);
- adaptor.AddChild(root_0, INDICES200_tree);
+ adaptor.AddChild(root_0, INDICES201_tree);
}
@@ -8719,9 +8784,9 @@
IASTNode _first_0 = null;
IASTNode _last = null;
- HqlSqlWalker.propertyRefPath_return propertyRefPath201 = default(HqlSqlWalker.propertyRefPath_return);
+ HqlSqlWalker.propertyRefPath_return propertyRefPath202 = default(HqlSqlWalker.propertyRefPath_return);
- HqlSqlWalker.propertyRefIdent_return propertyRefIdent202 = default(HqlSqlWalker.propertyRefIdent_return);
+ HqlSqlWalker.propertyRefIdent_return propertyRefIdent203 = default(HqlSqlWalker.propertyRefIdent_return);
@@ -8754,11 +8819,11 @@
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_propertyRefPath_in_propertyRef2397);
- propertyRefPath201 = propertyRefPath();
+ PushFollow(FOLLOW_propertyRefPath_in_propertyRef2401);
+ propertyRefPath202 = propertyRefPath();
state.followingStackPointer--;
- adaptor.AddChild(root_0, propertyRefPath201.Tree);
+ adaptor.AddChild(root_0, propertyRefPath202.Tree);
}
break;
@@ -8768,11 +8833,11 @@
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_propertyRefIdent_in_propertyRef2402);
- propertyRefIdent202 = propertyRefIdent();
+ PushFollow(FOLLOW_propertyRefIdent_in_propertyRef2406);
+ propertyRefIdent203 = propertyRefIdent();
state.followingStackPointer--;
- adaptor.AddChild(root_0, propertyRefIdent202.Tree);
+ adaptor.AddChild(root_0, propertyRefIdent203.Tree);
}
break;
@@ -8835,20 +8900,20 @@
IASTNode _save_last_1 = _last;
IASTNode _first_1 = null;
IASTNode root_1 = (IASTNode)adaptor.GetNilNode();_last = (IASTNode)input.LT(1);
- d=(IASTNode)Match(input,DOT,FOLLOW_DOT_in_propertyRefPath2422);
+ d=(IASTNode)Match(input,DOT,FOLLOW_DOT_in_propertyRefPath2426);
stream_DOT.Add(d);
Match(input, Token.DOWN, null);
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_propertyRefLhs_in_propertyRefPath2426);
+ PushFollow(FOLLOW_propertyRefLhs_in_propertyRefPath2430);
lhs = propertyRefLhs();
state.followingStackPointer--;
stream_propertyRefLhs.Add(lhs.Tree);
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_propertyName_in_propertyRefPath2430);
+ PushFollow(FOLLOW_propertyName_in_propertyRefPath2434);
rhs = propertyName();
state.followingStackPointer--;
@@ -8860,7 +8925,7 @@
// AST REWRITE
- // elements: d, lhs, rhs
+ // elements: rhs, lhs, d
// token labels: d
// rule labels: lhs, retval, rhs
// token list labels:
@@ -8944,7 +9009,7 @@
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_identifier_in_propertyRefIdent2467);
+ PushFollow(FOLLOW_identifier_in_propertyRefIdent2471);
p = identifier();
state.followingStackPointer--;
@@ -9002,7 +9067,7 @@
IASTNode _first_0 = null;
IASTNode _last = null;
- HqlSqlWalker.propertyRef_return propertyRef203 = default(HqlSqlWalker.propertyRef_return);
+ HqlSqlWalker.propertyRef_return propertyRef204 = default(HqlSqlWalker.propertyRef_return);
@@ -9014,11 +9079,11 @@
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_propertyRef_in_propertyRefLhs2479);
- propertyRef203 = propertyRef();
+ PushFollow(FOLLOW_propertyRef_in_propertyRefLhs2483);
+ propertyRef204 = propertyRef();
state.followingStackPointer--;
- adaptor.AddChild(root_0, propertyRef203.Tree);
+ adaptor.AddChild(root_0, propertyRef204.Tree);
}
@@ -9071,7 +9136,7 @@
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_identifier_in_aliasRef2500);
+ PushFollow(FOLLOW_identifier_in_aliasRef2504);
i = identifier();
state.followingStackPointer--;
@@ -9163,14 +9228,14 @@
IASTNode _save_last_1 = _last;
IASTNode _first_1 = null;
IASTNode root_1 = (IASTNode)adaptor.GetNilNode();_last = (IASTNode)input.LT(1);
- c=(IASTNode)Match(input,COLON,FOLLOW_COLON_in_parameter2518);
+ c=(IASTNode)Match(input,COLON,FOLLOW_COLON_in_parameter2522);
stream_COLON.Add(c);
Match(input, Token.DOWN, null);
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_identifier_in_parameter2522);
+ PushFollow(FOLLOW_identifier_in_parameter2526);
a = identifier();
state.followingStackPointer--;
@@ -9215,7 +9280,7 @@
IASTNode _save_last_1 = _last;
IASTNode _first_1 = null;
IASTNode root_1 = (IASTNode)adaptor.GetNilNode();_last = (IASTNode)input.LT(1);
- p=(IASTNode)Match(input,PARAM,FOLLOW_PARAM_in_parameter2543);
+ p=(IASTNode)Match(input,PARAM,FOLLOW_PARAM_in_parameter2547);
stream_PARAM.Add(p);
@@ -9237,7 +9302,7 @@
// /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g:515:15: n= NUM_INT
{
_last = (IASTNode)input.LT(1);
- n=(IASTNode)Match(input,NUM_INT,FOLLOW_NUM_INT_in_parameter2548);
+ n=(IASTNode)Match(input,NUM_INT,FOLLOW_NUM_INT_in_parameter2552);
stream_NUM_INT.Add(n);
@@ -9330,9 +9395,9 @@
IASTNode _first_0 = null;
IASTNode _last = null;
- IASTNode NUM_INT204 = null;
+ IASTNode NUM_INT205 = null;
- IASTNode NUM_INT204_tree=null;
+ IASTNode NUM_INT205_tree=null;
try
{
@@ -9342,10 +9407,10 @@
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- NUM_INT204=(IASTNode)Match(input,NUM_INT,FOLLOW_NUM_INT_in_numericInteger2581);
- NUM_INT204_tree = (IASTNode)adaptor.DupNode(NUM_INT204);
+ NUM_INT205=(IASTNode)Match(input,NUM_INT,FOLLOW_NUM_INT_in_numericInteger2585);
+ NUM_INT205_tree = (IASTNode)adaptor.DupNode(NUM_INT205);
- adaptor.AddChild(root_0, NUM_INT204_tree);
+ adaptor.AddChild(root_0, NUM_INT205_tree);
}
@@ -9604,48 +9669,49 @@
public static readonly BitSet FOLLOW_METHOD_CALL_in_functionCall2036 = new BitSet(new ulong[]{0x0000000000000004UL});
public static readonly BitSet FOLLOW_pathAsIdent_in_functionCall2041 = new BitSet(new ulong[]{0x0000000000000008UL,0x0000000000000200UL});
public static readonly BitSet FOLLOW_EXPR_LIST_in_functionCall2046 = new BitSet(new ulong[]{0x0000000000000004UL});
- public static readonly BitSet FOLLOW_expr_in_functionCall2049 = new BitSet(new ulong[]{0x008201C404189448UL,0x079EF7CBED07F120UL});
- public static readonly BitSet FOLLOW_comparisonExpr_in_functionCall2053 = new BitSet(new ulong[]{0x008201C404189448UL,0x079EF7CBED07F120UL});
- public static readonly BitSet FOLLOW_AGGREGATE_in_functionCall2072 = new BitSet(new ulong[]{0x0000000000000004UL});
- public static readonly BitSet FOLLOW_aggregateExpr_in_functionCall2074 = new BitSet(new ulong[]{0x0000000000000008UL});
- public static readonly BitSet FOLLOW_literal_in_constant2087 = new BitSet(new ulong[]{0x0000000000000002UL});
- public static readonly BitSet FOLLOW_NULL_in_constant2092 = new BitSet(new ulong[]{0x0000000000000002UL});
- public static readonly BitSet FOLLOW_TRUE_in_constant2099 = new BitSet(new ulong[]{0x0000000000000002UL});
- public static readonly BitSet FOLLOW_FALSE_in_constant2109 = new BitSet(new ulong[]{0x0000000000000002UL});
- public static readonly BitSet FOLLOW_JAVA_CONSTANT_in_constant2116 = new BitSet(new ulong[]{0x0000000000000002UL});
- public static readonly BitSet FOLLOW_numericLiteral_in_literal2127 = new BitSet(new ulong[]{0x0000000000000002UL});
- public static readonly BitSet FOLLOW_stringLiteral_in_literal2132 = new BitSet(new ulong[]{0x0000000000000002UL});
+ public static readonly BitSet FOLLOW_expr_in_functionCall2049 = new BitSet(new ulong[]{0x008201C404189448UL,0x079EF7CBED17F120UL});
+ public static readonly BitSet FOLLOW_query_in_functionCall2053 = new BitSet(new ulong[]{0x008201C404189448UL,0x079EF7CBED17F120UL});
+ public static readonly BitSet FOLLOW_comparisonExpr_in_functionCall2057 = new BitSet(new ulong[]{0x008201C404189448UL,0x079EF7CBED17F120UL});
+ public static readonly BitSet FOLLOW_AGGREGATE_in_functionCall2076 = new BitSet(new ulong[]{0x0000000000000004UL});
+ public static readonly BitSet FOLLOW_aggregateExpr_in_functionCall2078 = new BitSet(new ulong[]{0x0000000000000008UL});
+ public static readonly BitSet FOLLOW_literal_in_constant2091 = new BitSet(new ulong[]{0x0000000000000002UL});
+ public static readonly BitSet FOLLOW_NULL_in_constant2096 = new BitSet(new ulong[]{0x0000000000000002UL});
+ public static readonly BitSet FOLLOW_TRUE_in_constant2103 = new BitSet(new ulong[]{0x0000000000000002UL});
+ public static readonly BitSet FOLLOW_FALSE_in_constant2113 = new BitSet(new ulong[]{0x0000000000000002UL});
+ public static readonly BitSet FOLLOW_JAVA_CONSTANT_in_constant2120 = new BitSet(new ulong[]{0x0000000000000002UL});
+ public static readonly BitSet FOLLOW_numericLiteral_in_literal2131 = new BitSet(new ulong[]{0x0000000000000002UL});
+ public static readonly BitSet FOLLOW_stringLiteral_in_literal2136 = new BitSet(new ulong[]{0x0000000000000002UL});
public static readonly BitSet FOLLOW_set_in_numericLiteral0 = new BitSet(new ulong[]{0x0000000000000002UL});
- public static readonly BitSet FOLLOW_QUOTED_String_in_stringLiteral2174 = new BitSet(new ulong[]{0x0000000000000002UL});
- public static readonly BitSet FOLLOW_set_in_identifier2185 = new BitSet(new ulong[]{0x0000000000000002UL});
- public static readonly BitSet FOLLOW_addrExprDot_in_addrExpr2204 = new BitSet(new ulong[]{0x0000000000000002UL});
- public static readonly BitSet FOLLOW_addrExprIndex_in_addrExpr2211 = new BitSet(new ulong[]{0x0000000000000002UL});
- public static readonly BitSet FOLLOW_addrExprIdent_in_addrExpr2218 = new BitSet(new ulong[]{0x0000000000000002UL});
- public static readonly BitSet FOLLOW_DOT_in_addrExprDot2242 = new BitSet(new ulong[]{0x0000000000000004UL});
- public static readonly BitSet FOLLOW_addrExprLhs_in_addrExprDot2246 = new BitSet(new ulong[]{0x0000000008028800UL,0x0400000008001000UL});
- public static readonly BitSet FOLLOW_propertyName_in_addrExprDot2250 = new BitSet(new ulong[]{0x0000000000000008UL});
- public static readonly BitSet FOLLOW_INDEX_OP_in_addrExprIndex2289 = new BitSet(new ulong[]{0x0000000000000004UL});
- public static readonly BitSet FOLLOW_addrExprLhs_in_addrExprIndex2293 = new BitSet(new ulong[]{0x0082008000109000UL,0x079E03C3ED009120UL});
- public static readonly BitSet FOLLOW_expr_in_addrExprIndex2297 = new BitSet(new ulong[]{0x0000000000000008UL});
- public static readonly BitSet FOLLOW_identifier_in_addrExprIdent2329 = new BitSet(new ulong[]{0x0000000000000002UL});
- public static readonly BitSet FOLLOW_addrExpr_in_addrExprLhs2357 = new BitSet(new ulong[]{0x0000000000000002UL});
- public static readonly BitSet FOLLOW_identifier_in_propertyName2370 = new BitSet(new ulong[]{0x0000000000000002UL});
- public static readonly BitSet FOLLOW_CLASS_in_propertyName2375 = new BitSet(new ulong[]{0x0000000000000002UL});
- public static readonly BitSet FOLLOW_ELEMENTS_in_propertyName2380 = new BitSet(new ulong[]{0x0000000000000002UL});
- public static readonly BitSet FOLLOW_INDICES_in_propertyName2385 = new BitSet(new ulong[]{0x0000000000000002UL});
- public static readonly BitSet FOLLOW_propertyRefPath_in_propertyRef2397 = new BitSet(new ulong[]{0x0000000000000002UL});
- public static readonly BitSet FOLLOW_propertyRefIdent_in_propertyRef2402 = new BitSet(new ulong[]{0x0000000000000002UL});
- public static readonly BitSet FOLLOW_DOT_in_propertyRefPath2422 = new BitSet(new ulong[]{0x0000000000000004UL});
- public static readonly BitSet FOLLOW_propertyRefLhs_in_propertyRefPath2426 = new BitSet(new ulong[]{0x0000000008028800UL,0x0400000008001000UL});
- public static readonly BitSet FOLLOW_propertyName_in_propertyRefPath2430 = new BitSet(new ulong[]{0x0000000000000008UL});
- public static readonly BitSet FOLLOW_identifier_in_propertyRefIdent2467 = new BitSet(new ulong[]{0x0000000000000002UL});
- public static readonly BitSet FOLLOW_propertyRef_in_propertyRefLhs2479 = new BitSet(new ulong[]{0x0000000000000002UL});
- public static readonly BitSet FOLLOW_identifier_in_aliasRef2500 = new BitSet(new ulong[]{0x0000000000000002UL});
- public static readonly BitSet FOLLOW_COLON_in_parameter2518 = new BitSet(new ulong[]{0x0000000000000004UL});
- public static readonly BitSet FOLLOW_identifier_in_parameter2522 = new BitSet(new ulong[]{0x0000000000000008UL});
- public static readonly BitSet FOLLOW_PARAM_in_parameter2543 = new BitSet(new ulong[]{0x0000000000000004UL});
- public static readonly BitSet FOLLOW_NUM_INT_in_parameter2548 = new BitSet(new ulong[]{0x0000000000000008UL});
- public static readonly BitSet FOLLOW_NUM_INT_in_numericInteger2581 = new BitSet(new ulong[]{0x0000000000000002UL});
+ public static readonly BitSet FOLLOW_QUOTED_String_in_stringLiteral2178 = new BitSet(new ulong[]{0x0000000000000002UL});
+ public static readonly BitSet FOLLOW_set_in_identifier2189 = new BitSet(new ulong[]{0x0000000000000002UL});
+ public static readonly BitSet FOLLOW_addrExprDot_in_addrExpr2208 = new BitSet(new ulong[]{0x0000000000000002UL});
+ public static readonly BitSet FOLLOW_addrExprIndex_in_addrExpr2215 = new BitSet(new ulong[]{0x0000000000000002UL});
+ public static readonly BitSet FOLLOW_addrExprIdent_in_addrExpr2222 = new BitSet(new ulong[]{0x0000000000000002UL});
+ public static readonly BitSet FOLLOW_DOT_in_addrExprDot2246 = new BitSet(new ulong[]{0x0000000000000004UL});
+ public static readonly BitSet FOLLOW_addrExprLhs_in_addrExprDot2250 = new BitSet(new ulong[]{0x0000000008028800UL,0x0400000008001000UL});
+ public static readonly BitSet FOLLOW_propertyName_in_addrExprDot2254 = new BitSet(new ulong[]{0x0000000000000008UL});
+ public static readonly BitSet FOLLOW_INDEX_OP_in_addrExprIndex2293 = new BitSet(new ulong[]{0x0000000000000004UL});
+ public static readonly BitSet FOLLOW_addrExprLhs_in_addrExprIndex2297 = new BitSet(new ulong[]{0x0082008000109000UL,0x079E03C3ED009120UL});
+ public static readonly BitSet FOLLOW_expr_in_addrExprIndex2301 = new BitSet(new ulong[]{0x0000000000000008UL});
+ public static readonly BitSet FOLLOW_identifier_in_addrExprIdent2333 = new BitSet(new ulong[]{0x0000000000000002UL});
+ public static readonly BitSet FOLLOW_addrExpr_in_addrExprLhs2361 = new BitSet(new ulong[]{0x0000000000000002UL});
+ public static readonly BitSet FOLLOW_identifier_in_propertyName2374 = new BitSet(new ulong[]{0x0000000000000002UL});
+ public static readonly BitSet FOLLOW_CLASS_in_propertyName2379 = new BitSet(new ulong[]{0x0000000000000002UL});
+ public static readonly BitSet FOLLOW_ELEMENTS_in_propertyName2384 = new BitSet(new ulong[]{0x0000000000000002UL});
+ public static readonly BitSet FOLLOW_INDICES_in_propertyName2389 = new BitSet(new ulong[]{0x0000000000000002UL});
+ public static readonly BitSet FOLLOW_propertyRefPath_in_propertyRef2401 = new BitSet(new ulong[]{0x0000000000000002UL});
+ public static readonly BitSet FOLLOW_propertyRefIdent_in_propertyRef2406 = new BitSet(new ulong[]{0x0000000000000002UL});
+ public static readonly BitSet FOLLOW_DOT_in_propertyRefPath2426 = new BitSet(new ulong[]{0x0000000000000004UL});
+ public static readonly BitSet FOLLOW_propertyRefLhs_in_propertyRefPath2430 = new BitSet(new ulong[]{0x0000000008028800UL,0x0400000008001000UL});
+ public static readonly BitSet FOLLOW_propertyName_in_propertyRefPath2434 = new BitSet(new ulong[]{0x0000000000000008UL});
+ public static readonly BitSet FOLLOW_identifier_in_propertyRefIdent2471 = new BitSet(new ulong[]{0x0000000000000002UL});
+ public static readonly BitSet FOLLOW_propertyRef_in_propertyRefLhs2483 = new BitSet(new ulong[]{0x0000000000000002UL});
+ public static readonly BitSet FOLLOW_identifier_in_aliasRef2504 = new BitSet(new ulong[]{0x0000000000000002UL});
+ public static readonly BitSet FOLLOW_COLON_in_parameter2522 = new BitSet(new ulong[]{0x0000000000000004UL});
+ public static readonly BitSet FOLLOW_identifier_in_parameter2526 = new BitSet(new ulong[]{0x0000000000000008UL});
+ public static readonly BitSet FOLLOW_PARAM_in_parameter2547 = new BitSet(new ulong[]{0x0000000000000004UL});
+ public static readonly BitSet FOLLOW_NUM_INT_in_parameter2552 = new BitSet(new ulong[]{0x0000000000000008UL});
+ public static readonly BitSet FOLLOW_NUM_INT_in_numericInteger2585 = new BitSet(new ulong[]{0x0000000000000002UL});
}
}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g 2009-06-10 15:56:57 UTC (rev 4446)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g 2009-06-10 18:30:18 UTC (rev 4447)
@@ -385,7 +385,7 @@
;
functionCall
- : ^(m=METHOD_CALL {_inFunctionCall=true;} pathAsIdent ( ^(EXPR_LIST (expr | comparisonExpr)* ) )? )
+ : ^(m=METHOD_CALL {_inFunctionCall=true;} pathAsIdent ( ^(EXPR_LIST (expr | query | comparisonExpr)* ) )? )
{ ProcessFunction($m.tree,_inSelect); _inFunctionCall=false; }
| ^(AGGREGATE aggregateExpr )
;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fab...@us...> - 2009-06-18 22:32:17
|
Revision: 4489
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4489&view=rev
Author: fabiomaulo
Date: 2009-06-18 22:32:11 +0000 (Thu, 18 Jun 2009)
Log Message:
-----------
First step to support UNION
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlLexer.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlParser.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlLexer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlLexer.cs 2009-06-18 18:51:03 UTC (rev 4488)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlLexer.cs 2009-06-18 22:32:11 UTC (rev 4489)
@@ -1,4719 +1,4719 @@
-// $ANTLR 3.1.2 /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g 2009-05-15 10:57:48
-
-// The variable 'variable' is assigned but its value is never used.
-#pragma warning disable 168, 219
-// Unreachable code detected.
-#pragma warning disable 162
-namespace NHibernate.Hql.Ast.ANTLR
-{
-
-using System;
-using Antlr.Runtime;
-using IList = System.Collections.IList;
-using ArrayList = System.Collections.ArrayList;
-using Stack = Antlr.Runtime.Collections.StackList;
-
-using IDictionary = System.Collections.IDictionary;
-using Hashtable = System.Collections.Hashtable;
-
-public partial class HqlLexer : Lexer {
- public const int EXPR_LIST = 73;
- public const int EXISTS = 19;
- public const int COMMA = 98;
- public const int FETCH = 21;
- public const int MINUS = 114;
- public const int AS = 7;
- public const int END = 56;
- public const int INTO = 30;
- public const int FALSE = 20;
- public const int ELEMENTS = 17;
- public const int THEN = 58;
- public const int ALIAS = 70;
- public const int BOR = 103;
- public const int ON = 60;
- public const int DOT = 15;
- public const int ORDER = 41;
- public const int AND = 6;
- public const int CONSTANT = 92;
- public const int UNARY_MINUS = 88;
- public const int METHOD_CALL = 79;
- public const int RIGHT = 44;
- public const int CONCAT = 112;
- public const int PROPERTIES = 43;
- public const int SELECT = 45;
- public const int LE = 110;
- public const int BETWEEN = 10;
- public const int NUM_INT = 93;
- public const int BOTH = 62;
- public const int PLUS = 113;
- public const int VERSIONED = 52;
- public const int MEMBER = 65;
- public const int UNION = 50;
- public const int DISTINCT = 16;
- public const int RANGE = 85;
- public const int FILTER_ENTITY = 74;
- public const int IDENT = 122;
- public const int WHEN = 59;
- public const int DESCENDING = 14;
- public const int WS = 126;
- public const int EQ = 99;
- public const int NEW = 37;
- public const int LT = 108;
- public const int ESCqs = 125;
- public const int OF = 67;
- public const int T__130 = 130;
- public const int UPDATE = 51;
- public const int SELECT_FROM = 87;
- public const int LITERAL_by = 54;
- public const int FLOAT_SUFFIX = 128;
- public const int ANY = 5;
- public const int UNARY_PLUS = 89;
- public const int NUM_FLOAT = 95;
- public const int GE = 111;
- public const int CASE = 55;
- public const int OPEN_BRACKET = 117;
- public const int ELSE = 57;
- public const int OPEN = 100;
- public const int COUNT = 12;
- public const int NULL = 39;
- public const int COLON = 119;
- public const int DIV = 116;
- public const int HAVING = 25;
- public const int ALL = 4;
- public const int SET = 46;
- public const int T__131 = 131;
- public const int INSERT = 29;
- public const int TRUE = 49;
- public const int CASE2 = 72;
- public const int IS_NOT_NULL = 77;
- public const int WHERE = 53;
- public const int AGGREGATE = 69;
- public const int VECTOR_EXPR = 90;
- public const int BNOT = 102;
- public const int LEADING = 64;
- public const int CLOSE_BRACKET = 118;
- public const int NUM_DOUBLE = 94;
- public const int INNER = 28;
- public const int QUERY = 84;
- public const int ORDER_ELEMENT = 83;
- public const int OR = 40;
- public const int FULL = 23;
- public const int INDICES = 27;
- public const int IS_NULL = 78;
- public const int GROUP = 24;
- public const int ESCAPE = 18;
- public const int PARAM = 120;
- public const int ID_LETTER = 124;
- public const int INDEX_OP = 76;
- public const int HEX_DIGIT = 129;
- public const int LEFT = 33;
- public const int TRAILING = 68;
- public const int JOIN = 32;
- public const int NOT_BETWEEN = 80;
- public const int SUM = 48;
- public const int BAND = 105;
- public const int ROW_STAR = 86;
- public const int OUTER = 42;
- public const int NOT_IN = 81;
- public const int FROM = 22;
- public const int DELETE = 13;
- public const int OBJECT = 66;
- public const int MAX = 35;
- public const int NOT_LIKE = 82;
- public const int EMPTY = 63;
- public const int QUOTED_String = 121;
- public const int ASCENDING = 8;
- public const int NUM_LONG = 96;
- public const int IS = 31;
- public const int SQL_NE = 107;
- public const int IN_LIST = 75;
- public const int WEIRD_IDENT = 91;
- public const int NE = 106;
- public const int GT = 109;
- public const int MIN = 36;
- public const int LIKE = 34;
- public const int WITH = 61;
- public const int IN = 26;
- public const int CONSTRUCTOR = 71;
- public const int SOME = 47;
- public const int CLASS = 11;
- public const int EXPONENT = 127;
- public const int ID_START_LETTER = 123;
- public const int EOF = -1;
- public const int CLOSE = 101;
- public const int AVG = 9;
- public const int BXOR = 104;
- public const int STAR = 115;
- public const int NOT = 38;
- public const int JAVA_CONSTANT = 97;
-
- // delegates
- // delegators
-
- public HqlLexer()
- {
- InitializeCyclicDFAs();
- }
- public HqlLexer(ICharStream input)
- : this(input, null) {
- }
- public HqlLexer(ICharStream input, RecognizerSharedState state)
- : base(input, state) {
- InitializeCyclicDFAs();
-
- }
-
- override public string GrammarFileName
- {
- get { return "/Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g";}
- }
-
- // $ANTLR start "ALL"
- public void mALL() // throws RecognitionException [2]
- {
- try
- {
- int _type = ALL;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:9:5: ( 'all' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:9:7: 'all'
- {
- Match("all"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "ALL"
-
- // $ANTLR start "ANY"
- public void mANY() // throws RecognitionException [2]
- {
- try
- {
- int _type = ANY;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:10:5: ( 'any' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:10:7: 'any'
- {
- Match("any"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "ANY"
-
- // $ANTLR start "AND"
- public void mAND() // throws RecognitionException [2]
- {
- try
- {
- int _type = AND;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:11:5: ( 'and' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:11:7: 'and'
- {
- Match("and"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "AND"
-
- // $ANTLR start "AS"
- public void mAS() // throws RecognitionException [2]
- {
- try
- {
- int _type = AS;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:12:4: ( 'as' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:12:6: 'as'
- {
- Match("as"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "AS"
-
- // $ANTLR start "ASCENDING"
- public void mASCENDING() // throws RecognitionException [2]
- {
- try
- {
- int _type = ASCENDING;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:13:11: ( 'asc' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:13:13: 'asc'
- {
- Match("asc"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "ASCENDING"
-
- // $ANTLR start "AVG"
- public void mAVG() // throws RecognitionException [2]
- {
- try
- {
- int _type = AVG;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:14:5: ( 'avg' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:14:7: 'avg'
- {
- Match("avg"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "AVG"
-
- // $ANTLR start "BETWEEN"
- public void mBETWEEN() // throws RecognitionException [2]
- {
- try
- {
- int _type = BETWEEN;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:15:9: ( 'between' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:15:11: 'between'
- {
- Match("between"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "BETWEEN"
-
- // $ANTLR start "CLASS"
- public void mCLASS() // throws RecognitionException [2]
- {
- try
- {
- int _type = CLASS;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:16:7: ( 'class' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:16:9: 'class'
- {
- Match("class"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "CLASS"
-
- // $ANTLR start "COUNT"
- public void mCOUNT() // throws RecognitionException [2]
- {
- try
- {
- int _type = COUNT;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:17:7: ( 'count' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:17:9: 'count'
- {
- Match("count"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "COUNT"
-
- // $ANTLR start "DELETE"
- public void mDELETE() // throws RecognitionException [2]
- {
- try
- {
- int _type = DELETE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:18:8: ( 'delete' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:18:10: 'delete'
- {
- Match("delete"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "DELETE"
-
- // $ANTLR start "DESCENDING"
- public void mDESCENDING() // throws RecognitionException [2]
- {
- try
- {
- int _type = DESCENDING;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:19:12: ( 'desc' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:19:14: 'desc'
- {
- Match("desc"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "DESCENDING"
-
- // $ANTLR start "DISTINCT"
- public void mDISTINCT() // throws RecognitionException [2]
- {
- try
- {
- int _type = DISTINCT;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:20:10: ( 'distinct' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:20:12: 'distinct'
- {
- Match("distinct"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "DISTINCT"
-
- // $ANTLR start "ELEMENTS"
- public void mELEMENTS() // throws RecognitionException [2]
- {
- try
- {
- int _type = ELEMENTS;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:21:10: ( 'elements' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:21:12: 'elements'
- {
- Match("elements"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "ELEMENTS"
-
- // $ANTLR start "ESCAPE"
- public void mESCAPE() // throws RecognitionException [2]
- {
- try
- {
- int _type = ESCAPE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:22:8: ( 'escape' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:22:10: 'escape'
- {
- Match("escape"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "ESCAPE"
-
- // $ANTLR start "EXISTS"
- public void mEXISTS() // throws RecognitionException [2]
- {
- try
- {
- int _type = EXISTS;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:23:8: ( 'exists' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:23:10: 'exists'
- {
- Match("exists"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "EXISTS"
-
- // $ANTLR start "FALSE"
- public void mFALSE() // throws RecognitionException [2]
- {
- try
- {
- int _type = FALSE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:24:7: ( 'false' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:24:9: 'false'
- {
- Match("false"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "FALSE"
-
- // $ANTLR start "FETCH"
- public void mFETCH() // throws RecognitionException [2]
- {
- try
- {
- int _type = FETCH;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:25:7: ( 'fetch' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:25:9: 'fetch'
- {
- Match("fetch"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "FETCH"
-
- // $ANTLR start "FROM"
- public void mFROM() // throws RecognitionException [2]
- {
- try
- {
- int _type = FROM;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:26:6: ( 'from' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:26:8: 'from'
- {
- Match("from"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "FROM"
-
- // $ANTLR start "FULL"
- public void mFULL() // throws RecognitionException [2]
- {
- try
- {
- int _type = FULL;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:27:6: ( 'full' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:27:8: 'full'
- {
- Match("full"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "FULL"
-
- // $ANTLR start "GROUP"
- public void mGROUP() // throws RecognitionException [2]
- {
- try
- {
- int _type = GROUP;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:28:7: ( 'group' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:28:9: 'group'
- {
- Match("group"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "GROUP"
-
- // $ANTLR start "HAVING"
- public void mHAVING() // throws RecognitionException [2]
- {
- try
- {
- int _type = HAVING;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:29:8: ( 'having' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:29:10: 'having'
- {
- Match("having"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "HAVING"
-
- // $ANTLR start "IN"
- public void mIN() // throws RecognitionException [2]
- {
- try
- {
- int _type = IN;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:30:4: ( 'in' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:30:6: 'in'
- {
- Match("in"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "IN"
-
- // $ANTLR start "INDICES"
- public void mINDICES() // throws RecognitionException [2]
- {
- try
- {
- int _type = INDICES;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:31:9: ( 'indices' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:31:11: 'indices'
- {
- Match("indices"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "INDICES"
-
- // $ANTLR start "INNER"
- public void mINNER() // throws RecognitionException [2]
- {
- try
- {
- int _type = INNER;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:32:7: ( 'inner' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:32:9: 'inner'
- {
- Match("inner"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "INNER"
-
- // $ANTLR start "INSERT"
- public void mINSERT() // throws RecognitionException [2]
- {
- try
- {
- int _type = INSERT;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:33:8: ( 'insert' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:33:10: 'insert'
- {
- Match("insert"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "INSERT"
-
- // $ANTLR start "INTO"
- public void mINTO() // throws RecognitionException [2]
- {
- try
- {
- int _type = INTO;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:34:6: ( 'into' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:34:8: 'into'
- {
- Match("into"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "INTO"
-
- // $ANTLR start "IS"
- public void mIS() // throws RecognitionException [2]
- {
- try
- {
- int _type = IS;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:35:4: ( 'is' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:35:6: 'is'
- {
- Match("is"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "IS"
-
- // $ANTLR start "JOIN"
- public void mJOIN() // throws RecognitionException [2]
- {
- try
- {
- int _type = JOIN;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:36:6: ( 'join' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:36:8: 'join'
- {
- Match("join"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "JOIN"
-
- // $ANTLR start "LEFT"
- public void mLEFT() // throws RecognitionException [2]
- {
- try
- {
- int _type = LEFT;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:37:6: ( 'left' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:37:8: 'left'
- {
- Match("left"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "LEFT"
-
- // $ANTLR start "LIKE"
- public void mLIKE() // throws RecognitionException [2]
- {
- try
- {
- int _type = LIKE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:38:6: ( 'like' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:38:8: 'like'
- {
- Match("like"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "LIKE"
-
- // $ANTLR start "MAX"
- public void mMAX() // throws RecognitionException [2]
- {
- try
- {
- int _type = MAX;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:39:5: ( 'max' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:39:7: 'max'
- {
- Match("max"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "MAX"
-
- // $ANTLR start "MIN"
- public void mMIN() // throws RecognitionException [2]
- {
- try
- {
- int _type = MIN;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:40:5: ( 'min' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:40:7: 'min'
- {
- Match("min"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "MIN"
-
- // $ANTLR start "NEW"
- public void mNEW() // throws RecognitionException [2]
- {
- try
- {
- int _type = NEW;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:41:5: ( 'new' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:41:7: 'new'
- {
- Match("new"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "NEW"
-
- // $ANTLR start "NOT"
- public void mNOT() // throws RecognitionException [2]
- {
- try
- {
- int _type = NOT;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:42:5: ( 'not' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:42:7: 'not'
- {
- Match("not"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "NOT"
-
- // $ANTLR start "NULL"
- public void mNULL() // throws RecognitionException [2]
- {
- try
- {
- int _type = NULL;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:43:6: ( 'null' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:43:8: 'null'
- {
- Match("null"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "NULL"
-
- // $ANTLR start "OR"
- public void mOR() // throws RecognitionException [2]
- {
- try
- {
- int _type = OR;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:44:4: ( 'or' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:44:6: 'or'
- {
- Match("or"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "OR"
-
- // $ANTLR start "ORDER"
- public void mORDER() // throws RecognitionException [2]
- {
- try
- {
- int _type = ORDER;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:45:7: ( 'order' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:45:9: 'order'
- {
- Match("order"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "ORDER"
-
- // $ANTLR start "OUTER"
- public void mOUTER() // throws RecognitionException [2]
- {
- try
- {
- int _type = OUTER;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:46:7: ( 'outer' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:46:9: 'outer'
- {
- Match("outer"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "OUTER"
-
- // $ANTLR start "PROPERTIES"
- public void mPROPERTIES() // throws RecognitionException [2]
- {
- try
- {
- int _type = PROPERTIES;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:47:12: ( 'properties' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:47:14: 'properties'
- {
- Match("properties"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "PROPERTIES"
-
- // $ANTLR start "RIGHT"
- public void mRIGHT() // throws RecognitionException [2]
- {
- try
- {
- int _type = RIGHT;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:48:7: ( 'right' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:48:9: 'right'
- {
- Match("right"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "RIGHT"
-
- // $ANTLR start "SELECT"
- public void mSELECT() // throws RecognitionException [2]
- {
- try
- {
- int _type = SELECT;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:49:8: ( 'select' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:49:10: 'select'
- {
- Match("select"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "SELECT"
-
- // $ANTLR start "SET"
- public void mSET() // throws RecognitionException [2]
- {
- try
- {
- int _type = SET;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:50:5: ( 'set' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:50:7: 'set'
- {
- Match("set"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "SET"
-
- // $ANTLR start "SOME"
- public void mSOME() // throws RecognitionException [2]
- {
- try
- {
- int _type = SOME;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:51:6: ( 'some' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:51:8: 'some'
- {
- Match("some"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "SOME"
-
- // $ANTLR start "SUM"
- public void mSUM() // throws RecognitionException [2]
- {
- try
- {
- int _type = SUM;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:52:5: ( 'sum' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:52:7: 'sum'
- {
- Match("sum"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "SUM"
-
- // $ANTLR start "TRUE"
- public void mTRUE() // throws RecognitionException [2]
- {
- try
- {
- int _type = TRUE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:53:6: ( 'true' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:53:8: 'true'
- {
- Match("true"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "TRUE"
-
- // $ANTLR start "UNION"
- public void mUNION() // throws RecognitionException [2]
- {
- try
- {
- int _type = UNION;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:54:7: ( 'union' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:54:9: 'union'
- {
- Match("union"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "UNION"
-
- // $ANTLR start "UPDATE"
- public void mUPDATE() // throws RecognitionException [2]
- {
- try
- {
- int _type = UPDATE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:55:8: ( 'update' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:55:10: 'update'
- {
- Match("update"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "UPDATE"
-
- // $ANTLR start "VERSIONED"
- public void mVERSIONED() // throws RecognitionException [2]
- {
- try
- {
- int _type = VERSIONED;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:56:11: ( 'versioned' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:56:13: 'versioned'
- {
- Match("versioned"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "VERSIONED"
-
- // $ANTLR start "WHERE"
- public void mWHERE() // throws RecognitionException [2]
- {
- try
- {
- int _type = WHERE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:57:7: ( 'where' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:57:9: 'where'
- {
- Match("where"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "WHERE"
-
- // $ANTLR start "LITERAL_by"
- public void mLITERAL_by() // throws RecognitionException [2]
- {
- try
- {
- int _type = LITERAL_by;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:58:12: ( 'by' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:58:14: 'by'
- {
- Match("by"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "LITERAL_by"
-
- // $ANTLR start "CASE"
- public void mCASE() // throws RecognitionException [2]
- {
- try
- {
- int _type = CASE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:59:6: ( 'case' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:59:8: 'case'
- {
- Match("case"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "CASE"
-
- // $ANTLR start "END"
- public void mEND() // throws RecognitionException [2]
- {
- try
- {
- int _type = END;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:60:5: ( 'end' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:60:7: 'end'
- {
- Match("end"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "END"
-
- // $ANTLR start "ELSE"
- public void mELSE() // throws RecognitionException [2]
- {
- try
- {
- int _type = ELSE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:61:6: ( 'else' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:61:8: 'else'
- {
- Match("else"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "ELSE"
-
- // $ANTLR start "THEN"
- public void mTHEN() // throws RecognitionException [2]
- {
- try
- {
- int _type = THEN;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:62:6: ( 'then' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:62:8: 'then'
- {
- Match("then"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "THEN"
-
- // $ANTLR start "WHEN"
- public void mWHEN() // throws RecognitionException [2]
- {
- try
- {
- int _type = WHEN;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:63:6: ( 'when' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:63:8: 'when'
- {
- Match("when"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "WHEN"
-
- // $ANTLR start "ON"
- public void mON() // throws RecognitionException [2]
- {
- try
- {
- int _type = ON;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:64:4: ( 'on' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:64:6: 'on'
- {
- Match("on"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "ON"
-
- // $ANTLR start "WITH"
- public void mWITH() // throws RecognitionException [2]
- {
- try
- {
- int _type = WITH;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:65:6: ( 'with' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:65:8: 'with'
- {
- Match("with"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "WITH"
-
- // $ANTLR start "BOTH"
- public void mBOTH() // throws RecognitionException [2]
- {
- try
- {
- int _type = BOTH;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:66:6: ( 'both' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:66:8: 'both'
- {
- Match("both"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "BOTH"
-
- // $ANTLR start "EMPTY"
- public void mEMPTY() // throws RecognitionException [2]
- {
- try
- {
- int _type = EMPTY;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:67:7: ( 'empty' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:67:9: 'empty'
- {
- Match("empty"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "EMPTY"
-
- // $ANTLR start "LEADING"
- public void mLEADING() // throws RecognitionException [2]
- {
- try
- {
- int _type = LEADING;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:68:9: ( 'leading' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:68:11: 'leading'
- {
- Match("leading"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "LEADING"
-
- // $ANTLR start "MEMBER"
- public void mMEMBER() // throws RecognitionException [2]
- {
- try
- {
- int _type = MEMBER;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:69:8: ( 'member' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:69:10: 'member'
- {
- Match("member"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "MEMBER"
-
- // $ANTLR start "OBJECT"
- public void mOBJECT() // throws RecognitionException [2]
- {
- try
- {
- int _type = OBJECT;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:70:8: ( 'object' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:70:10: 'object'
- {
- Match("object"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "OBJECT"
-
- // $ANTLR start "OF"
- public void mOF() // throws RecognitionException [2]
- {
- try
- {
- int _type = OF;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:71:4: ( 'of' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:71:6: 'of'
- {
- Match("of"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "OF"
-
- // $ANTLR start "TRAILING"
- public void mTRAILING() // throws RecognitionException [2]
- {
- try
- {
- int _type = TRAILING;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:72:10: ( 'trailing' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:72:12: 'trailing'
- {
- Match("trailing"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "TRAILING"
-
- // $ANTLR start "T__130"
- public void mT__130() // throws RecognitionException [2]
- {
- try
- {
- int _type = T__130;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:73:8: ( 'ascending' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:73:10: 'ascending'
- {
- Match("ascending"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "T__130"
-
- // $ANTLR start "T__131"
- public void mT__131() // throws RecognitionException [2]
- {
- try
- {
- int _type = T__131;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:74:8: ( 'descending' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:74:10: 'descending'
- {
- Match("descending"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "T__131"
-
- // $ANTLR start "EQ"
- public void mEQ() // throws RecognitionException [2]
- {
- try
- {
- int _type = EQ;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:757:3: ( '=' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:757:5: '='
- {
- Match('='); if (state.failed) return ;
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "EQ"
-
- // $ANTLR start "LT"
- public void mLT() // throws RecognitionException [2]
- {
- try
- {
- int _type = LT;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:758:3: ( '<' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:758:5: '<'
- {
- Match('<'); if (state.failed) return ;
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "LT"
-
- // $ANTLR start "GT"
- public void mGT() // throws RecognitionException [2]
- {
- try
- {
- int _type = GT;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:759:3: ( '>' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:759:5: '>'
- {
- Match('>'); if (state.failed) return ;
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "GT"
-
- // $ANTLR start "SQL_NE"
- public void mSQL_NE() // throws RecognitionException [2]
- {
- try
- {
- int _type = SQL_NE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:760:7: ( '<>' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:760:9: '<>'
- {
- Match("<>"); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "SQL_NE"
-
- // $ANTLR start "NE"
- public void mNE() // throws RecognitionException [2]
- {
- try
- {
- int _type = NE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:761:3: ( '!=' | '^=' )
- int alt1 = 2;
- int LA1_0 = input.LA(1);
-
- if ( (LA1_0 == '!') )
- {
- alt1 = 1;
- }
- else if ( (LA1_0 == '^') )
- {
- alt1 = 2;
- }
- else
- {
- if ( state.backtracking > 0 ) {state.failed = true; return ;}
- NoViableAltException nvae_d1s0 =
- new NoViableAltException("", 1, 0, input);
-
- throw nvae_d1s0;
- }
- switch (alt1)
- {
- case 1 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:761:5: '!='
- {
- Match("!="); if (state.failed) return ;
-
-
- }
- break;
- case 2 :
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:761:12: '^='
- {
- Match("^="); if (state.failed) return ;
-
-
- }
- break;
-
- }
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "NE"
-
- // $ANTLR start "LE"
- public void mLE() // throws RecognitionException [2]
- {
- try
- {
- int _type = LE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:762:3: ( '<=' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:762:5: '<='
- {
- Match("<="); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "LE"
-
- // $ANTLR start "GE"
- public void mGE() // throws RecognitionException [2]
- {
- try
- {
- int _type = GE;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:763:3: ( '>=' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:763:5: '>='
- {
- Match(">="); if (state.failed) return ;
-
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "GE"
-
- // $ANTLR start "BOR"
- public void mBOR() // throws RecognitionException [2]
- {
- try
- {
- int _type = BOR;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:765:5: ( '|' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:765:8: '|'
- {
- Match('|'); if (state.failed) return ;
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "BOR"
-
- // $ANTLR start "BXOR"
- public void mBXOR() // throws RecognitionException [2]
- {
- try
- {
- int _type = BXOR;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:766:6: ( '^' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:766:8: '^'
- {
- Match('^'); if (state.failed) return ;
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "BXOR"
-
- // $ANTLR start "BAND"
- public void mBAND() // throws RecognitionException [2]
- {
- try
- {
- int _type = BAND;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:767:6: ( '&' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:767:8: '&'
- {
- Match('&'); if (state.failed) return ;
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "BAND"
-
- // $ANTLR start "BNOT"
- public void mBNOT() // throws RecognitionException [2]
- {
- try
- {
- int _type = BNOT;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:768:6: ( '!' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:768:8: '!'
- {
- Match('!'); if (state.failed) return ;
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "BNOT"
-
- // $ANTLR start "COMMA"
- public void mCOMMA() // throws RecognitionException [2]
- {
- try
- {
- int _type = COMMA;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:770:6: ( ',' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:770:8: ','
- {
- Match(','); if (state.failed) return ;
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "COMMA"
-
- // $ANTLR start "OPEN"
- public void mOPEN() // throws RecognitionException [2]
- {
- try
- {
- int _type = OPEN;
- int _channel = DEFAULT_TOKEN_CHANNEL;
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:772:5: ( '(' )
- // /Users/Steve/Projects/NHibernate/Trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Hql.g:772:7: '('
- {
- Match('('); if (state.failed) return ;
-
- }
-
- state.type = _type;
- state.channel = _channel;
- }
- finally
- {
- }
- }
- // $ANTLR end "OPEN"
-
- // $ANTLR start "CLOSE"
- public void mCLOSE() // throws RecognitionException [2]
- {
-...
[truncated message content] |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X