Delete() is working again

1 files changed, 24 insertions, 20 deletions

diff --git a/generate.go b/generate.go
index bfacb07..3983973 100644
--- a/generate.go
+++ b/generate.go
@@ -200,8 +200,8 @@ func (pb *Files) makeNewSortfile(pf *File) error {
 				log.Printf("      %-2s %20s %20s %20s %s %s\n", "", "", "", "", "", funcname)
 				FRUIT := PARENT
 				APPLES := msg.Name
-				APPLE := v.VarName
-				COLOR := v.VarType
+				APPLE := msg.VarName
+				COLOR := v.VarName
 				FUNCNAME := "Delete" + msg.Name + "By" + v.VarName
 
 				var funcdef string
@@ -250,25 +250,29 @@ func (pb *Files) makeNewSortfile(pf *File) error {
 			log.Printf("      %-2s %20s %20s %20s %s %s\n", "", "", "", "done", "", funcdef)
 		}
 
-		/*
-			// delete() functions
-			for _, v := range msg.Vars {
-				if !v.HasUnique {
-					continue
-				}
-				funcname := "func (x *" + PARENT + ") Delete" + VARNAME + "By" + v.VarName + "(" + v.VarType + ") bool"
-				log.Printf("      %-2s %20s %20s %20s %s %s\n", "", "", "", "", "", funcname)
-				FRUIT := PARENT
-				APPLES := VARNAME
-				APPLE := v.VarName
-				COLOR := s.VarType
-				if argv.Delete {
-					msg.deleteByWithCopy(wSort, FRUIT, APPLES, APPLE, COLOR)
-				} else {
-					msg.deleteBy(wSort, FRUIT, APPLES, APPLE, COLOR)
-				}
+		// delete() functions
+		for _, v := range msg.Vars {
+			if v.IsRepeated {
+				continue
 			}
-		*/
+			if !v.HasUnique {
+				continue
+			}
+			// funcname := "func (x *" + PARENT + ") Delete" + VARNAME + "By" + v.VarName + "(" + v.VarType + ") bool"
+			// log.Printf("      %-2s %20s %20s %20s %s %s\n", "", "", "", "", "", funcname)
+			FRUIT := PARENT
+			APPLES := VARNAME
+			APPLE := v.VarName
+			COLOR := v.VarType
+			FUNCNAME := "Delete" + VARNAME + "By" + v.VarName
+			var funcdef string
+			if argv.Delete {
+				funcdef = msg.deleteByWithCopy(wSort, FRUIT, APPLES, APPLE, COLOR, FUNCNAME, v.VarName)
+			} else {
+				funcdef = msg.deleteBy(wSort, FRUIT, APPLES, APPLE, COLOR, FUNCNAME, v.VarName)
+			}
+			log.Printf("      %-2s %20s %20s %20s %s %s\n", "", "", "", "done", "", funcdef)
+		}
 
 		for _, v := range msg.Vars {
 			if v.HasUnique {