Change to use `error:illegal-datum' and `error:datum-out-of-range'.

diff --git a/v7/src/runtime/global.scm b/v7/src/runtime/global.scm
index 481848d6974f536efefb6fb7a6b0d6ae47e8eef0..5c091ccc1c58de39203765055ec614010958750f 100644 (file)
--- 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.18 1990/09/19 00:32:55 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/global.scm,v 14.19 1990/10/04 02:41:11 cph Exp $
 
 Copyright (c) 1988, 1989, 1990 Massachusetts Institute of Technology
 
@@ -249,7 +249,7 @@ MIT in each case. |#
                 (cons (car bucket) accumulator))))))))
 
 (define (error:illegal-datum object #!optional operator-name)
-  (if (default-object? operator-name)
+  (if (or (default-object? operator-name) (not operator-name))
       (error error-type:wrong-type-argument object)
       (error error-type:wrong-type-argument object
             (error-irritant/noise char:newline)
@@ -257,7 +257,7 @@ MIT in each case. |#
             operator-name)))
 
 (define (error:datum-out-of-range object #!optional operator-name)
-  (if (default-object? operator-name)
+  (if (or (default-object? operator-name) (not operator-name))
       (error error-type:bad-range-argument object)
       (error error-type:bad-range-argument object
             (error-irritant/noise char:newline)

diff --git a/v7/src/runtime/record.scm b/v7/src/runtime/record.scm
index 28220fcc7ca17e9879cb86e8e79f4432ecc9130d..5a4badc144a197314ea74384020aef379945bad8 100644 (file)
--- a/v7/src/runtime/record.scm
+++ b/v7/src/runtime/record.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/record.scm,v 1.5 1990/10/04 02:25:12 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/record.scm,v 1.6 1990/10/04 02:41:38 cph Exp $
 
 Copyright (c) 1989, 1990 Massachusetts Institute of Technology
 
@@ -153,7 +153,7 @@ MIT in each case. |#
       (named-structure/set-tag-description! tag
        (lambda (record-type)
          (if (not (record-type? record-type))
-             (error:illegal-datum record-type))
+             (error:illegal-datum record-type false))
          `((PREDICATE ,(vector-ref record-type 1))
            (CONSTRUCTOR-CONSTRUCTOR ,(vector-ref record-type 2))
            (ACCESSOR-CONSTRUCTOR ,(vector-ref record-type 3))
@@ -183,6 +183,6 @@ MIT in each case. |#
        (record-type? (vector-ref object 0))))
 
 (define (record-type-descriptor record)
-  (if (not (record? object))
-      (error:illegal-datum object 'RECORD-TYPE-DESCRIPTOR))
+  (if (not (record? record))
+      (error:illegal-datum record 'RECORD-TYPE-DESCRIPTOR))
   (vector-ref record 0))
\ No newline at end of file

diff --git a/v7/src/runtime/runtime.pkg b/v7/src/runtime/runtime.pkg
index 503016298960d544a41b4657087ec4e70408c937..f020b003d86e69147690181c9ea36b8154990040 100644 (file)
--- a/v7/src/runtime/runtime.pkg
+++ b/v7/src/runtime/runtime.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/runtime.pkg,v 14.78 1990/09/13 23:30:01 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/runtime.pkg,v 14.79 1990/10/04 02:42:24 cph Exp $
 
 Copyright (c) 1988, 1989, 1990 Massachusetts Institute of Technology
 
@@ -1413,8 +1413,6 @@ MIT in each case. |#
   (files "record")
   (parent ())
   (export ()
-         guarantee-record
-         guarantee-record-type
          make-record-type
          record-accessor
          record-constructor

diff --git a/v8/src/runtime/global.scm b/v8/src/runtime/global.scm
index b064b0c77193a9bde80e0402c1098082b79bfc9d..7361dd126f61b31d6a75b53ff71806078a061077 100644 (file)
--- 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.18 1990/09/19 00:32:55 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/global.scm,v 14.19 1990/10/04 02:41:11 cph Exp $
 
 Copyright (c) 1988, 1989, 1990 Massachusetts Institute of Technology
 
@@ -249,7 +249,7 @@ MIT in each case. |#
                 (cons (car bucket) accumulator))))))))
 
 (define (error:illegal-datum object #!optional operator-name)
-  (if (default-object? operator-name)
+  (if (or (default-object? operator-name) (not operator-name))
       (error error-type:wrong-type-argument object)
       (error error-type:wrong-type-argument object
             (error-irritant/noise char:newline)
@@ -257,7 +257,7 @@ MIT in each case. |#
             operator-name)))
 
 (define (error:datum-out-of-range object #!optional operator-name)
-  (if (default-object? operator-name)
+  (if (or (default-object? operator-name) (not operator-name))
       (error error-type:bad-range-argument object)
       (error error-type:bad-range-argument object
             (error-irritant/noise char:newline)

diff --git a/v8/src/runtime/runtime.pkg b/v8/src/runtime/runtime.pkg
index 525708a7984f114ad6eee23353e074afca659fa9..676da291b93152d5916215e703a8d9b4c770b9a2 100644 (file)
--- a/v8/src/runtime/runtime.pkg
+++ b/v8/src/runtime/runtime.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/runtime.pkg,v 14.78 1990/09/13 23:30:01 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/runtime.pkg,v 14.79 1990/10/04 02:42:24 cph Exp $
 
 Copyright (c) 1988, 1989, 1990 Massachusetts Institute of Technology
 
@@ -1413,8 +1413,6 @@ MIT in each case. |#
   (files "record")
   (parent ())
   (export ()
-         guarantee-record
-         guarantee-record-type
          make-record-type
          record-accessor
          record-constructor