diff options
Diffstat (limited to 'generate.go')
| -rw-r--r-- | generate.go | 35 |
1 files changed, 25 insertions, 10 deletions
diff --git a/generate.go b/generate.go index 4632997..5c7b92a 100644 --- a/generate.go +++ b/generate.go @@ -43,7 +43,7 @@ func (pb *Files) makeNewSortfile(pf *File) error { continue } VARNAME := v.VarName - funcdef := newSortType(wSort, PARENT, VARNAME) + funcdef := msg.newSortType(wSort, PARENT, VARNAME) log.Printf("Adding %s\n", funcdef) } } @@ -56,7 +56,7 @@ func (pb *Files) makeNewSortfile(pf *File) error { APPLES := s.VarName LOCK := s.Lockname - msg := pf.findMsg(s.VarType) + msg := pf.findMsg(s.MsgName) if msg == nil { return fmt.Errorf("failed to find struct %s", s.VarType) } @@ -73,7 +73,7 @@ func (pb *Files) makeNewSortfile(pf *File) error { VARNAME := s.VarName LOCK := s.Lockname - msg := pf.findMsg(s.VarType) + msg := pf.findMsg(s.MsgName) if msg == nil { return fmt.Errorf("failed to find struct %s", s.VarType) } @@ -90,6 +90,11 @@ func (pb *Files) makeNewSortfile(pf *File) error { PARENT := s.MsgName VARNAME := s.VarName + pmsg := pf.findMsg(s.MsgName) + if pmsg == nil { + return fmt.Errorf("failed to find struct %s", s.MsgName) + } + msg := pf.findMsg(s.VarType) if msg == nil { return fmt.Errorf("failed to find struct %s", s.VarType) @@ -112,7 +117,7 @@ func (pb *Files) makeNewSortfile(pf *File) error { sortby = "SortBy" + v.VarName sortname := s.VarType + v.VarName selectName := "selectAll" + VARNAME - funcdef := newSortBy(wSort, PARENT, s.VarType, sortname, sortby, selectName, v.VarName) + funcdef := pmsg.newSortBy(wSort, PARENT, s.VarType, sortname, sortby, selectName, v.VarName) log.Printf("Adding %s\n", funcdef) } else { // deprecate this THIS DOES NOT MAKE SENSE TO DO @@ -140,7 +145,7 @@ func (pb *Files) makeNewSortfile(pf *File) error { if PARENT == VARNAME { // special case - funcdef := addLenFunc(wSort, PARENT, VARNAME, LOCK) // + " " + v.VarType + " name:" + v.VarName + funcdef := msg.addLenFunc(wSort, PARENT, VARNAME, LOCK) // + " " + v.VarType + " name:" + v.VarName funcdef += " # is special struct=varname" log.Printf("Adding %s\n", funcdef) } @@ -161,8 +166,13 @@ func (pb *Files) makeNewSortfile(pf *File) error { CHILD := s.VarType VARNAME := s.VarName + pmsg := pf.findMsg(s.MsgName) + if pmsg == nil { + return fmt.Errorf("failed to find struct %s", s.MsgName) + } + if PARENT == VARNAME { - funcdef := addAllFunc(wSort, PARENT, CHILD, VARNAME) + funcdef := pmsg.addAllFunc(wSort, PARENT, CHILD, VARNAME) log.Printf("Adding %s\n", funcdef) } @@ -195,6 +205,11 @@ func (pb *Files) makeNewSortfile(pf *File) error { } // special case because of the enforced .proto format // ONLY SUPPORT THIS + pmsg := pf.findMsg(s.MsgName) + if pmsg == nil { + return fmt.Errorf("failed to find struct %s", s.MsgName) + } + msg := pf.findMsg(s.VarType) if msg == nil { return fmt.Errorf("failed to find struct %s", s.VarType) @@ -215,7 +230,7 @@ func (pb *Files) makeNewSortfile(pf *File) error { if PARENT == VARNAME { // special case because of the enforced .proto format FUNCNAME = "FindBy" + v.VarName - funcdef := msg.generateFindBy(wSort, FUNCNAME, PARENT, s, v) + funcdef := pmsg.generateFindBy(wSort, FUNCNAME, PARENT, s, v) // func (msg *MsgName) generateFindBy(w io.Writer, FUNCNAME, STRUCT, VARNAME, VARTYPE, COLOR string) string { log.Printf("Adding %s\n", funcdef) } else { @@ -255,9 +270,9 @@ func (pb *Files) makeNewSortfile(pf *File) error { FUNCNAME = "DeleteBy" + v.VarName var funcdef string if argv.Delete { - funcdef = msg.deleteByWithCopy(wSort, FRUIT, APPLES, APPLE, COLOR, FUNCNAME, v.VarName) + funcdef = pmsg.deleteByWithCopy(wSort, FRUIT, APPLES, APPLE, COLOR, FUNCNAME, v.VarName) } else { - funcdef = msg.deleteBy(wSort, FRUIT, APPLES, APPLE, COLOR, FUNCNAME, v.VarName) + funcdef = pmsg.deleteBy(wSort, FRUIT, APPLES, APPLE, COLOR, FUNCNAME, v.VarName) } log.Printf("Adding %s\n", funcdef) } else { @@ -283,7 +298,7 @@ func (pb *Files) makeNewSortfile(pf *File) error { if PARENT == VARNAME { // special case because of the enforced .proto format // ONLY SUPPORT THIS FUNCNAME = "AppendBy" + v.VarName - funcdef := msg.addAppendBy(wSort, PARENT, FUNCNAME, VARNAME, v.VarName, s.VarType) + funcdef := pmsg.addAppendBy(wSort, PARENT, FUNCNAME, VARNAME, v.VarName, s.VarType) log.Printf("Adding %s\n", funcdef) } else { // deprecate this |