X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdispatcher-scheme.cc;h=824c9a3fc542471c0b02c2bbe0f9a37e0ed64019;hb=a6bd229f7fe1dc4a03478e14ccc0c0c66b225061;hp=a8a2b273a1f8faebf55de9af9f7c4c0223a09f3e;hpb=2a8dcc4faa8a16229774d3414eedbf46feceac84;p=lilypond.git

diff --git a/lily/dispatcher-scheme.cc b/lily/dispatcher-scheme.cc
index a8a2b273a1..824c9a3fc5 100644
--- a/lily/dispatcher-scheme.cc
+++ b/lily/dispatcher-scheme.cc
@@ -1,28 +1,41 @@
 /*
-  dispatcher.cc -- implement Scheme bindings for Dispatcher
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2006--2010 Erik Sandberg  <mandolaerik@gmail.com>
 
-  (c) 2006 Erik Sandberg  <mandolaerik@gmail.com>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "dispatcher.hh"
 
 LY_DEFINE (ly_make_dispatcher, "ly:make-dispatcher",
 	   0, 0, 0, (),
-	   "Returns a newly created dispatcher.")
+	   "Return a newly created dispatcher.")
 {
   return (new Dispatcher ())->unprotect ();
 }
 
-LY_DEFINE (ly_register_dispatcher, "ly:connect-dispatchers",
+LY_DEFINE (ly_connect_dispatchers, "ly:connect-dispatchers",
 	   2, 0, 0, (SCM to, SCM from),
-	   "Makes the dispatcher @var{to} listen to events from @var{from}." )
+	   "Make the dispatcher @var{to} listen to events from @var{from}.")
 {
   Dispatcher *t = unsmob_dispatcher (to);
   Dispatcher *f = unsmob_dispatcher (from);
-  SCM_ASSERT_TYPE (t, from, SCM_ARG1, __FUNCTION__, "dispatcher");
-  SCM_ASSERT_TYPE (f, to, SCM_ARG2, __FUNCTION__, "dispatcher");
+  
+  LY_ASSERT_SMOB (Dispatcher, to, 1); 
+  LY_ASSERT_SMOB (Dispatcher, from,  2); 
+
   t->register_as_listener (f);
 
   return SCM_UNDEFINED;
@@ -30,18 +43,21 @@ LY_DEFINE (ly_register_dispatcher, "ly:connect-dispatchers",
 
 LY_DEFINE (ly_add_listener, "ly:add-listener",
 	   2, 0, 1, (SCM list, SCM disp, SCM cl),
-	   "Adds the listener @var{list} to the dispatcher @var{disp}.\n"
-	   " Whenever @var{disp} hears an event of class @var{cl}, it will be forwarded to @var{list}.\n" )
+	   "Add the listener @var{list} to the dispatcher @var{disp}."
+	   "  Whenever @var{disp} hears an event of class @var{cl},"
+	   " it is forwarded to @var{list}.")
 {
   Listener *l = unsmob_listener (list);
   Dispatcher *d = unsmob_dispatcher (disp);
-  SCM_ASSERT_TYPE (l, list, SCM_ARG1, __FUNCTION__, "listener");
-  SCM_ASSERT_TYPE (d, disp, SCM_ARG2, __FUNCTION__, "dispatcher");
+
+  LY_ASSERT_SMOB (Listener, list, 1); 
+  LY_ASSERT_SMOB (Dispatcher, disp, 2); 
   
-  for (int arg=SCM_ARG3; cl != SCM_EOL; cl = scm_cdr (cl), arg++)
+  for (int arg = SCM_ARG3; scm_is_pair (cl); cl = scm_cdr (cl), arg++)
     {
-      SCM_ASSERT_TYPE (scm_symbol_p (cl), cl, arg, __FUNCTION__, "symbol");
-      d->add_listener (*l, scm_car (cl));
+      SCM sym = scm_car (cl);
+      SCM_ASSERT_TYPE (scm_is_symbol (sym), sym, arg, __FUNCTION__, "symbol");
+      d->add_listener (*l, sym);
     }
 
   return SCM_UNDEFINED;
@@ -49,13 +65,14 @@ LY_DEFINE (ly_add_listener, "ly:add-listener",
 
 LY_DEFINE (ly_broadcast, "ly:broadcast",
 	   2, 0, 0, (SCM disp, SCM ev),
-	   "Sends the stream event @var{ev} to the dispatcher\n"
-	   "@var{disp}.")
+	   "Send the stream event @var{ev} to the dispatcher @var{disp}.")
 {
   Dispatcher *d = unsmob_dispatcher (disp);
   Stream_event *e = unsmob_stream_event (ev);
-  SCM_ASSERT_TYPE (d, disp, SCM_ARG1, __FUNCTION__, "dispatcher");
-  SCM_ASSERT_TYPE (e, ev, SCM_ARG2, __FUNCTION__, "stream event");
+ 
+  LY_ASSERT_SMOB (Dispatcher, disp, 1);
+
+  LY_ASSERT_SMOB (Stream_event, ev, 2); 
   d->broadcast (e);
   return SCM_UNDEFINED;
 }