X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Fbasic.h;h=d7fef59385856882a370e4f8383e67700a784e63;hb=f263f768cf609ae8c0899560449f235a6d408193;hp=4ace75fd6d9289ee1c79fd4796768b10f113250d;hpb=276f1bc79bd0f41a12fb45ece6c7857e13c6668e;p=ginac.git

diff --git a/ginac/basic.h b/ginac/basic.h
index 4ace75fd..d7fef593 100644
--- a/ginac/basic.h
+++ b/ginac/basic.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's ABC. */
 
 /*
- *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2002 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
@@ -23,9 +23,7 @@
 #ifndef __GINAC_BASIC_H__
 #define __GINAC_BASIC_H__
 
-#include <iostream>
 #include <vector>
-
 // CINT needs <algorithm> to work properly with <vector>
 #include <algorithm>
 
@@ -33,7 +31,6 @@
 #include "tinfos.h"
 #include "assertion.h"
 #include "registrar.h"
-/*#include "debugmsg.h"*/
 
 namespace GiNaC {
 
@@ -64,16 +61,12 @@ class basic
 	
 	friend class ex;
 	
-	// default ctor, dtor, copy ctor assignment operator and helpers
+	// default ctor, dtor, copy ctor, assignment operator and helpers
 public:
-	basic() : tinfo_key(TINFO_basic), flags(0), refcount(0)
-	{
-		/* debugmsg("basic default ctor", LOGLEVEL_CONSTRUCT); */
-	}
+	basic() : tinfo_key(TINFO_basic), flags(0), refcount(0) {}
 	/** basic dtor, virtual because class ex will delete objects via ptr. */
 	virtual ~basic()
 	{
-		/* debugmsg("basic dtor", LOGLEVEL_DESTRUCT); */
 		destroy(false);
 		GINAC_ASSERT((!(flags & status_flags::dynallocated))||(refcount==0));
 	}
@@ -92,12 +85,7 @@ protected:
 	
 	// other ctors
 	/** ctor with specified tinfo_key */
-	basic(unsigned ti) : tinfo_key(ti), flags(0), refcount(0)
-	{
-		/* debugmsg("basic ctor with tinfo_key", LOGLEVEL_CONSTRUCT); */
-	}
-	// functions overriding virtual functions from bases classes
-	// none
+	basic(unsigned ti) : tinfo_key(ti), flags(0), refcount(0) {}
 	
 	// new virtual functions which can be overridden by derived classes
 public: // only const functions please (may break reference counting)
@@ -112,6 +100,7 @@ public: // only const functions please (may break reference counting)
 	virtual ex & let_op(int i);
 	virtual ex operator[](const ex & index) const;
 	virtual ex operator[](int i) const;
+	virtual ex expand(unsigned options = 0) const;
 	virtual bool has(const ex & other) const;
 	virtual ex map(map_function & f) const;
 	virtual int degree(const ex & s) const;
@@ -130,19 +119,19 @@ public: // only const functions please (may break reference counting)
 	virtual ex smod(const numeric &xi) const;
 	virtual numeric max_coefficient(void) const;
 	virtual exvector get_free_indices(void) const;
-	virtual ex simplify_ncmul(const exvector & v) const;
 	virtual ex eval_indexed(const basic & i) const;
 	virtual ex add_indexed(const ex & self, const ex & other) const;
 	virtual ex scalar_mul_indexed(const ex & self, const numeric & other) const;
 	virtual bool contract_with(exvector::iterator self, exvector::iterator other, exvector & v) const;
-protected: // non-const functions should be called from class ex only
+	virtual unsigned return_type(void) const;
+	virtual unsigned return_type_tinfo(void) const;
+protected: // functions that should be called from class ex only
 	virtual ex derivative(const symbol & s) const;
 	virtual int compare_same_type(const basic & other) const;
 	virtual bool is_equal_same_type(const basic & other) const;
-	virtual unsigned return_type(void) const;
-	virtual unsigned return_type_tinfo(void) const;
+	virtual bool match_same_type(const basic & other) const;
 	virtual unsigned calchash(void) const;
-	virtual ex expand(unsigned options = 0) const;
+	virtual ex simplify_ncmul(const exvector & v) const;
 	
 	// non-virtual functions in this class
 public:
@@ -176,23 +165,52 @@ private:
 
 extern int max_recursion_level;
 
-// convenience macros
+// convenience type checker template functions
 
-/** Check if OBJ is a TYPE, including base classes. */
-#define is_of_type(OBJ,TYPE) \
-	(dynamic_cast<const TYPE *>(&OBJ)!=0)
+/** Check if obj is a T, including base classes. */
+template <class T>
+inline bool is_a(const basic &obj)
+{
+	return dynamic_cast<const T *>(&obj)!=0;
+}
+
+/** Check if obj is a T, not including base classes.  This one is just an
+ *  inefficient default.  It should in all time-critical cases be overridden
+ *  by template specializations that don't create a temporary. */
+template <class T>
+inline bool is_exactly_a(const class basic &obj)
+{
+	const T foo; return foo.tinfo()==obj.tinfo();
+}
 
-/** Check if OBJ is a TYPE, not including base classes. */
-#define is_exactly_of_type(OBJ,TYPE) \
-	((OBJ).tinfo()==GiNaC::TINFO_##TYPE)
+/** Check if ex is a handle to a T, including base classes. */
+template <class T>
+inline bool is_a(const ex &obj)
+{
+	return is_a<T>(*obj.bp);
+}
 
-/** Check if ex is a handle to a TYPE, including base classes. */
-#define is_ex_of_type(OBJ,TYPE) \
-	(dynamic_cast<const TYPE *>((OBJ).bp)!=0)
+/** Check if ex is a handle to a T, not including base classes. */
+template <class T>
+inline bool is_exactly_a(const ex &obj)
+{
+	return is_exactly_a<T>(*obj.bp);
+}
 
-/** Check if ex is a handle to a TYPE, not including base classes. */
-#define is_ex_exactly_of_type(OBJ,TYPE) \
-	((*(OBJ).bp).tinfo()==GiNaC::TINFO_##TYPE)
+/** Return a reference to the basic-derived class T object embedded in an
+ *  expression.  This is fast but unsafe: the result is undefined if the
+ *  expression does not contain a T object at its top level.  Hence, you
+ *  should generally check the type of e first.
+ *
+ *  @param e expression
+ *  @return reference to pseries object
+ *  @see is_exactly_a<class T>() */
+template <class T>
+inline const T &ex_to(const ex &e)
+{
+	GINAC_ASSERT(is_a<T>(e));
+	return static_cast<const T &>(*e.bp);
+}
 
 } // namespace GiNaC