release: 1.2.13

[lilypond.git] / lily / identifier.cc

diff --git a/lily/identifier.cc b/lily/identifier.cc
index c5dbee2c00efeb8ccd2389ffa551afd2515f2bef..0fbaa061853cbd17d7461fcb90243d439074cdf3 100644 (file)
--- a/lily/identifier.cc
+++ b/lily/identifier.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include <assert.h>
@@ -13,14 +13,11 @@
 #include "identifier.hh"
 #include "my-lily-lexer.hh"
 #include "debug.hh"
-#include "symtable.hh"
-#include "lookup.hh"
-#include "script-def.hh"
 #include "request.hh"
 #include "translator.hh"
 #include "notename-table.hh"
 
-IMPLEMENT_IS_TYPE_B(Identifier);
+
 
 Identifier::Identifier (int code)
 {
@@ -46,9 +43,7 @@ Identifier::~Identifier()
 void
 Identifier::error (String expect) const
 {
-  String e (_("Wrong identifier type: "));
-  e += _f ("%s expected", expect);
-  ::error (e);
+  ::error (_f ("wrong identifier type, expected: `%s'", expect));
 }
 
 String
@@ -66,7 +61,7 @@ Identifier::do_str () const
 void
 Identifier::print () const
 {
-  DOUT << "identifier ";
+  DEBUG_OUT << "identifier ";
   do_print ();
 }
 void
@@ -78,16 +73,13 @@ Identifier::do_print () const
 #define DEFAULT_PRINT(Class) \
 void \
 Class ## _identifier::do_print () const { \
-  Class *cl = ((Class ## _identifier *)this)->access_ ## Class(false);\
+  Class *cl = ((Class ## _identifier *)this)->access_content_ ## Class(false);\
   cl->print (); \
 }
 
 
 
-DEFAULT_PRINT(General_script_def);
-DEFAULT_PRINT(Lookup);
 DEFAULT_PRINT(Translator);
-DEFAULT_PRINT(Symtables);
 DEFAULT_PRINT(Music);
 DEFAULT_PRINT(Request);
 DEFAULT_PRINT(Score);
@@ -103,10 +95,7 @@ Class ## _identifier::do_str () const { \
 
 
 DUMMY_STR(Notename_table);
-DUMMY_STR(General_script_def);
-DUMMY_STR(Lookup);
 DUMMY_STR(Translator);
-DUMMY_STR(Symtables);
 DUMMY_STR(Music);
 DUMMY_STR(Request);
 DUMMY_STR(Score);
@@ -118,7 +107,7 @@ DUMMY_STR(Duration);
 void \
 Class ## _identifier::do_print () const\
 {\
-  DOUT << do_str () << '\n';\
+  DEBUG_OUT << do_str () << '\n';\
 }\
 
 
@@ -146,20 +135,19 @@ DEFAULT_STR(String);
 
 #define DEFAULT_ACCESSOR(Class)\
 Class*\
-Class ## _identifier::access_ ## Class (bool copy_b) const {\
+Class ## _identifier::access_content_ ## Class (bool copy_b) const {\
   ((Class ## _identifier*)this)->accessed_b_ = true;\
   return copy_b ? new Class (*data_p_) : data_p_;\
 }
 
 #define VIRTUAL_ACCESSOR(Class)\
 Class*\
-Class ## _identifier::access_ ## Class (bool copy_b) const{\
+Class ## _identifier::access_content_ ## Class (bool copy_b) const{\
   ((Class ## _identifier*)this)->accessed_b_ = true;\
   return copy_b ? (Class*)data_p_->clone() : data_p_;\
 }
 
 #define IMPLEMENT_ID_CLASS(Class)      \
-       IMPLEMENT_IS_TYPE_B1(Class ## _identifier,Identifier)\
        Class ## _identifier::~Class ## _identifier() { delete data_p_; }\
        Class ## _identifier::Class ## _identifier (Class*st, int code) \
          :Identifier (code)\
@@ -169,7 +157,7 @@ Class ## _identifier::access_ ## Class (bool copy_b) const{\
 Class ## _identifier::Class ## _identifier (Class ## _identifier const &s) \
   : Identifier (s)\
 {\
-   data_p_ = s.access_ ## Class (true);\
+   data_p_ = s.access_content_ ## Class (true);\
 } 
 
 
@@ -178,9 +166,6 @@ IMPLEMENT_ID_CLASS(Translator);
 IMPLEMENT_ID_CLASS(int);
 IMPLEMENT_ID_CLASS(Real);
 IMPLEMENT_ID_CLASS(String);
-IMPLEMENT_ID_CLASS(General_script_def);
-IMPLEMENT_ID_CLASS(Lookup);
-IMPLEMENT_ID_CLASS(Symtables);
 IMPLEMENT_ID_CLASS(Music);
 IMPLEMENT_ID_CLASS(Score);
 IMPLEMENT_ID_CLASS(Request);
@@ -190,14 +175,11 @@ IMPLEMENT_ID_CLASS(Notename_table);
 VIRTUAL_ACCESSOR(Music);
 VIRTUAL_ACCESSOR(Request);
 VIRTUAL_ACCESSOR(Translator);
-VIRTUAL_ACCESSOR(General_script_def);
 DEFAULT_ACCESSOR(Notename_table);
 DEFAULT_ACCESSOR(Duration);
 DEFAULT_ACCESSOR(int);
 DEFAULT_ACCESSOR(Real);
 DEFAULT_ACCESSOR(String);
-DEFAULT_ACCESSOR(Lookup);
-DEFAULT_ACCESSOR(Symtables);
 DEFAULT_ACCESSOR(Score);
 DEFAULT_ACCESSOR(Midi_def);
 DEFAULT_ACCESSOR(Paper_def);