HHH-19240 Fold ComparisonPredicate into BinaryExpressionPredicate rule

(cherry picked from commit 5615bca)

Author: beikov

hibernate-core/src/main/antlr/org/hibernate/grammars/hql/HqlParser.g4

@@ -663,8 +663,15 @@ predicate
 	| expression NOT? IN inList													# InPredicate
 	| expression NOT? BETWEEN expression AND expression							# BetweenPredicate
 	| expression NOT? (LIKE | ILIKE) expression likeEscape?						# LikePredicate
-	| expression NOT? (CONTAINS | INCLUDES | INTERSECTS) expression  			# BinaryExpressionPredicate
-	| expression comparisonOperator expression									# ComparisonPredicate
+	| expression
+	    ( NOT? (CONTAINS | INCLUDES | INTERSECTS)
+	    | EQUAL
+        | NOT_EQUAL
+        | GREATER
+        | GREATER_EQUAL
+        | LESS
+        | LESS_EQUAL
+	    ) expression  			                                                # BinaryExpressionPredicate
 	| EXISTS collectionQuantifier LEFT_PAREN simplePath RIGHT_PAREN				# ExistsCollectionPartPredicate
 	| EXISTS expression															# ExistsPredicate
 	| NOT predicate																# NegatedPredicate
@@ -673,18 +680,6 @@ predicate
 	| expression																# BooleanExpressionPredicate
 	;
 
-/**
- * An operator which compares values for equality or order
- */
-comparisonOperator
-	: EQUAL
-	| NOT_EQUAL
-	| GREATER
-	| GREATER_EQUAL
-	| LESS
-	| LESS_EQUAL
-	;
-
 /**
  * Any right operand of the 'in' operator
  *

hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java

@@ -2559,40 +2559,23 @@ public SqmPredicate visitBinaryExpressionPredicate(HqlParser.BinaryExpressionPre
 								);
 				return new SqmBooleanExpressionPredicate( contains, negated, creationContext.getNodeBuilder() );
 			}
+			case HqlParser.EQUAL:
+				return createComparisonPredicate( ComparisonOperator.EQUAL, lhsCtx, rhsCtx );
+			case HqlParser.NOT_EQUAL:
+				return createComparisonPredicate( ComparisonOperator.NOT_EQUAL, lhsCtx, rhsCtx );
+			case HqlParser.LESS:
+				return createComparisonPredicate( ComparisonOperator.LESS_THAN, lhsCtx, rhsCtx );
+			case HqlParser.LESS_EQUAL:
+				return createComparisonPredicate( ComparisonOperator.LESS_THAN_OR_EQUAL, lhsCtx, rhsCtx );
+			case HqlParser.GREATER:
+				return createComparisonPredicate( ComparisonOperator.GREATER_THAN, lhsCtx, rhsCtx );
+			case HqlParser.GREATER_EQUAL:
+				return createComparisonPredicate( ComparisonOperator.GREATER_THAN_OR_EQUAL, lhsCtx, rhsCtx );
 			default:
 				throw new AssertionError( "Unknown binary expression predicate: " + operationSymbol );
 		}
 	}
 
-	@Override
-	public Object visitComparisonOperator(HqlParser.ComparisonOperatorContext ctx) {
-		final TerminalNode firstToken = (TerminalNode) ctx.getChild( 0 );
-		switch ( firstToken.getSymbol().getType() ) {
-			case HqlLexer.EQUAL:
-				return ComparisonOperator.EQUAL;
-			case HqlLexer.NOT_EQUAL:
-				return ComparisonOperator.NOT_EQUAL;
-			case HqlLexer.LESS:
-				return ComparisonOperator.LESS_THAN;
-			case HqlLexer.LESS_EQUAL:
-				return ComparisonOperator.LESS_THAN_OR_EQUAL;
-			case HqlLexer.GREATER:
-				return ComparisonOperator.GREATER_THAN;
-			case HqlLexer.GREATER_EQUAL:
-				return ComparisonOperator.GREATER_THAN_OR_EQUAL;
-			default:
-				throw new ParsingException("Unrecognized comparison operator");
-		}
-	}
-
-	@Override
-	public SqmPredicate visitComparisonPredicate(HqlParser.ComparisonPredicateContext ctx) {
-		final ComparisonOperator comparisonOperator = (ComparisonOperator) ctx.comparisonOperator().accept( this );
-		final HqlParser.ExpressionContext leftExpressionContext = ctx.expression( 0 );
-		final HqlParser.ExpressionContext rightExpressionContext = ctx.expression( 1 );
-		return createComparisonPredicate( comparisonOperator, leftExpressionContext, rightExpressionContext );
-	}
-
 	@Override
 	public SqmPredicate visitIsDistinctFromPredicate(HqlParser.IsDistinctFromPredicateContext ctx) {
 		final HqlParser.ExpressionContext leftExpressionContext = ctx.expression( 0 );