[elpa] master aa3125d 041/215: posix-shell.el: sometimes I can't use (format)

[Rocky Bernstein]

branch: master
commit aa3125d819aba3aeb827f023d458e62019879550
Author: rocky <address@hidden>
Commit: rocky <address@hidden>

    posix-shell.el: sometimes I can't use (format)
    rest: More FSF copyrights
---
 realgud/debugger/trepan.pl/init.el     |   34 +++++++++++++++++++++++++-------
 realgud/debugger/trepan8/core.el       |   18 ++++++++++++++++-
 realgud/debugger/trepan8/init.el       |   21 ++++++++++++++++++--
 realgud/debugger/trepan8/track-mode.el |    3 ++-
 realgud/debugger/trepan8/trepan8.el    |   18 ++++++++++++++++-
 realgud/lang/posix-shell.el            |   11 ++++-------
 6 files changed, 86 insertions(+), 19 deletions(-)

diff --git a/realgud/debugger/trepan.pl/init.el 
b/realgud/debugger/trepan.pl/init.el
index 45e9b53..ae8c4fd 100644
--- a/realgud/debugger/trepan.pl/init.el
+++ b/realgud/debugger/trepan.pl/init.el
@@ -1,5 +1,21 @@
-;;; Copyright (C) 2011-2012, 2014-2015 Rocky Bernstein <address@hidden>
-;;; Trepanning Perl debugger
+;; Copyright (C) 2015 Free Software Foundation, Inc
+
+;; Author: Rocky Bernstein <address@hidden>
+
+;; 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 <http://www.gnu.org/licenses/>.
+
+;; Trepanning Perl debugger
 (eval-when-compile (require 'cl))
 
 (require 'load-relative)
@@ -34,7 +50,8 @@ realgud-loc-pat struct")
 
 (setf (gethash "loc" realgud:trepanpl-pat-hash)
       (make-realgud-loc-pat
-       :regexp ".. \\(?:.+::\\)?(\\(?:.+ \\(?:via\\|remapped\\) 
\\)?\\(.+\\):\\([0-9]+\\)\\(?: @0x[0-9a-f]+\\)?)\\(?:\n\\(.*?\\)\n\\)?"
+       :regexp (format ".. \\(?:.+::\\)?(\\(?:.+ \\(?:via\\|remapped\\) 
\\)?\\(.+\\):%s\\(?: @0x[0-9a-f]+\\)?)\\(?:\n\\(.*?\\)\n\\)?"
+                      realgud:regexp-captured-num)
        :file-group 1
        :line-group 2
        :text-group 3
@@ -68,7 +85,7 @@ realgud-loc-pat struct")
 
 
 (defconst realgud:trepanpl-frame-num-regexp
-  "\\([0-9]+\\)")
+  realgud:regexp-captured-num)
 
 ;; Regular expression that describes a Perl backtrace line.
 ;; For example:
@@ -84,7 +101,8 @@ realgud-loc-pat struct")
            realgud:trepanpl-frame-num-regexp
            "\\(?: address@hidden = .* in\\)?"
            "[\n\t ]+?file `"
-           "\\(.*\\)' at line \\([0-9]+\\)")
+           "\\(.*\\)' at line "
+           realgud:regexp-captured-num)
    :num 2
    :file-group 3
    :line-group 4
