Changeset 5049


Ignore:
Timestamp:
12/10/03 13:48:41 (17 years ago)
Author:
piso
Message:

CANONICALIZE-DIRECT-SLOT: check for duplicate :ALLOCATION options.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/j/src/org/armedbear/lisp/clos.lisp

    r5044 r5049  
    22;;;
    33;;; Copyright (C) 2003 Peter Graves
    4 ;;; $Id: clos.lisp,v 1.25 2003-12-10 02:59:30 piso Exp $
     4;;; $Id: clos.lisp,v 1.26 2003-12-10 13:48:41 piso Exp $
    55;;;
    66;;; This program is free software; you can redistribute it and/or
     
    9595            (initargs ())
    9696            (type nil)
     97            (allocation nil)
    9798            (documentation nil)
    9899            (readers ())
     
    112113            (:initarg
    113114             (push-on-end (cadr olist) initargs))
     115            (:allocation
     116             (when allocation
     117               (error 'program-error
     118                      "duplicate slot option :ALLOCATION for slot named ~S"
     119                      name))
     120             (setf allocation (cadr olist))
     121             (push-on-end (car olist) other-options)
     122             (push-on-end (cadr olist) other-options))
    114123            (:type
    115124             (when type
     
    131140             (push-on-end (cadr olist) readers)
    132141             (push-on-end `(setf ,(cadr olist)) writers))
    133             (otherwise
     142            (t
    134143             (push-on-end `',(car olist) other-options)
    135144             (push-on-end `',(cadr olist) other-options))))
Note: See TracChangeset for help on using the changeset viewer.