Review: improve use of radix in control flow

andralex · andralex · commit 237a4659381e · 2020-07-25T14:38:58.000-04:00
diff --git a/src/core/internal/string.d b/src/core/internal/string.d
@@ -34,18 +34,18 @@ if (radix >= 2 && radix <= 16)
     size_t i = buf.length;
     do
     {
+        uint x = void;
         if (value < radix)
         {
-            ubyte x = cast(ubyte)value;
-            buf[--i] = cast(char)((x < 10) ? x + '0' : x - 10 + 'a');
-            break;
+            x = cast(uint)value;
+            value = 0;
         }
         else
         {
-            ubyte x = cast(ubyte)(value % radix);
-            value = value / radix;
-            buf[--i] = cast(char)((x < 10) ? x + '0' : x - 10 + 'a');
+            x = cast(uint)(value % radix);
+            value /= radix;
         }
+        buf[--i] = cast(char)((radix <= 10 || x < 10) ? x + '0' : x - 10 + 'a');
     } while (value);
     return buf[i .. $];
 }

Original file line number	Diff line number	Diff line change
`@@ -34,18 +34,18 @@ if (radix >= 2 && radix <= 16)`
`34`	`34`	`size_t i = buf.length;`
`35`	`35`	`do`
`36`	`36`	`{`
	`37`	`+ uint x = void;`
`37`	`38`	`if (value < radix)`
`38`	`39`	`{`
`39`		`- ubyte x = cast(ubyte)value;`
`40`		`- buf[--i] = cast(char)((x < 10) ? x + '0' : x - 10 + 'a');`
`41`		`- break;`
	`40`	`+ x = cast(uint)value;`
	`41`	`+ value = 0;`
`42`	`42`	`}`
`43`	`43`	`else`
`44`	`44`	`{`
`45`		`- ubyte x = cast(ubyte)(value % radix);`
`46`		`- value = value / radix;`
`47`		`- buf[--i] = cast(char)((x < 10) ? x + '0' : x - 10 + 'a');`
	`45`	`+ x = cast(uint)(value % radix);`
	`46`	`+ value /= radix;`
`48`	`47`	`}`
	`48`	`+ buf[--i] = cast(char)((radix <= 10 \|\| x < 10) ? x + '0' : x - 10 + 'a');`
`49`	`49`	`} while (value);`
`50`	`50`	`return buf[i .. $];`
`51`	`51`	`}`