From f57c3b995f836aa47bf44a8a23eb7953a457bb09 Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 19:48:03 +0000 Subject: [PATCH] lilypond-0.0.76 --- lily/identifier.cc | 8 +++----- lily/include/identifier.hh | 5 ++--- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/lily/identifier.cc b/lily/identifier.cc index b3b6179487..4eda207ca7 100644 --- a/lily/identifier.cc +++ b/lily/identifier.cc @@ -63,11 +63,11 @@ class Class DEFAULT_PRINT(Script_id, General_script_def, script); DEFAULT_PRINT(Lookup_id, Lookup, lookup); +DEFAULT_PRINT(Input_translator_id, Input_trans, input_translator); DEFAULT_PRINT(Symtables_id, Symtables, symtables); DEFAULT_PRINT(Music_id,Music , music); DEFAULT_PRINT(Request_id, Request, request); DEFAULT_PRINT(Score_id, Score, score); -DEFAULT_PRINT(Input_trans_id, Input_translator, itrans); DEFAULT_PRINT(Midi_def_id,Midi_def, mididef); DEFAULT_PRINT(Paper_def_id,Paper_def, paperdef); @@ -112,7 +112,7 @@ Idclass::~Idclass() { delete accessor(false); }\ Idclass::Idclass(String s, Class*st, int code):Identifier(s,code) { data = st; }\ - +implement_id_class(Input_translator_id, Input_translator, input_translator); implement_id_class(Int_id, int, intid); implement_id_class(Real_id, Real, real); implement_id_class(Script_id, General_script_def, script); @@ -121,7 +121,6 @@ implement_id_class(Symtables_id, Symtables, symtables); implement_id_class(Music_id, Music, music); implement_id_class(Score_id, Score, score); implement_id_class(Request_id, Request, request); -implement_id_class(Input_trans_id, Input_translator, itrans); implement_id_class(Midi_def_id, Midi_def, mididef); implement_id_class(Paper_def_id, Paper_def, paperdef); @@ -129,7 +128,7 @@ Identifier::Identifier(Identifier const&) { assert(false); } - +default_accessor(Input_translator_id,Input_translator, input_translator); default_accessor(Int_id, int, intid); default_accessor(Real_id, Real, real); virtual_accessor(Script_id, General_script_def, script); @@ -138,6 +137,5 @@ default_accessor(Symtables_id, Symtables, symtables); virtual_accessor(Music_id, Music, music); default_accessor(Score_id, Score, score); virtual_accessor(Request_id, Request, request); -default_accessor(Input_trans_id, Input_translator, itrans); default_accessor(Midi_def_id, Midi_def, mididef); default_accessor(Paper_def_id, Paper_def, paperdef); diff --git a/lily/include/identifier.hh b/lily/include/identifier.hh index ddcc32ccb4..c2c5eebe7a 100644 --- a/lily/include/identifier.hh +++ b/lily/include/identifier.hh @@ -30,8 +30,8 @@ struct Identifier : public Input { void print()const; NAME_MEMBERS(); void error(String); + IDACCESSOR(Input_translator, input_translator) IDACCESSOR(Music, music) - IDACCESSOR(Input_translator, itrans) IDACCESSOR(General_script_def, script) IDACCESSOR(Symtables, symtables) IDACCESSOR(Midi_def, mididef) @@ -58,7 +58,7 @@ struct Idclass : Identifier {\ }\ - +declare_id_class(Input_translator_id, Input_translator, input_translator); declare_id_class(Real_id, Real, real); declare_id_class(Script_id, General_script_def, script); declare_id_class(Lookup_id, Lookup, lookup); @@ -67,7 +67,6 @@ declare_id_class(Music_id, Music, music); declare_id_class(Int_id, int, intid); declare_id_class(Score_id, Score, score); declare_id_class(Request_id, Request, request); -declare_id_class(Input_trans_id, Input_translator, itrans); declare_id_class(Paper_def_id,Paper_def, paperdef); declare_id_class(Midi_def_id,Midi_def, mididef); #endif // IDENTIFIER_ -- 2.39.5