From 627f3ef4da15ac23f9959e72ed5cfb1855650b05 Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
Date: Thu, 12 Dec 2013 22:29:12 -0500
Subject: Make init a non-keyword argument in make-signal procedure.

* 2d/signals.scm (make-signal): Change parameter list.
* 2d/mouse.scm (mouse-position): Remove #:init keyword.
* 2d/time.scm (time-interval, time-delay): Remove #:init keyword.
* 2d/window.scm (window-size): Remove #:init keyword.
---
 2d/mouse.scm   | 2 +-
 2d/signals.scm | 9 ++++-----
 2d/time.scm    | 4 ++--
 2d/window.scm  | 2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

(limited to '2d')

diff --git a/2d/mouse.scm b/2d/mouse.scm
index 1c118b2..bd11678 100644
--- a/2d/mouse.scm
+++ b/2d/mouse.scm
@@ -33,7 +33,7 @@
 
 (define mouse-last-down (make-signal))
 (define mouse-last-up (make-signal))
-(define mouse-position (make-signal #:init (vector2 0 0)))
+(define mouse-position (make-signal (vector2 0 0)))
 
 (define (mouse-down? button)
   "Create a signal for the state of BUTTON. Value is #t when mouse
diff --git a/2d/signals.scm b/2d/signals.scm
index 85cc5af..cd5cba0 100644
--- a/2d/signals.scm
+++ b/2d/signals.scm
@@ -79,10 +79,9 @@
   "Keep all values."
   #t)
 
-(define* (make-signal #:optional #:key
+(define* (make-signal #:optional init #:key
                       (transformer identity-transform)
                       (filter keep-all)
-                      (init #f)
                       (connectors '()))
   "Create a new signal with initial value INIT that uses the given
 TRANSFORMER procedure to process incoming values from another
@@ -200,7 +199,7 @@ list."
   "Create a new signal that accumulates the current and previous
 values of SIGNAL using PROC."
   (make-signal
-   #:init init
+   init
    #:transformer (lambda (value prev from)
                    (proc value prev))
    #:connectors (list signal)))
@@ -264,7 +263,7 @@ of SIGNALS."
 PREDICATE is true.  INIT specifies the value that is set if PREDICATE
 is never true."
   (make-signal
-   #:init init
+   init
    #:filter (lambda (value prev from)
               (signal-ref predicate))
    #:transformer (lambda (value prev from)
@@ -276,7 +275,7 @@ is never true."
 PREDICATE is true.  INIT specifies the value that is set if PREDICATE
 is never true."
   (make-signal
-   #:init init
+   init
    #:filter (lambda (value prev from)
               (not (signal-ref predicate)))
    #:transformer (lambda (value prev from)
diff --git a/2d/time.scm b/2d/time.scm
index cacfae4..6a6607e 100644
--- a/2d/time.scm
+++ b/2d/time.scm
@@ -31,7 +31,7 @@
 (define (time-interval ticks signal)
   "Create a new signal that emits the value of SIGNAL every TICKS
 agenda updates."
-  (let ((ticker (make-signal #:init (signal-ref signal))))
+  (let ((ticker (make-signal (signal-ref signal))))
     (agenda-schedule-interval
      (lambda ()
        (signal-set! ticker (signal-ref signal))) ticks)
@@ -43,7 +43,7 @@ agenda updates."
 
 (define (time-delay ticks signal)
   (make-signal
-   #:init (signal-ref signal)
+   (signal-ref signal)
    #:filter (lambda (value old from)
               (wait ticks)
               #t)
diff --git a/2d/window.scm b/2d/window.scm
index 159a9a2..f520c7a 100644
--- a/2d/window.scm
+++ b/2d/window.scm
@@ -53,7 +53,7 @@
                       (fullscreen? #f))
   (%make-window title resolution fullscreen?))
 
-(define window-size (make-signal #:init (vector2 0 0)))
+(define window-size (make-signal (vector2 0 0)))
 
 (register-event-handler
  'video-resize
-- 
cgit v1.2.3