From: David Kastrup <dak@gnu.org>
Date: Sat, 10 Mar 2012 10:06:20 +0000 (+0100)
Subject: Rectify order of property operations.
X-Git-Tag: release/2.15.34-1~28
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6d200fec9e5ab155aaad6b6a751715906e0655fc;p=lilypond.git

Rectify order of property operations.
---

diff --git a/lily/context-def.cc b/lily/context-def.cc
index 9b9628c6dc..fb8208acdd 100644
--- a/lily/context-def.cc
+++ b/lily/context-def.cc
@@ -326,7 +326,7 @@ Context_def::make_scm ()
 void
 Context_def::apply_default_property_operations (Context *tg)
 {
-  apply_property_operations (tg, property_ops_);
+  apply_property_operations (tg, scm_reverse (property_ops_));
 }
 
 SCM
diff --git a/lily/context-mod.cc b/lily/context-mod.cc
index a51f7cf71e..460d18bcfd 100644
--- a/lily/context-mod.cc
+++ b/lily/context-mod.cc
@@ -45,7 +45,7 @@ Context_mod::print_smob (SCM smob, SCM port, scm_print_state *)
   Context_mod *me = (Context_mod *) SCM_CELL_WORD_1 (smob);
 
   scm_puts ("#<Context_mod ", port);
-  scm_display (me->mods_, port);
+  scm_display (me->get_mods (), port);
   scm_puts (">", port);
   return 1;
 }
@@ -57,7 +57,6 @@ Context_mod::mark_smob (SCM smob)
 
   Context_mod *me = (Context_mod *) SCM_CELL_WORD_1 (smob);
 
-  scm_gc_mark (me->mods_);
   return me->mods_;
 }
 
diff --git a/lily/context-property.cc b/lily/context-property.cc
index 11d03c5b05..a9d7e2fc44 100644
--- a/lily/context-property.cc
+++ b/lily/context-property.cc
@@ -225,8 +225,7 @@ execute_pushpop_property (Context *context,
 void
 apply_property_operations (Context *tg, SCM pre_init_ops)
 {
-  SCM correct_order = scm_reverse (pre_init_ops);
-  for (SCM s = correct_order; scm_is_pair (s); s = scm_cdr (s))
+  for (SCM s = pre_init_ops; scm_is_pair (s); s = scm_cdr (s))
     {
       SCM entry = scm_car (s);
       SCM type = scm_car (entry);
diff --git a/lily/context.cc b/lily/context.cc
index be8a629804..3920778618 100644
--- a/lily/context.cc
+++ b/lily/context.cc
@@ -318,7 +318,7 @@ Context::path_to_acceptable_context (SCM name) const
   // The 'accepts elements in definition_mods_ is a list of ('accepts string),
   // but the Context_def expects to see elements of the form ('accepts symbol).
   SCM accepts = SCM_EOL;
-  for (SCM s = scm_reverse (definition_mods_); scm_is_pair (s); s = scm_cdr (s))
+  for (SCM s = definition_mods_; scm_is_pair (s); s = scm_cdr (s))
     if (scm_caar (s) == ly_symbol2scm ("accepts"))
       {
         SCM elt = scm_list_2 (scm_caar (s), scm_string_to_symbol (scm_cadar (s)));
@@ -327,7 +327,7 @@ Context::path_to_acceptable_context (SCM name) const
 
   return unsmob_context_def (definition_)->path_to_acceptable_context (name,
          get_output_def (),
-         accepts);
+	 scm_reverse_x (accepts, SCM_EOL));
 
 }