Ticket #695: Integer-unicode.patch

Integer.d

@@ -24 +24 @@
-module tango.text.convert.Integer;
-
-private import tango.core.Exception;
+private import tango.text.convert.Utf : toString, toString16;
-
-/******************************************************************************
-
@@ -39 +40 @@
-        Hex = 'x',                      /// lowercase hexadecimal
-        HexUpper = 'X',                 /// uppercase hexadecimal
-        Unsigned = 'u',                 /// unsigned integer
+        Unicode = 'c',                  /// Unicode code point
-}
-
-/******************************************************************************
@@ -255 +257 @@
-                           prefix = "0X";
-                       break;
-
+                  case 'c':
+                       if (i > dchar.max)
+                          return error(cast(T[])"{code point outside valid range}");
+
+                       auto codepoint = cast(dchar)i;
+                       dchar[1] str;
+                       str[0] = codepoint;
+
+                       static if (is(T == dchar)) {
+                          dst[0] = codepoint;
+                          return dst[0..1];
+                       } else {
+                          uint eaten = 0;
+                          T[] result = void;
+
+                          static if (is(T == wchar))
+                             result = toString16(str, dst, &eaten);
+                          else static if (is(T == char))
+                             result = toString(str, dst, &eaten);
+                          else
+                             static assert (false, "won't write Unicode to unknown buffer type");
+
+                          if (eaten)
+                             return result;
+                          else
+                             goto noroom;
+                       }
+
-                  default:
-                        return error (cast(T[])"{unknown format '"~cast(T)fmt~"'}");
-                  }
@@ -292 +322 @@
-           // write optional prefix string ...
-           dst [len .. len + prefix.length] = prefix[];
-           }
-
+ noroom:
-           return error ("{output width too small}");
-
-        // return slice of provided output buffer