|
From: <fab...@us...> - 2009-05-06 21:50:47
|
Revision: 4255
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4255&view=rev
Author: fabiomaulo
Date: 2009-05-06 21:50:40 +0000 (Wed, 06 May 2009)
Log Message:
-----------
Starting port of AST tests for Inserts
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlSqlWalker.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/IntoClause.cs
trunk/nhibernate/src/NHibernate.Test/HQL/Ast/BulkManipulation.cs
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlSqlWalker.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlSqlWalker.cs 2009-05-06 16:10:29 UTC (rev 4254)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlSqlWalker.cs 2009-05-06 21:50:40 UTC (rev 4255)
@@ -1,4 +1,4 @@
-// $ANTLR 3.1.2 C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g 2009-05-05 16:13:02
+// $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
@@ -665,16 +665,16 @@
// AST REWRITE
- // elements: w, u, s, f
+ // elements: u, f, s, w
// token labels: u
- // rule labels: f, w, retval, s
+ // 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_w = new RewriteRuleSubtreeStream(adaptor, "rule w", w!=null ? w.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);
@@ -956,8 +956,8 @@
try
{
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:84:2: ( ^( INTO (p= path ) ps= insertablePropertySpec ) )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:84:4: ^( INTO (p= path ) ps= insertablePropertySpec )
+ // 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();
@@ -966,7 +966,7 @@
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_intoClause341);
+ INTO12=(IASTNode)Match(input,INTO,FOLLOW_INTO_in_intoClause347);
INTO12_tree = (IASTNode)adaptor.DupNode(INTO12);
root_1 = (IASTNode)adaptor.BecomeRoot(INTO12_tree, root_1);
@@ -975,11 +975,11 @@
HandleClauseStart( INTO );
Match(input, Token.DOWN, null);
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:84:43: (p= path )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:84:44: p= path
+ // 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_intoClause348);
+ PushFollow(FOLLOW_path_in_intoClause354);
p = path();
state.followingStackPointer--;
@@ -988,7 +988,7 @@
}
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_insertablePropertySpec_in_intoClause353);
+ PushFollow(FOLLOW_insertablePropertySpec_in_intoClause359);
ps = insertablePropertySpec();
state.followingStackPointer--;
@@ -998,13 +998,13 @@
}
- retval.Tree = CreateIntoClause(((p != null) ? p.p : default(String)), ((ps != null) ? ((IASTNode)ps.Tree) : null));
-
-
}
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)
{
@@ -1029,7 +1029,7 @@
};
// $ANTLR start "insertablePropertySpec"
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:89:1: insertablePropertySpec : ^( RANGE ( IDENT )+ ) ;
+ // 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();
@@ -1048,8 +1048,8 @@
try
{
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:90:2: ( ^( RANGE ( IDENT )+ ) )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:90:4: ^( RANGE ( IDENT )+ )
+ // 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();
@@ -1058,7 +1058,7 @@
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_insertablePropertySpec370);
+ RANGE13=(IASTNode)Match(input,RANGE,FOLLOW_RANGE_in_insertablePropertySpec375);
RANGE13_tree = (IASTNode)adaptor.DupNode(RANGE13);
root_1 = (IASTNode)adaptor.BecomeRoot(RANGE13_tree, root_1);
@@ -1066,7 +1066,7 @@
Match(input, Token.DOWN, null);
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:90:13: ( IDENT )+
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:91:13: ( IDENT )+
int cnt5 = 0;
do
{
@@ -1082,10 +1082,10 @@
switch (alt5)
{
case 1 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:90:14: IDENT
+ // 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_insertablePropertySpec373);
+ IDENT14=(IASTNode)Match(input,IDENT,FOLLOW_IDENT_in_insertablePropertySpec378);
IDENT14_tree = (IASTNode)adaptor.DupNode(IDENT14);
adaptor.AddChild(root_1, IDENT14_tree);
@@ -1139,7 +1139,7 @@
};
// $ANTLR start "setClause"
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:93:1: setClause : ^( SET ( assignment )* ) ;
+ // 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();
@@ -1158,8 +1158,8 @@
try
{
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:94:2: ( ^( SET ( assignment )* ) )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:94:4: ^( SET ( assignment )* )
+ // 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();
@@ -1168,7 +1168,7 @@
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_setClause390);
+ SET15=(IASTNode)Match(input,SET,FOLLOW_SET_in_setClause395);
SET15_tree = (IASTNode)adaptor.DupNode(SET15);
root_1 = (IASTNode)adaptor.BecomeRoot(SET15_tree, root_1);
@@ -1179,7 +1179,7 @@
if ( input.LA(1) == Token.DOWN )
{
Match(input, Token.DOWN, null);
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:94:41: ( assignment )*
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:95:41: ( assignment )*
do
{
int alt6 = 2;
@@ -1194,10 +1194,10 @@
switch (alt6)
{
case 1 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:94:42: assignment
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:95:42: assignment
{
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_assignment_in_setClause395);
+ PushFollow(FOLLOW_assignment_in_setClause400);
assignment16 = assignment();
state.followingStackPointer--;
@@ -1248,7 +1248,7 @@
};
// $ANTLR start "assignment"
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:97:1: assignment : ^( EQ (p= propertyRef ) ( newValue ) ) ;
+ // 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();
@@ -1269,8 +1269,8 @@
try
{
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:103:2: ( ^( EQ (p= propertyRef ) ( newValue ) ) )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:103:4: ^( EQ (p= propertyRef ) ( newValue ) )
+ // 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();
@@ -1279,7 +1279,7 @@
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_assignment422);
+ EQ17=(IASTNode)Match(input,EQ,FOLLOW_EQ_in_assignment427);
EQ17_tree = (IASTNode)adaptor.DupNode(EQ17);
root_1 = (IASTNode)adaptor.BecomeRoot(EQ17_tree, root_1);
@@ -1287,11 +1287,11 @@
Match(input, Token.DOWN, null);
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:103:10: (p= propertyRef )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:103:11: p= propertyRef
+ // 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_assignment427);
+ PushFollow(FOLLOW_propertyRef_in_assignment432);
p = propertyRef();
state.followingStackPointer--;
@@ -1300,11 +1300,11 @@
}
Resolve(((p != null) ? ((IASTNode)p.Tree) : null));
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:103:48: ( newValue )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:103:49: newValue
+ // 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_assignment433);
+ PushFollow(FOLLOW_newValue_in_assignment438);
newValue18 = newValue();
state.followingStackPointer--;
@@ -1348,7 +1348,7 @@
};
// $ANTLR start "newValue"
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:107:1: newValue : ( expr | query );
+ // 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();
@@ -1367,7 +1367,7 @@
try
{
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:108:2: ( expr | query )
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:109:2: ( expr | query )
int alt7 = 2;
int LA7_0 = input.LA(1);
@@ -1389,12 +1389,12 @@
switch (alt7)
{
case 1 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:108:4: expr
+ // 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_newValue449);
+ PushFollow(FOLLOW_expr_in_newValue454);
expr19 = expr();
state.followingStackPointer--;
@@ -1403,12 +1403,12 @@
}
break;
case 2 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:108:11: query
+ // 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_newValue453);
+ PushFollow(FOLLOW_query_in_newValue458);
query20 = query();
state.followingStackPointer--;
@@ -1444,7 +1444,7 @@
};
// $ANTLR start "query"
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:113:1: query : ^( 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: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();
@@ -1479,15 +1479,15 @@
RewriteRuleSubtreeStream stream_selectClause = new RewriteRuleSubtreeStream(adaptor,"rule selectClause");
try
{
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:120: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:120:4: ^( QUERY ^( SELECT_FROM f= fromClause (s= selectClause )? ) (w= whereClause )? (g= groupClause )? (o= orderClause )? )
+ // 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_query475);
+ QUERY21=(IASTNode)Match(input,QUERY,FOLLOW_QUERY_in_query480);
stream_QUERY.Add(QUERY21);
@@ -1499,19 +1499,19 @@
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_query487);
+ 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_query495);
+ 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:124:5: (s= selectClause )?
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:125:5: (s= selectClause )?
int alt8 = 2;
int LA8_0 = input.LA(1);
@@ -1522,10 +1522,10 @@
switch (alt8)
{
case 1 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:124:6: s= selectClause
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:125:6: s= selectClause
{
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_selectClause_in_query504);
+ PushFollow(FOLLOW_selectClause_in_query509);
s = selectClause();
state.followingStackPointer--;
@@ -1540,7 +1540,7 @@
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:126:4: (w= whereClause )?
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:127:4: (w= whereClause )?
int alt9 = 2;
int LA9_0 = input.LA(1);
@@ -1551,10 +1551,10 @@
switch (alt9)
{
case 1 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:126:5: w= whereClause
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:127:5: w= whereClause
{
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_whereClause_in_query519);
+ PushFollow(FOLLOW_whereClause_in_query524);
w = whereClause();
state.followingStackPointer--;
@@ -1565,7 +1565,7 @@
}
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:127:4: (g= groupClause )?
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:128:4: (g= groupClause )?
int alt10 = 2;
int LA10_0 = input.LA(1);
@@ -1576,10 +1576,10 @@
switch (alt10)
{
case 1 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:127:5: g= groupClause
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:128:5: g= groupClause
{
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_groupClause_in_query529);
+ PushFollow(FOLLOW_groupClause_in_query534);
g = groupClause();
state.followingStackPointer--;
@@ -1590,7 +1590,7 @@
}
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:128:4: (o= orderClause )?
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:129:4: (o= orderClause )?
int alt11 = 2;
int LA11_0 = input.LA(1);
@@ -1601,10 +1601,10 @@
switch (alt11)
{
case 1 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:128:5: o= orderClause
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:129:5: o= orderClause
{
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_orderClause_in_query539);
+ PushFollow(FOLLOW_orderClause_in_query544);
o = orderClause();
state.followingStackPointer--;
@@ -1622,29 +1622,29 @@
// AST REWRITE
- // elements: s, f, g, w, o
+ // elements: s, o, w, f, g
// token labels:
- // rule labels: w, f, g, retval, s, o
+ // 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_f = new RewriteRuleSubtreeStream(adaptor, "rule f", f!=null ? f.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();
- // 130:2: -> ^( SELECT ( $s)? $f ( $w)? ( $g)? ( $o)? )
+ // 131:2: -> ^( SELECT ( $s)? $f ( $w)? ( $g)? ( $o)? )
{
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:130:5: ^( 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:130:14: ( $s)?
+ // 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());
@@ -1652,21 +1652,21 @@
}
stream_s.Reset();
adaptor.AddChild(root_1, stream_f.NextTree());
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:130:21: ( $w)?
+ // 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:130:25: ( $g)?
+ // 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:130:29: ( $o)?
+ // 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());
@@ -1714,7 +1714,7 @@
};
// $ANTLR start "orderClause"
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:133:1: orderClause : ^( ORDER orderExprs ) ;
+ // 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();
@@ -1733,8 +1733,8 @@
try
{
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:134:2: ( ^( ORDER orderExprs ) )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:134:4: ^( ORDER orderExprs )
+ // 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();
@@ -1743,7 +1743,7 @@
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_orderClause584);
+ ORDER23=(IASTNode)Match(input,ORDER,FOLLOW_ORDER_in_orderClause589);
ORDER23_tree = (IASTNode)adaptor.DupNode(ORDER23);
root_1 = (IASTNode)adaptor.BecomeRoot(ORDER23_tree, root_1);
@@ -1753,7 +1753,7 @@
Match(input, Token.DOWN, null);
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_orderExprs_in_orderClause588);
+ PushFollow(FOLLOW_orderExprs_in_orderClause593);
orderExprs24 = orderExprs();
state.followingStackPointer--;
@@ -1791,7 +1791,7 @@
};
// $ANTLR start "orderExprs"
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:137:1: orderExprs : expr ( ASCENDING | DESCENDING )? ( orderExprs )? ;
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:138:1: orderExprs : expr ( ASCENDING | DESCENDING )? ( orderExprs )? ;
public HqlSqlWalker.orderExprs_return orderExprs() // throws RecognitionException [1]
{
HqlSqlWalker.orderExprs_return retval = new HqlSqlWalker.orderExprs_return();
@@ -1812,18 +1812,18 @@
try
{
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:138:2: ( expr ( ASCENDING | DESCENDING )? ( orderExprs )? )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:138:4: expr ( ASCENDING | DESCENDING )? ( orderExprs )?
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:139:2: ( expr ( ASCENDING | DESCENDING )? ( orderExprs )? )
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:139:4: expr ( ASCENDING | DESCENDING )? ( orderExprs )?
{
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_expr_in_orderExprs600);
+ PushFollow(FOLLOW_expr_in_orderExprs605);
expr25 = expr();
state.followingStackPointer--;
adaptor.AddChild(root_0, expr25.Tree);
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:138:9: ( ASCENDING | DESCENDING )?
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:139:9: ( ASCENDING | DESCENDING )?
int alt12 = 2;
int LA12_0 = input.LA(1);
@@ -1860,7 +1860,7 @@
}
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:138:37: ( orderExprs )?
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:139:37: ( orderExprs )?
int alt13 = 2;
int LA13_0 = input.LA(1);
@@ -1871,10 +1871,10 @@
switch (alt13)
{
case 1 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:138:38: orderExprs
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:139:38: orderExprs
{
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_orderExprs_in_orderExprs614);
+ PushFollow(FOLLOW_orderExprs_in_orderExprs619);
orderExprs27 = orderExprs();
state.followingStackPointer--;
@@ -1914,7 +1914,7 @@
};
// $ANTLR start "groupClause"
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:141:1: groupClause : ^( GROUP ( expr )+ ( ^( HAVING logicalExpr ) )? ) ;
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:142:1: groupClause : ^( GROUP ( expr )+ ( ^( HAVING logicalExpr ) )? ) ;
public HqlSqlWalker.groupClause_return groupClause() // throws RecognitionException [1]
{
HqlSqlWalker.groupClause_return retval = new HqlSqlWalker.groupClause_return();
@@ -1937,8 +1937,8 @@
try
{
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:142:2: ( ^( GROUP ( expr )+ ( ^( HAVING logicalExpr ) )? ) )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:142:4: ^( GROUP ( expr )+ ( ^( HAVING logicalExpr ) )? )
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:143:2: ( ^( GROUP ( expr )+ ( ^( HAVING logicalExpr ) )? ) )
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:143:4: ^( GROUP ( expr )+ ( ^( HAVING logicalExpr ) )? )
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -1947,7 +1947,7 @@
IASTNode _save_last_1 = _last;
IASTNode _first_1 = null;
IASTNode root_1 = (IASTNode)adaptor.GetNilNode();_last = (IASTNode)input.LT(1);
- GROUP28=(IASTNode)Match(input,GROUP,FOLLOW_GROUP_in_groupClause628);
+ GROUP28=(IASTNode)Match(input,GROUP,FOLLOW_GROUP_in_groupClause633);
GROUP28_tree = (IASTNode)adaptor.DupNode(GROUP28);
root_1 = (IASTNode)adaptor.BecomeRoot(GROUP28_tree, root_1);
@@ -1956,7 +1956,7 @@
HandleClauseStart( GROUP );
Match(input, Token.DOWN, null);
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:142:44: ( expr )+
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:143:44: ( expr )+
int cnt14 = 0;
do
{
@@ -1972,10 +1972,10 @@
switch (alt14)
{
case 1 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:142:45: expr
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:143:45: expr
{
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_expr_in_groupClause633);
+ PushFollow(FOLLOW_expr_in_groupClause638);
expr29 = expr();
state.followingStackPointer--;
@@ -1996,7 +1996,7 @@
loop14:
; // Stops C# compiler whinging that label 'loop14' has no statements
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:142:52: ( ^( HAVING logicalExpr ) )?
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:143:52: ( ^( HAVING logicalExpr ) )?
int alt15 = 2;
int LA15_0 = input.LA(1);
@@ -2007,14 +2007,14 @@
switch (alt15)
{
case 1 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:142:54: ^( HAVING logicalExpr )
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:143:54: ^( HAVING logicalExpr )
{
_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);
- HAVING30=(IASTNode)Match(input,HAVING,FOLLOW_HAVING_in_groupClause640);
+ HAVING30=(IASTNode)Match(input,HAVING,FOLLOW_HAVING_in_groupClause645);
HAVING30_tree = (IASTNode)adaptor.DupNode(HAVING30);
root_2 = (IASTNode)adaptor.BecomeRoot(HAVING30_tree, root_2);
@@ -2023,7 +2023,7 @@
Match(input, Token.DOWN, null);
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_logicalExpr_in_groupClause642);
+ PushFollow(FOLLOW_logicalExpr_in_groupClause647);
logicalExpr31 = logicalExpr();
state.followingStackPointer--;
@@ -2071,7 +2071,7 @@
};
// $ANTLR start "selectClause"
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:145:1: selectClause : ^( SELECT (d= DISTINCT )? x= selectExprList ) -> ^( SELECT_CLAUSE[\"{select clause}\"] ( $d)? $x) ;
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:146:1: selectClause : ^( SELECT (d= DISTINCT )? x= selectExprList ) -> ^( SELECT_CLAUSE[\"{select clause}\"] ( $d)? $x) ;
public HqlSqlWalker.selectClause_return selectClause() // throws RecognitionException [1]
{
HqlSqlWalker.selectClause_return retval = new HqlSqlWalker.selectClause_return();
@@ -2094,22 +2094,22 @@
RewriteRuleSubtreeStream stream_selectExprList = new RewriteRuleSubtreeStream(adaptor,"rule selectExprList");
try
{
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:146:2: ( ^( SELECT (d= DISTINCT )? x= selectExprList ) -> ^( SELECT_CLAUSE[\"{select clause}\"] ( $d)? $x) )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:146:4: ^( SELECT (d= DISTINCT )? x= selectExprList )
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:147:2: ( ^( SELECT (d= DISTINCT )? x= selectExprList ) -> ^( SELECT_CLAUSE[\"{select clause}\"] ( $d)? $x) )
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:147:4: ^( SELECT (d= DISTINCT )? x= selectExprList )
{
_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);
- SELECT32=(IASTNode)Match(input,SELECT,FOLLOW_SELECT_in_selectClause661);
+ SELECT32=(IASTNode)Match(input,SELECT,FOLLOW_SELECT_in_selectClause666);
stream_SELECT.Add(SELECT32);
HandleClauseStart( SELECT ); BeforeSelectClause();
Match(input, Token.DOWN, null);
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:146:68: (d= DISTINCT )?
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:147:68: (d= DISTINCT )?
int alt16 = 2;
int LA16_0 = input.LA(1);
@@ -2120,10 +2120,10 @@
switch (alt16)
{
case 1 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:146:69: d= DISTINCT
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:147:69: d= DISTINCT
{
_last = (IASTNode)input.LT(1);
- d=(IASTNode)Match(input,DISTINCT,FOLLOW_DISTINCT_in_selectClause668);
+ d=(IASTNode)Match(input,DISTINCT,FOLLOW_DISTINCT_in_selectClause673);
stream_DISTINCT.Add(d);
@@ -2133,7 +2133,7 @@
}
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_selectExprList_in_selectClause674);
+ PushFollow(FOLLOW_selectExprList_in_selectClause679);
x = selectExprList();
state.followingStackPointer--;
@@ -2157,14 +2157,14 @@
RewriteRuleSubtreeStream stream_x = new RewriteRuleSubtreeStream(adaptor, "rule x", x!=null ? x.Tree : null);
root_0 = (IASTNode)adaptor.GetNilNode();
- // 147:2: -> ^( SELECT_CLAUSE[\"{select clause}\"] ( $d)? $x)
+ // 148:2: -> ^( SELECT_CLAUSE[\"{select clause}\"] ( $d)? $x)
{
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:147:5: ^( SELECT_CLAUSE[\"{select clause}\"] ( $d)? $x)
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:148:5: ^( SELECT_CLAUSE[\"{select clause}\"] ( $d)? $x)
{
IASTNode root_1 = (IASTNode)adaptor.GetNilNode();
root_1 = (IASTNode)adaptor.BecomeRoot((IASTNode)adaptor.Create(SELECT_CLAUSE, "{select clause}"), root_1);
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:147:40: ( $d)?
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:148:40: ( $d)?
if ( stream_d.HasNext() )
{
adaptor.AddChild(root_1, stream_d.NextNode());
@@ -2207,7 +2207,7 @@
};
// $ANTLR start "selectExprList"
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:150:1: selectExprList : ( selectExpr | aliasedSelectExpr )+ ;
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:151:1: selectExprList : ( selectExpr | aliasedSelectExpr )+ ;
public HqlSqlWalker.selectExprList_return selectExprList() // throws RecognitionException [1]
{
HqlSqlWalker.selectExprList_return retval = new HqlSqlWalker.selectExprList_return();
@@ -2230,12 +2230,12 @@
try
{
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:154:2: ( ( selectExpr | aliasedSelectExpr )+ )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:154:4: ( selectExpr | aliasedSelectExpr )+
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:155:2: ( ( selectExpr | aliasedSelectExpr )+ )
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:155:4: ( selectExpr | aliasedSelectExpr )+
{
root_0 = (IASTNode)adaptor.GetNilNode();
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:154:4: ( selectExpr | aliasedSelectExpr )+
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:155:4: ( selectExpr | aliasedSelectExpr )+
int cnt17 = 0;
do
{
@@ -2255,10 +2255,10 @@
switch (alt17)
{
case 1 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:154:6: selectExpr
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:155:6: selectExpr
{
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_selectExpr_in_selectExprList709);
+ PushFollow(FOLLOW_selectExpr_in_selectExprList714);
selectExpr33 = selectExpr();
state.followingStackPointer--;
@@ -2267,10 +2267,10 @@
}
break;
case 2 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:154:19: aliasedSelectExpr
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:155:19: aliasedSelectExpr
{
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_aliasedSelectExpr_in_selectExprList713);
+ PushFollow(FOLLOW_aliasedSelectExpr_in_selectExprList718);
aliasedSelectExpr34 = aliasedSelectExpr();
state.followingStackPointer--;
@@ -2323,7 +2323,7 @@
};
// $ANTLR start "aliasedSelectExpr"
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:159:1: aliasedSelectExpr : ^( AS se= selectExpr i= identifier ) ;
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:160:1: aliasedSelectExpr : ^( AS se= selectExpr i= identifier ) ;
public HqlSqlWalker.aliasedSelectExpr_return aliasedSelectExpr() // throws RecognitionException [1]
{
HqlSqlWalker.aliasedSelectExpr_return retval = new HqlSqlWalker.aliasedSelectExpr_return();
@@ -2344,8 +2344,8 @@
try
{
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:164:2: ( ^( AS se= selectExpr i= identifier ) )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:164:4: ^( AS se= selectExpr i= identifier )
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:165:2: ( ^( AS se= selectExpr i= identifier ) )
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:165:4: ^( AS se= selectExpr i= identifier )
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -2354,7 +2354,7 @@
IASTNode _save_last_1 = _last;
IASTNode _first_1 = null;
IASTNode root_1 = (IASTNode)adaptor.GetNilNode();_last = (IASTNode)input.LT(1);
- AS35=(IASTNode)Match(input,AS,FOLLOW_AS_in_aliasedSelectExpr737);
+ AS35=(IASTNode)Match(input,AS,FOLLOW_AS_in_aliasedSelectExpr742);
AS35_tree = (IASTNode)adaptor.DupNode(AS35);
root_1 = (IASTNode)adaptor.BecomeRoot(AS35_tree, root_1);
@@ -2363,13 +2363,13 @@
Match(input, Token.DOWN, null);
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_selectExpr_in_aliasedSelectExpr741);
+ PushFollow(FOLLOW_selectExpr_in_aliasedSelectExpr746);
se = selectExpr();
state.followingStackPointer--;
adaptor.AddChild(root_1, se.Tree);
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_identifier_in_aliasedSelectExpr745);
+ PushFollow(FOLLOW_identifier_in_aliasedSelectExpr750);
i = identifier();
state.followingStackPointer--;
@@ -2411,7 +2411,7 @@
};
// $ANTLR start "selectExpr"
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:167:1: selectExpr : (p= propertyRef | ^( ALL ar2= aliasRef ) | ^( OBJECT ar3= aliasRef ) | con= constructor | functionCall | count | collectionFunction | literal | arithmeticExpr | query );
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:168:1: selectExpr : (p= propertyRef | ^( ALL ar2= aliasRef ) | ^( OBJECT ar3= aliasRef ) | con= constructor | functionCall | count | collectionFunction | literal | arithmeticExpr | query );
public HqlSqlWalker.selectExpr_return selectExpr() // throws RecognitionException [1]
{
HqlSqlWalker.selectExpr_return retval = new HqlSqlWalker.selectExpr_return();
@@ -2450,7 +2450,7 @@
try
{
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:168:2: (p= propertyRef | ^( ALL ar2= aliasRef ) | ^( OBJECT ar3= aliasRef ) | con= constructor | functionCall | count | collectionFunction | literal | arithmeticExpr | query )
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:169:2: (p= propertyRef | ^( ALL ar2= aliasRef ) | ^( OBJECT ar3= aliasRef ) | con= constructor | functionCall | count | collectionFunction | literal | arithmeticExpr | query )
int alt18 = 10;
switch ( input.LA(1) )
{
@@ -2528,12 +2528,12 @@
switch (alt18)
{
case 1 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:168:4: p= propertyRef
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:169:4: p= propertyRef
{
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_propertyRef_in_selectExpr760);
+ PushFollow(FOLLOW_propertyRef_in_selectExpr765);
p = propertyRef();
state.followingStackPointer--;
@@ -2543,7 +2543,7 @@
}
break;
case 2 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:169:4: ^( ALL ar2= aliasRef )
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:170:4: ^( ALL ar2= aliasRef )
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -2552,7 +2552,7 @@
IASTNode _save_last_1 = _last;
IASTNode _first_1 = null;
IASTNode root_1 = (IASTNode)adaptor.GetNilNode();_last = (IASTNode)input.LT(1);
- ALL36=(IASTNode)Match(input,ALL,FOLLOW_ALL_in_selectExpr772);
+ ALL36=(IASTNode)Match(input,ALL,FOLLOW_ALL_in_selectExpr777);
ALL36_tree = (IASTNode)adaptor.DupNode(ALL36);
root_1 = (IASTNode)adaptor.BecomeRoot(ALL36_tree, root_1);
@@ -2561,7 +2561,7 @@
Match(input, Token.DOWN, null);
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_aliasRef_in_selectExpr776);
+ PushFollow(FOLLOW_aliasRef_in_selectExpr781);
ar2 = aliasRef();
state.followingStackPointer--;
@@ -2575,7 +2575,7 @@
}
break;
case 3 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:170:4: ^( OBJECT ar3= aliasRef )
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:171:4: ^( OBJECT ar3= aliasRef )
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -2584,7 +2584,7 @@
IASTNode _save_last_1 = _last;
IASTNode _first_1 = null;
IASTNode root_1 = (IASTNode)adaptor.GetNilNode();_last = (IASTNode)input.LT(1);
- OBJECT37=(IASTNode)Match(input,OBJECT,FOLLOW_OBJECT_in_selectExpr788);
+ OBJECT37=(IASTNode)Match(input,OBJECT,FOLLOW_OBJECT_in_selectExpr793);
OBJECT37_tree = (IASTNode)adaptor.DupNode(OBJECT37);
root_1 = (IASTNode)adaptor.BecomeRoot(OBJECT37_tree, root_1);
@@ -2593,7 +2593,7 @@
Match(input, Token.DOWN, null);
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_aliasRef_in_selectExpr792);
+ PushFollow(FOLLOW_aliasRef_in_selectExpr797);
ar3 = aliasRef();
state.followingStackPointer--;
@@ -2607,12 +2607,12 @@
}
break;
case 4 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:171:4: con= constructor
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:172:4: con= constructor
{
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_constructor_in_selectExpr803);
+ PushFollow(FOLLOW_constructor_in_selectExpr808);
con = constructor();
state.followingStackPointer--;
@@ -2622,12 +2622,12 @@
}
break;
case 5 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:172:4: functionCall
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:173:4: functionCall
{
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_functionCall_in_selectExpr814);
+ PushFollow(FOLLOW_functionCall_in_selectExpr819);
functionCall38 = functionCall();
state.followingStackPointer--;
@@ -2636,12 +2636,12 @@
}
break;
case 6 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:173:4: count
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:174:4: count
{
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_count_in_selectExpr819);
+ PushFollow(FOLLOW_count_in_selectExpr824);
count39 = count();
state.followingStackPointer--;
@@ -2650,12 +2650,12 @@
}
break;
case 7 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:174:4: collectionFunction
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:175:4: collectionFunction
{
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_collectionFunction_in_selectExpr824);
+ PushFollow(FOLLOW_collectionFunction_in_selectExpr829);
collectionFunction40 = collectionFunction();
state.followingStackPointer--;
@@ -2664,12 +2664,12 @@
}
break;
case 8 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:175:4: literal
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:176:4: literal
{
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_literal_in_selectExpr832);
+ PushFollow(FOLLOW_literal_in_selectExpr837);
literal41 = literal();
state.followingStackPointer--;
@@ -2678,12 +2678,12 @@
}
break;
case 9 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:176:4: arithmeticExpr
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:177:4: arithmeticExpr
{
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_arithmeticExpr_in_selectExpr837);
+ PushFollow(FOLLOW_arithmeticExpr_in_selectExpr842);
arithmeticExpr42 = arithmeticExpr();
state.followingStackPointer--;
@@ -2692,12 +2692,12 @@
}
break;
case 10 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:177:4: query
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:178:4: query
{
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_query_in_selectExpr842);
+ PushFollow(FOLLOW_query_in_selectExpr847);
query43 = query();
state.followingStackPointer--;
@@ -2733,7 +2733,7 @@
};
// $ANTLR start "count"
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:180:1: count : ^( COUNT ( DISTINCT | ALL )? ( aggregateExpr | ROW_STAR ) ) ;
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:181:1: count : ^( COUNT ( DISTINCT | ALL )? ( aggregateExpr | ROW_STAR ) ) ;
public HqlSqlWalker.count_return count() // throws RecognitionException [1]
{
HqlSqlWalker.count_return retval = new HqlSqlWalker.count_return();
@@ -2756,8 +2756,8 @@
try
{
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:181:2: ( ^( COUNT ( DISTINCT | ALL )? ( aggregateExpr | ROW_STAR ) ) )
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:181:4: ^( COUNT ( DISTINCT | ALL )? ( aggregateExpr | ROW_STAR ) )
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:182:2: ( ^( COUNT ( DISTINCT | ALL )? ( aggregateExpr | ROW_STAR ) ) )
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:182:4: ^( COUNT ( DISTINCT | ALL )? ( aggregateExpr | ROW_STAR ) )
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -2766,7 +2766,7 @@
IASTNode _save_last_1 = _last;
IASTNode _first_1 = null;
IASTNode root_1 = (IASTNode)adaptor.GetNilNode();_last = (IASTNode)input.LT(1);
- COUNT44=(IASTNode)Match(input,COUNT,FOLLOW_COUNT_in_count854);
+ COUNT44=(IASTNode)Match(input,COUNT,FOLLOW_COUNT_in_count859);
COUNT44_tree = (IASTNode)adaptor.DupNode(COUNT44);
root_1 = (IASTNode)adaptor.BecomeRoot(COUNT44_tree, root_1);
@@ -2774,7 +2774,7 @@
Match(input, Token.DOWN, null);
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:181:12: ( DISTINCT | ALL )?
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:182:12: ( DISTINCT | ALL )?
int alt19 = 2;
int LA19_0 = input.LA(1);
@@ -2811,7 +2811,7 @@
}
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:181:32: ( aggregateExpr | ROW_STAR )
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:182:32: ( aggregateExpr | ROW_STAR )
int alt20 = 2;
int LA20_0 = input.LA(1);
@@ -2833,10 +2833,10 @@
switch (alt20)
{
case 1 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:181:34: aggregateExpr
+ // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g:182:34: aggregateExpr
{
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_aggregateExpr_in_count869);
+ PushFollow(FOLLOW_aggregateExpr_in_count874);
aggregateExpr46 = aggregateExpr();
state.followingStackPointer--;
@@ -2845,10 +2845,10 @@
}
break;
case 2 :
- // C:\\CSharp\\NH\\nhibernate\\src\\NHibernate\\Hql\\Ast\\ANTLR\\HqlSqlWalker.g...
[truncated message content] |