support more elisp types

- ring
- vector
- hash-table

Author: knupfer

haskell-emacs.el

@@ -258,9 +258,15 @@ Read C-h f haskell-emacs-init for more instructions")
   "Take XS and remove recursively all text properties."
   (if (stringp xs)
       (substring-no-properties xs)
-    (if (listp xs)
-        (mapcar 'haskell-emacs--no-properties xs)
-      xs)))
+    (if (ring-p xs)
+        (haskell-emacs--no-properties (ring-elements xs))
+      (if (or (listp xs) (vectorp xs) (bool-vector-p xs))
+          (mapcar 'haskell-emacs--no-properties xs)
+        (if (hash-table-p xs)
+            (let ((pairs))
+              (maphash (lambda (k v) (push (list k v) pairs)) xs)
+              (haskell-emacs--no-properties pairs))
+          xs)))))
 
 (defun haskell-emacs--fun-wrapper (fun args docs)
   "Take FUN with ARGS and return wrappers in elisp with the DOCS."

test/HaskellEmacsTest.hs

@@ -3,6 +3,7 @@
 module HaskellEmacsTest where
 
 import           Control.Monad
+import           Data.Char
 import qualified Data.Text        as T
 import           External.NBody
 import           Foreign.Emacs
@@ -56,6 +57,17 @@ allTrue = and
 anyTrue :: [Bool] -> Bool
 anyTrue = or
 
+-- Char
+
+nextChar :: Char -> Char
+nextChar = chr . succ . ord
+
+-- Lisp
+
+symbolReverse :: Lisp -> Lisp
+symbolReverse (Symbol s) = Symbol $ T.reverse s
+symbolReverse x          = x
+
 -- Num
 
 nextNum :: Int -> Int

test/haskell-emacs-test.el

@@ -75,6 +75,23 @@
      ((HaskellEmacsTest.concatFst '(("a" 1) ("b" 2) ("c" 3))) "abc")
      ((HaskellEmacsTest.longAnswer 2) "aaaa")
      ((HaskellEmacsTest.nthFib 10) 55)
+;;;; Supported types,  look at #38
+     ((HaskellEmacsTest.nextNum 7) 8)
+     ((HaskellEmacsTest.multiply 4.5 2.0) 9.0)
+     ((HaskellEmacsTest.nextChar "a") "b")
+     ((HaskellEmacsTest.symbolReverse 'abcd) dcba)
+     ((HaskellEmacsTest.summation [1 2 3]) 6)
+     ((HaskellEmacsTest.allTrue (make-bool-vector 3 t)) t)
+     ((HaskellEmacsTest.summation (let ((r (make-ring 5)))
+                                    (ring-insert r 1)
+                                    (ring-insert r 2)
+                                    r)) 3)
+     ((HaskellEmacsTest.concatFst (let ((h (make-hash-table)))
+                                    (puthash "c" 12 h)
+                                    (puthash "b" 17 h)
+                                    (puthash "a" 22 h)
+                                    h)) "abc")
+;;;;
      ((mapcar 'eval (list (HaskellEmacsTest.multiply-async 2 4)
                           (HaskellEmacsTest.multiply-async 1 9)
                           (HaskellEmacsTest.multiply-async 10 15)))