adding support for Haskell

This commit is contained in:
Eric Schulte 2009-08-27 08:03:02 -06:00
parent e37cea2f24
commit 493e79eaf7
3 changed files with 128 additions and 2 deletions

View File

@ -0,0 +1,102 @@
;;; org-babel-haskell.el --- org-babel functions for haskell evaluation
;; Copyright (C) 2009 Eric Schulte
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
;; Version: 0.01
;;; License:
;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation; either version 3, or (at your option)
;; any later version.
;;
;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;;
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
;; Boston, MA 02110-1301, USA.
;;; Commentary:
;; Org-Babel support for evaluating haskell source code. This one will
;; be sort of tricky because haskell programs must be compiled before
;; they can be run, but haskell code can also be run through an
;; interactive interpreter.
;;
;; For now lets only allow evaluation using the haskell interpreter.
;;; Requirements:
;; - haskell-mode :: http://www.iro.umontreal.ca/~monnier/elisp/#haskell-mode
;;
;; - inf-haskell :: http://www.iro.umontreal.ca/~monnier/elisp/#haskell-mode
;;; Code:
(require 'org-babel)
(require 'haskell-mode)
(require 'inf-haskell)
(org-babel-add-interpreter "haskell")
(add-to-list 'org-babel-tangle-langs '("haskell" "hs"))
(defvar org-babel-haskell-eoe "\"org-babel-haskell-eoe\"")
(defun org-babel-execute:haskell (body params)
"Execute a block of Haskell code with org-babel. This function
is called by `org-babel-execute-src-block' with the following
variables pre-set using `multiple-value-bind'.
(session vars result-params result-type)"
(message "executing haskell source code block")
(let* ((full-body (concat
(mapconcat
(lambda (pair) (format "let %s = %s;" (car pair) (cdr pair)))
vars "\n") "\n" body "\n"))
(session (org-babel-prep-session:haskell session params))
(raw (org-babel-comint-with-output session org-babel-haskell-eoe t
(insert (org-babel-trim full-body))
(comint-send-input nil t)
(insert org-babel-haskell-eoe)
(comint-send-input nil t)))
(results (mapcar
#'org-babel-haskell-read-string
(cdr (member org-babel-haskell-eoe
(reverse (mapcar #'org-babel-trim raw)))))))
(case result-type
(output (mapconcat #'identity (reverse (cdr results)) "\n"))
(value (org-babel-haskell-table-or-string (car results))))))
(defun org-babel-haskell-read-string (string)
"Strip \\\"s from around haskell string"
(if (string-match "\"\\([^\000]+\\)\"" string)
(match-string 1 string)
string))
(defun org-babel-prep-session:haskell (session params)
"Prepare SESSION according to the header arguments specified in PARAMS."
(save-window-excursion (run-haskell) (current-buffer)))
(defun org-babel-haskell-table-or-string (results)
"If the results look like a table, then convert them into an
Emacs-lisp table, otherwise return the results as a string."
(org-babel-read
(if (and (stringp results) (string-match "^\\[.+\\]$" results))
(org-babel-read
(replace-regexp-in-string
"\\[" "(" (replace-regexp-in-string
"\\]" ")" (replace-regexp-in-string
"," " " (replace-regexp-in-string
"'" "\"" results)))))
results)))
(provide 'org-babel-haskell)
;;; org-babel-haskell.el ends here

View File

@ -86,9 +86,10 @@ which is viewable through the web browser.
;; (require 'org-babel-ditaa) ;; ditaa
;; (require 'org-babel-dot) ;; dot
;; (require 'org-babel-gnuplot) ;; gnuplot, and gnuplot-mode
;; (require 'org-babel-haskell) ;; haskell, haskell-mode, inf-haskell
;; (require 'org-babel-ocaml) ;; ocaml, and tuareg-mode
;; (require 'org-babel-python) ;; python, and python-mode
;; (require 'org-babel-ruby) ;; ruby, irb, ruby-mode, and inf-ruby mode
;; (require 'org-babel-ruby) ;; ruby, irb, ruby-mode, and inf-ruby
;; (require 'org-babel-sass) ;; sass, sass-mode
;; (require 'org-babel-sql) ;; none
;;

View File

@ -2722,7 +2722,7 @@ This is currently working only with emacs lisp as in the following
example in the [[* emacs lisp source reference][emacs lisp source reference]].
** TODO Add languages [11/15]
** TODO Add languages [12/16]
I'm sure there are many more that aren't listed here. Please add
them, and bubble any that you particularly care about up to the top.
@ -2730,6 +2730,29 @@ Any new language should be implemented in a org-babel-lang.el file.
Follow the pattern set by [[file:lisp/org-babel-script.el][org-babel-script.el]], [[file:lisp/org-babel-shell.el][org-babel-shell.el]] and
[[file:lisp/org-babel-R.el][org-babel-R.el]].
*** DONE Haskell
#+begin_src haskell
"hello Haskell"
#+end_src
#+resname:
: hello Haskell
#+begin_src haskell
let fac n = if n == 0 then 1 else n * fac (n - 1)
fac 4
#+end_src
#+resname:
: 24
#+begin_src haskell
[1, 2, 3, 4, 5]
#+end_src
#+resname:
| 1 | 2 | 3 | 4 | 5 |
*** STARTED ocaml [2/3]
- [X] Working for the simple case (no arguments, simple output)