emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/realgud-lldb 4bfd53a 49/56: Emacs lint in preparation f


From: Rocky Bernstein
Subject: [elpa] externals/realgud-lldb 4bfd53a 49/56: Emacs lint in preparation for Melpa release
Date: Thu, 23 May 2019 02:11:47 -0400 (EDT)

branch: externals/realgud-lldb
commit 4bfd53adda81047d2c1bf5541789e59d308f146c
Author: rocky <address@hidden>
Commit: rocky <address@hidden>

    Emacs lint in preparation for Melpa release
---
 lldb/init.el             |  9 ++++++---
 test/test-lldb.el        | 28 ++++++++++++++--------------
 test/test-regexp-lldb.el |  8 ++++----
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/lldb/init.el b/lldb/init.el
index 4f51277..aa20598 100644
--- a/lldb/init.el
+++ b/lldb/init.el
@@ -19,14 +19,17 @@
 
 (require 'realgud)
 
-(defvar realgud-pat-hash)
-(declare-function make-realgud-loc-pat (realgud-loc))
-
 (defvar realgud--lldb-pat-hash (make-hash-table :test 'equal)
   "hash key is the what kind of pattern we want to match:
 backtrace, prompt, etc.  the values of a hash entry is a
 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'.")
+(declare-function make-realgud-loc-pat (realgud-loc))
+
 (declare-function make-realgud-loc "realgud-loc" (a b c d e f))
 
 
diff --git a/test/test-lldb.el b/test/test-lldb.el
index 7db0984..32a131d 100644
--- a/test/test-lldb.el
+++ b/test/test-lldb.el
@@ -7,21 +7,21 @@
 (load-file "./regexp-helper.el")
 
 (eval-when-compile
-  (defvar realgud:lldb-minibuffer-history)
+  (defvar realgud--lldb-minibuffer-history)
   (defvar test:realgud-lldb-executable-save)
   (defvar test:realgud-minibuffer-history-save)
 )
 
-(declare-function realgud:lldb-suggest-invocation 'realgud:bashdb)
+(declare-function realgud--lldb-suggest-invocation 'realgud:bashdb)
 (declare-function __FILE__              'require-relative)
 
 (test-simple-start)
 
 ;; Save value realgud:run-process and change it to something we want
-(setq test:realgud-lldb-executable-save (symbol-function 
'realgud:lldb-executable))
-(setq test:realgud-minibuffer-history-save realgud:lldb-minibuffer-history)
+(setq test:realgud-lldb-executable-save (symbol-function 
'realgud--lldb-executable))
+(setq test:realgud-minibuffer-history-save realgud--lldb-minibuffer-history)
 
-(defun realgud:lldb-executable (filename)
+(defun realgud--lldb-executable (filename)
   "Mock function for testing"
   (cond ((equal filename "bar.sh") 7)
        ((equal filename "foo") 8)
@@ -29,29 +29,29 @@
        (t 3)))
 
 (defun lldb-test()
-  (note "realgud:lldb-suggest-invocation")
-  (setq realgud:lldb-minibuffer-history nil)
+  (note "realgud--lldb-suggest-invocation")
+  (setq realgud--lldb-minibuffer-history nil)
   (let ((my-directory (file-name-directory (__FILE__))))
     (save-excursion
       (note "Test preference to buffer editing")
       (setq default-directory
            (concat my-directory "lldb"))
       (find-file-literally "foo.c")
-      (assert-equal "lldb foo" (realgud:lldb-suggest-invocation)
+      (assert-equal "lldb foo" (realgud--lldb-suggest-invocation)
                    "Should find file sans extension - foo")
       (find-file-literally "baz.c")
-      (assert-equal "lldb baz" (realgud:lldb-suggest-invocation)
+      (assert-equal "lldb baz" (realgud--lldb-suggest-invocation)
                    "Should find file sans extension - baz")
       )
     (save-excursion
       (note "Pick up non-sans executable")
       (setq default-directory
            (concat my-directory  "lldb/test2"))
-      ;; (assert-equal "lldb bar.sh" (realgud:lldb-suggest-invocation))
-      (setq realgud:lldb-minibuffer-history '("lldb testing"))
+      ;; (assert-equal "lldb bar.sh" (realgud--lldb-suggest-invocation))
+      (setq realgud--lldb-minibuffer-history '("lldb testing"))
       (setq default-directory
            (concat my-directory  "lldb/test2"))
-      (assert-equal "lldb testing" (realgud:lldb-suggest-invocation)
+      (assert-equal "lldb testing" (realgud--lldb-suggest-invocation)
                    "After setting minibuffer history - takes precidence")
       )
     (setq default-directory my-directory)
@@ -62,6 +62,6 @@
 
 ;; Restore the old values.
 ;; You might have to run the below if you run this interactively.
-(fset 'realgud:lldb-executable test:realgud-lldb-executable-save)
-(setq realgud:lldb-minibuffer-history test:realgud-minibuffer-history-save)
+(fset 'realgud--lldb-executable test:realgud-lldb-executable-save)
+(setq realgud--lldb-minibuffer-history test:realgud-minibuffer-history-save)
 (setq default-directory (file-name-directory (__FILE__)))
diff --git a/test/test-regexp-lldb.el b/test/test-regexp-lldb.el
index 21cb4d6..8f8e136 100644
--- a/test/test-regexp-lldb.el
+++ b/test/test-regexp-lldb.el
@@ -18,7 +18,7 @@
   (defvar loc-pat)       (defvar prompt-pat)       (defvar bps-pat)
   (defvar file-group)    (defvar line-group)       (defvar test-pos)
   (defvar test-dbgr)     (defvar test-text)        (defvar realgud-bt-pat)
-  (defvar realgud-bt-re) (defvar realgud:lldb-pat-hash)
+  (defvar realgud-bt-re) (defvar realgud--lldb-pat-hash)
 )
 
 ; Some setup usually done in setting up the buffer.
@@ -48,7 +48,7 @@
 ;;                         test-text) "extract line number")
 (note "debugger-backtrace")
 (setq realgud-bt-pat  (gethash "debugger-backtrace"
-                           realgud:lldb-pat-hash))
+                              realgud--lldb-pat-hash))
 (setq test-text
       "#0  main (argc=2, argv=0xbffff564, envp=0xbffff570) at main.c:935
 #1  0xb7e9f4a5 in *__GI___strdup (s=0xbffff760 \"/tmp/remake/remake\") at 
strdup.c:42
@@ -108,7 +108,7 @@
                         (match-end line-group)))
 
 (set (make-local-variable 'bps-pat)
-     (gethash "brkpt-set"  realgud:lldb-pat-hash))
+     (gethash "brkpt-set"  realgud--lldb-pat-hash))
 
 (setq test-text "Breakpoint 1: where = solptest`main + 9 at 
unit_test_main.ipp:303:12, address = 0x00000001002380d9")
 
@@ -162,7 +162,7 @@
 
 (note "prompt")
 (set (make-local-variable 'prompt-pat)
-     (gethash "prompt" realgud:lldb-pat-hash))
+     (gethash "prompt" realgud--lldb-pat-hash))
 (prompt-match "(lldb) ")
 
 (end-tests)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]