Remove unnecessary parens in grammar
This commit is contained in:
parent
3f95c2eadb
commit
375076df35
|
@ -65,8 +65,7 @@ intoSpec
|
||||||
;
|
;
|
||||||
|
|
||||||
targetFieldsSpec
|
targetFieldsSpec
|
||||||
:
|
: LEFT_PAREN dotIdentifierSequence (COMMA dotIdentifierSequence)* RIGHT_PAREN
|
||||||
LEFT_PAREN dotIdentifierSequence (COMMA dotIdentifierSequence)* RIGHT_PAREN
|
|
||||||
;
|
;
|
||||||
|
|
||||||
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
@ -90,7 +89,7 @@ fromClauseSpace
|
||||||
;
|
;
|
||||||
|
|
||||||
pathRoot
|
pathRoot
|
||||||
: entityName (identificationVariableDef)?
|
: entityName identificationVariableDef?
|
||||||
;
|
;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -110,15 +109,15 @@ identificationVariableDef
|
||||||
;
|
;
|
||||||
|
|
||||||
crossJoin
|
crossJoin
|
||||||
: CROSS JOIN pathRoot (identificationVariableDef)?
|
: CROSS JOIN pathRoot identificationVariableDef?
|
||||||
;
|
;
|
||||||
|
|
||||||
jpaCollectionJoin
|
jpaCollectionJoin
|
||||||
: COMMA IN LEFT_PAREN path RIGHT_PAREN (identificationVariableDef)?
|
: COMMA IN LEFT_PAREN path RIGHT_PAREN identificationVariableDef?
|
||||||
;
|
;
|
||||||
|
|
||||||
qualifiedJoin
|
qualifiedJoin
|
||||||
: joinTypeQualifier JOIN FETCH? qualifiedJoinRhs (qualifiedJoinPredicate)?
|
: joinTypeQualifier JOIN FETCH? qualifiedJoinRhs qualifiedJoinPredicate?
|
||||||
;
|
;
|
||||||
|
|
||||||
joinTypeQualifier
|
joinTypeQualifier
|
||||||
|
@ -127,7 +126,7 @@ joinTypeQualifier
|
||||||
;
|
;
|
||||||
|
|
||||||
qualifiedJoinRhs
|
qualifiedJoinRhs
|
||||||
: path (identificationVariableDef)?
|
: path identificationVariableDef?
|
||||||
;
|
;
|
||||||
|
|
||||||
qualifiedJoinPredicate
|
qualifiedJoinPredicate
|
||||||
|
@ -148,7 +147,7 @@ selectionList
|
||||||
;
|
;
|
||||||
|
|
||||||
selection
|
selection
|
||||||
: selectExpression (resultIdentifier)?
|
: selectExpression resultIdentifier?
|
||||||
;
|
;
|
||||||
|
|
||||||
selectExpression
|
selectExpression
|
||||||
|
@ -251,7 +250,7 @@ syntacticDomainPath
|
||||||
* cases: TREAT, KEY, ELEMENTS, VALUES
|
* cases: TREAT, KEY, ELEMENTS, VALUES
|
||||||
*/
|
*/
|
||||||
generalPathFragment
|
generalPathFragment
|
||||||
: dotIdentifierSequence (indexedPathAccessFragment)?
|
: dotIdentifierSequence indexedPathAccessFragment?
|
||||||
;
|
;
|
||||||
|
|
||||||
indexedPathAccessFragment
|
indexedPathAccessFragment
|
||||||
|
@ -259,15 +258,15 @@ indexedPathAccessFragment
|
||||||
;
|
;
|
||||||
|
|
||||||
treatedNavigablePath
|
treatedNavigablePath
|
||||||
: TREAT LEFT_PAREN path AS dotIdentifierSequence RIGHT_PAREN (pathContinuation)?
|
: TREAT LEFT_PAREN path AS dotIdentifierSequence RIGHT_PAREN pathContinuation?
|
||||||
;
|
;
|
||||||
|
|
||||||
collectionElementNavigablePath
|
collectionElementNavigablePath
|
||||||
: (VALUE | ELEMENTS) LEFT_PAREN path RIGHT_PAREN (pathContinuation)?
|
: (VALUE | ELEMENTS) LEFT_PAREN path RIGHT_PAREN pathContinuation?
|
||||||
;
|
;
|
||||||
|
|
||||||
mapKeyNavigablePath
|
mapKeyNavigablePath
|
||||||
: KEY LEFT_PAREN path RIGHT_PAREN (pathContinuation)?
|
: KEY LEFT_PAREN path RIGHT_PAREN pathContinuation?
|
||||||
;
|
;
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue