emacs: Various cosmetic changes

[notmuch] / emacs / notmuch-parser.el

diff --git a/emacs/notmuch-parser.el b/emacs/notmuch-parser.el
index bb0379c102f653c2df12b08afd012186f3003a3e..3aa5bd8ff1cdc45f6265d9f2133e9e8b9e070c57 100644 (file)
--- a/emacs/notmuch-parser.el
+++ b/emacs/notmuch-parser.el
@@ -21,7 +21,7 @@
 
 ;;; Code:
 
 
 ;;; Code:
 

-(require 'cl)
+(eval-when-compile (require 'cl-lib))

 
 (defun notmuch-sexp-create-parser ()
   "Return a new streaming S-expression parser.
 
 (defun notmuch-sexp-create-parser ()
   "Return a new streaming S-expression parser.


@@ -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) ?\))


@@ -70,7 +65,7 @@ returns the value."
             ;; error to be consistent with all other code paths.
             (read (current-buffer))
           ;; Go up a level and return an end token
             ;; error to be consistent with all other code paths.
             (read (current-buffer))
           ;; Go up a level and return an end token

-          (decf (notmuch-sexp--depth sp))
+          (cl-decf (notmuch-sexp--depth sp))

           (forward-char)
           'end))
        ((= (char-after) ?\()
           (forward-char)
           'end))
        ((= (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)))


@@ -94,8 +89,8 @@ returns the value."
                                  (notmuch-sexp--partial-state sp)))
                      ;; A complete value is available if we've
                      ;; reached depth 0.
                                  (notmuch-sexp--partial-state sp)))
                      ;; A complete value is available if we've
                      ;; reached depth 0.

-                     (depth (first new-state)))
-                (assert (>= depth 0))
+                     (depth (car new-state)))
+                (cl-assert (>= depth 0))

                 (if (= depth 0)
                     ;; Reset partial parse state
                     (setf (notmuch-sexp--partial-state sp) nil
                 (if (= depth 0)
                     ;; Reset partial parse state
                     (setf (notmuch-sexp--partial-state sp) nil


@@ -134,12 +129,11 @@ 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) ?\()
         (forward-char)
   (skip-chars-forward " \n\r\t")
   (cond ((eobp) 'retry)
        ((= (char-after) ?\()
         (forward-char)

-        (incf (notmuch-sexp--depth sp))
+        (cl-incf (notmuch-sexp--depth sp))

         t)
        (t
         ;; Skip over the bad character like `read' does
         t)
        (t
         ;; Skip over the bad character like `read' does


@@ -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)


@@ -181,7 +173,7 @@ move point in the input buffer."
     (set (make-local-variable 'notmuch-sexp--state) 'begin))
   (let (done)
     (while (not done)
     (set (make-local-variable 'notmuch-sexp--state) 'begin))
   (let (done)
     (while (not done)

-      (case notmuch-sexp--state
+      (cl-case notmuch-sexp--state

        (begin
         ;; Enter the list
         (if (eq (notmuch-sexp-begin-list notmuch-sexp--parser) 'retry)
        (begin
         ;; Enter the list
         (if (eq (notmuch-sexp-begin-list notmuch-sexp--parser) 'retry)


@@ -190,7 +182,7 @@ move point in the input buffer."
        (result
         ;; Parse a result
         (let ((result (notmuch-sexp-read notmuch-sexp--parser)))
        (result
         ;; Parse a result
         (let ((result (notmuch-sexp-read notmuch-sexp--parser)))

-          (case result
+          (cl-case result

             (retry (setq done t))
             (end   (setq notmuch-sexp--state 'end))
             (t     (with-current-buffer result-buffer
             (retry (setq done t))
             (end   (setq notmuch-sexp--state 'end))
             (t     (with-current-buffer result-buffer


@@ -204,8 +196,4 @@ move point in the input buffer."
 
 (provide 'notmuch-parser)
 
 
 (provide 'notmuch-parser)
 

-;; Local Variables:
-;; byte-compile-warnings: (not cl-functions)
-;; End:
-

 ;;; notmuch-parser.el ends here
 ;;; notmuch-parser.el ends here