* Another grand 2003 update.

[lilypond.git] / flower / include / virtual-methods.hh

diff --git a/flower/include/virtual-methods.hh b/flower/include/virtual-methods.hh
index 909267165b01ae9d6c801393af0c6f998cef1d83..61294e885ed74aae57b6811dd73ffbc36c1042d5 100644 (file)
--- a/flower/include/virtual-methods.hh
+++ b/flower/include/virtual-methods.hh
@@ -3,7 +3,7 @@
 
   source file of the Flower Library
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -11,86 +11,40 @@
 #define VIRTUAL_METHODS_HH
 
 #include <typeinfo>
-#include "stdlib.h"            // size_t
 
-/**  Declare the classes name as a static and virtual function.
-  The static_name() can *not* be inlined (this might have the effect that 
-  s->name() != S::static_name (). Overlapping strings need not be merged in C++
- */
-#define DECLARE_MY_RUNTIME_TYPEINFO    \
-virtual char const *name() const{ return static_name (); }\
-static char const *static_name()
-
-
-#if 0
-  /*
-    oops.  before() has nothing to do with inheritance
-   */
-inline bool operator > (type_info const &a1, type_info const &a2)
-{
-  return a2.before (a1);
-}
-
-inline bool operator < (type_info const &a1, type_info const &a2)
-{
-  return a1.before (a2);
-}
-
-inline bool operator <= (type_info const &a1, type_info const &a2)
-{
-  return a1 == a2 ||  a1 < a2;
-}
-
-inline bool operator >= (type_info const &a1, type_info const &a2)
-{
-  return a1 == a2 ||  a1 > a2;
-}
-#endif
-
-#define IMPLEMENT_STATIC_NAME(c)\
-    char const *c::static_name() { return #c; }
-
-     /*
-    size_t c::static_class_size () { return sizeof (c); }
-    */
-
-#define VIRTUAL_COPY_CONS(T, R)\
-  virtual R *clone() const { return  new T(*this); } 
+#define classname(class_ptr)   demangle_classname (typeid (* (class_ptr)))
 
-#define DECLARE_VIRTUAL_COPY_CONS(T, R)\
-      virtual R *clone() const
+const char *
+demangle_classname (std::type_info const &);
 
-#define IMPLEMENT_VIRTUAL_COPY_CONS(T, R)\
-       R *T::clone() const { return  new T(*this); }\
+/**
 
-    
-#define IMPLEMENT_IS_TYPE_B(D)\
-  IMPLEMENT_STATIC_NAME(D)
-
-/*
-  bool D::static_is_type_b (const char *s)\
-{\
-  return s == static_name();\
-}*/
+   Virtual copy constructor. Make up for C++'s lack of a standard
+   clone () function.  Uses a typeof hack.  Usage:
 
-#define IMPLEMENT_IS_TYPE_B1(D, B)\
-  IMPLEMENT_STATIC_NAME(D)
-/*
-  bool D::static_is_type_b (const char *s)\
-{\
-  return s == static_name() || B::static_is_type_b (s);\
-}
-*/
-
-#define IMPLEMENT_IS_TYPE_B2(D, BA, BB)\
-  IMPLEMENT_STATIC_NAME(D)
+   class Foo : Baseclass {
+       VIRTUAL_COPY_CONS (Baseclass);
+   };
+   
+ */
 
 /*
-     
-  bool D::static_is_type_b (const char *s)\
-{\
-  return s == static_name() || BA::static_is_type_b (s) || BB::static_is_type_b (s);\
-}
+  fix constness: gcc-2.95 is correct in defining
+  
+    typeof (*this)
+    
+  in a const member function to be const
 */
-
-#endif 
+#define VIRTUAL_COPY_CONS(base) \
+  virtual base* clone_const_helper () \
+    { \
+      return new typeof (*this) (*this); \
+    } \
+  virtual base* clone () const \
+    { \
+      base* urg = (base*)this; \
+      return urg->clone_const_helper (); \
+    }
+
+
+#endif /* VIRTUAL_METHODS_HH */