diff options
Diffstat (limited to 'ext/-test-/printf')
| -rw-r--r-- | ext/-test-/printf/depend | 5 | ||||
| -rw-r--r-- | ext/-test-/printf/printf.c | 64 |
2 files changed, 35 insertions, 34 deletions
diff --git a/ext/-test-/printf/depend b/ext/-test-/printf/depend index 143317c778..0530df78bf 100644 --- a/ext/-test-/printf/depend +++ b/ext/-test-/printf/depend @@ -15,6 +15,7 @@ printf.o: $(hdrdir)/ruby/backward/2/stdarg.h printf.o: $(hdrdir)/ruby/defines.h printf.o: $(hdrdir)/ruby/encoding.h printf.o: $(hdrdir)/ruby/intern.h +printf.o: $(hdrdir)/ruby/internal/abi.h printf.o: $(hdrdir)/ruby/internal/anyargs.h printf.o: $(hdrdir)/ruby/internal/arithmetic.h printf.o: $(hdrdir)/ruby/internal/arithmetic/char.h @@ -52,6 +53,7 @@ printf.o: $(hdrdir)/ruby/internal/attr/noexcept.h printf.o: $(hdrdir)/ruby/internal/attr/noinline.h printf.o: $(hdrdir)/ruby/internal/attr/nonnull.h printf.o: $(hdrdir)/ruby/internal/attr/noreturn.h +printf.o: $(hdrdir)/ruby/internal/attr/packed_struct.h printf.o: $(hdrdir)/ruby/internal/attr/pure.h printf.o: $(hdrdir)/ruby/internal/attr/restrict.h printf.o: $(hdrdir)/ruby/internal/attr/returns_nonnull.h @@ -120,7 +122,6 @@ printf.o: $(hdrdir)/ruby/internal/intern/enumerator.h printf.o: $(hdrdir)/ruby/internal/intern/error.h printf.o: $(hdrdir)/ruby/internal/intern/eval.h printf.o: $(hdrdir)/ruby/internal/intern/file.h -printf.o: $(hdrdir)/ruby/internal/intern/gc.h printf.o: $(hdrdir)/ruby/internal/intern/hash.h printf.o: $(hdrdir)/ruby/internal/intern/io.h printf.o: $(hdrdir)/ruby/internal/intern/load.h @@ -151,12 +152,12 @@ printf.o: $(hdrdir)/ruby/internal/memory.h printf.o: $(hdrdir)/ruby/internal/method.h printf.o: $(hdrdir)/ruby/internal/module.h printf.o: $(hdrdir)/ruby/internal/newobj.h -printf.o: $(hdrdir)/ruby/internal/rgengc.h printf.o: $(hdrdir)/ruby/internal/scan_args.h printf.o: $(hdrdir)/ruby/internal/special_consts.h printf.o: $(hdrdir)/ruby/internal/static_assert.h printf.o: $(hdrdir)/ruby/internal/stdalign.h printf.o: $(hdrdir)/ruby/internal/stdbool.h +printf.o: $(hdrdir)/ruby/internal/stdckdint.h printf.o: $(hdrdir)/ruby/internal/symbol.h printf.o: $(hdrdir)/ruby/internal/value.h printf.o: $(hdrdir)/ruby/internal/value_type.h diff --git a/ext/-test-/printf/printf.c b/ext/-test-/printf/printf.c index e793bb7a48..889c0d9f0d 100644 --- a/ext/-test-/printf/printf.c +++ b/ext/-test-/printf/printf.c @@ -25,7 +25,7 @@ uint_to_str(char *p, char *e, unsigned int x) char *e0 = e; if (e <= p) return p; do { - *--e = x % 10 + '0'; + *--e = x % 10 + '0'; } while ((x /= 10) != 0 && e > p); memmove(p, e, e0 - e); return p + (e0 - e); @@ -44,48 +44,48 @@ printf_test_call(int argc, VALUE *argv, VALUE self) if (RSTRING_LEN(type) != 1) rb_raise(rb_eArgError, "wrong length(%ld)", RSTRING_LEN(type)); switch (cnv = RSTRING_PTR(type)[0]) { case 'd': case 'x': case 'o': case 'X': - n = NUM2INT(num); - break; + n = NUM2INT(num); + break; case 's': - s = StringValueCStr(num); - break; + s = StringValueCStr(num); + break; default: rb_raise(rb_eArgError, "wrong conversion(%c)", cnv); } *p++ = '%'; if (!NIL_P(opt)) { - VALUE v; - Check_Type(opt, T_HASH); - if (RTEST(rb_hash_aref(opt, ID2SYM(rb_intern("space"))))) { - *p++ = ' '; - } - if (RTEST(rb_hash_aref(opt, ID2SYM(rb_intern("hash"))))) { - *p++ = '#'; - } - if (RTEST(rb_hash_aref(opt, ID2SYM(rb_intern("plus"))))) { - *p++ = '+'; - } - if (RTEST(rb_hash_aref(opt, ID2SYM(rb_intern("minus"))))) { - *p++ = '-'; - } - if (RTEST(rb_hash_aref(opt, ID2SYM(rb_intern("zero"))))) { - *p++ = '0'; - } - if (!NIL_P(v = rb_hash_aref(opt, ID2SYM(rb_intern("width"))))) { - p = uint_to_str(p, format + sizeof(format), NUM2UINT(v)); - } - if (!NIL_P(v = rb_hash_aref(opt, ID2SYM(rb_intern("prec"))))) { - *p++ = '.'; - if (FIXNUM_P(v)) - p = uint_to_str(p, format + sizeof(format), NUM2UINT(v)); - } + VALUE v; + Check_Type(opt, T_HASH); + if (RTEST(rb_hash_aref(opt, ID2SYM(rb_intern("space"))))) { + *p++ = ' '; + } + if (RTEST(rb_hash_aref(opt, ID2SYM(rb_intern("hash"))))) { + *p++ = '#'; + } + if (RTEST(rb_hash_aref(opt, ID2SYM(rb_intern("plus"))))) { + *p++ = '+'; + } + if (RTEST(rb_hash_aref(opt, ID2SYM(rb_intern("minus"))))) { + *p++ = '-'; + } + if (RTEST(rb_hash_aref(opt, ID2SYM(rb_intern("zero"))))) { + *p++ = '0'; + } + if (!NIL_P(v = rb_hash_aref(opt, ID2SYM(rb_intern("width"))))) { + p = uint_to_str(p, format + sizeof(format), NUM2UINT(v)); + } + if (!NIL_P(v = rb_hash_aref(opt, ID2SYM(rb_intern("prec"))))) { + *p++ = '.'; + if (FIXNUM_P(v)) + p = uint_to_str(p, format + sizeof(format), NUM2UINT(v)); + } } *p++ = cnv; *p++ = '\0'; if (cnv == 's') { - result = rb_enc_sprintf(rb_usascii_encoding(), format, s); + result = rb_enc_sprintf(rb_usascii_encoding(), format, s); } else { - result = rb_enc_sprintf(rb_usascii_encoding(), format, n); + result = rb_enc_sprintf(rb_usascii_encoding(), format, n); } return rb_assoc_new(result, rb_usascii_str_new_cstr(format)); } |