From fa3f23105ddcf07c5900de47f19af43d1db1b597 Mon Sep 17 00:00:00 2001
From: Bryan Newbold <bnewbold@robocracy.org>
Date: Mon, 20 Feb 2017 00:05:27 -0800
Subject: Import Upstream version 2c3

---
 Template.scm | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'Template.scm')

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)))
-- 
cgit v1.2.3