Simplify aggregateDistinctAll rule in Hql.g (#3374)

bahusoid · web-flow · commit d578b1dd26f5 · 2023-07-24T18:06:45.000+02:00
diff --git a/src/NHibernate/Hql/Ast/ANTLR/Hql.g b/src/NHibernate/Hql/Ast/ANTLR/Hql.g
@@ -628,12 +628,11 @@ aggregateArgument
 	;
 
 aggregateDistinctAll
-	: ( distinctAll aggregateArgument ) => (distinctAll aggregateArgument)
-	| aggregateArgument
+	: ( distinctAll? aggregateArgument )
 	;
 
 distinctAll
-	: ( DISTINCT | ALL ) 
+	: {input.LA(1) == DISTINCT || input.LA(1) == ALL}? ( DISTINCT | ALL ) 
 	;
 
 //## collection: ( OPEN query CLOSE ) | ( 'elements'|'indices' OPEN path CLOSE );

Original file line number	Diff line number	Diff line change
`@@ -628,12 +628,11 @@ aggregateArgument`
`628`	`628`	`;`
`629`	`629`
`630`	`630`	`aggregateDistinctAll`
`631`		`- : ( distinctAll aggregateArgument ) => (distinctAll aggregateArgument)`
`632`		`- \| aggregateArgument`
	`631`	`+ : ( distinctAll? aggregateArgument )`
`633`	`632`	`;`
`634`	`633`
`635`	`634`	`distinctAll`
`636`		`- : ( DISTINCT \| ALL )`
	`635`	`+ : {input.LA(1) == DISTINCT \|\| input.LA(1) == ALL}? ( DISTINCT \| ALL )`
`637`	`636`	`;`
`638`	`637`
`639`	`638`	`//## collection: ( OPEN query CLOSE ) \| ( 'elements'\|'indices' OPEN path CLOSE );`