[gnome-calculator/60-split-out-a-backend-library] gcalc: renamed Parser to GParser

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit 08b228c0bf2a70336e464364d426dd2093ceaf50
Author: Daniel Espinosa Ortiz <esodan gmail com>
Date:   Fri Jan 4 22:16:48 2019 -0600

    gcalc: renamed Parser to GParser

 .gitlab-ci.yml                                  |  2 +-
 gcalc/{gcalc-parser.vala => gcalc-gparser.vala} |  2 +-
 gcalc/gcalc-gsolver.vala                        |  2 +-
 gcalc/meson.build                               |  2 +-
 tests/gcalc-parsing.vala                        | 48 ++++++++---------
 tests/gcalc-solving-basic.vala                  | 72 ++++++++++++-------------
 6 files changed, 64 insertions(+), 64 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a6493527..b1cfc045 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@
   image: ubuntu:rolling
   before_script:
     - apt-get update
-    - apt-get install -q -y --no-install-recommends meson valac gcc gettext itstool libgtk-3-dev 
libgtksourceview-4-dev libmpc-dev libmpfr-dev libsoup2.4-dev libxml2-dev libgee-0.8-2 libvala-0.42
+    - apt-get install -q -y --no-install-recommends meson valac gcc gettext itstool libgtk-3-dev 
libgtksourceview-4-dev libmpc-dev libmpfr-dev libsoup2.4-dev libxml2-dev libgee-0.8-dev libvala-0.42
 
 .before_script_template: &fedora_before_script
   image: fedora:latest
diff --git a/gcalc/gcalc-parser.vala b/gcalc/gcalc-gparser.vala
similarity index 99%
rename from gcalc/gcalc-parser.vala
rename to gcalc/gcalc-gparser.vala
index 7e4e167e..d0046917 100644
--- a/gcalc/gcalc-parser.vala
+++ b/gcalc/gcalc-gparser.vala
@@ -20,7 +20,7 @@
  */
 using Vala;
 
