emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: "Marc Nieper-Wißkirchen" <marc@nieper-wisskirchen.de>
To: Ihor Radchenko <yantar92@posteo.net>
Cc: "Rudolf Adamkovič" <salutis@me.com>, emacs-orgmode@gnu.org
Subject: Re: Babel (scheme): Evaluation errors are not shown
Date: Sat, 31 Dec 2022 11:50:13 +0100	[thread overview]
Message-ID: <CAEYrNrT3k6dB0MnPx1UpusSBPXSwdFEkF-pa_EPkoev-1w=ptQ@mail.gmail.com> (raw)
In-Reply-To: <CAEYrNrRVgd4+T33x-GcFKKLPvr7zUr3FGmzK=zUX5=N8R35iAg@mail.gmail.com>

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

Am Sa., 31. Dez. 2022 um 11:19 Uhr schrieb Marc Nieper-Wißkirchen
<marc@nieper-wisskirchen.de>:
>
> Am Sa., 31. Dez. 2022 um 11:09 Uhr schrieb Marc Nieper-Wißkirchen
> <marc@nieper-wisskirchen.de>:
> >
> > Am Sa., 31. Dez. 2022 um 10:49 Uhr schrieb Ihor Radchenko <yantar92@posteo.net>:
> > >
> > > Marc Nieper-Wißkirchen <marc@nieper-wisskirchen.de> writes:

[...]

> > >  It is not what we usually do in Org babel. If blocks execution
> > > fails, we display the error in separate buffer and still return the
> > > output available before error has been thrown. See `org-babel-eval' and
> > > `org-babel-eval-error-notify'.
> >
> > I will take a look.
>
> Hmmm... `org-babel-eval-error-notify' assumes that the code was
> evaluated by running an external script.  In the case of the Geiser
> interface to Scheme, the concept of an exit code does not make any
> sense.

Please find attached a version that does not signal an Elisp user
error, but calls `org-babel-eval-error-notify' instead.  To get rid of
the display of the arbitrary error code, could we modify
`org-babel-eval-error-notify' so that nothing is displayed about an
error if the error code is `nil'?

