Skip to content

Commit 38f0b1f

Browse files
committed
fix: change priority of mathematical operations
1 parent 7be087d commit 38f0b1f

1 file changed

Lines changed: 23 additions & 11 deletions

File tree

uvl/UVLBase.g4

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,29 @@ equation
7272
| expression NOT_EQUALS expression # NotEqualsEquation
7373
;
7474

75-
expression:
76-
FLOAT # FloatLiteralExpression
77-
| INTEGER # IntegerLiteralExpression
78-
| STRING # StringLiteralExpression
79-
| aggregateFunction # AggregateFunctionExpression
80-
| reference # LiteralExpression
81-
| OPEN_PAREN expression CLOSE_PAREN # BracketExpression
82-
| expression ADD expression # AddExpression
83-
| expression SUB expression # SubExpression
84-
| expression MUL expression # MulExpression
85-
| expression DIV expression # DivExpression
75+
expression
76+
: additiveExpression
77+
;
78+
79+
additiveExpression
80+
: additiveExpression ADD multiplicativeExpression # AddExpression
81+
| additiveExpression SUB multiplicativeExpression # SubExpression
82+
| multiplicativeExpression # MultiplicativeExpr
83+
;
84+
85+
multiplicativeExpression
86+
: multiplicativeExpression MUL atom # MulExpression
87+
| multiplicativeExpression DIV atom # DivExpression
88+
| atom # AtomExpression
89+
;
90+
91+
atom
92+
: FLOAT # FloatLiteralExpression
93+
| INTEGER # IntegerLiteralExpression
94+
| STRING # StringLiteralExpression
95+
| aggregateFunction # AggregateFunctionExpression
96+
| reference # LiteralExpression
97+
| OPEN_PAREN expression CLOSE_PAREN # BracketExpression
8698
;
8799

88100
aggregateFunction

0 commit comments

Comments
 (0)