Changeset 13968 in project for chicken

Timestamp:

03/27/09 15:52:35 (11 years ago)

Author:

felix winkelmann

Message:

a few fixes

Location:

chicken/branches/scrutiny

Files:

• TODO (modified) (1 diff)
• scrutinizer.scm (modified) (5 diffs)

chicken/branches/scrutiny/TODO

@@ -104 +104 @@
 *** using "touch" with WINDOWS_SHELL won't work (need alternative)
 *** extend scripts/guess-platforms.sh for more platforms
+*** is the Mac build properly working?
 
 ** documentation

chicken/branches/scrutiny/scrutinizer.scm

@@ -136 +136 @@
          loc "of type boolean" "a result that is always true" 
          "value"
-         (sprintf "in conditional `~s', " (fragment x))))
+         (sprintf "in conditional `~s'," (fragment x))))
       f))
   (define (typename t)
@@ -286 +286 @@
      loc 
      (sprintf 
-      "~a~a~a"
+      "~a~a~a~a"
       (or desc "")
+      (if desc " " "")
       (if expected
-          (sprintf "expected ~a~a~a" what (and what " ") expected)
+          (sprintf "expected ~a~a~a" (or what "") (and what " ") expected)
           "")
       (sprintf ", but where given ~a" given))))
@@ -315 +316 @@
                (map (lambda (x) 
                       (if (and (list? x) (any pair? x))
-                          '...
+                          '(...)
                           x))
                     x1)))
@@ -321 +322 @@
   (define (call-result args e loc x)
     (define (pname)
-      (sprintf "in procedure call to `~s' " (fragment x)))
+      (sprintf "in procedure call to `~s'" (fragment x)))
     (d "call-result: ~a (~a)" args loc)
     (let ((ptype (car args))
@@ -392 +393 @@
                        (let ((r1 (walk (second subs) e loc dest))
                              (r2 (walk (third subs) e loc dest)))
-                         (when (and (not (eq? r1 '*)) (not (eq? '* r2))
-                                    (not (= (length r1) (length r2))))
-                           (report1 
-                            loc
-                            "branches in conditional expression differ in the number of results"))
-                         (map (lambda (t1 t2) (simplify `(or ,t1 ,t2)))
-                              r1 r2))))
+                         (cond ((and (not (eq? r1 '*)) (not (eq? '* r2)))
+                                (when (not (= (length r1) (length r2)))
+                                  (report1 
+                                   loc
+                                   "branches in conditional expression differ in the number of results"))
+                                (map (lambda (t1 t2) (simplify `(or ,t1 ,t2)))
+                                     r1 r2))
+                               (else '*)))))
                ((let)
                 (let ((t (single (walk (first subs) e loc (first params)) loc)))