[PATCH 2/3] Make a stronger normalisation for expressions with exponents.

[ginac.git] / ginac / symbol.h

diff --git a/ginac/symbol.h b/ginac/symbol.h
index 68b747e8abb899576607cf5179d44e15cbf52ff7..c7535190163e019bf26d8d3a3a722f22c515d64a 100644 (file)
--- a/ginac/symbol.h
+++ b/ginac/symbol.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's symbolic objects. */
 
 /*
- *  GiNaC Copyright (C) 1999-2015 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2020 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -46,11 +46,11 @@ public:
        // functions overriding virtual functions from base classes
 public:
        bool info(unsigned inf) const override;
-       ex eval(int level = 0) const override { return *this; } // for performance reasons
-       ex evalf(int level = 0) const override { return *this; } // overwrites basic::evalf() for performance reasons
+       ex eval() const override { return *this; } // for performance reasons
+       ex evalf() const override { return *this; } // overwrites basic::evalf() for performance reasons
        ex series(const relational & s, int order, unsigned options = 0) const override;
        ex subs(const exmap & m, unsigned options = 0) const override { return subs_one_level(m, options); } // overwrites basic::subs() for performance reasons
-       ex normal(exmap & repl, exmap & rev_lookup, int level = 0) const override;
+       ex normal(exmap & repl, exmap & rev_lookup, lst & modifier) const override;
        ex to_rational(exmap & repl) const override;
        ex to_polynomial(exmap & repl) const override;
        ex conjugate() const override;
@@ -75,6 +75,7 @@ public:
        void set_name(const std::string & n) { name = n; }
        void set_TeX_name(const std::string & n) { TeX_name = n; }
        std::string get_name() const;
+       std::string get_TeX_name() const;
 protected:
        void do_print(const print_context & c, unsigned level) const;
        void do_print_latex(const print_latex & c, unsigned level) const;
@@ -107,7 +108,12 @@ public:
        ex real_part() const override { return *this; }
        ex imag_part() const override { return 0; }
 
-       realsymbol* duplicate() const override { return new realsymbol(*this); }
+       realsymbol* duplicate() const override
+       {
+               realsymbol * bp = new realsymbol(*this);
+               bp->setflag(status_flags::dynallocated);
+               return bp;
+       }
 };
 GINAC_DECLARE_UNARCHIVER(realsymbol);
 
@@ -122,7 +128,12 @@ public:
 
        unsigned get_domain() const override { return domain::positive; }
 
-       possymbol* duplicate() const override { return new possymbol(*this); }
+       possymbol* duplicate() const override
+       {
+               possymbol * bp = new possymbol(*this);
+               bp->setflag(status_flags::dynallocated);
+               return bp;
+       }
 };
 GINAC_DECLARE_UNARCHIVER(possymbol);