golang 1.24 'iter'

1 files changed, 36 insertions, 2 deletions

diff --git a/generateSort.go b/generateSort.go
index 1fe09f7..2daee70 100644
--- a/generateSort.go
+++ b/generateSort.go
@@ -116,12 +116,28 @@ func (msg *MsgName) newSortBy(w io.Writer, STRUCT, ITER, SORTNAME, SORTBY, SELEC
 	return funcdef
 }
 
+func (msg *MsgName) addIterAllFunc(w io.Writer, FRUIT, APPLE, APPLES string) string {
+	funcdef := "func (x *" + FRUIT + ") All() *" + APPLE + "Iterator {"
+
+	fmt.Fprintln(w, funcdef)
+	fmt.Fprintln(w, "	"+APPLE+"Pointers := x.selectAll"+APPLES+"()")
+	fmt.Fprintln(w, "")
+	// should this be 'new' or 'New' ? Does it matter? I think it's totally internal here. I think there are only 3 places
+	// in this file where it is "new or "New". I changed it to lower case 2025.01.12
+	fmt.Fprintln(w, "	iterator := new"+APPLE+"Iterator("+APPLE+"Pointers)")
+	fmt.Fprintln(w, "	return iterator")
+	fmt.Fprintln(w, "}")
+	fmt.Fprintln(w, "")
+
+	return funcdef
+}
+
 func (msg *MsgName) addIterBy(w io.Writer, FRUITS, FRUIT, APPLE, SORTNAME string) string {
-	fmt.Fprintln(w, "// for range syntax using iter package")
+	fmt.Fprintln(w, "// 'for x := range' syntax using the awesome golang 1.24 'iter'")
 	fmt.Fprintln(w, "func (x *"+FRUITS+") IterBy"+APPLE+"() iter.Seq[*"+FRUIT+"] {")
 	fmt.Fprintln(w, "	items := x.selectAll"+FRUITS+"()")
 	fmt.Fprintln(w, "	sort.Sort("+SORTNAME+"(items))")
-	fmt.Fprintln(w, "	log.Println(\"Made Iter.Seq[] with length\", len(items))")
+	fmt.Fprintln(w, "	// log.Println(\"Made Iter.Seq[] with length\", len(items))")
 	fmt.Fprintln(w, "	return func(yield func(*"+FRUIT+") bool) {")
 	fmt.Fprintln(w, "		for _, v := range items {")
 	fmt.Fprintln(w, "			if !yield(v) {")
@@ -134,6 +150,24 @@ func (msg *MsgName) addIterBy(w io.Writer, FRUITS, FRUIT, APPLE, SORTNAME string
 	return ""
 }
 
+func (msg *MsgName) addIterAll(w io.Writer, FRUITS, FRUIT string) string {
+	funcdef := "func (x *" + FRUITS + ") IterAll() iter.Seq[*" + FRUIT + "] {"
+	fmt.Fprintln(w, "// 'for x := range' syntax using the awesome golang 1.24 'iter'")
+	fmt.Fprintln(w, funcdef)
+	fmt.Fprintln(w, "	items := x.selectAll"+FRUITS+"()")
+	fmt.Fprintln(w, "	// log.Println(\"Made All() Iter.Seq[] with length\", len(items))")
+	fmt.Fprintln(w, "	return func(yield func(*"+FRUIT+") bool) {")
+	fmt.Fprintln(w, "		for _, v := range items {")
+	fmt.Fprintln(w, "			if !yield(v) {")
+	fmt.Fprintln(w, "				return")
+	fmt.Fprintln(w, "			}")
+	fmt.Fprintln(w, "		}")
+	fmt.Fprintln(w, "	}")
+	fmt.Fprintln(w, "}")
+
+	return funcdef
+}
+
 func (msg *MsgName) addAllFunc(w io.Writer, FRUIT, APPLE, APPLES string) string {
 	funcdef := "func (x *" + FRUIT + ") All() *" + APPLE + "Iterator {"