Ticket #465: Layout.patch

tango-0.99.3-src/tango/text/convert/Layout.d

@@ -28 +28 @@
-
-private import  tango.core.Exception;
-
+private import  tango.core.Vararg;
+
-private import  Unicode = tango.text.convert.Utf;
-
-private import  Float   = tango.text.convert.Float,
@@ -187 +189 @@
-                assert (formatStr, "null format specifier");
-                assert (arguments.length < 64, "too many args in Layout.convert");
-
-        version (X86_64)
-                {
-                Arg[64] arglist = void;
-                int[64] intargs = void;
-                byte[64] byteargs = void;
@@ -201 +201 @@
-
-                foreach (i, arg; arguments)
-                        {
-
+
+
+
+
+
-                        /* Since floating point types don't live on
-                         * the stack, they must be accessed by the
-                         * correct type. */
@@ -210 +214 @@
-                               {
-                               case TypeCode.FLOAT:
-                                    floatargs[i] = va_arg!(float)(args);
-
+cast(Arg) 
-                                    converted = true;
-                                    break;
-
-                               case TypeCode.DOUBLE:
-                                    doubleargs[i] = va_arg!(double)(args);
-
+cast(Arg) 
-                                    converted = true;
-                                    break;
-
-                               case TypeCode.REAL:
-                                    realargs[i] = va_arg!(real)(args);
-
+cast(Arg) 
-                                    converted = true;
-                                    break;
-
@@ -235 +239 @@
-                                  {
-                                  case 1:
-                                       byteargs[i] = va_arg!(byte)(args);
-
+cast(Arg) 
-                                       break;
-                                  case 2:
-                                       shortargs[i] = va_arg!(short)(args);
-
+cast(Arg) 
-                                       break;
-                                  case 4:
-                                       intargs[i] = va_arg!(int)(args);
-
+cast(Arg) 
-                                       break;
-                                  case 8:
-                                       longargs[i] = va_arg!(long)(args);
-
+cast(Arg) 
-                                       break;
-                                  case 16:
-                                       voidargs[i] = va_arg!(void[])(args);
-
+cast(Arg) 
-                                       break;
-                                  default:
-                                       assert (false, "Unknown size: " ~ Integer.toUtf8 (arg.tsize));
-                                  }
-                           }
-                        }
-                }
-             else
-                {
-                Arg[64] arglist = void;
-                foreach (i, arg; arguments)
-                        {
-                        arglist[i] = args;
-                        args += (arg.tsize + int.sizeof - 1) & ~ (int.sizeof - 1);
-                        }
-                }
-                return parse (formatStr, arguments, arglist, sink);
-        }
-