Add a cformatter flag

Fixes #10
This commit is contained in:
Nigel Tao committed 2018-04-13 13:13:07 +10:00
1 parent 9254d6746b
commit 06ff3d3369
5 files changed
+34 -7

No files matched your search

+4 -1
View File
@@ -24,7 +24,10 @@ import (
const (
CcompilersDefault = "clang-5.0,gcc"
CcompilersUsage = `comma-separated list of C compilers, e.g. "clang-5.0,gcc"`
CcompilersUsage = `comma-separated list of C compilers`
CformatterDefault = "clang-format-5.0"
CformatterUsage = `C formatter`
FocusDefault = ""
FocusUsage = `comma-separated list of tests or benchmarks (name prefixes) to focus on, e.g. "wuffs_gif_decode"`
+12 -2
View File
@@ -18,6 +18,7 @@ package cgen
import (
"bytes"
"flag"
"fmt"
"io/ioutil"
"math/big"
@@ -32,6 +33,8 @@ import (
"github.com/google/wuffs/lang/check"
"github.com/google/wuffs/lang/generate"
cf "github.com/google/wuffs/cmd/commonflags"
a "github.com/google/wuffs/lang/ast"
t "github.com/google/wuffs/lang/token"
)
@@ -60,7 +63,14 @@ const (
//
// The generated program is written to stdout.
func Do(args []string) error {
return generate.Do(args, func(pkgName string, tm *t.Map, c *check.Checker, files []*a.File) ([]byte, error) {
flags := flag.FlagSet{}
cformatterFlag := flags.String("cformatter", cf.CformatterDefault, cf.CformatterUsage)
return generate.Do(&flags, args, func(pkgName string, tm *t.Map, c *check.Checker, files []*a.File) ([]byte, error) {
if !cf.IsAlphaNumericIsh(*cformatterFlag) {
return nil, fmt.Errorf("bad -cformatter flag value %q", *cformatterFlag)
}
g := &gen{
PKGPREFIX: "WUFFS_" + strings.ToUpper(pkgName) + "__",
pkgPrefix: "wuffs_" + pkgName + "__",
@@ -74,7 +84,7 @@ func Do(args []string) error {
return nil, err
}
stdout := &bytes.Buffer{}
cmd := exec.Command("clang-format-5.0", "-style=Chromium")
cmd := exec.Command(*cformatterFlag, "-style=Chromium")
cmd.Stdin = bytes.NewReader(unformatted)
cmd.Stdout = stdout
cmd.Stderr = os.Stderr
+12 -2
View File
@@ -39,12 +39,16 @@ func doGenlib(wuffsRoot string, args []string) error { return doGenGenlib(wuffsR
func doGenGenlib(wuffsRoot string, args []string, genlib bool) error {
flags := flag.NewFlagSet("gen", flag.ExitOnError)
cformatterFlag := flags.String("cformatter", cf.CformatterDefault, cf.CformatterUsage)
langsFlag := flags.String("langs", langsDefault, langsUsage)
skipgendepsFlag := flags.Bool("skipgendeps", skipgendepsDefault, skipgendepsUsage)
if err := flags.Parse(args); err != nil {
return err
}
if !cf.IsAlphaNumericIsh(*cformatterFlag) {
return fmt.Errorf("bad -cformatter flag value %q", *cformatterFlag)
}
langs, err := parseLangs(*langsFlag)
if err != nil {
return err
@@ -57,6 +61,7 @@ func doGenGenlib(wuffsRoot string, args []string, genlib bool) error {
h := genHelper{
wuffsRoot: wuffsRoot,
langs: langs,
cformatter: *cformatterFlag,
skipgendeps: *skipgendepsFlag,
}
@@ -82,6 +87,7 @@ func doGenGenlib(wuffsRoot string, args []string, genlib bool) error {
type genHelper struct {
wuffsRoot string
langs []string
cformatter string
skipgendeps bool
affected []string
@@ -138,12 +144,16 @@ func (h *genHelper) genDir(dirname string, filenames []string) error {
return err
}
}
cmdArgs := []string{"gen", "-package_name", packageName}
cmdArgs = append(cmdArgs, qualifiedFilenames...)
for _, lang := range h.langs {
command := "wuffs-" + lang
cmdArgs := []string{"gen", "-package_name", packageName}
if lang == "c" {
cmdArgs = append(cmdArgs, fmt.Sprintf("-cformatter=%s", h.cformatter))
}
cmdArgs = append(cmdArgs, qualifiedFilenames...)
stdout := &bytes.Buffer{}
cmd := exec.Command(command, cmdArgs...)
cmd.Stdin = nil
cmd.Stdout = stdout
+5
View File
@@ -31,6 +31,7 @@ func doTest(wuffsRoot string, args []string) error { return doBenchTest(wuffsRo
func doBenchTest(wuffsRoot string, args []string, bench bool) error {
flags := flag.NewFlagSet("test", flag.ExitOnError)
ccompilersFlag := flags.String("ccompilers", cf.CcompilersDefault, cf.CcompilersUsage)
cformatterFlag := flags.String("cformatter", cf.CformatterDefault, cf.CformatterUsage)
focusFlag := flags.String("focus", cf.FocusDefault, cf.FocusUsage)
langsFlag := flags.String("langs", langsDefault, langsUsage)
mimicFlag := flags.Bool("mimic", cf.MimicDefault, cf.MimicUsage)
@@ -49,6 +50,9 @@ func doBenchTest(wuffsRoot string, args []string, bench bool) error {
if !cf.IsAlphaNumericIsh(*ccompilersFlag) {
return fmt.Errorf("bad -ccompilers flag value %q", *ccompilersFlag)
}
if !cf.IsAlphaNumericIsh(*cformatterFlag) {
return fmt.Errorf("bad -cformatter flag value %q", *cformatterFlag)
}
if !cf.IsAlphaNumericIsh(*focusFlag) {
return fmt.Errorf("bad -focus flag value %q", *focusFlag)
}
@@ -93,6 +97,7 @@ func doBenchTest(wuffsRoot string, args []string, bench bool) error {
gh := genHelper{
wuffsRoot: wuffsRoot,
langs: langs,
cformatter: *cformatterFlag,
skipgendeps: *skipgendepsFlag,
}
if err := gh.gen(arg, recursive); err != nil {
+1 -2
View File
@@ -34,8 +34,7 @@ import (
type Generator func(packageName string, tm *t.Map, c *check.Checker, files []*a.File) ([]byte, error)
func Do(args []string, g Generator) error {
flags := flag.FlagSet{}
func Do(flags *flag.FlagSet, args []string, g Generator) error {
packageName := flags.String("package_name", "", "the package name of the Wuffs input code")
if err := flags.Parse(args); err != nil {
return err