From 8c671874801f3ea133b5f93c59543e06b0d98185 Mon Sep 17 00:00:00 2001 From: Steve Manuel Date: Sat, 1 Apr 2017 11:46:52 -0700 Subject: provide generateType to parseField to get its parent data --- cmd/ponzu/generate.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/cmd/ponzu/generate.go b/cmd/ponzu/generate.go index 424a6a1..adbf093 100644 --- a/cmd/ponzu/generate.go +++ b/cmd/ponzu/generate.go @@ -37,7 +37,7 @@ func parseType(args []string) (generateType, error) { fields := args[1:] for _, field := range fields { - f, err := parseField(field) + f, err := parseField(field, t) if err != nil { return generateType{}, err } @@ -52,18 +52,17 @@ func parseType(args []string) (generateType, error) { return t, nil } -func parseField(raw string) (generateField, error) { +func parseField(raw string, gt generateType) (generateField, error) { // contents:string or // contents:string:richtext if !strings.Contains(raw, ":") { return generateField{}, fmt.Errorf("Invalid generate argument. [%s]", raw) } data := strings.Split(raw, ":") - name := fieldName(data[0]) field := generateField{ - Name: name, - Initial: strings.ToLower(string(name[0])), + Name: fieldName(data[0]), + Initial: gt.Initial, TypeName: strings.ToLower(data[1]), JSONName: fieldJSONName(data[0]), } -- cgit v1.2.3