From d134acdbc12a2d16dadc129f233daeec2b1c9fb8 Mon Sep 17 00:00:00 2001
From: krolxon <krolyxon@tutanota.com>
Date: Thu, 15 Feb 2024 00:09:10 +0530
Subject: [PATCH] fix duplicate digit at end

---
 Calculator.java      |   8 +++++++-
 Parser.java          |  19 +++++++++++++++----
 bin/Calculator.class | Bin 0 -> 678 bytes
 bin/Parser.class     | Bin 0 -> 3077 bytes
 4 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 bin/Calculator.class
 create mode 100644 bin/Parser.class

diff --git a/Calculator.java b/Calculator.java
index 031fa57..43804c3 100644
--- a/Calculator.java
+++ b/Calculator.java
@@ -1,8 +1,14 @@
 public class Calculator {
     public static void main(String[] args) {
         String expr = "(84 / 4 * 3 - 9) * 2 + 1 / 5"; // 108.2
-        Parser p = new Parser(expr);
+        Parser p;
+        if (args.length == 0) {
+            p = new Parser(expr);
+        } else {
+            p = new Parser(args[0]);
+        }
         String postfix = p.toPostFix();
+        // System.out.println("pfix => \t " + postfix);
         System.out.println(p.evalExpr(postfix));
     }
 }
diff --git a/Parser.java b/Parser.java
index c588052..de41371 100644
--- a/Parser.java
+++ b/Parser.java
@@ -1,4 +1,6 @@
 /* Todo
+* - Fix this:
+* when expression = 5+10*(10), it misses +
 * - Add support for trigonometric functions
 * - Remove all edge cases
 */
@@ -70,6 +72,9 @@ public class Parser {
         // Main Expression Iteration
         for (int i = 0; i < infix.length; i++) {
             char c = infix[i];
+
+            // Keep appending digits to the operand StringBuilder and skip iterations till
+            // we find a operator.
             if (isOperand(c)) {
                 operand.append(infix[i]);
                 if (i < infix.length - 1) {
@@ -90,14 +95,22 @@ public class Parser {
                 }
                 operatorStack.pop();
             } else {
+                // Manage precedence order of operatorStack operators
                 while (!operatorStack.isEmpty() && getPresedence(c) <= getPresedence((char) operatorStack.peek())
                         && hasLeftAssociativity(c)) {
                     output.add(operatorStack.pop().toString());
                 }
-                operatorStack.push(c);
+
+                // For whatever reason, the last digit gets added to the operatorStack, leading
+                // to a duplicate of last digit in the expression
+                // To fix this, we again make sure that the current char is not a operand.
+                if (!isOperand(c)) {
+                    operatorStack.push(c);
+                }
             }
         }
 
+        // pop all the operators left in the operatorStack after the loop is done.
         while (!operatorStack.isEmpty()) {
             if (operatorStack.peek() == '(') {
                 return "This expression is invalid";
@@ -105,9 +118,7 @@ public class Parser {
             output.add(operatorStack.pop().toString());
         }
 
-        // last digit gets duplicate entry for some reason, so have to remove it.
-        String op = output.toString();
-        return op.substring(0, op.length() -2);
+        return output.toString();
     }
 
     private Double evaluate(String operator, Double op1, Double op2) {
diff --git a/bin/Calculator.class b/bin/Calculator.class
new file mode 100644
index 0000000000000000000000000000000000000000..2b34176a17f8031429c7dba62dfb1bff8fa5c5b9
GIT binary patch
literal 678
zcmZ`$+iuf95IvJP-PkxuX_Ip6#pP-{35HT6P!SSp=~G%F1w}$UZGu&~ICkW0s`4xR
z0MGD{N+9(E_@)XmYaXho!Yj?3-JLn-tmpTipXUJHplzXmqJUwegayLlu{@DMER&<)
z-QYMJD#F66D2dc-Lecg5Wt0i4?u%_FaJC)adFHg8mmY&Hr|CT9!{-7P_jF}82{Q{O
zY|UIDG~CW5cTZ(ea<t?1bw$m_BCZomm3GsK+K)~Nb=SLEZekgAfrgD0+?ey)`!Z4C
zh%Kg5cHH>a8l^#(WfY5ra<rqRZrQkvJA`t0BICEG<Lp1a_AIPnU0}n8gH6J6ZhfAR
zAjX<LP6&p(=k*2d5v*Mq52vwIDRUdU>8FrT>qJR-I2{eb?7bYsd}54b#BD3?$E&aO
z`h-eP$>HY%InL_^{Q1}Be~-0#=`<UL`;n%sT?#+eZn25GJX`%0Kzh0y@AGbrGjT5Y
zXQ1y42oE^wYmH4j#3RnSRKef{JXsPQ|NJXzzhHi7p5fZTH&iwDi(7ivnxT65152&;
w3^!+3)vSe_bsd6nkyi<2)~IvbfW_=K0#xAgZ54$JJy-7nmSBBCGw*Nx1!rW7-~a#s

literal 0
HcmV?d00001

diff --git a/bin/Parser.class b/bin/Parser.class
new file mode 100644
index 0000000000000000000000000000000000000000..5332f06284284380a7e8bef8d9eb9fb277f4765f
GIT binary patch
literal 3077
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
Wy8!dGSwrY58vmd#iiadB@BIT&6|?mK

literal 0
HcmV?d00001