forked from mirrors/org-mode
1a5e3f931c
Mainly, add the corresponding cookie, but also add various `require`s so that the compiler knows which vars should be trated as dynbound. This does not fix all the warnings, but does try to eliminate all those about "unused" variables. For the variables truly unused, the patch usually adds an underscore to their name to silence the warning. Some of the fixes affect files which already used `lexical-binding`. Not sure why the test worked before: maybe because the tests were run without compiling them first (which could cause some of the missing `require`d packages to be autoloaded before we got to the problematic code, thus hiding the problem)? I found some suspicious code, for which I added FIXMEs. There are also a few changes to the main files. * lisp/org-protocol.el (org-protocol-check-filename-for-protocol): Don't call `server-edit` if it's not yet defined. [ Needed to get the tests to pass. ] * lisp/ob-core.el (org-babel-temporary-directory) (org-babel-temporary-stable-directory): Always define (and use nil if we don't want to create a directory for it). Simplify the code based on the fact that (defvar V E) only evaluates E if V is not yet `boundp`. (org-babel-temp-file, org-babel-temp-stable-file) (org-babel-remove-temporary-directory) (org-babel-remove-temporary-stable-directory): Adjust accordingly. * lisp/org.el (org-log-beginning): Add FIXME. * testing/org-test.el: Require `org` and `org-id`. (org-id-locations-file): Don't `defconst` it. (org-test-at-id, org-test-in-example-file, org-test-at-marker) (org-test-with-temp-text, org-test-with-temp-text-in-file): Move edebug specs into `declare` (and simplify them). (org-test-with-tramp-remote-dir--worker): Declare dynbound tramp vars. (org--compile-when): Fix quoting of `exp`. (org-test-load): Tweak regexps. * testing/org-batch-test-init.el: Tweak regexp, remove dead code and add a FIXME about it. * testing/lisp/test-ox.el: Require `ox` instead of erroring out if it's not already loaded. Also require `org-inlinetask`. (org-test-with-parsed-data): Silence warnings when `info` is not used. (test-org-export/bind-keyword): Add FIXME. * testing/lisp/test-ox-publish.el: Require `org-test` and `ox-publish`. (test-org-publish/resolve-external-link): Expose lambdas to the compiler. Remove unused var `ids`. (test-org-publish/get-project-from-filename): Remove unused var `file`. * testing/lisp/test-org.el: Require `org-macs`, `org`, `org-inlinetask`, `org-refile`, and `org-agenda`. (test-org/org-read-date): Declare `org-time-was-given` as dynbound. (test-org/set-regexps-and-options): Add FIXME. * testing/lisp/test-org-timer.el: Require `org-timer`. * testing/lisp/test-org-table.el: Require `ox`. * testing/lisp/test-org-protocol.el: Require `org-protocol` instead of erroring out if it's not already loaded. Also require `capture`, and add missing `provide` statement. * testing/lisp/test-org-pcomplete.el: Require `org`. * testing/lisp/test-org-list.el: Require `org-list` and `org`. * testing/lisp/test-org-lint.el: Require `org-footnote` and `org-lint`. * testing/lisp/test-org-footnote.el: Require `org-footnote`. * testing/lisp/test-org-element.el: Require `org-element` instead of erroring out if it's not already loaded. Also require `org` and `org-inlinetask`. * testing/lisp/test-org-duration.el: Require `org-duration`. * testing/lisp/test-org-datetree.el: Require `org-datetree`. * testing/lisp/test-org-colview.el: Require `org-colview`, `org-duration`, and `org-inlinetask`. * testing/lisp/test-org-clock.el: Require `org-duration` and `org-clock`. * testing/lisp/test-org-archive.el: Require `org-archive`. * testing/lisp/test-org-agenda.el (test-org-agenda/bulk-custom-arg-func): Add FIXME. * testing/lisp/test-ol.el: Require `ol` and `org-id`. (test-org-link/store-link): Declare `org-store-link-props` and add FIXME. * testing/lisp/test-oc.el (test-org-cite/export-capability): Add FIXME. * testing/lisp/test-ob.el: Require `ob-core`, `org-src`, `ob-ref`, and `org-table`. (test-ob/eval-header-argument): Rename `foo` to `test-ob--foo` and declare it as dynbound. (test-ob/blocks-with-spaces, test-ob/specific-colnames): Add FIXME. (test-ob/noweb-expansions-in-cache): Declare `noweb-expansions-in-cache-var` as dynbound. * testing/lisp/test-ob-tangle.el: Require `org` and `ob-tangle`. * testing/lisp/test-ob-shell.el: * testing/lisp/test-ob-python.el: Require `ob-core`. * testing/lisp/test-ob-lob.el: Require `ob-lob`. (temporary-value-for-test): Declare as dynbound. * testing/lisp/test-ob-plantuml.el: Require `ob-plantuml` instead of erroring out if it's not already loaded. * testing/lisp/test-ob-lilypond.el: Require `ob-lilypond` instead of erroring out if it's not already loaded. Use `with-current-buffer`. * testing/lisp/test-ob-julia.el: Require `ob-core`. * testing/lisp/test-ob-java.el (org-babel-temporary-directory): Remove dead code now that `org-babel-temporary-directory` is always bound. * testing/lisp/test-ob-exp.el: Require `ob-exp`, `org-src`, and `org-test`. (ob-exp/evaluate-all-executables-in-order): Declare `*evaluation-collector*` as dynbound. * testing/lisp/test-ob-emacs-lisp.el (ob-emacs-lisp/dynamic-lexical-edit) (ob-emacs-lisp/dynamic-lexical-execute): Rename dynbound var to `ob-emacs--x` and declare it as such. * testing/lisp/test-ob-R.el: Require `ob-core`. (ess-ask-for-ess-directory, ess-history-file): Declare vars.
174 lines
5.3 KiB
EmacsLisp
174 lines
5.3 KiB
EmacsLisp
;;; test-ob-emacs-lisp.el -*- lexical-binding: t; -*-
|
|
|
|
;; Copyright (c) 2012-2022 Free Software Foundation, Inc.
|
|
;; Authors: Eric Schulte, Martyn Jago
|
|
|
|
;; This file is not part of GNU Emacs.
|
|
|
|
;; This program is free software; you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; This program is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
;;; Comments:
|
|
|
|
;; Org tests for ob-emacs-lisp.el live here
|
|
|
|
;;; Code:
|
|
(ert-deftest ob-emacs-lisp/commented-last-block-line-no-var ()
|
|
(org-test-with-temp-text-in-file "
|
|
#+begin_src emacs-lisp
|
|
;;
|
|
#+end_src"
|
|
(org-babel-next-src-block)
|
|
(org-babel-execute-maybe)
|
|
(should (re-search-forward "results:" nil t))
|
|
(forward-line)
|
|
(should
|
|
(string=
|
|
""
|
|
(buffer-substring-no-properties (point-at-bol) (point-at-eol)))))
|
|
(org-test-with-temp-text-in-file "
|
|
#+begin_src emacs-lisp
|
|
\"some text\";;
|
|
#+end_src"
|
|
|
|
(org-babel-next-src-block)
|
|
(org-babel-execute-maybe)
|
|
(should (re-search-forward "results:" nil t))
|
|
(forward-line)
|
|
(should
|
|
(string=
|
|
": some text"
|
|
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))))
|
|
|
|
(ert-deftest ob-emacs-lisp/commented-last-block-line-with-var ()
|
|
(org-test-with-temp-text-in-file "
|
|
#+begin_src emacs-lisp :var a=1
|
|
;;
|
|
#+end_src"
|
|
(org-babel-next-src-block)
|
|
(org-babel-execute-maybe)
|
|
(re-search-forward "results" nil t)
|
|
(forward-line)
|
|
(should (string=
|
|
""
|
|
(buffer-substring-no-properties (point-at-bol) (point-at-eol))))))
|
|
|
|
(ert-deftest ob-emacs-lisp/commented-last-block-line ()
|
|
(should
|
|
(string= ": 2"
|
|
(org-test-with-temp-text-in-file "
|
|
#+begin_src emacs-lisp :var a=2
|
|
2;;
|
|
#+end_src"
|
|
(org-babel-next-src-block)
|
|
(org-babel-execute-maybe)
|
|
(re-search-forward "results" nil t)
|
|
(buffer-substring-no-properties (line-beginning-position 2)
|
|
(line-end-position 2))))))
|
|
|
|
(ert-deftest ob-emacs-lisp/dynamic-lexical-execute ()
|
|
(cl-flet ((execute (text)
|
|
(org-test-with-temp-text-in-file text
|
|
(org-babel-next-src-block)
|
|
(org-babel-execute-maybe)
|
|
(re-search-forward "results" nil t)
|
|
(re-search-forward ": " nil t)
|
|
(buffer-substring-no-properties (point) (point-at-eol)))))
|
|
|
|
(should (string= "dynamic" (execute "
|
|
#+begin_src emacs-lisp :lexical no :results verbatim
|
|
\(let ((x 'dynamic)) (funcall (let ((x 'lexical)) (lambda () x))))
|
|
#+end_src")))
|
|
|
|
(should (string= "lexical" (execute "
|
|
#+begin_src emacs-lisp :lexical yes :results verbatim
|
|
\(let ((x 'dynamic)) (funcall (let ((x 'lexical)) (lambda () x))))
|
|
#+end_src")))
|
|
|
|
(defvar ob-emacs--x)
|
|
|
|
(should (string= "dynamic" (let ((ob-emacs--x 'dynamic)) (execute "
|
|
#+begin_src emacs-lisp :lexical no :results verbatim
|
|
ob-emacs--x
|
|
#+end_src"))))
|
|
|
|
(should (string= "lexical" (let ((ob-emacs--x 'dynamic)) (execute "
|
|
#+begin_src emacs-lisp :lexical '((ob-emacs--x . lexical)) :results verbatim
|
|
ob-emacs--x
|
|
#+end_src"))))
|
|
|
|
;; Src block execution uses `eval'. As of 2019-02-26, `eval' does
|
|
;; not dynamically bind `lexical-binding' to the value of its
|
|
;; LEXICAL parameter. Hence, (eval 'lexical-binding LEXICAL)
|
|
;; evaluates to the same value that just `lexical-binding'
|
|
;; evaluates to, even if LEXICAL is different. So tests like the
|
|
;; following do not work here:
|
|
;;
|
|
;; (should (string= "t" (execute "
|
|
;; #+begin_src emacs-lisp :lexical yes :results verbatim
|
|
;; lexical-binding
|
|
;; #+end_src")))
|
|
;;
|
|
;; However, the corresponding test in
|
|
;; `ob-emacs-lisp/dynamic-lexical-edit' does work.
|
|
))
|
|
|
|
(ert-deftest ob-emacs-lisp/dynamic-lexical-edit ()
|
|
(cl-flet ((execute (text)
|
|
(org-test-with-temp-text-in-file text
|
|
(org-babel-next-src-block)
|
|
(org-edit-src-code)
|
|
(goto-char (point-max))
|
|
(prog1 (eval-last-sexp 0)
|
|
(org-edit-src-exit)))))
|
|
|
|
(should (eq 'dynamic (execute "
|
|
#+begin_src emacs-lisp :lexical no :results verbatim
|
|
\(let ((x 'dynamic)) (funcall (let ((x 'lexical)) (lambda () x))))
|
|
#+end_src")))
|
|
|
|
(should (eq 'lexical (execute "
|
|
#+begin_src emacs-lisp :lexical yes :results verbatim
|
|
\(let ((x 'dynamic)) (funcall (let ((x 'lexical)) (lambda () x))))
|
|
#+end_src")))
|
|
|
|
(defvar ob-emacs--x)
|
|
(should (eq 'dynamic (let ((ob-emacs--x 'dynamic)) (execute "
|
|
#+begin_src emacs-lisp :lexical no :results verbatim
|
|
ob-emacs--x
|
|
#+end_src"))))
|
|
|
|
(should (eq 'lexical (let ((ob-emacs--x 'dynamic)) (execute "
|
|
#+begin_src emacs-lisp :lexical '((ob-emacs--x . lexical)) :results verbatim
|
|
ob-emacs--x
|
|
#+end_src"))))
|
|
|
|
(should (equal nil (execute "
|
|
#+begin_src emacs-lisp :lexical no :results verbatim
|
|
lexical-binding
|
|
#+end_src")))
|
|
|
|
(should (equal t (execute "
|
|
#+begin_src emacs-lisp :lexical yes :results verbatim
|
|
lexical-binding
|
|
#+end_src")))
|
|
|
|
(should (equal '((x . 0)) (execute "
|
|
#+begin_src emacs-lisp :lexical '((x . 0)) :results verbatim
|
|
lexical-binding
|
|
#+end_src")))))
|
|
|
|
(provide 'test-ob-emacs-lisp)
|
|
|
|
;;; test-ob-emacs-lisp.el ends here
|