HQLPARSER-30 Change dependency to upstream ANTLR 3.4 (standard builds)

hibernate · Oct 2, 2013 · e31a385 · e31a385
1 parent 59d4b89
commit e31a385
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/parser/src/main/java/org/hibernate/hql/QueryParser.java b/parser/src/main/java/org/hibernate/hql/QueryParser.java
@@ -20,6 +20,8 @@
  */
 package org.hibernate.hql;
 
+import java.util.List;
+
 import org.antlr.runtime.ANTLRStringStream;
 import org.antlr.runtime.CommonTokenStream;
 import org.antlr.runtime.RecognitionException;
@@ -98,7 +100,7 @@ private String getUnconsumedTokens(CommonTokenStream tokens) {
 
 		StringBuilder nonEofEndingTokens = new StringBuilder();
 
-		for ( Token endToken : tokens.getTokens( tokens.index(), tokens.size() - 1 ) ) {
+		for ( Token endToken : (List<Token>) tokens.getTokens( tokens.index(), tokens.size() - 1 ) ) {
 			// Ignore <EOF> tokens as they might be inserted by the parser
 			if ( !"<EOF>".equals( endToken.getText() ) ) {
 				nonEofEndingTokens.append( endToken.getText() );

diff --git a/testing/src/main/java/org/hibernate/hql/testing/internal/parser/GrammarRuleTestRunner.java b/testing/src/main/java/org/hibernate/hql/testing/internal/parser/GrammarRuleTestRunner.java
@@ -25,6 +25,7 @@
 import java.io.PrintStream;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.List;
 
 import org.antlr.runtime.ANTLRStringStream;
 import org.antlr.runtime.CharStream;
@@ -36,7 +37,6 @@
 import org.antlr.runtime.Token;
 import org.antlr.runtime.TokenStream;
 import org.antlr.runtime.tree.CommonTree;
-
 import org.hibernate.hql.testing.internal.model.GrammarRuleTestDescriptor;
 import org.hibernate.hql.testing.internal.model.GrammarRuleTestGroupDescriptor;
 import org.hibernate.hql.testing.internal.model.GrammarTestDescriptor;
@@ -180,7 +180,7 @@ private String getUnconsumedTokens(CommonTokenStream tokens) {
 
 		StringBuilder nonEofEndingTokens = new StringBuilder();
 
-		for ( Token endToken : tokens.getTokens( tokens.index(), tokens.size() - 1 ) ) {
+		for ( Token endToken : (List<Token>) tokens.getTokens( tokens.index(), tokens.size() - 1 ) ) {
 			// Ignore <EOF> tokens as they might be inserted by the parser
 			if ( !"<EOF>".equals( endToken.getText() ) ) {
 				nonEofEndingTokens.append( endToken.getText() );