X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsimple-closure.cc;h=34bfd58f1bb6d06741b031a3d1cee0785d451e77;hb=dadf069231fbb3357563070318dc11c5746c97ba;hp=40efbdd7270a4f94d7616668dee43713ae40d493;hpb=9f3572d98bb948c9689cd1f75401a029451fa001;p=lilypond.git

diff --git a/lily/simple-closure.cc b/lily/simple-closure.cc
index 40efbdd727..34bfd58f1b 100644
--- a/lily/simple-closure.cc
+++ b/lily/simple-closure.cc
@@ -3,11 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
+#include "simple-closure.hh"
 
-#include "lily-guile.hh"
+#include "grob.hh"
 
 static scm_t_bits simple_closure_tag;
 
@@ -24,17 +25,18 @@ simple_closure_expression (SCM smob)
   return (SCM) SCM_CELL_WORD_1(smob);
 }
 
-SCM evaluate_with_simple_closure (SCM delayed_argument, SCM expr);
-
 SCM
-evaluate_args (SCM delayed_argument, SCM args)
+evaluate_args (SCM delayed_argument, SCM args, bool pure, int start, int end)
 {
   SCM new_args = SCM_EOL;
   SCM *tail = &new_args;
   for (SCM s = args; scm_is_pair (s); s = scm_cdr (s))
     {
-      *tail = scm_cons (evaluate_with_simple_closure (delayed_argument, scm_car (s)),
+      *tail = scm_cons (evaluate_with_simple_closure (delayed_argument, scm_car (s),
+						      pure, start, end),
 			SCM_EOL);
+      if (scm_car (*tail) == SCM_UNSPECIFIED)
+      	return SCM_UNSPECIFIED;
       tail = SCM_CDRLOC (*tail);
     }
   
@@ -43,14 +45,22 @@ evaluate_args (SCM delayed_argument, SCM args)
 
 SCM
 evaluate_with_simple_closure (SCM delayed_argument,
-			      SCM expr)
+			      SCM expr,
+			      bool pure,
+			      int start,
+			      int end)
 {
   if (is_simple_closure (expr))
     {
       SCM inside = simple_closure_expression (expr);
-      return scm_apply_1 (scm_car (inside),
-			  delayed_argument,
-			  evaluate_args (delayed_argument, scm_cdr (inside)));
+      SCM args = scm_cons (delayed_argument,
+			   evaluate_args (delayed_argument, scm_cdr (inside),
+					  pure, start, end));
+      if (scm_cdr (args) == SCM_UNSPECIFIED)
+      	return SCM_UNSPECIFIED;
+      if (pure)
+	return call_pure_function (scm_car (inside), args, start, end);
+      return scm_apply_0 (scm_car (inside), args);
     }
   else if (!scm_is_pair (expr))
     return expr;
@@ -58,35 +68,53 @@ evaluate_with_simple_closure (SCM delayed_argument,
     return scm_cadr (expr);
   else if (ly_is_procedure (scm_car (expr)))
     {
-      return scm_apply_0 (scm_car (expr),
-			  evaluate_args (delayed_argument, scm_cdr (expr)));
+      SCM args = evaluate_args (delayed_argument, scm_cdr (expr), pure, start, end);
+      if (args == SCM_UNSPECIFIED)
+      	return SCM_UNSPECIFIED;
+      if (pure)
+	return call_pure_function (scm_car (expr), args, start, end);
+      return scm_apply_0 (scm_car (expr), args);
     }
   else
     // ugh. deviation from standard. Should print error? 
-    return  evaluate_args (delayed_argument, scm_cdr (expr)); 
+    return evaluate_args (delayed_argument, scm_cdr (expr), pure, start, end); 
   
   assert (false);
   return SCM_EOL;
 }
 
-LY_DEFINE(ly_simple_closure_p, "ly:simple-closure?",
+LY_DEFINE (ly_simple_closure_p, "ly:simple-closure?",
 	  1,0,0, (SCM clos),
 	  "Type predicate.")
 {
   return scm_from_bool (is_simple_closure (clos));
 }
 
-LY_DEFINE(ly_make_simple_closure, "ly:make-simple-closure",
+LY_DEFINE (ly_make_simple_closure, "ly:make-simple-closure",
 	  1, 0, 0, (SCM expr),
-	  "Make a simple closure. @var{expr} should be form of "
-	  "@code{(@var{func} @var{a1} @var{A2} ...)}, and will be invoked "
-	  "as @code{(@var{func} @var{delayed-arg} @var{a1} @var{a2} ... )}.")
+	  "Make a simple closure.  @var{expr} should be form of"
+	  " @code{(@var{func} @var{a1} @var{A2} @dots{})}, and will be"
+	  " invoked as @code{(@var{func} @var{delayed-arg} @var{a1}"
+	  " @var{a2} @dots{})}.")
 {
   SCM z;
 
-  SCM_NEWSMOB(z, simple_closure_tag, expr);
+  SCM_NEWSMOB (z, simple_closure_tag, expr);
   return z;
 }
+
+LY_DEFINE (ly_eval_simple_closure, "ly:eval-simple-closure",
+	  2, 2, 0, (SCM delayed, SCM closure, SCM scm_start, SCM scm_end),
+	  "Evaluate a simple @var{closure} with the given @var{delayed}"
+	  " argument.  If @var{scm-start} and @var{scm-end} are defined,"
+	  " evaluate it purely with those start and end points.")
+{
+  bool pure = (scm_is_number (scm_start) && scm_is_number (scm_end));
+  int start = robust_scm2int (scm_start, 0);
+  int end = robust_scm2int (scm_end, 0);
+  SCM expr = simple_closure_expression (closure);
+  return evaluate_with_simple_closure (delayed, expr, pure, start, end);
+}
  
 int
 print_simple_closure (SCM s, SCM port, scm_print_state *)
@@ -107,4 +135,4 @@ void init_simple_closure ()
 
 
 
-ADD_SCM_INIT_FUNC(simple_closure, init_simple_closure);
+ADD_SCM_INIT_FUNC (simple_closure, init_simple_closure);