Remove puffs-gen-h as a separate executable.

The .h file is already a prefix of the .c file. We already call
puffs-gen-c and can truncate its output.
This commit is contained in:
Nigel Tao committed 2017-06-01 10:33:42 +10:00
1 parent 05e2cec03d
commit 1b4590d878
8 files changed
+46 -42

No files matched your search

+3 -7
View File
@@ -25,18 +25,16 @@ const (
)
type Generator struct {
// Extension should be either 'c' or 'h'.
Extension byte
}
func (g *Generator) Generate(pkgName string, m *t.IDMap, files []*a.File) ([]byte, error) {
func (*Generator) Generate(pkgName string, m *t.IDMap, files []*a.File) ([]byte, error) {
b := &bytes.Buffer{}
includeGuard := "PUFFS_" + strings.ToUpper(pkgName) + "_H"
fmt.Fprintf(b, "#ifndef %s\n#define %s\n\n", includeGuard, includeGuard)
// Write preamble.
fmt.Fprintf(b, "// Code generated by puffs-gen-%c. DO NOT EDIT.\n\n", g.Extension)
fmt.Fprintf(b, "// Code generated by puffs-gen-c. DO NOT EDIT.\n\n")
b.WriteString(preamble)
b.WriteString("\n#ifdef __cplusplus\nextern \"C\" {\n#endif\n\n")
@@ -71,9 +69,7 @@ func (g *Generator) Generate(pkgName string, m *t.IDMap, files []*a.File) ([]byt
// Finish up the header, which is also the first part of the .c file.
b.WriteString("\n#ifdef __cplusplus\n} // extern \"C\"\n#endif\n\n")
fmt.Fprintf(b, "#endif // %s\n\n", includeGuard)
if g.Extension == 'h' {
return format(b)
}
b.WriteString("// C HEADER ENDS HERE.\n\n")
b.WriteString("// ---------------- Private Structs\n\n")
if err := forEachStruct(b, pkgName, m, files, priOnly, writeStruct); err != nil {
+1 -1
View File
@@ -15,5 +15,5 @@ import (
)
func main() {
generate.Main(&cgen.Generator{Extension: 'c'})
generate.Main(&cgen.Generator{})
}
-19
View File
@@ -1,19 +0,0 @@
// Use of this source code is governed by a BSD-style license that can be found
// in the LICENSE file.
// puffs-gen-h transpiles a Puffs program to a C header.
//
// The command line arguments list the source Puffs files. If no arguments are
// given, it reads from stdin.
//
// The generated header is written to stdout.
package main
import (
"github.com/google/puffs/cmd/internal/cgen"
"github.com/google/puffs/lang/generate"
)
func main() {
generate.Main(&cgen.Generator{Extension: 'h'})
}
+33 -11
View File
@@ -22,11 +22,11 @@ import (
func doGen(puffsRoot string, args []string) error {
flags := flag.NewFlagSet("gen", flag.ExitOnError)
langsStr := flags.String("langs", "c,h", langsUsage)
langsFlag := flags.String("langs", langsDefault, langsUsage)
if err := flags.Parse(args); err != nil {
return err
}
langs, err := parseLangs(*langsStr)
langs, err := parseLangs(*langsFlag)
if err != nil {
return err
}
@@ -119,19 +119,41 @@ func genDir(puffsRoot string, dirname string, filenames []string, langs []string
return err
}
out := stdout.Bytes()
outDirname := filepath.Join(puffsRoot, "gen", lang)
outFilename := filepath.Join(outDirname, packageName+"."+lang)
if existing, err := ioutil.ReadFile(outFilename); err == nil && bytes.Equal(existing, out) {
fmt.Println("gen unchanged: ", outFilename)
if err := genFile(puffsRoot, packageName, lang, out); err != nil {
return err
}
// Special-case the "c" generator to also write a .h file.
if lang != "c" {
continue
}
if err := os.MkdirAll(outDirname, 0755); err != nil {
if i := bytes.Index(out, cHeaderEndsHere); i < 0 {
return fmt.Errorf("%s: output did not contain %q", command, cHeaderEndsHere)
} else {
out = out[:i]
}
if err := genFile(puffsRoot, packageName, "h", out); err != nil {
return err
}
if err := ioutil.WriteFile(outFilename, out, 0644); err != nil {
return err
}
fmt.Println("gen wrote: ", outFilename)
}
return nil
}
var cHeaderEndsHere = []byte("\n// C HEADER ENDS HERE.\n\n")
func genFile(puffsRoot string, packageName string, lang string, out []byte) error {
outDirname := filepath.Join(puffsRoot, "gen", lang)
outFilename := filepath.Join(outDirname, packageName+"."+lang)
if existing, err := ioutil.ReadFile(outFilename); err == nil && bytes.Equal(existing, out) {
fmt.Println("gen unchanged: ", outFilename)
return nil
}
if err := os.MkdirAll(outDirname, 0755); err != nil {
return err
}
if err := ioutil.WriteFile(outFilename, out, 0644); err != nil {
return err
}
fmt.Println("gen wrote: ", outFilename)
return nil
}
+4 -1
View File
@@ -102,7 +102,10 @@ The commands are:
`)
}
const langsUsage = `comma-separated list of target languages (file extensions), e.g. "c,h,go,rs"`
const (
langsDefault = "c"
langsUsage = `comma-separated list of target languages (file extensions), e.g. "c,go,rs"`
)
func parseLangs(commaSeparated string) ([]string, error) {
ret := []string(nil)
+2 -2
View File
@@ -15,11 +15,11 @@ import (
func doTest(puffsRoot string, args []string) error {
flags := flag.NewFlagSet("test", flag.ExitOnError)
langsStr := flags.String("langs", "c", langsUsage)
langsFlag := flags.String("langs", langsDefault, langsUsage)
if err := flags.Parse(args); err != nil {
return err
}
langs, err := parseLangs(*langsStr)
langs, err := parseLangs(*langsFlag)
if err != nil {
return err
}
+2
View File
@@ -81,6 +81,8 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self);
#endif // PUFFS_GIF_H
// C HEADER ENDS HERE.
// ---------------- Private Structs
// ---------------- Private Constructor and Destructor Prototypes
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef PUFFS_GIF_H
#define PUFFS_GIF_H
// Code generated by puffs-gen-h. DO NOT EDIT.
// Code generated by puffs-gen-c. DO NOT EDIT.
// Use of this source code is governed by a BSD-style license that can be found
// in the LICENSE file.