Issue 4997/7: Use Preinit for Global_context, protect output definition

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

diff --git a/lily/include/context.hh b/lily/include/context.hh
index 76317e96b4956c835e297f418046f2fe8e56bdb9..2555bfe2b49e0e26519c2a1eac630a148d5026b3 100644 (file)
--- a/lily/include/context.hh
+++ b/lily/include/context.hh
@@ -33,7 +33,7 @@ class Context : public Smob<Context>
 public:
   SCM mark_smob () const;
   int print_smob (SCM, scm_print_state *) const;
-  static const char type_p_name_[];
+  static const char * const type_p_name_;
   virtual ~Context ();
 private:
   Scheme_hash_table *properties_dict () const;
@@ -51,6 +51,7 @@ private:
   Stream_event *infant_event_;
 
 protected:
+  virtual void derived_mark () const;
   Context *daddy_context_;
   /* The used Context_def */
   SCM definition_;
@@ -63,7 +64,7 @@ protected:
   SCM default_child_;
   SCM aliases_;
   Translator_group *implementation_;
-  std::string id_string_;
+  string id_string_;
 
   /* Events reported in the context is sent to this dispatcher. */
   Dispatcher *event_source_;
@@ -83,7 +84,7 @@ protected:
   void unset_property_from_event (SCM);
 
 public:
-  std::string id_string () const { return id_string_; }
+  string id_string () const { return id_string_; }
   SCM children_contexts () const { return context_list_; }
   SCM default_child_context_name () const;
 
@@ -108,21 +109,21 @@ public:
   void instrumented_set_property (SCM, SCM, const char *, int, const char *);
   void internal_set_property (SCM var_sym, SCM value);
 
-  Context *create_context (Context_def *, const std::string&, SCM);
+  Context *create_context (Context_def *, const string&, SCM);
   void create_context_from_event (SCM);
   void acknowledge_infant (SCM);
   void remove_context (SCM);
   void change_parent (SCM);
   void disconnect_from_parent ();
   void check_removal ();
-  std::string context_name () const;
+  string context_name () const;
   SCM context_name_symbol () const;
   Global_context *get_global_context () const;
 
   virtual Context *get_score_context () const;
   virtual Output_def *get_output_def () const;
   virtual Moment now_mom () const;
-  virtual Context *get_default_interpreter (const std::string &context_id = "");
+  virtual Context *get_default_interpreter (const string &context_id = "");
 
   bool is_alias (SCM) const;
   void add_alias (SCM);
@@ -131,10 +132,10 @@ public:
   bool is_removable () const;
 
   Context *find_create_context (SCM context_name,
-                                const std::string &id, SCM ops);
-  Context *create_unique_context (SCM context_name, const std::string &context_id,
+                                const string &id, SCM ops);
+  Context *create_unique_context (SCM context_name, const string &context_id,
                                   SCM ops);
-  std::vector<Context_def *> path_to_acceptable_context (SCM alias) const;
+  vector<Context_def *> path_to_acceptable_context (SCM alias) const;
 };
 
 /*
@@ -158,13 +159,13 @@ Context *find_context_above_by_parent_type (Context *where, SCM parent_type);
 // context and moving toward the leaves of the tree.  If the starting context
 // matches, it is returned.  An empty ID matches any context of the given type.
 Context *find_context_below (Context *where,
-                             SCM type_sym, const std::string &id);
+                             SCM type_sym, const string &id);
 
 // Search for a context of the given type and ID starting with the given
 // context, then searching its descendants, then its parent's descendants, etc.
 // An empty ID matches any context of the given type.
 Context *find_context_near (Context *where,
-                            SCM type_sym, const std::string &id);
+                            SCM type_sym, const string &id);
 
 // Search for the top context (i.e. the ancestor with no parent) starting with
 // the given context.
@@ -186,16 +187,23 @@ bool check_repeat_count_visibility (Context const *context, SCM count);
 void set_context_property_on_children (Context *trans, SCM sym, SCM val);
 
 /* Shorthand for creating and broadcasting stream events. */
-#define send_stream_event(ctx, type, origin, ...)                               \
-{                                                                       \
-  SCM props[] = { __VA_ARGS__, 0 };                                     \
-  ctx->internal_send_stream_event (ly_symbol2scm (type), origin, props);        \
-}
+#define send_stream_event(ctx, type, origin, ...)                       \
+  do {                                                                  \
+    SCM props[] = { __VA_ARGS__, 0 };                                   \
+    ctx->internal_send_stream_event (ly_symbol2scm (type), origin, props); \
+  } while (0)
 
 SCM nested_property_alist (SCM alist, SCM prop_path, SCM value);
+SCM nested_property (SCM alist, SCM prop_path, SCM fallback = SCM_EOL);
 SCM nested_create_alist (SCM prop_path, SCM value);
 SCM partial_list_copy (SCM alist, SCM tail, SCM newtail);
+SCM assq_tail (SCM key, SCM alist, SCM alist_end);
+SCM assv_tail (SCM key, SCM alist, SCM alist_end);
+SCM assoc_tail (SCM key, SCM alist, SCM alist_end);
 SCM evict_from_alist (SCM, SCM, SCM);
 SCM nalist_to_alist (SCM nalist, int nested);
+extern SCM ly_context_set_property_x_proc;
+extern SCM ly_context_unset_property_proc;
+extern SCM ly_context_matched_pop_property_proc;
 
 #endif /* CONTEXT_HH */