Browse Source

字符串拼接允许_-a0

menglu 3 years ago
parent
commit
165490e9d7

+ 20 - 29
ibms-data-sdk/src/main/java/com/sagacloud/advanced/expression/AdvancedExpressionLexer.java

@@ -1,4 +1,4 @@
-// $ANTLR 3.1 AdvancedExpression.g 2021-05-25 17:56:09
+// $ANTLR 3.1 AdvancedExpression.g 2021-06-15 14:44:27
 
 package com.sagacloud.advanced.expression;
 
@@ -1588,26 +1588,17 @@ public class AdvancedExpressionLexer extends Lexer {
         try {
             int _type = STRINGVALUE;
             int _channel = DEFAULT_TOKEN_CHANNEL;
-            // AdvancedExpression.g:170:13: ( '\"' ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* '\"' )
-            // AdvancedExpression.g:170:15: '\"' ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* '\"'
+            // AdvancedExpression.g:170:13: ( '\"' ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '-' )* '\"' )
+            // AdvancedExpression.g:170:15: '\"' ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '-' )* '\"'
             {
             match('\"'); 
-            if ( (input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
-                input.consume();
-
-            }
-            else {
-                MismatchedSetException mse = new MismatchedSetException(null,input);
-                recover(mse);
-                throw mse;}
-
-            // AdvancedExpression.g:170:42: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*
+            // AdvancedExpression.g:170:19: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '-' )*
             loop12:
             do {
                 int alt12=2;
                 int LA12_0 = input.LA(1);
 
-                if ( ((LA12_0>='0' && LA12_0<='9')||(LA12_0>='A' && LA12_0<='Z')||LA12_0=='_'||(LA12_0>='a' && LA12_0<='z')) ) {
+                if ( (LA12_0=='-'||(LA12_0>='A' && LA12_0<='Z')||LA12_0=='_'||(LA12_0>='a' && LA12_0<='z')) ) {
                     alt12=1;
                 }
 
@@ -1616,7 +1607,7 @@ public class AdvancedExpressionLexer extends Lexer {
             	case 1 :
             	    // AdvancedExpression.g:
             	    {
-            	    if ( (input.LA(1)>='0' && input.LA(1)<='9')||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
+            	    if ( input.LA(1)=='-'||(input.LA(1)>='A' && input.LA(1)<='Z')||input.LA(1)=='_'||(input.LA(1)>='a' && input.LA(1)<='z') ) {
             	        input.consume();
 
             	    }
@@ -2157,13 +2148,13 @@ public class AdvancedExpressionLexer extends Lexer {
     }
     static final String DFA14_eotS =
         "\13\uffff\1\46\2\uffff\1\46\2\uffff\1\56\1\uffff\1\60\1\62\15\46"+
-        "\1\114\1\46\2\117\4\uffff\1\121\2\46\6\uffff\30\46\1\114\1\uffff"+
-        "\1\46\2\uffff\1\117\1\uffff\1\46\1\157\2\46\2\163\1\165\2\46\1\157"+
+        "\1\114\1\46\2\116\4\uffff\1\121\2\46\6\uffff\30\46\1\114\1\uffff"+
+        "\1\46\2\uffff\1\116\1\uffff\1\46\1\157\2\46\2\163\1\165\2\46\1\157"+
         "\4\46\1\157\2\46\1\157\4\46\1\157\2\46\1\157\1\163\1\46\1\u008a"+
         "\1\uffff\1\165\2\46\1\uffff\1\46\1\uffff\1\165\1\46\2\157\3\46\1"+
         "\157\2\46\5\157\1\46\1\163\1\46\1\u0097\1\46\1\uffff\1\165\10\46"+
         "\1\163\2\157\1\uffff\1\u00a2\1\165\2\46\1\165\4\46\1\165\1\uffff"+
-        "\11\46\1\u00b3\2\46\2\165\1\u00b6\1\u00b3\1\uffff\2\46\1\uffff\1"+
+        "\11\46\1\u00b2\2\46\2\165\1\u00b6\1\uffff\1\u00b2\2\46\1\uffff\1"+
         "\46\1\u00ba\1\165\1\uffff";
     static final String DFA14_eofS =
         "\u00bb\uffff";
@@ -2180,8 +2171,8 @@ public class AdvancedExpressionLexer extends Lexer {
         "\163\1\157\5\60\1\162\3\60\1\146\1\uffff\1\60\1\145\1\167\1\144"+
         "\1\162\1\147\1\163\1\164\1\155\3\60\1\uffff\2\60\2\145\1\60\1\151"+
         "\1\137\1\145\1\162\1\60\1\uffff\1\145\1\141\1\156\1\101\1\143\1"+
-        "\151\1\153\1\162\1\147\1\60\1\157\1\156\4\60\1\uffff\1\156\1\147"+
-        "\1\uffff\1\144\2\60\1\uffff";
+        "\151\1\153\1\162\1\147\1\60\1\157\1\156\3\60\1\uffff\1\60\1\156"+
+        "\1\147\1\uffff\1\144\2\60\1\uffff";
     static final String DFA14_maxS =
         "\1\175\12\uffff\1\146\2\uffff\1\170\2\uffff\1\75\1\uffff\2\75\1"+
         "\145\1\157\1\141\1\157\1\165\1\157\1\141\1\164\1\157\1\155\2\157"+
@@ -2196,13 +2187,13 @@ public class AdvancedExpressionLexer extends Lexer {
         "\1\uffff\1\172\1\145\1\171\1\144\1\162\1\147\1\163\1\164\1\155\3"+
         "\172\1\uffff\2\172\2\145\1\172\1\151\1\137\1\145\1\162\1\172\1\uffff"+
         "\1\145\1\141\1\156\1\172\1\143\1\151\1\153\1\162\1\147\1\172\1\157"+
-        "\1\156\4\172\1\uffff\1\156\1\147\1\uffff\1\144\2\172\1\uffff";
+        "\1\156\3\172\1\uffff\1\172\1\156\1\147\1\uffff\1\144\2\172\1\uffff";
     static final String DFA14_acceptS =
         "\1\uffff\1\1\1\2\1\3\1\4\1\5\1\6\1\7\1\10\1\11\1\12\1\uffff\1\14"+
         "\1\15\1\uffff\1\20\1\21\1\uffff\1\23\23\uffff\1\43\1\44\1\45\1\46"+
-        "\3\uffff\1\24\1\22\1\26\1\25\1\30\1\27\31\uffff\1\34\1\uffff\1\36"+
-        "\1\37\1\uffff\1\13\35\uffff\1\32\3\uffff\1\33\1\uffff\1\31\24\uffff"+
-        "\1\17\14\uffff\1\35\12\uffff\1\16\20\uffff\1\42\2\uffff\1\40\3\uffff"+
+        "\3\uffff\1\24\1\22\1\26\1\25\1\30\1\27\31\uffff\1\34\1\uffff\1\37"+
+        "\1\36\1\uffff\1\13\35\uffff\1\32\3\uffff\1\33\1\uffff\1\31\24\uffff"+
+        "\1\17\14\uffff\1\35\12\uffff\1\16\17\uffff\1\42\3\uffff\1\40\3\uffff"+
         "\1\41";
     static final String DFA14_specialS =
         "\u00bb\uffff}>";
@@ -2248,8 +2239,8 @@ public class AdvancedExpressionLexer extends Lexer {
             "\1\113",
             "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46",
             "\1\115",
-            "\1\116",
-            "\1\116\1\uffff\12\120",
+            "\1\117",
+            "\1\117\1\uffff\12\120",
             "",
             "",
             "",
@@ -2292,7 +2283,7 @@ public class AdvancedExpressionLexer extends Lexer {
             "\1\155",
             "",
             "",
-            "\1\116\1\uffff\12\120",
+            "\1\117\1\uffff\12\120",
             "",
             "\1\156",
             "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46",
@@ -2387,14 +2378,14 @@ public class AdvancedExpressionLexer extends Lexer {
             "\1\u00af",
             "\1\u00b0",
             "\1\u00b1",
-            "\12\u00b2\7\uffff\32\u00b2\4\uffff\1\u00b2\1\uffff\32\u00b2",
+            "\12\u00b3\7\uffff\32\u00b3\4\uffff\1\u00b3\1\uffff\32\u00b3",
             "\1\u00b4",
             "\1\u00b5",
             "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46",
             "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46",
             "\12\46\7\uffff\32\46\4\uffff\1\46\1\uffff\32\46",
-            "\12\u00b2\7\uffff\32\u00b2\4\uffff\1\u00b2\1\uffff\32\u00b2",
             "",
+            "\12\u00b3\7\uffff\32\u00b3\4\uffff\1\u00b3\1\uffff\32\u00b3",
             "\1\u00b7",
             "\1\u00b8",
             "",

+ 1 - 1
ibms-data-sdk/src/main/java/com/sagacloud/advanced/expression/AdvancedExpressionParser.java

@@ -1,4 +1,4 @@
-// $ANTLR 3.1 AdvancedExpression.g 2021-05-25 17:56:08
+// $ANTLR 3.1 AdvancedExpression.g 2021-06-15 14:44:27
 
 package com.sagacloud.advanced.expression;
 

+ 1 - 1
ibms-data-sdk/src/main/java/com/sagacloud/advanced/expression/AdvancedExpressionScanner.java

@@ -1,4 +1,4 @@
-// $ANTLR 3.1 AdvancedExpressionScanner.g 2021-05-25 17:56:09
+// $ANTLR 3.1 AdvancedExpressionScanner.g 2021-06-15 14:44:27
 
 package com.sagacloud.advanced.expression;
 

+ 1 - 1
ibms-data-sdk/src/main/java/com/sagacloud/advanced/expression/AdvancedExpressionWalker.java

@@ -1,4 +1,4 @@
-// $ANTLR 3.1 AdvancedExpressionWalker.g 2021-05-25 17:56:09
+// $ANTLR 3.1 AdvancedExpressionWalker.g 2021-06-15 14:44:27
 
 package com.sagacloud.advanced.expression;