diff options
Diffstat (limited to 'impl/EquationSystem.g')
| -rw-r--r-- | impl/EquationSystem.g | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/impl/EquationSystem.g b/impl/EquationSystem.g index 3a6598a..6b721bb 100644 --- a/impl/EquationSystem.g +++ b/impl/EquationSystem.g @@ -11,6 +11,7 @@ tokens { SUB = '-' ; MULT = '*' ; COMMA = ';' ; + RANGE = 'range' ; GUARD = 'guard' ; GREATER_EQUAL = '>=' ; QUESTION_MARK = '?' ; @@ -26,14 +27,15 @@ maxExpr : MAXIMUM^ '('! minExpr ( ','! minExpr )* ')'! | minExpr ; minExpr : MINIMUM^ '('! maxExpr ( ','! maxExpr )* ')'! | expr ; expr : '(' expr GREATER_EQUAL expr QUESTION_MARK expr ')' -> ^(GUARD expr expr expr) - | term ( (PLUS | MULT | SUB | COMMA)^ expr )* ; + | term ( (PLUS | MULT | COMMA)^ expr )* ; -term : NUMBER +term : '[' NUMBER ',' NUMBER ']' -> ^( RANGE NUMBER NUMBER ) | VARIABLE - | '('! expr ')'! ; + | '('! expr ')'! + | SUB^ term ; -NUMBER : (DIGIT)+ ; +NUMBER : (SUB) (DIGIT)+ | (DIGIT)+ ; VARIABLE: (LETTER) (LETTER | DIGIT)* ; WHITESPACE : ( '\t' | ' ' | '\u000C' )+ { |