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

Add exponentiation operator to toRPN and calculateRPN functions

Browse Source
This commit is contained in:
kwaroran
2024-03-24 19:19:42 +09:00
parent fd50692ab0
commit 342052a0a4
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,8 @@ 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: 4, associativity: 'Right'},
};
expression = expression.replace(/\s+/g, '');
@@ -15,7 +16,7 @@ function toRPN(expression:string) {
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) ||
@@ -48,6 +49,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;
}
}
});