Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

generate Generate methods for enums (compatible with testing/quick) #60

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

generate Generate methods for enums (compatible with testing/quick) #60

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1821c94
generate Generate methods for enums (compatible with testing/quick)
Sep 23, 2015
2631e8f
add a flag for Enum Generate methods
Sep 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 28 additions & 4 deletions generator/go.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,19 @@ import (
"os"
"path/filepath"
"runtime"
"sort"
"strconv"
"strings"

"github.com/samuel/go-thrift/parser"
)

var (
flagGoBinarystring = flag.Bool("go.binarystring", false, "Always use string for binary instead of []byte")
flagGoJSONEnumnum = flag.Bool("go.json.enumnum", false, "For JSON marshal enums by number instead of name")
flagGoPointers = flag.Bool("go.pointers", false, "Make all fields pointers")
flagGoImportPrefix = flag.String("go.importprefix", "", "Prefix for thrift-generated go package imports")
flagGoBinarystring = flag.Bool("go.binarystring", false, "Always use string for binary instead of []byte")
flagGoJSONEnumnum = flag.Bool("go.json.enumnum", false, "For JSON marshal enums by number instead of name")
flagGoPointers = flag.Bool("go.pointers", false, "Make all fields pointers")
flagGoImportPrefix = flag.String("go.importprefix", "", "Prefix for thrift-generated go package imports")
flagGoGenerateMethods = flag.Bool("go.generate", false, "Add testing/quick compatible Generate methods to enum types")
)

var (
Expand Down Expand Up @@ -422,6 +424,24 @@ func (e *%s) UnmarshalJSON(b []byte) error {
}
`, enumName, enumName, enumName, enumName)

if *flagGoGenerateMethods {
valueStrings := make([]string, 0, len(enum.Values))
for _, val := range enum.Values {
valueStrings = append(valueStrings, strconv.FormatInt(int64(val.Value), 10))
}
sort.Strings(valueStrings)
valueStringsName := strings.ToLower(enumName) + "Values"

g.write(out, `
var %s = []int32{%s}

func (e *%s) Generate(rand *rand.Rand, size int) reflect.Value {
v := %s(%s[rand.Intn(%d)])
return reflect.ValueOf(&v)
}
`, valueStringsName, strings.Join(valueStrings, ", "), enumName, enumName, valueStringsName, len(valueNames))
}

return nil
}

Expand Down Expand Up @@ -621,6 +641,10 @@ func (g *GoGenerator) generateSingle(out io.Writer, thriftPath string, thrift *p
imports := []string{"fmt"}
if len(thrift.Enums) > 0 {
imports = append(imports, "strconv")

if *flagGoGenerateMethods {
imports = append(imports, "math/rand", "reflect")
}
}
if len(thrift.Includes) > 0 {
for _, path := range thrift.Includes {
Expand Down