mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 03:40:34 +02:00
case-lambda* clauses fail to match if too many positionals
* doc/ref/api-procedures.texi (Case-lambda): Expand case-lambda* documentation. * module/ice-9/eval.scm (primitive-eval): * libguile/eval.c (prepare_boot_closure_env_for_apply): Dispatch to the next case-lambda clause if there are too many positionals. * doc/ref/vm.texi (Function Prologue Instructions): * libguile/vm-i-system.c (bind-optionals/shuffle-or-br): New instruction, like bind-optionals/shuffle but can dispatch to the next clause if there are too many positionals. * module/language/assembly/disassemble.scm (code-annotation): * module/language/assembly/decompile-bytecode.scm (decode-load-program): * module/language/assembly/compile-bytecode.scm (compile-bytecode): Add case for bind-optionals/shuffle-or-br. * module/language/glil/compile-assembly.scm (glil->assembly): If there is an alternate, use bind-optionals/shuffle-or-br instead of bind-optionals/shuffle. * test-suite/tests/optargs.test ("case-lambda*"): Add tests.
This commit is contained in:
parent
18c5bffe96
commit
581f410fbd
10 changed files with 308 additions and 80 deletions
|
@ -599,12 +599,61 @@ A @code{case-lambda*} clause matches if the arguments fill the
|
|||
required arguments, but are not too many for the optional and/or rest
|
||||
arguments.
|
||||
|
||||
Keyword arguments are possible with @code{case-lambda*}, but they do
|
||||
not contribute to the ``matching'' behavior. That is to say,
|
||||
@code{case-lambda*} matches only on required, optional, and rest
|
||||
arguments, and on the predicate; keyword arguments may be present but
|
||||
do not contribute to the ``success'' of a match. In fact a bad keyword
|
||||
argument list may cause an error to be raised.
|
||||
Keyword arguments are possible with @code{case-lambda*} as well, but
|
||||
they do not contribute to the ``matching'' behavior, and their
|
||||
interactions with required, optional, and rest arguments can be
|
||||
surprising.
|
||||
|
||||
For the purposes of @code{case-lambda*} (and of @code{case-lambda}, as a
|
||||
special case), a clause @dfn{matches} if it has enough required
|
||||
arguments, and not too many positional arguments. The required
|
||||
arguments are any arguments before the @code{#:optional}, @code{#:key},
|
||||
and @code{#:rest} arguments. @dfn{Positional} arguments are the
|
||||
required arguments, together with the optional arguments.
|
||||
|
||||
In the absence of @code{#:key} or @code{#:rest} arguments, it's easy to
|
||||
see how there could be too many positional arguments: you pass 5
|
||||
arguments to a function that only takes 4 arguments, including optional
|
||||
arguments. If there is a @code{#:rest} argument, there can never be too
|
||||
many positional arguments: any application with enough required
|
||||
arguments for a clause will match that clause, even if there are also
|
||||
@code{#:key} arguments.
|
||||
|
||||
Otherwise, for applications to a clause with @code{#:key} arguments (and
|
||||
without a @code{#:rest} argument), a clause will match there only if
|
||||
there are enough required arguments and if the next argument after
|
||||
binding required and optional arguments, if any, is a keyword. For
|
||||
efficiency reasons, Guile is currently unable to include keyword
|
||||
arguments in the matching algorithm. Clauses match on positional
|
||||
arguments only, not by comparing a given keyword to the available set of
|
||||
keyword arguments that a function has.
|
||||
|
||||
Some examples follow.
|
||||
|
||||
@example
|
||||
(define f
|
||||
(case-lambda*
|
||||
((a #:optional b) 'clause-1)
|
||||
((a #:optional b #:key c) 'clause-2)
|
||||
((a #:key d) 'clause-3)
|
||||
((#:key e #:rest f) 'clause-4)))
|
||||
|
||||
(f) @result{} clause-4
|
||||
(f 1) @result{} clause-1
|
||||
(f) @result{} clause-4
|
||||
(f #:e 10) clause-1
|
||||
(f 1 #:foo) clause-1
|
||||
(f 1 #:c 2) clause-2
|
||||
(f #:a #:b #:c #:d #:e) clause-4
|
||||
|
||||
;; clause-2 will match anything that clause-3 would match.
|
||||
(f 1 #:d 2) @result{} error: bad keyword args in clause 2
|
||||
@end example
|
||||
|
||||
Don't forget that the clauses are matched in order, and the first
|
||||
matching clause will be taken. This can result in a keyword being bound
|
||||
to a required argument, as in the case of @code{f #:e 10}.
|
||||
|
||||
|
||||
@node Higher-Order Functions
|
||||
@subsection Higher-Order Functions
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
@c -*-texinfo-*-
|
||||
@c This is part of the GNU Guile Reference Manual.
|
||||
@c Copyright (C) 2008,2009,2010
|
||||
@c Copyright (C) 2008,2009,2010,2013
|
||||
@c Free Software Foundation, Inc.
|
||||
@c See the file guile.texi for copying conditions.
|
||||
|
||||
|
@ -772,6 +772,7 @@ list. The list is then assigned to the @var{idx}th local variable.
|
|||
@end deffn
|
||||
|
||||
@deffn Instruction bind-optionals/shuffle nreq nreq-and-opt ntotal
|
||||
@deffnx Instruction bind-optionals/shuffle-or-br nreq nreq-and-opt ntotal offset
|
||||
Shuffle keyword arguments to the top of the stack, filling in the holes
|
||||
with @code{SCM_UNDEFINED}. Each argument is encoded over two bytes.
|
||||
|
||||
|
@ -783,6 +784,11 @@ the @var{nreq}th argument up to the @var{nreq-and-opt}th, and start
|
|||
shuffling when it sees the first keyword argument or runs out of
|
||||
positional arguments.
|
||||
|
||||
@code{bind-optionals/shuffle-or-br} does the same, except that it checks
|
||||
if there are too many positional arguments before shuffling. If this is
|
||||
the case, it jumps to @var{offset}, encoded using the normal three-byte
|
||||
encoding.
|
||||
|
||||
Shuffling simply moves the keyword arguments past the total number of
|
||||
arguments, @var{ntotal}, which includes keyword and rest arguments. The
|
||||
free slots created by the shuffle are filled in with
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011
|
||||
/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2013
|
||||
* Free Software Foundation, Inc.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
|
@ -846,6 +846,14 @@ prepare_boot_closure_env_for_apply (SCM proc, SCM args,
|
|||
env = scm_cons (args, env);
|
||||
i++;
|
||||
}
|
||||
else if (scm_is_true (alt)
|
||||
&& scm_is_pair (args) && !scm_is_keyword (CAR (args)))
|
||||
{
|
||||
/* Too many positional args, no rest arg, and we have an
|
||||
alternate clause. */
|
||||
mx = alt;
|
||||
goto loop;
|
||||
}
|
||||
|
||||
/* Now fill in env with unbound values, limn the rest of the args for
|
||||
keywords, and fill in unbound values with their inits. */
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* Copyright (C) 2001,2008,2009,2010,2011,2012 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 2001,2008,2009,2010,2011,2012,2013 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
|
||||
|
@ -634,6 +634,8 @@ VM_DEFINE_INSTRUCTION (47, bind_optionals_shuffle, "bind-optionals/shuffle", 6,
|
|||
NEXT;
|
||||
}
|
||||
|
||||
/* See also bind-optionals/shuffle-or-br below. */
|
||||
|
||||
/* Flags that determine whether other keywords are allowed, and whether a
|
||||
rest argument is expected. These values must match those used by the
|
||||
glil->assembly compiler. */
|
||||
|
@ -1630,6 +1632,60 @@ VM_DEFINE_INSTRUCTION (93, assert_nargs_ee_locals, "assert-nargs-ee/locals", 1,
|
|||
NEXT;
|
||||
}
|
||||
|
||||
/* Like bind-optionals/shuffle, but if there are too many positional
|
||||
arguments, jumps to the next case-lambda clause. */
|
||||
VM_DEFINE_INSTRUCTION (94, bind_optionals_shuffle_or_br, "bind-optionals/shuffle-or-br", 9, -1, -1)
|
||||
{
|
||||
SCM *walk;
|
||||
scm_t_ptrdiff nreq, nreq_and_opt, ntotal;
|
||||
scm_t_int32 offset;
|
||||
nreq = FETCH () << 8;
|
||||
nreq += FETCH ();
|
||||
nreq_and_opt = FETCH () << 8;
|
||||
nreq_and_opt += FETCH ();
|
||||
ntotal = FETCH () << 8;
|
||||
ntotal += FETCH ();
|
||||
FETCH_OFFSET (offset);
|
||||
|
||||
/* look in optionals for first keyword or last positional */
|
||||
/* starting after the last required positional arg */
|
||||
walk = fp + nreq;
|
||||
while (/* while we have args */
|
||||
walk <= sp
|
||||
/* and we still have positionals to fill */
|
||||
&& walk - fp < nreq_and_opt
|
||||
/* and we haven't reached a keyword yet */
|
||||
&& !scm_is_keyword (*walk))
|
||||
/* bind this optional arg (by leaving it in place) */
|
||||
walk++;
|
||||
if (/* If we have filled all the positionals */
|
||||
walk - fp == nreq_and_opt
|
||||
/* and there are still more arguments */
|
||||
&& walk <= sp
|
||||
/* and the next argument is not a keyword, */
|
||||
&& !scm_is_keyword (*walk))
|
||||
{
|
||||
/* Jump to the next case-lambda* clause. */
|
||||
ip += offset;
|
||||
}
|
||||
else
|
||||
{
|
||||
/* Otherwise, finish as in bind-optionals/shuffle: shuffle up,
|
||||
from walk to ntotal */
|
||||
scm_t_ptrdiff nshuf = sp - walk + 1, i;
|
||||
sp = (fp - 1) + ntotal + nshuf;
|
||||
CHECK_OVERFLOW ();
|
||||
for (i = 0; i < nshuf; i++)
|
||||
sp[-i] = walk[nshuf-i-1];
|
||||
|
||||
/* and fill optionals & keyword args with SCM_UNDEFINED */
|
||||
while (walk <= (fp - 1) + ntotal)
|
||||
*walk++ = SCM_UNDEFINED;
|
||||
}
|
||||
|
||||
NEXT;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
(defun renumber-ops ()
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
;;; -*- mode: scheme; coding: utf-8; -*-
|
||||
|
||||
;;;; Copyright (C) 2009, 2010, 2012 Free Software Foundation, Inc.
|
||||
;;;; Copyright (C) 2009, 2010, 2012, 2013 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
|
||||
|
@ -298,19 +298,26 @@
|
|||
(1- nopt) args (cdr inits))
|
||||
(lp (cons (car args) env)
|
||||
(1- nopt) (cdr args) (cdr inits)))))
|
||||
;; With keywords, we stop binding optionals at the first
|
||||
;; keyword.
|
||||
(let lp ((env env)
|
||||
(nopt* nopt)
|
||||
(args args)
|
||||
(inits inits))
|
||||
(if (> nopt* 0)
|
||||
(cond
|
||||
;; With keywords, we stop binding optionals at the
|
||||
;; first keyword.
|
||||
((> nopt* 0)
|
||||
(if (or (null? args) (keyword? (car args)))
|
||||
(lp (cons (eval (car inits) env) env)
|
||||
(1- nopt*) args (cdr inits))
|
||||
(lp (cons (car args) env)
|
||||
(1- nopt*) (cdr args) (cdr inits)))
|
||||
(1- nopt*) (cdr args) (cdr inits))))
|
||||
;; Finished with optionals.
|
||||
((and alt (pair? args) (not (keyword? (car args)))
|
||||
(not rest?))
|
||||
;; Too many positional args, no #:rest arg,
|
||||
;; and we have an alternate.
|
||||
(apply alt-proc %args))
|
||||
(else
|
||||
(let* ((aok (car kw))
|
||||
(kw (cdr kw))
|
||||
(kw-base (+ nopt nreq (if rest? 1 0)))
|
||||
|
@ -323,7 +330,9 @@
|
|||
(env (let lp ((i kw-base)
|
||||
;; Also, here we bind the rest
|
||||
;; arg, if any.
|
||||
(env (if rest? (cons args env) env)))
|
||||
(env (if rest?
|
||||
(cons args env)
|
||||
env)))
|
||||
(if (<= i imax)
|
||||
(lp (1+ i) (cons unbound-arg env))
|
||||
env))))
|
||||
|
@ -335,10 +344,12 @@
|
|||
(v (cadr args)))
|
||||
(if kw-pair
|
||||
;; Found a known keyword; set its value.
|
||||
(list-set! env (- imax (cdr kw-pair)) v)
|
||||
(list-set! env
|
||||
(- imax (cdr kw-pair)) v)
|
||||
;; Unknown keyword.
|
||||
(if (not aok)
|
||||
(scm-error 'keyword-argument-error
|
||||
(scm-error
|
||||
'keyword-argument-error
|
||||
"eval" "Unrecognized keyword"
|
||||
'() #f)))
|
||||
(lp (cddr args)))
|
||||
|
@ -363,7 +374,7 @@
|
|||
(cdr tail))))
|
||||
(lp (1- i) (cdr inits)))
|
||||
;; Finally, eval the body.
|
||||
(eval body env)))))))))))))))
|
||||
(eval body env))))))))))))))))
|
||||
|
||||
;; The "engine". EXP is a memoized expression.
|
||||
(define (eval exp env)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
;;; Guile VM assembler
|
||||
|
||||
;; Copyright (C) 2001, 2009, 2010, 2011 Free Software Foundation, Inc.
|
||||
;; Copyright (C) 2001, 2009, 2010, 2011, 2013 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
|
||||
|
@ -136,6 +136,17 @@
|
|||
((br-if-nargs-ne ,hi ,lo ,l) (write-byte hi) (write-byte lo) (write-break l))
|
||||
((br-if-nargs-lt ,hi ,lo ,l) (write-byte hi) (write-byte lo) (write-break l))
|
||||
((br-if-nargs-gt ,hi ,lo ,l) (write-byte hi) (write-byte lo) (write-break l))
|
||||
((bind-optionals/shuffle-or-br ,nreq-hi ,nreq-lo
|
||||
,nreq-and-nopt-hi ,nreq-and-nopt-lo
|
||||
,ntotal-hi ,ntotal-lo
|
||||
,l)
|
||||
(write-byte nreq-hi)
|
||||
(write-byte nreq-lo)
|
||||
(write-byte nreq-and-nopt-hi)
|
||||
(write-byte nreq-and-nopt-lo)
|
||||
(write-byte ntotal-hi)
|
||||
(write-byte ntotal-lo)
|
||||
(write-break l))
|
||||
((mv-call ,n ,l) (write-byte n) (write-break l))
|
||||
((prompt ,escape-only? ,l) (write-byte escape-only?) (write-break l))
|
||||
(else
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
;;; Guile VM code converters
|
||||
|
||||
;; Copyright (C) 2001, 2009, 2010 Free Software Foundation, Inc.
|
||||
;; Copyright (C) 2001, 2009, 2010, 2013 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
|
||||
|
@ -43,7 +43,7 @@
|
|||
(define (br-instruction? x)
|
||||
(memq x '(br br-if br-if-not br-if-eq br-if-not-eq br-if-null br-if-not-null)))
|
||||
(define (br-nargs-instruction? x)
|
||||
(memq x '(br-if-nargs-ne br-if-nargs-lt br-if-nargs-gt)))
|
||||
(memq x '(br-if-nargs-ne br-if-nargs-lt br-if-nargs-gt br-if-nargs-lt/non-kw)))
|
||||
|
||||
(define (bytes->s24 a b c)
|
||||
(let ((x (+ (ash a 16) (ash b 8) c)))
|
||||
|
@ -88,6 +88,16 @@
|
|||
(lp (cons `(,br ,(ensure-label rel1 rel2 rel3)) out)))
|
||||
((,br ,hi ,lo ,rel1 ,rel2 ,rel3) (guard (br-nargs-instruction? br))
|
||||
(lp (cons `(,br ,hi ,lo ,(ensure-label rel1 rel2 rel3)) out)))
|
||||
((bind-optionals/shuffle-or-br ,nreq-hi ,nreq-lo
|
||||
,nreq-and-nopt-hi ,nreq-and-nopt-lo
|
||||
,ntotal-hi ,ntotal-lo
|
||||
,rel1 ,rel2 ,rel3)
|
||||
(lp (cons `(bind-optionals/shuffle-or-br
|
||||
,nreq-hi ,nreq-lo
|
||||
,nreq-and-nopt-hi ,nreq-and-nopt-lo
|
||||
,ntotal-hi ,ntotal-lo
|
||||
,(ensure-label rel1 rel2 rel3))
|
||||
out)))
|
||||
((mv-call ,n ,rel1 ,rel2 ,rel3)
|
||||
(lp (cons `(mv-call ,n ,(ensure-label rel1 rel2 rel3)) out)))
|
||||
((prompt ,n0 ,rel1 ,rel2 ,rel3)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
;;; Guile VM code converters
|
||||
|
||||
;; Copyright (C) 2001, 2009, 2010, 2012 Free Software Foundation, Inc.
|
||||
;; Copyright (C) 2001, 2009, 2010, 2012, 2013 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
|
||||
|
@ -129,6 +129,8 @@
|
|||
(list "-> ~A" (assq-ref labels (car args))))
|
||||
((br-if-nargs-ne br-if-nargs-lt br-if-nargs-gt)
|
||||
(list "-> ~A" (assq-ref labels (caddr args))))
|
||||
((bind-optionals/shuffle-or-br)
|
||||
(list "-> ~A" (assq-ref labels (car (last-pair args)))))
|
||||
((object-ref)
|
||||
(and objs (list "~s" (vector-ref objs (car args)))))
|
||||
((local-ref local-boxed-ref local-set local-boxed-set)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
;;; Guile VM assembler
|
||||
|
||||
;; Copyright (C) 2001, 2009, 2010, 2011 Free Software Foundation, Inc.
|
||||
;; Copyright (C) 2001, 2009, 2010, 2011, 2013 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
|
||||
|
@ -486,13 +486,18 @@
|
|||
,(modulo nreq 256)))))
|
||||
(ntotal (apply max (+ nreq nopt) (map 1+ (map cdr kw))))
|
||||
(bind-optionals-and-shuffle
|
||||
`((bind-optionals/shuffle
|
||||
`((,(if (and else-label (not rest))
|
||||
'bind-optionals/shuffle-or-br
|
||||
'bind-optionals/shuffle)
|
||||
,(quotient nreq 256)
|
||||
,(modulo nreq 256)
|
||||
,(quotient (+ nreq nopt) 256)
|
||||
,(modulo (+ nreq nopt) 256)
|
||||
,(quotient ntotal 256)
|
||||
,(modulo ntotal 256))))
|
||||
,(modulo ntotal 256)
|
||||
,@(if (and else-label (not rest))
|
||||
`(,else-label)
|
||||
'()))))
|
||||
(bind-kw
|
||||
;; when this code gets called, all optionals are filled
|
||||
;; in, space has been made for kwargs, and the kwargs
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
;;;; 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.
|
||||
;;;; Copyright (C) 2001, 2006, 2009, 2010, 2013 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
|
||||
|
@ -22,6 +22,9 @@
|
|||
#:use-module (system base compile)
|
||||
#:use-module (ice-9 optargs))
|
||||
|
||||
(define exception:invalid-keyword
|
||||
'(keyword-argument-error . "Invalid keyword"))
|
||||
|
||||
(define exception:unrecognized-keyword
|
||||
'(keyword-argument-error . "Unrecognized keyword"))
|
||||
|
||||
|
@ -217,3 +220,70 @@
|
|||
(pass-if "default arg"
|
||||
(equal? (transmogrify quote)
|
||||
10)))
|
||||
|
||||
(with-test-prefix/c&e "case-lambda*"
|
||||
(pass-if "unambiguous"
|
||||
((case-lambda*
|
||||
((a b) #t)
|
||||
((a) #f))
|
||||
1 2))
|
||||
|
||||
(pass-if "unambiguous (reversed)"
|
||||
((case-lambda*
|
||||
((a) #f)
|
||||
((a b) #t))
|
||||
1 2))
|
||||
|
||||
(pass-if "optionals (order disambiguates)"
|
||||
((case-lambda*
|
||||
((a #:optional b) #t)
|
||||
((a b) #f))
|
||||
1 2))
|
||||
|
||||
(pass-if "optionals (order disambiguates (2))"
|
||||
((case-lambda*
|
||||
((a b) #t)
|
||||
((a #:optional b) #f))
|
||||
1 2))
|
||||
|
||||
(pass-if "optionals (one arg)"
|
||||
((case-lambda*
|
||||
((a b) #f)
|
||||
((a #:optional b) #t))
|
||||
1))
|
||||
|
||||
(pass-if "optionals (one arg (2))"
|
||||
((case-lambda*
|
||||
((a #:optional b) #t)
|
||||
((a b) #f))
|
||||
1))
|
||||
|
||||
(pass-if "keywords without keyword"
|
||||
((case-lambda*
|
||||
((a #:key c) #t)
|
||||
((a b) #f))
|
||||
1))
|
||||
|
||||
(pass-if "keywords with keyword"
|
||||
((case-lambda*
|
||||
((a #:key c) #t)
|
||||
((a b) #f))
|
||||
1 #:c 2))
|
||||
|
||||
(pass-if "keywords (too many positionals)"
|
||||
((case-lambda*
|
||||
((a #:key c) #f)
|
||||
((a b) #t))
|
||||
1 2))
|
||||
|
||||
(pass-if "keywords (order disambiguates)"
|
||||
((case-lambda*
|
||||
((a #:key c) #t)
|
||||
((a b c) #f))
|
||||
1 #:c 2))
|
||||
|
||||
(pass-if "keywords (order disambiguates (2))"
|
||||
((case-lambda*
|
||||
((a b c) #t)
|
||||
((a #:key c) #f))
|
||||
1 #:c 2)))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue