* lisp/simple.el (save-mark-and-excursion): Add declare forms.

[gnu-emacs] / lisp / org / ob-calc.el

diff --git a/lisp/org/ob-calc.el b/lisp/org/ob-calc.el
index d6fbf3f92eb0d4d88c078120b565e3ee60996400..f5e70de9d7cdc642269432936b2a41fac433496c 100644 (file)
--- a/lisp/org/ob-calc.el
+++ b/lisp/org/ob-calc.el
@@ -1,11 +1,10 @@
 ;;; ob-calc.el --- org-babel functions for calc code evaluation
 
-;; Copyright (C) 2010, 2011  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.4
 
 ;; This file is part of GNU Emacs.
 
@@ -29,8 +28,13 @@
 ;;; 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.")
@@ -38,13 +42,15 @@
 (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."
   (unless (get-buffer "*Calculator*")
     (save-window-excursion (calc) (calc-quit)))
   (let* ((vars (mapcar #'cdr (org-babel-get-header params :var)))
-        (var-syms (mapcar #'car vars))
-        (var-names (mapcar #'symbol-name var-syms)))
+        (org--var-syms (mapcar #'car vars))
+        (var-names (mapcar #'symbol-name org--var-syms)))
     (mapc
      (lambda (pair)
        (calc-push-list (list (cdr pair)))
@@ -62,35 +68,41 @@
          ;; complex expression
          (t
           (calc-push-list
-           (list ((lambda (res)
-                    (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 (calc-eval
-                         (math-evaluate-expr
-                          ;; resolve user variables, calc built in
-                          ;; variables are handled automatically
-                          ;; upstream by calc
-                          (mapcar (lambda (el)
-                                    (if (and (consp el) (equal 'var (car el))
-                                             (member (cadr el) var-syms))
-                                        (progn
-                                          (calc-recall (cadr el))
-                                          (prog1 (calc-top 1)
-                                            (calc-pop 1)))
-                                      el))
-                                  ;; parse line into calc objects
-                                  (car (math-read-exprs line))))))))
-                  (calc-eval line))))))))
+           (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
     (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)
 
 
+
 ;;; ob-calc.el ends here