1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sprintf.c: QUOTE flag

Browse Source 
* sprintf.c (ruby__sfvextra): add QUOTE flag to escape unprintable
  characters.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42251 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-07-30 08:16:20 +00:00
parent 6be21c1de0
commit 09adba0dc1
4 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
Tue Jul 30 17:16:15 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* sprintf.c (ruby__sfvextra): add QUOTE flag to escape unprintable
characters.
Tue Jul 30 17:09:51 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* sprintf.c (ruby__sfvextra): add QUOTE flag to escape unprintable
characters.
Tue Jul 30 11:00:52 2013 Zachary Scott <e@zzak.io> Tue Jul 30 11:00:52 2013 Zachary Scott <e@zzak.io>
* ext/curses/extconf.rb: [DOC] nodoc to reduce Object pollution * ext/curses/extconf.rb: [DOC] nodoc to reduce Object pollution

7
ext/-test-/printf/printf.c
View File

@ -21,6 +21,12 @@ printf_test_v(VALUE self, VALUE obj)
return rb_enc_sprintf(rb_usascii_encoding(), "{%+"PRIsVALUE"}", obj); return rb_enc_sprintf(rb_usascii_encoding(), "{%+"PRIsVALUE"}", obj);
} }
static VALUE
printf_test_q(VALUE self, VALUE obj)
{
return rb_enc_sprintf(rb_usascii_encoding(), "[% "PRIsVALUE"]", obj);
}
void void
Init_printf(void) Init_printf(void)
{ {
@ -28,4 +34,5 @@ Init_printf(void)
rb_define_singleton_method(m, "i", printf_test_i, 1); rb_define_singleton_method(m, "i", printf_test_i, 1);
rb_define_singleton_method(m, "s", printf_test_s, 1); rb_define_singleton_method(m, "s", printf_test_s, 1);
rb_define_singleton_method(m, "v", printf_test_v, 1); rb_define_singleton_method(m, "v", printf_test_v, 1);
rb_define_singleton_method(m, "q", printf_test_q, 1);
} }

1
sprintf.c
View File

@ -1171,6 +1171,7 @@ ruby__sfvextra(rb_printf_buffer *fp, size_t valsize, void *valp, long *sz, int s
} }
else { else {
value = rb_obj_as_string(value); value = rb_obj_as_string(value);
if (sign == ' ') value = QUOTE(value);
} }
enc = rb_enc_compatible(result, value); enc = rb_enc_compatible(result, value);
if (enc) { if (enc) {

6
test/-ext-/test_printf.rb
View File

@ -22,6 +22,12 @@ class Test_SPrintf < Test::Unit::TestCase
assert_equal("{<#{self.class}:#{object_id}>}", Bug::Printf.v(self)) assert_equal("{<#{self.class}:#{object_id}>}", Bug::Printf.v(self))
end end
def test_quote
assert_equal('["\n"]', Bug::Printf.q("\n"))
assert_equal('[aaa]', Bug::Printf.q('aaa'))
assert_equal('[a a]', Bug::Printf.q('a a'))
end
def test_encoding def test_encoding
def self.to_s def self.to_s
"\u{3042 3044 3046 3048 304a}" "\u{3042 3044 3046 3048 304a}"