~ chicken-core (chicken-5) b1e65f3c631059c7b9db1c9d32861fa1d0bbfba4

commit b1e65f3c631059c7b9db1c9d32861fa1d0bbfba4
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Thu Aug 11 10:44:11 2011 +0200
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Thu Aug 11 10:44:11 2011 +0200

    minor scrutiny bugfixes

diff --git a/scrutinizer.scm b/scrutinizer.scm
index 700deaf8..02c40e65 100755
--- a/scrutinizer.scm
+++ b/scrutinizer.scm
@@ -45,8 +45,8 @@
 
 (define dd d)
 
-;(define-syntax d (syntax-rules () ((_ . _) (void))))
-;(define-syntax dd (syntax-rules () ((_ . _) (void))))
+(define-syntax d (syntax-rules () ((_ . _) (void))))
+(define-syntax dd (syntax-rules () ((_ . _) (void))))
 
 
 ;;; Walk node tree, keeping type and binding information
@@ -115,8 +115,8 @@
 	       (else 'number)))		; in case...
 	    ((boolean? lit) 'boolean)
 	    ((null? lit) 'null)
-	    ((pair? lit) 'pair)
 	    ((list? lit) 'list)
+	    ((pair? lit) 'pair)
 	    ((eof-object? lit) 'eof)
 	    ((vector? lit) 'vector)
 	    ((and (not (##sys#immediate? lit)) (##sys#generic-structure? lit))
@@ -1276,7 +1276,7 @@
 					 ,@(if (and name (not rec)) (list name) '())
 					 ,ts
 					 ,@rt)))))))))
-	    ((and (pair? (cdr t)) (memq '-> (cdr t))) =>
+	    ((and (pair? (cdr t)) (memq '-> t)) =>
 	     (lambda (p)
 	       (let ((cp (memq ': (cdr t))))
 		 (cond ((not cp)