[-- Attachment #2: ob-scheme.el --]
[-- Type: application/octet-stream, Size: 11008 bytes --]

;;; ob-scheme.el --- Babel Functions for Scheme      -*- lexical-binding: t; -*-

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

;; Authors: Eric Schulte
;;        Michael Gauland
;; Keywords: literate programming, reproducible research, scheme
;; URL: https://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 <https://www.gnu.org/licenses/>.

;;; Commentary:

;; Now working with SBCL for both session and external evaluation.
;;
;; This certainly isn't optimally robust, but it seems to be working
;; for the basic use cases.

;;; Requirements:

;; - a working scheme implementation
;;   (e.g. guile https://www.gnu.org/software/guile/guile.html)
;;
;; - for session based evaluation geiser is required, which is available from
;;   ELPA.

;;; Code:

(require 'org-macs)
(org-assert-version)

(require 'ob)
(require 'geiser nil t)
(require 'geiser-impl nil t)
(defvar geiser-repl--repl)             ; Defined in geiser-repl.el
(defvar geiser-impl--implementation)   ; Defined in geiser-impl.el
(defvar geiser-scheme-implementation)  ; Defined in geiser-impl.el
(defvar geiser-default-implementation) ; Defined in geiser-impl.el
(defvar geiser-active-implementations) ; Defined in geiser-impl.el
(defvar geiser-debug-show-debug-p)     ; Defined in geiser-debug.el
(defvar geiser-debug-jump-to-debug-p)  ; Defined in geiser-debug.el
(defvar geiser-repl-use-other-window)  ; Defined in geiser-repl.el
(defvar geiser-repl-window-allow-split)    ; Defined in geiser-repl.el

(declare-function run-geiser "ext:geiser-repl" (impl))
(declare-function geiser "ext:geiser-repl" (impl))
(declare-function geiser-mode "ext:geiser-mode" ())
(declare-function geiser-eval-region "ext:geiser-mode"
                  (start end &optional and-go raw nomsg))
(declare-function geiser-eval-region/wait "ext:geiser-mode"
                  (start end &optional timeout))
(declare-function geiser-repl-exit "ext:geiser-repl" (&optional arg))
(declare-function geiser-eval--retort-output "ext:geiser-eval" (ret))
(declare-function geiser-eval--retort-result-str "ext:geiser-eval" (ret prefix))
(declare-function geiser-eval--retort-error "ext:geiser-eval" (ret))
(declare-function geiser-eval--retort-error-msg "ext:geiser-eval" (err))

(defcustom org-babel-scheme-null-to 'hline
  "Replace `null' and empty lists in scheme tables with this before returning."
  :group 'org-babel
  :version "26.1"
  :package-version '(Org . "9.1")
  :type 'symbol)

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

(defun org-babel-expand-body:scheme (body params)
  "Expand BODY according to PARAMS, return the expanded body."
  (let ((vars (org-babel--get-vars params))
    (prepends (cdr (assq :prologue params)))
    (postpends (cdr (assq :epilogue params))))
    (concat (and prepends (concat prepends "\n"))
        (if (null vars) body
          (format "(let (%s)\n%s\n)"
              (mapconcat
               (lambda (var)
             (format "%S" (print `(,(car var) ',(cdr var)))))
               vars
               "\n      ")
              body))
        (and postpends (concat "\n" postpends)))))


(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) (unless (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)
  "Return 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
          (if (fboundp 'geiser)
              (geiser impl)
            ;; Obsolete since Geiser 0.26.
        (run-geiser impl))
      (when name
        (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."
  (cond ((not name) (concat buffer " " (symbol-name impl) " REPL"))
    ((string= name "none") nil)
    (name)))

(defmacro org-babel-scheme-capture-current-message (&rest body)
  "Capture current message in both interactive and noninteractive mode."
  `(if noninteractive
       (let ((original-message (symbol-function 'message))
             (current-message nil))
         (unwind-protect
             (progn
               (defun message (&rest args)
                 (setq current-message (apply original-message args)))
               ,@body
               current-message)
           (fset 'message original-message)))
     (progn
       ,@body
       (current-message))))

(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 code)
      (geiser-mode)
      (let ((geiser-repl-window-allow-split nil)
        (geiser-repl-use-other-window nil))
        (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)
          (let ((geiser-debug-jump-to-debug-p nil)
                (geiser-debug-show-debug-p nil))
            ;; `geiser-eval-region/wait' was introduced to await the
            ;; result of async evaluation in geiser version 0.22.
            (let ((ret (funcall (if (fboundp 'geiser-eval-region/wait)
                                    #'geiser-eval-region/wait
                                  #'geiser-eval-region)
                                (point-min)
                                (point-max))))
              (let ((err (geiser-eval--retort-error ret)))
                (setq result (cond
                              (err "Geiser Interpreter produced an error")
                              (output
                               (or (geiser-eval--retort-output ret)
                                   "Geiser Interpreter produced no output"))
                              (t (geiser-eval--retort-result-str ret ""))))
                (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))
                (when err
                  (let ((msg (geiser-eval--error-msg err)))
                    (org-babel-eval-error-notify
                     1
                     (concat (if (listp msg) (car msg) msg) "\n"))))))))))
    result))

(defun org-babel-scheme--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)))
    (cond ((listp res)
           (mapcar (lambda (el)
             (if (or (null el) (eq el 'null))
             org-babel-scheme-null-to
               el))
                   res))
      (t res))))

(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* ((source-buffer (current-buffer))
     (source-buffer-name (replace-regexp-in-string ;; zap surrounding *
                  "^ ?\\*\\([^*]+\\)\\*" "\\1"
                  (buffer-name source-buffer))))
    (save-excursion
      (let* ((result-type (cdr (assq :result-type params)))
         (impl (or (when (cdr (assq :scheme params))
             (intern (cdr (assq :scheme params))))
               geiser-scheme-implementation
               geiser-default-implementation
               (car geiser-active-implementations)))
         (session (org-babel-scheme-make-session-name
               source-buffer-name (cdr (assq :session params)) impl))
         (full-body (org-babel-expand-body:scheme body params))
         (result-params (cdr (assq :result-params params)))
         (result
          (org-babel-scheme-execute-with-geiser
           full-body               ; code
           (string= result-type "output")  ; output?
           impl                   ; implementation
           (and (not (string= session "none")) session)))) ; session
    (let ((table
           (org-babel-reassemble-table
        result
        (org-babel-pick-name (cdr (assq :colname-names params))
                     (cdr (assq :colnames params)))
        (org-babel-pick-name (cdr (assq :rowname-names params))
                     (cdr (assq :rownames params))))))
      (org-babel-result-cond result-params
        result
        (org-babel-scheme--table-or-string table)))))))

(provide 'ob-scheme)

;;; ob-scheme.el ends here

  reply	other threads:[~2022-12-31 10:51 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-16 12:03 Babel (scheme): Evaluation errors are not shown Marc Nieper-Wißkirchen
2022-12-18 12:41 ` Ihor Radchenko
2022-12-20  0:39   ` Rudolf Adamkovič
2022-12-20 20:00     ` Marc Nieper-Wißkirchen
2022-12-31  9:50       ` Ihor Radchenko
2022-12-31 10:09         ` Marc Nieper-Wißkirchen
2022-12-31 10:19           ` Marc Nieper-Wißkirchen
2022-12-31 10:50             ` Marc Nieper-Wißkirchen [this message]
2022-12-31 12:07               ` Ihor Radchenko
2022-12-31 13:11                 ` Marc Nieper-Wißkirchen
2022-12-31 13:24                   ` Ihor Radchenko
2022-12-31 14:46                     ` Marc Nieper-Wißkirchen
2023-01-01 13:53                       ` Ihor Radchenko
2023-01-01 15:21                         ` Marc Nieper-Wißkirchen
2023-01-02  9:38                           ` Ihor Radchenko
2023-01-02  9:52                             ` Marc Nieper-Wißkirchen
2023-01-03  9:07                               ` Ihor Radchenko
2023-01-07 14:26                                 ` Marc Nieper-Wißkirchen
2023-01-25 13:12                                   ` Ihor Radchenko
2023-01-05  8:55                               ` Marc Nieper-Wißkirchen
2023-01-06 16:17                                 ` Ihor Radchenko
2023-01-06 16:20                                   ` Ihor Radchenko
2023-01-06 16:32                                     ` tomas
2023-01-06 20:47                                       ` Marc Nieper-Wißkirchen
2023-01-07 13:28                                   ` Bastien Guerry
2022-12-21 13:25     ` Ihor Radchenko
2022-12-29 15:34       ` Bastien Guerry
2023-01-03 23:28         ` Rudolf Adamkovič
2023-01-03 23:35           ` Bastien
2023-01-06 20:45             ` Rudolf Adamkovič

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAEYrNrT3k6dB0MnPx1UpusSBPXSwdFEkF-pa_EPkoev-1w=ptQ@mail.gmail.com' \
    --to=marc@nieper-wisskirchen.de \
    --cc=emacs-orgmode@gnu.org \
    --cc=salutis@me.com \
    --cc=yantar92@posteo.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).