Changeset 4164


Ignore:
Timestamp:
10/01/03 21:46:59 (19 years ago)
Author:
piso
Message:

Work in progress.

Location:
trunk/j/src/org/armedbear/lisp
Files:
2 edited

Legend:

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

    r4153 r4164  
    22;;;
    33;;; Copyright (C) 2003 Peter Graves
    4 ;;; $Id: compiler.lisp,v 1.39 2003-10-01 01:14:15 piso Exp $
     4;;; $Id: compiler.lisp,v 1.40 2003-10-01 21:46:37 piso Exp $
    55;;;
    66;;; This program is free software; you can redistribute it and/or
     
    188188(defun %compile (name &optional definition)
    189189  (unless definition
    190     (setq definition (or (macro-function name) (fdefinition name))))
     190    (setq definition (or (and (symbolp name) (macro-function name))
     191                         (fdefinition name))))
    191192  (let (expr result)
    192193    (cond ((functionp definition)
     
    210211      (sys::%set-call-count result (sys::%call-count definition))
    211212      (sys::%set-arglist result (sys::arglist definition))
    212       (if (macro-function name)
     213      (if (and (symbolp name) (macro-function name))
    213214          (setf (fdefinition name) (sys::make-macro result))
    214215          (setf (fdefinition name) result)))
  • trunk/j/src/org/armedbear/lisp/setf.lisp

    r4162 r4164  
    22;;;
    33;;; Copyright (C) 2003 Peter Graves
    4 ;;; $Id: setf.lisp,v 1.31 2003-10-01 21:29:17 piso Exp $
     4;;; $Id: setf.lisp,v 1.32 2003-10-01 21:46:59 piso Exp $
    55;;;
    66;;; This program is free software; you can redistribute it and/or
     
    117117         (symbol-function name))
    118118        ((and (consp name) (eq (car name) 'setf))
    119          (or (get 'setf-function (cadr name)) (error 'undefined-function)))
     119         (or (get (cadr name) 'setf-function) (error 'undefined-function)))
    120120        (t (error 'type-error))))
    121121
Note: See TracChangeset for help on using the changeset viewer.