patch::: 1.3.99.jcn2

[lilypond.git] / lily / identifier.cc

diff --git a/lily/identifier.cc b/lily/identifier.cc
index e4712f8a5a9e8b630a98bf52c952679c085c0112..d46460f71b03306f8d23fe4a82a8cd272993cc5c 100644 (file)
--- a/lily/identifier.cc
+++ b/lily/identifier.cc
@@ -1,51 +1,139 @@
 /*
   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>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+
+/*
+  JUNKTHIS!
+ */
 #include <assert.h>
 
+#include "music-output-def.hh"
+#include "score.hh"
 #include "identifier.hh"
-#include "lexer.hh"
+#include "my-lily-lexer.hh"
 #include "debug.hh"
+#include "ly-smobs.icc"
 
-void
-Identifier::error(String expect)
+
+IMPLEMENT_UNSMOB(Identifier, identifier);
+IMPLEMENT_SMOBS(Identifier);
+IMPLEMENT_DEFAULT_EQUAL_P(Identifier);
+
+Identifier::Identifier (int code)
+{
+  token_code_i_ = code;
+  accessed_b_ = 0;
+  smobify_self ();
+}
+
+Identifier::Identifier (Identifier const&s)
+  : Input (s)
+{
+  smobify_self ();  
+  token_code_i_ = s.token_code_i_;
+  accessed_b_ = s.accessed_b_;
+}
+
+Identifier::~Identifier()
 {
-    String e("Wrong identifier type: ");
-    e += String(classname()) + "(expected " + expect + ")";
-    ::error(e);
 }
 
 void
-Identifier::print()const
+Identifier::error (String expect) const
+{
+  ::error (_f ("wrong identifier type, expected: `%s'", expect));
+}
+
+String
+Identifier::str () const
+{
+  return do_str ();
+}
+
+String
+Identifier::do_str () const
 {
-    mtor << "identifier \'" << name << "\'=";
-    do_print();
+  return "";
 }
 
+
 /* ugh. */
-#define DEFAULT_PRINT(Class, Content_type, accessor) \
-void \
-Class::do_print() const { \
-    ((Class*)this)->accessor(false)->print(); \
-} \
-class Class
-
-DEFAULT_PRINT(Script_id, Script_def, script);
-DEFAULT_PRINT(Lookup_id, Lookup, lookup);
-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(Request_id, Request, request);
-void
-Real_id::do_print() const
+#define DUMMY_STR(Class) \
+String \
+Class ## _identifier::do_str () const { \
+  return String (#Class); \
+}
+
+DUMMY_STR(Score);
+DUMMY_STR(Music_output_def);
+DUMMY_STR(Duration);
+
+  
+#define DEFAULT_STR(Class) \
+String \
+Class ## _identifier::do_str () const\
+{\
+  return to_str (*data_p_);\
+}
+
+  
+
+/*
+  fucking C++ blows me.
+ */
+
+#define DEFAULT_ACCESSOR(Class)\
+Class*\
+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_content_ ## Class (bool copy_b) const{\
+  ((Class ## _identifier*)this)->accessed_b_ = true;\
+  return copy_b ? dynamic_cast<Class*> (data_p_->clone()) : data_p_;\
+}
+
+#define IMPLEMENT_ID_CLASS(Class)      \
+       Class ## _identifier::~Class ## _identifier() { delete data_p_; }\
+       Class ## _identifier::Class ## _identifier (Class*st, int code) \
+         :Identifier (code)\
+       {\
+         data_p_ = st;\
+       }\
+Class ## _identifier::Class ## _identifier (Class ## _identifier const &s) \
+  : Identifier (s)\
+{\
+   data_p_ = s.access_content_ ## Class (true);\
+} 
+
+
+IMPLEMENT_ID_CLASS(Duration);
+IMPLEMENT_ID_CLASS(Score);
+IMPLEMENT_ID_CLASS(Music_output_def);
+VIRTUAL_ACCESSOR(Music_output_def);
+DEFAULT_ACCESSOR(Duration);
+DEFAULT_ACCESSOR(Score);
+
+
+int
+Identifier::print_smob (SCM s, SCM p, scm_print_state*)
 {
-    Identifier::print();
-    mtor << *((Real_id*)this)->real(false)<< "\n";
+ return 1;  
 }
 
+SCM
+Identifier::mark_smob (SCM s)
+{
+  return SCM_EOL;
+}
+
+
+