release: 0.1.8

[lilypond.git] / lily / identifier.cc

diff --git a/lily/identifier.cc b/lily/identifier.cc
index 59f1ff5d83c0cfdc288728f995b74d11e3c066d3..ff75e9331158187935a11bc3247b966dc74b42e0 100644 (file)
--- a/lily/identifier.cc
+++ b/lily/identifier.cc
@@ -1,29 +1,51 @@
 /*
   identifier.cc -- implement identifier and derived classes
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
 
 #include <assert.h>
-
+#include "midi-def.hh"
+#include "paper-def.hh"
+#include "score.hh"
 #include "identifier.hh"
-#include "lexer.hh"
+#include "my-lily-lexer.hh"
 #include "debug.hh"
+#include "symtable.hh"
+#include "lookup.hh"
+#include "script-def.hh"
+#include "request.hh"
+#include "input-translator.hh"
+
+
+IMPLEMENT_IS_TYPE_B(Identifier);
 
+Identifier::~Identifier()
+{
+    if (!accessed_b_ && !init_b_)
+       warning ("Variable not used");
+}
 void
-Identifier::error(String expect)
+Identifier::error (String expect)
 {
-    String e("Wrong identifier type: ");
-    e += String(classname()) + "(expected " + expect + ")";
-    ::error(e);
+    String e ("Wrong identifier type: ");
+    e += String (name()) + "(expected " + expect + ")";
+    ::error (e);
+}
+
+Identifier::Identifier ( int code)
+{
+    token_code_i_ = code; 
+    accessed_b_ = 0;
+    init_b_ = 0;
 }
 
 void
 Identifier::print()const
 {
-    mtor << "identifier \'" << name << "\'=";
+    DOUT << "identifier ";
     do_print();
 }
 
@@ -31,26 +53,79 @@ Identifier::print()const
 #define DEFAULT_PRINT(Class, Content_type, accessor) \
 void \
 Class::do_print() const { \
-    ((Class*)this)->accessor(false)->print(); \
+    ((Class*)this)->accessor()->print(); \
 } \
 class Class
 
-DEFAULT_PRINT(Script_id, Script_def, script);
+
+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(Staff_id, Input_staff, staff);
-DEFAULT_PRINT(M_chord_id, Music_general_chord, mchord);
-DEFAULT_PRINT(M_voice_id, Music_voice, mvoice);
+DEFAULT_PRINT(Music_id,Music , music);
+DEFAULT_PRINT(Request_id, Request, request);
+DEFAULT_PRINT(Score_id, Score, score);
+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";
+    DOUT << *data_p_<< "\n";
 }
 
 void
-Notetab_id::do_print() const
+Int_id::do_print() const
 {
-    mtor << "unknown" << "\n";
+    DOUT << *data_p_<< "\n";
 }
+
+
+#define DEFAULT_ACCESSOR(Idclass, Class, accessor)\
+Class*\
+Idclass::accessor () {\
+    accessed_b_ = true;\
+    return new Class (*data_p_);\
+}
+
+#define VIRTUAL_ACCESSOR(Idclass, Class, accessor)\
+Class*\
+Idclass::accessor () {\
+  accessed_b_ = true;\
+  return (Class*)data_p_->clone();\
+}
+
+#define IMPLEMENT_ID_CLASS(Idclass, Class, accessor)   \
+       IMPLEMENT_IS_TYPE_B1(Idclass,Identifier)\
+       Idclass::~Idclass() { delete data_p_; }\
+       Idclass::Idclass (Class*st, int code):Identifier (code) { data_p_ = 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);
+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(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);
+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(Midi_def_id, Midi_def, mididef);
+DEFAULT_ACCESSOR(Paper_def_id, Paper_def, paperdef);