summaryrefslogtreecommitdiffhomepage
path: root/src/numeric.c
diff options
context:
space:
mode:
authorKOBAYASHI Shuji <[email protected]>2019-10-25 19:29:19 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2020-10-12 16:21:45 +0900
commit8bd1bc47b3e92bfc1c21c698dd7392d8b49a02ef (patch)
tree0444d0255d09402e57409aa685480d48bb441558 /src/numeric.c
parentc45674aff07045517cc4c4333457ea87b9f6a305 (diff)
downloadmruby-8bd1bc47b3e92bfc1c21c698dd7392d8b49a02ef.tar.gz
mruby-8bd1bc47b3e92bfc1c21c698dd7392d8b49a02ef.zip
Always add trailing `.0` in `Float#inspect`; ref #4225
Trailing `.0` is removed from `Float#to_s` and `Float#inspect` at 9d08025b. However, I think the more human-readable format is better for `Float#inspect`. For example, in the `Float#to_s` format, the failure message is not well understood when testing values including types by `eql?` (e.g. `Numeric#step` test). ```ruby assert "example" do exp = 1.0 act = 1 assert_operator(exp, :eql?, act) #=> Expected 1 to be eql? 1. end ```
Diffstat (limited to 'src/numeric.c')
-rw-r--r--src/numeric.c61
1 files changed, 48 insertions, 13 deletions
diff --git a/src/numeric.c b/src/numeric.c
index 40114c07d..617348254 100644
--- a/src/numeric.c
+++ b/src/numeric.c
@@ -203,19 +203,8 @@ integral_coerce_step_counter(mrb_state *mrb, mrb_value self)
* representation.
*/
-/* 15.2.9.3.16(x) */
-/*
- * call-seq:
- * flt.to_s -> string
- *
- * Returns a string containing a representation of self. As well as a
- * fixed or exponential form of the number, the call may return
- * "<code>NaN</code>", "<code>Infinity</code>", and
- * "<code>-Infinity</code>".
- */
-
static mrb_value
-flo_to_s(mrb_state *mrb, mrb_value flt)
+flo_to_str(mrb_state *mrb, mrb_value flt, mrb_bool add_dot_zero)
{
mrb_float f = mrb_float(flt);
mrb_value str;
@@ -258,6 +247,9 @@ flo_to_s(mrb_state *mrb, mrb_value flt)
str = mrb_float_to_str(mrb, flt, fmt);
goto insert_dot_zero;
}
+ else if (add_dot_zero) {
+ mrb_str_cat(mrb, str, ".0", 2);
+ }
goto exit;
}
@@ -267,6 +259,49 @@ flo_to_s(mrb_state *mrb, mrb_value flt)
return str;
}
+/* 15.2.9.3.16(x) */
+/*
+ * call-seq:
+ * flt.to_s -> string
+ *
+ * Returns a string containing a representation of self. As well as a
+ * fixed or exponential form of the number, the call may return
+ * "<code>NaN</code>", "<code>Infinity</code>", and
+ * "<code>-Infinity</code>".
+ *
+ * Trailing <code>.0</code> is removed.
+ *
+ * 3.0.to_s #=> 3
+ * 3.25.to_s #=> 3.25
+ */
+
+static mrb_value
+flo_to_s(mrb_state *mrb, mrb_value flt)
+{
+ return flo_to_str(mrb, flt, FALSE);
+}
+
+/*
+ * call-seq:
+ * flt.inspect -> string
+ *
+ * Returns a string containing a representation of self. As well as a
+ * fixed or exponential form of the number, the call may return
+ * "<code>NaN</code>", "<code>Infinity</code>", and
+ * "<code>-Infinity</code>".
+ *
+ * Trailing <code>.0</code> is added.
+ *
+ * 3.0.to_s #=> 3.0
+ * 3.25.to_s #=> 3.25
+ */
+
+static mrb_value
+flo_inspect(mrb_state *mrb, mrb_value flt)
+{
+ return flo_to_str(mrb, flt, TRUE);
+}
+
/* 15.2.9.3.2 */
/*
* call-seq:
@@ -1684,7 +1719,7 @@ mrb_init_numeric(mrb_state *mrb)
mrb_define_method(mrb, fl, "eql?", flo_eql, MRB_ARGS_REQ(1)); /* 15.2.8.3.16 */
mrb_define_method(mrb, fl, "to_s", flo_to_s, MRB_ARGS_NONE()); /* 15.2.9.3.16(x) */
- mrb_define_method(mrb, fl, "inspect", flo_to_s, MRB_ARGS_NONE());
+ mrb_define_method(mrb, fl, "inspect", flo_inspect, MRB_ARGS_NONE());
mrb_define_method(mrb, fl, "nan?", flo_nan_p, MRB_ARGS_NONE());
#ifdef INFINITY