diff options
| -rw-r--r-- | generate.go | 5 | ||||
| -rw-r--r-- | generateGui.go | 23 | ||||
| -rw-r--r-- | generateHeader.go | 2 | ||||
| -rw-r--r-- | generateSort.go | 38 |
4 files changed, 53 insertions, 15 deletions
diff --git a/generate.go b/generate.go index 6c67ae8..2ab8665 100644 --- a/generate.go +++ b/generate.go @@ -187,6 +187,11 @@ func (pb *Files) makeNewSortfile(pf *File) error { if PARENT == VARNAME { funcdef := pmsg.addAllFunc(wSort, PARENT, CHILD, VARNAME) log.Printf("Adding %s\n", funcdef) + + FRUITS := PARENT + FRUIT := CHILD + funcdef = pmsg.addIterAll(wSort, FRUITS, FRUIT) + log.Printf("Adding %s\n", funcdef) } /* diff --git a/generateGui.go b/generateGui.go index 86d6179..f1ba384 100644 --- a/generateGui.go +++ b/generateGui.go @@ -282,9 +282,14 @@ func guiStringFuncs(w io.Writer, ZOOPB string, FRUITS string, FRUIT string) { fmt.Fprintln(w, " r := new(guipb.StringRow)") fmt.Fprintln(w, " r.Header = new(guipb.Widget)") fmt.Fprintln(w, " r.Header.Name = name") - fmt.Fprintln(w, " all := mt.x.All()") - fmt.Fprintln(w, " for all.Scan() {") - fmt.Fprintln(w, " m := all.Next()") + + /* + fmt.Fprintln(w, " all := mt.x.All()") + fmt.Fprintln(w, " for all.Scan() {") + fmt.Fprintln(w, " m := all.Next()") + */ + + fmt.Fprintln(w, " for m := range mt.x.IterAll() {") fmt.Fprintln(w, " r.Vals = append(r.Vals, sf.f(m))") fmt.Fprintln(w, " // log.Info(\""+ZOOPB+": adding\", name, r.Vals)") fmt.Fprintln(w, " }") @@ -303,9 +308,7 @@ func guiStringFuncs(w io.Writer, ZOOPB string, FRUITS string, FRUIT string) { fmt.Fprintln(w, " r := new(guipb.ButtonRow)") fmt.Fprintln(w, " r.Header = new(guipb.Widget)") fmt.Fprintln(w, " r.Header.Name = name") - fmt.Fprintln(w, " all := mt.x.All()") - fmt.Fprintln(w, " for all.Scan() {") - fmt.Fprintln(w, " m := all.Next()") + fmt.Fprintln(w, " for m := range mt.x.IterAll() {") fmt.Fprintln(w, " r.Vals = append(r.Vals, sf.f(m))") fmt.Fprintln(w, " // log.Info(\""+ZOOPB+": adding\", name, r.Vals)") fmt.Fprintln(w, " }") @@ -324,9 +327,7 @@ func guiStringFuncs(w io.Writer, ZOOPB string, FRUITS string, FRUIT string) { fmt.Fprintln(w, " r := new(guipb.IntRow)") fmt.Fprintln(w, " r.Header = new(guipb.Widget)") fmt.Fprintln(w, " r.Header.Name = name") - fmt.Fprintln(w, " all := mt.x.All()") - fmt.Fprintln(w, " for all.Scan() {") - fmt.Fprintln(w, " m := all.Next()") + fmt.Fprintln(w, " for m := range mt.x.IterAll() {") fmt.Fprintln(w, " r.Vals = append(r.Vals, int64(sf.f(m)))") fmt.Fprintln(w, " // log.Info(\""+ZOOPB+": adding\", name, r.Vals)") fmt.Fprintln(w, " }") @@ -345,9 +346,7 @@ func guiStringFuncs(w io.Writer, ZOOPB string, FRUITS string, FRUIT string) { fmt.Fprintln(w, " r := new(guipb.TimeRow)") fmt.Fprintln(w, " r.Header = new(guipb.Widget)") fmt.Fprintln(w, " r.Header.Name = name") - fmt.Fprintln(w, " all := mt.x.All()") - fmt.Fprintln(w, " for all.Scan() {") - fmt.Fprintln(w, " m := all.Next()") + fmt.Fprintln(w, " for m := range mt.x.IterAll() {") fmt.Fprintln(w, " t := sf.f(m)") fmt.Fprintln(w, " r.Vals = append(r.Vals, timestamppb.New(t)) // convert to protobuf time") fmt.Fprintln(w, " // log.Info(\""+ZOOPB+": adding\", name, r.Vals)") diff --git a/generateHeader.go b/generateHeader.go index 785e858..4f2b4b6 100644 --- a/generateHeader.go +++ b/generateHeader.go @@ -45,7 +45,7 @@ func header(w io.Writer, pf *File) { fmt.Fprintln(w, "import (") fmt.Fprintln(w, " \"sort\"") fmt.Fprintln(w, " \"sync\"") - fmt.Fprintln(w, " \"go.wit.com/iter // this might not work. forgive me.\"") + fmt.Fprintln(w, " \"iter\"") fmt.Fprintln(w, ")") fmt.Fprintln(w, "") } 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 {" |