[Emacs-diffs] trunk r117704: Support Guile backtraces in compilation mode.

[Jan Nieuwenhuizen]

------------------------------------------------------------
revno: 117704
revision-id: address@hidden
parent: address@hidden
committer: Jan Nieuwenhuizen <address@hidden>
branch nick: trunk
timestamp: Wed 2014-08-13 21:17:21 +0200
message:
  Support Guile backtraces in compilation mode.
  
        * lisp/progmodes/compile.el (compilation-error-regexp-alist-alist):
        Add Guile regexpses.
  
        * etc/compilation.txt (file): Add Guile backtrace example.
  
        * test/automated/compile-tests.el (compile--test-error-line):
        Grok FILE being nil.  Allows for Guile tests to pass.
        (compile-tests--test-regexps-data): Add Guile tests.
modified:
  etc/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1485
  etc/compilation.txt            
compilation.txt-20091113204419-o5vbwnq5f7feedwu-2970
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/progmodes/compile.el      compile.el-20091113204419-o5vbwnq5f7feedwu-126
  test/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-8588
  test/automated/compile-tests.el 
compiletests.el-20110509012129-is8ki513s83dabl2-1

=== modified file 'etc/ChangeLog'
--- a/etc/ChangeLog     2014-08-09 16:12:33 +0000
+++ b/etc/ChangeLog     2014-08-13 19:17:21 +0000
@@ -1,3 +1,7 @@
+2014-08-08  Jan Nieuwenhuizen  <address@hidden>
+
+       * compilation.txt (file): Add Guile backtrace example.
+
 2014-08-09  Reuben Thomas  <address@hidden>
 
        * PROBLEMS: Remove msdos/is_exec.c and sigaction.c.

=== modified file 'etc/compilation.txt'
--- a/etc/compilation.txt       2014-01-01 07:43:34 +0000
+++ b/etc/compilation.txt       2014-08-13 19:17:21 +0000
@@ -261,6 +261,26 @@
 {standard input}:27041: Warning: end of file not at end of a line; newline 
inserted
 
 
+* Guile backtrace, 2.0.11
+
+symbols: guile-file, guile-line
+
+Backtrace:
+In ice-9/boot-9.scm:
+ 157: 6 [catch #t #<catch-closure 196e3e0> ...]
+In unknown file:
+   ?: 5 [apply-smob/1 #<catch-closure 196e3e0>]
+In ice-9/boot-9.scm:
+  63: 4 [call-with-prompt prompt0 ...]
+In ice-9/eval.scm:
+ 432: 3 [eval # #]
+In unknown file:
+   ?: 2 [eval (main (command-line)) #<directory (gud-break) 1962510>]
+In /home/janneke/vc/guile/examples/gud-break.scm:
+1038: 1 [main ("gud-break.scm")]
+1033: 0 [stderr "~a:hello world\n" (# # #)]
+
+
 * Lucid Compiler, lcc 3.x
 
 symbol: lcc

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-08-13 19:15:28 +0000
+++ b/lisp/ChangeLog    2014-08-13 19:17:21 +0000
@@ -1,5 +1,10 @@
 2014-08-13  Jan Nieuwenhuizen  <address@hidden>
 
+       * progmodes/compile.el (compilation-error-regexp-alist-alist):
+       Add Guile regexpses.
+
+2014-08-13  Jan Nieuwenhuizen  <address@hidden>
+
        * progmodes/gud.el (guiler): New function.  Starts the Guile REPL;
        add Guile debugger support for GUD.
        

=== modified file 'lisp/progmodes/compile.el'
--- a/lisp/progmodes/compile.el 2014-05-29 03:45:29 +0000
+++ b/lisp/progmodes/compile.el 2014-08-13 19:17:21 +0000
@@ -477,6 +477,8 @@
      ;;
      "^\\([^ \t\r\n(]+\\) (\\([0-9]+\\):\\([0-9]+\\)) "
      1 2 3)
+    (guile-file "^In \\(.+\\):\n" 1)
+    (guile-line "^ *\\([0-9]+\\): *\\([0-9]+\\)" nil 1 2)
     )
   "Alist of values for `compilation-error-regexp-alist'.")
 

=== modified file 'test/ChangeLog'
--- a/test/ChangeLog    2014-08-11 00:59:34 +0000
+++ b/test/ChangeLog    2014-08-13 19:17:21 +0000
@@ -1,3 +1,9 @@
+2014-08-13  Jan Nieuwenhuizen  <address@hidden>
+
+       * automated/compile-tests.el (compile--test-error-line): Grok FILE
+       being nil.  Allows for Guile tests to pass.
+       (compile-tests--test-regexps-data): Add Guile tests.
+
 2014-08-11  Glenn Morris  <address@hidden>
 
        * automated/data/files-bug18141.el.gz: New file.

=== modified file 'test/automated/compile-tests.el'
--- a/test/automated/compile-tests.el   2014-01-01 07:43:34 +0000
+++ b/test/automated/compile-tests.el   2014-08-13 19:17:21 +0000
@@ -190,6 +190,10 @@
      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}")
+    ;; Guile
+    ("In foo.scm:\n" 1 nil nil "foo.scm")
+    ("  63:4 [call-with-prompt prompt0 ...]" 1 4 63 nil)
+    ("1038: 1 [main (\"gud-break.scm\")]" 1 1 1038 nil)
     ;; lcc
     ("E, file.cc(35,52) Illegal operation on pointers" 1 52 35 "file.cc")
     ("W, file.cc(36,52) blah blah" 1 52 36 "file.cc")
@@ -338,7 +342,8 @@
            (setq end-line (cdr line) line (car line)))
        (and (equal (compilation--loc->col loc) col)
             (equal (compilation--loc->line loc) line)
-            (equal (caar (compilation--loc->file-struct loc)) file)
+            (or (not file) 
+                 (equal (caar (compilation--loc->file-struct loc)) file))
             (or (null end-col)
                 (equal (car (cadr (nth 2 (compilation--loc->file-struct loc))))
                        end-col))