Rebind in the right place, no :- where type is anything

Author: drewc

src/std/monad.ss

@@ -1,16 +1,14 @@
 (import
-      ./monad/interface
-      ./monad/identity
-      ./monad/list
-      ./monad/state
-      ./monad/syntax
-      ./monad/error)
-    (export
-      (import:
-      ./monad/interface)
-      ;; ./monad/identity
-      ;; ./monad/list
-      ;; ./monad/state
-      ;; ./monad/syntax
-      ;; ./monad/error
-)
+  ./monad/interface
+  ./monad/identity
+  ./monad/list
+  ./monad/state
+  ./monad/syntax
+  ./monad/error)
+(export
+  (import: ./monad/interface)
+  (import: ./monad/identity)
+  (import: ./monad/list)
+  (import: ./monad/state)
+  (import: ./monad/syntax)
+  (import: ./monad/error))

src/std/monad/README.org

@@ -105,8 +105,8 @@ definition.
     (instance (m Monad) :t
       ((return a) a)
       ((>>= ma f) (f ma))
-      ((>> ma mb) (m.>>= ma (lambda (_) mb))))
-    rebind: #t)
+      ((>> ma mb) (m.>>= ma (lambda (_) mb)))
+      rebind: #t))
 #+end_src
 
 Essentially that's that! a monad is just an abstraction around those
@@ -828,16 +828,16 @@ Making the handler is easy.
 
 #+begin_src scheme :noweb-ref errorT-struct
   (instance (me MonadError) (et errorT)
-    ((return a) (du (inner et.inner :- Monad) (inner.return a)))
-    ((>>= ma f) (du (inner et.inner :- Monad)
+    ((return a) (du (inner et.inner : Monad) (inner.return a)))
+    ((>>= ma f) (du (inner et.inner : Monad)
                   a <- ma
   		  (if (me.error? a) (inner.return a) (f a))))
     ((error? thing) (Error? thing))
     ((throw msg . irritants)
-     (du (inner et.inner :- Monad)
+     (du (inner et.inner : Monad)
        (inner.return (Error msg irritants: irritants))))
     ((catch exp handler)
-     (du (inner et.inner :- Monad)
+     (du (inner et.inner : Monad)
        val <- exp
        (if (me.error? val) (handler val) (inner.return val)))))
 
@@ -887,18 +887,18 @@ This is after state in the train of thought so is defined here.
 
 #+begin_src scheme :noweb-ref errorT-struct
   (instance MonadState (et errorT)
-   ((get) (du (inner et.inner :- MonadState) (inner.get)))
-   ((put! s) (du (inner et.inner :- MonadState) (inner.put! s)))
-   ((state f)(du (inner et.inner :- MonadState) (inner.state f))))
+   ((get) (du (inner et.inner : MonadState) (inner.get)))
+   ((put! s) (du (inner et.inner : MonadState) (inner.put! s)))
+   ((state f)(du (inner et.inner : MonadState) (inner.state f))))
 
   (instance MonadError (st stateT)
     ((error? e?) (lambda (s)
-                   (du (inner st.inner :- MonadError)
+                   (du (inner st.inner : MonadError)
                    [(inner.error? e?) s ...])))
     ((throw message . args)
      (lambda (s)
      [ (apply MonadError-throw st.inner message args) s ...]))
-    ((catch exp handler) (lambda (s) (du (inner st.inner :- MonadError)
+    ((catch exp handler) (lambda (s) (du (inner st.inner : MonadError)
   		      [(inner.catch exp handler) s ...]))))	  
 #+end_src
 

src/std/monad/error.ss

@@ -14,16 +14,16 @@
     (set! self.inner inner)))
 
 (instance (me MonadError) (et errorT)
-  ((return a) (du (inner et.inner :- Monad) (inner.return a)))
-  ((>>= ma f) (du (inner et.inner :- Monad)
+  ((return a) (du (inner et.inner : Monad) (inner.return a)))
+  ((>>= ma f) (du (inner et.inner : Monad)
                 a <- ma
 		  (if (me.error? a) (inner.return a) (f a))))
   ((error? thing) (Error? thing))
   ((throw msg . irritants)
-   (du (inner et.inner :- Monad)
+   (du (inner et.inner : Monad)
      (inner.return (Error msg irritants: irritants))))
   ((catch exp handler)
-   (du (inner et.inner :- Monad)
+   (du (inner et.inner : Monad)
      val <- exp
      (if (me.error? val) (handler val) (inner.return val)))))
 
@@ -34,16 +34,16 @@
 (instance Zero (et errorT) ((zero) (using (i et.inner : Zero) (i.zero))))
 
 (instance MonadState (et errorT)
- ((get) (du (inner et.inner :- MonadState) (inner.get)))
- ((put! s) (du (inner et.inner :- MonadState) (inner.put! s)))
- ((state f)(du (inner et.inner :- MonadState) (inner.state f))))
+ ((get) (du (inner et.inner : MonadState) (inner.get)))
+ ((put! s) (du (inner et.inner : MonadState) (inner.put! s)))
+ ((state f)(du (inner et.inner : MonadState) (inner.state f))))
 
 (instance MonadError (st stateT)
   ((error? e?) (lambda (s)
-                 (du (inner st.inner :- MonadError)
+                 (du (inner st.inner : MonadError)
                  [(inner.error? e?) s ...])))
   ((throw message . args)
    (lambda (s)
    [ (apply MonadError-throw st.inner message args) s ...]))
-  ((catch exp handler) (lambda (s) (du (inner st.inner :- MonadError)
+  ((catch exp handler) (lambda (s) (du (inner st.inner : MonadError)
 		      [(inner.catch exp handler) s ...]))))

src/std/monad/interface.ss

@@ -12,8 +12,8 @@
    (instance (m Monad) :t
      ((return a) a)
      ((>>= ma f) (f ma))
-     ((>> ma mb) (m.>>= ma (lambda (_) mb))))
-   rebind: #t)
+     ((>> ma mb) (m.>>= ma (lambda (_) mb)))
+     rebind: #t))
 
  (interface Run (run . args))