release: 1.3.107

[lilypond.git] / lily / include / identifier.hh

diff --git a/lily/include/identifier.hh b/lily/include/identifier.hh
index 5a0d8d53955af681a66c801b54c86b1c8a7cfba2..2a82889757e8375527f062c7fdd47c01d3af8a25 100644 (file)
--- a/lily/include/identifier.hh
+++ b/lily/include/identifier.hh
@@ -1,71 +1,74 @@
 /*
   identifier.hh -- part of GNU LilyPond
 
-  (c) 1996,97 Han-Wen Nienhuys
+  (c) 1996--2000 Han-Wen Nienhuys
 */
 
 #ifndef IDENTIFIER_HH
 #define IDENTIFIER_HH
 
 #include "lily-proto.hh"
+#include "lily-guile.hh"
 #include "string.hh"
 #include "input.hh"
 #include "virtual-methods.hh"
+#include "smobs.hh"
 
-/* boolean argument to accesor is copy_b..*/
-#define IDACCESSOR( Input_staff, staff)\
-    virtual Input_staff * staff(bool) { error(#Input_staff); return 0; }
 
+class Output_def_identifier;
+class Score_identifier;
 
+
+#define IDACCESSOR(Class)\
+virtual Class *  access_content_ ## Class (bool) const { error (#Class  + String ("_identifier")); return 0; }\
+
+
+/**
+   A declarable data structure in lilypond.
+
+   TODO: use SMOBS for the union type, and junk all derived classes.
+   */
 struct Identifier : public Input {
-    void *data;
-    String name_str_;
-    bool init_b_;
-    bool accessed_b_;
-    int token_code_i_;
-    
-    Identifier(String n, int code) ;
-    virtual ~Identifier() ;
-
-    void print()const;
-    NAME_MEMBERS();
-    void error(String);
-    IDACCESSOR(Music, music)
-    IDACCESSOR(Input_translator, itrans)       
-    IDACCESSOR(General_script_def, script)
-    IDACCESSOR(Symtables, symtables)
-    IDACCESSOR(Paper_def, paperdef)
-    IDACCESSOR(Lookup,lookup)
-    IDACCESSOR(Real,real)
-    IDACCESSOR(Request, request)
-    IDACCESSOR(Score, score)
-    IDACCESSOR(int, intid)
 
+  bool init_b_;
+  bool accessed_b_;
+  int token_code_i_;
+  Identifier (Identifier const&);    
+  Identifier (int code) ;
+
+  void print() const;
+  
+  void error (String) const;
+  String str () const;
+  IDACCESSOR(Music_output_def)
+  IDACCESSOR(Score)
+  VIRTUAL_COPY_CONS(Identifier);
+
+  DECLARE_SMOBS(Identifier, foo);
 protected:
-    virtual void do_print()const=0;
-private:
-    Identifier(Identifier const&);
+
+  virtual String do_str () const;
 };
 
-#define declare_id_class(Idclass, Class, accessor)     \
-struct Idclass : Identifier {\
-        NAME_MEMBERS();                            \
-       Idclass(String s, Class*st, int code);\
-       virtual Class* accessor(bool copy);\
-       ~Idclass();\
-       virtual void do_print()const; \
+#define DECLARE_ID_CLASS(Class)        \
+struct Class ## _identifier : Identifier {\
+                            Class *data_p_;                 \
+                             \
+                            Class ## _identifier (Class ## _identifier const&);\
+                            Class ## _identifier (Class*st, int code);\
+                            VIRTUAL_COPY_CONS(Identifier);\
+                            virtual Class* access_content_ ## Class (bool copy_b) const;\
+                            ~Class ## _identifier();\
+                           \
+                            virtual String do_str () const; \
 }\
 
 
+DECLARE_ID_CLASS(Score);
+DECLARE_ID_CLASS(Music_output_def);
+
+Identifier * unsmob_identifier (SCM);
+SCM smobify (Identifier*);
+
+#endif // IDENTIFIER_HH
 
-declare_id_class(Real_id, Real, real);
-declare_id_class(Script_id, General_script_def, script);
-declare_id_class(Lookup_id, Lookup, lookup);
-declare_id_class(Symtables_id, Symtables, symtables);
-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);
-#endif // IDENTIFIER_