diff --git a/core/src/main/java/org/nwapw/abacus/plugin/StandardPlugin.java b/core/src/main/java/org/nwapw/abacus/plugin/standard/StandardPlugin.java similarity index 99% rename from core/src/main/java/org/nwapw/abacus/plugin/StandardPlugin.java rename to core/src/main/java/org/nwapw/abacus/plugin/standard/StandardPlugin.java index 6c17dd8..7fb94ff 100755 --- a/core/src/main/java/org/nwapw/abacus/plugin/StandardPlugin.java +++ b/core/src/main/java/org/nwapw/abacus/plugin/standard/StandardPlugin.java @@ -1,10 +1,13 @@ -package org.nwapw.abacus.plugin; +package org.nwapw.abacus.plugin.standard; import org.nwapw.abacus.context.MutableEvaluationContext; import org.nwapw.abacus.function.*; import org.nwapw.abacus.number.NaiveNumber; import org.nwapw.abacus.number.NumberInterface; import org.nwapw.abacus.number.PreciseNumber; +import org.nwapw.abacus.plugin.NumberImplementation; +import org.nwapw.abacus.plugin.Plugin; +import org.nwapw.abacus.plugin.PluginManager; import org.nwapw.abacus.plugin.standard.operator.*; import java.util.ArrayList; diff --git a/core/src/main/kotlin/org/nwapw/abacus/Abacus.kt b/core/src/main/kotlin/org/nwapw/abacus/Abacus.kt index 4272aa8..f84f25a 100644 --- a/core/src/main/kotlin/org/nwapw/abacus/Abacus.kt +++ b/core/src/main/kotlin/org/nwapw/abacus/Abacus.kt @@ -8,7 +8,7 @@ import org.nwapw.abacus.parsing.LexerTokenizer import org.nwapw.abacus.parsing.ShuntingYardParser import org.nwapw.abacus.parsing.TreeBuilder import org.nwapw.abacus.plugin.PluginManager -import org.nwapw.abacus.plugin.StandardPlugin +import org.nwapw.abacus.plugin.standard.StandardPlugin import org.nwapw.abacus.tree.EvaluationResult import org.nwapw.abacus.tree.NumberReducer import org.nwapw.abacus.tree.TreeNode diff --git a/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorCaret.kt b/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorCaret.kt index c820150..b673851 100644 --- a/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorCaret.kt +++ b/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorCaret.kt @@ -5,7 +5,7 @@ import org.nwapw.abacus.function.NumberOperator import org.nwapw.abacus.function.OperatorAssociativity import org.nwapw.abacus.function.OperatorType import org.nwapw.abacus.number.NumberInterface -import org.nwapw.abacus.plugin.StandardPlugin.* +import org.nwapw.abacus.plugin.standard.StandardPlugin.* /** * The power operator. diff --git a/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorNcr.kt b/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorNcr.kt index 7b1a45d..15cada8 100644 --- a/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorNcr.kt +++ b/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorNcr.kt @@ -5,7 +5,7 @@ import org.nwapw.abacus.function.NumberOperator import org.nwapw.abacus.function.OperatorAssociativity import org.nwapw.abacus.function.OperatorType import org.nwapw.abacus.number.NumberInterface -import org.nwapw.abacus.plugin.StandardPlugin.* +import org.nwapw.abacus.plugin.standard.StandardPlugin.* /** * The "N choose R" operator. diff --git a/core/src/test/java/org/nwapw/abacus/tests/CalculationTests.java b/core/src/test/java/org/nwapw/abacus/tests/CalculationTests.java index b1c0cd4..f4d5597 100755 --- a/core/src/test/java/org/nwapw/abacus/tests/CalculationTests.java +++ b/core/src/test/java/org/nwapw/abacus/tests/CalculationTests.java @@ -7,7 +7,7 @@ import org.nwapw.abacus.Abacus; import org.nwapw.abacus.config.Configuration; import org.nwapw.abacus.exception.DomainException; import org.nwapw.abacus.number.NumberInterface; -import org.nwapw.abacus.plugin.StandardPlugin; +import org.nwapw.abacus.plugin.standard.StandardPlugin; import org.nwapw.abacus.tree.TreeNode; public class CalculationTests { diff --git a/core/src/test/java/org/nwapw/abacus/tests/RangeTests.java b/core/src/test/java/org/nwapw/abacus/tests/RangeTests.java index 85f3bc0..a9c0cf1 100644 --- a/core/src/test/java/org/nwapw/abacus/tests/RangeTests.java +++ b/core/src/test/java/org/nwapw/abacus/tests/RangeTests.java @@ -9,7 +9,7 @@ import org.nwapw.abacus.number.NaiveNumber; import org.nwapw.abacus.number.NumberInterface; import org.nwapw.abacus.number.NumberRange; import org.nwapw.abacus.number.PreciseNumber; -import org.nwapw.abacus.plugin.StandardPlugin; +import org.nwapw.abacus.plugin.standard.StandardPlugin; import java.util.function.Function; diff --git a/fx/src/main/java/org/nwapw/abacus/fx/AbacusController.java b/fx/src/main/java/org/nwapw/abacus/fx/AbacusController.java index 25f8632..fc9d6cb 100644 --- a/fx/src/main/java/org/nwapw/abacus/fx/AbacusController.java +++ b/fx/src/main/java/org/nwapw/abacus/fx/AbacusController.java @@ -19,7 +19,7 @@ import org.nwapw.abacus.number.*; import org.nwapw.abacus.plugin.ClassFinder; import org.nwapw.abacus.plugin.PluginListener; import org.nwapw.abacus.plugin.PluginManager; -import org.nwapw.abacus.plugin.StandardPlugin; +import org.nwapw.abacus.plugin.standard.StandardPlugin; import org.nwapw.abacus.tree.EvaluationResult; import org.nwapw.abacus.tree.TreeNode;