From 0c94c8cf85824c2a8798a4c72d345738b1583388 Mon Sep 17 00:00:00 2001
From: Roman / Linnea Gräf <roman.graef@gmail.com>
Date: Thu, 6 Jul 2023 12:41:33 +0200
Subject: Fix calculator preop operations (#758)

Fix calculator postop operations
---
 .../io/github/moulberry/notenoughupdates/util/Calculator.java    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/util/Calculator.java b/src/main/java/io/github/moulberry/notenoughupdates/util/Calculator.java
index 0762d107..2b741e94 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/util/Calculator.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/util/Calculator.java
@@ -98,7 +98,7 @@ public class Calculator {
 
 	public static List<Token> lex(String source) throws CalculatorException {
 		List<Token> tokens = new ArrayList<>();
-		boolean justParsedNumber = false;
+		boolean doesNotHaveLValue = true;
 		for (int i = 0; i < source.length(); ) {
 			char c = source.charAt(i);
 			if (Character.isWhitespace(c)) {
@@ -107,7 +107,7 @@ public class Calculator {
 			}
 			Token token = new Token();
 			token.tokenStart = i;
-			if (!justParsedNumber && c == '-') {
+			if (doesNotHaveLValue && c == '-') {
 				token.tokenLength = 1;
 				token.type = TokenType.PREOP;
 				token.operatorValue = "-";
@@ -175,7 +175,8 @@ public class Calculator {
 			} else {
 				throw new CalculatorException("Unknown thing " + c, i, 1);
 			}
-			justParsedNumber = token.type == TokenType.NUMBER || token.type == TokenType.VARIABLE;
+			doesNotHaveLValue =
+				token.type == TokenType.LPAREN || token.type == TokenType.PREOP || token.type == TokenType.BINOP;
 			tokens.add(token);
 			i += token.tokenLength;
 		}
@@ -218,7 +219,7 @@ public class Calculator {
 						Token l = op.peek();
 						if (l.type == TokenType.LPAREN)
 							break;
-						assert (l.type == TokenType.BINOP);
+						assert (l.type == TokenType.BINOP || l.type == TokenType.PREOP);
 						int pl = getPrecedence(l);
 						if (pl >= p) { // Association order
 							out.add(op.pop());
-- 
cgit