[Hibernate-commits] Hibernate Code SVN: r10073 - branches/HQL_ANTLR_2/Hibernate3/g2

[<hib...@li...>]

Author: ste...@jb...
Date: 2006-06-30 02:12:36 -0400 (Fri, 30 Jun 2006)
New Revision: 10073

Modified:
   branches/HQL_ANTLR_2/Hibernate3/g2/parse.g
   branches/HQL_ANTLR_2/Hibernate3/g2/resolve.g
Log:
added PROP_FETCH to remove some non-determinism

Modified: branches/HQL_ANTLR_2/Hibernate3/g2/parse.g
===================================================================
--- branches/HQL_ANTLR_2/Hibernate3/g2/parse.g	2006-06-30 06:07:52 UTC (rev 10072)
+++ branches/HQL_ANTLR_2/Hibernate3/g2/parse.g	2006-06-30 06:12:36 UTC (rev 10073)
@@ -125,6 +125,7 @@
 	ENTITY_NAME;
 	COLLECTION_ROLE;
 	CLASS_NAME;
+	PROP_FETCH;
 
 	// Literal tokens.
 	CONSTANT;
@@ -339,7 +340,9 @@
     ;
 
 propertyFetch
-	: FETCH ALL! PROPERTIES!
+	: FETCH ALL! PROPERTIES! {
+		#propertyFetch = #( [PROP_FETCH, "prop-fetch"] );
+	}
 	;
 
 

Modified: branches/HQL_ANTLR_2/Hibernate3/g2/resolve.g
===================================================================
--- branches/HQL_ANTLR_2/Hibernate3/g2/resolve.g	2006-06-30 06:07:52 UTC (rev 10072)
+++ branches/HQL_ANTLR_2/Hibernate3/g2/resolve.g	2006-06-30 06:12:36 UTC (rev 10073)
@@ -143,7 +143,7 @@
 	;
 
 entityPersisterReference!
-	: en:ENTITY_NAME (a:ALIAS)? (pf:FETCH)? {
+	: en:ENTITY_NAME (a:ALIAS)? (pf:PROP_FETCH)? {
 		#entityPersisterReference = buildEntityPersisterReference( en, a, pf );
 	}
 	;
@@ -156,7 +156,7 @@
 	: e:entityPersisterReference (on:ON)? {
 		handleAdHocJoinNode( #e, joinType, on );
 	}
-	| (f:FETCH)? (a:ALIAS)? (pf:FETCH)? { pushExplicitJoinContext( joinType, #f, #a, #pf ); } prop:propertyPath (with:WITH)? {
+	| (f:FETCH)? (a:ALIAS)? (pf:PROP_FETCH)? { pushExplicitJoinContext( joinType, #f, #a, #pf ); } prop:propertyPath (with:WITH)? {
 		popExplicitJoinContext();
 	}
 	;