hopefully the last beauty fix

lpapailiou · Jul 4, 2021 · a40c4c5 · a40c4c5
1 parent 1d9da5c
commit a40c4c5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>fac</groupId>
     <artifactId>fac</artifactId>
-    <version>2.3.7</version>
+    <version>2.3.8</version>
 
     <dependencies>
         <dependency>

diff --git a/src/main/java/parser/parsetree/BinaryOperator.java b/src/main/java/parser/parsetree/BinaryOperator.java
@@ -115,6 +115,21 @@ public enum BinaryOperator {
      */
     PLUS("+", (a, b) -> {
         if (Type.getByInput(a) == Type.STRING || Type.getByInput(b) == Type.STRING) {
+            if (Type.getByInput(a) == Type.NUMERIC) {
+                double doubleValue = Double.parseDouble(a.toString());
+                String result = doubleValue + "";
+                if (doubleValue == Math.floor(doubleValue)) {
+                    result = ((int) doubleValue) + "";
+                }
+                return "'" + (result + (b.toString())).replaceAll("'", "") + "'";
+            } else if (Type.getByInput(b) == Type.NUMERIC) {
+                double doubleValue = Double.parseDouble(b.toString());
+                String result = doubleValue + "";
+                if (doubleValue == Math.floor(doubleValue)) {
+                    result = ((int) doubleValue) + "";
+                }
+                return "'" + (a.toString() + (result)).replaceAll("'", "") + "'";
+            }
             return "'" + (a.toString() + (b.toString())).replaceAll("'", "") + "'";
         } else {
             return Double.parseDouble(a.toString()) + Double.parseDouble(b.toString());