Make it put no spaces around **

Author: MarcellPerger1

src/main/java/net/marcellperger/mathexpr/BinaryOperationLeftRight.java

@@ -37,6 +37,11 @@ public MathSymbol getRight() {
         return SymbolInfo.infixFromClass(getClass());
     }
 
+    @Contract(pure = true)
+    public @Nullable String getSpacesAroundInfixInst() {
+        return SymbolInfo.spacesAroundInfixFromClass(getClass());
+    }
+
     @Contract(pure = true)
     public @Nullable GroupingDirection getGroupingDirectionInst() {
         return SymbolInfo.groupingDirectionFromClass(getClass());
@@ -46,9 +51,11 @@ public MathSymbol getRight() {
     public String fmt() {
         String infix = getInfixInst();
         if(infix == null) return BinaryOperation.super.fmt(); // fallback
-        return "%s %s %s".formatted(
+        return "%s%s%s%s%s".formatted(
                 left.fmtWithParensIfRequired(instPrecedenceInt(), _parensRequiredIfEqual(LeftRight.LEFT)),
+                getSpacesAroundInfixInst(),
                 infix,
+                getSpacesAroundInfixInst(),
                 right.fmtWithParensIfRequired(instPrecedenceInt(), _parensRequiredIfEqual(LeftRight.RIGHT)));
     }
 

src/main/java/net/marcellperger/mathexpr/SymbolInfo.java

@@ -19,12 +19,13 @@
 
 public enum SymbolInfo {
     // Let's say that precedence 0 is for (parens) OR literals - TODO add a class?? but it wouldn't actually be used !
-    POW(PowOperation.class, 1, GroupingDirection.RightToLeft, "**", PowOperation::new),
-    MUL(MulOperation.class, 2, GroupingDirection.LeftToRight, "*", MulOperation::new),
-    DIV(DivOperation.class, 2, GroupingDirection.LeftToRight, "/", DivOperation::new),
+    POW(PowOperation.class, 1, GroupingDirection.RightToLeft, "**", "", PowOperation::new),
 
-    ADD(AddOperation.class, 3, GroupingDirection.LeftToRight, "+", AddOperation::new),
-    SUB(SubOperation.class, 3, GroupingDirection.LeftToRight, "-", SubOperation::new),
+    MUL(MulOperation.class, 2, GroupingDirection.LeftToRight, "*", " ", MulOperation::new),
+    DIV(DivOperation.class, 2, GroupingDirection.LeftToRight, "/", " ", DivOperation::new),
+
+    ADD(AddOperation.class, 3, GroupingDirection.LeftToRight, "+", " ", AddOperation::new),
+    SUB(SubOperation.class, 3, GroupingDirection.LeftToRight, "-", " ", SubOperation::new),
     ;
 
     public static final Map<Class<? extends MathSymbol>, SymbolInfo> CLS_TO_INFO_MAP;
@@ -37,22 +38,25 @@ public enum SymbolInfo {
     public final Class<? extends MathSymbol> cls;
     public final GroupingDirection groupingDirection;
     public final String infix;
+    public final @Nullable String spacesAroundInfix;
 
     @SuppressWarnings("unused")  // useful later
     SymbolInfo(Class<? extends MathSymbol> cls, int precedence,
-               GroupingDirection groupingDirection, @Nullable String infix) {
+               GroupingDirection groupingDirection, @Nullable String spacesAroundInfix, @Nullable String infix) {
         this.precedence = precedence;
-        this.cls = cls;  // TODO: private + getters?
+        this.cls = cls;
         this.groupingDirection = groupingDirection;
         this.infix = infix;
+        this.spacesAroundInfix = spacesAroundInfix;
     }
     SymbolInfo(Class<? extends BinaryOperationLeftRight> cls, int precedence,
-               GroupingDirection groupingDirection, @Nullable String infix,
+               GroupingDirection groupingDirection, @Nullable String infix, @Nullable String spacesAroundInfix,
                BinOpBiConstructor biConstructor) {
         this.precedence = precedence;
         this.cls = cls;  // TODO: private + getters?
         this.groupingDirection = groupingDirection;
         this.infix = infix;
+        this.spacesAroundInfix = spacesAroundInfix;
         this.biConstructorCache = biConstructor;
     }
 
@@ -70,6 +74,9 @@ public enum SymbolInfo {
     public static @Nullable String infixFromClass(Class<? extends MathSymbol> cls) {
         return Util.chainNulls(fromClass(cls), x -> x.infix);
     }
+    public static @Nullable String spacesAroundInfixFromClass(Class<? extends MathSymbol> cls) {
+        return Util.chainNulls(fromClass(cls), s -> s.spacesAroundInfix);
+    }
 
     private BinOpBiConstructor biConstructorCache = null;
     public @NotNull BinOpBiConstructor getBiConstructor() {

src/test/java/net/marcellperger/mathexpr/CommonData.java

@@ -356,10 +356,10 @@ public static ObjStringPair getBigData2_groupingParens() {
     }
 
     public static ObjStringPair getBigData3Pow_minimumParens() {
-        return new ObjStringPair(getBigData3Pow_obj(), "((-19.7 - 17.1) * (-99.6 * -49.2) * (43.6 ** (-29.1 + -68.3) - (40.6 - 58.4) / ((86.8 + 71.8) * 51.8)) / (72.4 * (-91.1 - -3.2)) - ((-27.1 ** -28.2 / -99.8 / -54.3) ** -50.2 / (-69.8 - 64.5 + 63.9 ** -92.9 + (-24.9 - (58.1 + 13.3))) + (78.0 + -34.5))) ** (12.5 - 52.3 + (32.0 / 43.5 / (37.4 - -11.4)) ** 12.2 ** 33.0) ** (-19.7 ** (11.0 / 67.9) * (46.2 / 97.6 * -13.9))");
+        return new ObjStringPair(getBigData3Pow_obj(), "((-19.7 - 17.1) * (-99.6 * -49.2) * (43.6**(-29.1 + -68.3) - (40.6 - 58.4) / ((86.8 + 71.8) * 51.8)) / (72.4 * (-91.1 - -3.2)) - ((-27.1**-28.2 / -99.8 / -54.3)**-50.2 / (-69.8 - 64.5 + 63.9**-92.9 + (-24.9 - (58.1 + 13.3))) + (78.0 + -34.5)))**(12.5 - 52.3 + (32.0 / 43.5 / (37.4 - -11.4))**12.2**33.0)**(-19.7**(11.0 / 67.9) * (46.2 / 97.6 * -13.9))");
     }
 
     public static ObjStringPair getBigData3Pow_groupingParens() {
-        return new ObjStringPair(getBigData3Pow_obj(), "(((((-19.7 - 17.1) * (-99.6 * -49.2)) * ((43.6 ** (-29.1 + -68.3)) - ((40.6 - 58.4) / ((86.8 + 71.8) * 51.8)))) / (72.4 * (-91.1 - -3.2))) - ((((((-27.1 ** -28.2) / -99.8) / -54.3) ** -50.2) / (((-69.8 - 64.5) + (63.9 ** -92.9)) + (-24.9 - (58.1 + 13.3)))) + (78.0 + -34.5))) ** (((12.5 - 52.3) + (((32.0 / 43.5) / (37.4 - -11.4)) ** (12.2 ** 33.0))) ** ((-19.7 ** (11.0 / 67.9)) * ((46.2 / 97.6) * -13.9)))");
+        return new ObjStringPair(getBigData3Pow_obj(), "(((((-19.7 - 17.1) * (-99.6 * -49.2)) * ((43.6**(-29.1 + -68.3)) - ((40.6 - 58.4) / ((86.8 + 71.8) * 51.8)))) / (72.4 * (-91.1 - -3.2))) - ((((((-27.1**-28.2) / -99.8) / -54.3)**-50.2) / (((-69.8 - 64.5) + (63.9**-92.9)) + (-24.9 - (58.1 + 13.3)))) + (78.0 + -34.5)))**(((12.5 - 52.3) + (((32.0 / 43.5) / (37.4 - -11.4))**(12.2**33.0)))**((-19.7**(11.0 / 67.9)) * ((46.2 / 97.6) * -13.9)))");
     }
 }

src/test/java/net/marcellperger/mathexpr/MathSymbolTest.java

@@ -21,11 +21,11 @@ void test_fmt() {
     @Test
     void test_fmt__pow() {
         // TODO decide spacing: `2.2**3.1` or `2.2 ** 3.1`
-        assertExprFmt(new ObjStringPair(new PowOperation(new BasicDoubleSymbol(0.2), new BasicDoubleSymbol(5.5)), "0.2 ** 5.5"));
+        assertExprFmt(new ObjStringPair(new PowOperation(new BasicDoubleSymbol(0.2), new BasicDoubleSymbol(5.5)), "0.2**5.5"));
         assertExprFmt(new ObjStringPair(new PowOperation(new PowOperation(new BasicDoubleSymbol(0.2), new BasicDoubleSymbol(5.5)), new BasicDoubleSymbol(3.3)),
-            "(0.2 ** 5.5) ** 3.3"));
+            "(0.2**5.5)**3.3"));
         assertExprFmt(new ObjStringPair(new PowOperation(new BasicDoubleSymbol(0.2), new PowOperation(new BasicDoubleSymbol(5.5), new BasicDoubleSymbol(3.3))),
-            "0.2 ** 5.5 ** 3.3"));
+            "0.2**5.5**3.3"));
         assertExprFmt(CommonData.getBigData3Pow_minimumParens());
     }