~ chicken-core (chicken-5) 2e6ef61345398e4193b57f4a3ab612e42bebc4fe


commit 2e6ef61345398e4193b57f4a3ab612e42bebc4fe
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Thu Apr 7 04:39:25 2011 -0400
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Thu Apr 7 04:39:25 2011 -0400

    scrutiny fixes, slight changes in fft.scm

diff --git a/scrutinizer.scm b/scrutinizer.scm
index 51baf162..1cd8a513 100755
--- a/scrutinizer.scm
+++ b/scrutinizer.scm
@@ -140,10 +140,10 @@
 		     (and (eq? id (caar b))
 			  (memq (cdar b) flow)) )
 		   blist)
-	     => (o list cdr))
+	     => cdr)
 	    (else #f)))
     (define (variable-result id e loc flow)
-      (cond ((blist-type id flow))
+      (cond ((blist-type id flow) => list)
 	    ((and (get db id 'assigned) 
 		  (not (variable-mark id '##compiler#declared-type)))
 	     '(*))
diff --git a/tests/fft.scm b/tests/fft.scm
index 49fd8e5d..1e692aa6 100644
--- a/tests/fft.scm
+++ b/tests/fft.scm
@@ -13,16 +13,27 @@
 ;;; All the following redefinitions are *ignored* by the Gambit compiler
 ;;; because of the declarations above.
 
+(define-syntax defalias
+  (syntax-rules ()
+    ((_ one two) 
+     (define-syntax one
+       (syntax-rules ()
+	 ((_ . args) (two . args))))))) 
+
 (cond-expand
+ (generic
+  (begin
+    (defalias fixnum->flonum exact->inexact)
+    (defalias fxodd? odd?)
+    (defalias fxeven? even?)
+    (defalias fxarithmetic-shift-right fxshr)
+    (defalias fxarithmetic-shift-left  fxshl)
+    (defalias fl* *)
+    (defalias fl/ /)
+    (defalias fl+ +)
+    (defalias fl- -)))
  (chicken
   (begin
-    (use srfi-4)
-    (define-syntax defalias
-      (syntax-rules ()
-	((_ one two) 
-	 (define-syntax one
-	   (syntax-rules ()
-	     ((_ . args) (two . args))))))) 
     (defalias fixnum->flonum exact->inexact)
     (defalias fxodd? odd?)
     (defalias fxeven? even?)
@@ -43,6 +54,8 @@
     (defalias f64vector-ref vector-ref)
     (defalias list->f64vector list->vector)
     (defalias f64vector-length vector-length)) )
+ (chicken
+  (use srfi-4))
  (else) )
 
 ;;; end of *ignored* definitions
Trap