From 61dfef0cea705bdd638867ec42036bab0dd90846 Mon Sep 17 00:00:00 2001 From: Abdulaziz Ghuloum Date: Fri, 4 Jan 2008 02:50:45 -0500 Subject: [PATCH] Passing tests-1.2 in 64-bit. --- scheme/last-revision | 2 +- scheme/test64.ss | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/scheme/last-revision b/scheme/last-revision index 58d676f..0718dd8 100644 --- a/scheme/last-revision +++ b/scheme/last-revision @@ -1 +1 @@ -1318 +1320 diff --git a/scheme/test64.ss b/scheme/test64.ss index 286c39f..b0631a7 100755 --- a/scheme/test64.ss +++ b/scheme/test64.ss @@ -22,14 +22,14 @@ (define (compile1 x) (printf "Compiling ~s\n" x) - (let ([p (open-file-output-port "test64.boot" (file-options no-fail))]) + (let ([p (open-file-output-port "test64.fasl" (file-options no-fail))]) (parameterize ([assembler-output #t]) (compile-core-expr-to-port x p)) (close-output-port p))) (define (compile-and-run x) (compile1 x) - (let ([rs (system "../src/ikarus -b test64.boot > test64.out")]) + (let ([rs (system "../src/ikarus -b test64.fasl > test64.out")]) (unless (= rs 0) (error 'run1 "died")) (with-input-from-file "test64.out" (lambda () (get-string-all (current-input-port)))))) @@ -50,9 +50,12 @@ [(quote #f) "#f\n"] [(quote ()) "()\n"])) +(define (self-evaluating? x) + (or (number? x) (char? x) (boolean? x) (null? x) (string? x))) + (define (fixup x) (match x - [,n (guard (number? n)) `(quote ,n)] + [,n (guard (self-evaluating? n)) `(quote ,n)] [,_ (error 'fixup "invalid expression" _)])) (define-syntax add-tests-with-string-output @@ -66,6 +69,7 @@ ...)))]))) (include "tests/tests-1.1-req.scm") +(include "tests/tests-1.2-req.scm") (test-all) (printf "Passed ~s tests\n" (length all-tests))