implemented operator-> for the iterators

[ginac.git] / ginac / wildcard.h

diff --git a/ginac/wildcard.h b/ginac/wildcard.h
index 2e76e193d3ee4b83f4efe4e8c08744741f8d7bfc..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)
@@ -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;
 
+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,10 +61,12 @@ private:
 };
 
 
-// global functions
-inline const wildcard &ex_to_wildcard(const ex &e)
+// utility functions
+
+/** Specialization of is_exactly_a<wildcard>(obj) for wildcard objects. */
+template<> inline bool is_exactly_a<wildcard>(const basic & obj)
 {
-       return static_cast<const wildcard &>(*e.bp);
+        return obj.tinfo()==TINFO_wildcard;
 }
 
 /** Create a wildcard object with the specified label. */