From bd0274970696fb2985442ac43581edd996b94830 Mon Sep 17 00:00:00 2001
From: Danila Fedorin <danila.fedorin@gmail.com>
Date: Sat, 23 Sep 2017 17:13:56 -0700
Subject: [PATCH] Move all the operators into a separate subpackage.

---
 core/src/main/java/org/nwapw/abacus/plugin/StandardPlugin.java  | 2 +-
 .../nwapw/abacus/plugin/standard/{ => operator}/OperatorAdd.kt  | 2 +-
 .../abacus/plugin/standard/{ => operator}/OperatorCaret.kt      | 2 +-
 .../abacus/plugin/standard/{ => operator}/OperatorDefine.kt     | 2 +-
 .../abacus/plugin/standard/{ => operator}/OperatorDivide.kt     | 2 +-
 .../abacus/plugin/standard/{ => operator}/OperatorFactorial.kt  | 2 +-
 .../abacus/plugin/standard/{ => operator}/OperatorMultiply.kt   | 2 +-
 .../nwapw/abacus/plugin/standard/{ => operator}/OperatorNcr.kt  | 2 +-
 .../abacus/plugin/standard/{ => operator}/OperatorNegate.kt     | 2 +-
 .../nwapw/abacus/plugin/standard/{ => operator}/OperatorNpr.kt  | 2 +-
 .../nwapw/abacus/plugin/standard/{ => operator}/OperatorSet.kt  | 2 +-
 .../abacus/plugin/standard/{ => operator}/OperatorSubtract.kt   | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)
 rename core/src/main/kotlin/org/nwapw/abacus/plugin/standard/{ => operator}/OperatorAdd.kt (93%)
 rename core/src/main/kotlin/org/nwapw/abacus/plugin/standard/{ => operator}/OperatorCaret.kt (97%)
 rename core/src/main/kotlin/org/nwapw/abacus/plugin/standard/{ => operator}/OperatorDefine.kt (95%)
 rename core/src/main/kotlin/org/nwapw/abacus/plugin/standard/{ => operator}/OperatorDivide.kt (93%)
 rename core/src/main/kotlin/org/nwapw/abacus/plugin/standard/{ => operator}/OperatorFactorial.kt (96%)
 rename core/src/main/kotlin/org/nwapw/abacus/plugin/standard/{ => operator}/OperatorMultiply.kt (93%)
 rename core/src/main/kotlin/org/nwapw/abacus/plugin/standard/{ => operator}/OperatorNcr.kt (95%)
 rename core/src/main/kotlin/org/nwapw/abacus/plugin/standard/{ => operator}/OperatorNegate.kt (93%)
 rename core/src/main/kotlin/org/nwapw/abacus/plugin/standard/{ => operator}/OperatorNpr.kt (97%)
 rename core/src/main/kotlin/org/nwapw/abacus/plugin/standard/{ => operator}/OperatorSet.kt (95%)
 rename core/src/main/kotlin/org/nwapw/abacus/plugin/standard/{ => operator}/OperatorSubtract.kt (93%)

diff --git a/core/src/main/java/org/nwapw/abacus/plugin/StandardPlugin.java b/core/src/main/java/org/nwapw/abacus/plugin/StandardPlugin.java
index c2ec80a..6c17dd8 100755
--- a/core/src/main/java/org/nwapw/abacus/plugin/StandardPlugin.java
+++ b/core/src/main/java/org/nwapw/abacus/plugin/StandardPlugin.java
@@ -5,7 +5,7 @@ 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.standard.*;
+import org.nwapw.abacus.plugin.standard.operator.*;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/OperatorAdd.kt b/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorAdd.kt
similarity index 93%
rename from core/src/main/kotlin/org/nwapw/abacus/plugin/standard/OperatorAdd.kt
rename to core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorAdd.kt
index 0f1c7d4..17db073 100644
--- a/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/OperatorAdd.kt
+++ b/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorAdd.kt
@@ -1,4 +1,4 @@
-package org.nwapw.abacus.plugin.standard
+package org.nwapw.abacus.plugin.standard.operator
 
 import org.nwapw.abacus.context.MutableEvaluationContext
 import org.nwapw.abacus.function.NumberOperator
diff --git a/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/OperatorCaret.kt b/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorCaret.kt
similarity index 97%
rename from core/src/main/kotlin/org/nwapw/abacus/plugin/standard/OperatorCaret.kt
rename to core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorCaret.kt
index db81267..c820150 100644
--- a/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/OperatorCaret.kt
+++ b/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorCaret.kt
@@ -1,4 +1,4 @@
-package org.nwapw.abacus.plugin.standard
+package org.nwapw.abacus.plugin.standard.operator
 
 import org.nwapw.abacus.context.MutableEvaluationContext
 import org.nwapw.abacus.function.NumberOperator
diff --git a/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/OperatorDefine.kt b/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorDefine.kt
similarity index 95%
rename from core/src/main/kotlin/org/nwapw/abacus/plugin/standard/OperatorDefine.kt
rename to core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorDefine.kt
index 6cb4979..8eff979 100644
--- a/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/OperatorDefine.kt
+++ b/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorDefine.kt
@@ -1,4 +1,4 @@
-package org.nwapw.abacus.plugin.standard
+package org.nwapw.abacus.plugin.standard.operator
 
 import org.nwapw.abacus.context.MutableEvaluationContext
 import org.nwapw.abacus.function.OperatorAssociativity
