[gnome-calculator] GCalc: renamed GMathEquation to Equation
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-calculator] GCalc: renamed GMathEquation to Equation
- Date: Thu, 17 Oct 2019 19:08:32 +0000 (UTC)
commit bba22813b2e85ada2f14e3cea31473bad4a9e096
Author: Daniel Espinosa <esodan gmail com>
Date: Thu Oct 17 11:59:48 2019 -0500
GCalc: renamed GMathEquation to Equation
gcalc/{gcalc-gmath-equation.vala => gcalc-equation.vala} | 4 ++--
gcalc/gcalc-parser.vala | 6 +++---
gcalc/meson.build | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/gcalc/gcalc-gmath-equation.vala b/gcalc/gcalc-equation.vala
similarity index 93%
rename from gcalc/gcalc-gmath-equation.vala
rename to gcalc/gcalc-equation.vala
index 1136aea3..33c6cd22 100644
--- a/gcalc/gcalc-gmath-equation.vala
+++ b/gcalc/gcalc-equation.vala
@@ -1,4 +1,4 @@
-/* gcalc-gmath-equation.vala
+/* gcalc-quation.vala
*
* Copyright (C) 2018 Daniel Espinosa <esodan gmail com>
*
@@ -18,7 +18,7 @@
* Authors:
* Daniel Espinosa <esodan gmail com>
*/
-public class GCalc.GMathEquation : Expression, MathEquation {
+public class GCalc.Equation : Expression, MathEquation {
ExpressionHashMap _variables = new ExpressionHashMap ();
internal ExpressionHashMap variables { get { return _variables; } }
internal override Result solve () {
diff --git a/gcalc/gcalc-parser.vala b/gcalc/gcalc-parser.vala
index 7c425276..068e9869 100644
--- a/gcalc/gcalc-parser.vala
+++ b/gcalc/gcalc-parser.vala
@@ -51,7 +51,7 @@ public class GCalc.Parser : Object {
*/
public void parse (string str, MathEquationManager eqman) throws GLib.Error {
TokenType token = TokenType.NONE;
- GMathEquation eq = new GMathEquation ();
+ Equation eq = new Equation ();
scanner.input_text (str, str.length);
current = null;
current_parent = null;
@@ -334,7 +334,7 @@ public class GCalc.Parser : Object {
}
eqman.equations.add (eq);
}
- private void process_operator (MathOperator opp, GMathEquation eq) throws GLib.Error {
+ private void process_operator (MathOperator opp, Equation eq) throws GLib.Error {
if (current is MathBinaryOperator) {
throw new ParserError.INVALID_TOKEN_ERROR ("Found an unexpected expression for a plus operator");
}
@@ -388,7 +388,7 @@ public class GCalc.Parser : Object {
expected.clear ();
}
}
- private void process_term_operator (MathOperator op, GMathEquation eq) throws GLib.Error {
+ private void process_term_operator (MathOperator op, Equation eq) throws GLib.Error {
if (current is MathOperator) {
throw new ParserError.INVALID_TOKEN_ERROR ("Found an unexpected expression for a multiply operator");
}
diff --git a/gcalc/meson.build b/gcalc/meson.build
index e826c6b4..01a3cd0a 100644
--- a/gcalc/meson.build
+++ b/gcalc/meson.build
@@ -59,6 +59,7 @@ gcalc_sources = files([
'gcalc-assign.vala',
'gcalc-constant.vala',
'gcalc-division.vala',
+ 'gcalc-equation.vala',
'gcalc-error-result.vala',
'gcalc-expression.vala',
'gcalc-expression-container.vala',
@@ -80,7 +81,6 @@ gcalc_sources = files([
'gcalc-function-tan.vala',
'gcalc-function-tanh.vala',
'gcalc-group.vala',
- 'gcalc-gmath-equation.vala',
'gcalc-gmath-equation-manager.vala',
'gcalc-gminus.vala',
'gcalc-gmultiply.vala',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]