procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't increment array index in cl-loop twice (Bug#40727)

Browse source 
* lisp/emacs-lisp/cl-macs.el (cl--parse-loop-clause): Put the temp-idx
increment in cl--loop-body, leaving just the side-effect free testing
of the index for both cl--loop-body and cl--loop-conditions.
* test/lisp/emacs-lisp/cl-macs-tests.el (cl-macs-loop-and-arrays):
Extend test to cover this case.
This commit is contained in:
Noam Postavsky 2020-04-30 18:55:40 -04:00
parent de7158598f
commit ddc8020327
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lisp/emacs-lisp/cl-macs.el
View file

@ -1320,8 +1320,9 @@ For more details, see Info node `(cl)Loop Facility'.
(temp-idx (make-symbol "--cl-idx--")))
(push (list temp-vec (pop cl--loop-args)) loop-for-bindings)
(push (list temp-idx -1) loop-for-bindings)
(push `(setq ,temp-idx (1+ ,temp-idx)) cl--loop-body)
(cl--push-clause-loop-body
`(< (setq ,temp-idx (1+ ,temp-idx)) (length ,temp-vec)))
`(< ,temp-idx (length ,temp-vec)))
(if (eq word 'across-ref)
(push (list var `(aref ,temp-vec ,temp-idx))
cl--loop-symbol-macs)

3
test/lisp/emacs-lisp/cl-macs-tests.el
View file

@ -43,6 +43,9 @@
"Bug#40727"
(should (equal (cl-loop for y = (- (or x 0)) and x across [1 2]
collect (cons x y))
'((1 . 0) (2 . -1))))
(should (equal (cl-loop for x across [1 2] and y = (- (or x 0))
collect (cons x y))
'((1 . 0) (2 . -1)))))
(ert-deftest cl-macs-loop-destructure ()