|
[Sbcl-commits] CVS: sbcl/src/code target-package.lisp,1.52,1.53
From: Alastair Bridgewater <lisphacker@us...> - 2010-05-30 00:40
|
Update of /cvsroot/sbcl/sbcl/src/code
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv26634/src/code
Modified Files:
target-package.lisp
Log Message:
1.0.39.2: Fix symbol-name-conflict resolution test from 1.0.39.1.
* Before signalling a name-conflict in IMPORT due to a symbol found
previously on the arglist, remove the earlier symbol from the list of
symbols to add to the package (one or the other will be shadowing-imported,
and there's no further check for name collision.
Index: target-package.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/target-package.lisp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- target-package.lisp 6 Apr 2010 15:11:03 -0000 1.52
+++ target-package.lisp 30 May 2010 00:40:34 -0000 1.53
@@ -1116,6 +1116,7 @@
(let ((found (member sym syms :test #'string=)))
(if found
(when (not (eq (car found) sym))
+ (setf syms (remove (car found) syms))
(name-conflict package 'import sym sym (car found)))
(push sym syms))))
((not (eq s sym))
|
| Thread | Author | Date |
|---|---|---|
| [Sbcl-commits] CVS: sbcl/src/code target-package.lisp,1.52,1.53 | Alastair Bridgewater <lisphacker@us...> |