Skip to content

Add mod and div error message #92

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
sabotack merged 1 commit into from
May 17, 2023
Merged

Add mod and div error message #92

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 13 additions & 3 deletions src/main/interpreter/Visitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ public MSType visitFuncCall(MineScriptParser.FuncCallContext ctx) {
}

if (actualParams.size() != 1 || !(actualParams.get(0) instanceof MSBool b)) {
throw new RuntimeException(getFuncCallErrorMessage(id, new int[]{1}, "bool", actualParams));
throw new RuntimeException(getFuncCallErrorMessage(id, new int[]{0, 1}, "bool", actualParams));
}

shouldBreak = b.getValue();
Expand Down Expand Up @@ -689,8 +689,18 @@ private MSNumber calculateArithmeticExpression(MSNumber left, MSNumber right, St
case "+" -> leftBig.add(rightBig);
case "-" -> leftBig.subtract(rightBig);
case "*" -> leftBig.multiply(rightBig);
case "/" -> leftBig.divide(rightBig);
case "%" -> leftBig.mod(rightBig);
case "/" -> {
if (rightBig.equals(BigInteger.ZERO)) {
throw new RuntimeException("Cannot divide by 0");
}
yield leftBig.divide(rightBig);
}
case "%" -> {
if (rightBig.compareTo(BigInteger.ZERO) <= 0) {
throw new RuntimeException("Modulus must be positive");
}
yield leftBig.mod(rightBig);
}
case "^" -> leftBig.pow(rightBig.intValue());
default -> throw new RuntimeException("Unknown operator: " + operator);
};
Expand Down