- replaced the Derivative() function by a more resonable fderivative class;

[ginac.git] / ginac / symbol.cpp

diff --git a/ginac/symbol.cpp b/ginac/symbol.cpp
index 29d46bbf73a1f14d243c8d0342524100df9aa7a4..f5fd4a090b0df1f1ab66440b730d31b520104ada 100644 (file)
--- a/ginac/symbol.cpp
+++ b/ginac/symbol.cpp
@@ -28,6 +28,7 @@
 #include "print.h"
 #include "archive.h"
 #include "debugmsg.h"
+#include "tostring.h"
 #include "utils.h"
 
 namespace GiNaC {
@@ -121,7 +122,7 @@ ex symbol::unarchive(const archive_node &n, const lst &sym_lst)
        
        // If symbol is in sym_lst, return the existing symbol
        for (unsigned i=0; i<sym_lst.nops(); i++) {
-               if (is_ex_of_type(sym_lst.op(i), symbol) && (ex_to_symbol(sym_lst.op(i)).name == ex_to_symbol(s).name))
+               if (is_ex_of_type(sym_lst.op(i), symbol) && (ex_to<symbol>(sym_lst.op(i)).name == ex_to<symbol>(s).name))
                        return sym_lst.op(i);
        }
        return s;
@@ -137,7 +138,7 @@ void symbol::archive(archive_node &n) const
 }
 
 //////////
-// functions overriding virtual functions from bases classes
+// functions overriding virtual functions from base classes
 //////////
 
 // public
@@ -179,19 +180,6 @@ bool symbol::info(unsigned inf) const
                return inherited::info(inf);
 }
 
-ex symbol::expand(unsigned options) const
-{
-       return this->hold();
-}
-
-bool symbol::has(const ex & other) const
-{
-       if (this->is_equal(*other.bp))
-               return true;
-       else
-               return false;
-}
-
 int symbol::degree(const ex & s) const
 {
        return is_equal(*s.bp) ? 1 : 0;
@@ -255,16 +243,6 @@ bool symbol::is_equal_same_type(const basic & other) const
        return serial==o->serial;
 }
 
-unsigned symbol::return_type(void) const
-{
-       return return_types::commutative;
-}
-   
-unsigned symbol::return_type_tinfo(void) const
-{
-       return tinfo_key;
-}
-
 unsigned symbol::calchash(void) const
 {
        // this is where the schoolbook method
@@ -324,7 +302,7 @@ std::string symbol::default_TeX_name(void) const
         || name=="xi"           || name=="omicron"      || name=="pi"
         || name=="varpi"        || name=="rho"          || name=="varrho"
         || name=="sigma"        || name=="varsigma"     || name=="tau"
-        || name=="upsilon"      || name=="phi"          || name=="varphix"
+        || name=="upsilon"      || name=="phi"          || name=="varphi"
         || name=="chi"          || name=="psi"          || name=="omega"
         || name=="Gamma"        || name=="Delta"        || name=="Theta"
         || name=="Lambda"       || name=="Xi"           || name=="Pi"