Run grand replace for 2015.

[lilypond.git] / lily / include / context-def.hh

diff --git a/lily/include/context-def.hh b/lily/include/context-def.hh
index 6024c68e06ae30f58d2afba6db1f4c14f78f54d5..9a7db15b6d68e1c87cb82838edf3cbb82970d926 100644 (file)
--- a/lily/include/context-def.hh
+++ b/lily/include/context-def.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2000--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2000--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -27,13 +27,16 @@
 #include "virtual-methods.hh"
 #include <set>
 
-
 /*
-  The definition of a interpretation context as given in the
+  The definition of an interpretation context as given in the
   input. The lists are stored in order of definition.
 */
-struct Context_def
+struct Context_def : public Smob<Context_def>
 {
+  SCM mark_smob ();
+  int print_smob (SCM, scm_print_state *);
+  static const char type_p_name_[];
+  virtual ~Context_def ();
 private:
   /*
     these lists store the definition, in opposite order of entry
@@ -57,16 +60,18 @@ public:
   SCM get_translator_names (SCM) const;
   SCM get_translator_group_type () const { return translator_group_type_; }
   void set_acceptor (SCM accepts, bool add);
-
-  VIRTUAL_COPY_CONSTRUCTOR(Context_def, Context_def);
-
-  vector<Context_def*> path_to_acceptable_context (SCM type_string,
-                                                  Output_def *,
-                                                  SCM) const;
-  vector<Context_def*> internal_path_to_acceptable_context (SCM type_string,
-                                                           Output_def *,
-                                                           SCM,
-                                                           set<const Context_def *> *seen) const;
+  SCM lookup (SCM sym) const;
+  bool is_alias (SCM sym) const;
+
+  VIRTUAL_COPY_CONSTRUCTOR (Context_def, Context_def);
+
+  vector<Context_def *> path_to_acceptable_context (SCM type_string,
+                                                    Output_def *,
+                                                    SCM) const;
+  vector<Context_def *> internal_path_to_acceptable_context (SCM type_string,
+                                                             Output_def *,
+                                                             SCM,
+                                                             set<const Context_def *> *seen) const;
   Context *instantiate (SCM extra_ops);
 
   SCM to_alist () const;
@@ -75,12 +80,9 @@ public:
   void apply_default_property_operations (Context *);
 
 private:
-  DECLARE_SMOBS (Context_def);
   Context_def ();
   Context_def (Context_def const &);
 };
 
-DECLARE_UNSMOB (Context_def, context_def);
 
 #endif /* CONTEXT_DEF_HH */
-