bug#16353: 24.3.50; cl-position fails in 23.4.1

bug#16353: 24.3.50; cl-position fails in 23.4.1

[João Távora]

Hi,

This is GNU Emacs 23.4.1 (x86_64-pc-linux-gnu, GTK+ Version 2.24.10)
 of 2012-09-08 on trouble, modified by Debian

Using that emacs and cl-lib-0.3.el this fails

/usr/bin/emacs --batch -Q -l cl-lib.el \
               --eval "(princ (cl-position 2 '(1 2 3)))"

where it should have printed "1". This works

/usr/bin/emacs --batch -Q -l cl-lib.el \
               --eval "(princ (cl-position-if #'(lambda (n) (eq n 2)) '(1 2 3)))"

All other cl-lib functions seem ok. This might be a debian bug.

João

bug#16353: 24.3.50; cl-position fails in 23.4.1

[Glenn Morris]

João Távora wrote:

> This is GNU Emacs 23.4.1 (x86_64-pc-linux-gnu, GTK+ Version 2.24.10)
>  of 2012-09-08 on trouble, modified by Debian
>
> Using that emacs and cl-lib-0.3.el this fails
>
> /usr/bin/emacs --batch -Q -l cl-lib.el \
>                --eval "(princ (cl-position 2 '(1 2 3)))"

Namespace clash. cl-seq.el used to contain an internal function called
"cl-position". It was renamed to cl--position in 24.3.

bug#16353: 24.3.50; cl-position fails in 23.4.1

[Glenn Morris]

PS you can expect the same issue with at least cl-adjoin.

bug#16353: 24.3.50; cl-position fails in 23.4.1

[Stefan Monnier]

>> This is GNU Emacs 23.4.1 (x86_64-pc-linux-gnu, GTK+ Version 2.24.10)
>> of 2012-09-08 on trouble, modified by Debian
>> Using that emacs and cl-lib-0.3.el this fails
>> /usr/bin/emacs --batch -Q -l cl-lib.el \
>> --eval "(princ (cl-position 2 '(1 2 3)))"
> Namespace clash. cl-seq.el used to contain an internal function called
> "cl-position". It was renamed to cl--position in 24.3.

Indeed, thanks.  We need to adjust elpa's cl-lib.el accordingly (not
sure how best to do that, tho).


        Stefan

bug#16353: 24.3.50; cl-position fails in 23.4.1

[João Távora]

Stefan Monnier <monnier@iro.umontreal.ca> writes:

>>> This is GNU Emacs 23.4.1 (x86_64-pc-linux-gnu, GTK+ Version 2.24.10)
>>> of 2012-09-08 on trouble, modified by Debian
>>> Using that emacs and cl-lib-0.3.el this fails
>>> /usr/bin/emacs --batch -Q -l cl-lib.el \
>>> --eval "(princ (cl-position 2 '(1 2 3)))"
>> Namespace clash. cl-seq.el used to contain an internal function called
>> "cl-position". It was renamed to cl--position in 24.3.
>
> Indeed, thanks.  We need to adjust elpa's cl-lib.el accordingly (not
> sure how best to do that, tho).

