From 0ebc9190802ed9770b27153ccbcb17b60af4f2bd Mon Sep 17 00:00:00 2001 From: kwaroran Date: Thu, 25 Apr 2024 14:43:52 +0900 Subject: [PATCH] Fix toRPN cac --- src/ts/process/infunctions.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ts/process/infunctions.ts b/src/ts/process/infunctions.ts index 71262537..80045d42 100644 --- a/src/ts/process/infunctions.ts +++ b/src/ts/process/infunctions.ts @@ -17,12 +17,12 @@ function toRPN(expression:string) { }; expression = expression.replace(/\s+/g, ''); - let expression2 = expression.split(/([\+\-\*\/\^\%\>\<])/).filter(token => token); + let expression2 = expression.split(/([\+\-\*\/\^\%\>\<\|\&])/).filter(token => token); expression2.forEach(token => { if (parseFloat(token) || token === '0') { outputQueue += token + ' '; - } else if ('+-*/^%><'.includes(token)) { + } else if ('+-*/^%><|&'.includes(token)) { while (operatorStack.length > 0 && ((operators[token].associativity === 'Left' && operators[token].precedence <= operators[operatorStack[operatorStack.length - 1]].precedence) ||