diff --git a/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/OperatorDivide.kt b/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorDivide.kt
similarity index 93%
rename from core/src/main/kotlin/org/nwapw/abacus/plugin/standard/OperatorDivide.kt
rename to core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorDivide.kt
index 55eeb1e..94ad35a 100644
--- a/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/OperatorDivide.kt
+++ b/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorDivide.kt
@@ -1,4 +1,4 @@
-package org.nwapw.abacus.plugin.standard
+package org.nwapw.abacus.plugin.standard.operator
 
 import org.nwapw.abacus.context.MutableEvaluationContext
 import org.nwapw.abacus.function.NumberOperator
diff --git a/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/OperatorFactorial.kt b/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorFactorial.kt
similarity index 96%
rename from core/src/main/kotlin/org/nwapw/abacus/plugin/standard/OperatorFactorial.kt
rename to core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorFactorial.kt
index 5af7970..64071a8 100644
--- a/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/OperatorFactorial.kt
+++ b/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorFactorial.kt
@@ -1,4 +1,4 @@
-package org.nwapw.abacus.plugin.standard
+package org.nwapw.abacus.plugin.standard.operator
 
 import org.nwapw.abacus.context.MutableEvaluationContext
 import org.nwapw.abacus.function.NumberOperator
diff --git a/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/OperatorMultiply.kt b/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorMultiply.kt
similarity index 93%
rename from core/src/main/kotlin/org/nwapw/abacus/plugin/standard/OperatorMultiply.kt
rename to core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorMultiply.kt
index 98064fb..a92e8ba 100644
--- a/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/OperatorMultiply.kt
+++ b/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorMultiply.kt
@@ -1,4 +1,4 @@
-package org.nwapw.abacus.plugin.standard
+package org.nwapw.abacus.plugin.standard.operator
 
 import org.nwapw.abacus.context.MutableEvaluationContext
 import org.nwapw.abacus.function.NumberOperator
diff --git a/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/OperatorNcr.kt b/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorNcr.kt
similarity index 95%
rename from core/src/main/kotlin/org/nwapw/abacus/plugin/standard/OperatorNcr.kt
rename to core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorNcr.kt
index ae897d0..7b1a45d 100644
--- a/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/OperatorNcr.kt
+++ b/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorNcr.kt
@@ -1,4 +1,4 @@
-package org.nwapw.abacus.plugin.standard
+package org.nwapw.abacus.plugin.standard.operator
 
 import org.nwapw.abacus.context.MutableEvaluationContext
 import org.nwapw.abacus.function.NumberOperator
diff --git a/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/OperatorNegate.kt b/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorNegate.kt
similarity index 93%
rename from core/src/main/kotlin/org/nwapw/abacus/plugin/standard/OperatorNegate.kt
rename to core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorNegate.kt
index df085c2..a53b069 100644
--- a/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/OperatorNegate.kt
+++ b/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorNegate.kt
@@ -1,4 +1,4 @@
-package org.nwapw.abacus.plugin.standard
+package org.nwapw.abacus.plugin.standard.operator
 
 import org.nwapw.abacus.context.MutableEvaluationContext
 import org.nwapw.abacus.function.NumberOperator
diff --git a/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/OperatorNpr.kt b/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorNpr.kt
similarity index 97%
rename from core/src/main/kotlin/org/nwapw/abacus/plugin/standard/OperatorNpr.kt
rename to core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorNpr.kt
index 21e61d3..b053458 100644
--- a/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/OperatorNpr.kt
+++ b/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorNpr.kt
@@ -1,4 +1,4 @@
-package org.nwapw.abacus.plugin.standard
+package org.nwapw.abacus.plugin.standard.operator
 
 import org.nwapw.abacus.context.MutableEvaluationContext
 import org.nwapw.abacus.function.NumberOperator
diff --git a/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/OperatorSet.kt b/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorSet.kt
similarity index 95%
rename from core/src/main/kotlin/org/nwapw/abacus/plugin/standard/OperatorSet.kt
rename to core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorSet.kt
index 23e9b1f..89019dd 100644
--- a/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/OperatorSet.kt
+++ b/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorSet.kt
@@ -1,4 +1,4 @@
-package org.nwapw.abacus.plugin.standard
+package org.nwapw.abacus.plugin.standard.operator
 
 import org.nwapw.abacus.context.MutableEvaluationContext
 import org.nwapw.abacus.function.OperatorAssociativity
diff --git a/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/OperatorSubtract.kt b/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorSubtract.kt
similarity index 93%
rename from core/src/main/kotlin/org/nwapw/abacus/plugin/standard/OperatorSubtract.kt
rename to core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorSubtract.kt
index 25d408c..bd0e37f 100644
--- a/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/OperatorSubtract.kt
+++ b/core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorSubtract.kt
@@ -1,4 +1,4 @@
-package org.nwapw.abacus.plugin.standard
+package org.nwapw.abacus.plugin.standard.operator
 
 import org.nwapw.abacus.context.MutableEvaluationContext
 import org.nwapw.abacus.function.NumberOperator