Ignore:
Timestamp:
12/19/03 19:26:04 (18 years ago)
Author:
piso
Message:

Work in progress.

File:
1 edited

Legend:

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

    r5206 r5207  
    22;;;
    33;;; Copyright (C) 2003 Peter Graves
    4 ;;; $Id: clos.lisp,v 1.45 2003-12-19 19:20:29 piso Exp $
     4;;; $Id: clos.lisp,v 1.46 2003-12-19 19:26:04 piso Exp $
    55;;;
    66;;; This program is free software; you can redistribute it and/or
     
    420420        nil)))
    421421
    422 (defmacro slot-contents (slots location)
    423   `(aref ,slots ,location))
    424 
    425 (defun (setf slot-contents) (new-value slots location)
    426   (setf (svref slots location) new-value))
    427 
    428422(defun std-slot-value (instance slot-name)
    429423  (let* ((location (slot-location (class-of instance) slot-name))
     
    446440  (let ((location (slot-location (class-of instance) slot-name)))
    447441    (cond ((fixnump location)
    448 ;;            (setf (slot-contents (std-instance-slots instance) location) new-value))
    449442           (setf (instance-ref instance location) new-value))
    450443          ((consp location)
     
    463456  (let ((location (slot-location (class-of instance) slot-name)))
    464457    (cond ((fixnump location)
    465 ;;            (neq +slot-unbound+ (slot-contents (std-instance-slots instance) location)))
    466458           (neq +slot-unbound+ (instance-ref instance location)))
    467459          ((consp location)
     
    478470  (let ((location (slot-location (class-of instance) slot-name)))
    479471    (cond ((fixnump location)
    480            (setf (slot-contents (std-instance-slots instance) location) +slot-unbound+))
     472           (setf (instance-ref instance location) +slot-unbound+))
    481473          ((consp location)
    482474           (setf (cdr location) +slot-unbound+))
     
    661653
    662654(defun classes-to-emf-table (gf)
    663 ;;   (slot-value gf 'classes-to-emf-table))
    664   (slot-contents (std-instance-slots gf) *sgf-classes-to-emf-table-index*))
     655  (instance-ref gf *sgf-classes-to-emf-table-index*))
    665656
    666657(defun (setf classes-to-emf-table) (new-value gf)
     
    709700
    710701(defun method-function (method)
    711 ;;   (slot-value method 'function))
    712   (slot-contents (std-instance-slots method) *sm-function-index*))
     702  (instance-ref method *sm-function-index*))
     703
    713704(defun (setf method-function) (new-value method)
    714705  (setf (slot-value method 'function) new-value))
     
    804795
    805796(defun gf-required-args (gf)
    806   (slot-contents (std-instance-slots gf) *sgf-required-args-index*))
     797  (instance-ref gf *sgf-required-args-index*))
    807798
    808799(defun make-instance-standard-generic-function (generic-function-class
Note: See TracChangeset for help on using the changeset viewer.