@@ -108,7 +126,8 @@ realgud-loc-pat struct")
 ;;   Breakpoint 2 set in /tmp/File/Basename.pm at line 215
 (setf (gethash "brkpt-set" realgud:trepanpl-pat-hash)
       (make-realgud-loc-pat
-       :regexp "^Breakpoint \\([0-9]+\\) set in[\n\t ]+\\(.+\\)[ \t\n]+at line 
\\([0-9]+\\)"
+       :regexp (format "^Breakpoint %s set in[\n\t ]+\\(.+\\)[ \t\n]+at line 
\\([0-9]+\\)"
+                      realgud:regexp-captured-num)
        :num 1
        :file-group 2
        :line-group 3
@@ -120,7 +139,8 @@ realgud-loc-pat struct")
 ;;   Deleted breakpoint 1.
 (setf (gethash "brkpt-del" realgud:trepanpl-pat-hash)
       (make-realgud-loc-pat
-       :regexp "^Deleted breakpoint \\([0-9]+\\)\n"
+       :regexp (format "^Deleted breakpoint %s\n"
+                      realgud:regexp-captured-num)
        :num 1))
 
 (defconst realgud:trepanpl-selected-frame-indicator "-->"
diff --git a/realgud/debugger/trepan8/core.el b/realgud/debugger/trepan8/core.el
index 6c8e876..9939e5a 100644
--- a/realgud/debugger/trepan8/core.el
+++ b/realgud/debugger/trepan8/core.el
@@ -1,4 +1,20 @@
-;;; Copyright (C) 2010-2011, 2014 Rocky Bernstein <address@hidden>
+;; Copyright (C) 2015 Free Software Foundation, Inc
+
+;; Author: Rocky Bernstein <address@hidden>
+
+;; 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 <http://www.gnu.org/licenses/>.
+
 (eval-when-compile (require 'cl))
 
 (require 'load-relative)
diff --git a/realgud/debugger/trepan8/init.el b/realgud/debugger/trepan8/init.el
index b6c9e39..622a4e7 100644
--- a/realgud/debugger/trepan8/init.el
+++ b/realgud/debugger/trepan8/init.el
@@ -1,4 +1,20 @@
-;;; Copyright (C) 2010, 2011 Rocky Bernstein <address@hidden>
+;; Copyright (C) 2015 Free Software Foundation, Inc
+
+;; Author: Rocky Bernstein <address@hidden>
+
+;; 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 <http://www.gnu.org/licenses/>.
+
 (eval-when-compile (require 'cl))
 
 (require 'load-relative)
@@ -47,7 +63,8 @@ realgud-loc-pat struct")
 ;; Set breakpoint 1: /tmp/fact.rb:1 (@0)
 (setf (gethash "brkpt-set" realgud:trepan8-pat-hash)
       (make-realgud-loc-pat
-       :regexp "^Set breakpoint \\([0-9]+\\): .+ at \\(.+\\):\\([0-9]+\\) 
(@[0-9]+)"
+       :regexp (format "^Set breakpoint %s: .+ at \\(.+\\):\\([0-9]+\\) 
(@[0-9]+)"
+                      realgud:regexp-captured-num)
        :num 1
        :file-group 2
        :line-group 3))
diff --git a/realgud/debugger/trepan8/track-mode.el 
b/realgud/debugger/trepan8/track-mode.el
index 10a2821..2040a8b 100644
--- a/realgud/debugger/trepan8/track-mode.el
+++ b/realgud/debugger/trepan8/track-mode.el
@@ -14,7 +14,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-;;; Ruby "trepan8" Debugger tracking a comint buffer.
+
+;; Ruby "trepan8" Debugger tracking a comint buffer.
 
 (eval-when-compile (require 'cl))
 (require 'load-relative)
diff --git a/realgud/debugger/trepan8/trepan8.el 
b/realgud/debugger/trepan8/trepan8.el
index 8f96c6e..6d80fa5 100644
--- a/realgud/debugger/trepan8/trepan8.el
+++ b/realgud/debugger/trepan8/trepan8.el
@@ -1,4 +1,20 @@
-;;; Copyright (C) 2010-2011, 2015 Rocky Bernstein <address@hidden>
+;; Copyright (C) 2015 Free Software Foundation, Inc
+
+;; Author: Rocky Bernstein <address@hidden>
+
+;; 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 <http://www.gnu.org/licenses/>.
+
 ;;  `trepan8' Main interface to trepan8 via Emacs
 (require 'load-relative)
 (require-relative-list '("../../common/helper") "realgud-")
diff --git a/realgud/lang/posix-shell.el b/realgud/lang/posix-shell.el
index 4b5e017..54216c2 100644
--- a/realgud/lang/posix-shell.el
+++ b/realgud/lang/posix-shell.el
@@ -31,8 +31,7 @@
 
 (defconst realgud-shell-backtrace-loc-pat
   (make-realgud-loc-pat
-   :regexp (format "^[ \t]+from \\([^:]+\\):%s\\(?: in `.*'\\)?"
-                  realgud:regexp-captured-num)
+   :regexp "^[ \t]+from \\([^:]+\\):\\([0-9]+\\)\\(?: in `.*'\\)?"
    :file-group 1
    :line-group 2)
   "A realgud-loc-pat struct that describes a Shell backtrace (or
@@ -64,9 +63,7 @@ traceback) line."  )
 ;;   (/etc/init.d/apparmor:35):
 (defconst realgud:POSIX-debugger-loc-pat
       (make-realgud-loc-pat
-       :regexp (format
-               "\\(?:^\\|\n\\)(\\([^:]+\\):%s):\\(?:\n\\(.+\\)\\)?"
-               realgud:regexp-captured-num)
+       :regexp "\\(?:^\\|\n\\)(\\([^:]+\\):\\([0-9]*\\)):\\(?:\n\\(.+\\)\\)?"
        :file-group 1
        :line-group 2
        :text-group 3)
@@ -115,7 +112,7 @@ traceback) line."  )
     ;; The frame number and first type name, if present.
     ;; E.g. ->0 in file `/etc/init.d/apparmor' at line 35
     ;;      --^-
-    ((format "^\\(->\\|##\\)%s " realgud:regexp-captured-num)
+    ("^\\(->\\|##\\)\\([0-9]+\\) "
      (2 realgud-backtrace-number-face))
 
     ;; File name.
@@ -128,7 +125,7 @@ traceback) line."  )
     ;; E.g. ->0 in file `/etc/init.d/apparmor' at line 35
     ;;                                         --------^^
     ;; Line number.
-    ((format "[ \t]+at line %s$" realgud:regexp-captured-num)
+    ("[ \t]+at line \\([0-9]+\\)$"
      (1 realgud-line-number-face))
     ;; (trepan-frames-match-current-line
     ;;  (0 trepan-frames-current-frame-face append))