From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bruno =?UTF-8?B?RsOpbGl4?= Rezende Ribeiro Subject: [PATCH] Emacs Org Babel Scheme (Geiser) support Date: Mon, 5 Aug 2013 20:05:18 -0300 Message-ID: <20130805230019.48F5FA4A@fruiteater.riseup.net> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=PGP-SHA1; boundary="Sig_/+h895+TVYZ4yvSrEvSwycE9"; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:51262) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V6TlN-0001Er-Qc for emacs-orgmode@gnu.org; Mon, 05 Aug 2013 19:00:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V6TlJ-0003F6-BJ for emacs-orgmode@gnu.org; Mon, 05 Aug 2013 19:00:29 -0400 Received: from mx1.riseup.net ([198.252.153.129]:60050) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V6TlI-0003Ek-V9 for emacs-orgmode@gnu.org; Mon, 05 Aug 2013 19:00:25 -0400 Received: from fruiteater.riseup.net (fruiteater-pn.riseup.net [10.0.1.74]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.riseup.net", Issuer "Gandi Standard SSL CA" (not verified)) by mx1.riseup.net (Postfix) with ESMTPS id 93AF543B3E for ; Mon, 5 Aug 2013 16:00:23 -0700 (PDT) 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-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org --Sig_/+h895+TVYZ4yvSrEvSwycE9 Content-Type: multipart/mixed; boundary="MP_/2ebd2PK.ock67VW7v=kCIYH" --MP_/2ebd2PK.ock67VW7v=kCIYH Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline _________________________________________________ [PATCH] EMACS ORG BABEL SCHEME (GEISER) SUPPORT Bruno F=C3=A9lix Rezende Ribeiro _________________________________________________ This is a patch submission for the Emacs Org Babel Scheme support, Geiser based, implementation (file ob-scheme.el). It achieves the following: 1. Removes the restriction on evaluated code's top-level definitions introduced in the major rewrite to support Geiser[1]. The previous evaluation procedure used to wrap the whole code in a `(with-output-to-string ...)' form before sending it to Geiser. A more robust technique is employed in the evaluation procedure avoiding such arguable bugs that results from the artificial wrapping of code. Now the Scheme code is not modified in any way before being interpreted by the REPL. For instance it is possible to use the so common and necessary `(define ...)' top level statements[2]. 2. A more sound and reliable communication mechanism is employed to process the return value, output and error yielded by the REPL and reported by Geiser to ob-scheme[3]. Previously ob-scheme and Geiser did communication over the echo area.[4] That behavior leads to inconsistent results when debugging code and potentially broken code if a minor change in Geiser's echo area output syntax were made[5]. 3. Taking advantage of the new communication mechanism described in the previous item the evaluation error handling logic is extended to report REPL error messages directly into the result blocks instead of the ubiquitous and uninformative "An error occurred." message. 4. Frame window configuration restitution measures are implemented to prevent that Geiser spawns a persistent[6] window for each new invoked REPL session[7][8]. This patch has been tested only with Guile's Scheme implementation. But inasmuch ob-scheme does not interface directly to interpreters, but rather to Geiser, the code should be implementation agnostic[9]. The ChangeLog follows: ,---- | Babel Scheme: | | * lisp/ob-scheme.el (org-babel-scheme-make-session-name): remove wrap | around code to be evaluated and get evaluation result directly from | `geiser-eval-region' respecting evaluation error messages and | restoring frame's window configuration after it. | (org-babel-scheme-get-repl): Restore frame's window configuration | after asking Geiser to run the REPL. | | These changes fix: | | - a major regression from the older implementation that prevents code | with top-level definitions from being correctly evaluated. | - the mechanism of communication with Geiser (before did over the echo | area). | - a bug of reference to a nonexistent echo area message that occurred | whenever debugging (edebug) `org-babel-scheme-make-session-name'. | - the report of evaluation errors. | - the intrusive creation of REPL windows. `---- Thank you for your contribution to Free Software. Best regards. *Ps:* - The ChangeLog entry is already included in the commit for Org maintainers' pleasure. - Since the changes made sums up to more than 15 lines, so it does not classify as "tiny change", and the code changed is part of Org's core, I will probably need to sign a FSF copyright assignment. That will be no burden as I pretend to contribute to GNU Emacs whenever possible. Footnotes _________ [1] See [{O} {PATCH} Babel support for scheme using geiser] (https://lists.gnu.org/archive/html/emacs-orgmode/2013-01/msg00134.html). [2] In fact, that is the main and original motivation behind this patch. Believe it or not the new ob-scheme implementation failed on my first attempt to evaluate a snippet of scheme that happens to be the result of the resolution of the first question of the famous [SICP - Structure and Interpretation of Computer Programs] (https://mitpress.mit.edu/sicp/sicp.html). Odd is the fact that it is a deliberated regression from the older implementation (cf. [1]). [3] Now it uses the return value of a `geiser-eval-region' call which is a loose association list containing all information needed. [4] The echo area message was used by ob-scheme to detect an error on evaluation and to transform valid result or output into a lisp object. [5] It was impossible to debug the whole `org-babel-scheme-execute-with-geiser' procedure because it relied on the Geiser's echo area output that was generated several forms earlier and, by the echo area's own nature/mechanism, had gone when the programmer pressed a key to step to the next stop point in the edebug process. Whether that is a edebug or ob-scheme bug is arguable, but certainly to use the echo area to inter-library communication is not a good programming practice since the echo area is intended just as a clue feature for human eyes. [6] By "persistent window" I mean an auxiliary window that is not removed in the end of the associated procedure's execution. [7] Thus, for session-less code blocks (the default), it was making a persistent new window each time one evaluates the respective code. [8] Using the current implementation of Geiser --- while ensuring a forward-compatible and clean interface --- it is not feasible to prevent Geiser's spawns of REPL windows; our best is to prevent its persistence. [9] Nevertheless, if you can, please test it with other Scheme implementation supported by Geiser --- i.e., Racket --- and report back. -- ,=3D ,-_-. =3D. Bruno F=C3=A9lix Rezende Ribeiro (oitofelix) [0x28D618AF] ((_/)o o(\_)) There is no system but GNU; `-'(. .)`-' Linux-libre is just one of its kernels; \_/ All software should be free as in freedom; --MP_/2ebd2PK.ock67VW7v=kCIYH Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0001-Babel-Scheme.patch =46rom 66ab485b27daad2126080439f79a664c157ff62a Mon Sep 17 00:00:00 2001 From: =3D?UTF-8?q?Bruno=3D20F=3DC3=3DA9lix=3D20Rezende=3D20Ribeiro?=3D Date: Mon, 5 Aug 2013 19:38:48 -0300 Subject: [PATCH] Babel Scheme: * lisp/ob-scheme.el (org-babel-scheme-make-session-name): remove wrap around code to be evaluated and get evaluation result directly from eiser-eval-region' respecting evaluation error messages and restoring frame's window configuration after it. (org-babel-scheme-get-repl): Restore frame's window configuration after asking Geiser to run the REPL. These changes fix: - a major regression from the older implementation that prevents code with top-level definitions from being correctly evaluated. - the mechanism of communication with Geiser (before did over the echo area). - a bug of reference to a nonexistent echo area message that occurred whenever debugging (edebug) rg-babel-scheme-make-session-name'. - the report of evaluation errors. - the intrusive creation of REPL windows. --- lisp/ob-scheme.el | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/lisp/ob-scheme.el b/lisp/ob-scheme.el index f979640..d002c93 100644 --- a/lisp/ob-scheme.el +++ b/lisp/ob-scheme.el @@ -91,15 +91,18 @@ =20 (defun org-babel-scheme-get-repl (impl name) "Switch to a scheme REPL, creating it if it doesn't exist:" - (let ((buffer (org-babel-scheme-get-session-buffer name))) + (let ((buffer (org-babel-scheme-get-session-buffer name)) + (window-cfg (current-window-configuration))) (or buffer (progn (run-geiser impl) + (setq buffer (current-buffer)) (if name (progn (rename-buffer name t) - (org-babel-scheme-set-session-buffer name (current-buffer)))) - (current-buffer))))) + (org-babel-scheme-set-session-buffer name buffer))) + (set-window-configuration window-cfg) + buffer)))) =20 (defun org-babel-scheme-make-session-name (buffer name impl) "Generate a name for the session buffer. @@ -127,9 +130,7 @@ is true; otherwise returns the last value." (with-temp-buffer (insert (format ";; -*- geiser-scheme-implementation: %s -*-" impl)) (newline) - (insert (if output - (format "(with-output-to-string (lambda () %s))" code) - code)) + (insert code) (geiser-mode) (let ((repl-buffer (save-current-buffer (org-babel-scheme-get-repl impl repl)))) @@ -141,11 +142,16 @@ is true; otherwise returns the last value." (current-buffer))))) (setq geiser-repl--repl repl-buffer) (setq geiser-impl--implementation nil) - (geiser-eval-region (point-min) (point-max)) (setq result - (if (equal (substring (current-message) 0 3) "=3D> ") - (replace-regexp-in-string "^=3D> " "" (current-message)) - "\"An error occurred.\"")) + (let ((window-cfg (current-window-configuration)) + (pre-result (geiser-eval-region (point-min) + (point-max)))) + (set-window-configuration window-cfg) + (if (or (assq 'error pre-result) + output) + (format "\"%s\"" + (cdr (assq 'output pre-result))) + (cadr (assq 'result pre-result))))) (when (not repl) (save-current-buffer (set-buffer repl-buffer) (geiser-repl-exit)) --=20 1.7.9.6 --MP_/2ebd2PK.ock67VW7v=kCIYH-- --Sig_/+h895+TVYZ4yvSrEvSwycE9 Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQEcBAEBAgAGBQJSAC+uAAoJECe5xv0o1hivNf8H+wXQIA+ro8oBIasbhv+hdhOB bgxazBZWt/xhuSTQa2IBgtOEa4Fqv/Hx6y0kNIOUbPBoSSKsy5xuC2Gom+2uGUr4 wgtkoqalt5APVMqHiclbGquSg/3NXKY1k/TZi9Pj9wzqDA17OIHAPwtdceD3yiIb /TaHjonqQVWMHxTaB1Acygn6WLjrQGppPhBZANtqGO1lYhs/W4DQ3JWrnX4qevAe mttFipooFXkItv+k9qlA2h76ASo24tfCytlIill5KjS7NEhJXiUrdAdIKWEiw8EO odNl66Jek5TIMH+PQTT5IAtMf6OZzLeV5WcmLHUHB2LLGw9SnJN8hIZXNwbX79Y= =/DTP -----END PGP SIGNATURE----- --Sig_/+h895+TVYZ4yvSrEvSwycE9--