summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Schulte <eric.schulte@gmx.com>2012-02-28 19:45:01 -0700
committerEric Schulte <eric.schulte@gmx.com>2012-02-28 19:45:01 -0700
commit5061de6ee3c3967f1eb8dc5015a4bcb2a025409e (patch)
treefd13b954fa6d487e5bc1b07d8d708df28584741d
parent806ce38c5752e9c5e2a96351ba6d71bd3026662d (diff)
downloadorg-mode-5061de6ee3c3967f1eb8dc5015a4bcb2a025409e.tar.gz
integrating ob-scala and ob-io into Org-mode, with code cleanup
-rw-r--r--Makefile4
-rw-r--r--lisp/ob-io.el34
-rw-r--r--lisp/ob-scala.el37
-rw-r--r--lisp/org.el2
4 files changed, 41 insertions, 36 deletions
diff --git a/Makefile b/Makefile
index 1753dd8..1022cdc 100644
--- a/Makefile
+++ b/Makefile
@@ -170,7 +170,9 @@ LISPF = org.el \
ob-shen.el \
ob-fortran.el \
ob-picolisp.el \
- ob-maxima.el
+ ob-maxima.el \
+ ob-io.el \
+ ob-scala.el
LISPFILES0 = $(LISPF:%=lisp/%)
LISPFILES = $(LISPFILES0) lisp/org-install.el
diff --git a/lisp/ob-io.el b/lisp/ob-io.el
index 6425b62..7742fc6 100644
--- a/lisp/ob-io.el
+++ b/lisp/ob-io.el
@@ -1,28 +1,25 @@
;;; ob-io.el --- org-babel functions for Io evaluation
-;; Copyright (C) Andrzej Lichnerowicz
+;; Copyright (C) 2012 Free Software Foundation, Inc.
;; Author: Andrzej Lichnerowicz
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
-;; Version: 0.02
-;;; License:
+;; This file is part of GNU Emacs.
-;; This program is free software; you can redistribute it and/or modify
+;; GNU Emacs 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,
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs 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.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;; Currently only supports the external execution. No session support yet.
@@ -34,12 +31,12 @@
;; - Io major mode :: Can be installed from Io sources
;; https://github.com/stevedekorte/io/blob/master/extras/SyntaxHighlighters/Emacs/io-mode.el
-
;;; Code:
(require 'ob)
(require 'ob-ref)
(require 'ob-comint)
(require 'ob-eval)
+(eval-when-compile (require 'cl))
(add-to-list 'org-babel-tangle-lang-exts '("io" . "io"))
(defvar org-babel-default-header-args:io '())
@@ -52,9 +49,9 @@
called by `org-babel-execute-src-block'"
(message "executing Io source code block")
(let* ((processed-params (org-babel-process-params params))
- (session (org-babel-io-initiate-session (first processed-params)))
- (vars (second processed-params))
- (result-params (third processed-params))
+ (session (org-babel-io-initiate-session (nth 0 processed-params)))
+ (vars (nth 1 processed-params))
+ (result-params (nth 2 processed-params))
(result-type (cdr (assoc :result-type params)))
(full-body (org-babel-expand-body:generic
body params))
@@ -94,7 +91,7 @@ in BODY as elisp."
(if (member "repl" result-params)
(org-babel-eval org-babel-io-command body)
(let ((src-file (org-babel-temp-file "io-")))
- (progn (with-temp-file src-file (insert full-body))
+ (progn (with-temp-file src-file (insert body))
(org-babel-eval
(concat org-babel-io-command " " src-file) "")))))
(value (let* ((src-file (org-babel-temp-file "io-"))
@@ -119,4 +116,7 @@ supported in Io."
nil)
(provide 'ob-io)
+
+
+
;;; ob-io.el ends here
diff --git a/lisp/ob-scala.el b/lisp/ob-scala.el
index b20a7fa..8af4886 100644
--- a/lisp/ob-scala.el
+++ b/lisp/ob-scala.el
@@ -1,28 +1,25 @@
;;; ob-scala.el --- org-babel functions for Scala evaluation
-;; Copyright (C) Andrzej Lichnerowicz
+;; Copyright (C) 2012 Free Software Foundation, Inc.
;; Author: Andrzej Lichnerowicz
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
-;; Version: 0.01
-;;; License:
+;; This file is part of GNU Emacs.
-;; This program is free software; you can redistribute it and/or modify
+;; GNU Emacs 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,
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs 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.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;; Currently only supports the external execution. No session support yet.
@@ -32,12 +29,12 @@
;; - Scala major mode :: Can be installed from Scala sources
;; https://github.com/scala/scala-dist/blob/master/tool-support/src/emacs/scala-mode.el
-
;;; Code:
(require 'ob)
(require 'ob-ref)
(require 'ob-comint)
(require 'ob-eval)
+(eval-when-compile (require 'cl))
(add-to-list 'org-babel-tangle-lang-exts '("scala" . "scala"))
(defvar org-babel-default-header-args:scala '())
@@ -50,9 +47,9 @@
called by `org-babel-execute-src-block'"
(message "executing Scala source code block")
(let* ((processed-params (org-babel-process-params params))
- (session (org-babel-scala-initiate-session (first processed-params)))
- (vars (second processed-params))
- (result-params (third processed-params))
+ (session (org-babel-scala-initiate-session (nth 0 processed-params)))
+ (vars (nth 1 processed-params))
+ (result-params (nth 2 processed-params))
(result-type (cdr (assoc :result-type params)))
(full-body (org-babel-expand-body:generic
body params))
@@ -81,7 +78,8 @@ Emacs-lisp table, otherwise return the results as a string."
")
-(defun org-babel-scala-evaluate (session body &optional result-type result-params)
+(defun org-babel-scala-evaluate
+ (session body &optional result-type result-params)
"Evaluate BODY in external Scala process.
If RESULT-TYPE equals 'output then return standard output as a string.
If RESULT-TYPE equals 'value then return the value of the last statement
@@ -90,7 +88,7 @@ in BODY as elisp."
(case result-type
(output
(let ((src-file (org-babel-temp-file "scala-")))
- (progn (with-temp-file src-file (insert full-body))
+ (progn (with-temp-file src-file (insert body))
(org-babel-eval
(concat org-babel-scala-command " " src-file) ""))))
(value
@@ -116,4 +114,7 @@ supported in Scala."
nil)
(provide 'ob-scala)
+
+
+
;;; ob-scala.el ends here
diff --git a/lisp/org.el b/lisp/org.el
index a81f7fc..f36b110 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -169,6 +169,7 @@ requirements) is loaded."
(const :tag "Fortran" fortran)
(const :tag "Gnuplot" gnuplot)
(const :tag "Haskell" haskell)
+ (const :tag "IO" io)
(const :tag "Java" java)
(const :tag "Javascript" js)
(const :tag "LaTeX" latex)
@@ -186,6 +187,7 @@ requirements) is loaded."
(const :tag "Python" python)
(const :tag "Ruby" ruby)
(const :tag "Sass" sass)
+ (const :tag "Scala" scala)
(const :tag "Scheme" scheme)
(const :tag "Screen" screen)
(const :tag "Shell Script" sh)