Merge branch 'master' into comment_lits

Author: p4l1ly

README.md

@@ -49,6 +49,7 @@ Flags:
   -in="": file to parse instead of stdin
   -out="": file to save output to instead of stdout
   -pkg="": package name for generated files
+  -tag="": build tag that is stripped from output
 ```
 
   * Comma separated type lists will generate code for each type

main.go

@@ -36,6 +36,7 @@ func main() {
 		in      = flag.String("in", "", "file to parse instead of stdin")
 		out     = flag.String("out", "", "file to save output to instead of stdout")
 		pkgName = flag.String("pkg", "", "package name for generated files")
+		genTag  = flag.String("tag", "", "build tag that is stripped from output")
 		prefix  = "https://github.com/metabition/gennylib/raw/master/"
 	)
 	flag.Parse()
@@ -83,23 +84,23 @@ func main() {
 		}
 		r.Body.Close()
 		br := bytes.NewReader(b)
-		err = gen(*in, outputFilename, *pkgName, br, typeSets, outWriter)
+		err = gen(*in, outputFilename, *pkgName, *genTag, br, typeSets, outWriter)
 	} else if len(*in) > 0 {
 		var file *os.File
 		file, err = os.Open(*in)
 		if err != nil {
 			fatal(exitcodeSourceFileInvalid, err)
 		}
 		defer file.Close()
-		err = gen(*in, outputFilename, *pkgName, file, typeSets, outWriter)
+		err = gen(*in, outputFilename, *pkgName, *genTag, file, typeSets, outWriter)
 	} else {
 		var source []byte
 		source, err = ioutil.ReadAll(os.Stdin)
 		if err != nil {
 			fatal(exitcodeStdinFailed, err)
 		}
 		reader := bytes.NewReader(source)
-		err = gen("stdin", outputFilename, *pkgName, reader, typeSets, outWriter)
+		err = gen("stdin", outputFilename, *pkgName, *genTag, reader, typeSets, outWriter)
 	}
 
 	// do the work
@@ -143,12 +144,12 @@ func fatal(code int, a ...interface{}) {
 }
 
 // gen performs the generic generation.
-func gen(filename, outputFilename, pkgName string, in io.ReadSeeker, typesets []map[string]string, out io.Writer) error {
+func gen(filename, outputFilename, pkgName, tag string, in io.ReadSeeker, typesets []map[string]string, out io.Writer) error {
 
 	var output []byte
 	var err error
 
-	output, err = parse.Generics(filename, outputFilename, pkgName, in, typesets)
+	output, err = parse.Generics(filename, outputFilename, pkgName, tag, in, typesets)
 	if err != nil {
 		return err
 	}

parse/parse.go

@@ -172,7 +172,13 @@ func generateSpecific(filename string, in io.ReadSeeker, typeSet map[string]stri
 
 // Generics parses the source file and generates the bytes replacing the
 // generic types for the keys map with the specific types (its value).
-func Generics(filename, outputFilename, pkgName string, in io.ReadSeeker, typeSets []map[string]string) ([]byte, error) {
+func Generics(filename, outputFilename, pkgName, tag string, in io.ReadSeeker, typeSets []map[string]string) ([]byte, error) {
+	var localUnwantedLinePrefixes [][]byte
+	localUnwantedLinePrefixes = append(localUnwantedLinePrefixes, unwantedLinePrefixes...)
+
+	if tag != "" {
+		localUnwantedLinePrefixes = append(localUnwantedLinePrefixes, []byte(fmt.Sprintf("// +build %s", tag)))
+	}
 
 	totalOutput := header
 
@@ -216,9 +222,9 @@ func Generics(filename, outputFilename, pkgName string, in io.ReadSeeker, typeSe
 			continue
 		}
 
-		// check all unwantedLinePrefixes - and skip them
+		// check all localUnwantedLinePrefixes - and skip them
 		skipline := false
-		for _, prefix := range unwantedLinePrefixes {
+		for _, prefix := range localUnwantedLinePrefixes {
 			if bytes.HasPrefix(scanner.Bytes(), prefix) {
 				skipline = true
 				continue

parse/parse_test.go

@@ -16,6 +16,7 @@ var tests = []struct {
 	outputFilename string
 	pkgName        string
 	in             string
+	tag            string
 	types          []map[string]string
 
 	// expectations
@@ -116,6 +117,20 @@ var tests = []struct {
 		types:       []map[string]string{{"SomeThing": "int"}},
 		expectedOut: `test/bugreports/comment_int.go`,
 	},
+	{
+		filename:    "buildtags.go",
+		in:          `test/buildtags/buildtags.go`,
+		types:       []map[string]string{{"_t_": "int"}},
+		expectedOut: `test/buildtags/buildtags_expected.go`,
+		tag:         "genny",
+	},
+	{
+		filename:    "buildtags.go",
+		in:          `test/buildtags/buildtags.go`,
+		types:       []map[string]string{{"_t_": "string"}},
+		expectedOut: `test/buildtags/buildtags_expected_nostrip.go`,
+		tag:         "",
+	},
 }
 
 func TestParse(t *testing.T) {
@@ -125,7 +140,7 @@ func TestParse(t *testing.T) {
 		test.in = contents(test.in)
 		test.expectedOut = contents(test.expectedOut)
 
-		bytes, err := parse.Generics(test.filename, test.outputFilename, test.pkgName, strings.NewReader(test.in), test.types)
+		bytes, err := parse.Generics(test.filename, test.outputFilename, test.pkgName, test.tag, strings.NewReader(test.in), test.types)
 
 		// check the error
 		if test.expectedErr == nil {

parse/test/buildtags/buildtags.go

@@ -0,0 +1,16 @@
+// +build x,y z
+// +build genny
+
+package buildtags
+
+import (
+	"fmt"
+
+	"github.com/cheekybits/genny/generic"
+)
+
+type _t_ generic.Type
+
+func _t_Print(t _t_) {
+	fmt.Println(t)
+}

parse/test/buildtags/buildtags_expected.go

@@ -0,0 +1,13 @@
+// This file was automatically generated by genny.
+// Any changes will be lost if this file is regenerated.
+// see https://github.com/cheekybits/genny
+
+// +build x,y z
+
+package buildtags
+
+import "fmt"
+
+func intPrint(t int) {
+	fmt.Println(t)
+}

parse/test/buildtags/buildtags_expected_nostrip.go

@@ -0,0 +1,14 @@
+// This file was automatically generated by genny.
+// Any changes will be lost if this file is regenerated.
+// see https://github.com/cheekybits/genny
+
+// +build x,y z
+// +build genny
+
+package buildtags
+
+import "fmt"
+
+func stringPrint(t string) {
+	fmt.Println(t)
+}