From 48fb709ad8890fc7669ba5fdb280147db53f3082 Mon Sep 17 00:00:00 2001 From: rocky Date: Sat, 6 Aug 2016 18:34:45 -0400 Subject: Remove ANSI schmutz. Inter-packaging woes --- configure.ac | 1 + lldb/lldb.el | 10 +++++----- test/regexp-helper.el | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index f70128f..deb1ed7 100644 --- a/configure.ac +++ b/configure.ac @@ -48,6 +48,7 @@ AC_SUBST([lispdir_realgud]) AM_CONDITIONAL(INSTALL_EMACS_LISP, test "x$lispdir_realgud" != "x") AC_CONFIG_FILES([Makefile \ + common.mk \ lldb/Makefile \ test/Makefile \ ]) diff --git a/lldb/lldb.el b/lldb/lldb.el index a2b71e5..b400144 100644 --- a/lldb/lldb.el +++ b/lldb/lldb.el @@ -37,11 +37,12 @@ This should be an executable on your path, or an absolute file name." :group 'realgud:lldb) (declare-function realgud:lldb-track-mode 'realgud:lldb-track-mode) -(declare-function realgud-command 'realgud:lldb-core) +(declare-function realgud-command 'realgud:lldb-core) (declare-function realgud:lldb-parse-cmd-args 'realgud:lldb-core) (declare-function realgud:lldb-query-cmdline 'realgud:lldb-core) -(declare-function realgud:run-process 'realgud-core) -(declare-function realgud:flatten 'realgud-utils) +(declare-function realgud:run-process 'realgud-core) +(declare-function realgud:flatten 'realgud-utils) +(declare-function realgud:remove-ansi-schmutz 'realgud-utils) ;; ------------------------------------------------------------------- ;; The end. @@ -62,7 +63,6 @@ buffers and source buffers which may contain marks and fringe or marginal icons is reset. See `loc-changes-clear-buffer' to clear fringe and marginal icons. " - (interactive) (let* ((cmd-str (or opt-cmd-line (realgud:lldb-query-cmdline "lldb"))) (cmd-args (split-string-and-unquote cmd-str)) @@ -78,7 +78,7 @@ fringe and marginal icons. ) (if cmd-buf (with-current-buffer cmd-buf - ; (realgud-command "set annotate 1" nil nil nil) + (realgud:remove-ansi-schmutz) ) ) ) diff --git a/test/regexp-helper.el b/test/regexp-helper.el index 6c67de3..2660077 100644 --- a/test/regexp-helper.el +++ b/test/regexp-helper.el @@ -1,5 +1,5 @@ (require 'test-simple) -(require 'realgud-buffer-command) +(require 'realgud) (eval-when-compile (defvar helper-bps) -- cgit v1.0 From 006bda2be6bf2f3ad6d8188d80639a7d783f7f4d Mon Sep 17 00:00:00 2001 From: "R. Bernstein" Date: Sat, 6 Aug 2016 18:40:07 -0400 Subject: Update INSTALL.md --- INSTALL.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL.md b/INSTALL.md index 4d46fae..6b07102 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,4 +1,4 @@ -* Have `realgud` installed. +* Have `realgud` and `test-simple` installed. * From inside emacs, evaluate: ```lisp (compile (format "EMACSLOADPATH=:%s:%s ./autogen.sh" (file-name-directory (locate-library "test-simple.elc")) (file-name-directory (locate-library "realgud.elc")))) -- cgit v1.0 From ad6f3a30ea75697e4899e444d4ceca2f5b958b01 Mon Sep 17 00:00:00 2001 From: rocky Date: Sat, 6 Aug 2016 18:41:31 -0400 Subject: Con't need cl-lib (yet). --- realgud-lldb.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/realgud-lldb.el b/realgud-lldb.el index c98ea17..ba2247f 100644 --- a/realgud-lldb.el +++ b/realgud-lldb.el @@ -2,7 +2,7 @@ ;; Author: Rocky Bernstein ;; Version: 1.0 -;; Package-Requires: ((realgud "1.4.2") (cl-lib "0.5") (emacs "24")) +;; Package-Requires: ((realgud "1.4.2") (emacs "24")) ;; URL: http://github.com/rocky/realgud-lldb ;; Compatibility: GNU Emacs 24.x -- cgit v1.0 From 2b329f9792d029610ab6cd64431162001267186a Mon Sep 17 00:00:00 2001 From: rocky Date: Sat, 6 Aug 2016 23:14:13 -0400 Subject: Hack to use "global" to resolve names. --- lldb/core.el | 35 +++++++++++++++++++++++++++++++++++ lldb/init.el | 4 +++- 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/lldb/core.el b/lldb/core.el index 5e9e3bb..20341b0 100644 --- a/lldb/core.el +++ b/lldb/core.el @@ -41,6 +41,41 @@ 'realgud:lldb-minibuffer-history opt-debugger)) +(defvar realgud:lldb-file-remap (make-hash-table :test 'equal) + "How to remap lldb files in when we otherwise can't find in + the filesystem. The hash key is the file string we saw, and the + value is associated filesystem string presumably in the + filesystem") + +(defun realgud:lldb-find-file(filename) + "A find-file specific for lldb. We use `global' to map a +name to a filename. Failing that +we will prompt for a mapping and save that in `realgud:lldb-file-remap' when +that works." + (let ((resolved-filename filename) + (global-output) + (remapped-filename (gethash filename realgud:lldb-file-remap))) + (cond + ((and remapped-filename (stringp remapped-filename) + (file-exists-p remapped-filename)) remapped-filename) + ((file-exists-p filename) filename) + ((and (setq resolved-filename (shell-command-to-string (format "global -P %s" filename))) + (stringp resolved-filename) + (file-exists-p (setq resolved-filename (realgud:strip resolved-filename)))) + (puthash filename resolved-filename realgud:lldb-file-remap)) + ('t + (setq resolved-filename + (buffer-file-name + (compilation-find-file (point-marker) filename nil ""))) + (puthash filename resolved-filename realgud:lldb-file-remap))) + )) + +(defun realgud:lldb-loc-fn-callback(text filename lineno source-str + ignore-file-re cmd-mark) + (realgud:file-loc-from-line filename lineno + cmd-mark source-str nil + ignore-file-re 'realgud:lldb-find-file)) + (defun realgud:lldb-parse-cmd-args (orig-args) "Parse command line ARGS for the annotate level and name of script to debug. diff --git a/lldb/init.el b/lldb/init.el index 42a9e6e..a8c4961 100644 --- a/lldb/init.el +++ b/lldb/init.el @@ -38,7 +38,9 @@ realgud-loc-pat struct") ;; Some versions of lldb insert "frame" and some don't. (defconst realgud:lldb-frame-num-regexp (format "[ ]*\\(?:frame \\)?#%s[:]? " - realgud:regexp-captured-num realgud:regexp-captured-num)) + realgud:regexp-captured-num)) + +(setf (gethash "loc-callback-fn" realgud:lldb-pat-hash) 'realgud:lldb-loc-fn-callback) ;; realgud-loc-pat that describes a lldb location generally shown ;; before a command prompt. -- cgit v1.0 From f9959546dda144499681b12f4322df8d4e70e6f5 Mon Sep 17 00:00:00 2001 From: rocky Date: Sat, 6 Aug 2016 23:16:10 -0400 Subject: wrong name --- realgud-lldb.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/realgud-lldb.el b/realgud-lldb.el index ba2247f..4d0398d 100644 --- a/realgud-lldb.el +++ b/realgud-lldb.el @@ -35,7 +35,7 @@ (require 'load-relative) -(defgroup realgud-byebug nil +(defgroup realgud-lldb nil "Realgud interface to lldb" :group 'realgud :version "24.3") -- cgit v1.0 From 8adce8dee6b3d4fc81351880237ce0c2a98a9d7e Mon Sep 17 00:00:00 2001 From: rocky Date: Sat, 6 Aug 2016 23:19:26 -0400 Subject: Make sure we load lldb --- realgud-lldb.el | 1 + 1 file changed, 1 insertion(+) diff --git a/realgud-lldb.el b/realgud-lldb.el index 4d0398d..6158c42 100644 --- a/realgud-lldb.el +++ b/realgud-lldb.el @@ -41,6 +41,7 @@ :version "24.3") (require-relative-list '( "./lldb/lldb" ) "realgud-") +(load-relative "./lldb/lldb.el") (provide-me) -- cgit v1.0 From caed6efabb0c97d333ed844041b39f755dc8a7dd Mon Sep 17 00:00:00 2001 From: rocky Date: Sun, 7 Aug 2016 02:38:15 -0400 Subject: file remapping is buffer local --- lldb/lldb.el | 1 + realgud-lldb.el | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/lldb/lldb.el b/lldb/lldb.el index b400144..de64b4f 100644 --- a/lldb/lldb.el +++ b/lldb/lldb.el @@ -78,6 +78,7 @@ fringe and marginal icons. ) (if cmd-buf (with-current-buffer cmd-buf + (set (make-local-variable 'realgud:lldb-file-remap)) (realgud:remove-ansi-schmutz) ) ) diff --git a/realgud-lldb.el b/realgud-lldb.el index 6158c42..4d0398d 100644 --- a/realgud-lldb.el +++ b/realgud-lldb.el @@ -41,7 +41,6 @@ :version "24.3") (require-relative-list '( "./lldb/lldb" ) "realgud-") -(load-relative "./lldb/lldb.el") (provide-me) -- cgit v1.0