Merge pull request #508 from gracjan/pr-clean-up-haskell-string

Clean up haskell-string.el utiliy module.

Author: purcell

Makefile

@@ -49,7 +49,6 @@ ELFILES = \
 	haskell-show.el \
 	haskell-simple-indent.el \
 	haskell-sort-imports.el \
-	haskell-str.el \
 	haskell-string.el \
 	haskell-unicode-input-method.el \
 	haskell-utils.el \

haskell-indent.el

@@ -658,8 +658,8 @@ Returns the location of the start of the comment, nil otherwise."
           (string-match "where[ \t]*" haskell-indent-current-line-first-ident))
          (diff-first                 ; not a function def with the same name
           (or (null valname-string)
-              (not (string= (haskell-trim valname-string)
-                            (haskell-trim haskell-indent-current-line-first-ident)))))
+              (not (string= (haskell-string-trim valname-string)
+                            (haskell-string-trim haskell-indent-current-line-first-ident)))))
 
          ;; (is-type-def
          ;;  (and rhs-sign (eq (char-after rhs-sign) ?\:)))

haskell-interactive-mode.el

@@ -416,7 +416,7 @@ SESSION, otherwise operate on the current buffer.
       (message "%s"
                (concat (car lines)
                        (if (and (cdr lines) (stringp (cadr lines)))
-                           (format " [ %s .. ]" (haskell-string-take (haskell-trim (cadr lines)) 10))
+                           (format " [ %s .. ]" (haskell-string-take (haskell-string-trim (cadr lines)) 10))
                          ""))))))
 
 (defun haskell-interactive-mode-tab ()

haskell-process.el

@@ -29,7 +29,7 @@
 (require 'haskell-compat)
 (require 'haskell-session)
 (require 'haskell-customize)
-(require 'haskell-str)
+(require 'haskell-string)
 
 (defconst haskell-process-prompt-regex "\4"
   "Used for delimiting command replies. 4 is End of Transmission.")
@@ -264,17 +264,17 @@ This uses `accept-process-output' internally."
 (defun haskell-process-get-repl-completions (process inputstr)
   "Perform `:complete repl ...' query for INPUTSTR using PROCESS."
   (let* ((reqstr (concat ":complete repl "
-                         (haskell-str-literal-encode inputstr)))
+                         (haskell-string-literal-encode inputstr)))
          (rawstr (haskell-process-queue-sync-request process reqstr)))
     (if (string-prefix-p "unknown command " rawstr)
         (error "GHCi lacks `:complete' support")
       (let* ((s1 (split-string rawstr "\r?\n" t))
-             (cs (mapcar #'haskell-str-literal-decode (cdr s1)))
+             (cs (mapcar #'haskell-string-literal-decode (cdr s1)))
              (h0 (car s1))) ;; "<cnt1> <cnt2> <quoted-str>"
         (unless (string-match "\\`\\([0-9]+\\) \\([0-9]+\\) \\(\".*\"\\)\\'" h0)
           (error "Invalid `:complete' response"))
         (let ((cnt1 (match-string 1 h0))
-              (h1 (haskell-str-literal-decode (match-string 3 h0))))
+              (h1 (haskell-string-literal-decode (match-string 3 h0))))
           (unless (= (string-to-number cnt1) (length cs))
             (error "Lengths inconsistent in `:complete' reponse"))
           (cons h1 cs))))))

haskell-show.el

@@ -51,7 +51,7 @@
 (defun haskell-show-parse-and-insert (given)
   "Parse a `string' containing a Show instance value and insert
   it pretty printed into the current buffer."
-  (when (not (string= "" (haskell-trim given)))
+  (when (not (string= "" (haskell-string-trim given)))
     (let ((current-column (- (point)
                              (line-beginning-position)))
           (result (haskell-show-parse given)))