fix

Author: toolgood

g4/math.g4

@@ -133,8 +133,8 @@ OPGT: '>';
 OPGE: '>=';
 OPLT: '<';
 OPLE: '<=';
-OPNE: '!=' | '!==' | '<>';
-OPEQ: '=' | '==' | '===';
+OPNE: '!' '=' '='? | '<>';
+OPEQ: '=' ('=' '='?)?;
 OPAND: '&&';
 OPOR: '||';
 
@@ -145,27 +145,9 @@ STRING:
 	| '`' (~[`\\] | '\\' .)* '`';
 
 
-UNIT:
-	'M'
-	| 'KM'
-	| 'DM'
-	| 'CM'
-	| 'MM'
-	| 'M2'
-	| 'KM2'
-	| 'DM2'
-	| 'CM2'
-	| 'MM2'
-	| 'M3'
-	| 'KM3'
-	| 'DM3'
-	| 'CM3'
-	| 'MM3'
-	| 'L'
-	| 'ML'
-	| 'G'
-	| 'KG';
-
+UNIT: [KDCM]? 'M' [23]?
+		| 'M'? 'L'	 
+		| 'K'? 'G';
 
 // BOOL_fun
 TRUE: 'TRUE' | 'YES';

g4/mathjs.g4

@@ -3,42 +3,40 @@ grammar mathjs;
 prog: expr EOF;
 
 expr:
-	'(' expr ')'												
-	| expr '.'  PARAMETER ('(' (expr (',' expr)*)? ')')?			
-	| expr '[' (PARAMETER | expr) ']' 			
-	// 运算符优先级 开始
-	| '!' expr													
-	| expr OPMOD													
-	| expr (OPMOD|OP) expr							
-	| expr '?' expr ':' expr				
-	// 运算符优先级 结束
-
-	| PARAMETER '(' (expr (',' expr)*)? ')'						
-	| '{' arrayJson (',' arrayJson)* ','? '}'					
-	| '[' expr (',' expr)* ','? ']'		
-	| '-'? NUM										
-	| STRING													
-	| PARAMETER																					
+	'(' expr ')'
+	| expr '.'  PARAMETER ('(' (expr (',' expr)*)? ')')?
+	| expr '[' (PARAMETER | expr) ']'
+	| '!' expr
+	| expr OPMOD
+	| expr (OPMOD|OPSUB|OP) expr
+	| expr '?' expr ':' expr
+
+	| PARAMETER '(' (expr (',' expr)*)? ')'
+	| '{' arrayJson (',' arrayJson)* ','? '}'
+	| '[' expr (',' expr)* ','? ']'
+	| OPSUB? NUM
+	| STRING
+	| PARAMETER
 	;
 
 arrayJson: (NUM | STRING | PARAMETER) ':' expr;
- 
+
 OPMOD: '%';
-OP: '+'| '-'| '*'| '/'|'&'| '>'| '>='|'<'|'<='| '!=' | '!==' | '<>'| '=' | '==' | '==='| '&&'|'||';
+OPSUB: '-';
+OP: [+*/&><=]| [>=<!] '=' '='? | '<>' | '&&' | '||' ;
 
 NUM: [0-9]+ ('.' [0-9]+)? ('E' [+-]? [0-9]+)?
-	| [0-9]+ ('.' [0-9]+)? ('M'
-		| 'KM'	| 'DM'	| 'CM'	| 'MM'
-		| 'M2'	| 'KM2'	| 'DM2'	| 'CM2'	| 'MM2'
-		| 'M3'	| 'KM3'	| 'DM3'	| 'CM3'	| 'MM3'	| 'L'	| 'ML'
-		| 'G'	| 'KG' | 'T')
+	| [0-9]+ ('.' [0-9]+)? (
+		[KDCM]? 'M' [23]?
+		| 'M'? 'L'	 
+		| 'K'? 'G' | 'T')
 	;
 STRING:
 	'\'' (~['\\] | '\\' .)* '\''
 	| '"' (~["\\] | '\\' .)* '"'
 	| '`' (~[`\\] | '\\' .)* '`';
  
-PARAMETER: ([A-Z_] | FullWidthLetter) ( [A-Z0-9_] | FullWidthLetter	)*;
+PARAMETER: ([A-Z_] | FullWidthLetter) ([A-Z0-9_] | FullWidthLetter)*;
 
 fragment FullWidthLetter:
 	'\u00c0' ..'\u00d6'
@@ -53,7 +51,6 @@ fragment FullWidthLetter:
 	| '\ua000' ..'\ud7ff'
 	| '\uf900' ..'\ufaff'
 	| '\uff00' ..'\ufff0'
-	// | '\u10000'..'\u1F9FF' //not support four bytes chars | '\u20000'..'\u2FA1F'
 	;
 
 WS: [ \t\r\n\f]+ -> skip;