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

* ext/bigdecimal/bigdecimal.c (BigDecimal_dump, BigDecimal_inspect, VPrint, VpToString, VpVarCheck): use PRIuSIZE, PRIdSIZE, PRIdVALUE, and PRIxVALUE.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28996 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mrkn 2010-08-15 09:20:44 +00:00
parent 5dde183d0a
commit 56d3b926ce
2 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Sun Aug 15 18:14:20 2010 Kenta Murata <mrkn@mrkn.jp>
* ext/bigdecimal/bigdecimal.c (BigDecimal_dump, BigDecimal_inspect,
VPrint, VpToString, VpVarCheck): use PRIuSIZE, PRIdSIZE, PRIdVALUE,
and PRIxVALUE.
Sun Aug 15 16:14:31 2010 NAKAMURA Usaku <usa@ruby-lang.org> Sun Aug 15 16:14:31 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* lib/mkmf.rb (Logging.postpone): close @log only when it's available. * lib/mkmf.rb (Logging.postpone): close @log only when it's available.

26
ext/bigdecimal/bigdecimal.c
View file

@ -239,7 +239,7 @@ BigDecimal_dump(int argc, VALUE *argv, VALUE self)
GUARD_OBJ(vp,GetVpValue(self,1)); GUARD_OBJ(vp,GetVpValue(self,1));
dump = rb_str_new(0,VpNumOfChars(vp,"E")+50); dump = rb_str_new(0,VpNumOfChars(vp,"E")+50);
psz = RSTRING_PTR(dump); psz = RSTRING_PTR(dump);
sprintf(psz,"%zu:",VpMaxPrec(vp)*VpBaseFig()); sprintf(psz, "%"PRIuSIZE":", VpMaxPrec(vp)*VpBaseFig());
VpToString(vp, psz+strlen(psz), 0, 0); VpToString(vp, psz+strlen(psz), 0, 0);
rb_str_resize(dump, strlen(psz)); rb_str_resize(dump, strlen(psz));
return dump; return dump;
@ -1635,11 +1635,11 @@ BigDecimal_inspect(VALUE self)
obj = rb_str_new(0, nc+256); obj = rb_str_new(0, nc+256);
psz = RSTRING_PTR(obj); psz = RSTRING_PTR(obj);
sprintf(psz,"#<BigDecimal:%lx,'",self); sprintf(psz,"#<BigDecimal:%"PRIxVALUE",'",self);
tmp = psz + strlen(psz); tmp = psz + strlen(psz);
VpToString(vp, tmp, 10, 0); VpToString(vp, tmp, 10, 0);
tmp += strlen(tmp); tmp += strlen(tmp);
sprintf(tmp, "',%zu(%zu)>", VpPrec(vp)*VpBaseFig(), VpMaxPrec(vp)*VpBaseFig()); sprintf(tmp, "',%"PRIuSIZE"(%"PRIuSIZE")>", VpPrec(vp)*VpBaseFig(), VpMaxPrec(vp)*VpBaseFig());
rb_str_resize(obj, strlen(psz)); rb_str_resize(obj, strlen(psz));
return obj; return obj;
} }
@ -3692,7 +3692,7 @@ VPrint(FILE *fp, const char *cntl_chr, Real *a)
m /= 10; m /= 10;
} }
} }
nc += fprintf(fp, "E%zi", VpExponent10(a)); nc += fprintf(fp, "E%"PRIdVALUE, VpExponent10(a));
} else { } else {
nc += fprintf(fp, "0.0"); nc += fprintf(fp, "0.0");
} }
@ -3889,7 +3889,7 @@ VpToString(Real *a, char *psz, size_t fFmt, int fPlus)
shift /= 10; shift /= 10;
} }
while(psz[-1]=='0') *(--psz) = 0; while(psz[-1]=='0') *(--psz) = 0;
sprintf(psz, "E%ld", ex); sprintf(psz, "E%"PRIdVALUE, ex);
if(fFmt) VpFormatSt(pszSav, fFmt); if(fFmt) VpFormatSt(pszSav, fFmt);
} }
@ -4394,7 +4394,7 @@ converge:
if(gfDebug) { if(gfDebug) {
VpMult(r, y, y); VpMult(r, y, y);
VpAddSub(f, x, r, -1); VpAddSub(f, x, r, -1);
printf("VpSqrt: iterations = %lu\n", nr); printf("VpSqrt: iterations = %"PRIdSIZE"\n", nr);
VPrint(stdout, " y =% \n", y); VPrint(stdout, " y =% \n", y);
VPrint(stdout, " x =% \n", x); VPrint(stdout, " x =% \n", x);
VPrint(stdout, " x-y*y = % \n", f); VPrint(stdout, " x-y*y = % \n", f);
@ -4779,24 +4779,24 @@ VpVarCheck(Real * v)
* other ... error * other ... error
*/ */
{ {
U_LONG i; size_t i;
if(v->MaxPrec <= 0) { if(v->MaxPrec <= 0) {
printf("ERROR(VpVarCheck): Illegal Max. Precision(=%lu)\n", printf("ERROR(VpVarCheck): Illegal Max. Precision(=%"PRIuSIZE")\n",
v->MaxPrec); v->MaxPrec);
return 1; return 1;
} }
if((v->Prec <= 0) ||((v->Prec) >(v->MaxPrec))) { if((v->Prec <= 0) ||((v->Prec) >(v->MaxPrec))) {
printf("ERROR(VpVarCheck): Illegal Precision(=%lu)\n", v->Prec); printf("ERROR(VpVarCheck): Illegal Precision(=%"PRIuSIZE")\n", v->Prec);
printf(" Max. Prec.=%lu\n", v->MaxPrec); printf(" Max. Prec.=%"PRIuSIZE"\n", v->MaxPrec);
return 2; return 2;
} }
for(i = 0; i < v->Prec; ++i) { for(i = 0; i < v->Prec; ++i) {
if((v->frac[i] >= BASE)) { if((v->frac[i] >= BASE)) {
printf("ERROR(VpVarCheck): Illegal fraction\n"); printf("ERROR(VpVarCheck): Illegal fraction\n");
printf(" Frac[%ld]=%lu\n", i, v->frac[i]); printf(" Frac[%"PRIuSIZE"]=%lu\n", i, v->frac[i]);
printf(" Prec. =%lu\n", v->Prec); printf(" Prec. =%"PRIuSIZE"\n", v->Prec);
printf(" Exp. =%d\n", v->exponent); printf(" Exp. =%"PRIdVALUE"\n", v->exponent);
printf(" BASE =%lu\n", BASE); printf(" BASE =%lu\n", BASE);
return 3; return 3;
} }