From edeb77e08568d424f0b08e8135e91b6eafdc27df Mon Sep 17 00:00:00 2001
From: kwaroran <amasio1234@proton.me>
Date: Thu, 25 Apr 2024 02:47:44 +0900
Subject: [PATCH] Add ^ and % to calc

---
 src/ts/process/infunctions.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/ts/process/infunctions.ts b/src/ts/process/infunctions.ts
index 606da561..90c3bb75 100644
--- a/src/ts/process/infunctions.ts
+++ b/src/ts/process/infunctions.ts
@@ -7,16 +7,17 @@ function toRPN(expression:string) {
         '-': {precedence: 2, 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, '');
-    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) ||
@@ -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;
             }
         }
     });