mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-15 10:30:25 -08:00
Improve autoconf-mode macro detection
* doc/lispref/modes.texi (Search-based Fontification): Fix
indentation of (MATCHER . FACESPEC) example.
* doc/misc/cc-mode.texi (Performance Issues): Index
defun-prompt-regexp under variables, not functions.
* lisp/progmodes/autoconf.el (autoconf--symbol, autoconf--macro):
New rx definitions.
(autoconf-definition-regexp): Use an optional second capture group
to indicate a function rather than variable definition. Detect
AC_DEFINE defining a function-like CPP macro. Skip more shell
syntax such as variable ${} expansion and command `` substitution in
AC_DEFINE_UNQUOTED variable. Match AH_VERBATIM, AM_CONDITIONAL, and
AM_MISSING_PROG as defining variables, and AC_DEFUN, AC_DEFUN_ONCE,
AU_ALIAS, and AU_DEFUN as defining functions. Document first
capture group in docstring.
(autoconf-font-lock-keywords): Use autoconf--macro to match more
Autoconf macros, such as those defined in the Autoconf Archive and
Gnulib. Reserve font-lock-function-name-face for function
definitions as determined by autoconf-definition-regexp, and use
font-lock-variable-name-face for the rest instead. Use Font Lock
face symbols directly in place of their corresponding variable.
Fontify M4 changequote primitive only as a standalone symbol.
(autoconf-imenu-generic-expression): Add commentary mentioning new
submenu possibility.
(autoconf-current-defun-function): Update docstring accuracy.
Replace line-end-position with pos-eol since there are no fields.
(autoconf-mode): Define defun-prompt-regexp in terms of
autoconf--macro to support more toplevel macros, such as those
defined in Autoheader, M4sh, etc. Set
open-paren-in-column-0-is-defun-start to nil to avoid false
positives when an Autoconf quote character is in column zero.
* test/lisp/progmodes/autoconf-resources/configure.ac: New file.
* test/lisp/progmodes/autoconf-tests.el
(autoconf-tests-current-defun-function-define)
(autoconf-tests-current-defun-function-subst): Replace character
motion with search.
(autoconf-tests-autoconf-mode-comment-syntax): Ditto. Test both dnl
and # comments. Use syntax-ppss-context.
(autoconf-tests-font-lock): New test.
This commit is contained in:
Basil L. Contovounesios
Paul Eggert
parent
9cedb434ee
commit
2e3cf73e05
5 changed files with 249 additions and 24 deletions
172
test/lisp/progmodes/autoconf-resources/configure.ac
Normal file
172
test/lisp/progmodes/autoconf-resources/configure.ac
Normal file
|
|
@ -0,0 +1,172 @@
|
|||
# Indentation.
|
||||
|
||||
AC_PROG_CC
|
||||
dnl <- font-lock-keyword-face
|
||||
AC_PROG_CC
|
||||
dnl <- font-lock-keyword-face
|
||||
AC_PROG_CC
|
||||
dnl <- font-lock-keyword-face
|
||||
|
||||
# Quoting.
|
||||
|
||||
[AC_PROG_CC] [[AC_PREREQ([2.70])]]
|
||||
dnl ^^^^^^^^^^ ^^^^^^^^^ font-lock-keyword-face
|
||||
|
||||
# Nesting.
|
||||
|
||||
AS_VAR_IF([foo], [bar], [AC_MSG_FAILURE([baz])])
|
||||
dnl <- font-lock-keyword-face
|
||||
dnl ^^^^^^^^^^^^^^ font-lock-keyword-face
|
||||
AS_VAR_IF([foo], [bar],
|
||||
dnl <- font-lock-keyword-face
|
||||
[AC_MSG_FAILURE([baz])])
|
||||
dnl ^^^^^^^^^^^^^^ font-lock-keyword-face
|
||||
|
||||
# Autoconf.
|
||||
|
||||
AC_PROG_CC AC_PREREQ(2.70) AC_PREREQ([2.70])
|
||||
dnl <- font-lock-keyword-face
|
||||
dnl ^^^^^^^^^ ^^^^^^^^^ font-lock-keyword-face
|
||||
|
||||
# Autoheader.
|
||||
|
||||
AH_HEADER AH_TOP(foo) AH_TOP([foo])
|
||||
dnl <- font-lock-keyword-face
|
||||
dnl ^^^^^^ ^^^^^^ font-lock-keyword-face
|
||||
|
||||
# Automake.
|
||||
|
||||
AM_PATH_LISPDIR AM_SILENT_RULES(yes) AM_SILENT_RULES([yes])
|
||||
dnl <- font-lock-keyword-face
|
||||
dnl ^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^ font-lock-keyword-face
|
||||
|
||||
# M4sh.
|
||||
|
||||
AS_INIT AS_ECHO(foo) AS_ECHO([foo])
|
||||
dnl <- font-lock-keyword-face
|
||||
dnl ^^^^^^^ ^^^^^^^ font-lock-keyword-face
|
||||
|
||||
# Autoconf Archive.
|
||||
|
||||
AX_ADD_FORTIFY_SOURCE AX_SAVE_FLAGS(foo) AX_SAVE_FLAGS([foo])
|
||||
dnl <- font-lock-keyword-face
|
||||
dnl ^^^^^^^^^^^^^ ^^^^^^^^^^^^^ font-lock-keyword-face
|
||||
|
||||
# Libtool.
|
||||
|
||||
LT_OUTPUT LT_PREREQ(2.4.6) LT_PREREQ([2.4.6])
|
||||
dnl <- font-lock-keyword-face
|
||||
dnl ^^^^^^^^^ ^^^^^^^^^ font-lock-keyword-face
|
||||
|
||||
# Gnulib.
|
||||
|
||||
gl_EARLY gl_WARN_ADD(foo) gl_WARN_ADD([foo])
|
||||
dnl <- font-lock-keyword-face
|
||||
dnl ^^^^^^^^^^^ ^^^^^^^^^^^ font-lock-keyword-face
|
||||
|
||||
# M4.
|
||||
|
||||
changequote(<<, >>) m4_changequote(<<, >>)
|
||||
dnl <- font-lock-keyword-face
|
||||
dnl ^^^^^^^^^^^^^^ !font-lock-keyword-face
|
||||
changequote([, ]) m4_changequote([, ])
|
||||
dnl <- font-lock-keyword-face
|
||||
dnl ^^^^^^^^^^^^^^ !font-lock-keyword-face
|
||||
|
||||
# AC_DEFINE object-like macro.
|
||||
|
||||
AC_DEFINE(a) AC_DEFINE(a, d)
|
||||
dnl <- font-lock-keyword-face
|
||||
dnl ^^^^^^^^^ font-lock-keyword-face
|
||||
dnl ^ ^ font-lock-variable-name-face
|
||||
AC_DEFINE([a]) AC_DEFINE([a], d)
|
||||
dnl ^ ^ font-lock-variable-name-face
|
||||
AC_DEFINE([[a]]) AC_DEFINE([[a]], d)
|
||||
dnl ^ ^ font-lock-variable-name-face
|
||||
AC_DEFINE(bc) AC_DEFINE(bc, d)
|
||||
dnl ^^ ^^ font-lock-variable-name-face
|
||||
AC_DEFINE([bc]) AC_DEFINE([bc], d)
|
||||
dnl ^^ ^^ font-lock-variable-name-face
|
||||
AC_DEFINE([[bc]]) AC_DEFINE([[bc]], d)
|
||||
dnl ^^ ^^ font-lock-variable-name-face
|
||||
|
||||
# AC_DEFINE function-like macro.
|
||||
|
||||
AC_DEFINE(a()) AC_DEFINE(a(), d)
|
||||
dnl <- font-lock-keyword-face
|
||||
dnl ^^^^^^^^^ font-lock-keyword-face
|
||||
dnl ^ ^ font-lock-function-name-face
|
||||
AC_DEFINE([a()]) AC_DEFINE([a()], d)
|
||||
dnl ^ ^ font-lock-function-name-face
|
||||
AC_DEFINE([[a()]]) AC_DEFINE([[a()]], d)
|
||||
dnl ^ ^ font-lock-function-name-face
|
||||
AC_DEFINE(a(x)) AC_DEFINE(a(x), d)
|
||||
dnl ^ ^ font-lock-function-name-face
|
||||
AC_DEFINE([a(x)]) AC_DEFINE([a(x)], d)
|
||||
dnl ^ ^ font-lock-function-name-face
|
||||
AC_DEFINE([[a(x)]]) AC_DEFINE([[a(x)]], d)
|
||||
dnl ^ ^ font-lock-function-name-face
|
||||
AC_DEFINE(a(x, y)) AC_DEFINE(a(x, y), d)
|
||||
dnl ^ ^ font-lock-function-name-face
|
||||
AC_DEFINE([a(x, y)]) AC_DEFINE([a(x, y)], d)
|
||||
dnl ^ ^ font-lock-function-name-face
|
||||
AC_DEFINE([[a(x, y)]]) AC_DEFINE([[a(x, y)]], d)
|
||||
dnl ^ ^ font-lock-function-name-face
|
||||
|
||||
# AC_DEFINE_UNQUOTED object-like macro.
|
||||
|
||||
AC_DEFINE_UNQUOTED(a) AC_DEFINE_UNQUOTED(a, d)
|
||||
dnl <- font-lock-keyword-face
|
||||
dnl ^^^^^^^^^^^^^^^^^^ font-lock-keyword-face
|
||||
dnl ^ ^ font-lock-variable-name-face
|
||||
AC_DEFINE_UNQUOTED([a]) AC_DEFINE_UNQUOTED([a], d)
|
||||
dnl ^ ^ font-lock-variable-name-face
|
||||
AC_DEFINE_UNQUOTED([[a]]) AC_DEFINE_UNQUOTED([[a]], d)
|
||||
dnl ^ ^ font-lock-variable-name-face
|
||||
AC_DEFINE_UNQUOTED(bc) AC_DEFINE_UNQUOTED(bc, d)
|
||||
dnl ^^ ^^ font-lock-variable-name-face
|
||||
AC_DEFINE_UNQUOTED([bc]) AC_DEFINE_UNQUOTED([bc], d)
|
||||
dnl ^^ ^^ font-lock-variable-name-face
|
||||
AC_DEFINE_UNQUOTED([[bc]]) AC_DEFINE_UNQUOTED([[bc]], d)
|
||||
dnl ^^ ^^ font-lock-variable-name-face
|
||||
AC_DEFINE_UNQUOTED(\a`b`$c${d})
|
||||
dnl ^^^^^^^^^^^ font-lock-variable-name-face
|
||||
AC_DEFINE_UNQUOTED([\a`b`$c${d}])
|
||||
dnl ^^^^^^^^^^^ font-lock-variable-name-face
|
||||
AC_DEFINE_UNQUOTED([[\a`b`$c${d}]])
|
||||
dnl ^^^^^^^^^^^ font-lock-variable-name-face
|
||||
AC_DEFINE_UNQUOTED(\a`b`$c${d}, e)
|
||||
dnl ^^^^^^^^^^^ font-lock-variable-name-face
|
||||
AC_DEFINE_UNQUOTED([\a`b`$c${d}], e)
|
||||
dnl ^^^^^^^^^^^ font-lock-variable-name-face
|
||||
AC_DEFINE_UNQUOTED([[\a`b`$c${d}]], e)
|
||||
dnl ^^^^^^^^^^^ font-lock-variable-name-face
|
||||
|
||||
# Variable definition.
|
||||
|
||||
AC_SUBST(a) AC_SUBST(a, b)
|
||||
dnl <- font-lock-keyword-face
|
||||
dnl ^^^^^^^^ font-lock-keyword-face
|
||||
dnl ^ ^ font-lock-variable-name-face
|
||||
AH_TEMPLATE(a, b) AH_VERBATIM(a, b)
|
||||
dnl <- font-lock-keyword-face
|
||||
dnl ^^^^^^^^^^^ font-lock-keyword-face
|
||||
dnl ^ ^font-lock-variable-name-face
|
||||
AM_CONDITIONAL(a, b) AM_MISSING_PROG(a, b)
|
||||
dnl <- font-lock-keyword-face
|
||||
dnl ^^^^^^^^^^^^^^^ font-lock-keyword-face
|
||||
dnl ^ ^ font-lock-variable-name-face
|
||||
|
||||
# Function definition.
|
||||
|
||||
AC_DEFUN(a) AC_DEFUN(a, b)
|
||||
dnl <- font-lock-keyword-face
|
||||
dnl ^^^^^^^^ font-lock-keyword-face
|
||||
dnl ^ ^ font-lock-function-name-face
|
||||
AC_DEFUN_ONCE(a, b)
|
||||
dnl <- font-lock-keyword-face
|
||||
dnl ^ font-lock-function-name-face
|
||||
AU_ALIAS(a, b) AU_DEFUN(a, b)
|
||||
dnl <- font-lock-keyword-face
|
||||
dnl ^^^^^^^^ font-lock-keyword-face
|
||||
dnl ^ ^ font-lock-function-name-face
|
||||
|
|
@ -20,36 +20,44 @@
|
|||
;; You should have received a copy of the GNU General Public License
|
||||
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
;;; Commentary:
|
||||
|
||||
;;
|
||||
|
||||
;;; Code:
|
||||
|
||||
(require 'autoconf)
|
||||
(require 'ert)
|
||||
(require 'ert-font-lock)
|
||||
|
||||
(ert-deftest autoconf-tests-current-defun-function-define ()
|
||||
(with-temp-buffer
|
||||
(autoconf-mode)
|
||||
(insert "AC_DEFINE([HAVE_RSVG], [1], [Define to 1 if using librsvg.])")
|
||||
(let ((def "HAVE_RSVG"))
|
||||
(search-backward def)
|
||||
(should (equal (autoconf-current-defun-function) def)))
|
||||
(goto-char (point-min))
|
||||
(should-not (autoconf-current-defun-function))
|
||||
(forward-char 11)
|
||||
(should (equal (autoconf-current-defun-function) "HAVE_RSVG"))))
|
||||
(should-not (autoconf-current-defun-function))))
|
||||
|
||||
(ert-deftest autoconf-tests-current-defun-function-subst ()
|
||||
(with-temp-buffer
|
||||
(autoconf-mode)
|
||||
(insert "AC_SUBST([srcdir])")
|
||||
(let ((def "srcdir"))
|
||||
(search-backward def)
|
||||
(should (equal (autoconf-current-defun-function) "srcdir")))
|
||||
(goto-char (point-min))
|
||||
(should-not (autoconf-current-defun-function))
|
||||
(forward-char 10)
|
||||
(should (equal (autoconf-current-defun-function) "srcdir"))))
|
||||
(should-not (autoconf-current-defun-function))))
|
||||
|
||||
(ert-deftest autoconf-tests-autoconf-mode-comment-syntax ()
|
||||
(with-temp-buffer
|
||||
(autoconf-mode)
|
||||
(insert "dnl Autoconf script for GNU Emacs")
|
||||
(should (nth 4 (syntax-ppss)))))
|
||||
(dolist (start '("dnl" "#"))
|
||||
(insert start " Autoconf script for GNU Emacs")
|
||||
(should (eq (syntax-ppss-context (syntax-ppss)) 'comment))
|
||||
(insert "\n")
|
||||
(should-not (syntax-ppss-context (syntax-ppss))))))
|
||||
|
||||
(ert-font-lock-deftest-file autoconf-tests-font-lock
|
||||
"Test `autoconf-mode' font lock."
|
||||
autoconf-mode "configure.ac")
|
||||
|
||||
(provide 'autoconf-tests)
|
||||
;;; autoconf-tests.el ends here
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue