diff options
Diffstat (limited to 'lisp/cedet/semantic/debug.el')
| -rw-r--r-- | lisp/cedet/semantic/debug.el | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/lisp/cedet/semantic/debug.el b/lisp/cedet/semantic/debug.el index e4fe243302b..1b1639cbf14 100644 --- a/lisp/cedet/semantic/debug.el +++ b/lisp/cedet/semantic/debug.el @@ -36,7 +36,6 @@ ;; Each parser must implement the interface and override any methods as needed. ;; -(eval-when-compile (require 'cl)) (require 'semantic) (require 'eieio) (require 'cl-generic) @@ -171,7 +170,7 @@ These buffers are brought into view when layout occurs.") (cl-defmethod semantic-debug-highlight-lexical-token ((iface semantic-debug-interface) token) "For IFACE, highlight TOKEN in the source buffer . TOKEN is a lexical token." - (set-buffer (oref iface :source-buffer)) + (set-buffer (oref iface source-buffer)) (object-add-to-list iface 'overlays (semantic-lex-highlight-token token)) @@ -184,7 +183,7 @@ TOKEN is a lexical token." NONTERM is the name of the rule currently being processed that shows up as a nonterminal (or tag) in the source buffer. If RULE and MATCH indices are specified, highlight those also." - (set-buffer (oref iface :parser-buffer)) + (set-buffer (oref iface parser-buffer)) (let* ((rules (semantic-find-tags-by-class 'nonterminal (current-buffer))) (nt (semantic-find-first-tag-by-name nonterm rules)) @@ -194,12 +193,12 @@ If RULE and MATCH indices are specified, highlight those also." ;; I know it is the first symbol appearing in the body of this token. (goto-char (semantic-tag-start nt)) - (setq o (semantic-make-overlay (point) (progn (forward-sexp 1) (point)))) - (semantic-overlay-put o 'face 'highlight) + (setq o (make-overlay (point) (progn (forward-sexp 1) (point)))) + (overlay-put o 'face 'highlight) (object-add-to-list iface 'overlays o) - (semantic-debug-set-parser-location iface (semantic-overlay-start o)) + (semantic-debug-set-parser-location iface (overlay-start o)) (when (and rule match) @@ -216,20 +215,20 @@ If RULE and MATCH indices are specified, highlight those also." (setq match (1- match))) ;; Now highlight the thingy we find there. - (setq o (semantic-make-overlay (point) (progn (forward-sexp 1) (point)))) - (semantic-overlay-put o 'face 'highlight) + (setq o (make-overlay (point) (progn (forward-sexp 1) (point)))) + (overlay-put o 'face 'highlight) (object-add-to-list iface 'overlays o) ;; If we have a match for a sub-rule, have the parser position ;; move so we can see it in the output window for very long rules. - (semantic-debug-set-parser-location iface (semantic-overlay-start o)) + (semantic-debug-set-parser-location iface (overlay-start o)) )))) (cl-defmethod semantic-debug-unhighlight ((iface semantic-debug-interface)) "Remove all debugging overlays." - (mapc 'semantic-overlay-delete (oref iface overlays)) + (mapc #'delete-overlay (oref iface overlays)) (oset iface overlays nil)) ;; Call from the parser at a breakpoint @@ -361,7 +360,6 @@ Argument ONOFF is non-nil when we are entering debug mode. (semantic-debug-current-interface (let ((parserb (semantic-debug-find-parser-source))) (semantic-debug-interface - "Debug Interface" :parser-buffer parserb :parser-local-map (with-current-buffer parserb (current-local-map)) |