FIX: MOLD/FLAT has no effect when used on VECTOR

Fixes: metaeducation/rebol-issues#2349

Author: Oldes

src/core/t-vector.c

@@ -53,9 +53,10 @@ enum {
 	VTSF64,
 };
 
-#define VECT_TYPE(s) ((s)->size & 0xff)
+static REBCNT bit_sizes[4] = { 8, 16, 32, 64 };
 
-static REBCNT bit_sizes[4] = {8, 16, 32, 64};
+#define VECT_TYPE(s) ((s)->size & 0xff)
+#define VECT_BIT_SIZE(bits) (bit_sizes[bits & 3])
 
 REBU64 f_to_u64(float n) {
 	union {
@@ -621,6 +622,7 @@ void Set_Vector_Row(REBSER *ser, REBVAL *blk)
 	union {REBU64 i; REBDEC d;} v;
 	REBYTE buf[32];
 	REBYTE l;
+	REBOOL indented = !GET_MOPT(mold, MOPT_INDENT);
 
 	if (GET_MOPT(mold, MOPT_MOLD_ALL)) {
 		len = VAL_TAIL(value);
@@ -635,8 +637,11 @@ void Set_Vector_Row(REBSER *ser, REBVAL *blk)
 		Pre_Mold(value, mold);
 		if (!GET_MOPT(mold, MOPT_MOLD_ALL)) Append_Byte(mold->series, '[');
 		if (bits >= VTUI08 && bits <= VTUI64) Append_Bytes(mold->series, "unsigned ");
-		Emit(mold, "N I I [", type+1, bit_sizes[bits & 3], len);
-		if (len) New_Indented_Line(mold);
+		Emit(mold, "N I I [", type+1, VECT_BIT_SIZE(bits), len);
+		if (indented && len > 10) {
+			mold->indent = 1;
+			New_Indented_Line(mold);
+		}
 	}
 
 	c = 0;
@@ -648,8 +653,7 @@ void Set_Vector_Row(REBSER *ser, REBVAL *blk)
 			l = Emit_Decimal(buf, v.d, 0, '.', mold->digits);
 		}
 		Append_Bytes_Len(mold->series, buf, l);
-
-		if ((++c > 7) && (n+1 < vect->tail)) {
+		if (indented && (++c > 9) && (n+1 < vect->tail)) {
 			New_Indented_Line(mold);
 			c = 0;
 		}
@@ -660,7 +664,10 @@ void Set_Vector_Row(REBSER *ser, REBVAL *blk)
 	if (len) mold->series->tail--; // remove final space
 
 	if (molded) {
-		if (len) New_Indented_Line(mold);
+		if (indented && len > 10) {
+			mold->indent = 0;
+			New_Indented_Line(mold);
+		}
 		Append_Byte(mold->series, ']');
 		if (!GET_MOPT(mold, MOPT_MOLD_ALL)) {
 			Append_Byte(mold->series, ']');

src/tests/units/series-test.r3

@@ -213,11 +213,24 @@ Rebol [
 	--assert v = do load mold v
 
 --test-- "Conversion from VECTOR to BINARY"
+	;@@ https://github.com/rebol/rebol-issues/issues/2347
 	--assert #{0102} = to binary! make vector! [integer! 8 [1 2]]
 	--assert #{01000200} = to binary! make vector! [integer! 16 [1 2]]
 	--assert #{0100000002000000} = to binary! make vector! [integer! 32 [1 2]]
 	--assert 1 = to integer! head reverse to binary! make vector! [integer! 64 [1]]
+	--assert #{0000803F} = to binary! make vector! [decimal! 32 [1.0]]
+	--assert 1.0 = to decimal! head reverse to binary! make vector! [decimal! 64 [1.0]]
+
+--test-- "MOLD/flat on vector"
+	;@@ https://github.com/rebol/rebol-issues/issues/2349
+	--assert (mold/flat make vector! [integer! 8 12]) = {make vector! [integer! 8 12 [0 0 0 0 0 0 0 0 0 0 0 0]]}
+	--assert (mold/all/flat make vector! [integer! 8 12]) = "#[vector! integer! 8 12 [0 0 0 0 0 0 0 0 0 0 0 0]]"
+	--assert (mold make vector! [integer! 8  2]) = {make vector! [integer! 8 2 [0 0]]}
+	--assert (mold make vector! [integer! 8 20]) = {make vector! [integer! 8 20 [
+    0 0 0 0 0 0 0 0 0 0
+    0 0 0 0 0 0 0 0 0 0
+]]}
 
 ===end-group===
 
-~~~end-file~~~
+~~~end-file~~~