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_f_sprintf): 1.7 sprintf() backported.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@3136 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2002-12-12 09:16:44 +00:00
parent d950b2f12f
commit e71c9d1c4a
2 changed files with 105 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -3,6 +3,10 @@ Thu Dec 12 16:26:31 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* marshal.c (r_object0): singleton class instance can't be loaded. * marshal.c (r_object0): singleton class instance can't be loaded.
(ruby-bugs-ja:PR#366) (ruby-bugs-ja:PR#366)
Thu Dec 12 03:05:16 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
* sprintf.c (rb_f_sprintf): 1.7 sprintf() backported.
Wed Dec 11 23:35:43 2002 WATANABE Hirofumi <eban@ruby-lang.org> Wed Dec 11 23:35:43 2002 WATANABE Hirofumi <eban@ruby-lang.org>
* ext/extmk.rb.in (create_makefile): -no-undefined -> --no-undefined. * ext/extmk.rb.in (create_makefile): -no-undefined -> --no-undefined.

271
sprintf.c
View file

@ -15,13 +15,10 @@
#include "ruby.h" #include "ruby.h"
#include <ctype.h> #include <ctype.h>
#include <math.h> #include <math.h>
#include "util.h"
#define BIT_DIGITS(N) (((N)*146)/485 + 1) /* log2(10) =~ 146/485 */ #define BIT_DIGITS(N) (((N)*146)/485 + 1) /* log2(10) =~ 146/485 */
#if !defined(atof) && !defined(HAVE_STDLIB_H)
double strtod();
#endif
static void fmt_setup _((char*,int,int,int,int)); static void fmt_setup _((char*,int,int,int,int));
static char* static char*
@ -30,78 +27,26 @@ remove_sign_bits(str, base)
int base; int base;
{ {
char *s, *t, *end; char *s, *t, *end;
unsigned long len;
s = t = str; s = t = str;
end = str + strlen(str); len = strlen(str);
end = str + len;
if (base == 16) { if (base == 16) {
x_retry: while (t<end && *t == 'f') {
switch (*t) { t++;
case 'c': case 'C':
*t = '4';
break;
case 'd': case 'D':
*t = '5';
break;
case 'e': case 'E':
*t = '2';
break;
case 'f': case 'F':
if (t[1] > '8') {
t++;
goto x_retry;
}
*t = '1';
break;
case '1':
case '3':
case '7':
if (t[1] > '8') {
t++;
goto x_retry;
}
break;
}
switch (*t) {
case '1': *t = 'f'; break;
case '2': *t = 'e'; break;
case '3': *t = 'f'; break;
case '4': *t = 'c'; break;
case '5': *t = 'd'; break;
case '6': *t = 'e'; break;
case '7': *t = 'f'; break;
} }
} }
else if (base == 8) { else if (base == 8) {
o_retry: while (t<end && *t == '7') {
switch (*t) { t++;
case '6':
*t = '2';
break;
case '7':
if (t[1] > '3') {
t++;
goto o_retry;
}
*t = '1';
break;
case '1':
case '3':
if (t[1] > '3') {
t++;
goto o_retry;
}
break;
}
switch (*t) {
case '1': *t = '7'; break;
case '2': *t = '6'; break;
case '3': *t = '7'; break;
} }
} }
else if (base == 2) { else if (base == 2) {
while (t<end && *t == '1') t++; while (t<end && *t == '1') {
t--; t++;
}
} }
while (*t) *s++ = *t++; while (*t) *s++ = *t++;
*s = '\0'; *s = '\0';
@ -118,23 +63,34 @@ remove_sign_bits(str, base)
#define FWIDTH 32 #define FWIDTH 32
#define FPREC 64 #define FPREC 64
#define CHECK(l) {\ #define CHECK(l) do {\
while (blen + (l) >= bsiz) {\ while (blen + (l) >= bsiz) {\
REALLOC_N(buf, char, bsiz*2);\
bsiz*=2;\ bsiz*=2;\
}\ }\
} rb_str_resize(result, bsiz);\
buf = RSTRING(result)->ptr;\
} while (0)
#define PUSH(s, l) { \ #define PUSH(s, l) do { \
CHECK(l);\ CHECK(l);\
memcpy(&buf[blen], s, l);\ memcpy(&buf[blen], s, l);\
blen += (l);\ blen += (l);\
} } while (0)
#define GETARG() \ #define GETARG() (nextvalue != Qundef ? nextvalue : \
((nextarg >= argc) ? (rb_raise(rb_eArgError, "too few argument."), 0) : argv[nextarg++]) posarg < 0 ? \
(rb_raise(rb_eArgError, "unnumbered(%d) mixed with numbered", nextarg), 0) : \
(posarg = nextarg++, GETNTHARG(posarg)))
#define GETASTER(val) { \ #define GETPOSARG(n) (posarg > 0 ? \
(rb_raise(rb_eArgError, "numbered(%d) after unnumbered(%d)", n, posarg), 0) : \
((n < 1) ? (rb_raise(rb_eArgError, "invalid index - %d$", n), 0) : \
(posarg = -1, GETNTHARG(n))))
#define GETNTHARG(nth) \
((nth >= argc) ? (rb_raise(rb_eArgError, "too few argument."), 0) : argv[nth])
#define GETASTER(val) do { \
t = p++; \ t = p++; \
n = 0; \ n = 0; \
for (; p < end && ISDIGIT(*p); p++) { \ for (; p < end && ISDIGIT(*p); p++) { \
@ -144,17 +100,14 @@ remove_sign_bits(str, base)
rb_raise(rb_eArgError, "malformed format string - %%*[0-9]"); \ rb_raise(rb_eArgError, "malformed format string - %%*[0-9]"); \
} \ } \
if (*p == '$') { \ if (*p == '$') { \
int curarg = nextarg; \ tmp = GETPOSARG(n); \
nextarg = n; \
tmp = GETARG(); \
nextarg = curarg; \
} \ } \
else { \ else { \
tmp = GETARG(); \ tmp = GETARG(); \
p = t; \ p = t; \
} \ } \
val = NUM2INT(tmp); \ val = NUM2INT(tmp); \
} } while (0)
VALUE VALUE
rb_f_sprintf(argc, argv) rb_f_sprintf(argc, argv)
@ -167,25 +120,27 @@ rb_f_sprintf(argc, argv)
VALUE result; VALUE result;
int width, prec, flags = FNONE; int width, prec, flags = FNONE;
int nextarg = 0; int nextarg = 1;
int posarg = 0;
int tainted = 0; int tainted = 0;
VALUE nextvalue;
VALUE tmp; VALUE tmp;
VALUE str; VALUE str;
fmt = GETARG(); fmt = GETNTHARG(0);
if (OBJ_TAINTED(fmt)) tainted = 1; if (OBJ_TAINTED(fmt)) tainted = 1;
p = rb_str2cstr(fmt, &blen); p = rb_str2cstr(fmt, &blen);
end = p + blen; end = p + blen;
blen = 0; blen = 0;
bsiz = 120; bsiz = 120;
buf = ALLOC_N(char, bsiz); result = rb_str_new(0, bsiz);
buf = RSTRING(result)->ptr;
for (; p < end; p++) { for (; p < end; p++) {
char *t; char *t;
int n; int n;
for (t = p; t < end && *t != '%'; t++) ; for (t = p; t < end && *t != '%'; t++) ;
CHECK(t - p);
PUSH(p, t - p); PUSH(p, t - p);
if (t >= end) { if (t >= end) {
/* end of fmt string */ /* end of fmt string */
@ -194,6 +149,7 @@ rb_f_sprintf(argc, argv)
p = t + 1; /* skip `%' */ p = t + 1; /* skip `%' */
width = prec = -1; width = prec = -1;
nextvalue = Qundef;
retry: retry:
switch (*p) { switch (*p) {
default: default:
@ -238,7 +194,10 @@ rb_f_sprintf(argc, argv)
rb_raise(rb_eArgError, "malformed format string - %%[0-9]"); rb_raise(rb_eArgError, "malformed format string - %%[0-9]");
} }
if (*p == '$') { if (*p == '$') {
nextarg = n; if (nextvalue != Qundef) {
rb_raise(rb_eArgError, "value given twice - %d$", n);
}
nextvalue = GETPOSARG(n);
p++; p++;
goto retry; goto retry;
} }
@ -313,7 +272,7 @@ rb_f_sprintf(argc, argv)
case 's': case 's':
{ {
VALUE arg = GETARG(); VALUE arg = GETARG();
int len; long len;
str = rb_obj_as_string(arg); str = rb_obj_as_string(arg);
if (OBJ_TAINTED(str)) tainted = 1; if (OBJ_TAINTED(str)) tainted = 1;
@ -342,9 +301,7 @@ rb_f_sprintf(argc, argv)
break; break;
} }
} }
CHECK(len); PUSH(RSTRING(str)->ptr, len);
memcpy(&buf[blen], RSTRING(str)->ptr, len);
blen += len;
} }
break; break;
@ -354,6 +311,7 @@ rb_f_sprintf(argc, argv)
case 'x': case 'x':
case 'X': case 'X':
case 'b': case 'b':
case 'B':
case 'u': case 'u':
{ {
volatile VALUE val = GETARG(); volatile VALUE val = GETARG();
@ -373,6 +331,7 @@ rb_f_sprintf(argc, argv)
case 'x': case 'x':
case 'X': case 'X':
case 'b': case 'b':
case 'B':
case 'u': case 'u':
default: default:
if (flags&(FPLUS|FSPACE)) sign = 1; if (flags&(FPLUS|FSPACE)) sign = 1;
@ -383,6 +342,7 @@ rb_f_sprintf(argc, argv)
else if (*p == 'x') prefix = "0x"; else if (*p == 'x') prefix = "0x";
else if (*p == 'X') prefix = "0X"; else if (*p == 'X') prefix = "0X";
else if (*p == 'b') prefix = "0b"; else if (*p == 'b') prefix = "0b";
else if (*p == 'B') prefix = "0B";
if (prefix) { if (prefix) {
width -= strlen(prefix); width -= strlen(prefix);
} }
@ -401,18 +361,18 @@ rb_f_sprintf(argc, argv)
case T_BIGNUM: case T_BIGNUM:
bignum = 1; bignum = 1;
break; break;
default:
val = rb_Integer(val);
goto bin_retry;
case T_FIXNUM: case T_FIXNUM:
v = FIX2LONG(val); v = FIX2LONG(val);
break; break;
default:
val = rb_Integer(val);
goto bin_retry;
} }
if (*p == 'u' || *p == 'd' || *p == 'i') base = 10; if (*p == 'u' || *p == 'd' || *p == 'i') base = 10;
else if (*p == 'x' || *p == 'X') base = 16; else if (*p == 'x' || *p == 'X') base = 16;
else if (*p == 'o') base = 8; else if (*p == 'o') base = 8;
else if (*p == 'b') base = 2; else if (*p == 'b' || *p == 'B') base = 2;
if (!bignum) { if (!bignum) {
if (base == 2) { if (base == 2) {
val = rb_int2big(v); val = rb_int2big(v);
@ -457,8 +417,7 @@ rb_f_sprintf(argc, argv)
remove_sign_bits(s, base); remove_sign_bits(s, base);
switch (base) { switch (base) {
case 16: case 16:
d = 'f'; d = 'f'; break;
break;
case 8: case 8:
d = '7'; break; d = '7'; break;
} }
@ -477,16 +436,14 @@ rb_f_sprintf(argc, argv)
if (s[0] == '-') { if (s[0] == '-') {
s++; s++;
sc = '-'; sc = '-';
width--;
} }
else if (flags & FPLUS) { else if (flags & FPLUS) {
sc = '+'; sc = '+';
width--;
} }
else if (flags & FSPACE) { else if (flags & FSPACE) {
sc = ' '; sc = ' ';
width--;
} }
width--;
goto format_integer; goto format_integer;
} }
if (!RBIGNUM(val)->sign) { if (!RBIGNUM(val)->sign) {
@ -496,21 +453,29 @@ rb_f_sprintf(argc, argv)
val = rb_big2str(val, base); val = rb_big2str(val, base);
s = RSTRING(val)->ptr; s = RSTRING(val)->ptr;
if (*s == '-') { if (*s == '-') {
remove_sign_bits(++s, base); if (base == 10) {
val = rb_str_new(0, 3+strlen(s)); rb_warning("negative number for %%u specifier");
t = RSTRING(val)->ptr; s++;
if (!(flags&FPREC)) {
strcpy(t, "..");
t += 2;
} }
switch (base) { else {
case 16: remove_sign_bits(++s, base);
if (s[0] != 'f') strcpy(t++, "f"); break; val = rb_str_new(0, 3+strlen(s));
case 8: t = RSTRING(val)->ptr;
if (s[0] != '7') strcpy(t++, "7"); break; if (!(flags&FPREC)) {
strcpy(t, "..");
t += 2;
}
switch (base) {
case 16:
if (s[0] != 'f') strcpy(t++, "f"); break;
case 8:
if (s[0] != '7') strcpy(t++, "7"); break;
case 2:
if (s[0] != '1') strcpy(t++, "1"); break;
}
strcpy(t, s);
bignum = 2;
} }
strcpy(t, s);
bignum = 2;
} }
s = RSTRING(val)->ptr; s = RSTRING(val)->ptr;
@ -525,52 +490,27 @@ rb_f_sprintf(argc, argv)
pp++; pp++;
} }
} }
if (prec < len) prec = len; if ((flags&(FZERO|FPREC)) == FZERO) {
width -= prec; prec = width;
if (!(flags&(FZERO|FMINUS)) && v >= 0) { width = 0;
}
else {
if (prec < len) prec = len;
width -= prec;
}
if (!(flags&FMINUS)) {
CHECK(width); CHECK(width);
while (width-->0) { while (width-- > 0) {
buf[blen++] = ' '; buf[blen++] = ' ';
} }
} }
if (sc) PUSH(&sc, 1); if (sc) PUSH(&sc, 1);
if (prefix) { if (prefix) {
int plen = strlen(prefix); int plen = strlen(prefix);
CHECK(plen); PUSH(prefix, plen);
strcpy(&buf[blen], prefix);
blen += plen;
if (pos) pos += plen;
}
if (!(flags & FMINUS)) {
char c = ' ';
if (v < 0) {
c = '.';
if ((flags & FPREC) && prec > len) {
pos = blen;
}
else {
pos = blen + 2;
}
}
else if (flags & FZERO) c = '0';
CHECK(width);
while (width-->0) {
buf[blen++] = c;
}
} }
CHECK(prec - len); CHECK(prec - len);
while (len < prec--) { if (v < 0) {
buf[blen++] = v < 0 ? '.' : '0';
}
CHECK(len);
strcpy(&buf[blen], s);
blen += len;
CHECK(width);
while (width-->0) {
buf[blen++] = ' ';
}
if (pos >= 0 && buf[pos] == '.') {
char c = '.'; char c = '.';
switch (base) { switch (base) {
@ -583,11 +523,20 @@ rb_f_sprintf(argc, argv)
case 2: case 2:
c = '1'; break; c = '1'; break;
} }
s = &buf[pos]; while (len < prec--) {
while (*s && *s == '.') { buf[blen++] = c;
*s++ = c;
} }
} }
else {
while (len < prec--) {
buf[blen++] = '0';
}
}
PUSH(s, len);
CHECK(width);
while (width-- > 0) {
buf[blen++] = ' ';
}
} }
break; break;
@ -602,24 +551,7 @@ rb_f_sprintf(argc, argv)
int i, need = 6; int i, need = 6;
char fbuf[32]; char fbuf[32];
switch (TYPE(val)) { fval = RFLOAT(rb_Float(val))->value;
case T_FIXNUM:
fval = (double)FIX2LONG(val);
break;
case T_FLOAT:
fval = RFLOAT(val)->value;
break;
case T_BIGNUM:
fval = rb_big2dbl(val);
break;
case T_STRING:
fval = strtod(RSTRING(val)->ptr, 0);
break;
default:
fval = NUM2DBL(val);
break;
}
fmt_setup(fbuf, *p, flags, width, prec); fmt_setup(fbuf, *p, flags, width, prec);
need = 0; need = 0;
if (*p != 'e' && *p != 'E') { if (*p != 'e' && *p != 'E') {
@ -651,8 +583,7 @@ rb_f_sprintf(argc, argv)
rb_raise(rb_eArgError, "too many argument for format string"); rb_raise(rb_eArgError, "too many argument for format string");
} }
#endif #endif
result = rb_str_new(buf, blen); rb_str_resize(result, blen);
free(buf);
if (tainted) OBJ_TAINT(result); if (tainted) OBJ_TAINT(result);
return result; return result;