[Wisp-cvs] wisp/modules shell.wisp,1.31,1.32

[<di...@us...>]

Update of /cvsroot/wisp/wisp/modules
In directory usw-pr-cvs1:/tmp/cvs-serv6943/modules

Modified Files:
	shell.wisp 
Log Message:
Implemented the SRFI-31 |rec| form.

Index: shell.wisp
===================================================================
RCS file: /cvsroot/wisp/wisp/modules/shell.wisp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- shell.wisp	26 Aug 2002 16:18:19 -0000	1.31
+++ shell.wisp	31 Aug 2002 14:39:19 -0000	1.32
@@ -167,24 +167,25 @@
         (print "$[r] = $[v]\n")
         (if (procedure? v)
           (my org (origin v)
-            (my doc (if org
-                      (my pkg (cdr org)
-                        (cond
-                          ((or (eq? pkg '-A)
-                               (and (cons? pkg)
-                                    (eq? (car pkg) 'regular-env)))
-                            (builtin.wid (car org)))
-                          ((and (cons? pkg)
-                                (eq? (car pkg) 'use))
-                           (my module-name (second pkg)
-                             (my mwc (assq module-name module.wids[])
-                               (if (not mwc)
-                                 (begin
-                                   (set! mwc (cons module-name
-                                                   (make-wid-holder
-                                                     "$[module-name]")))
-                                   (cons! module.wids[] mwc)))
-                               ((cdr mwc) (car org))))))))
+            (my doc (and org
+                         (my pkg (cdr org)
+                           (cond
+                             ((or (eq? pkg '-A)
+                                  (and (cons? pkg)
+                                       (eq? (car pkg) 'regular-env)))
+                               (builtin.wid (car org)))
+                             ((and (cons? pkg)
+                                   (eq? (car pkg) 'use))
+                               (my module-name (second pkg)
+                                 (my mwc (assq module-name module.wids[])
+                                   (if (not mwc)
+                                     (begin
+                                       (set! mwc (cons module-name
+                                                       (make-wid-holder
+                                                         "$[module-name]")))
+                                       (cons! module.wids[] mwc)))
+                                   ((cdr mwc) (car org)))))
+                             (else #f))))
               (if (or org doc)
                 (begin
                   (newline)