update formatting

Author: 9il

source/mir/bignum/internal/dec2float.d

@@ -284,7 +284,6 @@ private template bigSize(T)
     {
         enum size_t bits = T.max_exp - T.min_exp + T.mant_dig;
         enum size_t bigSize = bits / 64 + bits % 64 + 1;
-        pragma(msg, "bigSize = ", bigSize);
     }
 }
 

source/mir/format.d

@@ -334,6 +334,13 @@ struct HexAddress(T)
     }
 }
 
+///ditto
+HexAddress!T hexAddress(T)(const T value, SwitchLU switchLU = SwitchLU.upper)
+    if (isUnsigned!T && !is(T == enum))
+{
+    return typeof(return)(value, switchLU);
+}
+
 /++
 Escaped string formats
 +/
@@ -640,25 +647,37 @@ version (mir_test) unittest
 
 /// Prints array
 pragma(inline, false)
-ref W print(C = char, W, T)(scope return ref W w, scope const(T)[] c)
+ref W printArray(C = char, W, T)(scope return ref W w,
+    scope const(T)[] c,
+    scope const(C)[] lb = "[",
+    scope const(C)[] rb = "]",
+    scope const(C)[] sep = ", ",
+)
     if (isSomeChar!C && !isSomeChar!T)
 {
-    enum C left = '[';
-    enum C right = ']';
-    enum C[2] sep = ", ";
-    w.put(left);
+    w.put(lb);
     bool first = true;
     foreach (ref e; c)
     {
         if (!first)
-            w.printStaticString!C(sep);
+            w.put(sep);
         first = false;
         printElement!C(w, e);
     }
-    w.put(right);
+    w.put(rb);
     return w;
 }
 
+/// ditto
+pragma(inline, false)
+ref W print(C = char, W, T)(scope return ref W w,
+    scope const(T)[] c,
+)
+    if (isSomeChar!C && !isSomeChar!T)
+{
+    return printArray(w, c);
+}
+
 ///
 @safe pure nothrow @nogc
 version (mir_test) unittest
@@ -669,6 +688,39 @@ version (mir_test) unittest
     assert(w.print(array[]).data == `["a\na", "b"]`);
 }
 
+/// Prints array as hex values
+pragma(inline, false)
+ref W printHexArray(C = char, W, T)(scope return ref W w,
+    scope const(T)[] c,
+    scope const(C)[] lb = "",
+    scope const(C)[] rb = "",
+    scope const(C)[] sep = " ",
+)
+    if (isSomeChar!C && !isSomeChar!T && isUnsigned!T)
+{
+    w.put(lb);
+    bool first = true;
+    foreach (ref e; c)
+    {
+        if (!first)
+            w.put(sep);
+        first = false;
+        printElement!C(w, e.hexAddress);
+    }
+    w.put(rb);
+    return w;
+}
+
+///
+@safe pure nothrow @nogc
+version (mir_test) unittest
+{
+    import mir.appender: scopedBuffer;
+    auto w = scopedBuffer!char;
+    ubyte[2] array = [0x34, 0x32];
+    assert(w.print(array[]).data == `34 32`);
+}
+
 /// Prints escaped character in the form `'c'`.
 pragma(inline, false)
 ref W print(C = char, W)(scope return ref W w, char c)

source/mir/test.d

@@ -65,7 +65,8 @@ struct Should(T)
     ///
     T value;
 
-    ///
+    static if(!is(immutable T == immutable ubyte[]))
+        ///
     void opEquals(R)(const R expected, string file = __FILE__, int line = __LINE__)
     {
         import mir.format: stringBuf, getData;
@@ -77,12 +78,29 @@ struct Should(T)
         if (value == expected)
             return;
         auto buf = stringBuf;
-        assumeAllAttrAndCall({
-            throw new MirError(buf
-                << "expected " << expected
-                << ", got " << value
-                << getData, file, line);
-        });
+        buf << "mir.test.should:\n";
+            buf << "expected " << expected << "\n"
+                << "     got " << value;
+        assumeAllAttrAndCall({ throw new MirError(buf << getData, file, line); });
+    }
+    else
+    /// ditto
+    void opEquals(scope const ubyte[] expected, string file = __FILE__, int line = __LINE__)
+        @safe pure nothrow @nogc
+    {
+        import mir.format: stringBuf, getData;
+        if (value == expected)
+            return;
+        auto buf = stringBuf;
+        import mir.format: printHexArray;
+        import mir.ndslice.topology: map;
+        buf << "mir.test.should:\n";
+        buf << "expected ";
+        buf.printHexArray(expected);
+        buf << "\n";
+        buf << "     got ";
+        buf.printHexArray(   value);
+        assumeAllAttrAndCall({ throw new MirError(buf << getData, file, line); });
     }
 }
 
@@ -98,6 +116,9 @@ unittest
 {
     1.0.should == 1;
     should(1) == 1;
+
+    ubyte[] val = [0, 2, 3];
+    val.should = [0, 2, 3];
 }
 
 ///