implemented operator-> for the iterators

[ginac.git] / ginac / wildcard.h

diff --git a/ginac/wildcard.h b/ginac/wildcard.h
index 6e1bf1c014718ade6549f620a83a139e993f69da..42c874ffd74986604aba050fb2c3d1e372503847 100644 (file)
--- 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-2003 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
@@ -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)
@@ -41,13 +41,19 @@ public:
 
        // 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;
 
+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:
@@ -57,13 +63,6 @@ private:
 
 // utility functions
 
-/** Return the wildcard object handled by an ex.
- *  This is unsafe: you need to check the type first. */
-inline const wildcard &ex_to_wildcard(const ex &e)
-{
-       return static_cast<const wildcard &>(*e.bp);
-}
-
 /** Specialization of is_exactly_a<wildcard>(obj) for wildcard objects. */
 template<> inline bool is_exactly_a<wildcard>(const basic & obj)
 {