Changeset 293

Timestamp:

Jan 13, 2004, 5:13:45 PM (21 years ago)

Author:

Gary Byers

Message:

Signal a PROGRAM-ERROR or two. Better checking of SYMBOL-MACROs in
AUGMENT-ENVIRONMENT.

File:

• trunk/ccl/compiler/nx-basic.lisp (modified) (2 diffs)

trunk/ccl/compiler/nx-basic.lisp

@@ -294 +294 @@
             (when (non-nil-symbol-p spec)
               (if (assq spec symbol-macros)
-                (error "Special declaration cannot be applied to symbol-macro ~S" spec))
+                (signal-program-error "Special declaration cannot be applied to symbol-macro ~S" spec))
               (push (list* spec 'special t) vdecls)))))
       (dolist (decl decls)
@@ -364 +364 @@
   (check-environment-args variable symbol-macro function macro)
   (let* ((vars (mapcar #'cons-var variable))
-         (symbol-macros (mapcar #'(lambda (s) (let ((v (cons-var (car s)))) 
-                                                (setf (var-expansion v) (cons :symbol-macro (cadr s)))
-                                                v))
-                                symbol-macro))
+         (symbol-macros (mapcar #'(lambda (s)
+                                    (let* ((sym (car s)))
+                                      (unless (and (symbolp sym)
+                                                   (not (constantp sym env))
+                                                   (not (eq (variable-information sym env) :special)))
+                                        (signal-program-error "~S can't by bound as a SYMBOL-MACRO" sym))
+                                      (let ((v (cons-var (car s)))) 
+                                        (setf (var-expansion v) (cons :symbol-macro (cadr s)))
+                                        v)))
+                                symbol-macro))
          (macros (mapcar #'(lambda (m) (list* (car m) 'macro (cadr m))) macro))
          (functions (mapcar #'(lambda (f) (list* f 'function nil)) function))