emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
* [PATCH] Use geiser for babel scheme evaluation.
  2013-01-06  6:56     ` Bastien
@ 2013-01-08 23:46       ` Michael Gauland
  2013-01-09  8:23         ` Bastien
  0 siblings, 1 reply; 12+ messages in thread
From: Michael Gauland @ 2013-01-08 23:46 UTC (permalink / raw)
  To: Bastien; +Cc: emacs-orgmode


[-- Attachment #1.1: Type: text/plain, Size: 1576 bytes --]

On 06/01/13 19:56, Bastien wrote:
> Well, I'm afraid we'll have to go the clean way: just document the
> deleted functions, the new ones, and the ones that have been
> rewritten. No need to go too much into details. Also let's rename
> `cleanse-org-babel-scheme-repl-map' to
> `org-babel-scheme-cleanse-repl-map'.

I've done the rename, un-dangled the parentheses, and prepared a changelog:


Babel: Use geiser to manage scheme sessions

* lisp/ob-scheme.el: Load the geiser library
(run-scheme): Removed
(org-babel-scheme-eoe): Removed
(org-babel-scheme-cmd): Removed
(scheme-program-name): Removed
(org-babel-scheme-repl-map): Hash mapping session names to sessions.
(org-babel-scheme-cleanse-repl-map): Remove dead sessions from map.
(org-babel-scheme-get-session-buffer): Return buffer associated with a
session.
(org-babel-scheme-set-session-buffer): Record the buffer associated with
a session.
(org-babel-scheme-get-buffer-impl): Return the scheme implementation
geiser associates with a buffer.
(org-babel-scheme-get-repl): Switch to the scheme REPL buffer for a
session, creating it if it doesn't exist.
(org-bable-scheme-make-session-name): Generate a name for a session, if
one was not specified.
(org-babel-scheme-execute-with-geiser): Execute scheme code, creating
the REPL if necessary.
(org-babel-execute-scheme): Rewritten to use geiser.
(org-babel-prep-session:scheme): Removed
(org-babel-scheme-initiate-session): Removed

This uses geiser to evaluate babel scheme source blocks, and generally
improves scheme support.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-Use-geiser-for-babel-scheme-evaluation.patch --]
[-- Type: text/x-diff; name="0001-Use-geiser-for-babel-scheme-evaluation.patch", Size: 9195 bytes --]

From bc33a46041086abd5d1fec321f104aa034823576 Mon Sep 17 00:00:00 2001
From: Michael Gauland <mike_gauland@stanfordalumni.org>
Date: Wed, 9 Jan 2013 12:41:13 +1300
Subject: [PATCH] Use geiser for babel scheme evaluation.

---
 lisp/ob-scheme.el |  192 ++++++++++++++++++++++++++++++++---------------------
 1 files changed, 117 insertions(+), 75 deletions(-)

diff --git a/lisp/ob-scheme.el b/lisp/ob-scheme.el
index c9fa44a..31e0cad 100644
--- a/lisp/ob-scheme.el
+++ b/lisp/ob-scheme.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2010-2013 Free Software Foundation, Inc.
 
-;; Author: Eric Schulte
+;; Authors: Eric Schulte, Michael Gauland
 ;; Keywords: literate programming, reproducible research, scheme
 ;; Homepage: http://orgmode.org
 
@@ -33,27 +33,16 @@
 ;; - a working scheme implementation
 ;;   (e.g. guile http://www.gnu.org/software/guile/guile.html)
 ;;
-;; - for session based evaluation cmuscheme.el is required which is
-;;   included in Emacs
+;; - for session based evaluation geiser is required, which is available from
+;;   ELPA.
 
 ;;; Code:
 (require 'ob)
-(eval-when-compile (require 'cl))
-
-(declare-function run-scheme "ext:cmuscheme" (cmd))
+(load-library "geiser-impl")
 
 (defvar org-babel-default-header-args:scheme '()
   "Default header arguments for scheme code blocks.")
 
-(defvar org-babel-scheme-eoe "org-babel-scheme-eoe"
-  "String to indicate that evaluation has completed.")
-
-(defcustom org-babel-scheme-cmd "guile"
-  "Name of command used to evaluate scheme blocks."
-  :group 'org-babel
-  :version "24.1"
-  :type 'string)
-
 (defun org-babel-expand-body:scheme (body params)
   "Expand BODY according to PARAMS, return the expanded body."
   (let ((vars (mapcar #'cdr (org-babel-get-header params :var))))
@@ -65,70 +54,123 @@
                 ")\n" body ")")
       body)))
 
-(defvar scheme-program-name)
+
+(defvar org-babel-scheme-repl-map (make-hash-table :test 'equal)
+  "Map of scheme sessions to session names.")
+
+(defun org-babel-scheme-cleanse-repl-map ()
+  "Remove dead buffers from the REPL map."
+  (maphash
+   (lambda (x y)
+     (when (not (buffer-name y))
+       (remhash x org-babel-scheme-repl-map)))
+   org-babel-scheme-repl-map))
+
+(defun org-babel-scheme-get-session-buffer (session-name)
+  "Look up the scheme buffer for a session; return nil if it doesn't exist."
+  (org-babel-scheme-cleanse-repl-map) ; Prune dead sessions
+  (gethash session-name org-babel-scheme-repl-map))
+
+(defun org-babel-scheme-set-session-buffer (session-name buffer)
+  "Record the scheme buffer used for a given session."
+  (puthash session-name buffer org-babel-scheme-repl-map))
+
+(defun org-babel-scheme-get-buffer-impl (buffer)
+  "Returns the scheme implementation geiser associates with the buffer."
+  (with-current-buffer (set-buffer buffer)
+    geiser-impl--implementation))
+
+(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)))
+    (or buffer 
+    (progn
+      (run-geiser impl)
+      (if name
+	  (progn 
+	    (rename-buffer name t)
+	    (org-babel-scheme-set-session-buffer name (current-buffer))))
+      (current-buffer)))))
+
+(defun org-babel-scheme-make-session-name (buffer name impl)
+  "Generate a name for the session buffer.
+
+For a named session, the buffer name will be the session name.
+
+If the session is unnamed (nil), generate a name.
+
+If the session is 'none', use nil for the session name, and
+org-babel-scheme-execute-with-geiser will use a temporary session."
+  (let ((result 
+	 (cond ((not name)
+		(concat buffer " " (symbol-name impl) " REPL"))
+	       ((string= name "none") nil)
+	       (name))))
+    result))
+
+(defun org-babel-scheme-execute-with-geiser (code output impl repl)
+  "Execute code in specified REPL. If the REPL doesn't exist, create it
+using the given scheme implementation.
+
+Returns the output of executing the code if the output parameter
+is true; otherwise returns the last value."
+  (let ((result nil))
+    (with-temp-buffer
+      (insert (format ";; -*- geiser-scheme-implementation: %s -*-" impl))
+      (newline)
+      (insert (if output
+		  (format "(with-output-to-string (lambda () %s))" code)
+		code))
+      (geiser-mode)
+      (let ((repl-buffer (save-current-buffer (org-babel-scheme-get-repl impl repl))))
+	(when (not (eq impl (org-babel-scheme-get-buffer-impl (current-buffer))))
+	  (message "Implementation mismatch: %s (%s) %s (s)" impl (symbolp impl)
+		   (org-babel-scheme-get-buffer-impl (current-buffer))
+		   (symbolp (org-babel-scheme-get-buffer-impl (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) "=> ")
+		  (replace-regexp-in-string "^=> " "" (current-message))
+		"\"An error occurred.\""))
+	(when (not repl)
+	  (save-current-buffer (set-buffer repl-buffer)
+			       (geiser-repl-exit))
+	  (set-process-query-on-exit-flag (get-buffer-process repl-buffer) nil)
+	  (kill-buffer repl-buffer))
+	(setq result (if (or (string= result "#<void>")
+			     (string= result "#<unspecified>"))
+			 nil
+		       (read result)))))
+    result))
+
 (defun org-babel-execute:scheme (body params)
   "Execute a block of Scheme code with org-babel.
 This function is called by `org-babel-execute-src-block'"
