fix: #213 flinksql expression syntax (#215)

* fix: #213 use uid to replace SLASH_TEXT in dtFilePath rule * test: #213 flinksql syntax expression --------- Co-authored-by: liuyi <[email protected]>
DTStack · Nov 23, 2023 · 6bbcb3c · 6bbcb3c
1 parent 00b66cc
commit 6bbcb3c
Show file tree

Hide file tree

Showing 13 changed files with 5,254 additions and 5,298 deletions.
diff --git a/src/grammar/flinksql/FlinkSqlLexer.g4 b/src/grammar/flinksql/FlinkSqlLexer.g4
@@ -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]*;

diff --git a/src/grammar/flinksql/FlinkSqlParser.g4 b/src/grammar/flinksql/FlinkSqlParser.g4
@@ -101,7 +101,7 @@ dtAddStatement
     ;
 
 dtFilePath
-    : SLASH_TEXT+
+    : (SLASH_SIGN? uid)+
     ;
 
 // Create statements
@@ -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

diff --git a/src/lib/flinksql/FlinkSqlLexer.interp b/src/lib/flinksql/FlinkSqlLexer.interp
diff --git a/src/lib/flinksql/FlinkSqlLexer.tokens b/src/lib/flinksql/FlinkSqlLexer.tokens
@@ -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

diff --git a/src/lib/flinksql/FlinkSqlLexer.ts b/src/lib/flinksql/FlinkSqlLexer.ts
diff --git a/src/lib/flinksql/FlinkSqlParser.interp b/src/lib/flinksql/FlinkSqlParser.interp
diff --git a/src/lib/flinksql/FlinkSqlParser.tokens b/src/lib/flinksql/FlinkSqlParser.tokens
@@ -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