Doc: Usage 1.2 - Added note about using wildcards

[lilypond.git] / lily / grob-property.cc

diff --git a/lily/grob-property.cc b/lily/grob-property.cc
index 32ff49124dff37919c6e21b5b8778874338c188b..779f0e91cbcb4712deb96e765e5f4db4f8c4c506 100644 (file)
--- a/lily/grob-property.cc
+++ b/lily/grob-property.cc
@@ -123,8 +123,8 @@ Grob::internal_set_value_on_alist (SCM *alist, SCM sym, SCM v)
   if (do_internal_type_checking_global)
     {
       if (!ly_is_procedure (v)
-          && !is_simple_closure (v)
-          && !is_unpure_pure_container (v)
+          && !Simple_closure::is_smob (v)
+          && !Unpure_pure_container::is_smob (v)
           && v != ly_symbol2scm ("calculation-in-progress"))
         type_check_assignment (sym, v, ly_symbol2scm ("backend-type?"));
 
@@ -151,7 +151,8 @@ Grob::internal_get_property_data (SCM sym) const
   if (do_internal_type_checking_global && scm_is_pair (handle))
     {
       SCM val = scm_cdr (handle);
-      if (!ly_is_procedure (val) && !is_simple_closure (val) && !is_unpure_pure_container (val))
+      if (!ly_is_procedure (val) && !Simple_closure::is_smob (val)
+          && !Unpure_pure_container::is_smob (val))
         type_check_assignment (sym, val, ly_symbol2scm ("backend-type?"));
 
       check_interfaces_for_property (this, sym);
@@ -179,11 +180,11 @@ Grob::internal_get_property (SCM sym) const
     }
 #endif
 
-  if (is_unpure_pure_container (val))
-    val = unpure_pure_container_unpure_part (val);
+  if (Unpure_pure_container *upc = Unpure_pure_container::unsmob (val))
+    val = upc->unpure_part ();
 
   if (ly_is_procedure (val)
-      || is_simple_closure (val))
+      || Simple_closure::is_smob (val))
     {
       Grob *me = ((Grob *)this);
       val = me->try_callback_on_alist (&me->mutable_property_alist_, sym, val);
@@ -200,17 +201,17 @@ Grob::internal_get_pure_property (SCM sym, int start, int end) const
   if (ly_is_procedure (val))
     return call_pure_function (val, scm_list_1 (self_scm ()), start, end);
 
-  if (is_unpure_pure_container (val)) {
+  if (Unpure_pure_container *upc = Unpure_pure_container::unsmob (val)) {
     // Do cache, if the function ignores 'start' and 'end'
-    if (is_unchanging_unpure_pure_container (val))
+    if (upc->is_unchanging ())
       return internal_get_property (sym);
     else
       return call_pure_function (val, scm_list_1 (self_scm ()), start, end);
   }
 
-  if (is_simple_closure (val))
+  if (Simple_closure *sc = Simple_closure::unsmob (val))
     return evaluate_with_simple_closure (self_scm (),
-                                         simple_closure_expression (val),
+                                         sc->expression (),
                                          true, start, end);
   return val;
 }
@@ -239,10 +240,10 @@ Grob::try_callback_on_alist (SCM *alist, SCM sym, SCM proc)
   SCM value = SCM_EOL;
   if (ly_is_procedure (proc))
     value = scm_call_1 (proc, self_scm ());
-  else if (is_simple_closure (proc))
+  else if (Simple_closure *sc = Simple_closure::unsmob (proc))
     {
       value = evaluate_with_simple_closure (self_scm (),
-                                            simple_closure_expression (proc),
+                                            sc->expression (),
                                             false, 0, 0);
     }
 
@@ -303,8 +304,8 @@ Grob::internal_get_object (SCM sym) const
     {
       SCM val = scm_cdr (s);
       if (ly_is_procedure (val)
-          || is_simple_closure (val)
-          || is_unpure_pure_container (val))
+          || Simple_closure::is_smob (val)
+          || Unpure_pure_container::is_smob (val))
         {
           Grob *me = ((Grob *)this);
           val = me->try_callback_on_alist (&me->object_alist_, sym, val);
@@ -331,13 +332,13 @@ Grob::internal_has_interface (SCM k)
 SCM
 call_pure_function (SCM unpure, SCM args, int start, int end)
 {
-  if (is_unpure_pure_container (unpure))
+  if (Unpure_pure_container *upc = Unpure_pure_container::unsmob (unpure))
     {
-      SCM pure = unpure_pure_container_pure_part (unpure);
+      SCM pure = upc->pure_part ();
 
-      if (is_simple_closure (pure))
+      if (Simple_closure *sc = Simple_closure::unsmob (pure))
         {
-          SCM expr = simple_closure_expression (pure);
+          SCM expr = sc->expression ();
           return evaluate_with_simple_closure (scm_car (args), expr, true, start, end);
         }
 
@@ -351,9 +352,9 @@ call_pure_function (SCM unpure, SCM args, int start, int end)
       return pure;
     }
 
-  if (is_simple_closure (unpure))
+  if (Simple_closure *sc = Simple_closure::unsmob (unpure))
     {
-      SCM expr = simple_closure_expression (unpure);
+      SCM expr = sc->expression ();
       return evaluate_with_simple_closure (scm_car (args), expr, true, start, end);
     }