fix very very *many* bugs

Nickid2018 · Mar 6, 2023 · 8260771 · 8260771
1 parent 208ca35
commit 8260771
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.github.nickid2018</groupId>
     <artifactId>smcl</artifactId>
-    <version>1.0.3</version>
+    <version>1.0.4</version>
     <packaging>jar</packaging>
     <name>smcl</name>
     <url>https://github.com/Nickid2018/SMCL</url>

diff --git a/src/main/java/io/github/nickid2018/smcl/functions/BinaryFunctionBuilder.java b/src/main/java/io/github/nickid2018/smcl/functions/BinaryFunctionBuilder.java
@@ -120,10 +120,10 @@ public static BinaryFunctionBuilder createBuilder(String name) {
     }
 
     @Override
-    public Statement create(Statement... statements) {
+    public Statement create(boolean optimize, Statement... statements) {
         Statement source1 = statements[0];
         Statement source2 = statements[1];
-        if(source1 instanceof NumberStatement && source2 instanceof NumberStatement) {
+        if(source1 instanceof NumberStatement && source2 instanceof NumberStatement && optimize) {
             NumberObject value1 = source1.calculate(null);
             value1 = resolveVariable1.accept(value1, source1.getSMCL());
             domainCheck1.accept(value1);

diff --git a/src/main/java/io/github/nickid2018/smcl/functions/FunctionBuilder.java b/src/main/java/io/github/nickid2018/smcl/functions/FunctionBuilder.java
@@ -172,5 +172,5 @@ public String getName() {
      * @param statements an array contains arguments
      * @return a statement
      */
-    public abstract Statement create(Statement... statements);
+    public abstract Statement create(boolean optimize, Statement... statements);
 }
diff --git a/src/main/java/io/github/nickid2018/smcl/functions/UnaryFunctionBuilder.java b/src/main/java/io/github/nickid2018/smcl/functions/UnaryFunctionBuilder.java
@@ -48,10 +48,14 @@ public static UnaryFunctionBuilder createBuilder(String name) {
         return new UnaryFunctionBuilder(name);
     }
 
-    @Override
     public Statement create(Statement... statements) {
+        return create(true, statements);
+    }
+
+    @Override
+    public Statement create(boolean optimize, Statement... statements) {
         Statement source = statements[0];
-        if (source instanceof NumberStatement) {
+        if (source instanceof NumberStatement && optimize) {
             NumberObject value = source.calculate(null);
             value = resolveVariable.accept(value, source.getSMCL());
             domainCheck.accept(value);

diff --git a/src/main/java/io/github/nickid2018/smcl/parser/BinaryFunctionParser.java b/src/main/java/io/github/nickid2018/smcl/parser/BinaryFunctionParser.java
@@ -34,10 +34,10 @@ public class BinaryFunctionParser extends FunctionParser {
 
     /**
      * Construct a parser.
-     * @param unary the function builder
+     * @param binary the function builder
      */
-    public BinaryFunctionParser(BinaryFunctionBuilder unary) {
-        map = unary::create;
+    public BinaryFunctionParser(BinaryFunctionBuilder binary) {
+        map = statements -> binary.create(optimize, statements);
     }
 
     @Override

diff --git a/src/main/java/io/github/nickid2018/smcl/parser/FunctionParser.java b/src/main/java/io/github/nickid2018/smcl/parser/FunctionParser.java
@@ -24,6 +24,13 @@
  */
 public abstract class FunctionParser {
 
+    protected boolean optimize = true;
+
+    public FunctionParser noOptimize() {
+        optimize = false;
+        return this;
+    }
+
     /**
      * Returns whether it has two or more arguments.
      * @return true if the arguments count >1

diff --git a/src/main/java/io/github/nickid2018/smcl/parser/UnaryFunctionParser.java b/src/main/java/io/github/nickid2018/smcl/parser/UnaryFunctionParser.java
@@ -35,7 +35,7 @@ public class UnaryFunctionParser extends FunctionParser {
      * @param unary the function builder
      */
     public UnaryFunctionParser(UnaryFunctionBuilder unary) {
-        map = unary::create;
+        map = statements -> unary.create(optimize, statements);
     }
 
     @Override

diff --git a/src/main/java/io/github/nickid2018/smcl/statements/arith/MathStatement.java b/src/main/java/io/github/nickid2018/smcl/statements/arith/MathStatement.java
@@ -77,9 +77,21 @@ public MathStatement(SMCLContext smcl, VariableList variables, boolean isNegativ
      */
     public MathStatement(SMCLContext smcl, VariableList variables, boolean isNegative, List<Statement> subStatements) {
         super(smcl, variables, isNegative);
-        this.subStatements = Collections.unmodifiableList(subStatements);
+        this.subStatements = Collections.unmodifiableList(expand(subStatements));
     }
 
+    private static List<Statement> expand(List<Statement> statement) {
+        List<Statement> list = new ArrayList<>();
+        for (Statement en : statement) {
+            if (en instanceof MathStatement)
+                expand(((MathStatement) en).subStatements).stream()
+                        .map(s -> en.isNegative() ? s.negate() : s)
+                        .forEach(list::add);
+            else
+                list.add(en);
+        }
+        return list;
+    }
 
     @Override
     public Statement negate() {