[hibernate-commits] Hibernate SVN: r16349 - core/branches/antlr3/src/main/antlr3/org/hibernate/sql/ast/phase/hql/parse.

[hibernate-commits at lists.jboss.org]

Author: porcelli
Date: 2009-04-15 20:41:18 -0400 (Wed, 15 Apr 2009)
New Revision: 16349

Modified:
   core/branches/antlr3/src/main/antlr3/org/hibernate/sql/ast/phase/hql/parse/HQL.g
   core/branches/antlr3/src/main/antlr3/org/hibernate/sql/ast/phase/hql/parse/HQLTreeWalker.g
Log:
TreeWalker and Parser working together

Modified: core/branches/antlr3/src/main/antlr3/org/hibernate/sql/ast/phase/hql/parse/HQL.g
===================================================================
--- core/branches/antlr3/src/main/antlr3/org/hibernate/sql/ast/phase/hql/parse/HQL.g	2009-04-16 00:18:25 UTC (rev 16348)
+++ core/branches/antlr3/src/main/antlr3/org/hibernate/sql/ast/phase/hql/parse/HQL.g	2009-04-16 00:41:18 UTC (rev 16349)
@@ -650,8 +650,8 @@
 			-> {isNegated}? ^(NOT_LIKE[$not_key.start, "not like"] $relationalExpression concatenation likeEscape?) 
 			-> ^(like_key $relationalExpression concatenation likeEscape?)
 		|	member_of_key propertyReference
-			-> {isNegated}? ^(NOT_IN[$not_key.start, "not in"] ^(IN_LIST ^(QUERY ^(SELECT_FROM ^(FROM propertyReference)))))
-			-> ^(IN[$member_of_key.start, "in"] ^(IN_LIST ^(QUERY ^(SELECT_FROM ^(FROM propertyReference)))))
+			-> {isNegated}? ^(NOT_IN[$not_key.start, "not in"] $relationalExpression ^(IN_LIST ^(QUERY ^(QUERY_SPEC ^(SELECT_FROM ^(FROM propertyReference))))))
+			-> ^(IN[$member_of_key.start, "in"] $relationalExpression ^(IN_LIST ^(QUERY ^(QUERY_SPEC ^(SELECT_FROM ^(FROM propertyReference))))))
 		)
 	)?
 	;

Modified: core/branches/antlr3/src/main/antlr3/org/hibernate/sql/ast/phase/hql/parse/HQLTreeWalker.g
===================================================================
--- core/branches/antlr3/src/main/antlr3/org/hibernate/sql/ast/phase/hql/parse/HQLTreeWalker.g	2009-04-16 00:18:25 UTC (rev 16348)
+++ core/branches/antlr3/src/main/antlr3/org/hibernate/sql/ast/phase/hql/parse/HQLTreeWalker.g	2009-04-16 00:41:18 UTC (rev 16349)
@@ -117,7 +117,9 @@
 	;
 
 persisterSpaces
-	:	^(PERSISTER_SPACE persisterSpace)
+	:	propertyReference
+	|	^(GENERIC_ELEMENT identPrimary)
+	|	^(PERSISTER_SPACE persisterSpace)
 	;
 
 persisterSpace