---

yaml
---
r: 42941
b: refs/heads/try
c: eeb89c5
h: refs/heads/master
i:
  42939: 9495aae
v: v3

Author: Kimundi

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 19dfec2aaf746535de1521f68421f9980dbf25de
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
-refs/heads/try: 974d5ac1e095379d63f546da7b8e9d61f7fdcc76
+refs/heads/try: eeb89c5012ef3e6a467835af67fed3ab8da3d84b
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/libcore/num/f32.rs

@@ -375,14 +375,36 @@ pub pure fn to_str_hex(num: f32) -> ~str {
  *
  * * num - The float value
  * * radix - The base to use
+ *
+ * # Failure
+ *
+ * Fails if called on a special value like `inf`, `-inf` or `NaN` due to
+ * possible misinterpretation of the result at higher bases. If those values
+ * are expected, use `to_str_radix_special()` instead.
  */
 #[inline(always)]
 pub pure fn to_str_radix(num: f32, rdx: uint) -> ~str {
-    let (r, _) = num::to_str_common(
+    let (r, special) = num::to_str_common(
         &num, rdx, true, true, num::SignNeg, num::DigAll);
+    if special { die!(~"number has a special value, \
+                      try to_str_radix_special() if those are expected") }
     r
 }
 
+/**
+ * Converts a float to a string in a given radix, and a flag indicating
+ * whether it's a special value
+ *
+ * # Arguments
+ *
+ * * num - The float value
+ * * radix - The base to use
+ */
+#[inline(always)]
+pub pure fn to_str_radix_special(num: f32, rdx: uint) -> (~str, bool) {
+    num::to_str_common(&num, rdx, true, true, num::SignNeg, num::DigAll)
+}
+
 /**
  * Converts a float to a string with exactly the number of
  * provided significant digits

branches/try/src/libcore/num/f64.rs

@@ -399,14 +399,36 @@ pub pure fn to_str_hex(num: f64) -> ~str {
  *
  * * num - The float value
  * * radix - The base to use
+ *
+ * # Failure
+ *
+ * Fails if called on a special value like `inf`, `-inf` or `NaN` due to
+ * possible misinterpretation of the result at higher bases. If those values
+ * are expected, use `to_str_radix_special()` instead.
  */
 #[inline(always)]
 pub pure fn to_str_radix(num: f64, rdx: uint) -> ~str {
-    let (r, _) = num::to_str_common(
+    let (r, special) = num::to_str_common(
         &num, rdx, true, true, num::SignNeg, num::DigAll);
+    if special { die!(~"number has a special value, \
+                      try to_str_radix_special() if those are expected") }
     r
 }
 
+/**
+ * Converts a float to a string in a given radix, and a flag indicating
+ * whether it's a special value
+ *
+ * # Arguments
+ *
+ * * num - The float value
+ * * radix - The base to use
+ */
+#[inline(always)]
+pub pure fn to_str_radix_special(num: f64, rdx: uint) -> (~str, bool) {
+    num::to_str_common(&num, rdx, true, true, num::SignNeg, num::DigAll)
+}
+
 /**
  * Converts a float to a string with exactly the number of
  * provided significant digits

branches/try/src/libcore/num/float.rs

@@ -136,14 +136,36 @@ pub pure fn to_str_hex(num: float) -> ~str {
  *
  * * num - The float value
  * * radix - The base to use
+ *
+ * # Failure
+ *
+ * Fails if called on a special value like `inf`, `-inf` or `NaN` due to
+ * possible misinterpretation of the result at higher bases. If those values
+ * are expected, use `to_str_radix_special()` instead.
  */
 #[inline(always)]
 pub pure fn to_str_radix(num: float, radix: uint) -> ~str {
-    let (r, _) = num::to_str_common(
+    let (r, special) = num::to_str_common(
         &num, radix, true, true, num::SignNeg, num::DigAll);
+    if special { die!(~"number has a special value, \
+                      try to_str_radix_special() if those are expected") }
     r
 }
 
+/**
+ * Converts a float to a string in a given radix, and a flag indicating
+ * whether it's a special value
+ *
+ * # Arguments
+ *
+ * * num - The float value
+ * * radix - The base to use
+ */
+#[inline(always)]
+pub pure fn to_str_radix_special(num: float, radix: uint) -> (~str, bool) {
+    num::to_str_common(&num, radix, true, true, num::SignNeg, num::DigAll)
+}
+
 /**
  * Converts a float to a string with exactly the number of
  * provided significant digits