-  (let* ((result-type (cdr (assoc :result-type params)))
-	 (org-babel-scheme-cmd (or (cdr (assoc :scheme params))
-				   org-babel-scheme-cmd))
-         (full-body (org-babel-expand-body:scheme body params)))
-    (read
-     (if (not (string= (cdr (assoc :session params)) "none"))
-         ;; session evaluation
-	 (let ((session (org-babel-prep-session:scheme
-			 (cdr (assoc :session params)) params)))
-	   (org-babel-comint-with-output
-	       (session (format "%S" org-babel-scheme-eoe) t body)
-	     (mapc
-	      (lambda (line)
-		(insert (org-babel-chomp line)) (comint-send-input nil t))
-	      (list body (format "%S" org-babel-scheme-eoe)))))
-       ;; external evaluation
-       (let ((script-file (org-babel-temp-file "scheme-script-")))
-         (with-temp-file script-file
-           (insert
-            ;; return the value or the output
-            (if (string= result-type "value")
-                (format "(display %s)" full-body)
-              full-body)))
-         (org-babel-eval
-	  (format "%s %s" org-babel-scheme-cmd
-		  (org-babel-process-file-name script-file)) ""))))))
-
-(defun org-babel-prep-session:scheme (session params)
-  "Prepare SESSION according to the header arguments specified in PARAMS."
-  (let* ((session (org-babel-scheme-initiate-session session))
-	 (vars (mapcar #'cdr (org-babel-get-header params :var)))
-	 (var-lines
-	  (mapcar
-	   (lambda (var) (format "%S" (print `(define ,(car var) ',(cdr var)))))
-	   vars)))
-    (when session
-      (org-babel-comint-in-buffer session
-	(sit-for .5) (goto-char (point-max))
-	(mapc (lambda (var)
-		(insert var) (comint-send-input nil t)
-		(org-babel-comint-wait-for-output session)
-		(sit-for .1) (goto-char (point-max))) var-lines)))
-    session))
-
-(defun org-babel-scheme-initiate-session (&optional session)
-  "If there is not a current inferior-process-buffer in SESSION
-then create.  Return the initialized session."
-  (require 'cmuscheme)
-  (unless (string= session "none")
-    (let ((session-buffer (save-window-excursion
-			    (run-scheme org-babel-scheme-cmd)
-			    (rename-buffer session)
-			    (current-buffer))))
-      (if (org-babel-comint-buffer-livep session-buffer)
-	  (progn (sit-for .25) session-buffer)
-        (sit-for .5)
-        (org-babel-scheme-initiate-session session)))))
+  (let* ((source-buffer (current-buffer))
+	 (source-buffer-name (replace-regexp-in-string ;; zap surrounding *
+	  "^ ?\\*\\([^*]+\\)\\*" "\\1" (buffer-name source-buffer))))
+    (save-excursion
+      (org-babel-reassemble-table
+       (let* ((result-type (cdr (assoc :result-type params)))
+	      (impl (or (when (cdr (assoc :scheme params))
+			  (intern (cdr (assoc :scheme params))))
+			geiser-default-implementation
+			(car geiser-active-implementations)))
+	      (session (org-babel-scheme-make-session-name source-buffer-name (cdr (assoc :session params)) impl))
+	    (full-body (org-babel-expand-body:scheme body params)))
+       (org-babel-scheme-execute-with-geiser full-body           ; code
+					     (string= result-type "output")	; output?
+					     impl ; implementation
+					     (and (not (string= session "none")) session)); session
+       )
+     (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)))))))
+  
 
 (provide 'ob-scheme)
 
-
-
 ;;; ob-scheme.el ends here
-- 
1.7.2.5


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 899 bytes --]

^ permalink raw reply related	[flat|nested] 12+ messages in thread

* Re: [PATCH] Use geiser for babel scheme evaluation.
  2013-01-08 23:46       ` [PATCH] Use geiser for babel scheme evaluation Michael Gauland
@ 2013-01-09  8:23         ` Bastien
  0 siblings, 0 replies; 12+ messages in thread
From: Bastien @ 2013-01-09  8:23 UTC (permalink / raw)
  To: Michael Gauland; +Cc: emacs-orgmode

Hi Michael,

Michael Gauland <mikelygee@no8wireless.co.nz> writes:

> I've done the rename, un-dangled the parentheses, and prepared a
> changelog:

Thanks Michael.   I ping'ed the FSF copyright clerk for some news, 
I hope he's not overwhelmed after Christmas holidays.

Best,

PS: Next time put the ChangeLog directly in the commit message,
that's even quicker for me.

-- 
 Bastien

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH] Use geiser for babel scheme evaluation.
@ 2013-06-15  7:06 Greg Minshall
  2013-06-27 14:49 ` Bastien
  0 siblings, 1 reply; 12+ messages in thread
From: Greg Minshall @ 2013-06-15  7:06 UTC (permalink / raw)
  To: Bastien; +Cc: emacs-orgmode, Michael Gauland

hi.  what happened to this patch?  i don't see it anywhere.  cheers!

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH] Use geiser for babel scheme evaluation.
  2013-06-15  7:06 Greg Minshall
@ 2013-06-27 14:49 ` Bastien
  0 siblings, 0 replies; 12+ messages in thread
From: Bastien @ 2013-06-27 14:49 UTC (permalink / raw)
  To: Greg Minshall; +Cc: emacs-orgmode, Michael Gauland

Hi Greg,

Greg Minshall <minshall@acm.org> writes:

> hi.  what happened to this patch?  i don't see it anywhere.  cheers!

Can you give a pointer to "this" patch?

Thanks!

-- 
 Bastien

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH] Use geiser for babel scheme evaluation.
@ 2013-06-29  3:50 Greg Minshall
  2013-06-30 22:55 ` Bastien
  2013-06-30 23:26 ` Eric Schulte
  0 siblings, 2 replies; 12+ messages in thread
From: Greg Minshall @ 2013-06-29  3:50 UTC (permalink / raw)
  To: Bastien; +Cc: emacs-orgmode, Michael Gauland

hi, Bastien,

>> hi.  what happened to this patch?  i don't see it anywhere.  cheers!

> Can you give a pointer to "this" patch?

here is the thread:
http://comments.gmane.org/gmane.emacs.orgmode/64229

cheers, Greg

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH] Use geiser for babel scheme evaluation.
  2013-06-29  3:50 [PATCH] Use geiser for babel scheme evaluation Greg Minshall
@ 2013-06-30 22:55 ` Bastien
  2013-07-01  0:10   ` Eric Schulte
  2013-06-30 23:26 ` Eric Schulte
  1 sibling, 1 reply; 12+ messages in thread
From: Bastien @ 2013-06-30 22:55 UTC (permalink / raw)
  To: Greg Minshall; +Cc: emacs-orgmode, schulte eric, Michael Gauland

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

Hi Greg,

Greg Minshall <minshall@acm.org> writes:

> here is the thread:
> http://comments.gmane.org/gmane.emacs.orgmode/64229

Thanks.

I'm reattaching the patch, with a reworked ChangeLog.

(We could not apply it at the time because Michael didn't
have his copyright assignment.)

I like geiser very much, but maybe this introduces too much
external dependencies.

Eric, do you think we can go ahead and apply it?

PS: The patch does not apply, we need to revert 
http://orgmode.org/cgit.cgi/org-mode.git/commit/?id=92e327
first.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Use-geiser-for-babel-scheme-evaluation.patch --]
[-- Type: text/x-patch, Size: 9471 bytes --]

From bc33a46041086abd5d1fec321f104aa034823576 Mon Sep 17 00:00:00 2001
From: Michael Gauland <mike_gauland@stanfordalumni.org>
Date: Wed, 9 Jan 2013 12:41:13 +1300
Subject: [PATCH] ob-scheme.el: Use geiser for babel scheme evaluation

* ob-scheme.el (run-scheme, org-babel-scheme-eoe)
(org-babel-scheme-cmd, scheme-program-name)
(org-babel-prep-session:scheme)
(org-babel-scheme-initiate-session): Deleted.
(org-babel-execute-scheme): Rewritten to use geiser.
(org-babel-scheme-repl-map, org-babel-scheme-cleanse-repl-map)
(org-babel-scheme-get-session-buffer)
(org-babel-scheme-set-session-buffer)
(org-babel-scheme-get-buffer-impl, org-babel-scheme-get-repl)
(org-bable-scheme-make-session-name)
(org-babel-scheme-execute-with-geiser): New functions.

---
 lisp/ob-scheme.el |  192 ++++++++++++++++++++++++++++++++---------------------
 1 files changed, 117 insertions(+), 75 deletions(-)

diff --git a/lisp/ob-scheme.el b/lisp/ob-scheme.el
index c9fa44a..31e0cad 100644
--- a/lisp/ob-scheme.el
+++ b/lisp/ob-scheme.el
@@ -2,7 +2,7 @@

 ;; Copyright (C) 2010-2013 Free Software Foundation, Inc.

-;; Author: Eric Schulte
+;; Authors: Eric Schulte, Michael Gauland
 ;; Keywords: literate programming, reproducible research, scheme
 ;; Homepage: http://orgmode.org

@@ -33,27 +33,16 @@
 ;; - a working scheme implementation
 ;;   (e.g. guile http://www.gnu.org/software/guile/guile.html)
 ;;
-;; - for session based evaluation cmuscheme.el is required which is
-;;   included in Emacs
+;; - for session based evaluation geiser is required, which is available from
+;;   ELPA.

 ;;; Code:
 (require 'ob)
-(eval-when-compile (require 'cl))
-
-(declare-function run-scheme "ext:cmuscheme" (cmd))
+(load-library "geiser-impl")

 (defvar org-babel-default-header-args:scheme '()
   "Default header arguments for scheme code blocks.")

-(defvar org-babel-scheme-eoe "org-babel-scheme-eoe"
-  "String to indicate that evaluation has completed.")
-
-(defcustom org-babel-scheme-cmd "guile"
-  "Name of command used to evaluate scheme blocks."
-  :group 'org-babel
-  :version "24.1"
-  :type 'string)
-
 (defun org-babel-expand-body:scheme (body params)
   "Expand BODY according to PARAMS, return the expanded body."
   (let ((vars (mapcar #'cdr (org-babel-get-header params :var))))
@@ -65,70 +54,123 @@
                 ")\n" body ")")
       body)))

-(defvar scheme-program-name)
+
+(defvar org-babel-scheme-repl-map (make-hash-table :test 'equal)
+  "Map of scheme sessions to session names.")
+
+(defun org-babel-scheme-cleanse-repl-map ()
+  "Remove dead buffers from the REPL map."
+  (maphash
+   (lambda (x y)
+     (when (not (buffer-name y))
+       (remhash x org-babel-scheme-repl-map)))
+   org-babel-scheme-repl-map))
+
+(defun org-babel-scheme-get-session-buffer (session-name)
+  "Look up the scheme buffer for a session; return nil if it doesn't exist."
+  (org-babel-scheme-cleanse-repl-map) ; Prune dead sessions
+  (gethash session-name org-babel-scheme-repl-map))
+
+(defun org-babel-scheme-set-session-buffer (session-name buffer)
+  "Record the scheme buffer used for a given session."
+  (puthash session-name buffer org-babel-scheme-repl-map))
+
+(defun org-babel-scheme-get-buffer-impl (buffer)
+  "Returns the scheme implementation geiser associates with the buffer."
+  (with-current-buffer (set-buffer buffer)
+    geiser-impl--implementation))
+
+(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)))
+    (or buffer
+    (progn
+      (run-geiser impl)
+      (if name
+	  (progn
+	    (rename-buffer name t)
+	    (org-babel-scheme-set-session-buffer name (current-buffer))))
+      (current-buffer)))))
+
+(defun org-babel-scheme-make-session-name (buffer name impl)
+  "Generate a name for the session buffer.
+
+For a named session, the buffer name will be the session name.
+
+If the session is unnamed (nil), generate a name.
+
+If the session is 'none', use nil for the session name, and
+org-babel-scheme-execute-with-geiser will use a temporary session."
+  (let ((result
+	 (cond ((not name)
+		(concat buffer " " (symbol-name impl) " REPL"))
+	       ((string= name "none") nil)
+	       (name))))
+    result))
+
+(defun org-babel-scheme-execute-with-geiser (code output impl repl)
+  "Execute code in specified REPL. If the REPL doesn't exist, create it
+using the given scheme implementation.
+
+Returns the output of executing the code if the output parameter
+is true; otherwise returns the last value."
+  (let ((result nil))
+    (with-temp-buffer
+      (insert (format ";; -*- geiser-scheme-implementation: %s -*-" impl))
+      (newline)
+      (insert (if output
+		  (format "(with-output-to-string (lambda () %s))" code)
+		code))
+      (geiser-mode)
+      (let ((repl-buffer (save-current-buffer (org-babel-scheme-get-repl impl repl))))
+	(when (not (eq impl (org-babel-scheme-get-buffer-impl (current-buffer))))
+	  (message "Implementation mismatch: %s (%s) %s (s)" impl (symbolp impl)
+		   (org-babel-scheme-get-buffer-impl (current-buffer))
+		   (symbolp (org-babel-scheme-get-buffer-impl (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) "=> ")
+		  (replace-regexp-in-string "^=> " "" (current-message))
+		"\"An error occurred.\""))
+	(when (not repl)
+	  (save-current-buffer (set-buffer repl-buffer)
+			       (geiser-repl-exit))
+	  (set-process-query-on-exit-flag (get-buffer-process repl-buffer) nil)
+	  (kill-buffer repl-buffer))
+	(setq result (if (or (string= result "#<void>")
+			     (string= result "#<unspecified>"))
+			 nil
+		       (read result)))))
+    result))
+
 (defun org-babel-execute:scheme (body params)
   "Execute a block of Scheme code with org-babel.
 This function is called by `org-babel-execute-src-block'"
-  (let* ((result-type (cdr (assoc :result-type params)))
-	 (org-babel-scheme-cmd (or (cdr (assoc :scheme params))
-				   org-babel-scheme-cmd))
-         (full-body (org-babel-expand-body:scheme body params)))
-    (read
-     (if (not (string= (cdr (assoc :session params)) "none"))
-         ;; session evaluation
-	 (let ((session (org-babel-prep-session:scheme
-			 (cdr (assoc :session params)) params)))
-	   (org-babel-comint-with-output
-	       (session (format "%S" org-babel-scheme-eoe) t body)
-	     (mapc
-	      (lambda (line)
-		(insert (org-babel-chomp line)) (comint-send-input nil t))
-	      (list body (format "%S" org-babel-scheme-eoe)))))
-       ;; external evaluation
-       (let ((script-file (org-babel-temp-file "scheme-script-")))
-         (with-temp-file script-file
-           (insert
-            ;; return the value or the output
-            (if (string= result-type "value")
-                (format "(display %s)" full-body)
-              full-body)))
-         (org-babel-eval
-	  (format "%s %s" org-babel-scheme-cmd
-		  (org-babel-process-file-name script-file)) ""))))))
-
-(defun org-babel-prep-session:scheme (session params)
-  "Prepare SESSION according to the header arguments specified in PARAMS."
-  (let* ((session (org-babel-scheme-initiate-session session))
-	 (vars (mapcar #'cdr (org-babel-get-header params :var)))
-	 (var-lines
-	  (mapcar
-	   (lambda (var) (format "%S" (print `(define ,(car var) ',(cdr var)))))
-	   vars)))
-    (when session
-      (org-babel-comint-in-buffer session
-	(sit-for .5) (goto-char (point-max))
-	(mapc (lambda (var)
-		(insert var) (comint-send-input nil t)
-		(org-babel-comint-wait-for-output session)
-		(sit-for .1) (goto-char (point-max))) var-lines)))
-    session))
-
-(defun org-babel-scheme-initiate-session (&optional session)
-  "If there is not a current inferior-process-buffer in SESSION
-then create.  Return the initialized session."
-  (require 'cmuscheme)
-  (unless (string= session "none")
-    (let ((session-buffer (save-window-excursion
-			    (run-scheme org-babel-scheme-cmd)
-			    (rename-buffer session)
-			    (current-buffer))))
-      (if (org-babel-comint-buffer-livep session-buffer)
-	  (progn (sit-for .25) session-buffer)
-        (sit-for .5)
-        (org-babel-scheme-initiate-session session)))))
+  (let* ((source-buffer (current-buffer))
+	 (source-buffer-name (replace-regexp-in-string ;; zap surrounding *
+	  "^ ?\\*\\([^*]+\\)\\*" "\\1" (buffer-name source-buffer))))
+    (save-excursion
+      (org-babel-reassemble-table
+       (let* ((result-type (cdr (assoc :result-type params)))
+	      (impl (or (when (cdr (assoc :scheme params))
+			  (intern (cdr (assoc :scheme params))))
+			geiser-default-implementation
+			(car geiser-active-implementations)))
+	      (session (org-babel-scheme-make-session-name source-buffer-name (cdr (assoc :session params)) impl))
+	    (full-body (org-babel-expand-body:scheme body params)))
+       (org-babel-scheme-execute-with-geiser full-body           ; code
+					     (string= result-type "output")	; output?
+					     impl ; implementation
+					     (and (not (string= session "none")) session)); session
+       )
+     (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)))))))
+

 (provide 'ob-scheme)

-
-
 ;;; ob-scheme.el ends here
--
1.7.2.5

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


-- 
 Bastien

^ permalink raw reply related	[flat|nested] 12+ messages in thread

* Re: [PATCH] Use geiser for babel scheme evaluation.
  2013-06-29  3:50 [PATCH] Use geiser for babel scheme evaluation Greg Minshall
  2013-06-30 22:55 ` Bastien
@ 2013-06-30 23:26 ` Eric Schulte
  1 sibling, 0 replies; 12+ messages in thread
From: Eric Schulte @ 2013-06-30 23:26 UTC (permalink / raw)
  To: Greg Minshall; +Cc: Bastien, emacs-orgmode, Michael Gauland

Greg Minshall <minshall@acm.org> writes:

> hi, Bastien,
>
>>> hi.  what happened to this patch?  i don't see it anywhere.  cheers!
>
>> Can you give a pointer to "this" patch?
>
> here is the thread:
> http://comments.gmane.org/gmane.emacs.orgmode/64229
>
> cheers, Greg
>

Hi Greg,

Thanks for sending this along.

1. Have you completed the FSF assignment?  I don't see you listed on
   http://orgmode.org/worg/org-contribute.html

2. This patch no longer applies cleanly, I get the following error
   output when trying to apply it to the current repo.

    17:24 bagel:org-mode git am ~/64406-001.bin
    Applying: Use geiser for babel scheme evaluation.
    /home/eschulte/src/org-mode/.git/rebase-apply/patch:83: trailing whitespace.
        (or buffer
    /home/eschulte/src/org-mode/.git/rebase-apply/patch:87: trailing whitespace.
              (progn
    /home/eschulte/src/org-mode/.git/rebase-apply/patch:101: trailing whitespace.
      (let ((result
    /home/eschulte/src/org-mode/.git/rebase-apply/patch:226: trailing whitespace.

    error: patch failed: lisp/ob-scheme.el:65
    error: lisp/ob-scheme.el: patch does not apply
    Patch failed at 0001 Use geiser for babel scheme evaluation.

Once these are resolved we can apply this patch.  Thanks!

-- 
Eric Schulte
http://cs.unm.edu/~eschulte

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH] Use geiser for babel scheme evaluation.
  2013-06-30 22:55 ` Bastien
@ 2013-07-01  0:10   ` Eric Schulte
  2013-07-01  0:27     ` Bastien
  2013-07-01 16:19     ` Achim Gratz
  0 siblings, 2 replies; 12+ messages in thread
From: Eric Schulte @ 2013-07-01  0:10 UTC (permalink / raw)
  To: Bastien; +Cc: emacs-orgmode, Michael Gauland, Greg Minshall

Bastien <bzg@gnu.org> writes:

> Hi Greg,
>
> Greg Minshall <minshall@acm.org> writes:
>
>> here is the thread:
>> http://comments.gmane.org/gmane.emacs.orgmode/64229
>
> Thanks.
>
> I'm reattaching the patch, with a reworked ChangeLog.
>
> (We could not apply it at the time because Michael didn't
> have his copyright assignment.)
>
> I like geiser very much, but maybe this introduces too much
> external dependencies.
>
> Eric, do you think we can go ahead and apply it?
>

I've just applied this patch.  I don't think external dependencies are a
problem if they offload language integration work to a dedicated
external package.  The more babel can re-use existing packages the
better, e.g., common lisp code blocks are just thin wrappers around
slime, but they work exceedingly well with almost no babel-side coding
or maintenance.

Thanks Greg for this patch!

>
> PS: The patch does not apply, we need to revert
> http://orgmode.org/cgit.cgi/org-mode.git/commit/?id=92e327
> first.

Thanks for figuring out this conflict.

-- 
Eric Schulte
http://cs.unm.edu/~eschulte

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH] Use geiser for babel scheme evaluation.
@ 2013-07-01  0:24 Greg Minshall
  2013-07-01  1:36 ` Eric Schulte
  0 siblings, 1 reply; 12+ messages in thread
From: Greg Minshall @ 2013-07-01  0:24 UTC (permalink / raw)
  To: Eric Schulte; +Cc: Bastien, emacs-orgmode, Michael Gauland

hi, Eric,

this patch isn't mine, but rather Michael Gauland's; i just wondered
where it had gone.

cheers, Greg

> here is the thread:
> http://comments.gmane.org/gmane.emacs.orgmode/64229

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH] Use geiser for babel scheme evaluation.
  2013-07-01  0:10   ` Eric Schulte
@ 2013-07-01  0:27     ` Bastien
  2013-07-01 16:19     ` Achim Gratz
  1 sibling, 0 replies; 12+ messages in thread
From: Bastien @ 2013-07-01  0:27 UTC (permalink / raw)
  To: Eric Schulte; +Cc: emacs-orgmode, Michael Gauland, Greg Minshall

Eric Schulte <schulte.eric@gmail.com> writes:

> Thanks Greg for this patch!

(Michael Gauland is the one to thank for the patch, and Greg for the
heads up. Thanks to both!)

-- 
 Bastien

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH] Use geiser for babel scheme evaluation.
  2013-07-01  0:24 Greg Minshall
@ 2013-07-01  1:36 ` Eric Schulte
  0 siblings, 0 replies; 12+ messages in thread
From: Eric Schulte @ 2013-07-01  1:36 UTC (permalink / raw)
  To: Greg Minshall; +Cc: Bastien, emacs-orgmode, Michael Gauland

Ah, apologies and thanks all around.

Cheers,

Greg Minshall <minshall@acm.org> writes:

> hi, Eric,
>
> this patch isn't mine, but rather Michael Gauland's; i just wondered
> where it had gone.
>
> cheers, Greg
>
>> here is the thread:
>> http://comments.gmane.org/gmane.emacs.orgmode/64229

-- 
Eric Schulte
http://cs.unm.edu/~eschulte

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PATCH] Use geiser for babel scheme evaluation.
  2013-07-01  0:10   ` Eric Schulte
  2013-07-01  0:27     ` Bastien
@ 2013-07-01 16:19     ` Achim Gratz
  1 sibling, 0 replies; 12+ messages in thread
From: Achim Gratz @ 2013-07-01 16:19 UTC (permalink / raw)
  To: emacs-orgmode

Eric Schulte writes:
> I've just applied this patch.  I don't think external dependencies are a
> problem if they offload language integration work to a dedicated
> external package.  The more babel can re-use existing packages the
> better, e.g., common lisp code blocks are just thin wrappers around
> slime, but they work exceedingly well with almost no babel-side coding
> or maintenance.

Would you mind keeping the byte-compile clean?

--8<---------------cut here---------------start------------->8---
Compiling /home/org-mode/lisp/ob-scheme.el...

In org-babel-scheme-get-buffer-impl:
ob-scheme.el:81:5:Warning: reference to free variable
    `geiser-impl--implementation'

In org-babel-scheme-execute-with-geiser:
ob-scheme.el:130:21:Warning: `message' called with 4 args to fill 3 format
    field(s)
ob-scheme.el:133:15:Warning: assignment to free variable `geiser-repl--repl'
ob-scheme.el:134:15:Warning: assignment to free variable
    `geiser-impl--implementation'

In org-babel-execute:scheme:
ob-scheme.el:163:25:Warning: reference to free variable
    `geiser-default-implementation'
ob-scheme.el:164:30:Warning: reference to free variable
    `geiser-active-implementations'

In end of data:
ob-scheme.el:181:1:Warning: the following functions are not known to be
    defined: run-geiser, geiser-mode, geiser-eval-region, geiser-repl-exit
--8<---------------cut here---------------end--------------->8---



Regards,
Achim.
-- 
+<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+

Factory and User Sound Singles for Waldorf rackAttack:
http://Synth.Stromeko.net/Downloads.html#WaldorfSounds

^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2013-07-01 16:20 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-06-29  3:50 [PATCH] Use geiser for babel scheme evaluation Greg Minshall
2013-06-30 22:55 ` Bastien
2013-07-01  0:10   ` Eric Schulte
2013-07-01  0:27     ` Bastien
2013-07-01 16:19     ` Achim Gratz
2013-06-30 23:26 ` Eric Schulte
  -- strict thread matches above, loose matches on Subject: below --
2013-07-01  0:24 Greg Minshall
2013-07-01  1:36 ` Eric Schulte
2013-06-15  7:06 Greg Minshall
2013-06-27 14:49 ` Bastien
2013-01-04 19:18 [PATCH] Babel support for scheme using geiser Michael Gauland
2013-01-05 14:42 ` Bastien
2013-01-05 18:57   ` Michael Gauland
2013-01-06  6:56     ` Bastien
2013-01-08 23:46       ` [PATCH] Use geiser for babel scheme evaluation Michael Gauland
2013-01-09  8:23         ` Bastien

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).