;;; ob-calc.el --- org-babel functions for calc code evaluation
-;; Copyright (C) 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2016 Free Software Foundation, Inc.
;; Author: Eric Schulte
;; Keywords: literate programming, reproducible research
;; Homepage: http://orgmode.org
-;; Version: 7.3
;; This file is part of GNU Emacs.
;;; Code:
(require 'ob)
(require 'calc)
-(require 'calc-trail)
-(eval-when-compile (require 'ob-comint))
+(unless (featurep 'xemacs)
+ (require 'calc-trail)
+ (require 'calc-store))
+
+(declare-function calc-store-into "calc-store" (&optional var))
+(declare-function calc-recall "calc-store" (&optional var))
+(declare-function math-evaluate-expr "calc-ext" (x))
(defvar org-babel-default-header-args:calc nil
"Default arguments for evaluating an calc source block.")
(defun org-babel-expand-body:calc (body params)
"Expand BODY according to PARAMS, return the expanded body." body)
+(defvar org--var-syms) ; Dynamically scoped from org-babel-execute:calc
+
(defun org-babel-execute:calc (body params)
"Execute a block of calc code with Babel."
- (mapcar
- (lambda (line)
- (when (> (length line) 0)
- (if (string= "'" (substring line 0 1))
- (funcall (lookup-key calc-mode-map (substring line 1)) nil)
- (calc-push-list
- (list ((lambda (res)
- (cond
- ((numberp res) res)
- ((listp res) (error "calc error \"%s\" on input \"%s\""
- (cadr res) line))
- (t res))
- (if (numberp res) res (math-read-number res)))
- (calc-eval line)))))))
- (mapcar #'org-babel-trim
- (split-string (org-babel-expand-body:calc body params) "[\n\r]")))
+ (unless (get-buffer "*Calculator*")
+ (save-window-excursion (calc) (calc-quit)))
+ (let* ((vars (mapcar #'cdr (org-babel-get-header params :var)))
+ (org--var-syms (mapcar #'car vars))
+ (var-names (mapcar #'symbol-name org--var-syms)))
+ (mapc
+ (lambda (pair)
+ (calc-push-list (list (cdr pair)))
+ (calc-store-into (car pair)))
+ vars)
+ (mapc
+ (lambda (line)
+ (when (> (length line) 0)
+ (cond
+ ;; simple variable name
+ ((member line var-names) (calc-recall (intern line)))
+ ;; stack operation
+ ((string= "'" (substring line 0 1))
+ (funcall (lookup-key calc-mode-map (substring line 1)) nil))
+ ;; complex expression
+ (t
+ (calc-push-list
+ (list (let ((res (calc-eval line)))
+ (cond
+ ((numberp res) res)
+ ((math-read-number res) (math-read-number res))
+ ((listp res) (error "Calc error \"%s\" on input \"%s\""
+ (cadr res) line))
+ (t (replace-regexp-in-string
+ "'" ""
+ (calc-eval
+ (math-evaluate-expr
+ ;; resolve user variables, calc built in
+ ;; variables are handled automatically
+ ;; upstream by calc
+ (mapcar #'org-babel-calc-maybe-resolve-var
+ ;; parse line into calc objects
+ (car (math-read-exprs line)))))))))
+ ))))))
+ (mapcar #'org-babel-trim
+ (split-string (org-babel-expand-body:calc body params) "[\n\r]"))))
(save-excursion
- (set-buffer (get-buffer "*Calculator*"))
- (calc-eval (calc-top 1))))
+ (with-current-buffer (get-buffer "*Calculator*")
+ (calc-eval (calc-top 1)))))
+
+(defun org-babel-calc-maybe-resolve-var (el)
+ (if (consp el)
+ (if (and (equal 'var (car el)) (member (cadr el) org--var-syms))
+ (progn
+ (calc-recall (cadr el))
+ (prog1 (calc-top 1)
+ (calc-pop 1)))
+ (mapcar #'org-babel-calc-maybe-resolve-var el))
+ el))
(provide 'ob-calc)
-;; arch-tag: 5c57a3b7-5818-4c6c-acda-7a94831a6449
+
;;; ob-calc.el ends here