Changeset 5212


Ignore:
Timestamp:
12/20/03 02:18:13 (17 years ago)
Author:
piso
Message:

Work in progress.

File:
1 edited

Legend:

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

    r5210 r5212  
    22;;;
    33;;; Copyright (C) 2003 Peter Graves
    4 ;;; $Id: clos.lisp,v 1.48 2003-12-19 20:26:53 piso Exp $
     4;;; $Id: clos.lisp,v 1.49 2003-12-20 02:18:13 piso Exp $
    55;;;
    66;;; This program is free software; you can redistribute it and/or
     
    270270          (make-layout class length)))
    271271  (setf (class-default-initargs class)
    272         (compute-class-default-initargs class))
    273   (values))
     272        (compute-class-default-initargs class)))
    274273
    275274(defun compute-class-default-initargs (class)
     
    771770        (when (fboundp function-name)
    772771          (error 'program-error
    773                  "~A already names an ordinary function, macro, or special operator"
    774                  function-name))
     772                 :format-control "~A already names an ordinary function, macro, or special operator."
     773                 :format-args (list function-name)))
    775774        (let ((gf (apply (if (eq generic-function-class the-class-standard-gf)
    776775                             #'make-instance-standard-generic-function
     
    10191018    (unless (= (length (getf gf-plist :required-args))
    10201019               (length (getf method-plist :required-args)))
    1021       (error "the method has the wrong number of required arguments for the generic function"))
     1020      (error "The method has the wrong number of required arguments for the generic function."))
    10221021    (unless (= (length (getf gf-plist :optional-args))
    10231022               (length (getf method-plist :optional-args)))
    1024       (error "the method has the wrong number of optional arguments for the generic function"))
     1023      (error "The method has the wrong number of optional arguments for the generic function."))
    10251024    (unless (eq (or gf-restp gf-keysp) (or method-restp method-keysp))
    1026       (error "the method and the generic function differ in whether they accept &REST or &KEY arguments"))
     1025      (format t "gf-restp = ~S~% gf-keysp = ~S~% method-restp = ~S~% method-keysp = ~S~%"
     1026              gf-restp gf-keysp method-restp method-keysp)
     1027      (error "The method and the generic function differ in whether they accept &REST or &KEY arguments."))
    10271028    (when (consp gf-keywords)
    10281029      (unless (or (and method-restp (not method-keysp))
    10291030                  method-allow-other-keys-p
    10301031                  (every (lambda (k) (memq k method-keywords)) gf-keywords))
    1031         (error "the method does not accept all of the keyword arguments defined for the generic function"))))
     1032        (error "The method does not accept all of the keyword arguments defined for the generic function."))))
    10321033  (let ((new-method
    10331034         (apply
     
    12341235    (setq around (car arounds))
    12351236    (when (null primaries)
    1236       (error "no primary methods for the generic function ~S" gf))
     1237      (error "No primary methods for the generic function ~S." gf))
    12371238    (if around
    12381239        (let ((next-emfun
     
    13751376
    13761377(defgeneric slot-value-using-class (class instance slot-name))
     1378
    13771379(defmethod slot-value-using-class ((class standard-class) instance slot-name)
    13781380  (std-slot-value instance slot-name))
     
    15191521
    15201522(defgeneric finalize-inheritance (class))
     1523
    15211524(defmethod finalize-inheritance ((class standard-class))
    1522   (std-finalize-inheritance class)
    1523   (values))
     1525  (std-finalize-inheritance class))
    15241526
    15251527;;; Class precedence lists
Note: See TracChangeset for help on using the changeset viewer.