Menu
▾
▴
[Nhibernate-commit] SF.net SVN: nhibernate:[5509] trunk/nhibernate
|
From: <fab...@us...> - 2011-03-23 15:41:17
|
Revision: 5509
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5509&view=rev
Author: fabiomaulo
Date: 2011-03-23 15:41:09 +0000 (Wed, 23 Mar 2011)
Log Message:
-----------
Apply NH-2548 (thanks to Mihai Codrean)
Modified Paths:
--------------
trunk/nhibernate/ShowBuildMenu.bat
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlSqlWalker.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/SqlGenerator.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.g
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/SqlGenerator.g
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/CaseNode.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/IntoClause.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/ParameterNode.cs
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Tree/SelectClause.cs
trunk/nhibernate/src/NHibernate/Hql/NameGenerator.cs
trunk/nhibernate/src/NHibernate.Test/HQL/Ast/HqlFixture.cs
Added Paths:
-----------
trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrSqlGenerator.bat
Modified: trunk/nhibernate/ShowBuildMenu.bat
===================================================================
--- trunk/nhibernate/ShowBuildMenu.bat 2011-03-23 14:27:03 UTC (rev 5508)
+++ trunk/nhibernate/ShowBuildMenu.bat 2011-03-23 15:41:09 UTC (rev 5509)
@@ -119,9 +119,10 @@
echo --- GRAMMAR ---
echo A. Regenerate HqlLexer.cs and HqlParser.cs from Hql.g.
echo B. Regenerate HqlSqlWalker.cs from HqlSqlWalker.g.
-echo C. Regenerate Hql.g in debug mode.
-echo D. Regenerate HqlSqlWalker.g in debug mode.
-echo E. Quick instructions on using debug mode.
+echo C. Regenerate SqlGenerator.cs from SqlGenerator.g.
+echo D. Regenerate Hql.g in debug mode.
+echo E. Regenerate HqlSqlWalker.g in debug mode.
+echo H. Quick instructions on using debug mode.
echo.
if exist %SYSTEMROOT%\System32\choice.exe ( goto grammar-prompt-choice )
@@ -139,13 +140,14 @@
if errorlevel 0 goto end
:grammar-prompt-set
-set /p OPT=[A, B, C, D, E]?
+set /p OPT=[A, B, C, D, E, H]?
if /I "%OPT%"=="A" goto antlr-hql
if /I "%OPT%"=="B" goto antlr-hqlsqlwalker
-if /I "%OPT%"=="C" goto antlr-hql-debug
-if /I "%OPT%"=="D" goto antlr-hqlsqlwalker-debug
-if /I "%OPT%"=="E" goto antlr-debug
+if /I "%OPT%"=="C" goto antlr-sqlgenerator
+if /I "%OPT%"=="D" goto antlr-hql-debug
+if /I "%OPT%"=="E" goto antlr-hqlsqlwalker-debug
+if /I "%OPT%"=="H" goto antlr-debug
goto grammar-prompt-set
:antlr-hql
@@ -156,6 +158,10 @@
call src\NHibernate\Hql\Ast\ANTLR\AntlrHqlSqlWalker.bat
goto end
+:antlr-sqlgenerator
+call src\NHibernate\Hql\Ast\ANTLR\AntlrSqlGenerator.bat
+goto end
+
:antlr-hql-debug
call src\NHibernate\Hql\Ast\ANTLR\AntlrHqlDebug.bat
goto end
Added: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrSqlGenerator.bat
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrSqlGenerator.bat (rev 0)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrSqlGenerator.bat 2011-03-23 15:41:09 UTC (rev 5509)
@@ -0,0 +1,5 @@
+rem I wanted to put this in the nant build file, but I had very annoying problems with 64-bit java running from the 32-bit nant process.
+@echo off
+pushd %~dp0
+java.exe -cp ..\..\..\..\..\Tools\Antlr\antlr-3.2.jar org.antlr.Tool -o Generated SqlGenerator.g
+popd
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlSqlWalker.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlSqlWalker.cs 2011-03-23 14:27:03 UTC (rev 5508)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/Generated/HqlSqlWalker.cs 2011-03-23 15:41:09 UTC (rev 5509)
@@ -1,4 +1,4 @@
-// $ANTLR 3.2 Sep 23, 2009 12:02:23 HqlSqlWalker.g 2011-01-15 10:39:02
+// $ANTLR 3.2 Sep 23, 2009 12:02:23 HqlSqlWalker.g 2011-03-23 12:04:52
// The variable 'variable' is assigned but its value is never used.
#pragma warning disable 168, 219
@@ -677,16 +677,16 @@
// AST REWRITE
- // elements: s, u, f, w
+ // elements: u, w, s, f
// token labels: u
- // rule labels: w, f, retval, s
+ // rule labels: f, w, 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_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_retval = new RewriteRuleSubtreeStream(adaptor, "rule retval", retval!=null ? retval.Tree : null);
RewriteRuleSubtreeStream stream_s = new RewriteRuleSubtreeStream(adaptor, "rule s", s!=null ? s.Tree : null);
@@ -1757,15 +1757,15 @@
// AST REWRITE
- // elements: o, g, s, w, f
+ // elements: s, o, f, g, w
// token labels:
- // rule labels: f, w, g, retval, s, o
+ // rule labels: w, f, g, retval, s, o
// token list labels:
// rule list labels:
// wildcard labels:
retval.Tree = root_0;
+ 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_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);
@@ -2377,7 +2377,7 @@
int alt18 = 3;
int LA18_0 = input.LA(1);
- if ( (LA18_0 == ALL || LA18_0 == COUNT || LA18_0 == DOT || LA18_0 == ELEMENTS || LA18_0 == INDICES || LA18_0 == UNION || LA18_0 == CASE || LA18_0 == OBJECT || LA18_0 == AGGREGATE || (LA18_0 >= CONSTRUCTOR && LA18_0 <= CASE2) || LA18_0 == METHOD_CALL || LA18_0 == QUERY || LA18_0 == UNARY_MINUS || LA18_0 == WEIRD_IDENT || (LA18_0 >= NUM_INT && LA18_0 <= NUM_LONG) || (LA18_0 >= BNOT && LA18_0 <= DIV) || (LA18_0 >= QUOTED_String && LA18_0 <= IDENT)) )
+ if ( (LA18_0 == ALL || LA18_0 == COUNT || LA18_0 == DOT || LA18_0 == ELEMENTS || LA18_0 == INDICES || LA18_0 == UNION || LA18_0 == CASE || LA18_0 == OBJECT || LA18_0 == AGGREGATE || (LA18_0 >= CONSTRUCTOR && LA18_0 <= CASE2) || LA18_0 == METHOD_CALL || LA18_0 == QUERY || LA18_0 == UNARY_MINUS || LA18_0 == WEIRD_IDENT || (LA18_0 >= NUM_INT && LA18_0 <= NUM_LONG) || (LA18_0 >= BNOT && LA18_0 <= DIV) || (LA18_0 >= COLON && LA18_0 <= IDENT)) )
{
alt18 = 1;
}
@@ -2546,7 +2546,7 @@
};
// $ANTLR start "selectExpr"
- // HqlSqlWalker.g:173:1: selectExpr : (p= propertyRef | ^( ALL ar2= aliasRef ) | ^( OBJECT ar3= aliasRef ) | con= constructor | functionCall | count | collectionFunction | literal | arithmeticExpr | query );
+ // HqlSqlWalker.g:173:1: selectExpr : (p= propertyRef | ^( ALL ar2= aliasRef ) | ^( OBJECT ar3= aliasRef ) | con= constructor | functionCall | parameter | count | collectionFunction | literal | arithmeticExpr | query );
public HqlSqlWalker.selectExpr_return selectExpr() // throws RecognitionException [1]
{
HqlSqlWalker.selectExpr_return retval = new HqlSqlWalker.selectExpr_return();
@@ -2569,24 +2569,26 @@
HqlSqlWalker.functionCall_return functionCall42 = default(HqlSqlWalker.functionCall_return);
- HqlSqlWalker.count_return count43 = default(HqlSqlWalker.count_return);
+ HqlSqlWalker.parameter_return parameter43 = default(HqlSqlWalker.parameter_return);
- HqlSqlWalker.collectionFunction_return collectionFunction44 = default(HqlSqlWalker.collectionFunction_return);
+ HqlSqlWalker.count_return count44 = default(HqlSqlWalker.count_return);
- HqlSqlWalker.literal_return literal45 = default(HqlSqlWalker.literal_return);
+ HqlSqlWalker.collectionFunction_return collectionFunction45 = default(HqlSqlWalker.collectionFunction_return);
- HqlSqlWalker.arithmeticExpr_return arithmeticExpr46 = default(HqlSqlWalker.arithmeticExpr_return);
+ HqlSqlWalker.literal_return literal46 = default(HqlSqlWalker.literal_return);
- HqlSqlWalker.query_return query47 = default(HqlSqlWalker.query_return);
+ HqlSqlWalker.arithmeticExpr_return arithmeticExpr47 = default(HqlSqlWalker.arithmeticExpr_return);
+ HqlSqlWalker.query_return query48 = default(HqlSqlWalker.query_return);
+
IASTNode ALL40_tree=null;
IASTNode OBJECT41_tree=null;
try
{
- // HqlSqlWalker.g:174:2: (p= propertyRef | ^( ALL ar2= aliasRef ) | ^( OBJECT ar3= aliasRef ) | con= constructor | functionCall | count | collectionFunction | literal | arithmeticExpr | query )
- int alt19 = 10;
+ // HqlSqlWalker.g:174:2: (p= propertyRef | ^( ALL ar2= aliasRef ) | ^( OBJECT ar3= aliasRef ) | con= constructor | functionCall | parameter | count | collectionFunction | literal | arithmeticExpr | query )
+ int alt19 = 11;
switch ( input.LA(1) )
{
case DOT:
@@ -2617,15 +2619,21 @@
alt19 = 5;
}
break;
- case COUNT:
+ case COLON:
+ case PARAM:
{
alt19 = 6;
}
break;
+ case COUNT:
+ {
+ alt19 = 7;
+ }
+ break;
case ELEMENTS:
case INDICES:
{
- alt19 = 7;
+ alt19 = 8;
}
break;
case NUM_INT:
@@ -2635,7 +2643,7 @@
case NUM_LONG:
case QUOTED_String:
{
- alt19 = 8;
+ alt19 = 9;
}
break;
case CASE:
@@ -2650,13 +2658,13 @@
case STAR:
case DIV:
{
- alt19 = 9;
+ alt19 = 10;
}
break;
case UNION:
case QUERY:
{
- alt19 = 10;
+ alt19 = 11;
}
break;
default:
@@ -2777,76 +2785,90 @@
}
break;
case 6 :
- // HqlSqlWalker.g:179:4: count
+ // HqlSqlWalker.g:179:4: parameter
{
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_count_in_selectExpr847);
- count43 = count();
+ PushFollow(FOLLOW_parameter_in_selectExpr847);
+ parameter43 = parameter();
state.followingStackPointer--;
- adaptor.AddChild(root_0, count43.Tree);
+ adaptor.AddChild(root_0, parameter43.Tree);
}
break;
case 7 :
- // HqlSqlWalker.g:180:4: collectionFunction
+ // HqlSqlWalker.g:180:4: count
{
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_collectionFunction_in_selectExpr852);
- collectionFunction44 = collectionFunction();
+ PushFollow(FOLLOW_count_in_selectExpr852);
+ count44 = count();
state.followingStackPointer--;
- adaptor.AddChild(root_0, collectionFunction44.Tree);
+ adaptor.AddChild(root_0, count44.Tree);
}
break;
case 8 :
- // HqlSqlWalker.g:181:4: literal
+ // HqlSqlWalker.g:181:4: collectionFunction
{
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_literal_in_selectExpr860);
- literal45 = literal();
+ PushFollow(FOLLOW_collectionFunction_in_selectExpr857);
+ collectionFunction45 = collectionFunction();
state.followingStackPointer--;
- adaptor.AddChild(root_0, literal45.Tree);
+ adaptor.AddChild(root_0, collectionFunction45.Tree);
}
break;
case 9 :
- // HqlSqlWalker.g:182:4: arithmeticExpr
+ // HqlSqlWalker.g:182:4: literal
{
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_arithmeticExpr_in_selectExpr865);
- arithmeticExpr46 = arithmeticExpr();
+ PushFollow(FOLLOW_literal_in_selectExpr865);
+ literal46 = literal();
state.followingStackPointer--;
- adaptor.AddChild(root_0, arithmeticExpr46.Tree);
+ adaptor.AddChild(root_0, literal46.Tree);
}
break;
case 10 :
- // HqlSqlWalker.g:183:4: query
+ // HqlSqlWalker.g:183:4: arithmeticExpr
{
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_query_in_selectExpr870);
- query47 = query();
+ PushFollow(FOLLOW_arithmeticExpr_in_selectExpr870);
+ arithmeticExpr47 = arithmeticExpr();
state.followingStackPointer--;
- adaptor.AddChild(root_0, query47.Tree);
+ adaptor.AddChild(root_0, arithmeticExpr47.Tree);
}
break;
+ case 11 :
+ // HqlSqlWalker.g:184:4: query
+ {
+ root_0 = (IASTNode)adaptor.GetNilNode();
+ _last = (IASTNode)input.LT(1);
+ PushFollow(FOLLOW_query_in_selectExpr875);
+ query48 = query();
+ state.followingStackPointer--;
+
+ adaptor.AddChild(root_0, query48.Tree);
+
+ }
+ break;
+
}
retval.Tree = (IASTNode)adaptor.RulePostProcessing(root_0);
@@ -2874,7 +2896,7 @@
};
// $ANTLR start "count"
- // HqlSqlWalker.g:186:1: count : ^( COUNT ( DISTINCT | ALL )? ( aggregateExpr | ROW_STAR ) ) ;
+ // HqlSqlWalker.g:187:1: count : ^( COUNT ( DISTINCT | ALL )? ( aggregateExpr | ROW_STAR ) ) ;
public HqlSqlWalker.count_return count() // throws RecognitionException [1]
{
HqlSqlWalker.count_return retval = new HqlSqlWalker.count_return();
@@ -2885,20 +2907,20 @@
IASTNode _first_0 = null;
IASTNode _last = null;
- IASTNode COUNT48 = null;
- IASTNode set49 = null;
- IASTNode ROW_STAR51 = null;
- HqlSqlWalker.aggregateExpr_return aggregateExpr50 = default(HqlSqlWalker.aggregateExpr_return);
+ IASTNode COUNT49 = null;
+ IASTNode set50 = null;
+ IASTNode ROW_STAR52 = null;
+ HqlSqlWalker.aggregateExpr_return aggregateExpr51 = default(HqlSqlWalker.aggregateExpr_return);
- IASTNode COUNT48_tree=null;
- IASTNode set49_tree=null;
- IASTNode ROW_STAR51_tree=null;
+ IASTNode COUNT49_tree=null;
+ IASTNode set50_tree=null;
+ IASTNode ROW_STAR52_tree=null;
try
{
- // HqlSqlWalker.g:187:2: ( ^( COUNT ( DISTINCT | ALL )? ( aggregateExpr | ROW_STAR ) ) )
- // HqlSqlWalker.g:187:4: ^( COUNT ( DISTINCT | ALL )? ( aggregateExpr | ROW_STAR ) )
+ // HqlSqlWalker.g:188:2: ( ^( COUNT ( DISTINCT | ALL )? ( aggregateExpr | ROW_STAR ) ) )
+ // HqlSqlWalker.g:188:4: ^( COUNT ( DISTINCT | ALL )? ( aggregateExpr | ROW_STAR ) )
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -2907,15 +2929,15 @@
IASTNode _save_last_1 = _last;
IASTNode _first_1 = null;
IASTNode root_1 = (IASTNode)adaptor.GetNilNode();_last = (IASTNode)input.LT(1);
- COUNT48=(IASTNode)Match(input,COUNT,FOLLOW_COUNT_in_count882);
- COUNT48_tree = (IASTNode)adaptor.DupNode(COUNT48);
+ COUNT49=(IASTNode)Match(input,COUNT,FOLLOW_COUNT_in_count887);
+ COUNT49_tree = (IASTNode)adaptor.DupNode(COUNT49);
- root_1 = (IASTNode)adaptor.BecomeRoot(COUNT48_tree, root_1);
+ root_1 = (IASTNode)adaptor.BecomeRoot(COUNT49_tree, root_1);
Match(input, Token.DOWN, null);
- // HqlSqlWalker.g:187:12: ( DISTINCT | ALL )?
+ // HqlSqlWalker.g:188:12: ( DISTINCT | ALL )?
int alt20 = 2;
int LA20_0 = input.LA(1);
@@ -2929,14 +2951,14 @@
// HqlSqlWalker.g:
{
_last = (IASTNode)input.LT(1);
- set49 = (IASTNode)input.LT(1);
+ set50 = (IASTNode)input.LT(1);
if ( input.LA(1) == ALL || input.LA(1) == DISTINCT )
{
input.Consume();
- set49_tree = (IASTNode)adaptor.DupNode(set49);
+ set50_tree = (IASTNode)adaptor.DupNode(set50);
- adaptor.AddChild(root_1, set49_tree);
+ adaptor.AddChild(root_1, set50_tree);
state.errorRecovery = false;
}
@@ -2952,7 +2974,7 @@
}
- // HqlSqlWalker.g:187:32: ( aggregateExpr | ROW_STAR )
+ // HqlSqlWalker.g:188:32: ( aggregateExpr | ROW_STAR )
int alt21 = 2;
int LA21_0 = input.LA(1);
@@ -2974,25 +2996,25 @@
switch (alt21)
{
case 1 :
- // HqlSqlWalker.g:187:34: aggregateExpr
+ // HqlSqlWalker.g:188:34: aggregateExpr
{
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_aggregateExpr_in_count897);
- aggregateExpr50 = aggregateExpr();
+ PushFollow(FOLLOW_aggregateExpr_in_count902);
+ aggregateExpr51 = aggregateExpr();
state.followingStackPointer--;
- adaptor.AddChild(root_1, aggregateExpr50.Tree);
+ adaptor.AddChild(root_1, aggregateExpr51.Tree);
}
break;
case 2 :
- // HqlSqlWalker.g:187:50: ROW_STAR
+ // HqlSqlWalker.g:188:50: ROW_STAR
{
_last = (IASTNode)input.LT(1);
- ROW_STAR51=(IASTNode)Match(input,ROW_STAR,FOLLOW_ROW_STAR_in_count901);
- ROW_STAR51_tree = (IASTNode)adaptor.DupNode(ROW_STAR51);
+ ROW_STAR52=(IASTNode)Match(input,ROW_STAR,FOLLOW_ROW_STAR_in_count906);
+ ROW_STAR52_tree = (IASTNode)adaptor.DupNode(ROW_STAR52);
- adaptor.AddChild(root_1, ROW_STAR51_tree);
+ adaptor.AddChild(root_1, ROW_STAR52_tree);
}
@@ -3033,7 +3055,7 @@
};
// $ANTLR start "constructor"
- // HqlSqlWalker.g:190:1: constructor : ^( CONSTRUCTOR path ( selectExpr | aliasedSelectExpr )* ) ;
+ // HqlSqlWalker.g:191:1: constructor : ^( CONSTRUCTOR path ( selectExpr | aliasedSelectExpr )* ) ;
public HqlSqlWalker.constructor_return constructor() // throws RecognitionException [1]
{
HqlSqlWalker.constructor_return retval = new HqlSqlWalker.constructor_return();
@@ -3044,20 +3066,20 @@
IASTNode _first_0 = null;
IASTNode _last = null;
- IASTNode CONSTRUCTOR52 = null;
- HqlSqlWalker.path_return path53 = default(HqlSqlWalker.path_return);
+ IASTNode CONSTRUCTOR53 = null;
+ HqlSqlWalker.path_return path54 = default(HqlSqlWalker.path_return);
- HqlSqlWalker.selectExpr_return selectExpr54 = default(HqlSqlWalker.selectExpr_return);
+ HqlSqlWalker.selectExpr_return selectExpr55 = default(HqlSqlWalker.selectExpr_return);
- HqlSqlWalker.aliasedSelectExpr_return aliasedSelectExpr55 = default(HqlSqlWalker.aliasedSelectExpr_return);
+ HqlSqlWalker.aliasedSelectExpr_return aliasedSelectExpr56 = default(HqlSqlWalker.aliasedSelectExpr_return);
- IASTNode CONSTRUCTOR52_tree=null;
+ IASTNode CONSTRUCTOR53_tree=null;
try
{
- // HqlSqlWalker.g:191:2: ( ^( CONSTRUCTOR path ( selectExpr | aliasedSelectExpr )* ) )
- // HqlSqlWalker.g:191:4: ^( CONSTRUCTOR path ( selectExpr | aliasedSelectExpr )* )
+ // HqlSqlWalker.g:192:2: ( ^( CONSTRUCTOR path ( selectExpr | aliasedSelectExpr )* ) )
+ // HqlSqlWalker.g:192:4: ^( CONSTRUCTOR path ( selectExpr | aliasedSelectExpr )* )
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -3066,27 +3088,27 @@
IASTNode _save_last_1 = _last;
IASTNode _first_1 = null;
IASTNode root_1 = (IASTNode)adaptor.GetNilNode();_last = (IASTNode)input.LT(1);
- CONSTRUCTOR52=(IASTNode)Match(input,CONSTRUCTOR,FOLLOW_CONSTRUCTOR_in_constructor917);
- CONSTRUCTOR52_tree = (IASTNode)adaptor.DupNode(CONSTRUCTOR52);
+ CONSTRUCTOR53=(IASTNode)Match(input,CONSTRUCTOR,FOLLOW_CONSTRUCTOR_in_constructor922);
+ CONSTRUCTOR53_tree = (IASTNode)adaptor.DupNode(CONSTRUCTOR53);
- root_1 = (IASTNode)adaptor.BecomeRoot(CONSTRUCTOR52_tree, root_1);
+ root_1 = (IASTNode)adaptor.BecomeRoot(CONSTRUCTOR53_tree, root_1);
Match(input, Token.DOWN, null);
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_path_in_constructor919);
- path53 = path();
+ PushFollow(FOLLOW_path_in_constructor924);
+ path54 = path();
state.followingStackPointer--;
- adaptor.AddChild(root_1, path53.Tree);
- // HqlSqlWalker.g:191:23: ( selectExpr | aliasedSelectExpr )*
+ adaptor.AddChild(root_1, path54.Tree);
+ // HqlSqlWalker.g:192:23: ( selectExpr | aliasedSelectExpr )*
do
{
int alt22 = 3;
int LA22_0 = input.LA(1);
- if ( (LA22_0 == ALL || LA22_0 == COUNT || LA22_0 == DOT || LA22_0 == ELEMENTS || LA22_0 == INDICES || LA22_0 == UNION || LA22_0 == CASE || LA22_0 == OBJECT || LA22_0 == AGGREGATE || (LA22_0 >= CONSTRUCTOR && LA22_0 <= CASE2) || LA22_0 == METHOD_CALL || LA22_0 == QUERY || LA22_0 == UNARY_MINUS || LA22_0 == WEIRD_IDENT || (LA22_0 >= NUM_INT && LA22_0 <= NUM_LONG) || (LA22_0 >= BNOT && LA22_0 <= DIV) || (LA22_0 >= QUOTED_String && LA22_0 <= IDENT)) )
+ if ( (LA22_0 == ALL || LA22_0 == COUNT || LA22_0 == DOT || LA22_0 == ELEMENTS || LA22_0 == INDICES || LA22_0 == UNION || LA22_0 == CASE || LA22_0 == OBJECT || LA22_0 == AGGREGATE || (LA22_0 >= CONSTRUCTOR && LA22_0 <= CASE2) || LA22_0 == METHOD_CALL || LA22_0 == QUERY || LA22_0 == UNARY_MINUS || LA22_0 == WEIRD_IDENT || (LA22_0 >= NUM_INT && LA22_0 <= NUM_LONG) || (LA22_0 >= BNOT && LA22_0 <= DIV) || (LA22_0 >= COLON && LA22_0 <= IDENT)) )
{
alt22 = 1;
}
@@ -3099,26 +3121,26 @@
switch (alt22)
{
case 1 :
- // HqlSqlWalker.g:191:25: selectExpr
+ // HqlSqlWalker.g:192:25: selectExpr
{
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_selectExpr_in_constructor923);
- selectExpr54 = selectExpr();
+ PushFollow(FOLLOW_selectExpr_in_constructor928);
+ selectExpr55 = selectExpr();
state.followingStackPointer--;
- adaptor.AddChild(root_1, selectExpr54.Tree);
+ adaptor.AddChild(root_1, selectExpr55.Tree);
}
break;
case 2 :
- // HqlSqlWalker.g:191:38: aliasedSelectExpr
+ // HqlSqlWalker.g:192:38: aliasedSelectExpr
{
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_aliasedSelectExpr_in_constructor927);
- aliasedSelectExpr55 = aliasedSelectExpr();
+ PushFollow(FOLLOW_aliasedSelectExpr_in_constructor932);
+ aliasedSelectExpr56 = aliasedSelectExpr();
state.followingStackPointer--;
- adaptor.AddChild(root_1, aliasedSelectExpr55.Tree);
+ adaptor.AddChild(root_1, aliasedSelectExpr56.Tree);
}
break;
@@ -3164,7 +3186,7 @@
};
// $ANTLR start "aggregateExpr"
- // HqlSqlWalker.g:194:1: aggregateExpr : ( expr | collectionFunction );
+ // HqlSqlWalker.g:195:1: aggregateExpr : ( expr | collectionFunction );
public HqlSqlWalker.aggregateExpr_return aggregateExpr() // throws RecognitionException [1]
{
HqlSqlWalker.aggregateExpr_return retval = new HqlSqlWalker.aggregateExpr_return();
@@ -3175,15 +3197,15 @@
IASTNode _first_0 = null;
IASTNode _last = null;
- HqlSqlWalker.expr_return expr56 = default(HqlSqlWalker.expr_return);
+ HqlSqlWalker.expr_return expr57 = default(HqlSqlWalker.expr_return);
- HqlSqlWalker.collectionFunction_return collectionFunction57 = default(HqlSqlWalker.collectionFunction_return);
+ HqlSqlWalker.collectionFunction_return collectionFunction58 = default(HqlSqlWalker.collectionFunction_return);
try
{
- // HqlSqlWalker.g:195:2: ( expr | collectionFunction )
+ // HqlSqlWalker.g:196:2: ( expr | collectionFunction )
int alt23 = 2;
int LA23_0 = input.LA(1);
@@ -3205,30 +3227,30 @@
switch (alt23)
{
case 1 :
- // HqlSqlWalker.g:195:4: expr
+ // HqlSqlWalker.g:196:4: expr
{
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_expr_in_aggregateExpr943);
- expr56 = expr();
+ PushFollow(FOLLOW_expr_in_aggregateExpr948);
+ expr57 = expr();
state.followingStackPointer--;
- adaptor.AddChild(root_0, expr56.Tree);
+ adaptor.AddChild(root_0, expr57.Tree);
}
break;
case 2 :
- // HqlSqlWalker.g:196:4: collectionFunction
+ // HqlSqlWalker.g:197:4: collectionFunction
{
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_collectionFunction_in_aggregateExpr949);
- collectionFunction57 = collectionFunction();
+ PushFollow(FOLLOW_collectionFunction_in_aggregateExpr954);
+ collectionFunction58 = collectionFunction();
state.followingStackPointer--;
- adaptor.AddChild(root_0, collectionFunction57.Tree);
+ adaptor.AddChild(root_0, collectionFunction58.Tree);
}
break;
@@ -3260,7 +3282,7 @@
};
// $ANTLR start "fromClause"
- // HqlSqlWalker.g:200:1: fromClause : ^(f= FROM fromElementList ) ;
+ // HqlSqlWalker.g:201:1: fromClause : ^(f= FROM fromElementList ) ;
public HqlSqlWalker.fromClause_return fromClause() // throws RecognitionException [1]
{
HqlSqlWalker.fromClause_return retval = new HqlSqlWalker.fromClause_return();
@@ -3272,7 +3294,7 @@
IASTNode _last = null;
IASTNode f = null;
- HqlSqlWalker.fromElementList_return fromElementList58 = default(HqlSqlWalker.fromElementList_return);
+ HqlSqlWalker.fromElementList_return fromElementList59 = default(HqlSqlWalker.fromElementList_return);
IASTNode f_tree=null;
@@ -3284,8 +3306,8 @@
try
{
- // HqlSqlWalker.g:206:2: ( ^(f= FROM fromElementList ) )
- // HqlSqlWalker.g:206:4: ^(f= FROM fromElementList )
+ // HqlSqlWalker.g:207:2: ( ^(f= FROM fromElementList ) )
+ // HqlSqlWalker.g:207:4: ^(f= FROM fromElementList )
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -3294,7 +3316,7 @@
IASTNode _save_last_1 = _last;
IASTNode _first_1 = null;
IASTNode root_1 = (IASTNode)adaptor.GetNilNode();_last = (IASTNode)input.LT(1);
- f=(IASTNode)Match(input,FROM,FOLLOW_FROM_in_fromClause969);
+ f=(IASTNode)Match(input,FROM,FOLLOW_FROM_in_fromClause974);
f_tree = (IASTNode)adaptor.DupNode(f);
root_1 = (IASTNode)adaptor.BecomeRoot(f_tree, root_1);
@@ -3304,11 +3326,11 @@
Match(input, Token.DOWN, null);
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_fromElementList_in_fromClause973);
- fromElementList58 = fromElementList();
+ PushFollow(FOLLOW_fromElementList_in_fromClause978);
+ fromElementList59 = fromElementList();
state.followingStackPointer--;
- adaptor.AddChild(root_1, fromElementList58.Tree);
+ adaptor.AddChild(root_1, fromElementList59.Tree);
Match(input, Token.UP, null); adaptor.AddChild(root_0, root_1);_last = _save_last_1;
}
@@ -3342,7 +3364,7 @@
};
// $ANTLR start "fromElementList"
- // HqlSqlWalker.g:209:1: fromElementList : ( fromElement )+ ;
+ // HqlSqlWalker.g:210:1: fromElementList : ( fromElement )+ ;
public HqlSqlWalker.fromElementList_return fromElementList() // throws RecognitionException [1]
{
HqlSqlWalker.fromElementList_return retval = new HqlSqlWalker.fromElementList_return();
@@ -3353,7 +3375,7 @@
IASTNode _first_0 = null;
IASTNode _last = null;
- HqlSqlWalker.fromElement_return fromElement59 = default(HqlSqlWalker.fromElement_return);
+ HqlSqlWalker.fromElement_return fromElement60 = default(HqlSqlWalker.fromElement_return);
@@ -3363,12 +3385,12 @@
try
{
- // HqlSqlWalker.g:213:2: ( ( fromElement )+ )
- // HqlSqlWalker.g:213:4: ( fromElement )+
+ // HqlSqlWalker.g:214:2: ( ( fromElement )+ )
+ // HqlSqlWalker.g:214:4: ( fromElement )+
{
root_0 = (IASTNode)adaptor.GetNilNode();
- // HqlSqlWalker.g:213:4: ( fromElement )+
+ // HqlSqlWalker.g:214:4: ( fromElement )+
int cnt24 = 0;
do
{
@@ -3384,14 +3406,14 @@
switch (alt24)
{
case 1 :
- // HqlSqlWalker.g:213:5: fromElement
+ // HqlSqlWalker.g:214:5: fromElement
{
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_fromElement_in_fromElementList991);
- fromElement59 = fromElement();
+ PushFollow(FOLLOW_fromElement_in_fromElementList996);
+ fromElement60 = fromElement();
state.followingStackPointer--;
- adaptor.AddChild(root_0, fromElement59.Tree);
+ adaptor.AddChild(root_0, fromElement60.Tree);
}
break;
@@ -3440,7 +3462,7 @@
};
// $ANTLR start "fromElement"
- // HqlSqlWalker.g:218:1: fromElement : ( ^( RANGE p= path (a= ALIAS )? (pf= FETCH )? ) -> {fromElement != null}? ^() -> | je= joinElement -> | fe= FILTER_ENTITY a3= ALIAS -> ^() );
+ // HqlSqlWalker.g:219:1: fromElement : ( ^( RANGE p= path (a= ALIAS )? (pf= FETCH )? ) -> {fromElement != null}? ^() -> | je= joinElement -> | fe= FILTER_ENTITY a3= ALIAS -> ^() );
public HqlSqlWalker.fromElement_return fromElement() // throws RecognitionException [1]
{
HqlSqlWalker.fromElement_return retval = new HqlSqlWalker.fromElement_return();
@@ -3455,7 +3477,7 @@
IASTNode pf = null;
IASTNode fe = null;
IASTNode a3 = null;
- IASTNode RANGE60 = null;
+ IASTNode RANGE61 = null;
HqlSqlWalker.path_return p = default(HqlSqlWalker.path_return);
HqlSqlWalker.joinElement_return je = default(HqlSqlWalker.joinElement_return);
@@ -3465,7 +3487,7 @@
IASTNode pf_tree=null;
IASTNode fe_tree=null;
IASTNode a3_tree=null;
- IASTNode RANGE60_tree=null;
+ IASTNode RANGE61_tree=null;
RewriteRuleNodeStream stream_FILTER_ENTITY = new RewriteRuleNodeStream(adaptor,"token FILTER_ENTITY");
RewriteRuleNodeStream stream_RANGE = new RewriteRuleNodeStream(adaptor,"token RANGE");
RewriteRuleNodeStream stream_FETCH = new RewriteRuleNodeStream(adaptor,"token FETCH");
@@ -3477,7 +3499,7 @@
try
{
- // HqlSqlWalker.g:223:2: ( ^( RANGE p= path (a= ALIAS )? (pf= FETCH )? ) -> {fromElement != null}? ^() -> | je= joinElement -> | fe= FILTER_ENTITY a3= ALIAS -> ^() )
+ // HqlSqlWalker.g:224:2: ( ^( RANGE p= path (a= ALIAS )? (pf= FETCH )? ) -> {fromElement != null}? ^() -> | je= joinElement -> | fe= FILTER_ENTITY a3= ALIAS -> ^() )
int alt27 = 3;
switch ( input.LA(1) )
{
@@ -3506,26 +3528,26 @@
switch (alt27)
{
case 1 :
- // HqlSqlWalker.g:223:4: ^( RANGE p= path (a= ALIAS )? (pf= FETCH )? )
+ // HqlSqlWalker.g:224:4: ^( RANGE p= path (a= ALIAS )? (pf= FETCH )? )
{
_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);
- RANGE60=(IASTNode)Match(input,RANGE,FOLLOW_RANGE_in_fromElement1016);
- stream_RANGE.Add(RANGE60);
+ RANGE61=(IASTNode)Match(input,RANGE,FOLLOW_RANGE_in_fromElement1021);
+ stream_RANGE.Add(RANGE61);
Match(input, Token.DOWN, null);
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_path_in_fromElement1020);
+ PushFollow(FOLLOW_path_in_fromElement1025);
p = path();
state.followingStackPointer--;
stream_path.Add(p.Tree);
- // HqlSqlWalker.g:223:19: (a= ALIAS )?
+ // HqlSqlWalker.g:224:19: (a= ALIAS )?
int alt25 = 2;
int LA25_0 = input.LA(1);
@@ -3536,10 +3558,10 @@
switch (alt25)
{
case 1 :
- // HqlSqlWalker.g:223:20: a= ALIAS
+ // HqlSqlWalker.g:224:20: a= ALIAS
{
_last = (IASTNode)input.LT(1);
- a=(IASTNode)Match(input,ALIAS,FOLLOW_ALIAS_in_fromElement1025);
+ a=(IASTNode)Match(input,ALIAS,FOLLOW_ALIAS_in_fromElement1030);
stream_ALIAS.Add(a);
@@ -3548,7 +3570,7 @@
}
- // HqlSqlWalker.g:223:30: (pf= FETCH )?
+ // HqlSqlWalker.g:224:30: (pf= FETCH )?
int alt26 = 2;
int LA26_0 = input.LA(1);
@@ -3559,10 +3581,10 @@
switch (alt26)
{
case 1 :
- // HqlSqlWalker.g:223:31: pf= FETCH
+ // HqlSqlWalker.g:224:31: pf= FETCH
{
_last = (IASTNode)input.LT(1);
- pf=(IASTNode)Match(input,FETCH,FOLLOW_FETCH_in_fromElement1032);
+ pf=(IASTNode)Match(input,FETCH,FOLLOW_FETCH_in_fromElement1037);
stream_FETCH.Add(pf);
@@ -3589,10 +3611,10 @@
RewriteRuleSubtreeStream stream_retval = new RewriteRuleSubtreeStream(adaptor, "rule retval", retval!=null ? retval.Tree : null);
root_0 = (IASTNode)adaptor.GetNilNode();
- // 224:3: -> {fromElement != null}? ^()
+ // 225:3: -> {fromElement != null}? ^()
if (fromElement != null)
{
- // HqlSqlWalker.g:224:29: ^()
+ // HqlSqlWalker.g:225:29: ^()
{
IASTNode root_1 = (IASTNode)adaptor.GetNilNode();
root_1 = (IASTNode)adaptor.BecomeRoot(fromElement, root_1);
@@ -3601,7 +3623,7 @@
}
}
- else // 225:3: ->
+ else // 226:3: ->
{
root_0 = null;
}
@@ -3610,10 +3632,10 @@
}
break;
case 2 :
- // HqlSqlWalker.g:226:4: je= joinElement
+ // HqlSqlWalker.g:227:4: je= joinElement
{
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_joinElement_in_fromElement1059);
+ PushFollow(FOLLOW_joinElement_in_fromElement1064);
je = joinElement();
state.followingStackPointer--;
@@ -3631,7 +3653,7 @@
RewriteRuleSubtreeStream stream_retval = new RewriteRuleSubtreeStream(adaptor, "rule retval", retval!=null ? retval.Tree : null);
root_0 = (IASTNode)adaptor.GetNilNode();
- // 227:3: ->
+ // 228:3: ->
{
root_0 = null;
}
@@ -3640,14 +3662,14 @@
}
break;
case 3 :
- // HqlSqlWalker.g:229:4: fe= FILTER_ENTITY a3= ALIAS
+ // HqlSqlWalker.g:230:4: fe= FILTER_ENTITY a3= ALIAS
{
_last = (IASTNode)input.LT(1);
- fe=(IASTNode)Match(input,FILTER_ENTITY,FOLLOW_FILTER_ENTITY_in_fromElement1074);
+ fe=(IASTNode)Match(input,FILTER_ENTITY,FOLLOW_FILTER_ENTITY_in_fromElement1079);
stream_FILTER_ENTITY.Add(fe);
_last = (IASTNode)input.LT(1);
- a3=(IASTNode)Match(input,ALIAS,FOLLOW_ALIAS_in_fromElement1078);
+ a3=(IASTNode)Match(input,ALIAS,FOLLOW_ALIAS_in_fromElement1083);
stream_ALIAS.Add(a3);
@@ -3663,9 +3685,9 @@
RewriteRuleSubtreeStream stream_retval = new RewriteRuleSubtreeStream(adaptor, "rule retval", retval!=null ? retval.Tree : null);
root_0 = (IASTNode)adaptor.GetNilNode();
- // 230:3: -> ^()
+ // 231:3: -> ^()
{
- // HqlSqlWalker.g:230:6: ^()
+ // HqlSqlWalker.g:231:6: ^()
{
IASTNode root_1 = (IASTNode)adaptor.GetNilNode();
root_1 = (IASTNode)adaptor.BecomeRoot(CreateFromFilterElement(fe,a3), root_1);
@@ -3706,7 +3728,7 @@
};
// $ANTLR start "joinElement"
- // HqlSqlWalker.g:233:1: joinElement : ^( JOIN (j= joinType )? (f= FETCH )? pRef= propertyRef (a= ALIAS )? (pf= FETCH )? ( ^( (with= WITH ) ( . )* ) )? ) ;
+ // HqlSqlWalker.g:234:1: joinElement : ^( JOIN (j= joinType )? (f= FETCH )? pRef= propertyRef (a= ALIAS )? (pf= FETCH )? ( ^( (with= WITH ) ( . )* ) )? ) ;
public HqlSqlWalker.joinElement_return joinElement() // throws RecognitionException [1]
{
HqlSqlWalker.joinElement_return retval = new HqlSqlWalker.joinElement_return();
@@ -3721,8 +3743,8 @@
IASTNode a = null;
IASTNode pf = null;
IASTNode with = null;
- IASTNode JOIN61 = null;
- IASTNode wildcard62 = null;
+ IASTNode JOIN62 = null;
+ IASTNode wildcard63 = null;
HqlSqlWalker.joinType_return j = default(HqlSqlWalker.joinType_return);
HqlSqlWalker.propertyRef_return pRef = default(HqlSqlWalker.propertyRef_return);
@@ -3732,13 +3754,13 @@
IASTNode a_tree=null;
IASTNode pf_tree=null;
IASTNode with_tree=null;
- IASTNode JOIN61_tree=null;
- IASTNode wildcard62_tree=null;
+ IASTNode JOIN62_tree=null;
+ IASTNode wildcard63_tree=null;
try
{
- // HqlSqlWalker.g:237:2: ( ^( JOIN (j= joinType )? (f= FETCH )? pRef= propertyRef (a= ALIAS )? (pf= FETCH )? ( ^( (with= WITH ) ( . )* ) )? ) )
- // HqlSqlWalker.g:237:4: ^( JOIN (j= joinType )? (f= FETCH )? pRef= propertyRef (a= ALIAS )? (pf= FETCH )? ( ^( (with= WITH ) ( . )* ) )? )
+ // HqlSqlWalker.g:238:2: ( ^( JOIN (j= joinType )? (f= FETCH )? pRef= propertyRef (a= ALIAS )? (pf= FETCH )? ( ^( (with= WITH ) ( . )* ) )? ) )
+ // HqlSqlWalker.g:238:4: ^( JOIN (j= joinType )? (f= FETCH )? pRef= propertyRef (a= ALIAS )? (pf= FETCH )? ( ^( (with= WITH ) ( . )* ) )? )
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -3747,15 +3769,15 @@
IASTNode _save_last_1 = _last;
IASTNode _first_1 = null;
IASTNode root_1 = (IASTNode)adaptor.GetNilNode();_last = (IASTNode)input.LT(1);
- JOIN61=(IASTNode)Match(input,JOIN,FOLLOW_JOIN_in_joinElement1107);
- JOIN61_tree = (IASTNode)adaptor.DupNode(JOIN61);
+ JOIN62=(IASTNode)Match(input,JOIN,FOLLOW_JOIN_in_joinElement1112);
+ JOIN62_tree = (IASTNode)adaptor.DupNode(JOIN62);
- root_1 = (IASTNode)adaptor.BecomeRoot(JOIN61_tree, root_1);
+ root_1 = (IASTNode)adaptor.BecomeRoot(JOIN62_tree, root_1);
Match(input, Token.DOWN, null);
- // HqlSqlWalker.g:237:11: (j= joinType )?
+ // HqlSqlWalker.g:238:11: (j= joinType )?
int alt28 = 2;
int LA28_0 = input.LA(1);
@@ -3766,10 +3788,10 @@
switch (alt28)
{
case 1 :
- // HqlSqlWalker.g:237:12: j= joinType
+ // HqlSqlWalker.g:238:12: j= joinType
{
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_joinType_in_joinElement1112);
+ PushFollow(FOLLOW_joinType_in_joinElement1117);
j = joinType();
state.followingStackPointer--;
@@ -3781,7 +3803,7 @@
}
- // HqlSqlWalker.g:237:56: (f= FETCH )?
+ // HqlSqlWalker.g:238:56: (f= FETCH )?
int alt29 = 2;
int LA29_0 = input.LA(1);
@@ -3792,10 +3814,10 @@
switch (alt29)
{
case 1 :
- // HqlSqlWalker.g:237:57: f= FETCH
+ // HqlSqlWalker.g:238:57: f= FETCH
{
_last = (IASTNode)input.LT(1);
- f=(IASTNode)Match(input,FETCH,FOLLOW_FETCH_in_joinElement1122);
+ f=(IASTNode)Match(input,FETCH,FOLLOW_FETCH_in_joinElement1127);
f_tree = (IASTNode)adaptor.DupNode(f);
adaptor.AddChild(root_1, f_tree);
@@ -3807,12 +3829,12 @@
}
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_propertyRef_in_joinElement1128);
+ PushFollow(FOLLOW_propertyRef_in_joinElement1133);
pRef = propertyRef();
state.followingStackPointer--;
adaptor.AddChild(root_1, pRef.Tree);
- // HqlSqlWalker.g:237:84: (a= ALIAS )?
+ // HqlSqlWalker.g:238:84: (a= ALIAS )?
int alt30 = 2;
int LA30_0 = input.LA(1);
@@ -3823,10 +3845,10 @@
switch (alt30)
{
case 1 :
- // HqlSqlWalker.g:237:85: a= ALIAS
+ // HqlSqlWalker.g:238:85: a= ALIAS
{
_last = (IASTNode)input.LT(1);
- a=(IASTNode)Match(input,ALIAS,FOLLOW_ALIAS_in_joinElement1133);
+ a=(IASTNode)Match(input,ALIAS,FOLLOW_ALIAS_in_joinElement1138);
a_tree = (IASTNode)adaptor.DupNode(a);
adaptor.AddChild(root_1, a_tree);
@@ -3837,7 +3859,7 @@
}
- // HqlSqlWalker.g:237:95: (pf= FETCH )?
+ // HqlSqlWalker.g:238:95: (pf= FETCH )?
int alt31 = 2;
int LA31_0 = input.LA(1);
@@ -3848,10 +3870,10 @@
switch (alt31)
{
case 1 :
- // HqlSqlWalker.g:237:96: pf= FETCH
+ // HqlSqlWalker.g:238:96: pf= FETCH
{
_last = (IASTNode)input.LT(1);
- pf=(IASTNode)Match(input,FETCH,FOLLOW_FETCH_in_joinElement1140);
+ pf=(IASTNode)Match(input,FETCH,FOLLOW_FETCH_in_joinElement1145);
pf_tree = (IASTNode)adaptor.DupNode(pf);
adaptor.AddChild(root_1, pf_tree);
@@ -3862,7 +3884,7 @@
}
- // HqlSqlWalker.g:237:107: ( ^( (with= WITH ) ( . )* ) )?
+ // HqlSqlWalker.g:238:107: ( ^( (with= WITH ) ( . )* ) )?
int alt33 = 2;
int LA33_0 = input.LA(1);
@@ -3873,17 +3895,17 @@
switch (alt33)
{
case 1 :
- // HqlSqlWalker.g:237:108: ^( (with= WITH ) ( . )* )
+ // HqlSqlWalker.g:238:108: ^( (with= WITH ) ( . )* )
{
_last = (IASTNode)input.LT(1);
{
IASTNode _save_last_2 = _last;
IASTNode _first_2 = null;
- IASTNode root_2 = (IASTNode)adaptor.GetNilNode();// HqlSqlWalker.g:237:110: (with= WITH )
- // HqlSqlWalker.g:237:111: with= WITH
+ IASTNode root_2 = (IASTNode)adaptor.GetNilNode();// HqlSqlWalker.g:238:110: (with= WITH )
+ // HqlSqlWalker.g:238:111: with= WITH
{
_last = (IASTNode)input.LT(1);
- with=(IASTNode)Match(input,WITH,FOLLOW_WITH_in_joinElement1149);
+ with=(IASTNode)Match(input,WITH,FOLLOW_WITH_in_joinElement1154);
with_tree = (IASTNode)adaptor.DupNode(with);
adaptor.AddChild(root_2, with_tree);
@@ -3896,7 +3918,7 @@
if ( input.LA(1) == Token.DOWN )
{
Match(input, Token.DOWN, null);
- // HqlSqlWalker.g:237:122: ( . )*
+ // HqlSqlWalker.g:238:122: ( . )*
do
{
int alt32 = 2;
@@ -3915,13 +3937,13 @@
switch (alt32)
{
case 1 :
- // HqlSqlWalker.g:237:122: .
+ // HqlSqlWalker.g:238:122: .
{
_last = (IASTNode)input.LT(1);
- wildcard62 = (IASTNode)input.LT(1);
+ wildcard63 = (IASTNode)input.LT(1);
MatchAny(input);
- wildcard62_tree = (IASTNode)adaptor.DupTree(wildcard62);
- adaptor.AddChild(root_2, wildcard62_tree);
+ wildcard63_tree = (IASTNode)adaptor.DupTree(wildcard63);
+ adaptor.AddChild(root_2, wildcard63_tree);
}
@@ -3984,7 +4006,7 @@
};
// $ANTLR start "joinType"
- // HqlSqlWalker.g:246:1: joinType returns [int j] : ( ( (left= LEFT | right= RIGHT ) (outer= OUTER )? ) | FULL | INNER );
+ // HqlSqlWalker.g:247:1: joinType returns [int j] : ( ( (left= LEFT | right= RIGHT ) (outer= OUTER )? ) | FULL | INNER );
public HqlSqlWalker.joinType_return joinType() // throws RecognitionException [1]
{
HqlSqlWalker.joinType_return retval = new HqlSqlWalker.joinType_return();
@@ -3998,21 +4020,21 @@
IASTNode left = null;
IASTNode right = null;
IASTNode outer = null;
- IASTNode FULL63 = null;
- IASTNode INNER64 = null;
+ IASTNode FULL64 = null;
+ IASTNode INNER65 = null;
IASTNode left_tree=null;
IASTNode right_tree=null;
IASTNode outer_tree=null;
- IASTNode FULL63_tree=null;
- IASTNode INNER64_tree=null;
+ IASTNode FULL64_tree=null;
+ IASTNode INNER65_tree=null;
retval.j = INNER;
try
{
- // HqlSqlWalker.g:250:2: ( ( (left= LEFT | right= RIGHT ) (outer= OUTER )? ) | FULL | INNER )
+ // HqlSqlWalker.g:251:2: ( ( (left= LEFT | right= RIGHT ) (outer= OUTER )? ) | FULL | INNER )
int alt36 = 3;
switch ( input.LA(1) )
{
@@ -4042,14 +4064,14 @@
switch (alt36)
{
case 1 :
- // HqlSqlWalker.g:250:4: ( (left= LEFT | right= RIGHT ) (outer= OUTER )? )
+ // HqlSqlWalker.g:251:4: ( (left= LEFT | right= RIGHT ) (outer= OUTER )? )
{
root_0 = (IASTNode)adaptor.GetNilNode();
- // HqlSqlWalker.g:250:4: ( (left= LEFT | right= RIGHT ) (outer= OUTER )? )
- // HqlSqlWalker.g:250:6: (left= LEFT | right= RIGHT ) (outer= OUTER )?
+ // HqlSqlWalker.g:251:4: ( (left= LEFT | right= RIGHT ) (outer= OUTER )? )
+ // HqlSqlWalker.g:251:6: (left= LEFT | right= RIGHT ) (outer= OUTER )?
{
- // HqlSqlWalker.g:250:6: (left= LEFT | right= RIGHT )
+ // HqlSqlWalker.g:251:6: (left= LEFT | right= RIGHT )
int alt34 = 2;
int LA34_0 = input.LA(1);
@@ -4071,10 +4093,10 @@
switch (alt34)
{
case 1 :
- // HqlSqlWalker.g:250:7: left= LEFT
+ // HqlSqlWalker.g:251:7: left= LEFT
{
_last = (IASTNode)input.LT(1);
- left=(IASTNode)Match(input,LEFT,FOLLOW_LEFT_in_joinType1190);
+ left=(IASTNode)Match(input,LEFT,FOLLOW_LEFT_in_joinType1195);
left_tree = (IASTNode)adaptor.DupNode(left);
adaptor.AddChild(root_0, left_tree);
@@ -4083,10 +4105,10 @@
}
break;
case 2 :
- // HqlSqlWalker.g:250:19: right= RIGHT
+ // HqlSqlWalker.g:251:19: right= RIGHT
{
_last = (IASTNode)input.LT(1);
- right=(IASTNode)Match(input,RIGHT,FOLLOW_RIGHT_in_joinType1196);
+ right=(IASTNode)Match(input,RIGHT,FOLLOW_RIGHT_in_joinType1201);
right_tree = (IASTNode)adaptor.DupNode(right);
adaptor.AddChild(root_0, right_tree);
@@ -4097,7 +4119,7 @@
}
- // HqlSqlWalker.g:250:32: (outer= OUTER )?
+ // HqlSqlWalker.g:251:32: (outer= OUTER )?
int alt35 = 2;
int LA35_0 = input.LA(1);
@@ -4108,10 +4130,10 @@
switch (alt35)
{
case 1 :
- // HqlSqlWalker.g:250:33: outer= OUTER
+ // HqlSqlWalker.g:251:33: outer= OUTER
{
_last = (IASTNode)input.LT(1);
- outer=(IASTNode)Match(input,OUTER,FOLLOW_OUTER_in_joinType1202);
+ outer=(IASTNode)Match(input,OUTER,FOLLOW_OUTER_in_joinType1207);
outer_tree = (IASTNode)adaptor.DupNode(outer);
adaptor.AddChild(root_0, outer_tree);
@@ -4134,15 +4156,15 @@
}
break;
case 2 :
- // HqlSqlWalker.g:256:4: FULL
+ // HqlSqlWalker.g:257:4: FULL
{
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- FULL63=(IASTNode)Match(input,FULL,FOLLOW_FULL_in_joinType1216);
- FULL63_tree = (IASTNode)adaptor.DupNode(FULL63);
+ FULL64=(IASTNode)Match(input,FULL,FOLLOW_FULL_in_joinType1221);
+ FULL64_tree = (IASTNode)adaptor.DupNode(FULL64);
- adaptor.AddChild(root_0, FULL63_tree);
+ adaptor.AddChild(root_0, FULL64_tree);
retval.j = FULL;
@@ -4151,15 +4173,15 @@
}
break;
case 3 :
- // HqlSqlWalker.g:259:4: INNER
+ // HqlSqlWalker.g:260:4: INNER
{
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- INNER64=(IASTNode)Match(input,INNER,FOLLOW_INNER_in_joinType1223);
- INNER64_tree = (IASTNode)adaptor.DupNode(INNER64);
+ INNER65=(IASTNode)Match(input,INNER,FOLLOW_INNER_in_joinType1228);
+ INNER65_tree = (IASTNode)adaptor.DupNode(INNER65);
- adaptor.AddChild(root_0, INNER64_tree);
+ adaptor.AddChild(root_0, INNER65_tree);
retval.j = INNER;
@@ -4196,7 +4218,7 @@
};
// $ANTLR start "path"
- // HqlSqlWalker.g:266:1: path returns [String p] : (a= identifier | ^( DOT x= path y= identifier ) );
+ // HqlSqlWalker.g:267:1: path returns [String p] : (a= identifier | ^( DOT x= path y= identifier ) );
public HqlSqlWalker.path_return path() // throws RecognitionException [1]
{
HqlSqlWalker.path_return retval = new HqlSqlWalker.path_return();
@@ -4207,7 +4229,7 @@
IASTNode _first_0 = null;
IASTNode _last = null;
- IASTNode DOT65 = null;
+ IASTNode DOT66 = null;
HqlSqlWalker.identifier_return a = default(HqlSqlWalker.identifier_return);
HqlSqlWalker.path_return x = default(HqlSqlWalker.path_return);
@@ -4215,11 +4237,11 @@
HqlSqlWalker.identifier_return y = default(HqlSqlWalker.identifier_return);
- IASTNode DOT65_tree=null;
+ IASTNode DOT66_tree=null;
try
{
- // HqlSqlWalker.g:267:2: (a= identifier | ^( DOT x= path y= identifier ) )
+ // HqlSqlWalker.g:268:2: (a= identifier | ^( DOT x= path y= identifier ) )
int alt37 = 2;
int LA37_0 = input.LA(1);
@@ -4241,12 +4263,12 @@
switch (alt37)
{
case 1 :
- // HqlSqlWalker.g:267:4: a= identifier
+ // HqlSqlWalker.g:268:4: a= identifier
{
root_0 = (IASTNode)adaptor.GetNilNode();
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_identifier_in_path1245);
+ PushFollow(FOLLOW_identifier_in_path1250);
a = identifier();
state.followingStackPointer--;
@@ -4256,7 +4278,7 @@
}
break;
case 2 :
- // HqlSqlWalker.g:268:4: ^( DOT x= path y= identifier )
+ // HqlSqlWalker.g:269:4: ^( DOT x= path y= identifier )
{
root_0 = (IASTNode)adaptor.GetNilNode();
@@ -4265,22 +4287,22 @@
IASTNode _save_last_1 = _last;
IASTNode _first_1 = null;
IASTNode root_1 = (IASTNode)adaptor.GetNilNode();_last = (IASTNode)input.LT(1);
- DOT65=(IASTNode)Match(input,DOT,FOLLOW_DOT_in_path1253);
- DOT65_tree = (IASTNode)adaptor.DupNode(DOT65);
+ DOT66=(IASTNode)Match(input,DOT,FOLLOW_DOT_in_path1258);
+ DOT66_tree = (IASTNode)adaptor.DupNode(DOT66);
- root_1 = (IASTNode)adaptor.BecomeRoot(DOT65_tree, root_1);
+ root_1 = (IASTNode)adaptor.BecomeRoot(DOT66_tree, root_1);
Match(input, Token.DOWN, null);
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_path_in_path1257);
+ PushFollow(FOLLOW_path_in_path1262);
x = path();
state.followingStackPointer--;
adaptor.AddChild(root_1, x.Tree);
_last = (IASTNode)input.LT(1);
- PushFollow(FOLLOW_identifier_in_path1261);
+ PushFoll...
[truncated message content] |
