diff options
Diffstat (limited to 'generateFind.go')
| -rw-r--r-- | generateFind.go | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/generateFind.go b/generateFind.go index 4ab9d10..d1f660b 100644 --- a/generateFind.go +++ b/generateFind.go @@ -38,15 +38,16 @@ func generateFindBy(w io.Writer, FRUIT, APPLES, APPLE, COLOR, LOCK string) { fmt.Fprintln(w, "") } -func (msg *MsgName) deleteBy(w io.Writer, FRUIT, APPLES, APPLE, COLOR, FUNCNAME string) string { +func (msg *MsgName) deleteBy(w io.Writer, FRUIT, APPLES, APPLE, COLOR, FUNCNAME, VARNAME string) string { LOCK := msg.getLockname("x") + funcdef := "func (x *" + FRUIT + ") " + FUNCNAME + "(s string) bool" - fmt.Fprintln(w, "func (x *"+FRUIT+") "+FUNCNAME+"(s string) bool {") + fmt.Fprintln(w, funcdef, "{") fmt.Fprintln(w, " "+LOCK+".Lock()") fmt.Fprintln(w, " defer "+LOCK+".Unlock()") fmt.Fprintln(w, "") fmt.Fprintln(w, " for i, _ := range x."+APPLES+" {") - fmt.Fprintln(w, " if x."+APPLES+"[i]."+COLOR+" == s {") + fmt.Fprintln(w, " if x."+APPLES+"[i]."+VARNAME+" == s {") fmt.Fprintln(w, " x."+APPLES+"[i] = x."+APPLES+"[len(x."+APPLES+")-1]") fmt.Fprintln(w, " x."+APPLES+" = x."+APPLES+"[:len(x."+APPLES+")-1]") fmt.Fprintln(w, " return true") @@ -56,22 +57,24 @@ func (msg *MsgName) deleteBy(w io.Writer, FRUIT, APPLES, APPLE, COLOR, FUNCNAME fmt.Fprintln(w, "}") fmt.Fprintln(w, "") - return "func (x *" + FRUIT + ") DeleteBy" + COLOR + "(s string) bool {" + return funcdef } // this tries to return the deleted one but is wrong/gives warning if mutex lock is in struct -func (msg *MsgName) deleteByWithCopy(w io.Writer, FRUIT, APPLES, APPLE, COLOR, FUNCNAME string) string { +func (msg *MsgName) deleteByWithCopy(w io.Writer, FRUIT, APPLES, APPLE, COLOR, FUNCNAME, VARNAME string) string { LOCK := msg.getLockname("x") + funcdef := "func (x *" + FRUIT + ") " + FUNCNAME + "(s string) *" + APPLE + fmt.Fprintln(w, "// TESTING fails with 'go vet' warning") - fmt.Fprintln(w, "func (x *"+FRUIT+") "+FUNCNAME+"(s string) *"+APPLE+" {") + fmt.Fprintln(w, funcdef, "{") fmt.Fprintln(w, " "+LOCK+".Lock()") fmt.Fprintln(w, " defer "+LOCK+".Unlock()") fmt.Fprintln(w, "") fmt.Fprintln(w, " var newr "+APPLE) fmt.Fprintln(w, "") fmt.Fprintln(w, " for i, _ := range x."+APPLES+" {") - fmt.Fprintln(w, " if x."+APPLES+"[i]."+COLOR+" == s {") + fmt.Fprintln(w, " if x."+APPLES+"[i]."+VARNAME+" == s {") fmt.Fprintln(w, " newr = *x."+APPLES+"[i]") fmt.Fprintln(w, " x."+APPLES+"[i] = x."+APPLES+"[len(x."+APPLES+")-1]") fmt.Fprintln(w, " x."+APPLES+" = x."+APPLES+"[:len(x."+APPLES+")-1]") @@ -82,7 +85,7 @@ func (msg *MsgName) deleteByWithCopy(w io.Writer, FRUIT, APPLES, APPLE, COLOR, F fmt.Fprintln(w, "}") fmt.Fprintln(w, "") - return "func (x *" + FRUIT + ") DeleteBy" + COLOR + "(s string) *" + APPLE + " {" + return funcdef } // new 2025 idea. useful? TODO: look at this again in 1y |