From: Chris Hanson Date: Thu, 18 Nov 2004 18:16:13 +0000 (+0000) Subject: Change DEFAULT-OBJECT? from syntax to a procedure. Requires X-Git-Tag: 20090517-FFI~1472 X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=2865c464967cec4e69fa4e0eba483a5bff5e44e6;p=mit-scheme.git Change DEFAULT-OBJECT? from syntax to a procedure. Requires corresponding changes to microcode. --- diff --git a/v7/src/runtime/boot.scm b/v7/src/runtime/boot.scm index 596aa8795..ad034e489 100644 --- a/v7/src/runtime/boot.scm +++ b/v7/src/runtime/boot.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: boot.scm,v 14.18 2004/10/01 02:47:41 cph Exp $ +$Id: boot.scm,v 14.19 2004/11/18 18:15:59 cph Exp $ Copyright 1986,1987,1988,1989,1990,1992 Massachusetts Institute of Technology Copyright 1993,1996,2001,2004 Massachusetts Institute of Technology @@ -115,4 +115,10 @@ USA. get-next-constant) (define-integrable (future? object) - ((ucode-primitive object-type? 2) (ucode-type future) object)) \ No newline at end of file + ((ucode-primitive object-type? 2) (ucode-type future) object)) + +(define-integrable (default-object? object) + (eq? object (default-object))) + +(define-integrable (default-object) + (object-new-type (ucode-type constant) 7)) \ No newline at end of file diff --git a/v7/src/runtime/mit-syntax.scm b/v7/src/runtime/mit-syntax.scm index 0cdfe4d06..0f2dd9049 100644 --- a/v7/src/runtime/mit-syntax.scm +++ b/v7/src/runtime/mit-syntax.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: mit-syntax.scm,v 14.21 2004/09/14 01:37:16 cph Exp $ +$Id: mit-syntax.scm,v 14.22 2004/11/18 18:16:04 cph Exp $ Copyright 1989,1990,1991,2001,2002,2003 Massachusetts Institute of Technology Copyright 2004 Massachusetts Institute of Technology @@ -863,18 +863,6 @@ USA. (syntax-check '(KEYWORD EXPRESSION EXPRESSION) form history) `(,(rename 'CONS) ,(cadr form) (,(rename 'DELAY) ,(caddr form))))))) - -(define-compiler 'DEFAULT-OBJECT? system-global-environment - (lambda (form environment history) - (syntax-check '(KEYWORD IDENTIFIER) form history) - (let ((item - (classify/subexpression (cadr form) - environment - history - select-cadr))) - (if (not (variable-item? item)) - (syntax-error history "Variable required in this context:" form)) - (output/unassigned-test (variable-item/name item))))) (define-er-macro-transformer 'DEFINE-INTEGRABLE system-global-environment (lambda (form rename compare) diff --git a/v7/src/runtime/runtime.pkg b/v7/src/runtime/runtime.pkg index 3874e9a25..d34fd3fd7 100644 --- a/v7/src/runtime/runtime.pkg +++ b/v7/src/runtime/runtime.pkg @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: runtime.pkg,v 14.511 2004/11/17 05:42:33 cph Exp $ +$Id: runtime.pkg,v 14.512 2004/11/18 18:16:08 cph Exp $ Copyright 1988,1989,1990,1991,1992,1993 Massachusetts Institute of Technology Copyright 1994,1995,1996,1997,1998,1999 Massachusetts Institute of Technology @@ -137,6 +137,8 @@ USA. (files "boot") (parent (runtime)) (export () + default-object + default-object? future? get-next-constant interrupt-bit/after-gc diff --git a/v7/src/runtime/version.scm b/v7/src/runtime/version.scm index 3783d97bd..738c89175 100644 --- a/v7/src/runtime/version.scm +++ b/v7/src/runtime/version.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: version.scm,v 14.218 2004/10/12 22:42:49 cph Exp $ +$Id: version.scm,v 14.219 2004/11/18 18:16:13 cph Exp $ Copyright 1988,1989,1990,1991,1992,1993 Massachusetts Institute of Technology Copyright 1995,1996,1997,1998,1999,2000 Massachusetts Institute of Technology @@ -34,7 +34,7 @@ USA. (add-subsystem-identification! "Release" '(7 7 91)) (snarf-microcode-version!) (add-event-receiver! event:after-restore snarf-microcode-version!) - (add-subsystem-identification! "Runtime" '(15 5))) + (add-subsystem-identification! "Runtime" '(15 6))) (define (snarf-microcode-version!) (add-subsystem-identification! "Microcode"