release: 0.0.78

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

diff --git a/flower/include/virtual-methods.hh b/flower/include/virtual-methods.hh
index f38d85293410fbabf017f9f03037b8885ce824ce..88dad44aebc96825c0086d257976c618831e8b9e 100644 (file)
--- a/flower/include/virtual-methods.hh
+++ b/flower/include/virtual-methods.hh
@@ -1,22 +1,23 @@
 /*
-  class-name.hh -- declare 
+  virtual-methods.hh -- declare 
 
-  source file of the LilyPond music typesetter
+  source file of the Flower Library
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.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() \
+#define DECLARE_MY_RUNTIME_TYPEINFO    \
 static char const *static_name();\
-virtual bool is_type_b(const char *)const; \
+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(); } \
 int a_stupid_nonexistent_function_to_allow_the_semicolon_come_out()
 
@@ -25,22 +26,26 @@ int a_stupid_nonexistent_function_to_allow_the_semicolon_come_out()
 
 #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                                      \
+    IMPLEMENT_STATIC_NAME(D)\
+  bool D::static_is_type_b(const char *s)                                         \
 {                                                                                 \
     return s == static_name();                                                    \
 }                                                                                 
                                                                                   
 #define IMPLEMENT_IS_TYPE_B1(D,B)                                                 \
-  bool D::is_type_b(const char *s)const                                                   \
+       IMPLEMENT_STATIC_NAME(D)\
+  bool D::static_is_type_b(const char *s)                                                 \
 {                                                                                 \
-    return s == static_name() || B::is_type_b(s);                                 \
+    return s == static_name() || B::static_is_type_b(s);                                  \
 }                                                                                 
 #define IMPLEMENT_IS_TYPE_B2(D, BA, BB)                                                   \
-  bool D::is_type_b(const char *s)     const                                      \
+       IMPLEMENT_STATIC_NAME(D)\
+  bool D::static_is_type_b(const char *s)                                                 \
 {                                                                                 \
-    return s == static_name() || BA::is_type_b(s) || BB::is_type_b(s); \
+    return s == static_name() || BA::static_is_type_b(s) || BB::static_is_type_b(s); \
 }
 
-#endif // CLASS-NAME_HH
+#endif