X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fpseries.h;h=0ddb590f1e6d4d6c7d20bc12fb0dba02473c59e6;hp=f7c32aa505bfd25423c1bdbb9951bafd50e1902a;hb=81efb5392132944d3649351b1efc5dac1a2625b1;hpb=bd2d7351b89743eb68ce7d3bfa7ab62c331f9522;ds=sidebyside

diff --git a/ginac/pseries.h b/ginac/pseries.h
index f7c32aa5..0ddb590f 100644
--- a/ginac/pseries.h
+++ b/ginac/pseries.h
@@ -36,70 +36,71 @@ namespace GiNaC {
  *  Other classes must provide members to convert into this type. */
 class pseries : public basic
 {
-    GINAC_DECLARE_REGISTERED_CLASS(pseries, basic)
+	GINAC_DECLARE_REGISTERED_CLASS(pseries, basic)
 
-    // default constructor, destructor, copy constructor, assignment operator and helpers
+	// default constructor, destructor, copy constructor, assignment operator and helpers
 public:
-    pseries();
-    ~pseries();
-    pseries(const pseries &other);
-    const pseries &operator=(const pseries &other);
+	pseries();
+	~pseries();
+	pseries(const pseries &other);
+	const pseries &operator=(const pseries &other);
 protected:
-    void copy(const pseries &other);
-    void destroy(bool call_parent);
+	void copy(const pseries &other);
+	void destroy(bool call_parent);
 
-    // other constructors
+	// other constructors
 public:
-    pseries(const ex &rel_, const epvector &ops_);
+	pseries(const ex &rel_, const epvector &ops_);
 
-    // functions overriding virtual functions from base classes
+	// functions overriding virtual functions from base classes
 public:
-    basic *duplicate() const;
-    void print(std::ostream &os, unsigned upper_precedence = 0) const;
-    void printraw(std::ostream &os) const;
-    void printtree(std::ostream & os, unsigned indent) const;
-    unsigned nops(void) const;
-    ex op(int i) const;
-    ex &let_op(int i);
-    int degree(const symbol &s) const;
-    int ldegree(const symbol &s) const;
-    ex coeff(const symbol &s, int n = 1) const;
-    ex collect(const symbol &s) const;
-    ex eval(int level=0) const;
-    ex evalf(int level=0) const;
-    ex series(const relational & r, int order, bool branchcut = true) const;
-    ex subs(const lst & ls, const lst & lr) const;
-    ex normal(lst &sym_lst, lst &repl_lst, int level = 0) const;
-    ex expand(unsigned options = 0) const;
+	basic *duplicate() const;
+	void print(std::ostream &os, unsigned upper_precedence = 0) const;
+	void printraw(std::ostream &os) const;
+	void printtree(std::ostream & os, unsigned indent) const;
+	unsigned nops(void) const;
+	ex op(int i) const;
+	ex &let_op(int i);
+	int degree(const symbol &s) const;
+	int ldegree(const symbol &s) const;
+	ex coeff(const symbol &s, int n = 1) const;
+	ex collect(const symbol &s) const;
+	ex eval(int level=0) const;
+	ex evalf(int level=0) const;
+	ex series(const relational & r, int order, unsigned options = 0) const;
+	ex subs(const lst & ls, const lst & lr) const;
+	ex normal(lst &sym_lst, lst &repl_lst, int level = 0) const;
+	ex expand(unsigned options = 0) const;
 protected:
-    ex derivative(const symbol & s) const;
+	ex derivative(const symbol & s) const;
 
-    // non-virtual functions in this class
+	// non-virtual functions in this class
 public:
-    ex convert_to_poly(bool no_order = false) const;
-    bool is_compatible_to(const pseries &other) const {return var.compare(other.var) == 0 && point.compare(other.point) == 0;}
-    bool is_zero(void) const {return seq.size() == 0;}
-    bool is_terminating(void) const;
-    ex add_series(const pseries &other) const;
-    ex mul_const(const numeric &other) const;
-    ex mul_series(const pseries &other) const;
-    ex power_const(const numeric &p, int deg) const;
-    pseries shift_exponents(int deg) const;
+	ex convert_to_poly(bool no_order = false) const;
+	bool is_compatible_to(const pseries &other) const {return var.compare(other.var) == 0 && point.compare(other.point) == 0;}
+	bool is_zero(void) const {return seq.size() == 0;}
+	bool is_terminating(void) const;
+	ex add_series(const pseries &other) const;
+	ex mul_const(const numeric &other) const;
+	ex mul_series(const pseries &other) const;
+	ex power_const(const numeric &p, int deg) const;
+	pseries shift_exponents(int deg) const;
 
 protected:
-    /** Vector of {coefficient, power} pairs */
-    epvector seq;
+	/** Vector of {coefficient, power} pairs */
+	epvector seq;
 
-    /** Series variable (holds a symbol) */
-    ex var;
+	/** Series variable (holds a symbol) */
+	ex var;
 
-    /** Expansion point */
-    ex point;
+	/** Expansion point */
+	ex point;
+	static unsigned precedence;
 };
 
 // global constants
 extern const pseries some_pseries;
-extern const type_info & typeid_pseries;
+extern const std::type_info & typeid_pseries;
 
 /** Return a reference to the pseries object embedded in an expression.
  *  The result is undefined if the expression does not contain a pseries
@@ -110,7 +111,7 @@ extern const type_info & typeid_pseries;
  *  @see is_ex_of_type */
 inline const pseries &ex_to_pseries(const ex &e)
 {
-    return static_cast<const pseries &>(*e.bp);
+	return static_cast<const pseries &>(*e.bp);
 }
 
 /** Convert the pseries object embedded in an expression to an ordinary
@@ -123,12 +124,12 @@ inline const pseries &ex_to_pseries(const ex &e)
  *  @see pseries::convert_to_poly */
 inline ex series_to_poly(const ex &e)
 {
-    return (static_cast<const pseries &>(*e.bp).convert_to_poly(true));
+	return (static_cast<const pseries &>(*e.bp).convert_to_poly(true));
 }
 
 inline bool is_terminating(const pseries & s)
 {
-    return s.is_terminating();
+	return s.is_terminating();
 }
 
 #ifndef NO_NAMESPACE_GINAC