@@ -3680,10 +3680,9 @@ JsonFunction JsonFunction() : {
3680
3680
(
3681
3681
// --- First Element
3682
3682
[ "KEY" { usingKeyKeyword = true; } ]
3683
- keyToken = <S_IDENTIFIER>
3683
+ ( keyToken = <DT_ZONE> | keyToken = <S_DOUBLE> | keyToken = <S_LONG> | keyToken = <S_HEX> | keyToken = <S_CHAR_LITERAL> | keyToken = < S_IDENTIFIER> | keyToken = <S_QUOTED_IDENTIFIER> )
3684
3684
( ":" | "VALUE" { usingValueKeyword = true; } )
3685
- // token = <DT_ZONE> | <S_DOUBLE> | <S_LONG> | <S_HEX> | <S_CHAR_LITERAL> { result.setValue( token.image ); }
3686
- valueToken = <S_IDENTIFIER> { keyValuePair = new JsonKeyValuePair( keyToken.image, valueToken.image, usingKeyKeyword, usingValueKeyword ); result.add(keyValuePair); }
3685
+ ( valueToken = <S_IDENTIFIER> | valueToken = <S_QUOTED_IDENTIFIER> ) { keyValuePair = new JsonKeyValuePair( keyToken.image, valueToken.image, usingKeyKeyword, usingValueKeyword ); result.add(keyValuePair); }
3687
3686
3688
3687
[ <K_FORMAT> <K_JSON> { keyValuePair.setUsingFormatJson( true ); } ]
3689
3688
@@ -3772,10 +3771,9 @@ JsonAggregateFunction JsonAggregateFunction() : {
3772
3771
( <K_JSON_OBJECTAGG>
3773
3772
"(" { result.setType( JsonFunctionType.OBJECT ); }
3774
3773
[ "KEY" { result.setUsingKeyKeyword( true ); } ]
3775
- token = <S_IDENTIFIER> { result.setKey( token.image ); }
3774
+ ( token = <DT_ZONE> | token = <S_DOUBLE> | token = <S_LONG> | token = <S_HEX> | token = <S_CHAR_LITERAL> | token = < S_IDENTIFIER> | token = <S_QUOTED_IDENTIFIER> ) { result.setKey( token.image ); }
3776
3775
( ":" | "VALUE" {result.setUsingValueKeyword( true ); } )
3777
- // token = <DT_ZONE> | <S_DOUBLE> | <S_LONG> | <S_HEX> | <S_CHAR_LITERAL> { result.setValue( token.image ); }
3778
- token = <S_IDENTIFIER> { result.setValue( token.image ); }
3776
+ ( token = <S_IDENTIFIER> | token = <S_QUOTED_IDENTIFIER> ) { result.setValue( token.image ); }
3779
3777
3780
3778
[ <K_FORMAT> <K_JSON> { result.setUsingFormatJson( true ); } ]
3781
3779
0 commit comments