release: 1.3.0

[lilypond.git] / lily / include / identifier.hh

diff --git a/lily/include/identifier.hh b/lily/include/identifier.hh
index ab6f25edd764f969fba3ca0b87ffc2e689f7d2af..ded6ac4a0ef4943f34b4a51d332076c1219ef0a6 100644 (file)
--- a/lily/include/identifier.hh
+++ b/lily/include/identifier.hh
@@ -1,7 +1,7 @@
 /*
   identifier.hh -- part of GNU LilyPond
 
-  (c) 1996--1998 Han-Wen Nienhuys
+  (c) 1996--1999 Han-Wen Nienhuys
 */
 
 #ifndef IDENTIFIER_HH
@@ -16,13 +16,12 @@
 #define DECLARE_TYPE_NAME(Class)
 
 class Notename_table_identifier;
-class Translator_identifier;
+class Translator_group_identifier;
 class Music_identifier;
-class General_script_def_identifier;
+class Articulation_req_identifier;
 class Symtables_identifier;
 class Midi_def_identifier;
 class Paper_def_identifier;
-class Lookup_identifier;
 class Real_identifier;
 class int_identifier;
 class String_identifier;
@@ -33,13 +32,11 @@ class Duration_identifier;
 
 
 #define IDACCESSOR(Class)\
-virtual Class *  access_ ## Class (bool=true) const { error (#Class  + String ("_identifier")); return 0; }\
-virtual Class ## _identifier * access_ ## Class ## _identifier () { return 0; }
+virtual Class *  access_content_ ## Class (bool) const { error (#Class  + String ("_identifier")); return 0; }\
+
 
 /**
    A declarable data structure in mudela. 
-
-
    */
 struct Identifier : public Input {
   bool init_b_;
@@ -51,24 +48,22 @@ struct Identifier : public Input {
 
 
   void print() const;
-  DECLARE_MY_RUNTIME_TYPEINFO;
+  
   void error (String) const;
   String str () const;
-  IDACCESSOR(Translator)
+  IDACCESSOR(Translator_group)
   IDACCESSOR(Notename_table)
   IDACCESSOR(Music)
-  IDACCESSOR(General_script_def)
   IDACCESSOR(Symtables)
   IDACCESSOR(Midi_def)
   IDACCESSOR(Paper_def)
-  IDACCESSOR(Lookup)
   IDACCESSOR(Real)
   IDACCESSOR(String)
   IDACCESSOR(Request)
   IDACCESSOR(Score)
   IDACCESSOR(int)
   IDACCESSOR(Duration)
-  VIRTUAL_COPY_CONS (Identifier, Identifier);
+  VIRTUAL_COPY_CONS(Identifier);
 
 protected:
   virtual void do_print () const;
@@ -78,28 +73,23 @@ protected:
 #define DECLARE_ID_CLASS(Class)        \
 struct Class ## _identifier : Identifier {\
                             Class *data_p_;                 \
-                            DECLARE_MY_RUNTIME_TYPEINFO; \
+                             \
                             Class ## _identifier (Class ## _identifier const&);\
                             Class ## _identifier (Class*st, int code);\
-                            VIRTUAL_COPY_CONS (Class ## _identifier, Identifier);\
-                            virtual Class ## _identifier * access_ ## Class ## _identifier ()\
-    {\
-      return this;\
-    }\
-                            virtual Class* access_ ## Class (bool copy_b) const;\
+                            VIRTUAL_COPY_CONS(Identifier);\
+                            virtual Class* access_content_ ## Class (bool copy_b) const;\
                             ~Class ## _identifier();\
                             virtual void do_print () const; \
                             virtual String do_str () const; \
 }\
 
 
-DECLARE_ID_CLASS(Translator);
+DECLARE_ID_CLASS(Translator_group);
 DECLARE_ID_CLASS(Duration);
 DECLARE_ID_CLASS(Notename_table);
 DECLARE_ID_CLASS(Real);
 DECLARE_ID_CLASS(String);
 DECLARE_ID_CLASS(General_script_def);
-DECLARE_ID_CLASS(Lookup);
 DECLARE_ID_CLASS(Symtables);
 DECLARE_ID_CLASS(Music);
 DECLARE_ID_CLASS(int);