diff options
Diffstat (limited to 'generate.go')
| -rw-r--r-- | generate.go | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/generate.go b/generate.go index e554b4d..30e0315 100644 --- a/generate.go +++ b/generate.go @@ -25,7 +25,7 @@ func (pb *Files) makeNewSortfile(pf *File) error { pf.selectAllFunc(wSort) pf.iterSelect(wSort) - pf.sortByFunc(wSort) + pf.sortByFunc(wSort, pf.Bases, pf.Base) /* pf.appendUnique(wFind) // Append() enforce no unique keys @@ -88,7 +88,7 @@ func (pf *File) processMessage(parent *MsgName, wSort, wFind io.Writer) error { for _, v := range parent.Vars { if !v.IsRepeated { - log.Printf("\tSKIP %s %s\n", v.VarName, v.VarType) + // log.Printf("\tSKIP %s %s\n", v.VarName, v.VarType) continue } log.Printf("\tFOUND REPEATED %s %s\n", v.VarName, v.VarType) @@ -124,18 +124,17 @@ func (pf *File) processMessage(parent *MsgName, wSort, wFind io.Writer) error { } func (parent *MsgName) addFindByMsg(w io.Writer, FRUIT, APPLES, APPLE, LOCK string) { - log.Printf("\tINSERT: %s %s for %s\n", APPLES, APPLE, FRUIT) for _, v := range parent.Vars { if v.HasUnique { var COLOR string = cases.Title(language.English, cases.NoLower).String(v.VarName) - log.Printf("\t\t(x %s) FindBy%s(string) *%s\n", FRUIT, COLOR, APPLE) + log.Printf("\tFIND: (x %s) FindBy%s(string) *%s\n", FRUIT, COLOR, APPLE) generateFindBy(w, FRUIT, APPLES, APPLE, COLOR, LOCK) } } } func (parent *MsgName) addDeleteByMsg(w io.Writer, FRUIT, APPLES, APPLE string) { - log.Printf("\tDELETE: %s %s for %s\n", APPLES, APPLE, FRUIT) + // log.Printf("\tDELETE: %s %s for %s\n", APPLES, APPLE, FRUIT) var COLORS []string for _, v := range parent.Vars { if !v.HasUnique { @@ -144,7 +143,7 @@ func (parent *MsgName) addDeleteByMsg(w io.Writer, FRUIT, APPLES, APPLE string) var COLOR string = cases.Title(language.English, cases.NoLower).String(v.VarName) COLORS = append(COLORS, COLOR) - log.Printf("\t\t(x %s) DeleteBy%s(string) *%s\n", FRUIT, COLOR, APPLE) + log.Printf("\tDELETE: (x %s) DeleteBy%s(string) *%s\n", FRUIT, COLOR, APPLE) if argv.Delete { parent.deleteByWithCopy(w, FRUIT, APPLES, APPLE, COLOR) } else { @@ -154,18 +153,18 @@ func (parent *MsgName) addDeleteByMsg(w io.Writer, FRUIT, APPLES, APPLE string) } func (parent *MsgName) addInsertByMsg(w io.Writer, FRUIT, APPLES, APPLE string) { - log.Printf("\tINSERT: %s %s for %s\n", APPLES, APPLE, FRUIT) + // log.Printf("\tINSERT: %s %s for %s\n", APPLES, APPLE, FRUIT) for _, v := range parent.Vars { if v.HasUnique { var COLOR string = cases.Title(language.English, cases.NoLower).String(v.VarName) - log.Printf("\t\t(x %s) InsertBy%s(string) *%s\n", FRUIT, COLOR, APPLE) + log.Printf("\tINSERT: (x %s) InsertBy%s(string) *%s\n", FRUIT, COLOR, APPLE) parent.insertBy(w, FRUIT, APPLES, APPLE, COLOR) } } } func (parent *MsgName) addAppendByMsg(w io.Writer, FRUIT, APPLES, APPLE string) { - log.Printf("\tAPPEND!: %s %s for %s\n", APPLES, APPLE, FRUIT) + // log.Printf("\tAPPEND!: %s %s for %s\n", APPLES, APPLE, FRUIT) var COLORS []string for _, v := range parent.Vars { @@ -173,7 +172,7 @@ func (parent *MsgName) addAppendByMsg(w io.Writer, FRUIT, APPLES, APPLE string) var COLOR string = cases.Title(language.English, cases.NoLower).String(v.VarName) COLORS = append(COLORS, COLOR) - log.Printf("\t\t(x %s) AppendUniqueBy%s(%s)\n", FRUIT, COLOR, APPLE) + log.Printf("\tAPPEND: (x %s) AppendUniqueBy%s(%s)\n", FRUIT, COLOR, APPLE) parent.appendUniqueCOLOR(w, FRUIT, APPLES, APPLE, COLOR) } } |