X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fwildcard.h;h=9729237c97573a0aa038f3d3889b1be39c6d3852;hp=2e76e193d3ee4b83f4efe4e8c08744741f8d7bfc;hb=def26469ff96228c66e877bb5594e7d9a24b638f;hpb=b617b5cf86e6f8ac01a339d9747c535257fcf8d0

diff --git a/ginac/wildcard.h b/ginac/wildcard.h
index 2e76e193..9729237c 100644
--- a/ginac/wildcard.h
+++ b/ginac/wildcard.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's wildcard objects. */
 
 /*
- *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2008 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
@@ -17,7 +17,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef __GINAC_WILDCARD_H__
@@ -28,8 +28,8 @@
 namespace GiNaC {
 
 
-/** This class acts as a wildcard for subs(), match() and has(). An integer
- *  label is used to identify different wildcards. */
+/** This class acts as a wildcard for subs(), match(), has() and find(). An
+ *  integer label is used to identify different wildcards. */
 class wildcard : public basic
 {
 	GINAC_DECLARE_REGISTERED_CLASS(wildcard, basic)
@@ -39,15 +39,21 @@ public:
 	/** Construct wildcard with specified label. */
 	wildcard(unsigned label);
 
-	// functions overriding virtual functions from bases classes
+	// functions overriding virtual functions from base classes
 public:
-	void print(const print_context & c, unsigned level = 0) const;
-	unsigned calchash(void) const;
-	bool match(const ex & pattern, lst & repl_lst) const;
+	bool match(const ex & pattern, exmap& repl_lst) const;
+
+protected:
+	unsigned calchash() const;
 
 	// non-virtual functions in this class
 public:
-	unsigned get_label(void) const {return label;}
+	unsigned get_label() const {return label;}
+
+protected:
+	void do_print(const print_context & c, unsigned level) const;
+	void do_print_tree(const print_tree & c, unsigned level) const;
+	void do_print_python_repr(const print_python_repr & c, unsigned level) const;
 
 	// member variables
 private:
@@ -55,11 +61,7 @@ private:
 };
 
 
-// global functions
-inline const wildcard &ex_to_wildcard(const ex &e)
-{
-	return static_cast<const wildcard &>(*e.bp);
-}
+// utility functions
 
 /** Create a wildcard object with the specified label. */
 inline ex wild(unsigned label = 0)
@@ -67,6 +69,9 @@ inline ex wild(unsigned label = 0)
 	return wildcard(label);
 }
 
+/** Check whether x has a wildcard anywhere as a subexpression. */
+bool haswild(const ex & x);
+
 } // namespace GiNaC
 
 #endif // ndef __GINAC_WILDCARD_H__