[babel] [PATCH] org-babel-asymptote now handles variables

[Nicolas Goaziou <n.goaziou@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 173 bytes --]

Hello,

This patch makes org-babel-asymptote handle variables. Types integer,
string, symbol (treated as strings), float, and any list of those are
supported.

- Nicolas

  

[-- Attachment #2: org-babel-asymptote.patch --]
[-- Type: application/octet-stream, Size: 5203 bytes --]

diff --git a/contrib/babel/lisp/langs/org-babel-asymptote.el b/contrib/babel/lisp/langs/org-babel-asymptote.el
index 59ca291..eed1a87 100644
--- a/contrib/babel/lisp/langs/org-babel-asymptote.el
+++ b/contrib/babel/lisp/langs/org-babel-asymptote.el
@@ -37,8 +37,6 @@
 ;; 3) we are adding the "file" and "cmdline" header arguments, if file
 ;;    is omitted then the -V option is passed to the asy command for
 ;;    interactive viewing
-;;
-;; 4) there are no variables (at least for now)
 
 ;;; Requirements:
 
@@ -56,13 +54,17 @@
 (defvar org-babel-default-header-args:asymptote '((:results . "file") (:exports . "results"))
   "Default arguments to use when evaluating a asymptote source block.")
 
-(defun org-babel-expand-body:asymptote (body params &optional processed-params) body)
+(defun org-babel-expand-body:asymptote (body params &optional processed-params)
+  (let ((vars (second (or processed-params
+                          (org-babel-process-params params)))))
+    (concat (mapconcat 'org-babel-asymptote-var-to-asymptote vars "\n") "\n" body "\n")))
 
 (defun org-babel-execute:asymptote (body params)
   "Execute a block of Asymptote code with org-babel.  This function is
 called by `org-babel-execute-src-block'."
   (message "executing Asymptote source code block")
-  (let* ((result-params (split-string (or (cdr (assoc :results params)) "")))
+  (let* ((processed-params (org-babel-process-params params))
+         (result-params (split-string (or (cdr (assoc :results params)) "")))
          (out-file (cdr (assoc :file params)))
          (format (or (and out-file
                           (string-match ".+\\.\\(.+\\)" out-file)
@@ -75,12 +77,76 @@ called by `org-babel-execute-src-block'."
                           (concat "-globalwrite -f " format " -o " out-file)
                         "-V")
                       " " cmdline " " in-file)))
-    (with-temp-file in-file (insert body))
+    (with-temp-file in-file (insert (org-babel-expand-body:asymptote body params processed-params)))
     (message cmd) (shell-command cmd)
     out-file))
 
 (defun org-babel-prep-session:asymptote (session params)
   (error "Asymptote does not support sessions"))
 
+(defun org-babel-asymptote-var-to-asymptote (pair)
+  "Convert an elisp val into a string of asymptote code specifying a var
+of the same value."
+  (let ((var (car pair))
+        (val (if (symbolp (cdr pair))
+                 (symbol-name (cdr pair))
+               (cdr pair))))
+    (cond
+     ((integerp val)
+      (format "int %S=%S;" var val))
+     ((floatp val)
+      (format "real %S=%S;" var val))
+     ((stringp val)
+      (format "string %S=\"%s\";" var val))
+     ((listp val)
+      (let* ((dimension-2-p (not (null (cdr val))))
+             (dim (if dimension-2-p "[][]" "[]"))
+             (type (org-babel-asymptote-define-type val))
+             (array (org-babel-asymptote-table-to-array
+                     val
+                     (if dimension-2-p '(:lstart "{" :lend "}," :llend "}")))))
+        (format "%S%s %S=%s;" type dim var array))))))
+
+(defun org-babel-asymptote-table-to-array (table params)
+  "Convert values of an elisp table into a string of an asymptote array.
+Empty cells are ignored."
+  (labels ((atom-to-string (table)
+                           (cond
+                            ((null table) '())
+                            ((not (listp (car table)))
+                             (cons (if (and (stringp (car table))
+                                            (not (string= (car table) "")))
+                                       (format "\"%s\"" (car table))
+                                     (format "%s" (car table)))
+                                   (atom-to-string (cdr table))))
+                            (t
+                             (cons (atom-to-string (car table))
+                                   (atom-to-string (cdr table))))))
+           ;; Remove any empty row
+           (fix-empty-lines (table)
+                            (delq nil (mapcar (lambda (l) (delq "" l)) table))))
+    (orgtbl-to-generic
+     (fix-empty-lines (atom-to-string table))
+     (org-combine-plists '(:hline nil :sep "," :tstart "{" :tend "}") params))))
+
+(defun org-babel-asymptote-define-type (data)
+  "Determine type of DATA. DATA is a list.
+Type symbol is returned as 'symbol. The type is usually the type
+of the first atom encountered, except for arrays of int where
+every cell must be of int type."
+  (labels ((anything-but-int (el)
+                             (cond
+                              ((null el) nil)
+                              ((not (listp (car el)))
+                               (cond
+                                ((floatp (car el)) 'real)
+                                ((stringp (car el)) 'string)
+                                (t
+                                 (anything-but-int (cdr el)))))
+                              (t
+                               (or (anything-but-int (car el))
+                                   (anything-but-int (cdr el)))))))
+    (or (anything-but-int data) 'int)))
+
 (provide 'org-babel-asymptote)
 ;;; org-babel-asymptote.el ends here

[-- Attachment #3: Type: text/plain, Size: 201 bytes --]

_______________________________________________
Emacs-orgmode mailing list
Please use `Reply All' to send replies to the list.
Emacs-orgmode@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-orgmode