fix

Author: toolgood

g4/math.g4

@@ -221,17 +221,17 @@ CODE: 'CODE';
 UNICHAR: 'UNICHAR';
 UNICODE: 'UNICODE';
 LEN: 'LEN';
-LOWER: 'LOWER' | 'TOLOWER';
+LOWER: 'TO'? 'LOWER';
 PROPER: 'PROPER';
 TRIM: 'TRIM';
-UPPER: 'UPPER' | 'TOUPPER';
+UPPER: 'TO'? 'UPPER';
 VALUE: 'VALUE';
 TIMEVALUE: 'TIMEVALUE';
 NORMSDIST: 'NORMSDIST' | 'NORM.S.DIST';
 NORMSINV: 'NORMSINV' | 'NORM.S.INV';
 FISHER: 'FISHER';
 FISHERINV: 'FISHERINV';
-GAMMALN: 'GAMMALN' | 'GAMMALN.PRECISE';
+GAMMALN: 'GAMMALN' '.PRECISE'?;
 URLENCODE: 'URLENCODE';
 URLDECODE: 'URLDECODE';
 HTMLENCODE: 'HTMLENCODE';
@@ -283,7 +283,7 @@ IRR: 'IRR';
 TRIMSTART: 'TRIMSTART' | 'LTRIM';
 TRIMEND: 'TRIMEND' | 'RTRIM';
 TIMESTAMP: 'TIMESTAMP';
-PARAM: 'PARAM' | 'PARAMETER' | 'GETPARAMETER';
+PARAM: 'PARAM' 'ETER'? | 'GETPARAMETER';
 DATEVALUE: 'DATEVALUE';
 
 // TWO_THREE_args_fun
@@ -327,7 +327,7 @@ MULTINOMIAL: 'MULTINOMIAL';
 PRODUCT: 'PRODUCT';
 SUMSQ: 'SUMSQ';
 SUMPRODUCT: 'SUMPRODUCT';
-CONCATENATE: 'CONCATENATE' | 'CONCAT';
+CONCATENATE: 'CONCAT' 'ENATE'?;
 MAX: 'MAX';
 MEDIAN: 'MEDIAN';
 MIN: 'MIN';
@@ -338,11 +338,11 @@ HARMEAN: 'HARMEAN';
 COUNT: 'COUNT';
 SUM: 'SUM';
 AVEDEV: 'AVEDEV';
-STDEV: 'STDEV' | 'STDEV.S';
-STDEVP: 'STDEVP' | 'STDEV.P';
+STDEV: 'STDEV' '.S'?;
+STDEVP: 'STDEV' '.'? 'P';
 DEVSQ: 'DEVSQ';
-VAR: 'VAR' | 'VAR.S';
-VARP: 'VARP' | 'VAR.P';
+VAR: 'VAR' '.S'?;
+VARP: 'VAR' '.'? 'P';
 NPV: 'NPV';
 
 // TWO_args_fun
@@ -372,13 +372,13 @@ EOMONTH: 'EOMONTH';
 QUARTILE: 'QUARTILE';
 LARGE: 'LARGE';
 SMALL: 'SMALL';
-PERCENTILE: 'PERCENTILE' | 'PERCENTILE.INC';
-PERCENTRANK: 'PERCENTRANK' | 'PERCENTRANK.INC';
-COVAR: 'COVAR' | 'COVARIANCE.P';
+PERCENTILE: 'PERCENTILE' '.INC'?;
+PERCENTRANK: 'PERCENTRANK' '.INC'?;
+COVAR: 'COVAR' 'IANCE.P'?;
 COVARIANCES: 'COVARIANCE.S';
-TINV: 'TINV' | 'T.INV';
+TINV: 'T' '.'? 'INV';
 REGEX: 'REGEX';
-ISREGEX: 'ISREGEX' | 'ISMATCH';
+ISREGEX: 'IS' ('REGEX' | 'MATCH');
 HMACMD5: 'HMACMD5';
 HMACSHA1: 'HMACSHA1';
 HMACSHA256: 'HMACSHA256';
