X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fadd.h;h=4f55240ade432133c4cde263969714cb70a6bad5;hp=8738bdf3d8b6d405ba0587cfd6e0a3011e741c7b;hb=a053768864556ce627f958a38fb1169ab00b8229;hpb=094911eb78cacb6f2877a70c9ac74766df58ccea

diff --git a/ginac/add.h b/ginac/add.h
index 8738bdf3..4f55240a 100644
--- a/ginac/add.h
+++ b/ginac/add.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's sums of expressions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2003 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
@@ -33,7 +33,6 @@ class add : public expairseq
 	GINAC_DECLARE_REGISTERED_CLASS(add, expairseq)
 	
 	friend class mul;
-	friend class ncmul;
 	friend class power;
 	
 	// other constructors
@@ -44,16 +43,16 @@ public:
 	add(const epvector & v, const ex & oc);
 	add(epvector * vp, const ex & oc);
 	
-	// functions overriding virtual functions from bases classes
+	// functions overriding virtual functions from base classes
 public:
-	void print(std::ostream & os, unsigned upper_precedence=0) const;
-	void printraw(std::ostream & os) const;
-	void printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence=0) const;
+	void print(const print_context & c, unsigned level = 0) const;
+	unsigned precedence(void) const {return 40;}
 	bool info(unsigned inf) const;
-	int degree(const symbol & s) const;
-	int ldegree(const symbol & s) const;
-	ex coeff(const symbol & s, int n=1) const;
+	int degree(const ex & s) const;
+	int ldegree(const ex & s) const;
+	ex coeff(const ex & s, int n=1) const;
 	ex eval(int level=0) const;
+	ex evalm(void) const;
 	ex series(const relational & r, int order, unsigned options = 0) const;
 	ex normal(lst &sym_lst, lst &repl_lst, int level=0) const;
 	numeric integer_content(void) const;
@@ -75,23 +74,14 @@ protected:
 	                                       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
-	// none
-	
-	// non-virtual functions in this class
-	// none
-
-// member variables
-
-protected:
-	static unsigned precedence;
 };
 
 // utility functions
-inline const add &ex_to_add(const ex &e)
+
+/** Specialization of is_exactly_a<add>(obj) for add objects. */
+template<> inline bool is_exactly_a<add>(const basic & obj)
 {
-	return static_cast<const add &>(*e.bp);
+	return obj.tinfo()==TINFO_add;
 }
 
 } // namespace GiNaC