mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-16 18:50:23 +02:00
a310a1d12e
* module/ice-9/eval.scm (primitive-eval): * libguile/eval.c (scm_c_primitive_eval): Don't expect a memoized expression -- expect either raw source or an *expanded* expression. We handle memoization ourselves. * libguile/expand.c (scm_macroexpand): Settle down into its proper name, "macroexpand", even as we comment that it is but a fleeting boot expander. (scm_macroexpanded_p): New predicate for expanded code. * libguile/expand.h: Add scm_macroexpanded_p. * libguile/memoize.c (scm_memoize_expression): Require that the expression be expanded. (scm_init_memoize): Don't alias memoize-expression to macroexpand. * module/ice-9/psyntax-pp.scm: * module/ice-9/psyntax.scm: Always produce macroexpanded expressions, and hand them to primitive-eval. No more calls to memoize-expression here. * test-suite/tests/optargs.test: Remove some tests, as unfortunately we have no way to invoke the boot expander after boot.
202 lines
6.3 KiB
Scheme
202 lines
6.3 KiB
Scheme
;;;; optargs.test --- test suite for optional arg processing -*- scheme -*-
|
|
;;;; Matthias Koeppe <mkoeppe@mail.math.uni-magdeburg.de> --- June 2001
|
|
;;;;
|
|
;;;; Copyright (C) 2001, 2006, 2009, 2010 Free Software Foundation, Inc.
|
|
;;;;
|
|
;;;; This library is free software; you can redistribute it and/or
|
|
;;;; modify it under the terms of the GNU Lesser General Public
|
|
;;;; License as published by the Free Software Foundation; either
|
|
;;;; version 3 of the License, or (at your option) any later version.
|
|
;;;;
|
|
;;;; This library 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
|
|
;;;; Lesser General Public License for more details.
|
|
;;;;
|
|
;;;; You should have received a copy of the GNU Lesser General Public
|
|
;;;; License along with this library; if not, write to the Free Software
|
|
;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
|
|
(define-module (test-suite test-optargs)
|
|
#:use-module (test-suite lib)
|
|
#:use-module (system base compile)
|
|
#:use-module (ice-9 optargs))
|
|
|
|
(define exception:unrecognized-keyword
|
|
'(keyword-argument-error . "Unrecognized keyword"))
|
|
|
|
(define exception:extraneous-arguments
|
|
;; Message depends on whether we use the interpreter or VM, and on the
|
|
;; evenness of the number of extra arguments (!).
|
|
;'(keyword-argument-error . ".*")
|
|
'(#t . ".*"))
|
|
|
|
(define-syntax c&e
|
|
(syntax-rules (pass-if pass-if-exception)
|
|
((_ (pass-if test-name exp))
|
|
(begin (pass-if (string-append test-name " (eval)")
|
|
(primitive-eval 'exp))
|
|
(pass-if (string-append test-name " (compile)")
|
|
(compile 'exp #:to 'value #:env (current-module)))))
|
|
((_ (pass-if-exception test-name exc exp))
|
|
(begin (pass-if-exception (string-append test-name " (eval)")
|
|
exc (primitive-eval 'exp))
|
|
(pass-if-exception (string-append test-name " (compile)")
|
|
exc (compile 'exp #:to 'value
|
|
#:env (current-module)))))))
|
|
|
|
(define-syntax with-test-prefix/c&e
|
|
(syntax-rules ()
|
|
((_ section-name exp ...)
|
|
(with-test-prefix section-name (c&e exp) ...))))
|
|
|
|
(with-test-prefix/c&e "optional argument processing"
|
|
(pass-if "local defines work with optional arguments"
|
|
(eval '(begin
|
|
(define* (test-1 #:optional (x 0))
|
|
(define d 1) ; local define
|
|
#t)
|
|
(false-if-exception (test-1)))
|
|
(interaction-environment))))
|
|
|
|
;;;
|
|
;;; let-keywords
|
|
;;;
|
|
|
|
(with-test-prefix/c&e "let-keywords"
|
|
|
|
;; in guile 1.6.4 and earlier, an empty binding list only used `begin',
|
|
;; which caused apparently internal defines to "leak" out into the
|
|
;; encompasing environment
|
|
(pass-if-exception "empty bindings internal defines leaking out"
|
|
exception:unbound-var
|
|
(let ((rest '()))
|
|
(let-keywords rest #f ()
|
|
(define localvar #f)
|
|
#f)
|
|
localvar))
|
|
|
|
(pass-if "one key"
|
|
(let-keywords '(#:foo 123) #f (foo)
|
|
(= foo 123))))
|
|
|
|
;;;
|
|
;;; let-keywords*
|
|
;;;
|
|
|
|
(with-test-prefix/c&e "let-keywords*"
|
|
|
|
;; in guile 1.6.4 and earlier, an empty binding list only used `begin',
|
|
;; which caused apparently internal defines to "leak" out into the
|
|
;; encompasing environment
|
|
(pass-if-exception "empty bindings internal defines leaking out"
|
|
exception:unbound-var
|
|
(let ((rest '()))
|
|
(let-keywords* rest #f ()
|
|
(define localvar #f)
|
|
#f)
|
|
localvar))
|
|
|
|
(pass-if "one key"
|
|
(let-keywords* '(#:foo 123) #f (foo)
|
|
(= foo 123))))
|
|
|
|
;;;
|
|
;;; let-optional
|
|
;;;
|
|
|
|
(with-test-prefix/c&e "let-optional"
|
|
|
|
;; in guile 1.6.4 and earlier, an empty binding list only used `begin',
|
|
;; which caused apparently internal defines to "leak" out into the
|
|
;; encompasing environment
|
|
(pass-if-exception "empty bindings internal defines leaking out"
|
|
exception:unbound-var
|
|
(let ((rest '()))
|
|
(let-optional rest ()
|
|
(define localvar #f)
|
|
#f)
|
|
localvar))
|
|
|
|
(pass-if "one var"
|
|
(let ((rest '(123)))
|
|
(let-optional rest ((foo 999))
|
|
(= foo 123)))))
|
|
|
|
;;;
|
|
;;; let-optional*
|
|
;;;
|
|
|
|
(with-test-prefix/c&e "let-optional*"
|
|
|
|
;; in guile 1.6.4 and earlier, an empty binding list only used `begin',
|
|
;; which caused apparently internal defines to "leak" out into the
|
|
;; encompasing environment
|
|
(pass-if-exception "empty bindings internal defines leaking out"
|
|
exception:unbound-var
|
|
(let ((rest '()))
|
|
(let-optional* rest ()
|
|
(define localvar #f)
|
|
#f)
|
|
localvar))
|
|
|
|
(pass-if "one var"
|
|
(let ((rest '(123)))
|
|
(let-optional* rest ((foo 999))
|
|
(= foo 123)))))
|
|
|
|
(define* (foo a b #:optional c (d 1) (e c) f #:key g (h a) (i r) #:rest r)
|
|
(list a b c d e f g h i r))
|
|
|
|
;; So we could use lots more tests here, but the fact that lambda* is in
|
|
;; the compiler, and the compiler compiles itself, using the evaluator
|
|
;; (when bootstrapping) and compiled code (when doing a partial rebuild)
|
|
;; makes me a bit complacent.
|
|
(with-test-prefix/c&e "define*"
|
|
(pass-if "the whole enchilada"
|
|
(equal? (foo 1 2)
|
|
'(1 2 #f 1 #f #f #f 1 () ())))
|
|
|
|
(pass-if-exception "extraneous arguments"
|
|
exception:extraneous-arguments
|
|
(let ((f (lambda* (#:key x) x)))
|
|
(f 1 2 #:x 'x)))
|
|
|
|
(pass-if-exception "unrecognized keyword"
|
|
exception:unrecognized-keyword
|
|
(let ((f (lambda* (#:key x) x)))
|
|
(f #:y 'not-recognized)))
|
|
|
|
(pass-if "rest given before keywords"
|
|
;; Passing the rest argument before the keyword arguments should not
|
|
;; prevent keyword argument binding.
|
|
(let ((f (lambda* (#:key x y z #:rest r) (list x y z r))))
|
|
(equal? (f 1 2 3 #:x 'x #:z 'z)
|
|
'(x #f z (1 2 3 #:x x #:z z))))))
|
|
|
|
(with-test-prefix/c&e "lambda* inits"
|
|
(pass-if "can bind lexicals within inits"
|
|
(begin
|
|
(define qux
|
|
(lambda* (#:optional a #:key (b (or a 13) #:a))
|
|
b))
|
|
#t))
|
|
(pass-if "testing qux"
|
|
(and (equal? (qux) 13)
|
|
(equal? (qux 1) 1)
|
|
(equal? (qux #:a 2) 2))))
|
|
|
|
(with-test-prefix/c&e "defmacro*"
|
|
(pass-if "definition"
|
|
(begin
|
|
(defmacro* transmogrify (a #:optional (b 10))
|
|
`(,a ,b))
|
|
#t))
|
|
|
|
(pass-if "explicit arg"
|
|
(equal? (transmogrify quote 5)
|
|
5))
|
|
|
|
(pass-if "default arg"
|
|
(equal? (transmogrify quote)
|
|
10)))
|