Fixed slot option parsing to check for missing arguments.

diff --git a/v7/src/runtime/defstr.scm b/v7/src/runtime/defstr.scm
index c5d83c56024de66c8916d98cd52f5b8cb98d3b99..8e7e66051a72802e94573907dd8a23854c66c667 100644 (file)
--- a/v7/src/runtime/defstr.scm
+++ b/v7/src/runtime/defstr.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/defstr.scm,v 14.7 1989/04/18 16:29:25 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/defstr.scm,v 14.8 1989/05/12 10:03:17 mhwu Rel $
 
 Copyright (c) 1988, 1989 Massachusetts Institute of Technology
 
@@ -252,24 +252,26 @@ must be defined when the defstruct is evaluated.
         (lambda (name default options)
           (if (not (list? options))
               (error "Structure slot options must be a list" options))
-          (let ((type #T)
-                (read-only? false))
+          (let ((type #T) (read-only? false))
+            (define (with-option-type-and-argument options receiver)
+              (if (null? (cdr options))
+                  (error "DEFINE-STRUCTURE -- Argument to option not given"
+                         (car options))
+                  (receiver (car options) (cadr options))))
             (define (loop options)
               (if (not (null? options))
                   (begin
                     (case (car options)
                       ((TYPE)
                        (set! type
-                             (parse/option-value symbol?
-                                                 (car options)
-                                                 (cadr options)
-                                                 true)))
+                             (with-option-type-and-argument options
+                                (lambda (type arg)
+                                 (parse/option-value symbol? type arg true)))))
                       ((READ-ONLY)
                        (set! read-only?
-                             (parse/option-value boolean?
-                                                 (car options)
-                                                 (cadr options)
-                                                 true)))
+                             (with-option-type-and-argument options
+                                (lambda (type arg)
+                                 (parse/option-value boolean? type arg true)))))
                       (else
                        (error "Unrecognized structure slot option"
                               (car options))))