X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsimple-closure.cc;h=465640eef59fc48f6de2ed6073ced7e1972ccb8f;hb=a670220b3bd83e8531ce5d2f655d379d9eb7511b;hp=a9aa435cab7fb19731382a4a825e0f59cfde028c;hpb=c39d188d28fdc84cef8cbaea7b8d6e2fb718c30f;p=lilypond.git

diff --git a/lily/simple-closure.cc b/lily/simple-closure.cc
index a9aa435cab..465640eef5 100644
--- a/lily/simple-closure.cc
+++ b/lily/simple-closure.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -22,21 +22,6 @@
 
 #include "grob.hh"
 
-static scm_t_bits simple_closure_tag;
-
-bool
-is_simple_closure (SCM s)
-{
-  return (SCM_NIMP (s) && SCM_CELL_TYPE (s) == simple_closure_tag);
-}
-
-SCM
-simple_closure_expression (SCM smob)
-{
-  assert (is_simple_closure (smob));
-  return (SCM) SCM_CELL_WORD_1 (smob);
-}
-
 SCM
 evaluate_args (SCM delayed_argument, SCM args, bool pure, int start, int end)
 {
@@ -47,7 +32,7 @@ evaluate_args (SCM delayed_argument, SCM args, bool pure, int start, int end)
       *tail = scm_cons (evaluate_with_simple_closure (delayed_argument, scm_car (s),
                                                       pure, start, end),
                         SCM_EOL);
-      if (scm_car (*tail) == SCM_UNSPECIFIED)
+      if (scm_is_eq (scm_car (*tail), SCM_UNSPECIFIED))
         return SCM_UNSPECIFIED;
       tail = SCM_CDRLOC (*tail);
     }
@@ -62,16 +47,16 @@ evaluate_with_simple_closure (SCM delayed_argument,
                               int start,
                               int end)
 {
-  if (is_simple_closure (expr))
+  if (Simple_closure *sc = unsmob<Simple_closure> (expr))
     {
-      SCM inside = simple_closure_expression (expr);
-      SCM proc = is_unpure_pure_container (scm_car (inside))
-               ? (pure ? scm_car (inside) : unpure_pure_container_unpure_part (scm_car (inside)))
-               : scm_car (inside);
+      SCM inside = sc->expression ();
+      SCM proc = !pure && unsmob<Unpure_pure_container> (scm_car (inside))
+        ? unsmob<Unpure_pure_container> (scm_car (inside))->unpure_part ()
+        : scm_car (inside);
       SCM args = scm_cons (delayed_argument,
                            evaluate_args (delayed_argument, scm_cdr (inside),
                                           pure, start, end));
-      if (scm_cdr (args) == SCM_UNSPECIFIED)
+      if (scm_is_eq (scm_cdr (args), SCM_UNSPECIFIED))
         return SCM_UNSPECIFIED;
       if (pure)
         return call_pure_function (proc, args, start, end);
@@ -79,16 +64,16 @@ evaluate_with_simple_closure (SCM delayed_argument,
     }
   else if (!scm_is_pair (expr))
     return expr;
-  else if (scm_car (expr) == ly_symbol2scm ("quote"))
+  else if (scm_is_eq (scm_car (expr), ly_symbol2scm ("quote")))
     return scm_cadr (expr);
-  else if (is_unpure_pure_container (scm_car (expr))
+  else if (unsmob<Unpure_pure_container> (scm_car (expr))
            || ly_is_procedure (scm_car (expr)))
     {
-      SCM proc = is_unpure_pure_container (scm_car (expr))
-               ? (pure ? scm_car (expr) : unpure_pure_container_unpure_part (scm_car (expr)))
-               : scm_car (expr);
+      SCM proc = !pure && unsmob<Unpure_pure_container> (scm_car (expr))
+        ? unsmob<Unpure_pure_container> (scm_car (expr))->unpure_part ()
+        : scm_car (expr);
       SCM args = evaluate_args (delayed_argument, scm_cdr (expr), pure, start, end);
-      if (args == SCM_UNSPECIFIED)
+      if (scm_is_eq (args, SCM_UNSPECIFIED))
         return SCM_UNSPECIFIED;
       if (pure)
         return call_pure_function (proc, args, start, end);
@@ -102,12 +87,7 @@ evaluate_with_simple_closure (SCM delayed_argument,
   return SCM_EOL;
 }
 
-LY_DEFINE (ly_simple_closure_p, "ly:simple-closure?",
-           1, 0, 0, (SCM clos),
-           "Is @var{clos} a simple closure?")
-{
-  return scm_from_bool (is_simple_closure (clos));
-}
+const char Simple_closure::type_p_name_[] = "ly:simple-closure?";
 
 LY_DEFINE (ly_make_simple_closure, "ly:make-simple-closure",
            1, 0, 0, (SCM expr),
@@ -116,10 +96,7 @@ LY_DEFINE (ly_make_simple_closure, "ly:make-simple-closure",
            " invoked as @code{(@var{func} @var{delayed-arg} @var{a1}"
            " @var{a2} @dots{})}.")
 {
-  SCM z;
-
-  SCM_NEWSMOB (z, simple_closure_tag, expr);
-  return z;
+  return Simple_closure::make_smob (expr);
 }
 
 LY_DEFINE (ly_eval_simple_closure, "ly:eval-simple-closure",
@@ -128,27 +105,19 @@ LY_DEFINE (ly_eval_simple_closure, "ly:eval-simple-closure",
            " argument.  If @var{scm-start} and @var{scm-end} are defined,"
            " evaluate it purely with those start and end points.")
 {
+  LY_ASSERT_SMOB (Simple_closure, closure, 2);
   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);
+  SCM expr = unsmob<Simple_closure> (closure)->expression ();
   return evaluate_with_simple_closure (delayed, expr, pure, start, end);
 }
 
 int
-print_simple_closure (SCM s, SCM port, scm_print_state *)
+Simple_closure::print_smob (SCM port, scm_print_state *) const
 {
   scm_puts ("#<simple-closure ", port);
-  scm_display (scm_cdr (s), port);
+  scm_display (expression (), port);
   scm_puts (" >", port);
   return 1;
 }
-
-void init_simple_closure ()
-{
-  simple_closure_tag = scm_make_smob_type ("simple-closure", 0);
-  scm_set_smob_mark (simple_closure_tag, scm_markcdr);
-  scm_set_smob_print (simple_closure_tag, print_simple_closure);
-};
-
-ADD_SCM_INIT_FUNC (simple_closure, init_simple_closure);