RE: [janneke@gnu.org: jdb line fix for gud]

RE: [janneke@gnu.org: jdb line fix for gud]

[Zoltan Kemenczy]

This an acceptable fix in my opinion (I test-drove it too). That regexp group is limited to matching the line number only and since (until:-) line numbers output from jdb get decimals, we should be ok.

Thanks for the fix... I have no idea right now how to get at the LOCALE variables in a platform-independent way. Someone may have a suggestion?

Regards,
Zoltan
-------------------------------------------------------------------
To: emacs-devel@gnu.org
From: Jan Nieuwenhuizen <janneke@gnu.org>
Organization: Jan at Appel
Date: Mon, 26 Jan 2004 12:16:33 +0100
X-RBL-Warning: (inputs.orbz.org) 
X-RBL-Warning: (outputs.orbz.org) 
Subject: jdb line fix for gud
Sender: emacs-devel-bounces+rms=gnu.org@gnu.org

Hi,

Find a small fix for jdb below.  Is this acceptable, or should `[.,]'
be replaced by the actual LOCALE's thousands separator (how?).

Jan.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.5622
diff -p -u -r1.5622 ChangeLog
- --- ChangeLog	25 Jan 2004 23:59:57 -0000	1.5622
+++ ChangeLog	26 Jan 2004 11:02:59 -0000
@@ -1,3 +1,9 @@
+2004-01-26  Jan Nieuwenhuizen  <jan.nieuwenhuizen@aspiratie.nl>
+
+	* progmodes/gud.el (gud-jdb-marker-filter): Add period as optional
+	thousands separator; fixes <class>:<line-number> regexp for
+	non-english locales.
+
 2004-01-25  Glenn Morris  <gmorris@ast.cam.ac.uk>
 
 	* progmodes/fortran.el (fortran-break-before-delimiters): Doc fix. 
Index: progmodes/gud.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/gud.el,v
retrieving revision 1.15
diff -p -u -r1.15 gud.el
- --- progmodes/gud.el	7 Jan 2004 23:22:34 -0000	1.15
+++ progmodes/gud.el	26 Jan 2004 11:02:59 -0000
@@ -1967,14 +1967,14 @@ nil)
 	 ;; FIXME: Java ID's are UNICODE strings, this matches ASCII
 	 ;; ID's only.
          ;;
- -         ;; The "," in the last square-bracket is necessary because of
- -         ;; Sun's total disrespect for backwards compatibility in
+         ;; The ".," in the last square-bracket are necessary because
+         ;; of Sun's total disrespect for backwards compatibility in
          ;; reported line numbers from jdb - starting in 1.4.0 they
- -         ;; introduced a comma at the thousands position (how
- -         ;; ingenious!)
+         ;; print line numbers using LOCALE, inserting a comma or a
+         ;; period at the thousands positions (how ingenious!).
 
 	 "\\(\[[0-9]+\] \\)*\\([a-zA-Z0-9.$_]+\\)\\.[a-zA-Z0-9$_<>(),]+ \
- -\\(([a-zA-Z0-9.$_]+:\\|line=\\)\\([0-9,]+\\)"
+\\(([a-zA-Z0-9.$_]+:\\|line=\\)\\([0-9.,]+\\)"
 	 gud-marker-acc)
 
       ;; A good marker is one that:
@@ -2001,7 +2001,7 @@ nil)
 			  (string-to-int
 			   (let
                                ((numstr (match-string 4 gud-marker-acc)))
- -                             (if (string-match "," numstr)
+                             (if (string-match "[.,]" numstr)
                                  (replace-match "" nil nil numstr)
                                numstr)))))
 	    (message "Could not find source file.")))



- -- 
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond - The music typesetter
http://www.xs4all.nl/~jantien       | http://www.lilypond.org



_______________________________________________
Emacs-devel mailing list
Emacs-devel@gnu.org
http://mail.gnu.org/mailman/listinfo/emacs-devel