Update copyright statements.

[ginac.git] / ginac / ex.h

diff --git a/ginac/ex.h b/ginac/ex.h
index 1e56e82373046828423e8d14c31c37230734115e..4cc7725cc26bef51bd9754997cbe5eea7977d3b5 100644 (file)
--- a/ginac/ex.h
+++ b/ginac/ex.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's light-weight expression handles. */
 
 /*
- *  GiNaC Copyright (C) 1999-2006 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2014 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
@@ -20,19 +20,23 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GINAC_EX_H__
-#define __GINAC_EX_H__
+#ifndef GINAC_EX_H
+#define GINAC_EX_H
 
+#include "basic.h"
+#include "ptr.h"
+
+#include <functional>
 #include <iosfwd>
 #include <iterator>
-#include <functional>
 #include <stack>
 
-#include "basic.h"
-#include "ptr.h"
-
 namespace GiNaC {
-
+#ifdef _MSC_VER
+  // MSVC produces a different symbol for _ex0 when it is declared inside   
+  // ex::is_zero() than when it is declared at top level as follows
+  extern const ex _ex0;
+#endif
 
 /** Helper class to initialize the library.  There must be one static object
  *  of this class in every object file that makes use of our flyweights in
@@ -43,6 +47,7 @@ namespace GiNaC {
  *
  *  @see utils.cpp */
 class library_init {
+       static void init_unarchivers();
 public:
        library_init();
        ~library_init();
@@ -52,17 +57,17 @@ private:
 /** For construction of flyweights, etc. */
 static library_init library_initializer;
 
-
 class scalar_products;
 class const_iterator;
 class const_preorder_iterator;
 class const_postorder_iterator;
 
 
-/** Lightweight wrapper for GiNaC's symbolic objects.  Basically all it does is
- *  to hold a pointer to the other objects, manage the reference counting and
- *  provide methods for manipulation of these objects.  (Some people call such
- *  a thing a proxy class.) */
+/** Lightweight wrapper for GiNaC's symbolic objects.  It holds a pointer to
+ *  the other object in order to do garbage collection by the method of
+ *  reference counting.  I.e., it is a smart pointer.  Also, the constructor
+ *  ex::ex(const basic & other) calls the methods that do automatic
+ *  evaluation.  E.g., x-x turns automatically into 0. */
 class ex {
        friend class archive_node;
        friend inline bool are_ex_trivially_equal(const ex &, const ex &);
@@ -141,9 +146,9 @@ public:
 
        // pattern matching
        bool has(const ex & pattern, unsigned options = 0) const { return bp->has(pattern, options); }
-       bool find(const ex & pattern, lst & found) const;
+       bool find(const ex & pattern, exset& found) const;
        bool match(const ex & pattern) const;
-       bool match(const ex & pattern, lst & repl_lst) const { return bp->match(pattern, repl_lst); }
+       bool match(const ex & pattern, exmap & repls) const { return bp->match(pattern, repls); }
 
        // substitutions
        ex subs(const exmap & m, unsigned options = 0) const;
@@ -204,7 +209,12 @@ public:
        // comparison
        int compare(const ex & other) const;
        bool is_equal(const ex & other) const;
-       bool is_zero() const { extern const ex _ex0; return is_equal(_ex0); }
+       bool is_zero() const { 
+#ifndef _MSC_VER
+         extern const ex _ex0;
+#endif
+         return is_equal(_ex0); 
+       }
        bool is_zero_matrix() const;
        
        // symmetry
@@ -217,7 +227,7 @@ public:
 
        // noncommutativity
        unsigned return_type() const { return bp->return_type(); }
-       tinfo_t return_type_tinfo() const { return bp->return_type_tinfo(); }
+       return_type_t return_type_tinfo() const { return bp->return_type_tinfo(); }
 
        unsigned gethash() const { return bp->gethash(); }
 
@@ -678,6 +688,11 @@ struct ex_swap : public std::binary_function<ex, ex, void> {
        void operator() (ex &lh, ex &rh) const { lh.swap(rh); }
 };
 
+// Make it possible to print exvectors and exmaps
+std::ostream & operator<<(std::ostream & os, const exvector & e);
+std::ostream & operator<<(std::ostream & os, const exset & e);
+std::ostream & operator<<(std::ostream & os, const exmap & e);
+
 // wrapper functions around member functions
 inline size_t nops(const ex & thisex)
 { return thisex.nops(); }
@@ -697,7 +712,7 @@ inline ex imag_part(const ex & thisex)
 inline bool has(const ex & thisex, const ex & pattern, unsigned options = 0)
 { return thisex.has(pattern, options); }
 
-inline bool find(const ex & thisex, const ex & pattern, lst & found)
+inline bool find(const ex & thisex, const ex & pattern, exset& found)
 { return thisex.find(pattern, found); }
 
 inline bool is_polynomial(const ex & thisex, const ex & vars)
@@ -757,7 +772,7 @@ inline ex diff(const ex & thisex, const symbol & s, unsigned nth = 1)
 inline ex series(const ex & thisex, const ex & r, int order, unsigned options = 0)
 { return thisex.series(r, order, options); }
 
-inline bool match(const ex & thisex, const ex & pattern, lst & repl_lst)
+inline bool match(const ex & thisex, const ex & pattern, exmap& repl_lst)
 { return thisex.match(pattern, repl_lst); }
 
 inline ex simplify_indexed(const ex & thisex, unsigned options = 0)
@@ -970,4 +985,4 @@ inline void iter_swap(list<GiNaC::ex>::iterator i1, list<GiNaC::ex>::iterator i2
 
 } // namespace std
 
-#endif // ndef __GINAC_EX_H__
+#endif // ndef GINAC_EX_H