-public class GCalc.Parser : Object {
+public class GCalc.GParser : Object {
   Expression current = null;
   Expression current_parent = null;
   Expression top_parent = null;
diff --git a/gcalc/gcalc-gsolver.vala b/gcalc/gcalc-gsolver.vala
index c3cffadf..3d09b605 100644
--- a/gcalc/gcalc-gsolver.vala
+++ b/gcalc/gcalc-gsolver.vala
@@ -27,7 +27,7 @@ public class GCalc.GSolver : Object, Solver {
   // Sover
   public MathEquationManager equation_manager { get; set; }
   public Result solve (string str) throws GLib.Error {
-    var p = new Parser ();
+    var p = new GParser ();
     Result res;
     try {
       p.parse (str, equation_manager);
diff --git a/gcalc/meson.build b/gcalc/meson.build
index f94054be..7b55b284 100644
--- a/gcalc/meson.build
+++ b/gcalc/meson.build
@@ -72,6 +72,7 @@ sources = files([
        'gcalc-gmath-equation-manager.vala',
        'gcalc-gminus.vala',
        'gcalc-gmultiply.vala',
+       'gcalc-gparser.vala',
        'gcalc-gplus.vala',
        'gcalc-gpolynomial.vala',
        'gcalc-gpow.vala',
@@ -86,7 +87,6 @@ sources = files([
        'gcalc-minus.vala',
        'gcalc-multiply.vala',
        'gcalc-operator.vala',
-       'gcalc-parser.vala',
        'gcalc-plus.vala',
        'gcalc-polynomial.vala',
        'gcalc-pow.vala',
diff --git a/tests/gcalc-parsing.vala b/tests/gcalc-parsing.vala
index b9b90d00..027c334c 100644
--- a/tests/gcalc-parsing.vala
+++ b/tests/gcalc-parsing.vala
@@ -26,7 +26,7 @@ class Tests {
     Test.add_func ("/gcalc/parser/constant/integer",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("1", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -48,7 +48,7 @@ class Tests {
     Test.add_func ("/gcalc/parser/constant/double",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("10.3", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -69,7 +69,7 @@ class Tests {
     });
     Test.add_func ("/gcalc/parser/assign/error",
     ()=>{
-      var parser = new Parser ();
+      var parser = new GParser ();
       var eqman = new GMathEquationManager ();
       try {
         parser.parse ("=", eqman);
@@ -81,7 +81,7 @@ class Tests {
     Test.add_func ("/gcalc/parser/assign/variable/constant",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("var=1", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -109,7 +109,7 @@ class Tests {
     Test.add_func ("/gcalc/parser/term/plus/constant",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("1+1", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -138,7 +138,7 @@ class Tests {
     Test.add_func ("/gcalc/parser/term/plus/variables",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("A+B", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -167,7 +167,7 @@ class Tests {
     Test.add_func ("/gcalc/parser/term/plus/variables+constant",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("A+1", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -196,7 +196,7 @@ class Tests {
     Test.add_func ("/gcalc/parser/term/plus/constant+variable",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("1+B", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -225,7 +225,7 @@ class Tests {
     Test.add_func ("/gcalc/parser/term/complex/constant+variable",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("-1+B+3+A", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -271,7 +271,7 @@ class Tests {
     Test.add_func ("/gcalc/parser/term/complex/constant+variable/combined-operators",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("-1+B+3-A", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -317,7 +317,7 @@ class Tests {
     Test.add_func ("/gcalc/parser/term/multiply/constant",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("1*1", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -343,7 +343,7 @@ class Tests {
     Test.add_func ("/gcalc/parser/term/multiply/variable",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("A*B", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -370,7 +370,7 @@ class Tests {
     Test.add_func ("/gcalc/parser/term/complex/constant*variable",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("-1*B+3*A", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -410,7 +410,7 @@ class Tests {
     Test.add_func ("/gcalc/parser/term/division/constant",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("1/1", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -436,7 +436,7 @@ class Tests {
     Test.add_func ("/gcalc/parser/term/division/variable",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("A/B", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -463,7 +463,7 @@ class Tests {
     Test.add_func ("/gcalc/parser/term/complex/multiply-division/constant-variable",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("-1/B+3*A/5", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -512,7 +512,7 @@ class Tests {
     Test.add_func ("/gcalc/parser/term/parenthesis",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("(1)", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -543,7 +543,7 @@ class Tests {
     });
     Test.add_func ("/gcalc/parser/term/parenthesis/errors",
     ()=>{
-      var parser = new Parser ();
+      var parser = new GParser ();
       var eqman1 = new GMathEquationManager ();
       try {
         parser.parse ("(", eqman1);
@@ -572,7 +572,7 @@ class Tests {
     Test.add_func ("/gcalc/parser/term/parenthesis/grouping",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("(1)+(1)", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -621,7 +621,7 @@ class Tests {
     Test.add_func ("/gcalc/parser/term/parenthesis/grouping/multiply",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("5*(3+2)", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -665,7 +665,7 @@ class Tests {
     Test.add_func ("/gcalc/parser/term/parenthesis/grouping/multiply-inv",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("(3+2)*5", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -729,7 +729,7 @@ class Tests {
     Test.add_func ("/gcalc/parser/function/unique",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("sin(0)", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -760,7 +760,7 @@ class Tests {
     Test.add_func ("/gcalc/parser/pow/unique",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("3^3", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -786,7 +786,7 @@ class Tests {
     Test.add_func ("/gcalc/parser/pow/polynomial",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("3^(3+5*3)", eqman);
         assert (eqman.equations.get_n_items () == 1);
diff --git a/tests/gcalc-solving-basic.vala b/tests/gcalc-solving-basic.vala
index 3116dee1..267f91b4 100644
--- a/tests/gcalc-solving-basic.vala
+++ b/tests/gcalc-solving-basic.vala
@@ -79,7 +79,7 @@ class Tests {
     Test.add_func ("/gcalc/solve/constant",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("1", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -105,7 +105,7 @@ class Tests {
     Test.add_func ("/gcalc/solve/term/constant",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("1", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -130,7 +130,7 @@ class Tests {
     Test.add_func ("/gcalc/solve/term/constant/multiply",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("3*5", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -155,7 +155,7 @@ class Tests {
     Test.add_func ("/gcalc/solve/term/constant/division",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("15/3-", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -180,7 +180,7 @@ class Tests {
     Test.add_func ("/gcalc/solve/term/add/constant",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("1+1", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -204,7 +204,7 @@ class Tests {
     Test.add_func ("/gcalc/solve/term/add/constant-multiple",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("1+1-9+8-3", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -226,7 +226,7 @@ class Tests {
     Test.add_func ("/gcalc/solve/term/add-mult-div/constant-multiple",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("15/3+18/6-27/9+4*2-3*2", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -248,7 +248,7 @@ class Tests {
     Test.add_func ("/gcalc/solve/group/constant",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("(1)", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -271,7 +271,7 @@ class Tests {
     Test.add_func ("/gcalc/solve/group/multiple-levels/1",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("(((1)))", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -290,7 +290,7 @@ class Tests {
     Test.add_func ("/gcalc/solve/group/multiple-levels/multiply",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("(((1)))*((((5))))", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -309,7 +309,7 @@ class Tests {
     Test.add_func ("/gcalc/solve/group/multiple-levels/add",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("(((1)))+((((5))))", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -328,7 +328,7 @@ class Tests {
     Test.add_func ("/gcalc/solve/group/constant/basic-polynomial",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("(1+2)", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -351,7 +351,7 @@ class Tests {
     Test.add_func ("/gcalc/solve/group/constant/polynomial",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("(2*8-10/5)", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -374,7 +374,7 @@ class Tests {
     Test.add_func ("/gcalc/solve/group/multiple/2",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("(2)+(3)", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -393,7 +393,7 @@ class Tests {
     Test.add_func ("/gcalc/solve/group/multiply-term",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("5*(3+2)", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -412,7 +412,7 @@ class Tests {
     Test.add_func ("/gcalc/solve/group/multiply-term/plug-constant",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("5*(3+2)+1", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -431,7 +431,7 @@ class Tests {
     Test.add_func ("/gcalc/solve/group/multiply-term-inv",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("(3+2)*5", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -450,7 +450,7 @@ class Tests {
     Test.add_func ("/gcalc/solve/group/complex",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("(3+2)*5+1-3*(8-2)*7-(3)", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -679,7 +679,7 @@ class Tests {
     Test.add_func ("/gcalc/solve/function/unique",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("sin(0)", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -703,7 +703,7 @@ class Tests {
     Test.add_func ("/gcalc/solve/function/unique/evaluated-polynomial",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("sin(0)", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -722,7 +722,7 @@ class Tests {
     Test.add_func ("/gcalc/solve/function/term/mul",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("cos(0)*3", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -741,7 +741,7 @@ class Tests {
     Test.add_func ("/gcalc/solve/function/term/mul-inv",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("3*cos(0)", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -760,7 +760,7 @@ class Tests {
     Test.add_func ("/gcalc/solve/function/term/div",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("3/cos(0)", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -779,7 +779,7 @@ class Tests {
     Test.add_func ("/gcalc/solve/function/term/div-inv",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("cos(0)/1", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -798,7 +798,7 @@ class Tests {
     Test.add_func ("/gcalc/solve/function/polynomial",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("cos(0)+4", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -817,7 +817,7 @@ class Tests {
     Test.add_func ("/gcalc/solve/function/polynomial-inv",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("4+cos(0)", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -836,7 +836,7 @@ class Tests {
     Test.add_func ("/gcalc/solve/function/polynomial/functions",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("cos(0)+sin(0)", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -855,7 +855,7 @@ class Tests {
     Test.add_func ("/gcalc/solve/function/polynomial/constan+func",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("1+cos(0)", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -874,7 +874,7 @@ class Tests {
     Test.add_func ("/gcalc/solve/function/polynomial/constan-func",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("4-cos(0)", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -893,7 +893,7 @@ class Tests {
     Test.add_func ("/gcalc/solve/function/polynomial/complex1",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("2*cos(0)-9/cos(0)", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -913,7 +913,7 @@ class Tests {
     Test.add_func ("/gcalc/solve/function/polynomial/group",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("(cos(0))", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -933,7 +933,7 @@ class Tests {
     Test.add_func ("/gcalc/solve/function/polynomial/complex2",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("5*6+tan(0)+tan(0)/2*8+2*cos(0)-9/cos(0)+(1/(cos(0)+cos(0))", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -953,7 +953,7 @@ class Tests {
     Test.add_func ("/gcalc/solve/pow",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("3^3", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -973,7 +973,7 @@ class Tests {
     Test.add_func ("/gcalc/solve/pow/polynomial/constants",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("2^(3+5)", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -993,7 +993,7 @@ class Tests {
     Test.add_func ("/gcalc/solve/pow/polynomial/function",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("2^(3+5*cos(0))", eqman);
         assert (eqman.equations.get_n_items () == 1);
@@ -1013,7 +1013,7 @@ class Tests {
     Test.add_func ("/gcalc/solve/pow/polynomial/terms",
     ()=>{
       try {
-        var parser = new Parser ();
+        var parser = new GParser ();
         var eqman = new GMathEquationManager ();
         parser.parse ("2^(3+5*cos(0))+5*3-3^(sin(0)+5/cos(0))", eqman);
         assert (eqman.equations.get_n_items () == 1);