X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fwildcard.cpp;h=3c6b0d85bd34a0305221bcd51fd1c3ac639bf5c2;hp=97fab9e919e101895a52d13d7cb9058886236906;hb=41e8c15b635c78bfbc677e7f1c00ce5f3ca97f1d;hpb=68fdf425abf14d016d5f95ee7b9d06a19a3c5926

diff --git a/ginac/wildcard.cpp b/ginac/wildcard.cpp
index 97fab9e9..3c6b0d85 100644
--- a/ginac/wildcard.cpp
+++ b/ginac/wildcard.cpp
@@ -3,7 +3,7 @@
  *  Implementation of GiNaC's wildcard objects. */
 
 /*
- *  GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2020 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,25 +17,28 @@
  *
  *  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
  */
 
-#include <iostream>
-
 #include "wildcard.h"
-#include "print.h"
 #include "archive.h"
 #include "utils.h"
+#include "hash_seed.h"
+
+#include <iostream>
 
 namespace GiNaC {
 
-GINAC_IMPLEMENT_REGISTERED_CLASS(wildcard, basic)
+GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(wildcard, basic,
+  print_func<print_context>(&wildcard::do_print).
+  print_func<print_tree>(&wildcard::do_print_tree).
+  print_func<print_python_repr>(&wildcard::do_print_python_repr))
 
 //////////
 // default constructor
 //////////
 
-wildcard::wildcard() : inherited(TINFO_wildcard), label(0)
+wildcard::wildcard() : label(0)
 {
 	setflag(status_flags::evaluated | status_flags::expanded);
 }
@@ -44,7 +47,7 @@ wildcard::wildcard() : inherited(TINFO_wildcard), label(0)
 // other constructors
 //////////
 
-wildcard::wildcard(unsigned l) : inherited(TINFO_wildcard), label(l)
+wildcard::wildcard(unsigned l) : label(l)
 {
 	setflag(status_flags::evaluated | status_flags::expanded);
 }
@@ -53,11 +56,13 @@ wildcard::wildcard(unsigned l) : inherited(TINFO_wildcard), label(l)
 // archiving
 //////////
 
-wildcard::wildcard(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst)
+void wildcard::read_archive(const archive_node& n, lst& sym_lst)
 {
+	inherited::read_archive(n, sym_lst);
 	n.find_unsigned("label", label);
 	setflag(status_flags::evaluated | status_flags::expanded);
 }
+GINAC_BIND_UNARCHIVER(wildcard);
 
 void wildcard::archive(archive_node &n) const
 {
@@ -65,8 +70,6 @@ void wildcard::archive(archive_node &n) const
 	n.add_unsigned("label", label);
 }
 
-DEFAULT_UNARCHIVE(wildcard)
-
 //////////
 // functions overriding virtual functions from base classes
 //////////
@@ -82,29 +85,35 @@ int wildcard::compare_same_type(const basic & other) const
 		return label < o.label ? -1 : 1;
 }
 
-void wildcard::print(const print_context & c, unsigned level) const
+void wildcard::do_print(const print_context & c, unsigned level) const
+{
+	c.s << "$" << label;
+}
+
+void wildcard::do_print_tree(const print_tree & c, unsigned level) const
+{
+	c.s << std::string(level, ' ') << class_name() << "(" << label << ")" << " @" << this
+	    << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
+	    << std::endl;
+}
+
+void wildcard::do_print_python_repr(const print_python_repr & c, unsigned level) const
 {
-	if (is_a<print_tree>(c)) {
-		c.s << std::string(level, ' ') << class_name() << " (" << label << ")"
-		    << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
-		    << std::endl;
-	} else if (is_a<print_python_repr>(c)) {
-		c.s << class_name() << '(' << label << ')';
-	} else
-		c.s << "$" << label;
+	c.s << class_name() << '(' << label << ')';
 }
 
 unsigned wildcard::calchash() const
 {
 	// this is where the schoolbook method
-	// (golden_ratio_hash(tinfo()) ^ label)
+	// (golden_ratio_hash(typeid(*this).name()) ^ label)
 	// is not good enough yet...
-	hashvalue = golden_ratio_hash(golden_ratio_hash(tinfo()) ^ label);
+	unsigned seed = make_hash_seed(typeid(*this));
+	hashvalue = golden_ratio_hash(seed ^ label);
 	setflag(status_flags::hash_calculated);
 	return hashvalue;
 }
 
-bool wildcard::match(const ex & pattern, lst & repl_lst) const
+bool wildcard::match(const ex & pattern, exmap& repl_lst) const
 {
 	// Wildcards must match each other exactly (this is required for
 	// subs() to work properly because in the final step it substitutes
@@ -112,4 +121,14 @@ bool wildcard::match(const ex & pattern, lst & repl_lst) const
 	return is_equal(ex_to<basic>(pattern));
 }
 
+bool haswild(const ex & x)
+{
+	if (is_a<wildcard>(x))
+		return true;
+	for (size_t i=0; i<x.nops(); ++i)
+		if (haswild(x.op(i)))
+			return true;
+	return false;
+}
+
 } // namespace GiNaC