sprintf.c: check_next_arg
* sprintf.c (check_next_arg): utility function for GETNEXTARG(). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46657 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
3659c10b9d
commit
420523389e
16
sprintf.c
16
sprintf.c
@ -82,10 +82,7 @@ sign_bits(int base, const char *p)
|
|||||||
GETNEXTARG())
|
GETNEXTARG())
|
||||||
|
|
||||||
#define GETNEXTARG() ( \
|
#define GETNEXTARG() ( \
|
||||||
posarg == -1 ? \
|
check_next_arg(posarg, nextarg), \
|
||||||
(rb_raise(rb_eArgError, "unnumbered(%d) mixed with numbered", nextarg), 0) : \
|
|
||||||
posarg == -2 ? \
|
|
||||||
(rb_raise(rb_eArgError, "unnumbered(%d) mixed with named", nextarg), 0) : \
|
|
||||||
(posarg = nextarg++, GETNTHARG(posarg)))
|
(posarg = nextarg++, GETNTHARG(posarg)))
|
||||||
|
|
||||||
#define GETPOSARG(n) (posarg > 0 ? \
|
#define GETPOSARG(n) (posarg > 0 ? \
|
||||||
@ -142,6 +139,17 @@ get_num(const char *p, const char *end, rb_encoding *enc, int *valp)
|
|||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
check_next_arg(int posarg, int nextarg)
|
||||||
|
{
|
||||||
|
switch (posarg) {
|
||||||
|
case -1:
|
||||||
|
rb_raise(rb_eArgError, "unnumbered(%d) mixed with numbered", nextarg);
|
||||||
|
case -2:
|
||||||
|
rb_raise(rb_eArgError, "unnumbered(%d) mixed with named", nextarg);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static VALUE
|
static VALUE
|
||||||
get_hash(volatile VALUE *hash, int argc, const VALUE *argv)
|
get_hash(volatile VALUE *hash, int argc, const VALUE *argv)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user