* 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 27557117e3c84fc2fe18934968ee38c6495863b7..61294e885ed74aae57b6811dd73ffbc36c1042d5 100644 (file)
--- a/flower/include/virtual-methods.hh
+++ b/flower/include/virtual-methods.hh
@@ -3,61 +3,48 @@
 
   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>
 */
 
 
 #ifndef VIRTUAL_METHODS_HH
 #define VIRTUAL_METHODS_HH
 
-#include "stdlib.h"            // size_t
+#include <typeinfo>
 
-/**  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    \
-static bool static_is_type_b (const char*s);\
-virtual bool is_type_b (const char *s) const { return static_is_type_b (s); } \
-virtual char const *name() const{ return static_name (); } \
-virtual size_t class_size () const { return static_class_size (); }\
-static size_t static_class_size (); \
-static char const *static_name()
-
-#define IMPLEMENT_STATIC_NAME(c)\
-    char const *c::static_name() { return #c; } \
-    size_t c::static_class_size () { return sizeof (c); }
+#define classname(class_ptr)   demangle_classname (typeid (* (class_ptr)))
 
+const char *
+demangle_classname (std::type_info const &);
 
+/**
 
-#define VIRTUAL_COPY_CONS(T, R)\
-  virtual R *clone() const { return  new T(*this); } \
-  int  yet_another_stupid_function_to_allow_semicolon()
+   Virtual copy constructor. Make up for C++'s lack of a standard
+   clone () function.  Uses a typeof hack.  Usage:
 
+   class Foo : Baseclass {
+       VIRTUAL_COPY_CONS (Baseclass);
+   };
+   
+ */
 
-#define DECLARE_VIRTUAL_COPY_CONS(T,R)\
-      virtual R *clone() const
-#define IMPLEMENT_VIRTUAL_COPY_CONS(T,R)\
-       R *T::clone() const { return  new T(*this); } \
+/*
+  fix constness: gcc-2.95 is correct in defining
+  
+    typeof (*this)
     
-#define IMPLEMENT_IS_TYPE_B(D)                                                            \
-    IMPLEMENT_STATIC_NAME(D)\
-  bool D::static_is_type_b (const char *s)                                        \
-{                                                                                 \
-    return s == static_name();                                                    \
-}                                                                                 
-                                                                                  
-#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)\
-  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); \
-}
-
-#endif 
+  in a const member function to be const
+*/
+#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 */