[gnome-calculator] GCalc: renamed Division to MathDivision
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-calculator] GCalc: renamed Division to MathDivision
- Date: Thu, 17 Oct 2019 19:07:51 +0000 (UTC)
commit ff4c54a4dad563154298785bc8f869e0b211e31a
Author: Daniel Espinosa <esodan gmail com>
Date: Thu Oct 17 11:24:56 2019 -0500
GCalc: renamed Division to MathDivision
gcalc/gcalc-gdivision.vala | 2 +-
gcalc/{gcalc-division.vala => gcalc-math-division.vala} | 7 +++++--
gcalc/gcalc-term.vala | 2 +-
gcalc/meson.build | 2 +-
tests/gcalc-parsing.vala | 8 ++++----
5 files changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/gcalc/gcalc-gdivision.vala b/gcalc/gcalc-gdivision.vala
index 0ca932cb..51c517b6 100644
--- a/gcalc/gcalc-gdivision.vala
+++ b/gcalc/gcalc-gdivision.vala
@@ -18,7 +18,7 @@
* Authors:
* Daniel Espinosa <esodan gmail com>
*/
-public class GCalc.GDivision : Expression, MathOperator, MathBinaryOperator, Division {
+public class GCalc.GDivision : Expression, MathOperator, MathBinaryOperator, MathDivision {
internal override string to_string () {
return "/";
}
diff --git a/gcalc/gcalc-division.vala b/gcalc/gcalc-math-division.vala
similarity index 81%
rename from gcalc/gcalc-division.vala
rename to gcalc/gcalc-math-division.vala
index ab1bb59b..6750656d 100644
--- a/gcalc/gcalc-division.vala
+++ b/gcalc/gcalc-math-division.vala
@@ -1,4 +1,4 @@
-/* gcalc-division.vala
+/* gcalc-math-division.vala
*
* Copyright (C) 2018 Daniel Espinosa <esodan gmail com>
*
@@ -18,5 +18,8 @@
* Authors:
* Daniel Espinosa <esodan gmail com>
*/
-public interface GCalc.Division : Object, MathExpression, MathOperator, MathBinaryOperator {}
+/**
+ * A division operator in a math expression
+ */
+public interface GCalc.MathDivision : Object, MathExpression, MathOperator, MathBinaryOperator {}
diff --git a/gcalc/gcalc-term.vala b/gcalc/gcalc-term.vala
index 3188691b..4391e2af 100644
--- a/gcalc/gcalc-term.vala
+++ b/gcalc/gcalc-term.vala
@@ -103,7 +103,7 @@ public interface GCalc.Term : Object, MathExpression {
if (op is Multiply) {
res = c1.multiply (c2);
}
- if (op is Division) {
+ if (op is MathDivision) {
res = c1.divide (c2);
}
if (op is Pow) {
diff --git a/gcalc/meson.build b/gcalc/meson.build
index 38cef76a..3827a440 100644
--- a/gcalc/meson.build
+++ b/gcalc/meson.build
@@ -58,7 +58,6 @@ lib_mpfrg = static_library ('mpfrg',
gcalc_sources = files([
'gcalc-assign.vala',
'gcalc-constant.vala',
- 'gcalc-division.vala',
'gcalc-expression.vala',
'gcalc-expression-container.vala',
'gcalc-expression-hash-map.vala',
@@ -99,6 +98,7 @@ gcalc_sources = files([
'gcalc-math-assign.vala',
'gcalc-math-constant.vala',
'gcalc-math-binary-operator.vala',
+ 'gcalc-math-division.vala',
'gcalc-math-equation.vala',
'gcalc-math-equation-manager.vala',
'gcalc-math-expression.vala',
diff --git a/tests/gcalc-parsing.vala b/tests/gcalc-parsing.vala
index cc3bf054..6ee9df96 100644
--- a/tests/gcalc-parsing.vala
+++ b/tests/gcalc-parsing.vala
@@ -425,7 +425,7 @@ class Tests {
assert (t1.expressions.get_n_items () == 3);
var c1 = t1.expressions.get_item (0) as MathConstant;
assert (c1 != null);
- var m = t1.expressions.get_item (1) as Division;
+ var m = t1.expressions.get_item (1) as MathDivision;
assert (m != null);
var c2 = t1.expressions.get_item (2) as MathConstant;
assert (c2 != null);
@@ -452,7 +452,7 @@ class Tests {
assert (t1.expressions.get_n_items () == 3);
var c1 = t1.expressions.get_item (0) as Variable;
assert (c1 != null);
- var m = t1.expressions.get_item (1) as Division;
+ var m = t1.expressions.get_item (1) as MathDivision;
assert (m != null);
var c2 = t1.expressions.get_item (2) as Variable;
assert (c2 != null);
@@ -481,7 +481,7 @@ class Tests {
assert (minus != null);
var c1 = t1.expressions.get_item (1) as MathConstant;
assert (c1 != null);
- var m1 = t1.expressions.get_item (2) as Division;
+ var m1 = t1.expressions.get_item (2) as MathDivision;
assert (m1 != null);
var c2 = t1.expressions.get_item (3) as Variable;
assert (c2 != null);
@@ -496,7 +496,7 @@ class Tests {
assert (m2 != null);
var c4 = t2.expressions.get_item (3) as Variable;
assert (c4 != null);
- var m3 = t2.expressions.get_item (4) as Division;
+ var m3 = t2.expressions.get_item (4) as MathDivision;
assert (m3 != null);
var c5 = t2.expressions.get_item (5) as MathConstant;
assert (c5 != null);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]