mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-26 07:11:34 -08:00
Code Issues Projects Releases Wiki Activity

* lisp/emacs-lisp/edebug.el (edebug-read-list): Phase out old-style backquotes.

Browse source
This commit is contained in:
Stefan Monnier 2010-06-18 10:05:43 -04:00
parent dbd6da7865
commit b1a03ef6bf
2 changed files with 13 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2010-06-18 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/edebug.el (edebug-read-list):
Phase out old-style backquotes.
2010-06-17 Juri Linkov <juri@jurta.org> 2010-06-17 Juri Linkov <juri@jurta.org>
* help-mode.el (help-mode): Set buffer-local variable * help-mode.el (help-mode): Set buffer-local variable

34
lisp/emacs-lisp/edebug.el
View file

@ -885,17 +885,12 @@ already is one.)"
(edebug-storing-offsets (1- (point)) 'quote) (edebug-storing-offsets (1- (point)) 'quote)
(edebug-read-storing-offsets stream))) (edebug-read-storing-offsets stream)))
(defvar edebug-read-backquote-level 0
"If non-zero, we're in a new-style backquote.
It should never be negative. This controls how we read comma constructs.")
(defun edebug-read-backquote (stream) (defun edebug-read-backquote (stream)
;; Turn `thing into (\` thing) ;; Turn `thing into (\` thing)
(forward-char 1) (forward-char 1)
(list (list
(edebug-storing-offsets (1- (point)) '\`) (edebug-storing-offsets (1- (point)) '\`)
(let ((edebug-read-backquote-level (1+ edebug-read-backquote-level))) (edebug-read-storing-offsets stream)))
(edebug-read-storing-offsets stream))))
(defun edebug-read-comma (stream) (defun edebug-read-comma (stream)
;; Turn ,thing into (\, thing). Handle ,@ and ,. also. ;; Turn ,thing into (\, thing). Handle ,@ and ,. also.
@ -910,12 +905,9 @@ It should never be negative. This controls how we read comma constructs.")
(forward-char 1))) (forward-char 1)))
;; Generate the same structure of offsets we would have ;; Generate the same structure of offsets we would have
;; if the resulting list appeared verbatim in the input text. ;; if the resulting list appeared verbatim in the input text.
(if (zerop edebug-read-backquote-level) (list
(edebug-storing-offsets opoint symbol) (edebug-storing-offsets opoint symbol)
(list (edebug-read-storing-offsets stream)))))
(edebug-storing-offsets opoint symbol)
(let ((edebug-read-backquote-level (1- edebug-read-backquote-level)))
(edebug-read-storing-offsets stream)))))))
(defun edebug-read-function (stream) (defun edebug-read-function (stream)
;; Turn #'thing into (function thing) ;; Turn #'thing into (function thing)
@ -937,17 +929,7 @@ It should never be negative. This controls how we read comma constructs.")
(prog1 (prog1
(let ((elements)) (let ((elements))
(while (not (memq (edebug-next-token-class) '(rparen dot))) (while (not (memq (edebug-next-token-class) '(rparen dot)))
(if (and (eq (edebug-next-token-class) 'backquote) (push (edebug-read-storing-offsets stream) elements))
(null elements)
(zerop edebug-read-backquote-level))
(progn
;; Old style backquote.
(forward-char 1) ; Skip backquote.
;; Call edebug-storing-offsets here so that we
;; produce the same offsets we would have had
;; if the backquote were an ordinary symbol.
(push (edebug-storing-offsets (1- (point)) '\`) elements))
(push (edebug-read-storing-offsets stream) elements)))
(setq elements (nreverse elements)) (setq elements (nreverse elements))
(if (eq 'dot (edebug-next-token-class)) (if (eq 'dot (edebug-next-token-class))
(let (dotted-form) (let (dotted-form)
@ -4455,7 +4437,7 @@ With prefix argument, make it a temporary breakpoint."
(add-hook 'cl-load-hook (add-hook 'cl-load-hook
(function (lambda () (require 'cl-specs))))) (function (lambda () (require 'cl-specs)))))
;;; edebug-cl-read and cl-read are available from liberte@cs.uiuc.edu ;; edebug-cl-read and cl-read are available from liberte@cs.uiuc.edu
(if (featurep 'cl-read) (if (featurep 'cl-read)
(add-hook 'edebug-setup-hook (add-hook 'edebug-setup-hook
(function (lambda () (require 'edebug-cl-read)))) (function (lambda () (require 'edebug-cl-read))))
@ -4466,8 +4448,8 @@ With prefix argument, make it a temporary breakpoint."
;;; Finalize Loading ;;; Finalize Loading
;;; Finally, hook edebug into the rest of Emacs. ;; Finally, hook edebug into the rest of Emacs.
;;; There are probably some other things that could go here. ;; There are probably some other things that could go here.
;; Install edebug read and eval functions. ;; Install edebug read and eval functions.
(edebug-install-read-eval-functions) (edebug-install-read-eval-functions)