From a33a82ba9f83010c828daf9cb1ae9d92f3109d26 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 9 Jun 2008 02:42:56 -0300
Subject: [PATCH] Style fixes; renames.

Rename execute_general_pushpop_property to
sloppy_general_pushpop_property.
---
 lily/context-property.cc | 44 ++++++++++++++++++++++------------------
 lily/engraver-group.cc   | 16 +++++++--------
 lily/include/context.hh  |  2 +-
 3 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/lily/context-property.cc b/lily/context-property.cc
index 8b94a4aa76..492c846629 100644
--- a/lily/context-property.cc
+++ b/lily/context-property.cc
@@ -34,13 +34,12 @@ general_pushpop_property (Context *context,
 	assert (false);
     }
 
-  execute_general_pushpop_property (context, context_property,
+  sloppy_general_pushpop_property (context, context_property,
 				    grob_property_path, new_value);
 }
 
 
 /*
-  
   Grob descriptions (ie. alists with layout properties) are
   represented as a (ALIST . BASED-ON) pair, where BASED-ON is the
   alist defined in a parent context. BASED-ON should always be a tail
@@ -115,31 +114,35 @@ execute_override_property (Context *context,
     }
 }
 
+/*
+  do a pop (indicated by new_value==SCM_UNDEFINED) or push
+ */
 void
-execute_general_pushpop_property (Context *context,
-				  SCM context_property,
-				  SCM grob_property_path,
-				  SCM new_value)
+sloppy_general_pushpop_property (Context *context,
+				 SCM context_property,
+				 SCM grob_property_path,
+				 SCM new_value)
 {
-  if (new_value != SCM_UNDEFINED)
+  if (new_value == SCM_UNDEFINED)
+    execute_revert_property (context, context_property,
+			     grob_property_path);
+  else
     execute_override_property (context, context_property,
 			       grob_property_path,
 			       new_value);
-  else
-    execute_revert_property (context, context_property,
-			     grob_property_path);
 }
 
+/*
+  Revert the property given by property_path.
+*/
 void
 execute_revert_property (Context *context,
 			 SCM context_property,
 			 SCM grob_property_path)
 {
-  /*
-    revert.
-  */
   SCM current_context_val = SCM_EOL;
-  if (context->where_defined (context_property, &current_context_val) == context)
+  if (context->where_defined (context_property, &current_context_val)
+      == context)
     {
       SCM current_alist = scm_car (current_context_val);
       SCM daddy = scm_cdr (current_context_val);
@@ -152,7 +155,6 @@ execute_revert_property (Context *context,
 	}
       
       SCM symbol = scm_car (grob_property_path);
-
       if (scm_is_pair (scm_cdr (grob_property_path)))
 	{
 	  SCM current_sub_alist = ly_assoc_get (symbol, current_alist, SCM_EOL);
@@ -180,13 +182,15 @@ execute_revert_property (Context *context,
 	}
     }
 }
-
+/*
+  Convenience: a push/pop grob property using a single grob_property
+  as argument.
+*/
 void
 execute_pushpop_property (Context *context,
 			  SCM context_property,
 			  SCM grob_property,
-			  SCM new_value
-			  )
+			  SCM new_value)
 {
   general_pushpop_property (context, context_property,
 			    scm_list_1 (grob_property),
@@ -211,14 +215,14 @@ apply_property_operations (Context *tg, SCM pre_init_ops)
 	  SCM context_prop = scm_car (entry);
 	  SCM val = scm_cadr (entry);
 	  SCM grob_prop_path = scm_cddr (entry);
-	  execute_general_pushpop_property (tg, context_prop, grob_prop_path, val);
+	  sloppy_general_pushpop_property (tg, context_prop, grob_prop_path, val);
 	}
       else if (type == ly_symbol2scm ("pop"))
 	{
 	  SCM context_prop = scm_car (entry);
 	  SCM val = SCM_UNDEFINED;
 	  SCM grob_prop_path = scm_cdr (entry);
-	  execute_general_pushpop_property (tg, context_prop, grob_prop_path, val);
+	  sloppy_general_pushpop_property (tg, context_prop, grob_prop_path, val);
 	}
       else if (type == ly_symbol2scm ("assign"))
 	tg->set_property (scm_car (entry), scm_cadr (entry));
diff --git a/lily/engraver-group.cc b/lily/engraver-group.cc
index eaa025dd17..54358b8fe5 100644
--- a/lily/engraver-group.cc
+++ b/lily/engraver-group.cc
@@ -20,10 +20,10 @@ Engraver_group::override (SCM sev)
 {
   Stream_event *ev = unsmob_stream_event (sev);
   
-  execute_general_pushpop_property (context (),
-				    ev->get_property ("symbol"),
-				    ev->get_property ("property-path"),
-				    ev->get_property ("value"));
+  sloppy_general_pushpop_property (context (),
+				   ev->get_property ("symbol"),
+				   ev->get_property ("property-path"),
+				   ev->get_property ("value"));
 }
 
 IMPLEMENT_LISTENER (Engraver_group, revert);
@@ -32,10 +32,10 @@ Engraver_group::revert (SCM sev)
 {
   Stream_event *ev = unsmob_stream_event (sev);
   
-  execute_general_pushpop_property (context (),
-				    ev->get_property ("symbol"),
-				    ev->get_property ("property-path"),
-				    SCM_UNDEFINED);
+  sloppy_general_pushpop_property (context (),
+				   ev->get_property ("symbol"),
+				   ev->get_property ("property-path"),
+				   SCM_UNDEFINED);
 }
 
 void
diff --git a/lily/include/context.hh b/lily/include/context.hh
index 8bda018544..33e8f8c9a0 100644
--- a/lily/include/context.hh
+++ b/lily/include/context.hh
@@ -126,7 +126,7 @@ void execute_revert_property (Context *context,
 			      SCM context_property,
 			      SCM grob_property_path);
 void execute_pushpop_property (Context *trg, SCM prop, SCM eltprop, SCM val);
-void execute_general_pushpop_property (Context *context,
+void sloppy_general_pushpop_property (Context *context,
 				       SCM context_property, SCM grob_property_path, SCM val);
 SCM updated_grob_properties (Context *tg, SCM sym);
 Context *find_context_below (Context *where,
-- 
2.39.5