summaryrefslogtreecommitdiffstats
path: root/Template.scm
diff options
context:
space:
mode:
authorDavid N. Welton <davidw@efn.org>1998-11-09 21:18:01 -0800
committerBryan Newbold <bnewbold@robocracy.org>2017-02-20 00:05:27 -0800
commit926b1b647ac830660933a5e63eb52d4a2552e264 (patch)
treee25db5f6e1441d67f5d9af063432018ee20a5f51 /Template.scm
parentb21cac3362022718634f7086964208b2eed8e897 (diff)
parentfa3f23105ddcf07c5900de47f19af43d1db1b597 (diff)
downloadslib-926b1b647ac830660933a5e63eb52d4a2552e264.tar.gz
slib-926b1b647ac830660933a5e63eb52d4a2552e264.zip
Import Debian changes 2c3-3debian/2c3-3
slib (2c3-3) frozen unstable; urgency=low * Fixes #16235. * Fixes #19943. * Fixes #20265. * Fixes #24917. * Fixes #27389. slib (2c3-2) frozen unstable; urgency=low * Re-uploaded for slink freeze. slib (2c3-1) unstable; urgency=low * New upstream release.
Diffstat (limited to 'Template.scm')
-rw-r--r--Template.scm13
1 files changed, 6 insertions, 7 deletions
diff --git a/Template.scm b/Template.scm
index 55011b2..e3d2687 100644
--- a/Template.scm
+++ b/Template.scm
@@ -103,7 +103,7 @@
; char-ready?
; macro ;has R4RS high level macros
; defmacro ;has Common Lisp DEFMACRO
-; eval ;SLIB:EVAL is single argument eval
+; eval ;R5RS two-argument eval
; record ;has user defined data structures
; values ;proposed multiple values
; dynamic-wind ;proposed dynamic-wind
@@ -168,9 +168,8 @@
;;; Return argument
(define (identity x) x)
-;;; If your implementation provides eval SLIB:EVAL is single argument
-;;; eval using the top-level (user) environment.
-;(define slib:eval eval)
+;;; SLIB:EVAL is single argument eval using the top-level (user) environment.
+(define slib:eval eval)
;;; If your implementation provides R4RS macros:
;(define macro:eval slib:eval)
@@ -210,9 +209,6 @@
(define (defmacro:expand* x)
(require 'defmacroexpand) (apply defmacro:expand* x '()))
-(define (defmacro:load <pathname>)
- (slib:eval-load <pathname> defmacro:eval))
-
(define (slib:eval-load <pathname> evl)
(if (not (file-exists? <pathname>))
(set! <pathname> (string-append <pathname> (scheme-file-suffix))))
@@ -225,6 +221,9 @@
(evl o))
(set! *load-pathname* old-load-pathname)))))
+(define (defmacro:load <pathname>)
+ (slib:eval-load <pathname> defmacro:eval))
+
(define slib:warn
(lambda args
(let ((port (current-error-port)))