/[cmucl]/src/pcl/combin.lisp
ViewVC logotype

Diff of /src/pcl/combin.lisp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.19 by gerd, Mon Aug 25 20:10:41 2003 UTC revision 1.20 by gerd, Fri Sep 5 23:03:36 2003 UTC
# Line 83  Line 83 
83    (standard-compute-effective-method gf combin applicable-methods))    (standard-compute-effective-method gf combin applicable-methods))
84    
85  (defun standard-compute-effective-method (gf combin applicable-methods)  (defun standard-compute-effective-method (gf combin applicable-methods)
   (declare (ignore combin))  
86    (collect ((before) (primary) (after) (around) (invalid))    (collect ((before) (primary) (after) (around) (invalid))
87      (labels ((lose (method why)      (labels ((lose (method why)
88                 (invalid-method-error                 (invalid-method-error
# Line 94  Line 93 
93                   no qualifier at all.~@:>"                   no qualifier at all.~@:>"
94                  method why :around :before :after))                  method why :around :before :after))
95               (invalid-method (method why)               (invalid-method (method why)
96                   (declare (special *in-precompute-effective-methods-p*))
97                 (if *in-precompute-effective-methods-p*                 (if *in-precompute-effective-methods-p*
98                     (invalid method)                     (invalid method)
99                     (lose method why))))                     (lose method why))))
# Line 129  Line 129 
129               ;; checking as in CLHS 7.6.5 because we can't tell in               ;; checking as in CLHS 7.6.5 because we can't tell in
130               ;; method functions if they are used as emfs only.  If they               ;; method functions if they are used as emfs only.  If they
131               ;; are not used as emfs only, they should accept any keyword               ;; are not used as emfs only, they should accept any keyword
132               ;; argumests, per CLHS 7.6.4, for instance.               ;; arguments, per CLHS 7.6.4, for instance.
133               (let ((call-method `(call-method ,(first (primary))               (let ((call-method `(call-method ,(first (primary))
134                                                ,(rest (primary)))))                                                ,(rest (primary)))))
135                 (if (emfs-must-check-applicable-keywords-p gf)                 (if (emfs-must-check-applicable-keywords-p gf)

Legend:
Removed from v.1.19  
changed lines
  Added in v.1.20

  ViewVC Help
Powered by ViewVC 1.1.5