From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thibault Marin Subject: Re: ob-lua Date: Tue, 23 Aug 2016 21:39:34 -0500 Message-ID: <87lgzmx53t.fsf@dell-desktop.WORKGROUP> References: <87bn0of273.fsf@dell-desktop.WORKGROUP> <87h9af1la2.fsf@saiph.selenimh> <87eg5ik9t7.fsf@dell-desktop.WORKGROUP> <878tvq1nbx.fsf@saiph.selenimh> <87a8g5edep.fsf@dell-desktop.WORKGROUP> <87mvk5w3si.fsf@saiph.selenimh> <87y43p55dy.fsf@dell-desktop.WORKGROUP> Reply-To: thibault.marin@gmx.com Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:34758) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bcO6W-00027N-0g for emacs-orgmode@gnu.org; Tue, 23 Aug 2016 22:39:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bcO6R-00026b-9e for emacs-orgmode@gnu.org; Tue, 23 Aug 2016 22:39:47 -0400 Received: from mout.gmx.net ([212.227.15.18]:61370) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bcO6Q-000263-TH for emacs-orgmode@gnu.org; Tue, 23 Aug 2016 22:39:43 -0400 In-reply-to: <87y43p55dy.fsf@dell-desktop.WORKGROUP> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: "Emacs-orgmode" To: Nicolas Goaziou Cc: Dieter Schoen , "emacs-orgmode@gnu.org" --=-=-= Content-Type: text/plain Hi, Thibault Marin writes: >>> The attached patch (using git format-patch) is adding test-ob-lua.el and >>> ob-lua.el. My contribution to ob-lua.el is only a tiny patch on top of >>> Dieter's ob-lua.el but it appears as a new file in the patch, since >>> ob-lua.el is not currently in the repository. >> >> That is not a problem. We can make this appear as two patches. > OK, should I send two patches then? > >> >>> I am still a bit confused about this (make test complains about a >>> missing dependency for ob-lua, maybe because it is in contrib/lisp?), >>> but I can run the test using the command line emacs --batch command >>> described in testing/README, and it does not require any change to >>> org-test.el, so I'll run tests this way from now on. >> >> The point is to add it to core Org, not to contrib/, isn't it? > I wasn't sure, attached is a new patch with ob-lua in lisp/. > > Thanks, > thibault I am attaching an updated patch adding the Lua language to the CSS in `org-html-style-default'. If you would like me to make two separate patches, one with the original ob-lua.el from Dieter Schoen and one with my changes and additions (test-ob-lua.el and ox-html.el), please let me know. Thanks, thibault --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-ob-lua.el-Add-lua-support-to-org-babel.patch >From e79446cda1a8fbf025145f00c0f2c7ba1caaa374 Mon Sep 17 00:00:00 2001 From: thibault Date: Mon, 22 Aug 2016 10:32:55 -0500 Subject: [PATCH] ob-lua.el: Add lua support to org-babel * lisp/ob-lua.el: Resurrect ob-lua.el from https://lists.gnu.org/archive/html/emacs-orgmode/2014-05/msg01149.html, replace deprecated functions `org-babel-get-header' and `org-babel-trim' by `org-babel--get-vars' and `org-trim' respectively. Sessions are not supported. * testing/test-ob-lua.el: Testing for ob-lua.el. Test table variable passing and results with `value' and `output' options. * lisp/ox-html.el (org-html-style-default): Add pre.src-lua to css. --- lisp/ob-lua.el | 405 ++++++++++++++++++++++++++++++++++++++++++++ lisp/ox-html.el | 1 + testing/lisp/test-ob-lua.el | 141 +++++++++++++++ 3 files changed, 547 insertions(+) create mode 100644 lisp/ob-lua.el create mode 100644 testing/lisp/test-ob-lua.el diff --git a/lisp/ob-lua.el b/lisp/ob-lua.el new file mode 100644 index 0000000..a81ec66 --- /dev/null +++ b/lisp/ob-lua.el @@ -0,0 +1,405 @@ +;;; ob-lua.el --- org-babel functions for lua evaluation + +;; Copyright (C) 2009-2014 Free Software Foundation, Inc. + +;; Authors: Dieter Schoen +;; Eric Schulte, Dan Davison +;; Keywords: literate programming, reproducible research +;; Homepage: http://orgmode.org + +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + +;; Requirements: +;; for session support, lua-mode is needed. +;; lua-mode is not part of GNU Emacs/orgmode, but can be obtained +;; from marmalade or melpa. +;; The source respository is here: +;; https://github.com/immerrr/lua-mode + +;; However, sessions are not yet working. + +;; Org-Babel support for evaluating lua source code. + +;;; Code: +(require 'ob) +(eval-when-compile (require 'cl)) + +(declare-function org-remove-indentation "org" ) +(declare-function lua-shell "ext:lua-mode" (&optional argprompt)) +(declare-function lua-toggle-shells "ext:lua-mode" (arg)) +(declare-function run-lua "ext:lua" (cmd &optional dedicated show)) + +(defvar org-babel-tangle-lang-exts) +(add-to-list 'org-babel-tangle-lang-exts '("lua" . "lua")) + +(defvar org-babel-default-header-args:lua '()) + +(defcustom org-babel-lua-command "lua" + "Name of the command for executing Lua code." + :version "24.5" + :package-version '(Org . "8.3") + :group 'org-babel + :type 'string) + +(defcustom org-babel-lua-mode 'lua-mode + "Preferred lua mode for use in running lua interactively. +This will typically be 'lua-mode." + :group 'org-babel + :version "24.5" + :package-version '(Org . "8.3") + :type 'symbol) + +(defcustom org-babel-lua-hline-to "None" + "Replace hlines in incoming tables with this when translating to lua." + :group 'org-babel + :version "24.5" + :package-version '(Org . "8.3") + :type 'string) + +(defcustom org-babel-lua-None-to 'hline + "Replace 'None' in lua tables with this before returning." + :group 'org-babel + :version "24.5" + :package-version '(Org . "8.3") + :type 'symbol) + +(defun org-babel-execute:lua (body params) + "Execute a block of Lua code with Babel. +This function is called by `org-babel-execute-src-block'." + (let* ((session (org-babel-lua-initiate-session + (cdr (assoc :session params)))) + (result-params (cdr (assoc :result-params params))) + (result-type (cdr (assoc :result-type params))) + (return-val (when (and (eq result-type 'value) (not session)) + (cdr (assoc :return params)))) + (preamble (cdr (assoc :preamble params))) + (full-body + (org-babel-expand-body:generic + (concat body (if return-val (format "\nreturn %s" return-val) "")) + params (org-babel-variable-assignments:lua params))) + (result (org-babel-lua-evaluate + session full-body result-type result-params preamble))) + (org-babel-reassemble-table + result + (org-babel-pick-name (cdr (assoc :colname-names params)) + (cdr (assoc :colnames params))) + (org-babel-pick-name (cdr (assoc :rowname-names params)) + (cdr (assoc :rownames params)))))) + +(defun org-babel-prep-session:lua (session params) + "Prepare SESSION according to the header arguments in PARAMS. +VARS contains resolved variable references" + (let* ((session (org-babel-lua-initiate-session session)) + (var-lines + (org-babel-variable-assignments:lua params))) + (org-babel-comint-in-buffer session + (mapc (lambda (var) + (end-of-line 1) (insert var) (comint-send-input) + (org-babel-comint-wait-for-output session)) var-lines)) + session)) + +(defun org-babel-load-session:lua (session body params) + "Load BODY into SESSION." + (save-window-excursion + (let ((buffer (org-babel-prep-session:lua session params))) + (with-current-buffer buffer + (goto-char (process-mark (get-buffer-process (current-buffer)))) + (insert (org-babel-chomp body))) + buffer))) + +;; helper functions + +(defun org-babel-variable-assignments:lua (params) + "Return a list of Lua statements assigning the block's variables." + (mapcar + (lambda (pair) + (format "%s=%s" + (car pair) + (org-babel-lua-var-to-lua (cdr pair)))) + (org-babel--get-vars params))) + +(defun org-babel-lua-var-to-lua (var) + "Convert an elisp value to a lua variable. +Convert an elisp value, VAR, into a string of lua source code +specifying a variable of the same value." + (if (listp var) + (if (and (= 1 (length var)) (not (listp (car var)))) + (org-babel-lua-var-to-lua (car var)) + (if (and + (= 2 (length var)) + (not (listp (car var)))) + (concat + (substring-no-properties (car var)) + "=" + (org-babel-lua-var-to-lua (cdr var))) + (concat "{" (mapconcat #'org-babel-lua-var-to-lua var ", ") "}"))) + (if (equal var 'hline) + org-babel-lua-hline-to + (format + (if (and (stringp var) (string-match "[\n\r]" var)) "\"\"%S\"\"" "%S") + (if (stringp var) (substring-no-properties var) var))))) + +(defun org-babel-lua-table-or-string (results) + "Convert RESULTS into an appropriate elisp value. +If the results look like a list or tuple, then convert them into an +Emacs-lisp table, otherwise return the results as a string." + (let ((res (org-babel-script-escape results))) + (if (listp res) + (mapcar (lambda (el) (if (equal el 'None) + org-babel-lua-None-to el)) + res) + res))) + +(defvar org-babel-lua-buffers '((:default . "*Lua*"))) + +(defun org-babel-lua-session-buffer (session) + "Return the buffer associated with SESSION." + (cdr (assoc session org-babel-lua-buffers))) + +(defun org-babel-lua-with-earmuffs (session) + (let ((name (if (stringp session) session (format "%s" session)))) + (if (and (string= "*" (substring name 0 1)) + (string= "*" (substring name (- (length name) 1)))) + name + (format "*%s*" name)))) + +(defun org-babel-lua-without-earmuffs (session) + (let ((name (if (stringp session) session (format "%s" session)))) + (if (and (string= "*" (substring name 0 1)) + (string= "*" (substring name (- (length name) 1)))) + (substring name 1 (- (length name) 1)) + name))) + +(defvar lua-default-interpreter) +(defvar lua-which-bufname) +(defvar lua-shell-buffer-name) +(defun org-babel-lua-initiate-session-by-key (&optional session) + "Initiate a lua session. +If there is not a current inferior-process-buffer in SESSION +then create. Return the initialized session." + (require org-babel-lua-mode) + (save-window-excursion + (let* ((session (if session (intern session) :default)) + (lua-buffer (org-babel-lua-session-buffer session)) + (cmd (if (member system-type '(cygwin windows-nt ms-dos)) + (concat org-babel-lua-command " -i") + org-babel-lua-command))) + (cond + ((and (eq 'lua-mode org-babel-lua-mode) + (fboundp 'lua-start-process)) ; lua-mode.el + ;; Make sure that lua-which-bufname is initialized, as otherwise + ;; it will be overwritten the first time a Lua buffer is + ;; created. + ;;(lua-toggle-shells lua-default-interpreter) + ;; `lua-shell' creates a buffer whose name is the value of + ;; `lua-which-bufname' with '*'s at the beginning and end + (let* ((bufname (if (and lua-process-buffer + (buffer-live-p lua-process-buffer)) + (replace-regexp-in-string ;; zap surrounding * + "^\\*\\([^*]+\\)\\*$" "\\1" (buffer-name lua-process-buffer)) + (concat "Lua-" (symbol-name session)))) + (lua-which-bufname bufname)) + (lua-start-process) + (setq lua-buffer (org-babel-lua-with-earmuffs bufname)))) + (t + (error "No function available for running an inferior Lua"))) + (setq org-babel-lua-buffers + (cons (cons session lua-process-buffer) + (assq-delete-all session org-babel-lua-buffers))) + session))) + +(defun org-babel-lua-initiate-session (&optional session params) + "Create a session named SESSION according to PARAMS." + (unless (string= session "none") + (error "Sessions currently not supported, work in progress") + (org-babel-lua-session-buffer + (org-babel-lua-initiate-session-by-key session)))) + +(defvar org-babel-lua-eoe-indicator "--eoe" + "A string to indicate that evaluation has completed.") + +(defvar org-babel-lua-wrapper-method + " +function main() +%s +end + +fd=io.open(\"%s\", \"w\") +fd:write( main() ) +fd:close()") +(defvar org-babel-lua-pp-wrapper-method + " +-- table to string +function t2s(t, indent) + if indent == nil then + indent = \"\" + end + if type(t) == \"table\" then + ts = \"\" + for k,v in pairs(t) do + if type(v) == \"table\" then + ts = ts .. indent .. t2s(k,indent .. \" \") .. \" = \\n\" .. + t2s(v, indent .. \" \") + else + ts = ts .. indent .. t2s(k,indent .. \" \") .. \" = \" .. + t2s(v, indent .. \" \") .. \"\\n\" + end + end + return ts + else + return tostring(t) + end +end + + +function main() +%s +end + +fd=io.open(\"%s\", \"w\") +fd:write(t2s(main())) +fd:close()") + +(defun org-babel-lua-evaluate + (session body &optional result-type result-params preamble) + "Evaluate BODY as Lua code." + (if session + (org-babel-lua-evaluate-session + session body result-type result-params) + (org-babel-lua-evaluate-external-process + body result-type result-params preamble))) + +(defun org-babel-lua-evaluate-external-process + (body &optional result-type result-params preamble) + "Evaluate BODY in external lua process. +If RESULT-TYPE equals 'output then return standard output as a +string. If RESULT-TYPE equals 'value then return the value of the +last statement in BODY, as elisp." + (let ((raw + (pcase result-type + (`output (org-babel-eval org-babel-lua-command + (concat (if preamble (concat preamble "\n")) + body))) + (`value (let ((tmp-file (org-babel-temp-file "lua-"))) + (org-babel-eval + org-babel-lua-command + (concat + (if preamble (concat preamble "\n") "") + (format + (if (member "pp" result-params) + org-babel-lua-pp-wrapper-method + org-babel-lua-wrapper-method) + (mapconcat + (lambda (line) (format "\t%s" line)) + (split-string + (org-remove-indentation + (org-trim body)) + "[\r\n]") "\n") + (org-babel-process-file-name tmp-file 'noquote)))) + (org-babel-eval-read-file tmp-file)))))) + (org-babel-result-cond result-params + raw + (org-babel-lua-table-or-string (org-trim raw))))) + +(defun org-babel-lua-evaluate-session + (session body &optional result-type result-params) + "Pass BODY to the Lua process in SESSION. +If RESULT-TYPE equals 'output then return standard output as a +string. If RESULT-TYPE equals 'value then return the value of the +last statement in BODY, as elisp." + (let* ((send-wait (lambda () (comint-send-input nil t) (sleep-for 0 5))) + (dump-last-value + (lambda + (tmp-file pp) + (mapc + (lambda (statement) (insert statement) (funcall send-wait)) + (if pp + (list + "-- table to string +function t2s(t, indent) + if indent == nil then + indent = \"\" + end + if type(t) == \"table\" then + ts = \"\" + for k,v in pairs(t) do + if type(v) == \"table\" then + ts = ts .. indent .. t2s(k,indent .. \" \") .. \" = \\n\" .. + t2s(v, indent .. \" \") + else + ts = ts .. indent .. t2s(k,indent .. \" \") .. \" = \" .. + t2s(v, indent .. \" \") .. \"\\n\" + end + end + return ts + else + return tostring(t) + end +end +" + (format "fd:write(_)) +fd:close()" + (org-babel-process-file-name tmp-file 'noquote))) + (list (format "fd=io.open(\"%s\", \"w\") +fd:write( _ ) +fd:close()" + (org-babel-process-file-name tmp-file + 'noquote))))))) + (input-body (lambda (body) + (mapc (lambda (line) (insert line) (funcall send-wait)) + (split-string body "[\r\n]")) + (funcall send-wait))) + (results + (case result-type + (output + (mapconcat + #'org-trim + (butlast + (org-babel-comint-with-output + (session org-babel-lua-eoe-indicator t body) + (funcall input-body body) + (funcall send-wait) (funcall send-wait) + (insert org-babel-lua-eoe-indicator) + (funcall send-wait)) + 2) "\n")) + (value + (let ((tmp-file (org-babel-temp-file "lua-"))) + (org-babel-comint-with-output + (session org-babel-lua-eoe-indicator nil body) + (let ((comint-process-echoes nil)) + (funcall input-body body) + (funcall dump-last-value tmp-file + (member "pp" result-params)) + (funcall send-wait) (funcall send-wait) + (insert org-babel-lua-eoe-indicator) + (funcall send-wait))) + (org-babel-eval-read-file tmp-file)))))) + (unless (string= (substring org-babel-lua-eoe-indicator 1 -1) results) + (org-babel-result-cond result-params + results + (org-babel-lua-table-or-string results))))) + +(defun org-babel-lua-read-string (string) + "Strip 's from around Lua string." + (if (string-match "^'\\([^\000]+\\)'$" string) + (match-string 1 string) + string)) + +(provide 'ob-lua) + + + +;;; ob-lua.el ends here diff --git a/lisp/ox-html.el b/lisp/ox-html.el index 5f02f25..adc68b2 100644 --- a/lisp/ox-html.el +++ b/lisp/ox-html.el @@ -339,6 +339,7 @@ for the JavaScript code in this tag. pre.src-ledger:before { content: 'Ledger'; } pre.src-lisp:before { content: 'Lisp'; } pre.src-lilypond:before { content: 'Lilypond'; } + pre.src-lua:before { content: 'Lua'; } pre.src-matlab:before { content: 'MATLAB'; } pre.src-mscgen:before { content: 'Mscgen'; } pre.src-ocaml:before { content: 'Objective Caml'; } diff --git a/testing/lisp/test-ob-lua.el b/testing/lisp/test-ob-lua.el new file mode 100644 index 0000000..d0c1302 --- /dev/null +++ b/testing/lisp/test-ob-lua.el @@ -0,0 +1,141 @@ +;;; test-ob-lua.el --- tests for ob-lua.el + +;; Copyright (c) 2016 Thibault Marin +;; Authors: Thibault Marin + +;; This file is not part of GNU Emacs. + +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with this program. If not, see . + +;;; Code: +(unless (featurep 'ob-lua) + (signal 'missing-test-dependency "Support for Lua code blocks")) + +(ert-deftest test-ob-lua/simple-value () + "Test associative array return by value." + (should + (= 2 + (org-test-with-temp-text + "#+name: eg +| a | 1 | +| b | 2 | + +#+header: :results value +#+header: :var x = eg +#+begin_src lua +return x['b'] +#+end_src" + (org-babel-next-src-block) + (org-babel-execute-src-block))))) + +(ert-deftest test-ob-lua/simple-output () + "Test text output from table." + (should + (equal "result: c\n" + (org-test-with-temp-text + "#+name: eg +| a | b | c | d | + +#+header: :results output +#+header: :var x = eg +#+begin_src lua +print('result: ' .. x[1][3]) +#+end_src" + (org-babel-next-src-block) + (org-babel-execute-src-block))))) + + +(ert-deftest test-ob-lua/colnames-yes-header-argument () + "Test table passing with `colnames' header." + (should + (equal "a" + (org-test-with-temp-text + "#+name: eg +| col | +|-----| +| a | +| b | + +#+header: :colnames yes +#+header: :var x = eg +#+begin_src lua +return x[1] +#+end_src" + (org-babel-next-src-block) + (org-babel-execute-src-block))))) + + +(ert-deftest test-ob-lua/colnames-yes-header-argument-pp () + "Test table passing with `colnames' header and pp option." + (should + (equal "a = 12\nb = 13\n" + (org-test-with-temp-text + "#+name: eg +| col | val | +|-----+-----| +| a | 12 | +| b | 13 | + +#+header: :results value pp +#+header: :colnames yes +#+header: :var x = eg +#+begin_src lua +return x +#+end_src" + (org-babel-next-src-block) + (org-babel-execute-src-block))))) + +(ert-deftest test-ob-lua/colnames-nil-header-argument () + "Test table with `colnames' set to `nil'." + (should + (equal "1 = a\n2 = b\n" + (org-test-with-temp-text + "#+name: eg +| col | +|-----| +| a | +| b | + +#+header: :colnames nil +#+header: :var x = eg +#+header: :results value pp +#+begin_src lua +return x +#+end_src" + (org-babel-next-src-block) + (org-babel-execute-src-block))))) + +(ert-deftest test-ob-lua/colnames-no-header-argument () + "Test table passing without `colnames'." + (should + (equal "1 = col\n2 = a\n3 = b\n" + (org-test-with-temp-text + "#+name: eg +| col | +|-----| +| a | +| b | + +#+header: :colnames no +#+header: :var x = eg +#+header: :results value pp +#+begin_src lua +return x +#+end_src" + (org-babel-next-src-block) + (org-babel-execute-src-block))))) + +(provide 'test-ob-lua) + +;;; test-ob-lua.el ends here -- 2.8.1 --=-=-=--