diff options
| author | Mattias EngdegÄrd | 2019-10-04 15:29:31 +0200 |
|---|---|---|
| committer | Mattias EngdegÄrd | 2019-10-04 15:43:15 +0200 |
| commit | 32558cfe53b187e3bbdfb532c7ce64ab9b0cd4f5 (patch) | |
| tree | 3a7b581f61f4cdc1277380d839dbc26e614d2375 | |
| parent | d09cbcee9ce90171a20a3cae4a27dc08dcb1af41 (diff) | |
| download | emacs-32558cfe53b187e3bbdfb532c7ce64ab9b0cd4f5.tar.gz emacs-32558cfe53b187e3bbdfb532c7ce64ab9b0cd4f5.zip | |
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.
| -rw-r--r-- | etc/compilation.txt | 1 | ||||
| -rw-r--r-- | lisp/progmodes/compile.el | 2 | ||||
| -rw-r--r-- | 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 eccdfa737f0..0e39ab5e4af 100644 --- a/etc/compilation.txt +++ b/etc/compilation.txt | |||
| @@ -286,6 +286,7 @@ jade:dbcommon.dsl:133:17:E: missing argument for function call | |||
| 286 | G:/cygwin/dev/build-myproj.xml:54: Compiler Adapter 'javac' can't be found. | 286 | G:/cygwin/dev/build-myproj.xml:54: Compiler Adapter 'javac' can't be found. |
| 287 | file:G:/cygwin/dev/build-myproj.xml:54: Compiler Adapter 'javac' can't be found. | 287 | file:G:/cygwin/dev/build-myproj.xml:54: Compiler Adapter 'javac' can't be found. |
| 288 | {standard input}:27041: Warning: end of file not at end of a line; newline inserted | 288 | {standard input}:27041: Warning: end of file not at end of a line; newline inserted |
| 289 | boost/container/detail/flat_tree.hpp:589:25: [ skipping 5 instantiation contexts, use -ftemplate-backtrace-limit=0 to disable ] | ||
| 289 | 290 | ||
| 290 | 291 | ||
| 291 | * Guile backtrace, 2.0.11 | 292 | * Guile backtrace, 2.0.11 |
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index d80fef3103e..83efb3e0295 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)) | |||
| 327 | (: (* " ") | 327 | (: (* " ") |
| 328 | (group-n 7 (| (regexp "[Ii]nfo\\(?:\\>\\|rmationa?l?\\)") | 328 | (group-n 7 (| (regexp "[Ii]nfo\\(?:\\>\\|rmationa?l?\\)") |
| 329 | "I:" | 329 | "I:" |
| 330 | (: "[ skipping " (+ ".") " ]") | 330 | (: "[ skipping " (+ nonl) " ]") |
| 331 | "instantiated from" | 331 | "instantiated from" |
| 332 | "required from" | 332 | "required from" |
| 333 | (regexp "[Nn]ote")))) | 333 | (regexp "[Nn]ote")))) |
diff --git a/test/lisp/progmodes/compile-tests.el b/test/lisp/progmodes/compile-tests.el index 3ff4521d2d8..8e59a5401bb 100644 --- a/test/lisp/progmodes/compile-tests.el +++ b/test/lisp/progmodes/compile-tests.el | |||
| @@ -204,6 +204,8 @@ | |||
| 204 | 1 nil 54 "G:/cygwin/dev/build-myproj.xml") | 204 | 1 nil 54 "G:/cygwin/dev/build-myproj.xml") |
| 205 | ("{standard input}:27041: Warning: end of file not at end of a line; newline inserted" | 205 | ("{standard input}:27041: Warning: end of file not at end of a line; newline inserted" |
| 206 | 1 nil 27041 "{standard input}") | 206 | 1 nil 27041 "{standard input}") |
| 207 | ("boost/container/detail/flat_tree.hpp:589:25: [ skipping 5 instantiation contexts, use -ftemplate-backtrace-limit=0 to disable ]" | ||
| 208 | 1 25 589 "boost/container/detail/flat_tree.hpp" 0) | ||
| 207 | ;; Guile | 209 | ;; Guile |
| 208 | ("In foo.scm:\n" 1 nil nil "foo.scm") | 210 | ("In foo.scm:\n" 1 nil nil "foo.scm") |
| 209 | (" 63:4 [call-with-prompt prompt0 ...]" 1 4 63 nil) | 211 | (" 63:4 [call-with-prompt prompt0 ...]" 1 4 63 nil) |
| @@ -407,7 +409,7 @@ The test data is in `compile-tests--test-regexps-data'." | |||
| 407 | (mapc #'compile--test-error-line compile-tests--test-regexps-data) | 409 | (mapc #'compile--test-error-line compile-tests--test-regexps-data) |
| 408 | (should (eq compilation-num-errors-found 87)) | 410 | (should (eq compilation-num-errors-found 87)) |
| 409 | (should (eq compilation-num-warnings-found 32)) | 411 | (should (eq compilation-num-warnings-found 32)) |
| 410 | (should (eq compilation-num-infos-found 20))))) | 412 | (should (eq compilation-num-infos-found 21))))) |
| 411 | 413 | ||
| 412 | (ert-deftest compile-test-grep-regexps () | 414 | (ert-deftest compile-test-grep-regexps () |
| 413 | "Test the `grep-regexp-alist' regexps. | 415 | "Test the `grep-regexp-alist' regexps. |