[gnome-calculator] GCalc: renamed Assign to MathAssign
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-calculator] GCalc: renamed Assign to MathAssign
- Date: Thu, 17 Oct 2019 19:07:31 +0000 (UTC)
commit d7c016114b69af94847bb3dddc6b7ea0def8f971
Author: Daniel Espinosa <esodan gmail com>
Date: Thu Oct 17 10:48:29 2019 -0500
GCalc: renamed Assign to MathAssign
gcalc/gcalc-gassign.vala | 2 +-
gcalc/{gcalc-assign.vala => gcalc-math-assign.vala} | 10 ++++++++--
gcalc/meson.build | 2 +-
tests/gcalc-parsing.vala | 20 ++++++++++----------
tests/gcalc-solving-basic.vala | 4 ++--
5 files changed, 22 insertions(+), 16 deletions(-)
---
diff --git a/gcalc/gcalc-gassign.vala b/gcalc/gcalc-gassign.vala
index 0b7308f4..56d63b22 100644
--- a/gcalc/gcalc-gassign.vala
+++ b/gcalc/gcalc-gassign.vala
@@ -18,7 +18,7 @@
* Authors:
* Daniel Espinosa <esodan gmail com>
*/
-public class GCalc.GAssign : Expression, MathOperator, MathBinaryOperator, Assign {
+public class GCalc.GAssign : Expression, MathOperator, MathBinaryOperator, MathAssign {
internal override string to_string () {
if (expressions.get_n_items () != 2) {
return "Invalid Assigment structure";
diff --git a/gcalc/gcalc-assign.vala b/gcalc/gcalc-math-assign.vala
similarity index 86%
rename from gcalc/gcalc-assign.vala
rename to gcalc/gcalc-math-assign.vala
index eb1e8ce8..a08d1e14 100644
--- a/gcalc/gcalc-assign.vala
+++ b/gcalc/gcalc-math-assign.vala
@@ -1,4 +1,4 @@
-/* gcalc-assign.vala
+/* gcalc-math-assign.vala
*
* Copyright (C) 2018 Daniel Espinosa <esodan gmail com>
*
@@ -18,7 +18,13 @@
* Authors:
* Daniel Espinosa <esodan gmail com>
*/
-public interface GCalc.Assign : Object, MathExpression, MathOperator, MathBinaryOperator {
+/**
+ * An assing operator in a math expression
+ */
+public interface GCalc.MathAssign : Object, MathExpression, MathOperator, MathBinaryOperator {
+ /**
+ * Evaluates the assign an returns a {@link MathExpression} as a result
+ */
public MathExpression evaluate () throws GLib.Error {
if (expressions.get_n_items () != 2) {
throw new AssigError.INVALID_STRUCTURE_ERROR ("Invalid number of expressions in assign");
diff --git a/gcalc/meson.build b/gcalc/meson.build
index 96a55a38..698e4e39 100644
--- a/gcalc/meson.build
+++ b/gcalc/meson.build
@@ -56,7 +56,6 @@ lib_mpfrg = static_library ('mpfrg',
)
gcalc_sources = files([
- 'gcalc-assign.vala',
'gcalc-constant.vala',
'gcalc-division.vala',
'gcalc-expression.vala',
@@ -98,6 +97,7 @@ gcalc_sources = files([
'gcalc-gterm.vala',
'gcalc-gvariable.vala',
'gcalc-hashable.vala',
+ 'gcalc-math-assign.vala',
'gcalc-math-binary-operator.vala',
'gcalc-math-equation.vala',
'gcalc-math-equation-manager.vala',
diff --git a/tests/gcalc-parsing.vala b/tests/gcalc-parsing.vala
index be7d1a78..005cd26c 100644
--- a/tests/gcalc-parsing.vala
+++ b/tests/gcalc-parsing.vala
@@ -88,7 +88,7 @@ class Tests {
var eq = eqman.equations.get_item (0) as MathEquation;
assert (eq != null);
assert (eq.expressions.get_n_items () == 1);
- var assign = eq.expressions.get_item (0) as Assign;
+ var assign = eq.expressions.get_item (0) as MathAssign;
assert (assign != null);
assert (assign.expressions.get_n_items () == 2);
var v = assign.expressions.get_item (0) as Variable;
@@ -822,7 +822,7 @@ class Tests {
var eq = eqman.equations.get_item (0) as MathEquation;
assert (eq != null);
assert (eq.expressions.get_n_items () == 1);
- var a = eq.expressions.get_item (0) as Assign;
+ var a = eq.expressions.get_item (0) as MathAssign;
assert (a != null);
assert (a.expressions.get_n_items () == 2);
var v = a.expressions.get_item (0) as Variable;
@@ -849,7 +849,7 @@ class Tests {
var eq = eqman.equations.get_item (0) as MathEquation;
assert (eq != null);
assert (eq.expressions.get_n_items () == 1);
- var a = eq.expressions.get_item (0) as Assign;
+ var a = eq.expressions.get_item (0) as MathAssign;
assert (a != null);
assert (a.expressions.get_n_items () == 2);
var v = a.expressions.get_item (0) as Variable;
@@ -931,7 +931,7 @@ class Tests {
var eq = eqman.equations.get_item (0) as MathEquation;
assert (eq != null);
assert (eq.expressions.get_n_items () == 1);
- var a = eq.expressions.get_item (0) as Assign;
+ var a = eq.expressions.get_item (0) as MathAssign;
assert (a != null);
assert (a.expressions.get_n_items () == 2);
var v = a.expressions.get_item (0) as Variable;
@@ -969,7 +969,7 @@ class Tests {
var eq = eqman.equations.get_item (0) as MathEquation;
assert (eq != null);
assert (eq.expressions.get_n_items () == 1);
- var a = eq.expressions.get_item (0) as Assign;
+ var a = eq.expressions.get_item (0) as MathAssign;
assert (a != null);
assert (a.expressions.get_n_items () == 2);
var v = a.expressions.get_item (0) as Variable;
@@ -985,7 +985,7 @@ class Tests {
assert (eq2 != null);
message (eq2.to_string ());
assert (eq2.expressions.get_n_items () == 1);
- var a2 = eq2.expressions.get_item (0) as Assign;
+ var a2 = eq2.expressions.get_item (0) as MathAssign;
assert (a2 != null);
assert (a2.expressions.get_n_items () == 2);
var v2 = a2.expressions.get_item (0) as Variable;
@@ -1014,7 +1014,7 @@ class Tests {
assert (eq != null);
message ("Eq1: %s", eq.to_string ());
assert (eq.expressions.get_n_items () == 1);
- var a = eq.expressions.get_item (0) as Assign;
+ var a = eq.expressions.get_item (0) as MathAssign;
assert (a != null);
assert (a.expressions.get_n_items () == 2);
var v = a.expressions.get_item (0) as Variable;
@@ -1030,7 +1030,7 @@ class Tests {
assert (eq2 != null);
message ("Eq2: %s", eq2.to_string ());
assert (eq2.expressions.get_n_items () == 1);
- var a2 = eq2.expressions.get_item (0) as Assign;
+ var a2 = eq2.expressions.get_item (0) as MathAssign;
assert (a2 != null);
assert (a2.expressions.get_n_items () == 2);
var v2 = a2.expressions.get_item (0) as Variable;
@@ -1046,7 +1046,7 @@ class Tests {
assert (eq3 != null);
message ("Eq3: %s", eq3.to_string ());
assert (eq3.expressions.get_n_items () == 1);
- var a3 = eq3.expressions.get_item (0) as Assign;
+ var a3 = eq3.expressions.get_item (0) as MathAssign;
assert (a3 != null);
assert (a3.expressions.get_n_items () == 2);
var v4 = a3.expressions.get_item (0) as Variable;
@@ -1082,7 +1082,7 @@ class Tests {
var eq = eqman.equations.get_item (0) as MathEquation;
assert (eq != null);
assert (eq.expressions.get_n_items () == 1);
- var a = eq.expressions.get_item (0) as Assign;
+ var a = eq.expressions.get_item (0) as MathAssign;
assert (a != null);
assert (a.expressions.get_n_items () == 2);
var v = a.expressions.get_item (0) as Variable;
diff --git a/tests/gcalc-solving-basic.vala b/tests/gcalc-solving-basic.vala
index 61fc451c..d8d66591 100644
--- a/tests/gcalc-solving-basic.vala
+++ b/tests/gcalc-solving-basic.vala
@@ -1039,7 +1039,7 @@ class Tests {
assert (eqman.equations.get_n_items () == 1);
var eq = eqman.equations.get_item (0) as MathEquation;
assert (eq != null);
- var a = eq.expressions.get_item (0) as Assign;
+ var a = eq.expressions.get_item (0) as MathAssign;
assert (a != null);
var res1 = a.evaluate () as Constant;
assert (res1 != null);
@@ -1065,7 +1065,7 @@ class Tests {
assert (eqman.equations.get_n_items () == 1);
var eq = eqman.equations.get_item (0) as MathEquation;
assert (eq != null);
- var a = eq.expressions.get_item (0) as Assign;
+ var a = eq.expressions.get_item (0) as MathAssign;
assert (a != null);
var res1 = a.evaluate () as Constant;
assert (res1 != null);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]