Skip to content

Commit 2e2917b

Browse files
toolgoodtoolgood
committed
fix
1 parent d2b1748 commit 2e2917b

File tree

2 files changed

+4
-76
lines changed

2 files changed

+4
-76
lines changed

‎csharp/ToolGood.Algorithm.Fast/math/mathParser.cs‎

Lines changed: 3 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -80,83 +80,11 @@ const int
8080
public const int
8181
RULE_prog = 0, RULE_expr = 1, RULE_num = 2, RULE_unit = 3, RULE_arrayJson = 4,
8282
RULE_parameter2 = 5;
83-
public static readonly string[] ruleNames = {
84-
"prog", "expr", "num", "unit", "arrayJson", "parameter2"
85-
};
83+
public static readonly string[] ruleNames = { };
8684

87-
private static readonly string[] _LiteralNames = {
88-
null, "'.'", "'('", "')'", "','", "'['", "']'", "'!'", "'%'", "'*'", "'/'",
89-
"'+'", "'&'", "'>'", "'>='", "'<'", "'<='", "'='", "'=='", "'==='", "'!=='",
90-
"'!='", "'<>'", "'&&'", "'||'", "'?'", "':'", "'{'", "'}'", "'-'", null,
91-
null, "'NULL'", "'ERROR'", null, "'IF'", "'IFERROR'", "'ISNUMBER'", "'ISTEXT'",
92-
"'ISERROR'", "'ISNONTEXT'", "'ISLOGICAL'", "'ISEVEN'", "'ISODD'", "'ISNULL'",
93-
"'ISNULLORERROR'", "'AND'", "'OR'", "'NOT'", "'TRUE'", "'FALSE'", "'E'",
94-
"'PI'", "'DEC2BIN'", "'DEC2HEX'", "'DEC2OCT'", "'HEX2BIN'", "'HEX2DEC'",
95-
"'HEX2OCT'", "'OCT2BIN'", "'OCT2DEC'", "'OCT2HEX'", "'BIN2OCT'", "'BIN2DEC'",
96-
"'BIN2HEX'", "'ABS'", "'QUOTIENT'", "'MOD'", "'SIGN'", "'SQRT'", "'TRUNC'",
97-
"'INT'", "'GCD'", "'LCM'", "'COMBIN'", "'PERMUT'", "'DEGREES'", "'RADIANS'",
98-
"'COS'", "'COSH'", "'SIN'", "'SINH'", "'TAN'", "'TANH'", "'ACOS'", "'ACOSH'",
99-
"'ASIN'", "'ASINH'", "'ATAN'", "'ATANH'", "'ATAN2'", "'ROUND'", "'ROUNDDOWN'",
100-
"'ROUNDUP'", "'CEILING'", "'FLOOR'", "'EVEN'", "'ODD'", "'MROUND'", "'RAND'",
101-
"'RANDBETWEEN'", "'FACT'", "'FACTDOUBLE'", "'POWER'", "'EXP'", "'LN'",
102-
"'LOG'", "'LOG10'", "'MULTINOMIAL'", "'PRODUCT'", "'SQRTPI'", "'SUMSQ'",
103-
"'ASC'", null, "'CHAR'", "'CLEAN'", "'CODE'", "'CONCATENATE'", "'EXACT'",
104-
"'FIND'", "'FIXED'", "'LEFT'", "'LEN'", null, "'MID'", "'PROPER'", "'REPLACE'",
105-
"'REPT'", "'RIGHT'", "'RMB'", "'SEARCH'", "'SUBSTITUTE'", "'T'", "'TEXT'",
106-
"'TRIM'", null, "'VALUE'", "'DATEVALUE'", "'TIMEVALUE'", "'DATE'", "'TIME'",
107-
"'NOW'", "'TODAY'", "'YEAR'", "'MONTH'", "'DAY'", "'HOUR'", "'MINUTE'",
108-
"'SECOND'", "'WEEKDAY'", "'DATEDIF'", "'DAYS360'", "'EDATE'", "'EOMONTH'",
109-
"'NETWORKDAYS'", "'WORKDAY'", "'WEEKNUM'", "'MAX'", "'MEDIAN'", "'MIN'",
110-
"'QUARTILE'", "'MODE'", "'LARGE'", "'SMALL'", null, null, "'AVERAGE'",
111-
"'AVERAGEIF'", "'GEOMEAN'", "'HARMEAN'", "'COUNT'", "'COUNTIF'", "'SUM'",
112-
"'SUMIF'", "'AVEDEV'", null, null, null, "'COVARIANCE.S'", "'DEVSQ'",
113-
null, null, null, null, null, null, null, null, null, null, null, null,
114-
"'FISHER'", "'FISHERINV'", null, null, null, null, null, null, null, null,
115-
null, null, "'WEIBULL'", "'URLENCODE'", "'URLDECODE'", "'HTMLENCODE'",
116-
"'HTMLDECODE'", "'BASE64TOTEXT'", "'BASE64URLTOTEXT'", "'TEXTTOBASE64'",
117-
"'TEXTTOBASE64URL'", "'REGEX'", "'REGEXREPALCE'", null, "'GUID'", "'MD5'",
118-
"'SHA1'", "'SHA256'", "'SHA512'", "'CRC32'", "'HMACMD5'", "'HMACSHA1'",
119-
"'HMACSHA256'", "'HMACSHA512'", null, null, "'INDEXOF'", "'LASTINDEXOF'",
120-
"'SPLIT'", "'JOIN'", "'SUBSTRING'", "'STARTSWITH'", "'ENDSWITH'", "'ISNULLOREMPTY'",
121-
"'ISNULLORWHITESPACE'", "'REMOVESTART'", "'REMOVEEND'", "'JSON'", "'VLOOKUP'",
122-
"'ARRAY'", null, "'ADDYEARS'", "'ADDMONTHS'", "'ADDDAYS'", "'ADDHOURS'",
123-
"'ADDMINUTES'", "'ADDSECONDS'", "'TIMESTAMP'"
85+
private static readonly string[] _LiteralNames = {
12486
};
125-
private static readonly string[] _SymbolicNames = {
126-
null, null, null, null, null, null, null, null, null, null, null, null,
127-
null, null, null, null, null, null, null, null, null, null, null, null,
128-
null, null, null, null, null, "SUB", "NUM", "STRING", "NULL", "ERROR",
129-
"UNIT", "IF", "IFERROR", "ISNUMBER", "ISTEXT", "ISERROR", "ISNONTEXT",
130-
"ISLOGICAL", "ISEVEN", "ISODD", "ISNULL", "ISNULLORERROR", "AND", "OR",
131-
"NOT", "TRUE", "FALSE", "E", "PI", "DEC2BIN", "DEC2HEX", "DEC2OCT", "HEX2BIN",
132-
"HEX2DEC", "HEX2OCT", "OCT2BIN", "OCT2DEC", "OCT2HEX", "BIN2OCT", "BIN2DEC",
133-
"BIN2HEX", "ABS", "QUOTIENT", "MOD", "SIGN", "SQRT", "TRUNC", "INT", "GCD",
134-
"LCM", "COMBIN", "PERMUT", "DEGREES", "RADIANS", "COS", "COSH", "SIN",
135-
"SINH", "TAN", "TANH", "ACOS", "ACOSH", "ASIN", "ASINH", "ATAN", "ATANH",
136-
"ATAN2", "ROUND", "ROUNDDOWN", "ROUNDUP", "CEILING", "FLOOR", "EVEN",
137-
"ODD", "MROUND", "RAND", "RANDBETWEEN", "FACT", "FACTDOUBLE", "POWER",
138-
"EXP", "LN", "LOG", "LOG10", "MULTINOMIAL", "PRODUCT", "SQRTPI", "SUMSQ",
139-
"ASC", "JIS", "CHAR", "CLEAN", "CODE", "CONCATENATE", "EXACT", "FIND",
140-
"FIXED", "LEFT", "LEN", "LOWER", "MID", "PROPER", "REPLACE", "REPT", "RIGHT",
141-
"RMB", "SEARCH", "SUBSTITUTE", "T", "TEXT", "TRIM", "UPPER", "VALUE",
142-
"DATEVALUE", "TIMEVALUE", "DATE", "TIME", "NOW", "TODAY", "YEAR", "MONTH",
143-
"DAY", "HOUR", "MINUTE", "SECOND", "WEEKDAY", "DATEDIF", "DAYS360", "EDATE",
144-
"EOMONTH", "NETWORKDAYS", "WORKDAY", "WEEKNUM", "MAX", "MEDIAN", "MIN",
145-
"QUARTILE", "MODE", "LARGE", "SMALL", "PERCENTILE", "PERCENTRANK", "AVERAGE",
146-
"AVERAGEIF", "GEOMEAN", "HARMEAN", "COUNT", "COUNTIF", "SUM", "SUMIF",
147-
"AVEDEV", "STDEV", "STDEVP", "COVAR", "COVARIANCES", "DEVSQ", "VAR", "VARP",
148-
"NORMDIST", "NORMINV", "NORMSDIST", "NORMSINV", "BETADIST", "BETAINV",
149-
"BINOMDIST", "EXPONDIST", "FDIST", "FINV", "FISHER", "FISHERINV", "GAMMADIST",
150-
"GAMMAINV", "GAMMALN", "HYPGEOMDIST", "LOGINV", "LOGNORMDIST", "NEGBINOMDIST",
151-
"POISSON", "TDIST", "TINV", "WEIBULL", "URLENCODE", "URLDECODE", "HTMLENCODE",
152-
"HTMLDECODE", "BASE64TOTEXT", "BASE64URLTOTEXT", "TEXTTOBASE64", "TEXTTOBASE64URL",
153-
"REGEX", "REGEXREPALCE", "ISREGEX", "GUID", "MD5", "SHA1", "SHA256", "SHA512",
154-
"CRC32", "HMACMD5", "HMACSHA1", "HMACSHA256", "HMACSHA512", "TRIMSTART",
155-
"TRIMEND", "INDEXOF", "LASTINDEXOF", "SPLIT", "JOIN", "SUBSTRING", "STARTSWITH",
156-
"ENDSWITH", "ISNULLOREMPTY", "ISNULLORWHITESPACE", "REMOVESTART", "REMOVEEND",
157-
"JSON", "VLOOKUP", "ARRAY", "ALGORITHMVERSION", "ADDYEARS", "ADDMONTHS",
158-
"ADDDAYS", "ADDHOURS", "ADDMINUTES", "ADDSECONDS", "TIMESTAMP", "HAS",
159-
"HASVALUE", "PARAM", "PARAMETER", "PARAMETER2", "WS", "COMMENT", "LINE_COMMENT"
87+
private static readonly string[] _SymbolicNames = {
16088
};
16189
public static readonly IVocabulary DefaultVocabulary = new Vocabulary(_LiteralNames, _SymbolicNames);
16290

‎csharp/ToolGood.Algorithm/Internals/MathVisitor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3745,7 +3745,7 @@ public virtual Operand VisitREMOVEEND_fun(mathParser.REMOVEEND_funContext contex
37453745

37463746
StringComparison comparison = StringComparison.Ordinal;
37473747
if (exprs.Length == 3) {
3748-
var args3 = exprs[2].Accept(this); if (args3.Type != OperandType.BOOLEAN) { args3 = args3.ToBoolean("Function REMOVESTART parameter 3 is error!"); if (args3.IsError) { return args3; } }
3748+
var args3 = exprs[2].Accept(this); if (args3.Type != OperandType.BOOLEAN) { args3 = args3.ToBoolean("Function REMOVEEND parameter 3 is error!"); if (args3.IsError) { return args3; } }
37493749
if (args3.BooleanValue) {
37503750
comparison = StringComparison.OrdinalIgnoreCase;
37513751
}

0 commit comments

Comments
 (0)