rename. plan for Clone()

1 files changed, 28 insertions, 23 deletions

diff --git a/generateAppend.go b/generateAppend.go
index c81dcfb..8aee819 100644
--- a/generateAppend.go
+++ b/generateAppend.go
@@ -33,54 +33,59 @@ func (msg *MsgName) simpleAppend(w io.Writer, FRUIT, APPLES, APPLE string) strin
 	return funcdef
 }
 
-/* FIX THSE as Import()
-func (msg *MsgName) appendUnique(w io.Writer, FRUIT, APPLES, APPLE string, COLORS []string) {
+// Unique Append. rejects Append() if value is already defined
+// compares the field 'COLOR' in the STRUCT with VARNAME
+// that's not the right description above, but whatever, you get the idea
+func (msg *MsgName) simpleAppendBy(w io.Writer, STRUCT, FUNCNAME, STRUCTVAR, VARNAME, VARTYPE string) string {
 	LOCK := msg.getLockname("x")
 
-	fmt.Fprintln(w, "// enforces "+APPLE+" is unique in "+FRUIT+"."+APPLES)
-	fmt.Fprintln(w, "func (x *"+FRUIT+") AppendUnique(newP *"+APPLE+") bool {")
+	funcdef := "func (x *" + STRUCT + ") " + FUNCNAME + "(y *" + VARTYPE + ") bool"
+
+	fmt.Fprintln(w, funcdef, "{")
 	fmt.Fprintln(w, "	"+LOCK+".Lock()")
 	fmt.Fprintln(w, "	defer "+LOCK+".Unlock()")
 	fmt.Fprintln(w, "")
-	fmt.Fprintln(w, "	for _, p := range x."+APPLES+" {")
-	for _, COLOR := range COLORS {
-		fmt.Fprintln(w, "		if p."+COLOR+" == newP."+COLOR+" {")
-		fmt.Fprintln(w, "			return false")
-		fmt.Fprintln(w, "		}")
-	}
+	fmt.Fprintln(w, "	for _, p := range x."+STRUCTVAR+" {")
+	fmt.Fprintln(w, "		if p."+VARNAME+" == y."+VARNAME+" {")
+	fmt.Fprintln(w, "			return false")
+	fmt.Fprintln(w, "		}")
 	fmt.Fprintln(w, "	}")
 	fmt.Fprintln(w, "")
-	fmt.Fprintln(w, "	x."+APPLES+" = append(x."+APPLES+", newP)")
+	fmt.Fprintln(w, "	x."+STRUCTVAR+" = append(x."+STRUCTVAR+", proto.Clone(y).(*"+VARTYPE+"))")
 	fmt.Fprintln(w, "	return true")
 	fmt.Fprintln(w, "}")
 	fmt.Fprintln(w, "")
+
+	return funcdef
 }
 
-func (msg *MsgName) appendUniqueCOLOR(w io.Writer, FRUIT, APPLES, APPLE, COLOR string) {
+// I like these functions the best.
+func (msg *MsgName) simpleClone(w io.Writer, FRUIT, APPLES, APPLE string) string {
 	LOCK := msg.getLockname("x")
 
-	fmt.Fprintln(w, "// enforces "+APPLE+"."+COLOR+" is unique in "+FRUIT+"."+APPLES)
-	fmt.Fprintln(w, "func (x *"+FRUIT+") AppendUnique"+COLOR+"(newP *"+APPLE+") bool {")
+	funcdef := "func (x *" + FRUIT + ") Append(y *" + APPLE + ") *" + APPLE
+
+	// log.Printf("\t\t(x %s) CLONE(%s)\n", FRUIT, APPLE)
+	// append -- no check at all
+	fmt.Fprintln(w, "// a Clone() shortcut (with a mutex). notsure if it really works")
+	fmt.Fprintln(w, funcdef, "{")
 	fmt.Fprintln(w, "	"+LOCK+".Lock()")
 	fmt.Fprintln(w, "	defer "+LOCK+".Unlock()")
 	fmt.Fprintln(w, "")
-	fmt.Fprintln(w, "	for _, p := range x."+APPLES+" {")
-	fmt.Fprintln(w, "		if p."+COLOR+" == newP."+COLOR+" {")
-	fmt.Fprintln(w, "			return false")
-	fmt.Fprintln(w, "		}")
-	fmt.Fprintln(w, "	}")
+	fmt.Fprintln(w, "	z := proto.Clone(y).(*"+APPLE+")")
+	fmt.Fprintln(w, "	x."+APPLES+" = append(x."+APPLES+", z)")
 	fmt.Fprintln(w, "")
-	fmt.Fprintln(w, "	x."+APPLES+" = append(x."+APPLES+", newP)")
-	fmt.Fprintln(w, "	return true")
+	fmt.Fprintln(w, "	return z")
 	fmt.Fprintln(w, "}")
 	fmt.Fprintln(w, "")
+
+	return funcdef
 }
-*/
 
 // Unique Append. rejects Append() if value is already defined
 // compares the field 'COLOR' in the STRUCT with VARNAME
 // that's not the right description above, but whatever, you get the idea
-func (msg *MsgName) addAppendBy(w io.Writer, STRUCT, FUNCNAME, STRUCTVAR, VARNAME, VARTYPE string) string {
+func (msg *MsgName) addCloneBy(w io.Writer, STRUCT, FUNCNAME, STRUCTVAR, VARNAME, VARTYPE string) string {
 	LOCK := msg.getLockname("x")
 
 	funcdef := "func (x *" + STRUCT + ") " + FUNCNAME + "(y *" + VARTYPE + ") bool"