From d527bc4b7d2f69d8b3ae76be78fb9610419bd800 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 24 Feb 2021 18:12:18 -0500 Subject: * test/lisp/emacs-lisp/macroexp-tests.el (macroexp--tests-file-name): New test * test/lisp/emacs-lisp/macroexp-resources/m1.el: * test/lisp/emacs-lisp/macroexp-resources/m2.el: New files. --- test/lisp/emacs-lisp/macroexp-resources/m1.el | 33 +++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 test/lisp/emacs-lisp/macroexp-resources/m1.el (limited to 'test/lisp/emacs-lisp/macroexp-resources/m1.el') diff --git a/test/lisp/emacs-lisp/macroexp-resources/m1.el b/test/lisp/emacs-lisp/macroexp-resources/m1.el new file mode 100644 index 00000000000..a2fe6ecf2ed --- /dev/null +++ b/test/lisp/emacs-lisp/macroexp-resources/m1.el @@ -0,0 +1,33 @@ +;;; m1.el --- Some sample code for macroexp-tests -*- lexical-binding: t; -*- + +;; Copyright (C) 2021 Free Software Foundation, Inc. + +;; Author: Stefan Monnier +;; Keywords: + +;; 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 . + +;;; Commentary: + +;; + +;;; Code: + +(defconst macroexp--m1-tests-filename (macroexp-file-name)) + +(eval-when-compile + (defconst macroexp--m1-tests-comp-filename (macroexp-file-name))) + +(provide 'm1) +;;; m1.el ends here -- cgit v1.2.3 From 8114a84b21b2463ea35db7f3a18fd3804396f47e Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 24 Feb 2021 18:39:06 -0500 Subject: * test/lisp/emacs-lisp/macroexp-tests.el (macroexp--tests-file-name): Add case Add use of `macroexp-file-name` from a macro called from within a function, which works thanks to eager-macroexpansion (so the macro is expanded which the file is being loaded rather than only later when the function is called). * test/lisp/emacs-lisp/macroexp-resources/m1.el (macroexp--m1-tests-file-name): New function. --- test/lisp/emacs-lisp/macroexp-resources/m1.el | 3 +++ test/lisp/emacs-lisp/macroexp-tests.el | 5 +++++ 2 files changed, 8 insertions(+) (limited to 'test/lisp/emacs-lisp/macroexp-resources/m1.el') diff --git a/test/lisp/emacs-lisp/macroexp-resources/m1.el b/test/lisp/emacs-lisp/macroexp-resources/m1.el index a2fe6ecf2ed..96b5f7091af 100644 --- a/test/lisp/emacs-lisp/macroexp-resources/m1.el +++ b/test/lisp/emacs-lisp/macroexp-resources/m1.el @@ -29,5 +29,8 @@ (eval-when-compile (defconst macroexp--m1-tests-comp-filename (macroexp-file-name))) +(defun macroexp--m1-tests-file-name () + (macroexp--test-get-file-name)) + (provide 'm1) ;;; m1.el ends here diff --git a/test/lisp/emacs-lisp/macroexp-tests.el b/test/lisp/emacs-lisp/macroexp-tests.el index 0b26f109b9e..89d3882d1da 100644 --- a/test/lisp/emacs-lisp/macroexp-tests.el +++ b/test/lisp/emacs-lisp/macroexp-tests.el @@ -34,6 +34,8 @@ (defconst macroexp--tests-filename (macroexp-file-name)) +(defmacro macroexp--test-get-file-name () (macroexp-file-name)) + (ert-deftest macroexp--tests-file-name () (should (string-match "\\`macroexp-tests.elc?\\'" @@ -44,10 +46,13 @@ (with-current-buffer (find-file-noselect (expand-file-name "m1.el" rsrc-dir)) (defvar macroexp--m1-tests-filename) + (declare-function macroexp--m1-tests-file-name "m1" ()) ;; `macroexp-file-name' should work with `eval-buffer'. (eval-buffer) (should (equal "m1.el" (file-name-nondirectory macroexp--m1-tests-filename))) + (should (equal "m1.el" + (file-name-nondirectory (macroexp--m1-tests-file-name)))) (search-forward "macroexp--m1-tests-filename") (makunbound 'macroexp--m1-tests-filename) ;; `macroexp-file-name' should also work with `eval-defun'. -- cgit v1.2.3