X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fidentifier.cc;h=28e450ac496c99cd4a8c2a41d15ec4736ce94552;hb=8da6cef580cce3365b219f6aca429b434cb60fcf;hp=d3d0e7221b7024d83614dc6b29aaab9c783070f7;hpb=9c8bcb9a2a1fedb5459e593b18a8c550318e6800;p=lilypond.git diff --git a/lily/identifier.cc b/lily/identifier.cc index d3d0e7221b..28e450ac49 100644 --- a/lily/identifier.cc +++ b/lily/identifier.cc @@ -11,12 +11,12 @@ JUNKTHIS! */ #include + #include "music-output-def.hh" #include "score.hh" #include "identifier.hh" #include "my-lily-lexer.hh" #include "debug.hh" -#include "translator-group.hh" #include "ly-smobs.icc" @@ -61,30 +61,6 @@ Identifier::do_str () const return ""; } -void -Identifier::print () const -{ - DEBUG_OUT << "identifier "; - do_print (); -} -void -Identifier::do_print () const -{ -} - -/* ugh. */ -#define DEFAULT_PRINT(Class) \ -void \ -Class ## _identifier::do_print () const { \ - Class *cl = ((Class ## _identifier *)this)->access_content_ ## Class(false);\ - cl->print (); \ -} - - - -DEFAULT_PRINT(Translator_group); -DEFAULT_PRINT(Score); -DEFAULT_PRINT(Music_output_def); /* ugh. */ #define DUMMY_STR(Class) \ @@ -93,21 +69,9 @@ Class ## _identifier::do_str () const { \ return String (#Class); \ } - -DUMMY_STR(Translator_group); DUMMY_STR(Score); DUMMY_STR(Music_output_def); -DUMMY_STR(Duration); - -#define STRING_PRINT(Class) \ -void \ -Class ## _identifier::do_print () const\ -{\ - DEBUG_OUT << do_str () << '\n';\ -}\ - -STRING_PRINT(Duration); #define DEFAULT_STR(Class) \ String \ @@ -150,13 +114,9 @@ Class ## _identifier::Class ## _identifier (Class ## _identifier const &s) \ } -IMPLEMENT_ID_CLASS(Duration); -IMPLEMENT_ID_CLASS(Translator_group); IMPLEMENT_ID_CLASS(Score); IMPLEMENT_ID_CLASS(Music_output_def); -VIRTUAL_ACCESSOR(Translator_group); VIRTUAL_ACCESSOR(Music_output_def); -DEFAULT_ACCESSOR(Duration); DEFAULT_ACCESSOR(Score);