Issues/34: More compact array/map representation

dump.go

@@ -106,6 +106,17 @@ func (s *dumpState) dumpType(v reflect.Value) {
 }
 
 func (s *dumpState) dumpSlice(v reflect.Value) {
+	elmType := v.Type().Elem()
+	switch elmType.Kind() {
+	case reflect.Bool, reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64, reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr, reflect.Float32, reflect.Float64, reflect.String:
+		// Where the elements in a slice/array are primitive types; dump in a compact manner
+		original := s.config.Compact
+		s.config.Compact = true
+		defer func() {
+			s.config.Compact = original
+		}()
+	}
+
 	s.dumpType(v)
 	numEntries := v.Len()
 	if numEntries == 0 {
@@ -178,6 +189,17 @@ func (s *dumpState) dumpStruct(v reflect.Value) {
 }
 
 func (s *dumpState) dumpMap(v reflect.Value) {
+	elmType := v.Type().Elem()
+	switch elmType.Kind() {
+	case reflect.Bool, reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64, reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr, reflect.Float32, reflect.Float64, reflect.String:
+		// Where the elements(not keys) in a map are primitive types; dump in a compact manner
+		original := s.config.Compact
+		s.config.Compact = true
+		defer func() {
+			s.config.Compact = original
+		}()
+	}
+
 	if v.IsNil() {
 		s.dumpType(v)
 		s.writeString("(nil)")

dump_test.go

@@ -238,6 +238,30 @@ func TestSdump_maps(t *testing.T) {
 		map[int]*BlankStruct{
 			2: &BlankStruct{},
 		},
+		map[string]BasicStruct{
+			"one":   BasicStruct{Public: 1, private: 1},
+			"two":   BasicStruct{Public: 2, private: 2},
+			"three": BasicStruct{Public: 3, private: 3},
+			"four":  BasicStruct{Public: 4, private: 4},
+			"five":  BasicStruct{Public: 5, private: 5},
+		},
+	})
+}
+
+func TestSdump_slices(t *testing.T) {
+	runTests(t, "slices_arrays", []interface{}{
+		[]string{"a", "b", "c", "d", "e", "f"},
+		[15]int{1, 2, 3, 4, 5, 6, 7, 8, 78_999, 4, 90_000},
+		[]BasicStruct{
+			BasicStruct{Public: 1, private: 1},
+			BasicStruct{Public: 2, private: 2},
+			BasicStruct{Public: 3, private: 3},
+		},
+		[5]BasicStruct{
+			BasicStruct{Public: 1, private: 1},
+			BasicStruct{Public: 2, private: 2},
+			BasicStruct{Public: 3, private: 3},
+		},
 	})
 }
 

testdata/maps.dump

@@ -1,15 +1,29 @@
 []interface {}{
-  map[string]string{
-    "another string": "indeed",
-    "hello": "there",
-    "something": "something something",
-  },
-  map[int]string{
-    1: "one",
-    2: "two",
-    3: "three",
-  },
+  map[string]string{"another string":"indeed","hello":"there","something":"something something"},
+  map[int]string{1:"one",2:"two",3:"three"},
   map[int]*litter_test.BlankStruct{
     2: &litter_test.BlankStruct{},
   },
+  map[string]litter_test.BasicStruct{
+    "five": litter_test.BasicStruct{
+      Public: 5,
+      private: 5,
+    },
+    "four": litter_test.BasicStruct{
+      Public: 4,
+      private: 4,
+    },
+    "one": litter_test.BasicStruct{
+      Public: 1,
+      private: 1,
+    },
+    "three": litter_test.BasicStruct{
+      Public: 3,
+      private: 3,
+    },
+    "two": litter_test.BasicStruct{
+      Public: 2,
+      private: 2,
+    },
+  },
 }

testdata/multipleArgs_lineBreak.dump

@@ -1,5 +1,2 @@
-[]string{
-  "x",
-  "y",
-}
+[]string{"x","y"}
 42

testdata/multipleArgs_noSeparator.dump

@@ -1,4 +1 @@
-[]string{
-  "x",
-  "y",
-}42
+[]string{"x","y"}42

testdata/multipleArgs_separator.dump

@@ -1,4 +1 @@
-[]string{
-  "x",
-  "y",
-}***42
+[]string{"x","y"}***42

testdata/primitives.dump

@@ -17,11 +17,7 @@
   complex128(-1.2-0.1i),
   &10,
   "string with \"quote\"",
-  []int{
-    1,
-    2,
-    3,
-  },
+  []int{1,2,3},
   "hello from interface",
   litter_test.BlankStruct{},
   &litter_test.BlankStruct{},

testdata/slices_arrays.dump

@@ -0,0 +1,40 @@
+[]interface {}{
+  []string{"a","b","c","d","e","f"},
+  [15]int{1,2,3,4,5,6,7,8,78999,4,90000,0,0,0,0},
+  []litter_test.BasicStruct{
+    litter_test.BasicStruct{
+      Public: 1,
+      private: 1,
+    },
+    litter_test.BasicStruct{
+      Public: 2,
+      private: 2,
+    },
+    litter_test.BasicStruct{
+      Public: 3,
+      private: 3,
+    },
+  },
+  [5]litter_test.BasicStruct{
+    litter_test.BasicStruct{
+      Public: 1,
+      private: 1,
+    },
+    litter_test.BasicStruct{
+      Public: 2,
+      private: 2,
+    },
+    litter_test.BasicStruct{
+      Public: 3,
+      private: 3,
+    },
+    litter_test.BasicStruct{
+      Public: 0,
+      private: 0,
+    },
+    litter_test.BasicStruct{
+      Public: 0,
+      private: 0,
+    },
+  },
+}