[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/dash dab0d1c 384/439: Merge pull request #107 from fber
From: |
Phillip Lord |
Subject: |
[elpa] externals/dash dab0d1c 384/439: Merge pull request #107 from fbergroth/workaround-byte-compiler |
Date: |
Tue, 04 Aug 2015 20:30:57 +0000 |
branch: externals/dash
commit dab0d1c6c5a1e56c3c938fcca13398774f547bd8
Merge: faeb61a c40fa44
Author: Magnar Sveen <address@hidden>
Commit: Magnar Sveen <address@hidden>
Merge pull request #107 from fbergroth/workaround-byte-compiler
Work around byte compiler
---
dash.el | 11 ++++++-----
dev/test-byte-compile.el | 8 ++++++++
run-tests.sh | 9 ++++++++-
3 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/dash.el b/dash.el
index 74dbcab..fd2b779 100644
--- a/dash.el
+++ b/dash.el
@@ -969,7 +969,7 @@ See also: `-table-flat'"
(while (car last-list)
(let ((item (apply fn (-map 'car lists))))
(push item (car re))
- (pop (car lists))
+ (setcar lists (cdar lists)) ;; silence byte compiler
(dash--table-carry lists restore-lists re)))
(nreverse (car (last re)))))
@@ -1500,11 +1500,12 @@ Note: binding is done according to `-let*'."
(declare (debug ((&rest (sexp form)) form body))
(indent 2))
(->> vars-vals
- (-mapcat (-lambda ((pat src)) (dash--match pat src)))
- (-reduce-r-from
- (-lambda ((var val) memo)
+ (--mapcat (dash--match (car it) (cadr it)))
+ (--reduce-r-from
+ (let ((var (car it))
+ (val (cadr it)))
`(let ((,var ,val))
- (if ,var ,memo ,@else)))
+ (if ,var ,acc ,@else)))
then)))
(defmacro -if-let (var-val then &rest else)
diff --git a/dev/test-byte-compile.el b/dev/test-byte-compile.el
new file mode 100644
index 0000000..8d9905e
--- /dev/null
+++ b/dev/test-byte-compile.el
@@ -0,0 +1,8 @@
+(require 'ert)
+
+(ert-deftest dash-byte-compile ()
+ (let* ((cmd "emacs --quick --batch -f batch-byte-compile dash.el")
+ (res (shell-command-to-string cmd))
+ (elc (expand-file-name "dash.elc"))
+ (exp (format "Wrote %s\n" elc)))
+ (should (string= res exp))))
diff --git a/run-tests.sh b/run-tests.sh
index a72e077..ce9a011 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -4,4 +4,11 @@ if [ -z "$EMACS" ] ; then
EMACS="emacs"
fi
-$EMACS -batch -l dev/ert.el -l dash.el -l dash-functional.el -l
dev/examples-to-tests.el -l dev/examples.el -f ert-run-tests-batch-and-exit
+$EMACS -batch \
+ -l dev/ert.el \
+ -l dash.el \
+ -l dash-functional.el \
+ -l dev/examples-to-tests.el \
+ -l dev/examples.el \
+ $([[ $EMACS != "emacs23" ]] && echo -l dev/test-byte-compile.el) \
+ -f ert-run-tests-batch-and-exit
- [elpa] externals/dash d0c6fc0 371/439: Merge pull request #104 from fbergroth/linkify-docs, (continued)
- [elpa] externals/dash d0c6fc0 371/439: Merge pull request #104 from fbergroth/linkify-docs, Phillip Lord, 2015/08/04
- [elpa] externals/dash faeb61a 379/439: Merge pull request #105 from fbergroth/debug-forms, Phillip Lord, 2015/08/04
- [elpa] externals/dash c40fa44 383/439: Exclude byte compilation test on emacs23, Phillip Lord, 2015/08/04
- [elpa] externals/dash a06e66e 382/439: Add test for clean byte compilation, Phillip Lord, 2015/08/04
- [elpa] externals/dash 5f879b3 387/439: Merge pull request #110 from bbatsov/comment-fix, Phillip Lord, 2015/08/04
- [elpa] externals/dash b7c2f9a 381/439: Work around byte compiler in -if-let*, Phillip Lord, 2015/08/04
- [elpa] externals/dash 9642c4a 385/439: [Fix #108] Sync indentation of threading forms with Clojure, Phillip Lord, 2015/08/04
- [elpa] externals/dash 1ccd2b4 389/439: Improve byte compilation test, Phillip Lord, 2015/08/04
- [elpa] externals/dash afe2781 388/439: Merge pull request #109 from bbatsov/threading-indentation, Phillip Lord, 2015/08/04
- [elpa] externals/dash 2eefbec 386/439: Don't use an inline comment on a line of its own, Phillip Lord, 2015/08/04
- [elpa] externals/dash dab0d1c 384/439: Merge pull request #107 from fbergroth/workaround-byte-compiler,
Phillip Lord <=
- [elpa] externals/dash 7d62b1a 393/439: Make test suite independent of dash, Phillip Lord, 2015/08/04
- [elpa] externals/dash 26c1bbe 390/439: Merge pull request #113 from fbergroth/fix-byte-compile-test, Phillip Lord, 2015/08/04
- [elpa] externals/dash c34e4ab 394/439: Update invalid tests, Phillip Lord, 2015/08/04
- [elpa] externals/dash 07f0358 392/439: Add test case operator !!> for expected errors, Phillip Lord, 2015/08/04
- [elpa] externals/dash 92ed7ff 391/439: Use vendored ert only on emacs23, Phillip Lord, 2015/08/04
- [elpa] externals/dash 7aec562 430/439: Merge pull request #140 from mijoharas/master, Phillip Lord, 2015/08/04
- [elpa] externals/dash 63d2db9 431/439: make ->>'s second arg optional, Phillip Lord, 2015/08/04
- [elpa] externals/dash 45bd985 427/439: Reimplementation of --group-by., Phillip Lord, 2015/08/04
- [elpa] externals/dash aa13c07 429/439: fixed typo in docs (first where it should be last, Phillip Lord, 2015/08/04
- [elpa] externals/dash 70caa37 432/439: Merge pull request #144 from cammsaul/thread_last_make_second_arg_optional, Phillip Lord, 2015/08/04