Steel Bank Common Lisp

Update of /cvsroot/sbcl/sbcl/tests
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv26634/tests

Modified Files:
	packages.impure.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: packages.impure.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/tests/packages.impure.lisp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- packages.impure.lisp	30 May 2010 00:32:12 -0000	1.11
+++ packages.impure.lisp	30 May 2010 00:40:34 -0000	1.12
@@ -248,7 +248,7 @@
 ;;; Make sure that resolving a name-conflict in IMPORT doesn't leave
 ;;; multiple symbols of the same name in the package (this particular
 ;;; scenario found in 1.0.38.9, but clearly a longstanding issue).
-(with-test (:name import-conflict-resolution :fails-on :sbcl)
+(with-test (:name import-conflict-resolution)
   (with-packages (("FOO" (:export "NIL"))
                   ("BAR" (:use)))
     (with-name-conflict-resolution ((sym "FOO" "NIL"))

Update of /cvsroot/sbcl/sbcl
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv26634

Modified Files:
	NEWS version.lisp-expr 
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: NEWS
===================================================================
RCS file: /cvsroot/sbcl/sbcl/NEWS,v
retrieving revision 1.1763
retrieving revision 1.1764
diff -u -d -r1.1763 -r1.1764
--- NEWS	29 May 2010 19:33:42 -0000	1.1763
+++ NEWS	30 May 2010 00:40:34 -0000	1.1764
@@ -1,4 +1,9 @@
 ;;;; -*- coding: utf-8; fill-column: 78 -*-
+changes relative to sbcl-1.0.39:
+  * bug fix: Name conflicts between symbols passed as arguments to a
+single call to IMPORT no longer add multiple symbols with the same name
+to the package (detectable via DO-SYMBOLS).
+
 changes in sbcl-1.0.39 relative to sbcl-1.0.38:
   * bug fix: Backtrace from undefined function on x86 and x86-64 now show
     the calling frame.

Index: version.lisp-expr
===================================================================
RCS file: /cvsroot/sbcl/sbcl/version.lisp-expr,v
retrieving revision 1.4882
retrieving revision 1.4883
diff -u -d -r1.4882 -r1.4883
--- version.lisp-expr	30 May 2010 00:32:11 -0000	1.4882
+++ version.lisp-expr	30 May 2010 00:40:34 -0000	1.4883
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"1.0.39.1"
+"1.0.39.2"

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))

Update of /cvsroot/sbcl/sbcl
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv25003

Modified Files:
	version.lisp-expr 
Log Message:
1.0.39.1: Test case for symbol-conflict resolution bug on import.

  * If two symbols of the same name are IMPORTed to a package that does
not yet have a symbol of that name accessible, and the latter of the two
symbols is chosen during conflict resolution, the former is also added
to the package, as is detectable via do-symbols.


Index: version.lisp-expr
===================================================================
RCS file: /cvsroot/sbcl/sbcl/version.lisp-expr,v
retrieving revision 1.4881
retrieving revision 1.4882
diff -u -d -r1.4881 -r1.4882
--- version.lisp-expr	29 May 2010 19:33:42 -0000	1.4881
+++ version.lisp-expr	30 May 2010 00:32:11 -0000	1.4882
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"1.0.39"
+"1.0.39.1"

Update of /cvsroot/sbcl/sbcl/tests
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv25003/tests

Modified Files:
	packages.impure.lisp 
Log Message:
1.0.39.1: Test case for symbol-conflict resolution bug on import.

  * If two symbols of the same name are IMPORTed to a package that does
not yet have a symbol of that name accessible, and the latter of the two
symbols is chosen during conflict resolution, the former is also added
to the package, as is detectable via do-symbols.


Index: packages.impure.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/tests/packages.impure.lisp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- packages.impure.lisp	6 Apr 2010 15:11:03 -0000	1.10
+++ packages.impure.lisp	30 May 2010 00:32:12 -0000	1.11
@@ -245,6 +245,17 @@
       (is (eql 1 (length conflict-sets)))
       (is (eql 3 (length (first conflict-sets)))))))
 
+;;; Make sure that resolving a name-conflict in IMPORT doesn't leave
+;;; multiple symbols of the same name in the package (this particular
+;;; scenario found in 1.0.38.9, but clearly a longstanding issue).
+(with-test (:name import-conflict-resolution :fails-on :sbcl)
+  (with-packages (("FOO" (:export "NIL"))
+                  ("BAR" (:use)))
+    (with-name-conflict-resolution ((sym "FOO" "NIL"))
+      (import (list 'CL:NIL (sym "FOO" "NIL")) "BAR"))
+    (do-symbols (sym "BAR")
+      (assert (eq sym (sym "FOO" "NIL"))))))
+
 ;;; UNINTERN
 (with-test (:name unintern.1)
   (with-packages (("FOO" (:export "SYM"))