@@ -392,7 +392,7 @@ ADDDAYS: 'ADDDAYS';
 ADDHOURS: 'ADDHOURS';
 ADDMINUTES: 'ADDMINUTES';
 ADDSECONDS: 'ADDSECONDS';
-HAS: 'HAS' | 'HASKEY' | 'CONTAINS' | 'CONTAINSKEY';
+HAS: 'HAS' 'KEY'? | 'CONTAINS' 'KEY'?;
 HASVALUE: 'HASVALUE' | 'CONTAINSVALUE';
 INTERCEPT: 'INTERCEPT';
 SLOPE: 'SLOPE';
@@ -402,30 +402,30 @@ COUNTIF: 'COUNTIF';
 
 // THREE_args_fun
 FORECAST: 'FORECAST';
-NORMINV: 'NORMINV' | 'NORM.INV';
-BETADIST: 'BETADIST' | 'BETA.DIST';
-BETAINV: 'BETAINV' | 'BETA.INV';
-EXPONDIST: 'EXPONDIST' | 'EXPON.DIST';
-FDIST: 'FDIST' | 'F.DIST';
-FINV: 'FINV' | 'F.INV';
-GAMMAINV: 'GAMMAINV' | 'GAMMA.INV';
-LOGINV: 'LOGINV' | 'LOGNORM.INV';
+NORMINV: 'NORM' '.'? 'INV';
+BETADIST: 'BETA' '.'? 'DIST';
+BETAINV: 'BETA' '.'? 'INV';
+EXPONDIST: 'EXPON' '.'?'DIST';
+FDIST: 'F' '.'? 'DIST';
+FINV: 'F' '.'? 'INV';
+GAMMAINV: 'GAMMA' '.'? 'INV';
+LOGINV: 'LOG' 'NORM.'? 'INV';
 XNPV: 'XNPV';
 MIRR: 'MIRR';
 SLN: 'SLN';
 MID: 'MID';
 DATEDIF: 'DATEDIF';
 REGEXREPLACE: 'REGEXREPLACE';
-LOGNORMDIST: 'LOGNORMDIST' | 'LOGNORM.DIST';
-NEGBINOMDIST: 'NEGBINOMDIST' | 'NEGBINOM.DIST';
-POISSON: 'POISSON' | 'POISSON.DIST';
-TDIST: 'TDIST' | 'T.DIST';
+LOGNORMDIST: 'LOGNORM' '.'? 'DIST';
+NEGBINOMDIST: 'NEGBINOM' '.'? 'DIST';
+POISSON: 'POISSON' '.DIST'?;
+TDIST: 'T' '.'? 'DIST';
 
 // FOUR_args_fun
-NORMDIST: 'NORMDIST' | 'NORM.DIST';
-BINOMDIST: 'BINOMDIST' | 'BINOM.DIST';
-GAMMADIST: 'GAMMADIST' | 'GAMMA.DIST';
-HYPGEOMDIST: 'HYPGEOMDIST' | 'HYPGEOM.DIST';
+NORMDIST:   'NORM' '.'? 'DIST';
+BINOMDIST:  'BINOM' '.'? 'DIST';
+GAMMADIST:   'GAMMA' '.'? 'DIST';
+HYPGEOMDIST:  'HYPGEOM' '.'? 'DIST';
 WEIBULL: 'WEIBULL';
 SYD: 'SYD';
 SERIESSUM: 'SERIESSUM';
@@ -458,7 +458,7 @@ IFS: 'IFS';
 SWITCH: 'SWITCH';
 
 // Version_fun
-ALGORITHMVERSION: 'ALGORITHMVERSION' | 'ENGINEVERSION';
+ALGORITHMVERSION: ('ALGORITHM' | 'ENGINE') 'VERSION';
 NULL: 'NULL';
 PARAMETER: ([A-Z_] | FullWidthLetter) ( [A-Z0-9_] | FullWidthLetter	)*;