release: 1.1.1

[lilypond.git] / lily / identifier.cc

diff --git a/lily/identifier.cc b/lily/identifier.cc
index 71f093fdfef0fa6fdcf59bb2da7ff204eaa5561f..d09749daedef762321247ae676809ebb572311a6 100644 (file)
--- a/lily/identifier.cc
+++ b/lily/identifier.cc
@@ -14,11 +14,10 @@
 #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);
 
@@ -78,14 +77,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);
@@ -102,9 +100,8 @@ 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);
@@ -126,7 +123,8 @@ STRING_PRINT(Duration);
 STRING_PRINT(Real);
 STRING_PRINT(int);
 STRING_PRINT(String);
-
+STRING_PRINT(Notename_table);
+  
 #define DEFAULT_STR(Class) \
 String \
 Class ## _identifier::do_str () const\
@@ -145,14 +143,14 @@ 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_;\
 }
@@ -168,7 +166,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,24 +176,22 @@ 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);
 IMPLEMENT_ID_CLASS(Midi_def);
 IMPLEMENT_ID_CLASS(Paper_def);
-
+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);