Skip to content

fix: #213 flinksql expression syntax #215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HaydenOrz merged 2 commits into from
Nov 23, 2023
Merged

fix: #213 flinksql expression syntax #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e54bfa
fix: #213 use uid to replace SLASH_TEXT in dtFilePath rule
liuxy0551 Nov 23, 2023
cfa0c70
test: #213 flinksql syntax expression
liuxy0551 Nov 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/grammar/flinksql/FlinkSqlLexer.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,9 +583,7 @@ REAL_LITERAL: (DEC_DIGIT+)? '.' DEC_DIGIT+
| DEC_DIGIT+ EXPONENT_NUM_PART;
BIT_STRING: BIT_STRING_L;
ID_LITERAL: ID_LITERAL_FRAG;
SLASH_TEXT: SLASH_TEXT_FRAG;

fragment SLASH_TEXT_FRAG: [/\\] (~([/\\ ] | '(' | ')' | ';'))*;
fragment JAR_FILE_PARTTARN: '`' ( '\\'. | '``' | ~('`'|'\\'))* '`';
fragment EXPONENT_NUM_PART: 'E' [-+]? DEC_DIGIT+;
fragment ID_LITERAL_FRAG: [A-Z_0-9a-z]*?[A-Z_a-z]+?[A-Z_0-9a-z]*;
Expand Down
3 changes: 1 addition & 2 deletions src/grammar/flinksql/FlinkSqlParser.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ dtAddStatement
;

dtFilePath
: SLASH_TEXT+
: (SLASH_SIGN? uid)+
;

// Create statements
Expand Down Expand Up @@ -698,7 +698,6 @@ valueExpression
| left=valueExpression operator=BIT_XOR_OP right=valueExpression #arithmeticBinary
| left=valueExpression operator=BIT_OR_OP right=valueExpression #arithmeticBinary
| left=valueExpression comparisonOperator right=valueExpression #comparison
| left=valueExpression right=SLASH_TEXT #arithmeticBinaryAlternate
;

primaryExpression
Expand Down
6 changes: 1 addition & 5 deletions src/lib/flinksql/FlinkSqlLexer.interp
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion src/lib/flinksql/FlinkSqlLexer.tokens
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,6 @@ DIG_LITERAL=538
REAL_LITERAL=539
BIT_STRING=540
ID_LITERAL=541
SLASH_TEXT=542
'ABS'=4
'ALL'=5
'ALLOCATE'=6
Expand Down
5,233 changes: 2,611 additions & 2,622 deletions src/lib/flinksql/FlinkSqlLexer.ts
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions src/lib/flinksql/FlinkSqlParser.interp
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion src/lib/flinksql/FlinkSqlParser.tokens
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,6 @@ DIG_LITERAL=538
REAL_LITERAL=539
BIT_STRING=540
ID_LITERAL=541
SLASH_TEXT=542
'ABS'=4
'ALL'=5
'ALLOCATE'=6
Expand Down
Loading