浏览代码

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

* lisp/ob-ocaml.el (org-babel-execute:ocaml): Use org-babel-result-cond
  in OCaml code blocks.
Eric Schulte 12 年之前
父节点
当前提交
f58889f0c1
共有 1 个文件被更改,包括 5 次插入1 次删除
  1. 5 1
      lisp/ob-ocaml.el

+ 5 - 1
lisp/ob-ocaml.el

@@ -74,7 +74,11 @@
 					 (progn (setq out t) nil))))
 					 (progn (setq out t) nil))))
 				   (mapcar #'org-babel-trim (reverse raw))))))))
 				   (mapcar #'org-babel-trim (reverse raw))))))))
     (org-babel-reassemble-table
     (org-babel-reassemble-table
-     (org-babel-ocaml-parse-output (org-babel-trim clean))
+     (let ((raw (org-babel-trim clean)))
+       (org-babel-result-cond (cdr (assoc :result-params params))
+	 ;; strip type information from output
+	 (if (string-match "= \\(.+\\)$" raw) (match-string 1 raw) raw)
+	 (org-babel-ocaml-parse-output raw)))
      (org-babel-pick-name
      (org-babel-pick-name
       (cdr (assoc :colname-names params)) (cdr (assoc :colnames params)))
       (cdr (assoc :colname-names params)) (cdr (assoc :colnames params)))
      (org-babel-pick-name
      (org-babel-pick-name