* Interface to GiNaC's light-weight expression handles. */
/*
- * GiNaC Copyright (C) 1999-2008 Johannes Gutenberg University Mainz, Germany
+ * GiNaC Copyright (C) 1999-2015 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
* 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 <memory>
#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
// default constructor, copy constructor and assignment operator
public:
- ex() throw();
+ ex() noexcept;
// other constructors
public:
// non-virtual functions in this class
public:
/** Efficiently swap the contents of two expressions. */
- void swap(ex & other) throw()
+ void swap(ex & other) noexcept
{
GINAC_ASSERT(bp->flags & status_flags::dynallocated);
GINAC_ASSERT(other.bp->flags & status_flags::dynallocated);
}
// iterators
- const_iterator begin() const throw();
- const_iterator end() const throw();
+ const_iterator begin() const noexcept;
+ const_iterator end() const noexcept;
const_preorder_iterator preorder_begin() const;
- const_preorder_iterator preorder_end() const throw();
+ const_preorder_iterator preorder_end() const noexcept;
const_postorder_iterator postorder_begin() const;
- const_postorder_iterator postorder_end() const throw();
+ const_postorder_iterator postorder_end() const noexcept;
// evaluation
- ex eval(int level = 0) const { return bp->eval(level); }
+ ex eval() const { return bp->eval(); }
ex evalf(int level = 0) const { return bp->evalf(level); }
ex evalm() const { return bp->evalm(); }
ex eval_ncmul(const exvector & v) const { return bp->eval_ncmul(v); }
// 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
extern const basic *_num0_bp;
inline
-ex::ex() throw() : bp(*const_cast<basic *>(_num0_bp))
+ex::ex() noexcept : bp(*const_cast<basic *>(_num0_bp))
{
GINAC_ASSERT(bp->flags & status_flags::dynallocated);
}
friend class const_postorder_iterator;
public:
- const_iterator() throw() {}
+ const_iterator() noexcept {}
private:
- const_iterator(const ex &e_, size_t i_) throw() : e(e_), i(i_) {}
+ const_iterator(const ex &e_, size_t i_) noexcept : e(e_), i(i_) {}
public:
// This should return an ex&, but that would be a reference to a
// This should return an ex*, but that would be a pointer to a
// temporary value
- std::auto_ptr<ex> operator->() const
+ std::unique_ptr<ex> operator->() const
{
- return std::auto_ptr<ex>(new ex(operator*()));
+ return std::unique_ptr<ex>(new ex(operator*()));
}
ex operator[](difference_type n) const
return e.op(i + n);
}
- const_iterator &operator++() throw()
+ const_iterator &operator++() noexcept
{
++i;
return *this;
}
- const_iterator operator++(int) throw()
+ const_iterator operator++(int) noexcept
{
const_iterator tmp = *this;
++i;
return tmp;
}
- const_iterator &operator+=(difference_type n) throw()
+ const_iterator &operator+=(difference_type n) noexcept
{
i += n;
return *this;
}
- const_iterator operator+(difference_type n) const throw()
+ const_iterator operator+(difference_type n) const noexcept
{
return const_iterator(e, i + n);
}
- inline friend const_iterator operator+(difference_type n, const const_iterator &it) throw()
+ inline friend const_iterator operator+(difference_type n, const const_iterator &it) noexcept
{
return const_iterator(it.e, it.i + n);
}
- const_iterator &operator--() throw()
+ const_iterator &operator--() noexcept
{
--i;
return *this;
}
- const_iterator operator--(int) throw()
+ const_iterator operator--(int) noexcept
{
const_iterator tmp = *this;
--i;
return tmp;
}
- const_iterator &operator-=(difference_type n) throw()
+ const_iterator &operator-=(difference_type n) noexcept
{
i -= n;
return *this;
}
- const_iterator operator-(difference_type n) const throw()
+ const_iterator operator-(difference_type n) const noexcept
{
return const_iterator(e, i - n);
}
- inline friend difference_type operator-(const const_iterator &lhs, const const_iterator &rhs) throw()
+ inline friend difference_type operator-(const const_iterator &lhs, const const_iterator &rhs) noexcept
{
return lhs.i - rhs.i;
}
- bool operator==(const const_iterator &other) const throw()
+ bool operator==(const const_iterator &other) const noexcept
{
return are_ex_trivially_equal(e, other.e) && i == other.i;
}
- bool operator!=(const const_iterator &other) const throw()
+ bool operator!=(const const_iterator &other) const noexcept
{
return !(*this == other);
}
- bool operator<(const const_iterator &other) const throw()
+ bool operator<(const const_iterator &other) const noexcept
{
return i < other.i;
}
- bool operator>(const const_iterator &other) const throw()
+ bool operator>(const const_iterator &other) const noexcept
{
return other < *this;
}
- bool operator<=(const const_iterator &other) const throw()
+ bool operator<=(const const_iterator &other) const noexcept
{
return !(other < *this);
}
- bool operator>=(const const_iterator &other) const throw()
+ bool operator>=(const const_iterator &other) const noexcept
{
return !(*this < other);
}
struct _iter_rep {
_iter_rep(const ex &e_, size_t i_, size_t i_end_) : e(e_), i(i_), i_end(i_end_) {}
- bool operator==(const _iter_rep &other) const throw()
+ bool operator==(const _iter_rep &other) const noexcept
{
return are_ex_trivially_equal(e, other.e) && i == other.i;
}
- bool operator!=(const _iter_rep &other) const throw()
+ bool operator!=(const _iter_rep &other) const noexcept
{
return !(*this == other);
}
class const_preorder_iterator : public std::iterator<std::forward_iterator_tag, ex, ptrdiff_t, const ex *, const ex &> {
public:
- const_preorder_iterator() throw() {}
+ const_preorder_iterator() noexcept {}
const_preorder_iterator(const ex &e, size_t n)
{
return tmp;
}
- bool operator==(const const_preorder_iterator &other) const throw()
+ bool operator==(const const_preorder_iterator &other) const noexcept
{
return s == other.s;
}
- bool operator!=(const const_preorder_iterator &other) const throw()
+ bool operator!=(const const_preorder_iterator &other) const noexcept
{
return !(*this == other);
}
private:
- std::stack<internal::_iter_rep, std::vector<internal::_iter_rep> > s;
+ std::stack<internal::_iter_rep, std::vector<internal::_iter_rep>> s;
void increment()
{
class const_postorder_iterator : public std::iterator<std::forward_iterator_tag, ex, ptrdiff_t, const ex *, const ex &> {
public:
- const_postorder_iterator() throw() {}
+ const_postorder_iterator() noexcept {}
const_postorder_iterator(const ex &e, size_t n)
{
return tmp;
}
- bool operator==(const const_postorder_iterator &other) const throw()
+ bool operator==(const const_postorder_iterator &other) const noexcept
{
return s == other.s;
}
- bool operator!=(const const_postorder_iterator &other) const throw()
+ bool operator!=(const const_postorder_iterator &other) const noexcept
{
return !(*this == other);
}
private:
- std::stack<internal::_iter_rep, std::vector<internal::_iter_rep> > s;
+ std::stack<internal::_iter_rep, std::vector<internal::_iter_rep>> s;
void descend()
{
}
};
-inline const_iterator ex::begin() const throw()
+inline const_iterator ex::begin() const noexcept
{
return const_iterator(*this, 0);
}
-inline const_iterator ex::end() const throw()
+inline const_iterator ex::end() const noexcept
{
return const_iterator(*this, nops());
}
return const_preorder_iterator(*this, nops());
}
-inline const_preorder_iterator ex::preorder_end() const throw()
+inline const_preorder_iterator ex::preorder_end() const noexcept
{
return const_preorder_iterator();
}
return const_postorder_iterator(*this, nops());
}
-inline const_postorder_iterator ex::postorder_end() const throw()
+inline const_postorder_iterator ex::postorder_end() const noexcept
{
return const_postorder_iterator();
}
inline ex collect(const ex & thisex, const ex & s, bool distributed = false)
{ return thisex.collect(s, distributed); }
-inline ex eval(const ex & thisex, int level = 0)
-{ return thisex.eval(level); }
+inline ex eval(const ex & thisex)
+{ return thisex.eval(); }
inline ex evalf(const ex & thisex, int level = 0)
{ return thisex.evalf(level); }
ex (*ptr)(const ex &);
public:
explicit pointer_to_map_function(ex x(const ex &)) : ptr(x) {}
- ex operator()(const ex & e) { return ptr(e); }
+ ex operator()(const ex & e) override { return ptr(e); }
};
template<class T1>
T1 arg1;
public:
explicit pointer_to_map_function_1arg(ex x(const ex &, T1), T1 a1) : ptr(x), arg1(a1) {}
- ex operator()(const ex & e) { return ptr(e, arg1); }
+ ex operator()(const ex & e) override { return ptr(e, arg1); }
};
template<class T1, class T2>
T2 arg2;
public:
explicit pointer_to_map_function_2args(ex x(const ex &, T1, T2), T1 a1, T2 a2) : ptr(x), arg1(a1), arg2(a2) {}
- ex operator()(const ex & e) { return ptr(e, arg1, arg2); }
+ ex operator()(const ex & e) override { return ptr(e, arg1, arg2); }
};
template<class T1, class T2, class T3>
T3 arg3;
public:
explicit pointer_to_map_function_3args(ex x(const ex &, T1, T2, T3), T1 a1, T2 a2, T3 a3) : ptr(x), arg1(a1), arg2(a2), arg3(a3) {}
- ex operator()(const ex & e) { return ptr(e, arg1, arg2, arg3); }
+ ex operator()(const ex & e) override { return ptr(e, arg1, arg2, arg3); }
};
template<class C>
C &c;
public:
explicit pointer_to_member_to_map_function(ex (C::*member)(const ex &), C &obj) : ptr(member), c(obj) {}
- ex operator()(const ex & e) { return (c.*ptr)(e); }
+ ex operator()(const ex & e) override { return (c.*ptr)(e); }
};
template<class C, class T1>
T1 arg1;
public:
explicit pointer_to_member_to_map_function_1arg(ex (C::*member)(const ex &, T1), C &obj, T1 a1) : ptr(member), c(obj), arg1(a1) {}
- ex operator()(const ex & e) { return (c.*ptr)(e, arg1); }
+ ex operator()(const ex & e) override { return (c.*ptr)(e, arg1); }
};
template<class C, class T1, class T2>
T2 arg2;
public:
explicit pointer_to_member_to_map_function_2args(ex (C::*member)(const ex&, T1, T2), C &obj, T1 a1, T2 a2) : ptr(member), c(obj), arg1(a1), arg2(a2) {}
- ex operator()(const ex & e) { return (c.*ptr)(e, arg1, arg2); }
+ ex operator()(const ex & e) override { return (c.*ptr)(e, arg1, arg2); }
};
template<class C, class T1, class T2, class T3>
T3 arg3;
public:
explicit pointer_to_member_to_map_function_3args(ex (C::*member)(const ex &, T1, T2, T3), C &obj, T1 a1, T2 a2, T3 a3) : ptr(member), c(obj), arg1(a1), arg2(a2), arg3(a3) {}
- ex operator()(const ex & e) { return (c.*ptr)(e, arg1, arg2, arg3); }
+ ex operator()(const ex & e) override { return (c.*ptr)(e, arg1, arg2, arg3); }
};
inline ex ex::map(ex f(const ex &)) const
a.swap(b);
}
-/** Specialization of std::iter_swap() for vector<ex> iterators. */
-template <>
-inline void iter_swap(vector<GiNaC::ex>::iterator i1, vector<GiNaC::ex>::iterator i2)
-{
- i1->swap(*i2);
-}
-
-/** Specialization of std::iter_swap() for list<ex> iterators. */
-template <>
-inline void iter_swap(list<GiNaC::ex>::iterator i1, list<GiNaC::ex>::iterator i2)
-{
- i1->swap(*i2);
-}
-
} // namespace std
-#endif // ndef __GINAC_EX_H__
+#endif // ndef GINAC_EX_H
git://www.ginac.de / ginac.git / blobdiff