简化代码

Author: toolgood

csharp/ToolGood.Algorithm2.MathParserReplace/Program.cs

@@ -13,41 +13,40 @@ static void Main(string[] args)
             var str = @"T__0=1, T__1=2, T__2=3, T__3=4, T__4=5, T__5=6, T__6=7, T__7=8, T__8=9, 
 		T__9=10, T__10=11, T__11=12, T__12=13, T__13=14, T__14=15, T__15=16, T__16=17, 
 		T__17=18, T__18=19, T__19=20, T__20=21, T__21=22, T__22=23, T__23=24, 
-		T__24=25, T__25=26, SUB=27, LB=28, RB=29, COMMA=30, NUM=31, STRING=32, 
-		NULL=33, IF=34, IFERROR=35, ISNUMBER=36, ISTEXT=37, ISERROR=38, ISNONTEXT=39, 
-		ISLOGICAL=40, ISEVEN=41, ISODD=42, ISNULL=43, ISNULLORERROR=44, AND=45, 
-		OR=46, NOT=47, TRUE=48, FALSE=49, E=50, PI=51, DEC2BIN=52, DEC2HEX=53, 
-		DEC2OCT=54, HEX2BIN=55, HEX2DEC=56, HEX2OCT=57, OCT2BIN=58, OCT2DEC=59, 
-		OCT2HEX=60, BIN2OCT=61, BIN2DEC=62, BIN2HEX=63, ABS=64, QUOTIENT=65, MOD=66, 
-		SIGN=67, SQRT=68, TRUNC=69, INT=70, GCD=71, LCM=72, COMBIN=73, PERMUT=74, 
-		DEGREES=75, RADIANS=76, COS=77, COSH=78, SIN=79, SINH=80, TAN=81, TANH=82, 
-		ACOS=83, ACOSH=84, ASIN=85, ASINH=86, ATAN=87, ATANH=88, ATAN2=89, ROUND=90, 
-		ROUNDDOWN=91, ROUNDUP=92, CEILING=93, FLOOR=94, EVEN=95, ODD=96, MROUND=97, 
-		RAND=98, RANDBETWEEN=99, FACT=100, FACTDOUBLE=101, POWER=102, EXP=103, 
-		LN=104, LOG=105, LOG10=106, MULTINOMIAL=107, PRODUCT=108, SQRTPI=109, 
-		SUMSQ=110, ASC=111, JIS=112, CHAR=113, CLEAN=114, CODE=115, CONCATENATE=116, 
-		EXACT=117, FIND=118, FIXED=119, LEFT=120, LEN=121, LOWER=122, MID=123, 
-		PROPER=124, REPLACE=125, REPT=126, RIGHT=127, RMB=128, SEARCH=129, SUBSTITUTE=130, 
-		T=131, TEXT=132, TRIM=133, UPPER=134, VALUE=135, DATEVALUE=136, TIMEVALUE=137, 
-		DATE=138, TIME=139, NOW=140, TODAY=141, YEAR=142, MONTH=143, DAY=144, 
-		HOUR=145, MINUTE=146, SECOND=147, WEEKDAY=148, DATEDIF=149, DAYS360=150, 
-		EDATE=151, EOMONTH=152, NETWORKDAYS=153, WORKDAY=154, WEEKNUM=155, MAX=156, 
-		MEDIAN=157, MIN=158, QUARTILE=159, MODE=160, LARGE=161, SMALL=162, PERCENTILE=163, 
-		PERCENTRANK=164, AVERAGE=165, AVERAGEIF=166, GEOMEAN=167, HARMEAN=168, 
-		COUNT=169, COUNTIF=170, SUM=171, SUMIF=172, AVEDEV=173, STDEV=174, STDEVP=175, 
-		DEVSQ=176, VAR=177, VARP=178, NORMDIST=179, NORMINV=180, NORMSDIST=181, 
-		NORMSINV=182, BETADIST=183, BETAINV=184, BINOMDIST=185, EXPONDIST=186, 
-		FDIST=187, FINV=188, FISHER=189, FISHERINV=190, GAMMADIST=191, GAMMAINV=192, 
-		GAMMALN=193, HYPGEOMDIST=194, LOGINV=195, LOGNORMDIST=196, NEGBINOMDIST=197, 
-		POISSON=198, TDIST=199, TINV=200, WEIBULL=201, URLENCODE=202, URLDECODE=203, 
-		HTMLENCODE=204, HTMLDECODE=205, BASE64TOTEXT=206, BASE64URLTOTEXT=207, 
-		TEXTTOBASE64=208, TEXTTOBASE64URL=209, REGEX=210, REGEXREPALCE=211, ISREGEX=212, 
-		GUID=213, MD5=214, SHA1=215, SHA256=216, SHA512=217, CRC32=218, HMACMD5=219, 
-		HMACSHA1=220, HMACSHA256=221, HMACSHA512=222, TRIMSTART=223, TRIMEND=224, 
-		INDEXOF=225, LASTINDEXOF=226, SPLIT=227, JOIN=228, SUBSTRING=229, STARTSWITH=230, 
-		ENDSWITH=231, ISNULLOREMPTY=232, ISNULLORWHITESPACE=233, REMOVESTART=234, 
-		REMOVEEND=235, JSON=236, VLOOKUP=237, LOOKUP=238, ARRAY=239, PARAMETER=240, 
-		PARAMETER2=241, WS=242;
+		T__24=25, SUB=26, NUM=27, STRING=28, NULL=29, IF=30, IFERROR=31, ISNUMBER=32, 
+		ISTEXT=33, ISERROR=34, ISNONTEXT=35, ISLOGICAL=36, ISEVEN=37, ISODD=38, 
+		ISNULL=39, ISNULLORERROR=40, AND=41, OR=42, NOT=43, TRUE=44, FALSE=45, 
+		E=46, PI=47, DEC2BIN=48, DEC2HEX=49, DEC2OCT=50, HEX2BIN=51, HEX2DEC=52, 
+		HEX2OCT=53, OCT2BIN=54, OCT2DEC=55, OCT2HEX=56, BIN2OCT=57, BIN2DEC=58, 
+		BIN2HEX=59, ABS=60, QUOTIENT=61, MOD=62, SIGN=63, SQRT=64, TRUNC=65, INT=66, 
+		GCD=67, LCM=68, COMBIN=69, PERMUT=70, DEGREES=71, RADIANS=72, COS=73, 
+		COSH=74, SIN=75, SINH=76, TAN=77, TANH=78, ACOS=79, ACOSH=80, ASIN=81, 
+		ASINH=82, ATAN=83, ATANH=84, ATAN2=85, ROUND=86, ROUNDDOWN=87, ROUNDUP=88, 
+		CEILING=89, FLOOR=90, EVEN=91, ODD=92, MROUND=93, RAND=94, RANDBETWEEN=95, 
+		FACT=96, FACTDOUBLE=97, POWER=98, EXP=99, LN=100, LOG=101, LOG10=102, 
+		MULTINOMIAL=103, PRODUCT=104, SQRTPI=105, SUMSQ=106, ASC=107, JIS=108, 
+		CHAR=109, CLEAN=110, CODE=111, CONCATENATE=112, EXACT=113, FIND=114, FIXED=115, 
+		LEFT=116, LEN=117, LOWER=118, MID=119, PROPER=120, REPLACE=121, REPT=122, 
+		RIGHT=123, RMB=124, SEARCH=125, SUBSTITUTE=126, T=127, TEXT=128, TRIM=129, 
+		UPPER=130, VALUE=131, DATEVALUE=132, TIMEVALUE=133, DATE=134, TIME=135, 
+		NOW=136, TODAY=137, YEAR=138, MONTH=139, DAY=140, HOUR=141, MINUTE=142, 
+		SECOND=143, WEEKDAY=144, DATEDIF=145, DAYS360=146, EDATE=147, EOMONTH=148, 
+		NETWORKDAYS=149, WORKDAY=150, WEEKNUM=151, MAX=152, MEDIAN=153, MIN=154, 
+		QUARTILE=155, MODE=156, LARGE=157, SMALL=158, PERCENTILE=159, PERCENTRANK=160, 
+		AVERAGE=161, AVERAGEIF=162, GEOMEAN=163, HARMEAN=164, COUNT=165, COUNTIF=166, 
+		SUM=167, SUMIF=168, AVEDEV=169, STDEV=170, STDEVP=171, DEVSQ=172, VAR=173, 
+		VARP=174, NORMDIST=175, NORMINV=176, NORMSDIST=177, NORMSINV=178, BETADIST=179, 
+		BETAINV=180, BINOMDIST=181, EXPONDIST=182, FDIST=183, FINV=184, FISHER=185, 
+		FISHERINV=186, GAMMADIST=187, GAMMAINV=188, GAMMALN=189, HYPGEOMDIST=190, 
+		LOGINV=191, LOGNORMDIST=192, NEGBINOMDIST=193, POISSON=194, TDIST=195, 
+		TINV=196, WEIBULL=197, URLENCODE=198, URLDECODE=199, HTMLENCODE=200, HTMLDECODE=201, 
+		BASE64TOTEXT=202, BASE64URLTOTEXT=203, TEXTTOBASE64=204, TEXTTOBASE64URL=205, 
+		REGEX=206, REGEXREPALCE=207, ISREGEX=208, GUID=209, MD5=210, SHA1=211, 
+		SHA256=212, SHA512=213, CRC32=214, HMACMD5=215, HMACSHA1=216, HMACSHA256=217, 
+		HMACSHA512=218, TRIMSTART=219, TRIMEND=220, INDEXOF=221, LASTINDEXOF=222, 
+		SPLIT=223, JOIN=224, SUBSTRING=225, STARTSWITH=226, ENDSWITH=227, ISNULLOREMPTY=228, 
+		ISNULLORWHITESPACE=229, REMOVESTART=230, REMOVEEND=231, JSON=232, VLOOKUP=233, 
+		LOOKUP=234, ARRAY=235, PARAMETER=236, PARAMETER2=237, WS=238;
 
 RULE_prog=0, RULE_expr=1, RULE_expr2=2, RULE_parameter2=3;
 ";
@@ -68,6 +67,7 @@ static void Main(string[] args)
 				csText = Regex.Replace(csText, @$"\(1L << {item}\)", $"(1L << {value})");
 				csText = Regex.Replace(csText, @$"\(1L << \({item} ", $"(1L << ({value} "); //(1L << (MULTINOMIAL
 				csText = csText.Replace(@$"_la=={item}", $"_la=={value}"); //(1L << (MULTINOMIAL
+				csText = csText.Replace(@$"_la == {item}", $"_la == {value}"); //(1L << (MULTINOMIAL
 				csText = csText.Replace(@$"mathParser.{item}", $"{value}"); //(1L << (MULTINOMIAL
 
 				csText = csText.Replace($"PushNewRecursionContext(_localctx, _startState, {item})", $"PushNewRecursionContext(_localctx, _startState, {value})"); //(1L << (MULTINOMIAL