Skip to content

Fix wrong priority of mathematical operations #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SundermannC merged 3 commits into from
Jul 24, 2025
Merged

Fix wrong priority of mathematical operations #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38f0b1f
fix: change priority of mathematical operations
MiriamGaus May 18, 2025
92015db
test: add uvl model for mathematically correct expressions
MiriamGaus May 18, 2025
7c4a14e
refactor: atom to primaryExpression
MiriamGaus May 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions tests/parsing/expressions.uvl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
features
A
or
B {Price 2, Fun 12}
C {Price 7, Fun 6}
constraints
B.Fun + C.Fun - B.Price == 16
B.Fun + (C.Fun - B.Price) == 16
B.Fun + C.Fun * B.Price == 24
B.Fun + (C.Fun * B.Price) == 24
B.Fun + C.Fun / B.Price == 15
B.Fun + (C.Fun / B.Price) == 15
B.Fun - C.Fun + B.Price == 8
B.Fun - (C.Fun + B.Price) == 4
B.Fun - C.Fun * B.Price == 0
B.Fun - (C.Fun * B.Price) == 0
B.Fun - C.Fun / B.Price == 9
B.Fun - (C.Fun / B.Price) == 9
B.Fun * C.Fun / B.Price == 36
B.Fun * (C.Fun / B.Price) == 36
B.Fun * C.Fun - B.Price == 70
B.Fun * (C.Fun - B.Price) == 48
B.Fun * C.Fun + B.Price == 74
B.Fun * (C.Fun + B.Price) == 96
B.Fun / C.Fun * B.Price == 4
B.Fun / (C.Fun * B.Price) == 1
B.Fun / C.Fun + B.Price == 4
B.Fun / (C.Fun + B.Price) == 1.5
B.Fun / C.Fun - B.Price == 0
B.Fun / (C.Fun - B.Price) == 3
36 changes: 24 additions & 12 deletions uvl/UVLBase.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,17 +72,29 @@ equation
| expression NOT_EQUALS expression # NotEqualsEquation
;

expression:
FLOAT # FloatLiteralExpression
| INTEGER # IntegerLiteralExpression
| STRING # StringLiteralExpression
| aggregateFunction # AggregateFunctionExpression
| reference # LiteralExpression
| OPEN_PAREN expression CLOSE_PAREN # BracketExpression
| expression ADD expression # AddExpression
| expression SUB expression # SubExpression
| expression MUL expression # MulExpression
| expression DIV expression # DivExpression
expression
: additiveExpression
;

additiveExpression
: additiveExpression ADD multiplicativeExpression # AddExpression
| additiveExpression SUB multiplicativeExpression # SubExpression
| multiplicativeExpression # MultiplicativeExpr
;

multiplicativeExpression
: multiplicativeExpression MUL primaryExpression # MulExpression
| multiplicativeExpression DIV primaryExpression # DivExpression
| primaryExpression # PrimaryExpressionExpression
;

primaryExpression
: FLOAT # FloatLiteralExpression
| INTEGER # IntegerLiteralExpression
| STRING # StringLiteralExpression
| aggregateFunction # AggregateFunctionExpression
| reference # LiteralExpression
| OPEN_PAREN expression CLOSE_PAREN # BracketExpression
;

aggregateFunction
Expand Down Expand Up @@ -160,4 +172,4 @@ SKIP_

fragment SPACES
: [ \t]+
;
;