diff options
author | Aaron Ecay <aaronecay@gmail.com> | 2015-01-16 17:42:04 -0500 |
---|---|---|
committer | Aaron Ecay <aaronecay@gmail.com> | 2015-01-23 14:36:40 -0500 |
commit | d067982b594e5d4511ce054627400355f04ac783 (patch) | |
tree | 4109685559aa29a057d234178d36931bdb0054e9 | |
parent | c4f34a69b5658b4e49c07738c341098c1cacd635 (diff) | |
download | org-mode-d067982b594e5d4511ce054627400355f04ac783.tar.gz |
babel: Remove functions which are just indirection around org-babel-script-escape
* lisp/ob-groovy.el (org-babel-groovy-table-or-string): Remove.
(org-babel-groovy-evaluate): Call `org-babel-script-escape' instead.
* lisp/ob-haskell.el (org-babel-haskell-table-or-string): Remove.
(org-babel-execute:haskell): Call `org-babel-script-escape' instead.
* lisp/ob-io.el (org-babel-io-table-or-string): Remove.
(org-babel-io-evaluate):Call `org-babel-script-escape' instead.
* lisp/ob-scala.el (org-babel-scala-table-or-string): Remove.
(org-babel-scala-evaluate): Call `org-babel-script-escape' instead.
-rw-r--r-- | lisp/ob-groovy.el | 10 | ||||
-rw-r--r-- | lisp/ob-haskell.el | 8 | ||||
-rw-r--r-- | lisp/ob-io.el | 10 | ||||
-rw-r--r-- | lisp/ob-scala.el | 10 |
4 files changed, 4 insertions, 34 deletions
diff --git a/lisp/ob-groovy.el b/lisp/ob-groovy.el index 0068df9..8797ec9 100644 --- a/lisp/ob-groovy.el +++ b/lisp/ob-groovy.el @@ -66,14 +66,6 @@ called by `org-babel-execute-src-block'" (org-babel-pick-name (cdr (assoc :rowname-names params)) (cdr (assoc :rownames params)))))) - -(defun org-babel-groovy-table-or-string (results) - "Convert RESULTS into an appropriate elisp value. -If RESULTS look like a table, then convert them into an -Emacs-lisp table, otherwise return the results as a string." - (org-babel-script-escape results)) - - (defvar org-babel-groovy-wrapper-method "class Runner extends Script { @@ -106,7 +98,7 @@ in BODY as elisp." (concat org-babel-groovy-command " " src-file) ""))) (org-babel-result-cond result-params raw - (org-babel-groovy-table-or-string raw))))))) + (org-babel-script-escape raw))))))) (defun org-babel-prep-session:groovy (session params) diff --git a/lisp/ob-haskell.el b/lisp/ob-haskell.el index 0006670..2e1d390 100644 --- a/lisp/ob-haskell.el +++ b/lisp/ob-haskell.el @@ -84,7 +84,7 @@ (output (mapconcat #'identity (reverse (cdr results)) "\n")) (value (car results))))) (org-babel-result-cond (cdr (assoc :result-params params)) - result (org-babel-haskell-table-or-string result))) + result (org-babel-script-escape result))) (org-babel-pick-name (cdr (assoc :colname-names params)) (cdr (assoc :colname-names params))) (org-babel-pick-name (cdr (assoc :rowname-names params)) @@ -133,12 +133,6 @@ then create one. Return the initialized session." (org-babel-haskell-var-to-haskell (cdr pair)))) (mapcar #'cdr (org-babel-get-header params :var)))) -(defun org-babel-haskell-table-or-string (results) - "Convert RESULTS to an Emacs-lisp table or string. -If RESULTS look like a table, then convert them into an -Emacs-lisp table, otherwise return the results as a string." - (org-babel-script-escape results)) - (defun org-babel-haskell-var-to-haskell (var) "Convert an elisp value VAR into a haskell variable. The elisp VAR is converted to a string of haskell source code diff --git a/lisp/ob-io.el b/lisp/ob-io.el index 971b37f..c309b88 100644 --- a/lisp/ob-io.el +++ b/lisp/ob-io.el @@ -62,14 +62,6 @@ called by `org-babel-execute-src-block'" (org-babel-pick-name (cdr (assoc :rowname-names params)) (cdr (assoc :rownames params)))))) - -(defun org-babel-io-table-or-string (results) - "Convert RESULTS into an appropriate elisp value. -If RESULTS look like a table, then convert them into an -Emacs-lisp table, otherwise return the results as a string." - (org-babel-script-escape results)) - - (defvar org-babel-io-wrapper-method "( %s @@ -98,7 +90,7 @@ in BODY as elisp." (concat org-babel-io-command " " src-file) ""))) (org-babel-result-cond result-params raw - (org-babel-io-table-or-string raw))))))) + (org-babel-script-escape raw))))))) (defun org-babel-prep-session:io (session params) diff --git a/lisp/ob-scala.el b/lisp/ob-scala.el index 0584342..838bc8f 100644 --- a/lisp/ob-scala.el +++ b/lisp/ob-scala.el @@ -60,14 +60,6 @@ called by `org-babel-execute-src-block'" (org-babel-pick-name (cdr (assoc :rowname-names params)) (cdr (assoc :rownames params)))))) - -(defun org-babel-scala-table-or-string (results) - "Convert RESULTS into an appropriate elisp value. -If RESULTS look like a table, then convert them into an -Emacs-lisp table, otherwise return the results as a string." - (org-babel-script-escape results)) - - (defvar org-babel-scala-wrapper-method "var str_result :String = null; @@ -104,7 +96,7 @@ in BODY as elisp." (concat org-babel-scala-command " " src-file) ""))) (org-babel-result-cond result-params raw - (org-babel-scala-table-or-string raw))))))) + (org-babel-script-escape raw))))))) (defun org-babel-prep-session:scala (session params) |