mincomk/risuai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix toRPN cac

Browse Source
This commit is contained in:
kwaroran
2024-04-25 14:43:52 +09:00
parent a476bc9c05
commit 0ebc919080
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ts/process/infunctions.ts
View File

@@ -17,12 +17,12 @@ function toRPN(expression:string) {
}; };
expression = expression.replace(/\s+/g, ''); expression = expression.replace(/\s+/g, '');
let expression2 = expression.split(/([\+\-\*\/\^\%\>\<])/).filter(token => token); let expression2 = expression.split(/([\+\-\*\/\^\%\>\<\|\&])/).filter(token => token);
expression2.forEach(token => { expression2.forEach(token => {
if (parseFloat(token) || token === '0') { if (parseFloat(token) || token === '0') {
outputQueue += token + ' '; outputQueue += token + ' ';
} else if ('+-*/^%><'.includes(token)) { } else if ('+-*/^%><|&'.includes(token)) {
while (operatorStack.length > 0 && while (operatorStack.length > 0 &&
((operators[token].associativity === 'Left' && ((operators[token].associativity === 'Left' &&
operators[token].precedence <= operators[operatorStack[operatorStack.length - 1]].precedence) || operators[token].precedence <= operators[operatorStack[operatorStack.length - 1]].precedence) ||