Run `make grand-replace'.

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

diff --git a/flower/include/virtual-methods.hh b/flower/include/virtual-methods.hh
index 909267165b01ae9d6c801393af0c6f998cef1d83..57431f49082de48e222e6801fdc2fa2e89fdb356 100644 (file)
--- a/flower/include/virtual-methods.hh
+++ b/flower/include/virtual-methods.hh
@@ -3,94 +3,42 @@
 
   source file of the Flower Library
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef VIRTUAL_METHODS_HH
 #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()
+using namespace std;
 
+#define classname(class_ptr) demangle_classname (typeid (* (class_ptr)))
 
-#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);
-}
+char const *
+demangle_classname (type_info const &);
 
-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;
-}
+Virtual copy constructor.  Make up for C++'s lack of a standard
+factory or clone () function.  Usage:
 
-inline bool operator >= (type_info const &a1, type_info const &a2)
+class Foo : Baseclass
 {
-  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); }
-    */
+VIRTUAL_COPY_CONSTRUCTOR (Baseclass, Foo);
+};
 
-#define VIRTUAL_COPY_CONS(T, R)\
-  virtual R *clone() const { return  new T(*this); } 
-
-#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); }\
-
-    
-#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);\
+#define DECLARE_CLASSNAME(name) \
+  virtual const char *class_name () const {    \
+    return #name; \
 }
-*/
 
-#endif 
+#define VIRTUAL_COPY_CONSTRUCTOR(Base, name)   \
+  DECLARE_CLASSNAME(name);\
+  virtual Base *clone () const                 \
+  {                                            \
+    return new name (*this);                   \
+  }
+
+#endif /* VIRTUAL_METHODS_HH */