[gnome-calculator] GCalc: renamed GTerm to Term
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-calculator] GCalc: renamed GTerm to Term
- Date: Thu, 17 Oct 2019 19:09:58 +0000 (UTC)
commit 8c7103e8d84c9de908975211f29d0dbf2e1cce07
Author: Daniel Espinosa <esodan gmail com>
Date: Thu Oct 17 12:48:16 2019 -0500
GCalc: renamed GTerm to Term
gcalc/gcalc-parser.vala | 28 ++++++++++++++--------------
gcalc/{gcalc-gterm.vala => gcalc-term.vala} | 4 ++--
gcalc/meson.build | 2 +-
3 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/gcalc/gcalc-parser.vala b/gcalc/gcalc-parser.vala
index f44a9e3d..6e0060fd 100644
--- a/gcalc/gcalc-parser.vala
+++ b/gcalc/gcalc-parser.vala
@@ -74,7 +74,7 @@ public class GCalc.Parser : Object {
if (current == null) {
var exp = new Polynomial ();
eq.expressions.add (exp);
- var t = new GTerm ();
+ var t = new Term ();
exp.expressions.add (t);
t.expressions.add (sfunc);
current = sfunc;
@@ -117,7 +117,7 @@ public class GCalc.Parser : Object {
if (current == null) {
var exp = new Polynomial ();
eq.expressions.add (exp);
- var t = new GTerm ();
+ var t = new Term ();
exp.expressions.add (t);
t.expressions.add (v);
current = v;
@@ -147,7 +147,7 @@ public class GCalc.Parser : Object {
if (current == null) {
var exp = new Polynomial ();
eq.expressions.add (exp);
- var t = new GTerm ();
+ var t = new Term ();
exp.expressions.add (t);
t.expressions.add (cexp);
current = cexp;
@@ -213,7 +213,7 @@ public class GCalc.Parser : Object {
expa.expressions.add (current);
var exp = new Polynomial ();
expa.expressions.add (exp);
- var t = new GTerm ();
+ var t = new Term ();
exp.expressions.add (t);
current = t;
current_parent = t;
@@ -225,12 +225,12 @@ public class GCalc.Parser : Object {
if (current == null) {
var exp = new Polynomial ();
eq.expressions.add (exp);
- var t = new GTerm ();
+ var t = new Term ();
exp.expressions.add (t);
var g = new Group ();
t.expressions.add (g);
var exp2 = new Polynomial ();
- var t2 = new GTerm ();
+ var t2 = new Term ();
exp2.expressions.add (t2);
g.expressions.add (exp2);
current = t2;
@@ -238,7 +238,7 @@ public class GCalc.Parser : Object {
top_parent = g;
} else if (current is MathFunction) {
var fexp = new Polynomial ();
- var t = new GTerm ();
+ var t = new Term ();
fexp.expressions.add (t);
current.expressions.add (fexp);
top_parent = current;
@@ -250,7 +250,7 @@ public class GCalc.Parser : Object {
current_parent.expressions.add (g);
var exp = new Polynomial ();
g.expressions.add (exp);
- var t = new GTerm ();
+ var t = new Term ();
exp.expressions.add (t);
current = t;
current_parent = exp;
@@ -340,7 +340,7 @@ public class GCalc.Parser : Object {
}
if (current == null) {
var exp = new Polynomial ();
- var t = new GTerm ();
+ var t = new Term ();
t.expressions.add (opp);
exp.expressions.add (t);
current = opp;
@@ -357,7 +357,7 @@ public class GCalc.Parser : Object {
} else if ((current is MathConstant || current is Variable)
&& current_parent is MathTerm && top_parent is MathPolynomial) {
// New term
- var t = new GTerm ();
+ var t = new Term ();
t.expressions.add (opp);
top_parent.expressions.add (t);
current = opp;
@@ -365,7 +365,7 @@ public class GCalc.Parser : Object {
expected.clear ();
} else if ((current is MathGroup || current is MathFunction) && current_parent is MathTerm && top_parent
is MathPolynomial) {
// New term
- var t = new GTerm ();
+ var t = new Term ();
t.expressions.add (opp);
top_parent.expressions.add (t);
current = opp;
@@ -376,10 +376,10 @@ public class GCalc.Parser : Object {
// New MathPolynomial
var exp = new Polynomial ();
eq.expressions.add (exp);
- var t = new GTerm ();
+ var t = new Term ();
exp.expressions.add (t);
t.expressions.add (current);
- var t2 = new GTerm ();
+ var t2 = new Term ();
exp.expressions.add (t2);
t2.expressions.add (opp);
current = opp;
@@ -401,7 +401,7 @@ public class GCalc.Parser : Object {
// New MathPolynomial
var exp = new Polynomial ();
eq.expressions.add (exp);
- var t = new GTerm ();
+ var t = new Term ();
exp.expressions.add (t);
t.expressions.add (current);
t.expressions.add (op);
diff --git a/gcalc/gcalc-gterm.vala b/gcalc/gcalc-term.vala
similarity index 93%
rename from gcalc/gcalc-gterm.vala
rename to gcalc/gcalc-term.vala
index 59dc77e0..aba74eda 100644
--- a/gcalc/gcalc-gterm.vala
+++ b/gcalc/gcalc-term.vala
@@ -1,4 +1,4 @@
-/* gcalc-gterm.vala
+/* gcalc-term.vala
*
* Copyright (C) 2018 Daniel Espinosa <esodan gmail com>
*
@@ -18,7 +18,7 @@
* Authors:
* Daniel Espinosa <esodan gmail com>
*/
-public class GCalc.GTerm : Expression, MathTerm {
+public class GCalc.Term : Expression, MathTerm {
internal override MathResult solve () {
MathResult res = null;
try {
diff --git a/gcalc/meson.build b/gcalc/meson.build
index 232566d5..238a7d0b 100644
--- a/gcalc/meson.build
+++ b/gcalc/meson.build
@@ -82,7 +82,6 @@ gcalc_sources = files([
'gcalc-function-tan.vala',
'gcalc-function-tanh.vala',
'gcalc-group.vala',
- 'gcalc-gterm.vala',
'gcalc-gvariable.vala',
'gcalc-hashable.vala',
'gcalc-math-assign.vala',
@@ -114,6 +113,7 @@ gcalc_sources = files([
'gcalc-pow.vala',
'gcalc-result.vala',
'gcalc-solver.vala',
+ 'gcalc-term.vala',
'gcalc-variable.vala',
])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]