- New tinfo mechanism

[ginac.git] / ginac / operators.cpp

diff --git a/ginac/operators.cpp b/ginac/operators.cpp
index d588b98d995560a9f5c8850d7f5427fae685cdf1..0ad960d4aaac5c582df8953f69c55e8a4dc9ad2d 100644 (file)
--- a/ginac/operators.cpp
+++ b/ginac/operators.cpp
@@ -3,7 +3,7 @@
  *  Implementation of GiNaC's overloaded operators. */
 
 /*
- *  GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2005 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
@@ -17,7 +17,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include <iostream>
@@ -48,10 +48,11 @@ static inline const ex exmul(const ex & lh, const ex & rh)
        // ncmul::eval()'s rule to pull out commutative elements we need to check
        // only one of the elements.
        if (rh.return_type()==return_types::commutative ||
-           lh.return_type()==return_types::commutative)
+           lh.return_type()==return_types::commutative) {
                return (new mul(lh,rh))->setflag(status_flags::dynallocated);
-       else
+       } else {
                return (new ncmul(lh,rh))->setflag(status_flags::dynallocated);
+       }
 }
 
 /** Used internally by operator-() and friends to change the sign of an argument. */
@@ -175,7 +176,7 @@ const numeric operator+(const numeric & lh)
 
 const numeric operator-(const numeric & lh)
 {
-       return _num_1.mul(lh);
+       return _num_1_p->mul(lh);
 }
 
 
@@ -214,14 +215,14 @@ const ex operator--(ex & lh, int)
 /** Numeric prefix increment.  Adds 1 and returns incremented number. */
 numeric& operator++(numeric & rh)
 {
-       rh = rh.add(_num1);
+       rh = rh.add(*_num1_p);
        return rh;
 }
 
 /** Numeric prefix decrement.  Subtracts 1 and returns decremented number. */
 numeric& operator--(numeric & rh)
 {
-       rh = rh.add(_num_1);
+       rh = rh.add(*_num_1_p);
        return rh;
 }
 
@@ -230,7 +231,7 @@ numeric& operator--(numeric & rh)
 const numeric operator++(numeric & lh, int)
 {
        numeric tmp(lh);
-       lh = lh.add(_num1);
+       lh = lh.add(*_num1_p);
        return tmp;
 }
 
@@ -239,7 +240,7 @@ const numeric operator++(numeric & lh, int)
 const numeric operator--(numeric & lh, int)
 {
        numeric tmp(lh);
-       lh = lh.add(_num_1);
+       lh = lh.add(*_num_1_p);
        return tmp;
 }
 
@@ -334,7 +335,7 @@ static void set_print_options(std::ostream & s, unsigned options)
 {
        print_context *p = get_print_context(s);
        if (p == 0)
-               set_print_context(s, print_context(s, options));
+               set_print_context(s, print_dflt(s, options));
        else
                p->options = options;
 }
@@ -343,7 +344,7 @@ std::ostream & operator<<(std::ostream & os, const ex & e)
 {
        print_context *p = get_print_context(os);
        if (p == 0)
-               e.print(print_context(os));
+               e.print(print_dflt(os));
        else
                e.print(*p);
        return os;
@@ -356,7 +357,7 @@ std::istream & operator>>(std::istream & is, ex & e)
 
 std::ostream & dflt(std::ostream & os)
 {
-       set_print_context(os, print_context(os));
+       set_print_context(os, print_dflt(os));
        set_print_options(os, 0);
        return os;
 }