emacs: Various cosmetic changes

[notmuch] / emacs / notmuch-parser.el

diff --git a/emacs/notmuch-parser.el b/emacs/notmuch-parser.el
index dc9fbe2f33911ec48294804de1098269a0f03426..3aa5bd8ff1cdc45f6265d9f2133e9e8b9e070c57 100644 (file)
--- a/emacs/notmuch-parser.el
+++ b/emacs/notmuch-parser.el
@@ -38,14 +38,10 @@ can return 'retry to indicate that not enough input is available.
 The parser always consumes input from point in the current
 buffer.  Hence, the caller is allowed to delete any data before
 point and may resynchronize after an error by moving point."
 The parser always consumes input from point in the current
 buffer.  Hence, the caller is allowed to delete any data before
 point and may resynchronize after an error by moving point."

-

   (vector 'notmuch-sexp-parser
   (vector 'notmuch-sexp-parser

-         ;; List depth
-         0
-         ;; Partial parse position marker
-         nil
-         ;; Partial parse state
-         nil))
+         0     ; List depth
+         nil   ; Partial parse position marker
+         nil)) ; Partial parse state

 
 (defmacro notmuch-sexp--depth (sp)         `(aref ,sp 1))
 (defmacro notmuch-sexp--partial-pos (sp)   `(aref ,sp 2))
 
 (defmacro notmuch-sexp--depth (sp)         `(aref ,sp 1))
 (defmacro notmuch-sexp--partial-pos (sp)   `(aref ,sp 2))


@@ -60,7 +56,6 @@ parser is currently inside a list and the next token ends the
 list, this moves point just past the terminator and returns 'end.
 Otherwise, this moves point to just past the end of the value and
 returns the value."
 list, this moves point just past the terminator and returns 'end.
 Otherwise, this moves point to just past the end of the value and
 returns the value."

-

   (skip-chars-forward " \n\r\t")
   (cond ((eobp) 'retry)
        ((= (char-after) ?\))
   (skip-chars-forward " \n\r\t")
   (cond ((eobp) 'retry)
        ((= (char-after) ?\))


@@ -80,7 +75,7 @@ returns the value."
         ;; parse, extend the partial parse to figure out when we
         ;; have a complete list.
         (catch 'return
         ;; parse, extend the partial parse to figure out when we
         ;; have a complete list.
         (catch 'return

-          (when (null (notmuch-sexp--partial-state sp))
+          (unless (notmuch-sexp--partial-state sp)

             (let ((start (point)))
               (condition-case nil
                   (throw 'return (read (current-buffer)))
             (let ((start (point)))
               (condition-case nil
                   (throw 'return (read (current-buffer)))


@@ -134,7 +129,6 @@ a list, it moves point past the token that opens the list and
 returns t.  Later calls to `notmuch-sexp-read' will return the
 elements inside the list.  If the input in buffer is not the
 beginning of a list, throw invalid-read-syntax."
 returns t.  Later calls to `notmuch-sexp-read' will return the
 elements inside the list.  If the input in buffer is not the
 beginning of a list, throw invalid-read-syntax."

-

   (skip-chars-forward " \n\r\t")
   (cond ((eobp) 'retry)
        ((= (char-after) ?\()
   (skip-chars-forward " \n\r\t")
   (cond ((eobp) 'retry)
        ((= (char-after) ?\()


@@ -151,7 +145,6 @@ beginning of a list, throw invalid-read-syntax."
 
 Moves point to the beginning of any trailing data or to the end
 of the buffer if there is only trailing whitespace."
 
 Moves point to the beginning of any trailing data or to the end
 of the buffer if there is only trailing whitespace."

-

   (skip-chars-forward " \n\r\t")
   (unless (eobp)
     (error "Trailing garbage following expression")))
   (skip-chars-forward " \n\r\t")
   (unless (eobp)
     (error "Trailing garbage following expression")))


@@ -173,7 +166,6 @@ complete value in the list.  It operates incrementally and should
 be called whenever the input buffer has been extended with
 additional data.  The caller just needs to ensure it does not
 move point in the input buffer."
 be called whenever the input buffer has been extended with
 additional data.  The caller just needs to ensure it does not
 move point in the input buffer."

-

   ;; Set up the initial state
   (unless (local-variable-p 'notmuch-sexp--parser)
     (set (make-local-variable 'notmuch-sexp--parser)
   ;; Set up the initial state
   (unless (local-variable-p 'notmuch-sexp--parser)
     (set (make-local-variable 'notmuch-sexp--parser)