X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fadd.h;h=51cb4f104eba044a8c2f5bc458a56c5946792961;hp=783830345b682f4d18ee7bcd6741fc6a77e4104e;hb=e78ff721b08c980e31b61cfcf9c0a882dfcf9898;hpb=a8507b8af1c08d9b27d98d57f95c7ca1a8671e27

diff --git a/ginac/add.h b/ginac/add.h
index 78383034..51cb4f10 100644
--- a/ginac/add.h
+++ b/ginac/add.h
@@ -1,8 +1,9 @@
 /** @file add.h
  *
- *  Interface to GiNaC's sums of expressions.
- *
- *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
+ *  Interface to GiNaC's sums of expressions. */
+
+/*
+ *  GiNaC Copyright (C) 1999-2000 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
@@ -22,9 +23,17 @@
 #ifndef __GINAC_ADD_H__
 #define __GINAC_ADD_H__
 
+#include <ginac/expairseq.h>
+
+#ifndef NO_GINAC_NAMESPACE
+namespace GiNaC {
+#endif // ndef NO_GINAC_NAMESPACE
+
 /** Sum of expressions. */
 class add : public expairseq
 {
+    GINAC_DECLARE_REGISTERED_CLASS(add, expairseq)
+
     friend class mul;
     friend class ncmul;
     friend class power;
@@ -35,55 +44,53 @@ class add : public expairseq
 public:
     add();
     ~add();
-    add(add const & other);
-    add const & operator=(add const & other);
+    add(const add & other);
+    const add & operator=(const add & other);
 protected:
-    void copy(add const & other);
+    void copy(const add & other);
     void destroy(bool call_parent);
 
     // other constructors
 public:
-    add(ex const & lh, ex const & rh);
-    add(exvector const & v);
-    add(epvector const & v);
-    //add(epvector const & v, bool do_not_canonicalize=0);
-    add(epvector const & v, ex const & oc);
-    add(epvector * vp, ex const & oc);
+    add(const ex & lh, const ex & rh);
+    add(const exvector & v);
+    add(const epvector & v);
+    //add(const epvector & v, bool do_not_canonicalize=0);
+    add(const epvector & v, const ex & oc);
+    add(epvector * vp, const ex & oc);
 
     // functions overriding virtual functions from bases classes
 public:
     basic * duplicate() const;
-    void printraw(ostream & os) const;
     void print(ostream & os, unsigned upper_precedence=0) const;
+    void printraw(ostream & os) const;
     void printcsrc(ostream & os, unsigned type, unsigned upper_precedence=0) const;
     bool info(unsigned inf) const;
-    int degree(symbol const & s) const;
-    int ldegree(symbol const & s) const;
-    ex coeff(symbol const & s, int const n=1) const;
+    int degree(const symbol & s) const;
+    int ldegree(const symbol & s) const;
+    ex coeff(const symbol & s, int n=1) const;
     ex eval(int level=0) const;
-    ex diff(symbol const & s) const;
-    ex series(symbol const & s, ex const & point, int order) const;
+    ex diff(const symbol & s) const;
+    ex series(const symbol & s, const ex & point, int order) const;
     ex normal(lst &sym_lst, lst &repl_lst, int level=0) const;
     numeric integer_content(void) const;
-    ex smod(numeric const &xi) const;
+    ex smod(const numeric &xi) const;
     numeric max_coefficient(void) const;
     exvector get_indices(void) const;
-    ex simplify_ncmul(exvector const & v) const;
+    ex simplify_ncmul(const exvector & v) const;
 protected:
-    int compare_same_type(basic const & other) const;
-    bool is_equal_same_type(basic const & other) const;
+    int compare_same_type(const basic & other) const;
+    bool is_equal_same_type(const basic & other) const;
     unsigned return_type(void) const;
     unsigned return_type_tinfo(void) const;
-    ex thisexpairseq(epvector const & v, ex const & oc) const;
-    ex thisexpairseq(epvector * vp, ex const & oc) const;
-    void printpair(ostream & os, expair const & p,
-                   unsigned upper_precedence) const;
-    expair split_ex_to_pair(ex const & e) const;
-    expair combine_ex_with_coeff_to_pair(ex const & e,
-                                         ex const & c) const;
-    expair combine_pair_with_coeff_to_pair(expair const & p,
-                                           ex const & c) const;
-    ex recombine_pair_to_ex(expair const & p) const;
+    ex thisexpairseq(const epvector & v, const ex & oc) const;
+    ex thisexpairseq(epvector * vp, const ex & oc) const;
+    expair split_ex_to_pair(const ex & e) const;
+    expair combine_ex_with_coeff_to_pair(const ex & e,
+                                         const ex & c) const;
+    expair combine_pair_with_coeff_to_pair(const expair & p,
+                                           const ex & c) const;
+    ex recombine_pair_to_ex(const expair & p) const;
     ex expand(unsigned options=0) const;
     
     // new virtual functions which can be overridden by derived classes
@@ -101,9 +108,16 @@ protected:
 // global constants
 
 extern const add some_add;
-extern type_info const & typeid_add;
+extern const type_info & typeid_add;
 
-#define ex_to_add(X) static_cast<add const &>(*(X).bp)
+// utility functions
+inline const add &ex_to_add(const ex &e)
+{
+	return static_cast<const add &>(*e.bp);
+}
 
-#endif // ndef __GINAC_ADD_H__
+#ifndef NO_GINAC_NAMESPACE
+} // namespace GiNaC
+#endif // ndef NO_GINAC_NAMESPACE
 
+#endif // ndef __GINAC_ADD_H__