mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-23 07:19:15 +00:00
Code Issues Releases Activity

* lisp/json.el (json-end-of-file): New error.

Browse Source 
Fixes: debbugs:19768

(json-pop, json-read): Use it.
This commit is contained in:
Era Eriksson 2015-02-05 14:52:03 -05:00 committed by Stefan Monnier
parent f06902840e
commit 6aa04a5570
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
2015-02-05 Era Eriksson <era+emacs@iki.fi>
* json.el (json-end-of-file): New error (bug#19768).
(json-pop, json-read): Use it.
2015-02-05 Kelly Dean <kelly@prtime.org> 2015-02-05 Kelly Dean <kelly@prtime.org>
* help-mode.el (help-xref-interned): Pass BUFFER and FRAME to * help-mode.el (help-xref-interned): Pass BUFFER and FRAME to
@ -14384,7 +14389,7 @@
Change default to "# encoding: %s" to differentiate it from the Change default to "# encoding: %s" to differentiate it from the
default Ruby encoding comment template. default Ruby encoding comment template.
2013-11-20 era eriksson <era+emacsbugs@iki.fi> 2013-11-20 Era Eriksson <era+emacsbugs@iki.fi>
* ses.el (ses-mode): Doc fix. (Bug#14748) * ses.el (ses-mode): Doc fix. (Bug#14748)

6
lisp/json.el
View File

@ -166,7 +166,7 @@ without indentation.")
"Advance past the character at point, returning it." "Advance past the character at point, returning it."
(let ((char (json-peek))) (let ((char (json-peek)))
(if (eq char :json-eof) (if (eq char :json-eof)
(signal 'end-of-file nil) (signal 'json-end-of-file nil)
(json-advance) (json-advance)
char))) char)))
@ -186,6 +186,8 @@ without indentation.")
(define-error 'json-string-format "Bad string format" 'json-error) (define-error 'json-string-format "Bad string format" 'json-error)
(define-error 'json-key-format "Bad JSON object key" 'json-error) (define-error 'json-key-format "Bad JSON object key" 'json-error)
(define-error 'json-object-format "Bad JSON object" 'json-error) (define-error 'json-object-format "Bad JSON object" 'json-error)
(define-error 'json-end-of-file "End of file while parsing JSON"
'(end-of-file json-error))
@ -554,7 +556,7 @@ Advances point just past JSON object."
(if (functionp (car record)) (if (functionp (car record))
(apply (car record) (cdr record)) (apply (car record) (cdr record))
(signal 'json-readtable-error record))) (signal 'json-readtable-error record)))
(signal 'end-of-file nil)))) (signal 'json-end-of-file nil))))
;; Syntactic sugar for the reader ;; Syntactic sugar for the reader