[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 32558cf 2/2: Fix error in gnu compilation-mode rege
From: |
Mattias Engdegård |
Subject: |
[Emacs-diffs] master 32558cf 2/2: Fix error in gnu compilation-mode regexp (bug#37582) |
Date: |
Fri, 4 Oct 2019 09:43:49 -0400 (EDT) |
branch: master
commit 32558cfe53b187e3bbdfb532c7ce64ab9b0cd4f5
Author: Mattias Engdegård <address@hidden>
Commit: Mattias Engdegård <address@hidden>
Fix error in gnu compilation-mode regexp (bug#37582)
* lisp/progmodes/compile.el (compilation-error-regexp-alist-alist):
Fix a mistake introduced when the regexp was translated to rx.
* test/lisp/progmodes/compile-tests.el (compile-tests--test-regexps-data)
(compile-test-error-regexps): Add test case.
* etc/compilation.txt: Add example.
---
etc/compilation.txt | 1 +
lisp/progmodes/compile.el | 2 +-
test/lisp/progmodes/compile-tests.el | 4 +++-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/etc/compilation.txt b/etc/compilation.txt
index eccdfa7..0e39ab5 100644
--- a/etc/compilation.txt
+++ b/etc/compilation.txt
@@ -286,6 +286,7 @@ jade:dbcommon.dsl:133:17:E: missing argument for function
call
G:/cygwin/dev/build-myproj.xml:54: Compiler Adapter 'javac' can't be found.
file:G:/cygwin/dev/build-myproj.xml:54: Compiler Adapter 'javac' can't be
found.
{standard input}:27041: Warning: end of file not at end of a line; newline
inserted
+boost/container/detail/flat_tree.hpp:589:25: [ skipping 5 instantiation
contexts, use -ftemplate-backtrace-limit=0 to disable ]
* Guile backtrace, 2.0.11
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index d80fef3..83efb3e 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -327,7 +327,7 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
(: (* " ")
(group-n 7 (| (regexp "[Ii]nfo\\(?:\\>\\|rmationa?l?\\)")
"I:"
- (: "[ skipping " (+ ".") " ]")
+ (: "[ skipping " (+ nonl) " ]")
"instantiated from"
"required from"
(regexp "[Nn]ote"))))
diff --git a/test/lisp/progmodes/compile-tests.el
b/test/lisp/progmodes/compile-tests.el
index 3ff4521..8e59a54 100644
--- a/test/lisp/progmodes/compile-tests.el
+++ b/test/lisp/progmodes/compile-tests.el
@@ -204,6 +204,8 @@
1 nil 54 "G:/cygwin/dev/build-myproj.xml")
("{standard input}:27041: Warning: end of file not at end of a line;
newline inserted"
1 nil 27041 "{standard input}")
+ ("boost/container/detail/flat_tree.hpp:589:25: [ skipping 5
instantiation contexts, use -ftemplate-backtrace-limit=0 to disable ]"
+ 1 25 589 "boost/container/detail/flat_tree.hpp" 0)
;; Guile
("In foo.scm:\n" 1 nil nil "foo.scm")
(" 63:4 [call-with-prompt prompt0 ...]" 1 4 63 nil)
@@ -407,7 +409,7 @@ The test data is in `compile-tests--test-regexps-data'."
(mapc #'compile--test-error-line compile-tests--test-regexps-data)
(should (eq compilation-num-errors-found 87))
(should (eq compilation-num-warnings-found 32))
- (should (eq compilation-num-infos-found 20)))))
+ (should (eq compilation-num-infos-found 21)))))
(ert-deftest compile-test-grep-regexps ()
"Test the `grep-regexp-alist' regexps.