From: Guillermo J. Rozas Date: Tue, 27 Aug 1991 01:31:00 +0000 (+0000) Subject: Fix backwards conditionals in exit and %exit. X-Git-Tag: 20090517-FFI~10291 X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=63eb4c1a4fdcc0ff13ec494a19dc4216b0865e7e;p=mit-scheme.git Fix backwards conditionals in exit and %exit. --- diff --git a/v7/src/runtime/global.scm b/v7/src/runtime/global.scm index 15c5075e5..62bcb530f 100644 --- a/v7/src/runtime/global.scm +++ b/v7/src/runtime/global.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/global.scm,v 14.26 1991/08/27 01:22:21 jinx Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/global.scm,v 14.27 1991/08/27 01:31:00 jinx Exp $ Copyright (c) 1988-91 Massachusetts Institute of Technology @@ -174,16 +174,17 @@ MIT in each case. |# (wait-loop))))) (define (exit #!optional integer) - (if (prompt-for-confirmation "Kill Scheme") - (if (default-object? integer) - (%exit integer) - (%exit)))) + (cond ((not (prompt-for-confirmation "Kill Scheme"))) + ((default-object? integer) + (%exit)) + (else + (%exit integer)))) (define (%exit #!optional integer) (event-distributor/invoke! event:before-exit) (if (default-object? integer) - ((ucode-primitive exit-with-value 1) integer) - ((ucode-primitive exit 0)))) + ((ucode-primitive exit 0)) + ((ucode-primitive exit-with-value 1) integer))) (define (quit) (with-absolutely-no-interrupts (ucode-primitive halt)) diff --git a/v8/src/runtime/global.scm b/v8/src/runtime/global.scm index 88ed91dff..81844ebf8 100644 --- a/v8/src/runtime/global.scm +++ b/v8/src/runtime/global.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/global.scm,v 14.26 1991/08/27 01:22:21 jinx Exp $ +$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/global.scm,v 14.27 1991/08/27 01:31:00 jinx Exp $ Copyright (c) 1988-91 Massachusetts Institute of Technology @@ -174,16 +174,17 @@ MIT in each case. |# (wait-loop))))) (define (exit #!optional integer) - (if (prompt-for-confirmation "Kill Scheme") - (if (default-object? integer) - (%exit integer) - (%exit)))) + (cond ((not (prompt-for-confirmation "Kill Scheme"))) + ((default-object? integer) + (%exit)) + (else + (%exit integer)))) (define (%exit #!optional integer) (event-distributor/invoke! event:before-exit) (if (default-object? integer) - ((ucode-primitive exit-with-value 1) integer) - ((ucode-primitive exit 0)))) + ((ucode-primitive exit 0)) + ((ucode-primitive exit-with-value 1) integer))) (define (quit) (with-absolutely-no-interrupts (ucode-primitive halt))