/[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.23.8.1 by rtoy, Tue Jul 26 14:46:24 2005 UTC revision 1.26 by rtoy, Fri Mar 19 15:19:03 2010 UTC
# Line 28  Line 28 
28    "$Header$")    "$Header$")
29    
30  (in-package "PCL")  (in-package "PCL")
31    (intl:textdomain "cmucl")
32    
33  ;;;  ;;;
34  ;;; In the following:  ;;; In the following:
# Line 104  Line 105 
105            (cond ((null qualifiers)            (cond ((null qualifiers)
106                   (primary m))                   (primary m))
107                  ((cdr qualifiers)                  ((cdr qualifiers)
108                   (invalid-method m "has more than one qualifier"))                   (invalid-method m _"has more than one qualifier"))
109                  ((eq (car qualifiers) :around)                  ((eq (car qualifiers) :around)
110                   (around m))                   (around m))
111                  ((eq (car qualifiers) :before)                  ((eq (car qualifiers) :before)
# Line 112  Line 113 
113                  ((eq (car qualifiers) :after)                  ((eq (car qualifiers) :after)
114                   (after m))                   (after m))
115                  (t                  (t
116                   (invalid-method m "has an invalid qualifier")))))                   (invalid-method m _"has an invalid qualifier")))))
117        (cond ((invalid)        (cond ((invalid)
118               `(%invalid-qualifiers ',gf ',combin .args. ',(invalid)))               `(%invalid-qualifiers ',gf ',combin .args. ',(invalid)))
119              ((null (primary))              ((null (primary))
# Line 154  Line 155 
155          (lambda (&rest args)          (lambda (&rest args)
156            (declare (ignore args))            (declare (ignore args))
157            (error            (error
158             "~@<~s was called outside the dynamic scope ~             _"~@<~s was called outside the dynamic scope ~
159              of a method combination function (inside the body of ~              of a method combination function (inside the body of ~
160              ~s or a method on the generic function ~s).~@:>"              ~s or a method on the generic function ~s).~@:>"
161             'invalid-method-error 'define-method-combination             'invalid-method-error 'define-method-combination
# Line 164  Line 165 
165          (lambda (&rest args)          (lambda (&rest args)
166            (declare (ignore args))            (declare (ignore args))
167            (error            (error
168             "~@<~s was called outside the dynamic scope ~             _"~@<~s was called outside the dynamic scope ~
169              of a method combination function (inside the body of ~              of a method combination function (inside the body of ~
170              ~s or a method on the generic function ~s).~@:>"              ~s or a method on the generic function ~s).~@:>"
171             'method-combination-error 'define-method-combination             'method-combination-error 'define-method-combination
# Line 178  Line 179 
179    
180  (defmacro call-method (&rest args)  (defmacro call-method (&rest args)
181    (declare (ignore args))    (declare (ignore args))
182    `(error "~@<~S used outside of a effective method form.~@:>" 'call-method))    ;;
183      ;; Hack: The PROGN is here so that RESTART-CASE doesn't see the
184      ;; ERROR.  See MUNGE-RESTART-CASE-EXPRESSION in code:error.lisp.
185      `(progn (error _"~@<~S used outside of a effective method form.~@:>" 'call-method)))
186    
187  (defmacro call-method-list (&rest calls)  (defmacro call-method-list (&rest calls)
188    `(progn ,@calls))    `(progn ,@calls))
# Line 393  Line 397 
397           (when (null args)           (when (null args)
398             (when (and (invalid) (not allow-other-keys))             (when (and (invalid) (not allow-other-keys))
399               (simple-program-error               (simple-program-error
400                "~@<Invalid keyword argument~p ~{~s~^, ~}.  ~                _"~@<Invalid keyword argument~p ~{~s~^, ~}.  ~
401                 Valid keywords are: ~{~s~^, ~}.~@:>"                 Valid keywords are: ~{~s~^, ~}.~@:>"
402                (length (invalid))                (length (invalid))
403                (invalid)                (invalid)
# Line 414  Line 418 
418           (pop args)))))           (pop args)))))
419    
420  (defun odd-number-of-keyword-arguments ()  (defun odd-number-of-keyword-arguments ()
421    (simple-program-error "Odd number of keyword arguments."))    (simple-program-error _"Odd number of keyword arguments."))
422    
423  (defun invalid-keyword-argument (key)  (defun invalid-keyword-argument (key)
424    (simple-program-error "Invalid keyword argument ~s" key))    (simple-program-error _"Invalid keyword argument ~s" key))
425    
426  ;;;  ;;;
427  ;;; Return a lambda-form for an effective method of generic function  ;;; Return a lambda-form for an effective method of generic function

Legend:
Removed from v.1.23.8.1  
changed lines
  Added in v.1.26

  ViewVC Help
Powered by ViewVC 1.1.5