Changeset 3444

Timestamp:

04/18/08 00:52:37 (4 months ago)

Author:

kris

Message:

fixes #1047 :: Layout doesn't handle non-decimal negative numbers very well.

kudos to fvbommel

Files:

• trunk/tango/text/convert/Layout.d (modified) (5 diffs)
• trunk/tango/text/locale/Locale.d (modified) (1 diff)

trunk/tango/text/convert/Layout.d

@@ -530 +530 @@
-
-                       case TypeCode.BYTE:
-
+, ubyte.max
-
-                       case TypeCode.UBYTE:
-
+ubyte.max, 
-
-                       case TypeCode.SHORT:
-
+, ushort.max
-
-                       case TypeCode.USHORT:
-
+ushort.max, 
-
-                       case TypeCode.INT:
-
+, uint.max
-
-                       case TypeCode.UINT:
-
+uint.max, 
-
-                       case TypeCode.ULONG:
-
+ulong.max, 
-
-                       case TypeCode.LONG:
-
+, ulong.max
-
-                       case TypeCode.FLOAT:
@@ -572 +572 @@
-
-                       case TypeCode.POINTER:
-
+size_t.max, 
-
-                       case TypeCode.CLASS:
@@ -622 +622 @@
-        **********************************************************************/
-
-
+ulong mask = ulong.max, 
-        {
-                Integer.Flags flags;
@@ -633 +633 @@
-                       flags |= flags.Zero;
-                       }
+                if (style != 'd')
+                    v &= mask;
-                return Integer.format (output, v, cast(Integer.Style) style, flags);
-        }
@@ -844 +846 @@
-        assert( Formatter( "d{0}d", "s" ) == "dsd" );
-
+        // Negative numbers in various bases
+        assert( Formatter( "{:b}", cast(byte) -1 ) == "11111111" );
+        assert( Formatter( "{:b}", cast(short) -1 ) == "1111111111111111" );
+        assert( Formatter( "{:b}", cast(int) -1 )
+                == "11111111111111111111111111111111" );
+        assert( Formatter( "{:b}", cast(long) -1 )
+                == "1111111111111111111111111111111111111111111111111111111111111111" );
+
+        assert( Formatter( "{:o}", cast(byte) -1 ) == "377" );
+        assert( Formatter( "{:o}", cast(short) -1 ) == "177777" );
+        assert( Formatter( "{:o}", cast(int) -1 ) == "37777777777" );
+        assert( Formatter( "{:o}", cast(long) -1 ) == "1777777777777777777777" );
+
+        assert( Formatter( "{:d}", cast(byte) -1 ) == "-1" );
+        assert( Formatter( "{:d}", cast(short) -1 ) == "-1" );
+        assert( Formatter( "{:d}", cast(int) -1 ) == "-1" );
+        assert( Formatter( "{:d}", cast(long) -1 ) == "-1" );
+
+        assert( Formatter( "{:x}", cast(byte) -1 ) == "ff" );
+        assert( Formatter( "{:x}", cast(short) -1 ) == "ffff" );
+        assert( Formatter( "{:x}", cast(int) -1 ) == "ffffffff" );
+        assert( Formatter( "{:x}", cast(long) -1 ) == "ffffffffffffffff" );
+
-        // argument index
-        assert( Formatter( "a{0}b{1}c{2}", "x", "y", "z" ) == "axbycz" );

trunk/tango/text/locale/Locale.d

@@ -94 +94 @@
-        **********************************************************************/
-
-
+ulong mask=ulong.max, 
-        {
-                return formatInteger (output, v, alt, numberFormat);