Changeset 4320 for trunk/j/src/org/armedbear/lisp/defclass.lisp

Timestamp:

10/12/03 01:21:56 (19 years ago)

Author:

piso

Message:

ENSURE-GENERIC-FUNCTION: signal a program error if the function name is already fbound.

File:

• trunk/j/src/org/armedbear/lisp/defclass.lisp (modified) (2 diffs)

trunk/j/src/org/armedbear/lisp/defclass.lisp

@@ -2 +2 @@
 ;;;
 ;;; Copyright (C) 2003 Peter Graves
-;;; $Id: defclass.lisp,v 1.13 2003-10-11 20:41:28 piso Exp $
+;;; $Id: defclass.lisp,v 1.14 2003-10-12 01:21:56 piso Exp $
 ;;;
 ;;; This program is free software; you can redistribute it and/or
@@ -644 +644 @@
 ;;; ensure-generic-function
 
-(defun ensure-generic-function
-  (function-name
-   &rest all-keys
-   &key (generic-function-class the-class-standard-gf)
-   (method-class the-class-standard-method)
-   &allow-other-keys)
-;;   (format t "ensure-generic-function function-name = ~S~%" function-name)
-;;   (when (fboundp function-name)
-;;     (error "~A already names an ordinary function, macro, or special operator"
-;;            function-name))
+(defun ensure-generic-function (function-name
+                                &rest all-keys
+                                &key
+                                (generic-function-class the-class-standard-gf)
+                                (method-class the-class-standard-method)
+                                &allow-other-keys)
   (if (find-generic-function function-name nil)
       (find-generic-function function-name)
       (progn
         (when (fboundp function-name)
-          (error "~A already names an ordinary function, macro, or special operator"
+          (error 'program-error
+                 "~A already names an ordinary function, macro, or special operator"
                  function-name))
         (let ((gf (apply (if (eq generic-function-class the-class-standard-gf)