diff options
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | lldb/core.el | 22 | ||||
| -rw-r--r-- | lldb/init.el | 17 | ||||
| -rw-r--r-- | lldb/lldb.el | 6 | ||||
| -rw-r--r-- | lldb/track-mode.el | 6 | ||||
| -rw-r--r-- | realgud-lldb.el | 6 |
6 files changed, 35 insertions, 27 deletions
diff --git a/configure.ac b/configure.ac index 7c44801..3999500 100644 --- a/configure.ac +++ b/configure.ac @@ -1,12 +1,11 @@ dnl FIXME: pick up from realgud.el -AC_INIT(realgud-lldb, 1.0.2,) +AC_INIT([realgud-lldb],[1.0.2],[]) AC_CONFIG_SRCDIR(lldb/lldb.el) AM_INIT_AUTOMAKE([foreign]) AM_MAINTAINER_MODE AC_PATH_PROG([EMACS], [emacs], [emacs]) -AC_ARG_WITH(emacs, AC_HELP_STRING([--with-emacs], - [location of emacs program]), EMACS=$withval) +AC_ARG_WITH(emacs, AS_HELP_STRING([--with-emacs],[location of emacs program]), EMACS=$withval) AC_MSG_NOTICE("Checking emacs version") $EMACS -batch -q --no-site-file -eval \ diff --git a/lldb/core.el b/lldb/core.el index 9d85481..0d47eab 100644 --- a/lldb/core.el +++ b/lldb/core.el @@ -1,4 +1,4 @@ -;; Copyright (C) 2019 Free Software Foundation, Inc +;; Copyright (C) 2019, 2026 Free Software Foundation, Inc ;; Author: Rocky Bernstein <rocky@gnu.org> ;; This program is free software; you can redistribute it and/or modify @@ -35,7 +35,7 @@ :inherit minibuffer-local-map) ;; FIXME: I think this code and the keymaps and history -;; variable chould be generalized, perhaps via a macro. +;; variable should be generalized, perhaps via a macro. (defun realgud--lldb-query-cmdline (&optional opt-debugger) (realgud-query-cmdline 'realgud--lldb-suggest-invocation @@ -92,22 +92,25 @@ ;; )) (defun realgud--lldb-parse-cmd-args (orig-args) - "Parse command line ARGS for the annotate level and name of script to debug. + "Parse command line ARGS for the annotate level and name of script +to debug. ORIG_ARGS should contain a tokenized list of the command line to run. We return the a list containing -* the name of the debugger given (e.g. lldb) and its arguments - a list of strings -* nil (a placehoder in other routines of this ilk for a debugger +* the name of the debugger given (e.g. lldb) and its arguments - + a list of strings +* nil (a placeholder in other routines of this ilk for a debugger * the script name and its arguments - list of strings -* whether the emacs option was given ('--emacs) - a boolean +* whether the emacs option was given (\"--emacs\") - a boolean -For example for the following input +For example for the following input: (map 'list 'symbol-name '(lldb --tty /dev/pts/1 -cd ~ --emacs ./gcd.py a b)) we might return: - ((\"lldb\" \"--tty\" \"/dev/pts/1\" \"-cd\" \"home/rocky\' \"--emacs\") nil \"(/tmp/gcd.py a b\") 't\") + ((\"lldb\" \"--tty\" \"/dev/pts/1\" \"-cd\" \"home/rocky\" + \"--emacs\") nil \"(/tmp/gcd.py a b\") 't\") Note that path elements have been expanded via `expand-file-name'. " @@ -185,7 +188,8 @@ Note that path elements have been expanded via `expand-file-name'. (defun realgud--lldb-suggest-invocation (&optional debugger-name) "Suggest a lldb command invocation. Here is the priority we use: -* an executable file with the name of the current buffer stripped of its extension +* an executable file with the name of the current buffer stripped + of its extension * any executable file in the current directory with no extension * the last invocation in lldb:minibuffer-history * any executable in the current directory diff --git a/lldb/init.el b/lldb/init.el index 38053a0..ade07d1 100644 --- a/lldb/init.el +++ b/lldb/init.el @@ -1,4 +1,4 @@ -;; Copyright (C) 2019 Free Software Foundation, Inc +;; Copyright (C) 2019, 2026 Free Software Foundation, Inc ;; Author: Rocky Bernstein <rocky@gnu.org> ;; This program is free software; you can redistribute it and/or modify @@ -27,8 +27,8 @@ realgud-loc-pat struct") (defvar realgud-pat-hash nil - "A buffer local hash table which maps a debugger name, .e.g. 'lldb' to its -the debugger specific hash table, e.g. 'realugd-lldd-pat-hash'.") + "A buffer local hash table which maps a debugger name, .e.g. \"lldb\" to its +the debugger specific hash table, e.g. \"realgud-lldd-pat-hash\".") (declare-function make-realgud-loc-pat (realgud-loc)) (declare-function make-realgud-loc "realgud-loc" (a b c d e f)) @@ -42,8 +42,11 @@ the debugger specific hash table, e.g. 'realugd-lldd-pat-hash'.") ;; SolidityParserError.cpp:102 ;; ;; Note the minimal-match regexp up to the first colon +;; The line column we have a null condition so that we +;; always have a pattern match for the column. +;; It may be nil though. (defconst realgud--lldb-file-col-regexp - (format "\\(.+?\\):%s\\(?::%s\\)?" + (format "\\(.+?\\):%s\\(?::\\(%s\\)\\|\\(\\)\\)" realgud:regexp-captured-num realgud:regexp-captured-num)) @@ -180,8 +183,8 @@ the debugger specific hash table, e.g. 'realugd-lldd-pat-hash'.") (setf (gethash "lldb" realgud:variable-basename-hash) "realgud--lldb") (defvar realgud--lldb-command-hash (make-hash-table :test 'equal) - "Hash key is command name like 'continue' and the value is - the lldb command to use, like 'process continue'") + "Hash key is command name like \"continue\" and the value is + the lldb command to use, like \"process continue\"") (setf (gethash "backtrace" realgud--lldb-command-hash) "bt") (setf (gethash "break" realgud--lldb-command-hash) "b %X:%l") @@ -189,7 +192,7 @@ the debugger specific hash table, e.g. 'realugd-lldd-pat-hash'.") (setf (gethash "delete" realgud--lldb-command-hash) "break delete %p") (setf (gethash "clear" realgud--lldb-command-hash) "break clear %X:%l") (setf (gethash "continue" realgud--lldb-command-hash) "process continue") -(setf (gethash "delete" realgud--lldb-command-hash) "*not-implemented*") ;; Or rather don't know what the equvalent is +(setf (gethash "delete" realgud--lldb-command-hash) "*not-implemented*") ;; Or rather don't know what the equivalent is (setf (gethash "delete_all" realgud--lldb-command-hash) "*not-implemented*") (setf (gethash "disable" realgud--lldb-command-hash) "break disable %p") (setf (gethash "disable-all" realgud--lldb-command-hash) "break disable") diff --git a/lldb/lldb.el b/lldb/lldb.el index e1c70a9..60f19fe 100644 --- a/lldb/lldb.el +++ b/lldb/lldb.el @@ -1,4 +1,4 @@ -;; Copyright (C) 2016-2019 Free Software Foundation, Inc +;; Copyright (C) 2016-2019, 2026 Free Software Foundation, Inc ;; Author: Rocky Bernstein <rocky@gnu.org> ;; This program is free software; you can redistribute it and/or modify @@ -14,7 +14,7 @@ ;; You should have received a copy of the GNU General Public License ;; along with this program. If not, see <http://www.gnu.org/licenses/>. -;; `realgud--lldb' Main interface to lldb via Emacs +;;; `realgud--lldb' Main interface to lldb via Emacs (require 'load-relative) (require 'realgud) (require-relative-list '("core" "track-mode") "realgud--lldb-") @@ -24,7 +24,7 @@ (defgroup realgud--lldb nil "The realgud interface to lldb" :group 'realgud - :version "25.1") + :version "27.1") ;; ------------------------------------------------------------------- ;; User definable variables diff --git a/lldb/track-mode.el b/lldb/track-mode.el index 50c9404..1c396d7 100644 --- a/lldb/track-mode.el +++ b/lldb/track-mode.el @@ -1,4 +1,4 @@ -;; Copyright (C) 2019 Free Software Foundation, Inc +;; Copyright (C) 2019, 2026 Free Software Foundation, Inc ;; Author: Rocky Bernstein <rocky@gnu.org> ;; This program is free software; you can redistribute it and/or modify @@ -42,7 +42,9 @@ (define-minor-mode realgud--lldb-track-mode "Minor mode for tracking lldb inside a process shell via realgud. -If called interactively with no prefix argument, the mode is toggled. A prefix argument, captured as ARG, enables the mode if the argument is positive, and disables it otherwise. +If called interactively with no prefix argument, the mode is +toggled. A prefix argument, captured as ARG, enables the mode if +the argument is positive, and disables it otherwise. Key bindings: \\{realgud--lldb-track-mode-map} diff --git a/realgud-lldb.el b/realgud-lldb.el index 72fe9fe..e2491243 100644 --- a/realgud-lldb.el +++ b/realgud-lldb.el @@ -1,13 +1,13 @@ -;;; realgud-lldb.el --- Realgud front-end to lldb -*- lexical-binding: t -*- +;;; Realgud-lldb.el --- Realgud front-end to lldb -*- lexical-binding: t -*- ;; Author: Rocky Bernstein <rocky@gnu.org> ;; Version: 1.0.2 ;; Package-Type: multi ;; Package-Requires: ((load-relative "1.3.1") (realgud "1.5.0") (emacs "25")) ;; URL: http://github.com/realgud/realgud-lldb -;; Compatibility: GNU Emacs 25.x +;; Compatibility: GNU Emacs 27.x -;; Copyright (C) 2015, 2016, 2019 Free Software Foundation, Inc +;; Copyright (C) 2015, 2016, 2019, 2026 Free Software Foundation, Inc ;; Author: Rocky Bernstein <rocky@gnu.org> |