X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fmul.h;h=23e0e1f3e60845d914631ec9be0d53a4ae72e82b;hp=c531fd6fa4ec36e2172b482c2dbda9e01db86eca;hb=6bff4f32e5cbe9f7e51837f392a2d0bf0d5b721d;hpb=094911eb78cacb6f2877a70c9ac74766df58ccea

diff --git a/ginac/mul.h b/ginac/mul.h
index c531fd6f..23e0e1f3 100644
--- a/ginac/mul.h
+++ b/ginac/mul.h
@@ -45,17 +45,17 @@ public:
 	mul(epvector * vp, const ex & oc);
 	mul(const ex & lh, const ex & mh, const ex & rh);
 	
-	// functions overriding virtual functions from bases classes
+	// functions overriding virtual functions from base classes
 public:
-	void print(std::ostream & os, unsigned upper_precedence) const;
-	void printraw(std::ostream & os) const;
-	void printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence) const;
+	void print(const print_context & c, unsigned level = 0) const;
+	unsigned precedence(void) const {return 50;}
 	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 evalf(int level=0) const;
+	ex evalm(void) const;
 	ex series(const relational & s, int order, unsigned options = 0) const;
 	ex normal(lst &sym_lst, lst &repl_lst, int level = 0) const;
 	numeric integer_content(void) const;
@@ -71,10 +71,8 @@ protected:
 	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;
+	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;
 	bool expair_needs_further_processing(epp it);
 	ex default_overall_coeff(void) const;
@@ -89,19 +87,23 @@ protected:
 	// non-virtual functions in this class
 protected:
 	epvector * expandchildren(unsigned options) const;
-	
-// member variables
-	
-protected:
-	static unsigned precedence;
 };
 
 // utility functions
+
+/** Return the mul object handled by an ex.  Deprecated: use ex_to<mul>().
+ *  This is unsafe: you need to check the type first. */
 inline const mul &ex_to_mul(const ex &e)
 {
 	return static_cast<const mul &>(*e.bp);
 }
 
+/** Specialization of is_exactly_a<mul>(obj) for mul objects. */
+template<> inline bool is_exactly_a<mul>(const basic & obj)
+{
+	return obj.tinfo()==TINFO_mul;
+}
+
 } // namespace GiNaC
 
 #endif // ndef __GINAC_MUL_H__