Browse Source

use org-babel-result-cond in Haskell code blocks

* lisp/ob-haskell.el (org-babel-execute:haskell): Use
  org-babel-result-cond in Haskell code blocks.
Eric Schulte 12 years ago
parent
commit
4b51984fe7
1 changed files with 6 additions and 5 deletions
  1. 6 5
      lisp/ob-haskell.el

+ 6 - 5
lisp/ob-haskell.el

@@ -78,11 +78,12 @@
                    (cdr (member org-babel-haskell-eoe
                                 (reverse (mapcar #'org-babel-trim raw)))))))
     (org-babel-reassemble-table
-     (cond
-      ((equal result-type 'output)
-       (mapconcat #'identity (reverse (cdr results)) "\n"))
-      ((equal result-type 'value)
-       (org-babel-haskell-table-or-string (car results))))
+     ((lambda (result)
+	(org-babel-result-cond (cdr (assoc :result-params params))
+	  result (org-babel-haskell-table-or-string result)))
+      (case result-type
+	('output (mapconcat #'identity (reverse (cdr results)) "\n"))
+	('value (car results))))
      (org-babel-pick-name (cdr (assoc :colname-names params))
 			  (cdr (assoc :colname-names params)))
      (org-babel-pick-name (cdr (assoc :rowname-names params))