X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Fwildcard.h;h=721bb744a99c5aa8c25784767bf6c5a42d77ecfe;hb=refs%2Ftags%2Frelease_1-7-1;hp=f1e16968abe6cb43bc848db124104fc48d863deb;hpb=e7cc6a764ff67b5885d6633385fac23ccc1dc9a7;p=ginac.git

diff --git a/ginac/wildcard.h b/ginac/wildcard.h
index f1e16968..721bb744 100644
--- a/ginac/wildcard.h
+++ b/ginac/wildcard.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's wildcard objects. */
 
 /*
- *  GiNaC Copyright (C) 1999-2002 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2016 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,17 +17,17 @@
  *
  *  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__
-#define __GINAC_WILDCARD_H__
+#ifndef GINAC_WILDCARD_H
+#define GINAC_WILDCARD_H
 
 #include "ex.h"
+#include "archive.h"
 
 namespace GiNaC {
 
-
 /** 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
@@ -41,36 +41,42 @@ public:
 
 	// functions overriding virtual functions from base classes
 public:
-	void print(const print_context & c, unsigned level = 0) const;
-	bool match(const ex & pattern, lst & repl_lst) const;
+	bool match(const ex & pattern, exmap& repl_lst) const override;
 
+	/** Save (a.k.a. serialize) object into archive. */
+	void archive(archive_node& n) const override;
+	/** Read (a.k.a. deserialize) object from archive. */
+	void read_archive(const archive_node& n, lst& syms) override;
 protected:
-	unsigned calchash(void) const;
+	unsigned calchash() const override;
 
 	// 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:
 	unsigned label; /**< Label used to distinguish different wildcards */
 };
+GINAC_DECLARE_UNARCHIVER(wildcard);
 
 
 // utility functions
 
-/** Specialization of is_exactly_a<wildcard>(obj) for wildcard objects. */
-template<> inline bool is_exactly_a<wildcard>(const basic & obj)
-{
-        return obj.tinfo()==TINFO_wildcard;
-}
-
 /** Create a wildcard object with the specified label. */
 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__
+#endif // ndef GINAC_WILDCARD_H