Changeset 14003

Timestamp:

07/13/12 14:07:27 (11 years ago)

Author:

rschlatte

Message:

Eliminate once-only-used function

File:

• trunk/abcl/src/org/armedbear/lisp/clos.lisp (modified) (2 diffs)

trunk/abcl/src/org/armedbear/lisp/clos.lisp

@@ -870 +870 @@
   (maybe-finalize-class-subtree class)
   (values))
-
-(defun canonical-slot-name (canonical-slot)
-  (getf canonical-slot :name))
 
 (defvar *extensible-built-in-classes*
@@ -2880 +2877 @@
 
 (defun check-duplicate-slots (slots)
-  (dolist (s1 slots)
-    (let ((name1 (canonical-slot-name s1)))
-      (dolist (s2 (cdr (memq s1 slots)))
-        (when (eq name1 (canonical-slot-name s2))
-          (error 'program-error "Duplicate slot ~S" name1))))))
+  (flet ((canonical-slot-name (canonical-slot)
+           (getf canonical-slot :name)))
+    (dolist (s1 slots)
+      (let ((name1 (canonical-slot-name s1)))
+        (dolist (s2 (cdr (memq s1 slots)))
+          (when (eq name1 (canonical-slot-name s2))
+            (error 'program-error "Duplicate slot ~S" name1)))))))
 
 (defun check-duplicate-default-initargs (initargs)