Fixed initialization order bug (references to flyweights removed!) [C.Dams].

[ginac.git] / ginac / operators.cpp

diff --git a/ginac/operators.cpp b/ginac/operators.cpp
index e95803a5ef8895dc734815baee08d9523926d592..2b68206c7ac7c03fd26fc932709bad8b00417751 100644 (file)
--- a/ginac/operators.cpp
+++ b/ginac/operators.cpp
@@ -3,7 +3,7 @@
  *  Implementation of GiNaC's overloaded operators. */
 
 /*
- *  GiNaC Copyright (C) 1999-2001 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,9 +17,12 @@
  *
  *  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>
+#include <iomanip>
+
 #include "operators.h"
 #include "numeric.h"
 #include "add.h"
@@ -172,7 +175,7 @@ const numeric operator+(const numeric & lh)
 
 const numeric operator-(const numeric & lh)
 {
-       return _num_1.mul(lh);
+       return _num_1_p->mul(lh);
 }
 
 
@@ -211,14 +214,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;
 }
 
@@ -227,7 +230,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;
 }
 
@@ -236,7 +239,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;
 }
 
@@ -272,11 +275,77 @@ const relational operator>=(const ex & lh, const ex & rh)
        return relational(lh,rh,relational::greater_or_equal);
 }
 
-// input/output stream operators
+// input/output stream operators and manipulators
+
+static int my_ios_index()
+{
+       static int i = std::ios_base::xalloc();
+       return i;
+}
+
+// Stream format gets copied or destroyed
+static void my_ios_callback(std::ios_base::event ev, std::ios_base & s, int i)
+{
+       print_context *p = static_cast<print_context *>(s.pword(i));
+       if (ev == std::ios_base::erase_event) {
+               delete p;
+               s.pword(i) = 0;
+       } else if (ev == std::ios_base::copyfmt_event && p != 0)
+               s.pword(i) = p->duplicate();
+}
+
+enum {
+       callback_registered = 1
+};
+
+// Get print_context associated with stream, may return 0 if no context has
+// been associated yet
+static inline print_context *get_print_context(std::ios_base & s)
+{
+       return static_cast<print_context *>(s.pword(my_ios_index()));
+}
+
+// Set print_context associated with stream, retain options
+static void set_print_context(std::ios_base & s, const print_context & c)
+{
+       int i = my_ios_index();
+       long flags = s.iword(i);
+       if (!(flags & callback_registered)) {
+               s.register_callback(my_ios_callback, i);
+               s.iword(i) = flags | callback_registered;
+       }
+       print_context *p = static_cast<print_context *>(s.pword(i));
+       unsigned options = p ? p->options : c.options;
+       delete p;
+       p = c.duplicate();
+       p->options = options;
+       s.pword(i) = p;
+}
+
+// Get options for print_context associated with stream
+static inline unsigned get_print_options(std::ios_base & s)
+{
+       print_context *p = get_print_context(s);
+       return p ? p->options : 0;
+}
+
+// Set options for print_context associated with stream
+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_dflt(s, options));
+       else
+               p->options = options;
+}
 
 std::ostream & operator<<(std::ostream & os, const ex & e)
 {
-       e.print(print_context(os));
+       print_context *p = get_print_context(os);
+       if (p == 0)
+               e.print(print_dflt(os));
+       else
+               e.print(*p);
        return os;
 }
 
@@ -285,4 +354,71 @@ std::istream & operator>>(std::istream & is, ex & e)
        throw (std::logic_error("expression input from streams not implemented"));
 }
 
+std::ostream & dflt(std::ostream & os)
+{
+       set_print_context(os, print_dflt(os));
+       set_print_options(os, 0);
+       return os;
+}
+
+std::ostream & latex(std::ostream & os)
+{
+       set_print_context(os, print_latex(os));
+       return os;
+}
+
+std::ostream & python(std::ostream & os)
+{
+       set_print_context(os, print_python(os));
+       return os;
+}
+
+std::ostream & python_repr(std::ostream & os)
+{
+       set_print_context(os, print_python_repr(os));
+       return os;
+}
+
+std::ostream & tree(std::ostream & os)
+{
+       set_print_context(os, print_tree(os));
+       return os;
+}
+
+std::ostream & csrc(std::ostream & os)
+{
+       set_print_context(os, print_csrc_double(os));
+       return os;
+}
+
+std::ostream & csrc_float(std::ostream & os)
+{
+       set_print_context(os, print_csrc_float(os));
+       return os;
+}
+
+std::ostream & csrc_double(std::ostream & os)
+{
+       set_print_context(os, print_csrc_double(os));
+       return os;
+}
+
+std::ostream & csrc_cl_N(std::ostream & os)
+{
+       set_print_context(os, print_csrc_cl_N(os));
+       return os;
+}
+
+std::ostream & index_dimensions(std::ostream & os)
+{
+       set_print_options(os, get_print_options(os) | print_options::print_index_dimensions);
+       return os;
+}
+
+std::ostream & no_index_dimensions(std::ostream & os)
+{
+       set_print_options(os, get_print_options(os) & ~print_options::print_index_dimensions);
+       return os;
+}
+
 } // namespace GiNaC