[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/geiser-guile afa28c8 253/284: Support for guile-2.2
From: |
Philip Kaludercic |
Subject: |
[nongnu] elpa/geiser-guile afa28c8 253/284: Support for guile-2.2 |
Date: |
Sun, 1 Aug 2021 18:29:55 -0400 (EDT) |
branch: elpa/geiser-guile
commit afa28c8a82f81a66eda3b12c2f7279e5c3a25368
Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
Commit: Jose Antonio Ortega Ruiz <jao@gnu.org>
Support for guile-2.2
Using cond-expand to provide support for the new world of guile 2.2
---
geiser/evaluation.scm | 64 +++++++++++++++++++++++++++++++++++----------------
1 file changed, 44 insertions(+), 20 deletions(-)
diff --git a/geiser/evaluation.scm b/geiser/evaluation.scm
index 4c87532..eab98b6 100644
--- a/geiser/evaluation.scm
+++ b/geiser/evaluation.scm
@@ -1,6 +1,6 @@
;;; evaluation.scm -- evaluation, compilation and macro-expansion
-;; Copyright (C) 2009, 2010, 2011, 2013 Jose Antonio Ortega Ruiz
+;; Copyright (C) 2009, 2010, 2011, 2013, 2015 Jose Antonio Ortega Ruiz
;; This program is free software; you can redistribute it and/or
;; modify it under the terms of the Modified BSD License. You should
@@ -9,22 +9,42 @@
;; Start date: Mon Mar 02, 2009 02:46
-(define-module (geiser evaluation)
- #:export (ge:compile
- ge:eval
- ge:macroexpand
- ge:compile-file
- ge:load-file
- ge:set-warnings
- ge:add-to-load-path)
- #:use-module (geiser modules)
- #:use-module (srfi srfi-1)
- #:use-module (language tree-il)
- #:use-module (system base compile)
- #:use-module (system base message)
- #:use-module (system base pmatch)
- #:use-module (system vm program)
- #:use-module (ice-9 pretty-print))
+(cond-expand
+ (guile-2.2
+ (define-module (geiser evaluation)
+ #:export (ge:compile
+ ge:eval
+ ge:macroexpand
+ ge:compile-file
+ ge:load-file
+ ge:set-warnings
+ ge:add-to-load-path)
+ #:use-module (geiser modules)
+ #:use-module (srfi srfi-1)
+ #:use-module (language tree-il)
+ #:use-module (system base compile)
+ #:use-module (system base message)
+ #:use-module (system base pmatch)
+ #:use-module (system vm program)
+ #:use-module (ice-9 pretty-print)
+ #:use-module (system vm loader)))
+ (else
+ (define-module (geiser evaluation)
+ #:export (ge:compile
+ ge:eval
+ ge:macroexpand
+ ge:compile-file
+ ge:load-file
+ ge:set-warnings
+ ge:add-to-load-path)
+ #:use-module (geiser modules)
+ #:use-module (srfi srfi-1)
+ #:use-module (language tree-il)
+ #:use-module (system base compile)
+ #:use-module (system base message)
+ #:use-module (system base pmatch)
+ #:use-module (system vm program)
+ #:use-module (ice-9 pretty-print))))
(define compile-opts '())
@@ -70,11 +90,15 @@
(ev (lambda ()
(call-with-values
(lambda ()
- (let* ((o (compile form
- #:to 'objcode
+ (let* ((to (cond-expand (guile-2.2 'bytecode)
+ (else 'objcode)))
+ (cf (cond-expand (guile-2.2 load-thunk-from-memory)
+ (else make-program)))
+ (o (compile form
+ #:to (if bytcode? 'bytecode 'objcode)
#:env module
#:opts opts))
- (thunk (make-program o)))
+ (thunk (cf o)))
(start-stack 'geiser-evaluation-stack
(eval `(,thunk) module))))
(lambda vs vs)))))
- [nongnu] elpa/geiser-guile a77bf8b 193/284: Elisp buggettes and warnings, (continued)
- [nongnu] elpa/geiser-guile a77bf8b 193/284: Elisp buggettes and warnings, Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile 1eebcce 197/284: Guile reconnected (but not debuggable (yet)), Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile fa4e0bc 198/284: Guile reconnected (but not debuggable (yet)), Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile 6d52afb 199/284: Better EOT token for more robust communication, Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile 2ea6d9d 204/284: Superior schemes, Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile 0d3b1f8 205/284: Support for implementation-specific font lock keywords, Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile 92dadf9 206/284: Typo, Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile e25e31f 208/284: Fix for error in Guile initialisation, Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile 67e9ff2 220/284: Guile: 'format' added to the warning list, Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile 5ed0541 243/284: Possible fix for scanning problem, Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile afa28c8 253/284: Support for guile-2.2,
Philip Kaludercic <=
- [nongnu] elpa/geiser-guile 60c7b01 260/284: A note on dir-locals and load-path variables, Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile b523072 269/284: Use cl-lib instead of cl, Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile 93ef710 281/284: fix: auto-activate guile implementation, Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile 12a6a2e 089/284: Well, i said that it was better, not that it was perfect., Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile 2fd5d5b 166/284: Guile: configurable warning level, Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile 57e3009 191/284: Guile: better meta-command args handling, Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile d2d5f62 192/284: Implementation guessing for scripts with #! ... guile, Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile 9889d29 196/284: Merge branch 'guile-meta' into meta-reconnection, Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile b5f0316 211/284: Guile: logging initialisation process, Philip Kaludercic, 2021/08/01
- [nongnu] elpa/geiser-guile 52e8e12 212/284: Guile: fix for connect-to-guile problems, Philip Kaludercic, 2021/08/01