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

Add ^ and % to calc

Browse Source
This commit is contained in:
kwaroran
2024-04-25 02:47:44 +09:00
parent bac475f22f
commit edeb77e085
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,16 +7,17 @@ function toRPN(expression:string) {
'-': {precedence: 2, associativity: 'Left'}, '-': {precedence: 2, associativity: 'Left'},
'*': {precedence: 3, associativity: 'Left'}, '*': {precedence: 3, associativity: 'Left'},
'/': {precedence: 3, associativity: 'Left'}, '/': {precedence: 3, associativity: 'Left'},
'^': {precedence: 4, associativity: 'Right'}, '^': {precedence: 4, associativity: 'Left'},
'%': {precedence: 3, associativity: 'Left'},
}; };
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) ||
@@ -50,6 +51,7 @@ function calculateRPN(expression:string) {
case '*': stack.push(a * b); break; case '*': stack.push(a * b); break;
case '/': stack.push(a / b); break; case '/': stack.push(a / b); break;
case '^': stack.push(a ** b); break; case '^': stack.push(a ** b); break;
case '%': stack.push(a % b); break;
} }
} }
}); });