Changeset 5193


Ignore:
Timestamp:
12/19/03 16:50:00 (18 years ago)
Author:
piso
Message:

Work in progress.

File:
1 edited

Legend:

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

    r5152 r5193  
    22;;;
    33;;; Copyright (C) 2003 Peter Graves
    4 ;;; $Id: clos.lisp,v 1.38 2003-12-15 17:28:39 piso Exp $
     4;;; $Id: clos.lisp,v 1.39 2003-12-19 16:50:00 piso Exp $
    55;;;
    66;;; This program is free software; you can redistribute it and/or
     
    11881188                             (method-specializers method)))
    11891189                   (generic-function-methods gf)))
    1190    #'(lambda (m1 m2)
    1191       (funcall
    1192        (if (eq (class-of gf) the-class-standard-gf)
    1193            #'std-method-more-specific-p
    1194            #'method-more-specific-p)
    1195        gf m1 m2 required-classes))))
     1190   (if (eq (class-of gf) the-class-standard-gf)
     1191       #'(lambda (m1 m2)
     1192          (funcall #'std-method-more-specific-p gf m1 m2 required-classes))
     1193       #'(lambda (m1 m2)
     1194          (funcall #'method-more-specific-p gf m1 m2 required-classes)))))
    11961195
    11971196;;; method-more-specific-p
     
    12481247              ((memq (car qualifiers) '(:before :after)))
    12491248              (t
    1250                (invalid generic-function combin m)))))
     1249               (error "invalid method qualifiers")))))
    12511250    (unless (eq order :most-specific-last)
    12521251      (setq primaries (nreverse primaries)))
     
    15801579
    15811580(defgeneric compute-effective-method-function (gf methods))
    1582 (defmethod compute-effective-method-function
    1583   ((gf standard-generic-function) methods)
     1581(defmethod compute-effective-method-function ((gf standard-generic-function) methods)
    15841582  (std-compute-effective-method-function gf methods))
    15851583
Note: See TracChangeset for help on using the changeset viewer.