Changeset 439 for EcnlProtoTool/trunk/mruby-2.1.1/src/fmt_fp.c

Timestamp:

Jul 9, 2020, 8:51:43 AM (4 years ago)

Author:

coas-nagasima

Message:

mrubyを2.1.1に更新

Location:

EcnlProtoTool/trunk/mruby-2.1.1

Files:

• . (moved) (moved from EcnlProtoTool/trunk/mruby-1.3.0 )
• src/fmt_fp.c (modified) (18 diffs)

EcnlProtoTool/trunk/mruby-2.1.1/src/fmt_fp.c

@@ +1 @@
+#ifndef MRB_WITHOUT_FLOAT
+#if defined(MRB_DISABLE_STDIO) || defined(_WIN32) || defined(_WIN64)
 /*
 
@@ -29 +31 @@
 #include <limits.h>
 #include <string.h>
-#include <stdint.h>
 #include <math.h>
 #include <float.h>
@@ -62 +63 @@
 #define PAD_SIZE 256
 static void
-pad(struct fmt_args *f, char c, int w, int l, int fl)
+pad(struct fmt_args *f, char c, ptrdiff_t w, ptrdiff_t l, uint8_t fl)
 {
   char pad[PAD_SIZE];
@@ -92 +93 @@
 
 static int
-fmt_fp(struct fmt_args *f, long double y, int w, int p, int fl, int t)
+fmt_fp(struct fmt_args *f, long double y, ptrdiff_t p, uint8_t fl, int t)
 {
   uint32_t big[(LDBL_MANT_DIG+28)/29 + 1          // mantissa expansion
@@ -98 +99 @@
   uint32_t *a, *d, *r, *z;
   uint32_t i;
-  int e2=0, e, j, l;
+  int e2=0, e, j;
+  ptrdiff_t l;
   char buf[9+LDBL_MANT_DIG/4], *s;
   const char *prefix="-0X+0X 0X-0x+0x 0x";
-  int pl;
+  ptrdiff_t pl;
   char ebuf0[3*sizeof(int)], *ebuf=&ebuf0[3*sizeof(int)], *estr;
 
@@ -116 +118 @@
     const char *ss = (t&32)?"inf":"INF";
     if (y!=y) ss=(t&32)?"nan":"NAN";
-    pad(f, ' ', w, 3+pl, fl&~ZERO_PAD);
+    pad(f, ' ', 0, 3+pl, fl&~ZERO_PAD);
     out(f, prefix, pl);
     out(f, ss, 3);
-    pad(f, ' ', w, 3+pl, fl^LEFT_ADJ);
-    return MAX(w, 3+pl);
+    pad(f, ' ', 0, 3+pl, fl^LEFT_ADJ);
+    return 3+(int)pl;
   }
 
@@ -128 +130 @@
   if ((t|32)=='a') {
     long double round = 8.0;
-    int re;
+    ptrdiff_t re;
 
     if (t&32) prefix += 9;
@@ -168 +170 @@
       l = (s-buf) + (ebuf-estr);
 
-    pad(f, ' ', w, pl+l, fl);
+    pad(f, ' ', 0, pl+l, fl);
     out(f, prefix, pl);
-    pad(f, '0', w, pl+l, fl^ZERO_PAD);
+    pad(f, '0', 0, pl+l, fl^ZERO_PAD);
     out(f, buf, s-buf);
     pad(f, '0', l-(ebuf-estr)-(s-buf), 0, 0);
     out(f, estr, ebuf-estr);
-    pad(f, ' ', w, pl+l, fl^LEFT_ADJ);
-    return MAX(w, pl+l);
+    pad(f, ' ', 0, pl+l, fl^LEFT_ADJ);
+    return (int)pl+(int)l;
   }
   if (p<0) p=6;
@@ -203 +205 @@
   while (e2<0) {
     uint32_t carry=0, *b;
-    int sh=MIN(9,-e2), need=1+(p+LDBL_MANT_DIG/3+8)/9;
+    int sh=MIN(9,-e2), need=1+((int)p+LDBL_MANT_DIG/3+8)/9;
     for (d=a; d<z; d++) {
       uint32_t rm = *d & ((1<<sh)-1);
@@ -217 +219 @@
   }
 
-  if (a<z) for (i=10, e=9*(r-a); *a>=i; i*=10, e++);
+  if (a<z) for (i=10, e=9*(int)(r-a); *a>=i; i*=10, e++);
   else e=0;
 
   /* Perform rounding: j is precision after the radix (possibly neg) */
-  j = p - ((t|32)!='f')*e - ((t|32)=='g' && p);
+  j = (int)p - ((t|32)!='f')*e - ((t|32)=='g' && p);
   if (j < 9*(z-r-1)) {
     uint32_t x;
@@ -248 +250 @@
           (*d)++;
         }
-        for (i=10, e=9*(r-a); *a>=i; i*=10, e++);
+        for (i=10, e=9*(int)(r-a); *a>=i; i*=10, e++);
       }
     }
@@ -287 +289 @@
   }
 
-  pad(f, ' ', w, pl+l, fl);
+  pad(f, ' ', 0, pl+l, fl);
   out(f, prefix, pl);
-  pad(f, '0', w, pl+l, fl^ZERO_PAD);
+  pad(f, '0', 0, pl+l, fl^ZERO_PAD);
 
   if ((t|32)=='f') {
@@ -318 +320 @@
       }
       out(f, ss, MIN(buf+9-ss, p));
-      p -= buf+9-ss;
+      p -= (int)(buf+9-ss);
     }
     pad(f, '0', p+18, 18, 0);
@@ -324 +326 @@
   }
 
-  pad(f, ' ', w, pl+l, fl^LEFT_ADJ);
-
-  return MAX(w, pl+l);
+  pad(f, ' ', 0, pl+l, fl^LEFT_ADJ);
+
+  return (int)pl+(int)l;
 }
 
@@ -332 +334 @@
 fmt_core(struct fmt_args *f, const char *fmt, mrb_float flo)
 {
-  int p;
+  ptrdiff_t p;
 
   if (*fmt != '%') {
@@ -352 +354 @@
   case 'e': case 'f': case 'g': case 'a':
   case 'E': case 'F': case 'G': case 'A':
-    return fmt_fp(f, flo, 0, p, 0, *fmt);
+    return fmt_fp(f, flo, p, 0, *fmt);
   default:
     return -1;
@@ -364 +366 @@
 
   f.mrb = mrb;
-  f.str = mrb_str_buf_new(mrb, 24);
+  f.str = mrb_str_new_capa(mrb, 24);
   if (fmt_core(&f, fmt, mrb_float(flo)) < 0) {
     mrb_raise(mrb, E_ARGUMENT_ERROR, "invalid format string");
@@ -370 +372 @@
   return f.str;
 }
+#else   /* MRB_DISABLE_STDIO || _WIN32 || _WIN64 */
+#include <mruby.h>
+#include <stdio.h>
+
+mrb_value
+mrb_float_to_str(mrb_state *mrb, mrb_value flo, const char *fmt)
+{
+  char buf[25];
+
+  snprintf(buf, sizeof(buf), fmt, mrb_float(flo));
+  return mrb_str_new_cstr(mrb, buf);
+}
+#endif  /* MRB_DISABLE_STDIO || _WIN32 || _WIN64 */
+#endif