mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-19 00:38:14 +01:00
Refactor some cmd/wuffs code
This commit is contained in:
1 parent
dd3f0b9ed4
commit
7b98b785f2
2 files changed
+61
-53
No files matched your search
+44
-40
@@ -44,51 +44,55 @@ func doGenGenlib(wuffsRoot string, args []string, genlib bool) error {
|
||||
args = []string{"std/..."}
|
||||
}
|
||||
|
||||
affected := []string(nil)
|
||||
h := genHelper{
|
||||
wuffsRoot: wuffsRoot,
|
||||
langs: langs,
|
||||
}
|
||||
|
||||
for _, arg := range args {
|
||||
recursive := strings.HasSuffix(arg, "/...")
|
||||
if recursive {
|
||||
arg = arg[:len(arg)-4]
|
||||
}
|
||||
var err error
|
||||
affected, err = gen(affected, wuffsRoot, arg, langs, recursive)
|
||||
if err != nil {
|
||||
if err := h.gen(arg, recursive); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
if genlib {
|
||||
if err := genlibAffected(wuffsRoot, langs, affected); err != nil {
|
||||
return h.genlibAffected()
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
type genHelper struct {
|
||||
wuffsRoot string
|
||||
langs []string
|
||||
affected []string
|
||||
}
|
||||
|
||||
func (h *genHelper) gen(dirname string, recursive bool) error {
|
||||
filenames, dirnames, err := listDir(h.wuffsRoot, dirname, recursive)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if len(filenames) > 0 {
|
||||
if err := h.genDir(dirname, filenames); err != nil {
|
||||
return err
|
||||
}
|
||||
h.affected = append(h.affected, dirname)
|
||||
}
|
||||
if len(dirnames) > 0 {
|
||||
for _, d := range dirnames {
|
||||
if err := h.gen(dirname+"/"+d, recursive); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func gen(affected []string, wuffsRoot, dirname string, langs []string, recursive bool) (retAffected []string, retErr error) {
|
||||
filenames, dirnames, err := listDir(wuffsRoot, dirname, recursive)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if len(filenames) > 0 {
|
||||
if err := genDir(wuffsRoot, dirname, filenames, langs); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
affected = append(affected, dirname)
|
||||
}
|
||||
if len(dirnames) > 0 {
|
||||
for _, d := range dirnames {
|
||||
var err error
|
||||
affected, err = gen(affected, wuffsRoot, dirname+"/"+d, langs, recursive)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
}
|
||||
return affected, nil
|
||||
}
|
||||
|
||||
func genDir(wuffsRoot string, dirname string, filenames []string, langs []string) error {
|
||||
func (h *genHelper) genDir(dirname string, filenames []string) error {
|
||||
// TODO: skip the generation if the output file already exists and its
|
||||
// mtime is newer than all inputs and the wuffs-gen-foo command.
|
||||
|
||||
@@ -99,10 +103,10 @@ func genDir(wuffsRoot string, dirname string, filenames []string, langs []string
|
||||
cmdArgs := []string{"gen", "-package_name", packageName}
|
||||
for _, filename := range filenames {
|
||||
cmdArgs = append(cmdArgs,
|
||||
filepath.Join(wuffsRoot, filepath.FromSlash(dirname), filename))
|
||||
filepath.Join(h.wuffsRoot, filepath.FromSlash(dirname), filename))
|
||||
}
|
||||
|
||||
for _, lang := range langs {
|
||||
for _, lang := range h.langs {
|
||||
command := "wuffs-" + lang
|
||||
stdout := &bytes.Buffer{}
|
||||
cmd := exec.Command(command, cmdArgs...)
|
||||
@@ -117,7 +121,7 @@ func genDir(wuffsRoot string, dirname string, filenames []string, langs []string
|
||||
return err
|
||||
}
|
||||
out := stdout.Bytes()
|
||||
if err := genFile(wuffsRoot, dirname, lang, out); err != nil {
|
||||
if err := h.genFile(dirname, lang, out); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -130,7 +134,7 @@ func genDir(wuffsRoot string, dirname string, filenames []string, langs []string
|
||||
} else {
|
||||
out = out[:i]
|
||||
}
|
||||
if err := genFile(wuffsRoot, dirname, "h", out); err != nil {
|
||||
if err := h.genFile(dirname, "h", out); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
@@ -139,8 +143,8 @@ func genDir(wuffsRoot string, dirname string, filenames []string, langs []string
|
||||
|
||||
var cHeaderEndsHere = []byte("\n// C HEADER ENDS HERE.\n\n")
|
||||
|
||||
func genFile(wuffsRoot string, dirname string, lang string, out []byte) error {
|
||||
outFilename := filepath.Join(wuffsRoot, "gen", lang, filepath.FromSlash(dirname)+"."+lang)
|
||||
func (h *genHelper) genFile(dirname string, lang string, out []byte) error {
|
||||
outFilename := filepath.Join(h.wuffsRoot, "gen", lang, filepath.FromSlash(dirname)+"."+lang)
|
||||
if existing, err := ioutil.ReadFile(outFilename); err == nil && bytes.Equal(existing, out) {
|
||||
fmt.Println("gen unchanged: ", outFilename)
|
||||
return nil
|
||||
@@ -155,13 +159,13 @@ func genFile(wuffsRoot string, dirname string, lang string, out []byte) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func genlibAffected(wuffsRoot string, langs []string, affected []string) error {
|
||||
for _, lang := range langs {
|
||||
func (h *genHelper) genlibAffected() error {
|
||||
for _, lang := range h.langs {
|
||||
command := "wuffs-" + lang
|
||||
args := []string{"genlib"}
|
||||
args = append(args, "-dstdir", filepath.Join(wuffsRoot, "gen", "lib", lang))
|
||||
args = append(args, "-srcdir", filepath.Join(wuffsRoot, "gen", lang))
|
||||
args = append(args, affected...)
|
||||
args = append(args, "-dstdir", filepath.Join(h.wuffsRoot, "gen", "lib", lang))
|
||||
args = append(args, "-srcdir", filepath.Join(h.wuffsRoot, "gen", lang))
|
||||
args = append(args, h.affected...)
|
||||
cmd := exec.Command(command, args...)
|
||||
cmd.Stdout = os.Stdout
|
||||
cmd.Stderr = os.Stderr
|
||||
|
||||
+17
-13
@@ -73,7 +73,7 @@ func doBenchTest(wuffsRoot string, args []string, bench bool) error {
|
||||
cmdArgs = append(cmdArgs, "-mimic")
|
||||
}
|
||||
|
||||
b := btHelper{
|
||||
h := testHelper{
|
||||
wuffsRoot: wuffsRoot,
|
||||
langs: langs,
|
||||
cmdArgs: cmdArgs,
|
||||
@@ -89,13 +89,17 @@ func doBenchTest(wuffsRoot string, args []string, bench bool) error {
|
||||
|
||||
// Ensure that we are testing the latest version of the generated code.
|
||||
if !*skipgenFlag {
|
||||
if _, err := gen(nil, wuffsRoot, arg, langs, recursive); err != nil {
|
||||
gh := genHelper{
|
||||
wuffsRoot: wuffsRoot,
|
||||
langs: langs,
|
||||
}
|
||||
if err := gh.gen(arg, recursive); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
// Proceed with benching / testing the generated code.
|
||||
f, err := b.benchTest(arg, recursive)
|
||||
f, err := h.benchTest(arg, recursive)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -111,20 +115,20 @@ func doBenchTest(wuffsRoot string, args []string, bench bool) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
type btHelper struct {
|
||||
type testHelper struct {
|
||||
wuffsRoot string
|
||||
langs []string
|
||||
cmdArgs []string
|
||||
ccompilers string
|
||||
}
|
||||
|
||||
func (b *btHelper) benchTest(dirname string, recursive bool) (failed bool, err error) {
|
||||
filenames, dirnames, err := listDir(b.wuffsRoot, dirname, recursive)
|
||||
func (h *testHelper) benchTest(dirname string, recursive bool) (failed bool, err error) {
|
||||
filenames, dirnames, err := listDir(h.wuffsRoot, dirname, recursive)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
if len(filenames) > 0 {
|
||||
f, err := b.benchTestDir(dirname)
|
||||
f, err := h.benchTestDir(dirname)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
@@ -132,7 +136,7 @@ func (b *btHelper) benchTest(dirname string, recursive bool) (failed bool, err e
|
||||
}
|
||||
if len(dirnames) > 0 {
|
||||
for _, d := range dirnames {
|
||||
f, err := b.benchTest(filepath.Join(dirname, d), recursive)
|
||||
f, err := h.benchTest(filepath.Join(dirname, d), recursive)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
@@ -142,19 +146,19 @@ func (b *btHelper) benchTest(dirname string, recursive bool) (failed bool, err e
|
||||
return failed, nil
|
||||
}
|
||||
|
||||
func (b *btHelper) benchTestDir(dirname string) (failed bool, err error) {
|
||||
func (h *testHelper) benchTestDir(dirname string) (failed bool, err error) {
|
||||
if packageName := filepath.Base(dirname); !validName(packageName) {
|
||||
return false, fmt.Errorf(`invalid package %q, not in [a-z0-9]+`, packageName)
|
||||
}
|
||||
|
||||
for _, lang := range b.langs {
|
||||
for _, lang := range h.langs {
|
||||
command := "wuffs-" + lang
|
||||
args := []string(nil)
|
||||
args = append(args, b.cmdArgs...)
|
||||
args = append(args, h.cmdArgs...)
|
||||
if lang == "c" {
|
||||
args = append(args, fmt.Sprintf("-ccompilers=%s", b.ccompilers))
|
||||
args = append(args, fmt.Sprintf("-ccompilers=%s", h.ccompilers))
|
||||
}
|
||||
args = append(args, filepath.Join(b.wuffsRoot, "test", lang, filepath.FromSlash(dirname)))
|
||||
args = append(args, filepath.Join(h.wuffsRoot, "test", lang, filepath.FromSlash(dirname)))
|
||||
cmd := exec.Command(command, args...)
|
||||
cmd.Stdout = os.Stdout
|
||||
cmd.Stderr = os.Stderr
|
||||
|
||||
Reference in new issue
Block a user