Remove remaining uses of defunct cl library

Author: purcell

purescript-align-imports.el

@@ -158,14 +158,14 @@
   "Merge together parts of an import statement that shouldn't be separated."
   (let ((parts (apply #'vector l))
         (join (lambda (ls)
-                (reduce (lambda (a b)
-                          (concat a
-                                  (if (and (> (length a) 0)
-                                           (> (length b) 0))
-                                      " "
-                                    "")
-                                  b))
-                        ls))))
+                (cl-reduce (lambda (a b)
+                             (concat a
+                                     (if (and (> (length a) 0)
+                                              (> (length b) 0))
+                                         " "
+                                       "")
+                                     b))
+                           ls))))
     (if purescript-align-imports-pad-after-name
         (list (funcall join (list (aref parts 0)
                                   (aref parts 1)
@@ -195,19 +195,19 @@
   "Find the padding for each part of the import statements."
   (if (null imports)
       imports
-    (reduce (lambda (a b) (mapcar* #'max a b))
-            (mapcar (lambda (x) (mapcar #'length (car x)))
-                    imports))))
+    (cl-reduce (lambda (a b) (cl-mapcar #'max a b))
+               (mapcar (lambda (x) (mapcar #'length (car x)))
+                       imports))))
 
 (defun purescript-align-imports-fill (padding line)
   "Fill an import line using the padding worked out from all statements."
   (mapconcat #'identity
-             (mapcar* (lambda (pad part)
-                        (if (> (length part) 0)
-                            (concat part (make-string (- pad (length part)) ? ))
-                          (make-string pad ? )))
-                      padding
-                      line)
+             (cl-mapcar (lambda (pad part)
+                          (if (> (length part) 0)
+                              (concat part (make-string (- pad (length part)) ? ))
+                            (make-string pad ? )))
+                        padding
+                        line)
              " "))
 
 (defun purescript-align-imports-line-match-it ()

purescript-font-lock.el

@@ -89,7 +89,7 @@
 
 (require 'purescript-mode)
 (require 'font-lock)
-(with-no-warnings (require 'cl))
+(require 'cl-lib)
 
 (defcustom purescript-font-lock-symbols nil
   "Display \\ and -> and such using symbols in fonts.
@@ -382,7 +382,7 @@ Returns keywords suitable for `font-lock-keywords'."
                         purescript-constructor-face
                       purescript-operator-face))))
     (unless (boundp 'font-lock-syntactic-keywords)
-      (case literate
+      (cl-case literate
         (bird
          (setq keywords
                `(("^[^>\n].*$" 0 purescript-comment-face t)
@@ -543,14 +543,14 @@ that should be commented under LaTeX-style literate scripts."
 ;;;###autoload
 (defun purescript-font-lock-choose-keywords ()
   (let ((literate (if (boundp 'purescript-literate) purescript-literate)))
-    (case literate
+    (cl-case literate
       (bird purescript-font-lock-bird-literate-keywords)
       ((latex tex) purescript-font-lock-latex-literate-keywords)
       (t purescript-font-lock-keywords))))
 
 (defun purescript-font-lock-choose-syntactic-keywords ()
   (let ((literate (if (boundp 'purescript-literate) purescript-literate)))
-    (case literate
+    (cl-case literate
       (bird purescript-bird-syntactic-keywords)
       ((latex tex) purescript-latex-syntactic-keywords)
       (t purescript-basic-syntactic-keywords))))

purescript-indent.el

@@ -89,7 +89,7 @@
 ;;; Code:
 
 (require 'purescript-string)
-(with-no-warnings (require 'cl))
+(require 'cl-lib)
 
 (defvar purescript-literate)
 
@@ -267,7 +267,7 @@ If so, return its start; otherwise return nil:
 If it is Bird-style, then return the position of the >;
 otherwise return the ending position of \\begin{code}."
   (save-excursion
-    (case purescript-literate
+    (cl-case purescript-literate
       (bird
        (beginning-of-line)
        (if (or (eq (following-char) ?\>)
@@ -374,7 +374,7 @@ location of the opening symbol, nil otherwise."
   "Check, starting from START, if END is at or within a comment.
 Returns the location of the start of the comment, nil otherwise."
   (let (pps)
-    (assert (<= start end))
+    (cl-assert (<= start end))
     (cond ((= start end) nil)
           ((nth 4 (save-excursion (setq pps (parse-partial-sexp start end))))
            (nth 8 pps))
@@ -580,7 +580,7 @@ Returns the location of the start of the comment, nil otherwise."
                 (if rpurs-sign (purescript-indent-push-pos rpurs-sign)
                   (purescript-indent-push-pos-offset valname))
               (purescript-indent-push-pos-offset valname)))
-        (case                           ; general case
+        (cl-case                           ; general case
             (purescript-indent-find-case test)
           ;; "1.1.11"   1= vn gd rh arh
           (1 (purescript-indent-push-pos valname)
@@ -681,7 +681,7 @@ Returns the location of the start of the comment, nil otherwise."
                   (purescript-indent-push-pos-offset valname))))
         (if (string= purescript-indent-current-line-first-ident "::")
             (if valname (purescript-indent-push-pos valname))
-          (case                         ; general case
+          (cl-case                         ; general case
               (purescript-indent-find-case test)
             ;; "1.1.11"   1= vn gd rh arh
             (1 (if is-where
@@ -776,7 +776,7 @@ than an identifier, a guard or rpurs."
       (if (and valname-string           ; special case for start keywords
                (string-match purescript-indent-start-keywords-re valname-string))
           (purescript-indent-push-pos-offset valname)
-        (case                           ; general case
+        (cl-case                           ; general case
             (purescript-indent-find-case test)
           ;; "1.1.11"   1= vn gd rh arh
           (1 (purescript-indent-push-pos aft-rpurs-sign))
@@ -819,11 +819,11 @@ than an identifier, a guard or rpurs."
       purescript-indent-info)))
 
 (defun purescript-indent-valdef-indentation (start end end-visible curr-line-type
-                                                indent-info)
+                                                   indent-info)
   "Find indentation information for a value definition."
   (let ((purescript-indent-info indent-info))
     (if (< start end-visible)
-        (case curr-line-type
+        (cl-case curr-line-type
           (empty (purescript-indent-empty start end end-visible indent-info))
           (ident (purescript-indent-ident start end end-visible indent-info))
           (guard (purescript-indent-guard start end end-visible indent-info))
@@ -839,7 +839,7 @@ Separate a line of program into valdefs between offside keywords
 and find indentation info for each part."
   (save-excursion
     ;; point is (already) at line-start
-    (assert (eq (point) line-start))
+    (cl-assert (eq (point) line-start))
     (let ((purescript-indent-info indent-info)
           (start (or (purescript-indent-in-comment line-start line-end)
                      (purescript-indent-in-string line-start line-end))))
@@ -1025,7 +1025,7 @@ See http://hackage.purescript.org/trac/purescript-prime/wiki/DoAndIfThenElse"
 (defun purescript-indent-closing-keyword (start)
   (let ((open (save-excursion
                 (purescript-indent-find-matching-start
-                 (case (char-after)
+                 (cl-case (char-after)
                    (?i "\\<\\(?:\\(in\\)\\|let\\)\\>")
                    (?o "\\<\\(?:\\(of\\)\\|case\\)\\>")
                    (?t "\\<\\(?:\\(then\\)\\|if\\)\\>")

purescript-indentation.el

@@ -33,7 +33,7 @@
 ;;; Code:
 
 (require 'syntax)
-(with-no-warnings (require 'cl))
+(require 'cl-lib)
 
 (defvar delete-active-region)
 
@@ -178,7 +178,7 @@ autofill-mode."
       (while (< (point) start)
         (if (= (char-after) ?\t)
             (setq cc (* 8 (+ 1 (/ cc 8))))
-          (incf cc))
+          (cl-incf cc))
         (forward-char))
       cc)))
 

purescript-package.el

@@ -27,7 +27,7 @@
 
 ;;; Code:
 
-(with-no-warnings (require 'cl))
+(require 'cl-lib)
 
 ;; Dynamically scoped variables.
 ;; TODO What actually sets this?
@@ -72,7 +72,7 @@
             name
             version))))
 
-(defstruct purescript-package "PureScript package object.")
+(cl-defstruct purescript-package "PureScript package object.")
 
 (defun purescript-package-parse (text)
   "Parse a package into a package object."
@@ -147,7 +147,7 @@
      (lambda (line)
        (string-match "^{?\\([a-zA-Z0-9-_]+\\)-\\([0-9.]+\\)}?$" line)
        (cons (match-string 1 line) (match-string 2 line)))
-     (delete-if
+     (cl-delete-if
       (lambda (line)
         (not (string-match "^{?[a-zA-Z0-9-_]+-[0-9.]+}?$" line)))
       lines))))

purescript-show.el

@@ -31,7 +31,7 @@
 
 (defvar sexp-show "sexp-show")
 (require 'purescript-string)
-(with-no-warnings (require 'cl))
+(require 'cl-lib)
 
 (defun purescript-show-replace-region ()
   "Replace the given region with a pretty printed version."
@@ -76,7 +76,7 @@
 
 (defun purescript-show-insert-pretty (column tree &optional parens)
   "Insert a Show `tree' into the current buffer with collapsible nodes."
-  (case (car tree)
+  (cl-case (car tree)
     ('list (let ((start (point)))
              (insert "[")
              (purescript-show-mapcar/i (lambda (x i len)
@@ -196,7 +196,7 @@
 
 (defun purescript-show-pretty (tree &optional parens)
   "Show a Show `tree'."
-  (case (car tree)
+  (cl-case (car tree)
     ('list (format "[%s]"
                    (mapconcat
                     (lambda (x)