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 ea81cbbc992fc8eb0ff9496e248de8e4d4a0825c..57431f49082de48e222e6801fdc2fa2e89fdb356 100644 (file)
--- a/flower/include/virtual-methods.hh
+++ b/flower/include/virtual-methods.hh
@@ -1,47 +1,44 @@
 /*
-  virtual-methods.hh -- declare 
+  virtual-methods.hh -- declare macros for our do-it-yourself RTTI
 
   source file of the Flower Library
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef VIRTUAL_METHODS_HH
 #define VIRTUAL_METHODS_HH
 
-/** a macro to 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 NAME_MEMBERS() \
-static char const *static_name();\
-virtual bool is_type_b(const char *)const; \
-virtual char const *name() const{ return static_name(); } \
-int a_stupid_nonexistent_function_to_allow_the_semicolon_come_out()
-
-#define IMPLEMENT_STATIC_NAME(c)\
-    char const *c::static_name() { return #c; } 
-
-#define VIRTUAL_COPY_CONS(T, R)\
-  virtual R *clone() const { return  new T(*this); } \
-  int  yet_another_stupid_function_to_allow_semicolon()
-
-#define IMPLEMENT_IS_TYPE_B(D)                                                            \
-  bool D::is_type_b(const char *s)     const                                      \
-{                                                                                 \
-    return s == static_name();                                                    \
-}                                                                                 
-                                                                                  
-#define IMPLEMENT_IS_TYPE_B1(D,B)                                                 \
-  bool D::is_type_b(const char *s)const                                                   \
-{                                                                                 \
-    return s == static_name() || B::is_type_b(s);                                 \
-}                                                                                 
-#define IMPLEMENT_IS_TYPE_B2(D, BA, BB)                                                   \
-  bool D::is_type_b(const char *s)     const                                      \
-{                                                                                 \
-    return s == static_name() || BA::is_type_b(s) || BB::is_type_b(s); \
+#include <typeinfo>
+using namespace std;
+
+#define classname(class_ptr) demangle_classname (typeid (* (class_ptr)))
+
+char const *
+demangle_classname (type_info const &);
+
+/*
+
+Virtual copy constructor.  Make up for C++'s lack of a standard
+factory or clone () function.  Usage:
+
+class Foo : Baseclass
+{
+VIRTUAL_COPY_CONSTRUCTOR (Baseclass, Foo);
+};
+
+*/
+
+#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 */