[gnome-calculator] GCalc: renamed Minus to MathMinus

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit 884467b9e88aaebbcd245eb5570c5c11da46610e
Author: Daniel Espinosa <esodan gmail com>
Date:   Thu Oct 17 12:07:38 2019 -0500

    GCalc: renamed Minus to MathMinus

 gcalc/gcalc-gminus.vala                           |  2 +-
 gcalc/{gcalc-minus.vala => gcalc-math-minus.vala} |  2 +-
 gcalc/gcalc-term.vala                             |  6 +++---
 gcalc/meson.build                                 |  2 +-
 tests/gcalc-parsing.vala                          | 10 +++++-----
 5 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/gcalc/gcalc-gminus.vala b/gcalc/gcalc-gminus.vala
index a30eac78..9810eef6 100644
--- a/gcalc/gcalc-gminus.vala
+++ b/gcalc/gcalc-gminus.vala
@@ -18,7 +18,7 @@
  * Authors:
  *      Daniel Espinosa <esodan gmail com>
  */
-public class GCalc.GMinus : Expression, MathOperator, MathBinaryOperator, Minus {
+public class GCalc.GMinus : Expression, MathOperator, MathBinaryOperator, MathMinus {
   internal override string to_string () {
     return "-";
   }
diff --git a/gcalc/gcalc-minus.vala b/gcalc/gcalc-math-minus.vala
similarity index 90%
rename from gcalc/gcalc-minus.vala
rename to gcalc/gcalc-math-minus.vala
index 797f1398..d6355fd4 100644
--- a/gcalc/gcalc-minus.vala
+++ b/gcalc/gcalc-math-minus.vala
@@ -21,5 +21,5 @@
 /**
  * A minus operator in a math expression
  */
-public interface GCalc.Minus : Object, MathExpression, MathOperator, MathBinaryOperator {}
+public interface GCalc.MathMinus : Object, MathExpression, MathOperator, MathBinaryOperator {}
 
diff --git a/gcalc/gcalc-term.vala b/gcalc/gcalc-term.vala
index 89f3a73d..d8c0517b 100644
--- a/gcalc/gcalc-term.vala
+++ b/gcalc/gcalc-term.vala
@@ -37,10 +37,10 @@ public interface GCalc.Term : Object, MathExpression {
     bool first = true;
     foreach (MathExpression e in expressions) {
       if (e is MathOperator) {
-        if (!(e is Minus || e is Plus) && first) {
+        if (!(e is MathMinus || e is Plus) && first) {
           throw new TermError.INVALID_OPERATOR ("Incorrect position for operator in expression");
         }
-        if (e is Minus && first) {
+        if (e is MathMinus && first) {
           var c = new Constant.@double (-1.0);
           current = c;
           first = false;
@@ -97,7 +97,7 @@ public interface GCalc.Term : Object, MathExpression {
     throws GLib.Error
   {
     MathExpression res = null;
-    if (op is Minus) {
+    if (op is MathMinus) {
       res = c1.multiply (c2);
     }
     if (op is Multiply) {
diff --git a/gcalc/meson.build b/gcalc/meson.build
index b60af6da..11cc2725 100644
--- a/gcalc/meson.build
+++ b/gcalc/meson.build
@@ -102,9 +102,9 @@ gcalc_sources = files([
        'gcalc-math-expression.vala',
        'gcalc-math-function.vala',
        'gcalc-math-group.vala',
+       'gcalc-math-minus.vala',
        'gcalc-math-operator.vala',
        'gcalc-math-polynomial.vala',
-       'gcalc-minus.vala',
        'gcalc-multiply.vala',
        'gcalc-parameter.vala',
        'gcalc-parser.vala',
diff --git a/tests/gcalc-parsing.vala b/tests/gcalc-parsing.vala
index 902b27ea..6f522155 100644
--- a/tests/gcalc-parsing.vala
+++ b/tests/gcalc-parsing.vala
@@ -239,7 +239,7 @@ class Tests {
         var t1 = p.expressions.get_item (0) as Term;
         assert (t1 != null);
         assert (t1.expressions.get_n_items () == 2);
-        var minus = t1.expressions.get_item (0) as Minus;
+        var minus = t1.expressions.get_item (0) as MathMinus;
         assert (minus != null);
         var c1 = t1.expressions.get_item (1) as MathConstant;
         assert (c1 != null);
@@ -285,7 +285,7 @@ class Tests {
         var t1 = p.expressions.get_item (0) as Term;
         assert (t1 != null);
         assert (t1.expressions.get_n_items () == 2);
-        var minus = t1.expressions.get_item (0) as Minus;
+        var minus = t1.expressions.get_item (0) as MathMinus;
         assert (minus != null);
         var c1 = t1.expressions.get_item (1) as MathConstant;
         assert (c1 != null);
@@ -306,7 +306,7 @@ class Tests {
         var t4 = p.expressions.get_item (3) as Term;
         assert (t4 != null);
         assert (t4.expressions.get_n_items () == 2);
-        var minus2 = t4.expressions.get_item (0) as Minus;
+        var minus2 = t4.expressions.get_item (0) as MathMinus;
         assert (minus2 != null);
         var c4 = t4.expressions.get_item (1) as Variable;
         assert (c4 != null);
@@ -384,7 +384,7 @@ class Tests {
         var t1 = p.expressions.get_item (0) as Term;
         assert (t1 != null);
         assert (t1.expressions.get_n_items () == 4);
-        var minus = t1.expressions.get_item (0) as Minus;
+        var minus = t1.expressions.get_item (0) as MathMinus;
         assert (minus != null);
         var c1 = t1.expressions.get_item (1) as MathConstant;
         assert (c1 != null);
@@ -477,7 +477,7 @@ class Tests {
         var t1 = p.expressions.get_item (0) as Term;
         assert (t1 != null);
         assert (t1.expressions.get_n_items () == 4);
-        var minus = t1.expressions.get_item (0) as Minus;
+        var minus = t1.expressions.get_item (0) as MathMinus;
         assert (minus != null);
         var c1 = t1.expressions.get_item (1) as MathConstant;
         assert (c1 != null);