''

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

diff --git a/flower/include/virtual-methods.hh b/flower/include/virtual-methods.hh
index e5c807e8a97f2769c11f58cda627d62eb9a5d3e9..eb144367a9ae1116ba1d69e5071a12b33bfdcdfc 100644 (file)
--- a/flower/include/virtual-methods.hh
+++ b/flower/include/virtual-methods.hh
@@ -1,29 +1,50 @@
 /*
-  class-name.hh -- declare 
+  virtual-methods.hh -- declare macros for our do-it-yourself RTTI
 
-  source file of the LilyPond music typesetter
+  source file of the Flower Library
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
-#ifndef CLASS_NAME_HH
-#define CLASS_NAME_HH
+#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(c)        \
-static char const *static_name();\
-virtual char const *name() const{ return c::static_name(); } \
-int a_stupid_nonexistent_function_to_allow_the_semicolon_come_out()
+#include <typeinfo>
+
+#define classname(class_ptr)   demangle_classname (typeid (* (class_ptr)))
 
-#define IMPLEMENT_STATIC_NAME(c)\
-    char const *c::static_name() { return #c; } 
+const char *
+demangle_classname (std::type_info const &);
 
-#define VIRTUAL_COPY_CONS(T, R)\
-  virtual R *clone() const { return  new T(*this); } \
+/**
 
+   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);
+   };
+   
+ */
+
+/*
+  fix constness: gcc-2.95 is correct in defining
+  
+    typeof (*this)
     
-#endif // CLASS-NAME_HH
+  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 */