release: 0.0.76

[lilypond.git] / lily / identifier.cc

diff --git a/lily/identifier.cc b/lily/identifier.cc
index 7e1e43e45f7da767943116f6e62ca6f773d40180..4eda207ca747db54ad3d96e211f8bfce2aa786fb 100644 (file)
--- a/lily/identifier.cc
+++ b/lily/identifier.cc
@@ -7,17 +7,18 @@
 */
 
 #include <assert.h>
-
+#include "midi-def.hh"
+#include "paper-def.hh"
 #include "score.hh"
 #include "identifier.hh"
 #include "my-lily-lexer.hh"
 #include "debug.hh"
-#include "input-register.hh"
+
 #include "symtable.hh"
 #include "lookup.hh"
 #include "script-def.hh"
 #include "request.hh"
-#include "input-register.hh"
+#include "input-translator.hh"
 
 IMPLEMENT_STATIC_NAME(Identifier);
 IMPLEMENT_IS_TYPE_B(Identifier);
@@ -59,21 +60,30 @@ Class::do_print() const { \
 } \
 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_regs_id, Input_register, iregs);
+DEFAULT_PRINT(Midi_def_id,Midi_def, mididef);
+DEFAULT_PRINT(Paper_def_id,Paper_def, paperdef);
 
 void
 Real_id::do_print() const
 {
-    Identifier::print();
     mtor << *((Real_id*)this)->real(false)<< "\n";
 }
 
+void
+Int_id::do_print() const
+{
+    mtor << *((Int_id*)this)->intid(false)<< "\n";
+}
+
+
 #define default_accessor(Idclass, Class, accessor)\
 Class*\
 Idclass::accessor(bool copy) {\
@@ -102,7 +112,8 @@ 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);
 implement_id_class(Lookup_id, Lookup, lookup);
@@ -110,14 +121,15 @@ 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_regs_id, Input_register, iregs);
+implement_id_class(Midi_def_id, Midi_def, mididef);
+implement_id_class(Paper_def_id, Paper_def, paperdef);
 
 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);
 default_accessor(Lookup_id, Lookup, lookup);
@@ -125,4 +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_regs_id, Input_register, iregs);
+default_accessor(Midi_def_id, Midi_def, mididef);
+default_accessor(Paper_def_id, Paper_def, paperdef);