Final changes

marcboeker · Jan 15, 2024 · f053e00 · f053e00
1 parent 1b6e9af
commit f053e00
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 955 deletions.
diff --git a/appender_modals.go b/appender_modals.go
@@ -5,44 +5,44 @@ import "strconv"
 const standardListSize = 3000
 const standardNestedListSize = 30
 
-type ListInt struct {
-	L []int32
+type ListString struct {
+	L []string
 }
 
-func (l *ListInt) Fill() ListInt {
+func (l *ListString) Fill() ListString {
 	for j := 0; j < standardListSize; j++ {
-		l.L = append(l.L, int32(j))
+		l.L = append(l.L, strconv.Itoa(j)+" ducks are cool")
 	}
 	return *l
 }
 
-func (l *ListInt) FillFromInterface(i interface{}) ListInt {
-	inner := i.(map[string]interface{})["L"]
-	l.FillInnerFromInterface(inner.([]interface{}))
-	return *l
-}
-
-func (l *ListInt) FillInnerFromInterface(i []interface{}) ListInt {
+func (l *ListString) FillFromInterface(i []interface{}) ListString {
 	for _, v := range i {
-		l.L = append(l.L, v.(int32))
+		l.L = append(l.L, v.(string))
 	}
 	return *l
 }
 
-type ListString struct {
-	L []string
+type ListInt struct {
+	L []int32
 }
 
-func (l *ListString) Fill() ListString {
+func (l *ListInt) Fill() ListInt {
 	for j := 0; j < standardListSize; j++ {
-		l.L = append(l.L, strconv.Itoa(j)+" ducks are cool")
+		l.L = append(l.L, int32(j))
 	}
 	return *l
 }
 
-func (l *ListString) FillFromInterface(i []interface{}) ListString {
+func (l *ListInt) FillFromInterface(i interface{}) ListInt {
+	inner := i.(map[string]interface{})["L"]
+	l.FillInnerFromInterface(inner.([]interface{}))
+	return *l
+}
+
+func (l *ListInt) FillInnerFromInterface(i []interface{}) ListInt {
 	for _, v := range i {
-		l.L = append(l.L, v.(string))
+		l.L = append(l.L, v.(int32))
 	}
 	return *l
 }
@@ -52,8 +52,8 @@ type NestedListInt struct {
 }
 
 func (l *NestedListInt) Fill() NestedListInt {
-	inner := ListInt{}
 	for j := 0; j < standardNestedListSize; j++ {
+		inner := ListInt{}
 		l.L = append(l.L, inner.Fill().L)
 	}
 	return *l
@@ -72,8 +72,8 @@ type TripleNestedListInt struct {
 }
 
 func (l *TripleNestedListInt) Fill() TripleNestedListInt {
-	inner := NestedListInt{}
-	for j := 0; j < standardNestedListSize; j++ {
+	for j := 0; j < standardNestedListSize/3; j++ {
+		inner := NestedListInt{}
 		l.L = append(l.L, inner.Fill().L)
 	}
 	return *l
@@ -184,16 +184,17 @@ type Mix struct {
 
 func (m *Mix) Fill() Mix {
 	m.A.Fill()
-	l := ListInt{}
 	for j := 0; j < standardNestedListSize; j++ {
+		l := ListInt{}
 		m.B = append(m.B, l.Fill())
 	}
 	return *m
 }
 
 func (m *Mix) FillFromInterface(i interface{}) Mix {
 	inner := i.(map[string]interface{})
-	m.A.FillFromInterface(inner["A"].([]interface{}))
+	innerA := inner["A"].(map[string]interface{})
+	m.A.FillFromInterface(innerA["L"].([]interface{}))
 	for _, v := range inner["B"].([]interface{}) {
 		l := ListInt{}
 		m.B = append(m.B, l.FillFromInterface(v))

diff --git a/appender_nested_2_test.go b/appender_nested_2_test.go
diff --git a/appender_nested_fancy_test.go b/appender_nested_fancy_test.go