@@ -10,7 +10,7 @@ (declare-function dbgr-set-arrow (src-marker)) (declare-function dbgr-scriptbuf-init(a b c d)) -(declare-function dbgr-unset-arrow()) +(declare-function dbgr-unset-arrow(marker)) (declare-function dbgr-proc-src-marker (a)) (declare-function dbgr-track-set-debugger (name)) dbgr-core.el @@ -15,9 +15,9 @@ "Our own location type. Even though a mark contains a file-name (via a buffer) and a line number (via an offset), we want to save the values that were seen/requested originally." - (filename :type string) - (line-number :type integer) - (marker :type marker)) + (filename) + (line-number) + (marker)) (defalias 'dbgr-loc? 'dbgr-loc-p) dbgr-loc.el @@ -10,9 +10,12 @@ (require 'ring) (eval-when-compile (require 'cl) - (setq load-path (cons nil (cons ".." load-path))) - (load "dbgr-loc") - (setq load-path (cddr load-path))) + ) + +(require 'load-relative) +(provide 'dbgr-lochist) +(load-relative "dbgr-loc" 'dbgr-loc-hist) + (defcustom dbgr-loc-hist-size 10 ; For testing. Should really be larger. @@ -22,7 +25,7 @@ (defstruct dbgr-loc-hist "A list of source-code positions recently encountered" - (position -1 :type integer) + (position -1) (ring (make-ring dbgr-loc-hist-size) :type (type-of make-ring 0))) (defun dbgr-loc-hist-item-at(loc-hist position) dbgr-lochist.el @@ -1,13 +1,20 @@ ;;; dbgr-procbuf.el --- debugger process buffer things -(require 'cl) +(eval-when-compile + (require 'cl) + (defvar dbgr-info) + (defvar cl-struct-dbgr-loc-tags) ;; ?? + (declare-function dbgr-unset-arrow (marker)) + (declare-function make-dbgr-loc-hist ()) + ) +(declare-function dbgr-loc-hist-item (item)) (defstruct dbgr-info "The debugger object/structure specific to a process buffer." - (name :type string) ; Name of debugger - (loc-regexp :type string) ; Location regular expression string + (name) ; Name of debugger + (loc-regexp) ; Location regular expression string ; FIXME: use include? - (file-group :type integer) - (line-group :type integer) + (file-group) + (line-group) (loc-hist) ; ring of locations seen in the course of execution ; see dbgr-lochist ) @@ -16,11 +23,9 @@ (provide 'dbgr-procbuf) (require 'load-relative) -(load-relative "dbgr-loc" 'dbgr-procbuf) +(load-relative '("dbgr-arrow" "dbgr-loc") 'dbgr-procbuf) -(declare-function make-dbgr-loc-hist ()) - -(defun dbgr-procbuf-init +(defun dbgr-procbuf-init (proc-buffer &optional debugger-name loc-regexp file-group line-group) "Initialize PROC-BUFFER for a working with a debugger. DEBUGGER-NAME is the name of the debugger. dbgr-procbuf.el @@ -13,9 +13,9 @@ (defstruct dbgr-loc-pat "Information to match and extract a file and line number location from a string output by a debugger inside a process shell" - (regexp :type string) - (file-group :type integer) - (line-group :type integer)) + (regexp) + (file-group) + (line-group)) (defvar dbgr-pat-hash (make-hash-table :test 'equal) "Hash key is the debugger name, a string. The values of a hash entry dbgr-regexp.el @@ -1,5 +1,8 @@ ;;; dbgr-scriptbuf.el --- code for a source-code buffer -(eval-when-compile (require 'cl)) +(eval-when-compile + (require 'cl) + (defvar dbgr-scriptbuf-info) ;; is buffer local + ) (defstruct dbgr-scriptbuf-info dbgr-scriptbuf.el @@ -3,9 +3,6 @@ (defconst dbgr-track-char-range 10000 "Max number of characters from end of buffer to search for stack entry.") - -(eval-when-compile (require 'cl)) - ;; Shell process buffers that we can hook into: (require 'esh-mode) (require 'comint) @@ -13,12 +10,30 @@ (require 'load-relative) (provide 'dbgr-track) (load-relative - '("dbgr-loc" "dbgr-lochist" "dbgr-file" "dbgr-procbuf" + '("dbgr-arrow" "dbgr-loc" "dbgr-lochist" "dbgr-file" "dbgr-procbuf" "dbgr-scriptbuf" "dbgr-window" "dbgr-regexp") 'dbgr-track) +(eval-when-compile + (require 'cl) + (defvar cl-struct-dbgr-info-tags) ;; ?? + (defvar cl-struct-dbgr-loc-pat) ;; ?? + (defvar cl-struct-dbgr-loc-pat-tags) ;; ?? + (defvar cl-struct-dbgr-loc-tags) ;; ?? + (defvar dbgr-pat-hash) ;; in dbgr-regexp + (defvar dbgr-track-mode) ;; in dbgr-track-mode +) (declare-function dbgr-proc-src-marker ()) -(declare-function dbgr-procbuf-init (a &optional b c d e)) +(declare-function dbgr-loc-goto(loc &optional window-fn &rest args)) +(declare-function dbgr-procbuf-init(proc-buffer + debugger-name loc-regexp + file-group line-group)) +(declare-function dbgr-loc-hist-item(item)) +(declare-function dbgr-proc-loc-hist(proc-buff)) (declare-function dbgr-scriptbuf-init-or-update (a b)) +(declare-function dbgr-unset-arrow(marker)) +(declare-function dbgr-loc-hist-index (loc-hist)) +(declare-function dbgr-loc-hist-add(loc-hist item)) +(declare-function dbgr-file-loc-from-line (filename line-number)) (make-variable-buffer-local 'dbgr-track-mode) @@ -52,7 +67,6 @@ location(s), if any, and run the action(s) associated with We use marks set in buffer-local variables to extract text" ; FIXME: Add unwind-protect? - (make-variable-buffer-local 'dbgr-track-mode) (if dbgr-track-mode (lexical-let ((proc-buff (current-buffer)) (loc (dbgr-track-from-region eshell-last-output-start dbgr-track.el c764480995d0d5c69cfbc5c2bb86bdd0a842d276 R. Bernstein rocky@gnu.org http://github.com/rocky/emacs-dbgr/commit/645fa709bf47c07481142fd2a9e31c501df9ca74 645fa709bf47c07481142fd2a9e31c501df9ca74 2009-11-09T12:47:43-08:00 2009-11-09T12:47:43-08:00 Remove byte-compile warnings. 4668bba4c988ee3d856a9809e132ceda2afcb030 R. Bernstein rocky@gnu.org