Can it be done so that it I can still use cl-position in emacs 23.4.1?
Maybe by including in cl-lib-0.4 some byte-recompilation of the
cl-seq.el functions that Glenn mentions:

   (defun remove* (cl-item cl-seq &rest cl-keys)
   (defun delete* (cl-item cl-seq &rest cl-keys)
   (defun cl-delete-duplicates (cl-seq cl-keys cl-copy)
   (defun substitute (cl-new cl-old cl-seq &rest cl-keys)
   (defun position (cl-item cl-seq &rest cl-keys)
   (defun search (cl-seq1 cl-seq2 &rest cl-keys)

This was only for cl-position.

bug#16353: 24.3.50; cl-position fails in 23.4.1

[Stefan Monnier]

>>>> This is GNU Emacs 23.4.1 (x86_64-pc-linux-gnu, GTK+ Version 2.24.10)
>>>> of 2012-09-08 on trouble, modified by Debian
>>>> Using that emacs and cl-lib-0.3.el this fails
>>>> /usr/bin/emacs --batch -Q -l cl-lib.el \
>>>> --eval "(princ (cl-position 2 '(1 2 3)))"
>>> Namespace clash. cl-seq.el used to contain an internal function called
>>> "cl-position". It was renamed to cl--position in 24.3.
>> Indeed, thanks.  We need to adjust elpa's cl-lib.el accordingly (not
>> sure how best to do that, tho).
> Can it be done so that it I can still use cl-position in emacs 23.4.1?

That would be best, yes.

> Maybe by including in cl-lib-0.4 some byte-recompilation of the
> cl-seq.el functions that Glenn mentions:

Could be.  It'd be good to first get a list of the all conflicting functions.


        Stefan

bug#16353: 24.3.50; cl-position fails in 23.4.1

[João Távora]

Stefan Monnier <monnier@iro.umontreal.ca> writes:

>>>>> This is GNU Emacs 23.4.1 (x86_64-pc-linux-gnu, GTK+ Version 2.24.10)
>>>>> of 2012-09-08 on trouble, modified by Debian
>>>>> Using that emacs and cl-lib-0.3.el this fails
>>>>> /usr/bin/emacs --batch -Q -l cl-lib.el \
>>>>> --eval "(princ (cl-position 2 '(1 2 3)))"
>>>> Namespace clash. cl-seq.el used to contain an internal function called
>>>> "cl-position". It was renamed to cl--position in 24.3.
>>> Indeed, thanks.  We need to adjust elpa's cl-lib.el accordingly (not
>>> sure how best to do that, tho).
>> Can it be done so that it I can still use cl-position in emacs 23.4.1?
>
> That would be best, yes.
>
>> Maybe by including in cl-lib-0.4 some byte-recompilation of the
>> cl-seq.el functions that Glenn mentions:
>
> Could be.

Can it be done without including the full definitions, e.g. via some
bytecode-changing trick? I'm asking because I could include this
workaround

> It'd be good to first get a list of the all conflicting functions.

Here's what I found

using cl-position:

   (defun remove* (cl-item cl-seq &rest cl-keys)
   (defun delete* (cl-item cl-seq &rest cl-keys)
   (defun cl-delete-duplicates (cl-seq cl-keys cl-copy)
   (defun cl-delete-duplicates (cl-seq cl-keys cl-copy)
   (defun cl-delete-duplicates (cl-seq cl-keys cl-copy)
   (defun substitute (cl-new cl-old cl-seq &rest cl-keys)
   (defun position (cl-item cl-seq &rest cl-keys)
   (defun search (cl-seq1 cl-seq2 &rest cl-keys)

these are all in cl-seq.el. using cl-adoing:
    
   (defun adjoin (cl-item cl-list &rest cl-keys)    in cl.el

using cl-delete-duplicates:

   (defun remove-duplicates (cl-seq &rest cl-keys) in cl-seq.el
   (defun delete-duplicates (cl-seq &rest cl-keys) in cl-seq.el

There are more internal functions prefixed with "cl-", but I don't think
they clash with aliases exported by cl-lib.

There's cl-macroexpand and cl-macroexpand-all, but I think these were
exported functions even back in 23.4.1.

João

bug#16353: 24.3.50; cl-position fails in 23.4.1

[Helmut Eller]

On Tue, Jan 07 2014, João Távora wrote:

> Can it be done without including the full definitions, e.g. via some
> bytecode-changing trick? I'm asking because I could include this
> workaround

Here's an idea for a solution: unintern the existing symbol, say
cl-postion, then intern "cl-position" again to create a second symbol.
defalias the second symbol.  Code loaded before the unintern dance, will
call the function of the uninterned symbols and code loaded afterwards
calls the function of the second symbol.  To make this work it's
important to load all code that must call uninterned symbols into
memory.  In practice that seems to be cl-seq.elc.

--- cl-lib-0.3.el.orig	2014-01-07 10:47:47.508299389 +0100
+++ cl-lib-0.3.el	2014-01-07 10:48:57.436296376 +0100
@@ -299,9 +299,20 @@
                dolist
                dotimes
                ))
-  (let ((new (if (consp fun) (prog1 (cdr fun) (setq fun (car fun)))
-               (intern (format "cl-%s" fun)))))
-    (unless (fboundp new) (defalias new fun))))
+  (let* ((old (cond ((consp fun) (car fun))
+		    (t fun)))
+	 (new (cond ((consp fun) (cdr fun))
+		    (t (intern (format "cl-%s" fun)))))
+	 (f (symbol-function old))
+	 (autoload (and (consp f) (eq (car f) 'autoload))))
+    (when autoload
+      (load (cadr f)))
+    (let ((new2 (cond ((fboundp new)
+		       (message "Conflict: %s" new)
+		       (unintern new)
+		       (intern (symbol-name new)))
+		      (t new))))
+      (defalias new2 old))))
 
 ;; `cl-labels' is not 100% compatible with `labels' when using dynamic scoping
 ;; (mostly because it does not turn lambdas that refer to those functions into

bug#16353: 24.3.50; cl-position fails in 23.4.1

[Stefan Monnier]

> Here's an idea for a solution: unintern the existing symbol, say
> cl-postion, then intern "cl-position" again to create a second symbol.

That was my initial idea as well, but there's the risk some code that
wants the cl-lib version of cl-position has already been `read' and
hence already refers to the incorrect symbol.

IOW, it's too hackish and fraught with problems.


        Stefan

bug#16353: 24.3.50; cl-position fails in 23.4.1

[Stefan Monnier]

> Using that emacs and cl-lib-0.3.el this fails
> /usr/bin/emacs --batch -Q -l cl-lib.el \
>                --eval "(princ (cl-position 2 '(1 2 3)))"
> where it should have printed "1". This works

I have pushed a cl-lib v0.4 (to appear hopefully to morrow) which should
resolve this problem, along with two other similar issues (with
cl-member and cl-delete-duplicates).  Thank you,


        Stefan

bug#16353: 24.3.50; cl-position fails in 23.4.1

[João Távora]

> I have pushed a cl-lib v0.4 (to appear hopefully to morrow) which should
> resolve this problem, along with two other similar issues (with
> cl-member and cl-delete-duplicates).  Thank you,

Thank you!