kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* sprintf.c (rb_str_format): checks if named argument given twice.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23090 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-03-27 23:49:52 +00:00
parent 456f68f2fd
commit 48379c7309
3 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,4 +1,6 @@
Sat Mar 28 06:18:27 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
Sat Mar 28 08:49:47 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* sprintf.c (rb_str_format): checks if named argument given twice.
* sprintf.c (GETNAMEARG): remembers named arg is used, to get rid
of too many arguments warning.

20
sprintf.c
View file

@ -119,11 +119,12 @@ sign_bits(int base, const char *p)
#define GETNTHARG(nth) \
((nth >= argc) ? (rb_raise(rb_eArgError, "too few arguments"), 0) : argv[nth])
#define GETNAMEARG(id) (posarg > 0 ? \
(rb_raise(rb_eArgError, "named after unnumbered(%d)", posarg), 0) : \
#define GETNAMEARG(id, name, len) ( \
posarg > 0 ? \
(rb_raise(rb_eArgError, "named%.*s after unnumbered(%d)", (len), (name), posarg), 0) : \
posarg == -1 ? \
(rb_raise(rb_eArgError, "named after numbered"), 0) : \
(posarg = -2, rb_hash_lookup(get_hash(&hash, argc, argv), id)))
(rb_raise(rb_eArgError, "named%.*s after numbered", (len), (name)), 0) : \
(posarg = -2, rb_hash_lookup2(get_hash(&hash, argc, argv), id, Qundef)))
#define GETNUM(n, val) \
for (; p < end && rb_enc_isdigit(*p, enc); p++) { \
@ -472,6 +473,7 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
for (; p < end; p++) {
const char *t;
int n;
ID id = 0;
for (t = p; t < end && *t != '%'; t++) ;
PUSH(p, t - p);
@ -544,7 +546,6 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
{
const char *start = p;
char term = (*p == '<') ? '>' : '}';
ID id;
for (; p < end && *p != term; ) {
p += rb_enc_mbclen(p, end, enc);
@ -552,8 +553,15 @@ rb_str_format(int argc, const VALUE *argv, VALUE fmt)
if (p >= end) {
rb_raise(rb_eArgError, "malformed name - unmatched parenthesis");
}
if (id) {
rb_raise(rb_eArgError, "name%.*s after <%s>",
(int)(p - start + 1), start, rb_id2name(id));
}
id = rb_intern3(start + 1, p - start - 1, enc);
nextvalue = GETNAMEARG(ID2SYM(id));
nextvalue = GETNAMEARG(ID2SYM(id), start, (int)(p - start + 1));
if (nextvalue == Qundef) {
rb_raise(rb_eKeyError, "key%.*s not found", (int)(p - start + 1), start);
}
if (term == '}') goto format_s;
p++;
goto retry;

6
test/ruby/test_sprintf.rb
View file

@ -273,4 +273,10 @@ class TestSprintf < Test::Unit::TestCase
b2 = (/\.\./ =~ s2) != nil
assert(b1 == b2, "[ruby-dev:33224]")
end
def test_named
assert_equal("value", sprintf("%<key>s", :key => "value"))
assert_raise(ArgumentError) {sprintf("%1$<key2>s", :key => "value")}
assert_raise(ArgumentError) {sprintf("%<key><key2>s", :key => "value")}
end
end