Add "wuffs help foo" for the command line tool

Updates #62
This commit is contained in:
Nigel Tao committed 2021-12-30 22:34:27 +11:00
1 parent 4e85543d9c
commit e1a6a7cd8c
3 files changed
+37 -11

No files matched your search

+6 -1
View File
@@ -37,7 +37,12 @@ func doGen(wuffsRoot string, args []string) error { return doGenGenlib(wuffsR
func doGenlib(wuffsRoot string, args []string) error { return doGenGenlib(wuffsRoot, args, true) }
func doGenGenlib(wuffsRoot string, args []string, genlib bool) error {
flags := flag.NewFlagSet("gen", flag.ExitOnError)
flagSetName := `"wuffs gen <flags> std/pkg1 std/pkg2 etc"`
if genlib {
flagSetName = `"wuffs genlib <flags> std/pkg1 std/pkg2 etc"`
}
flags := flag.NewFlagSet(flagSetName, flag.ExitOnError)
genlinenumFlag := flags.Bool("genlinenum", cf.GenlinenumDefault, cf.GenlinenumUsage)
langsFlag := flags.String("langs", langsDefault, langsUsage)
skipgendepsFlag := flags.Bool("skipgendeps", skipgendepsDefault, skipgendepsUsage)
+9
View File
@@ -52,6 +52,8 @@ The commands are:
gen generate code for packages and dependencies
genlib generate software libraries
test test packages
Use "wuffs help <command>" for more information about a command.
`)
}
@@ -76,6 +78,13 @@ func main1() error {
return c.do(wuffsRoot, args[1:])
}
}
if (len(args) == 2) && (args[0] == "help") {
for _, c := range commands {
if args[1] == c.name {
return c.do(wuffsRoot, []string{"-help"})
}
}
}
}
usage()
os.Exit(1)
+22 -10
View File
@@ -29,16 +29,26 @@ func doBench(wuffsRoot string, args []string) error { return doBenchTest(wuffsRo
func doTest(wuffsRoot string, args []string) error { return doBenchTest(wuffsRoot, args, false) }
func doBenchTest(wuffsRoot string, args []string, bench bool) error {
flags := flag.NewFlagSet("test", flag.ExitOnError)
flagSetName := `"wuffs test <flags> std/pkg1 std/pkg2 etc"`
if bench {
flagSetName = `"wuffs bench <flags> std/pkg1 std/pkg2 etc"`
}
flags := flag.NewFlagSet(flagSetName, flag.ExitOnError)
ccompilersFlag := flags.String("ccompilers", cf.CcompilersDefault, cf.CcompilersUsage)
focusFlag := flags.String("focus", cf.FocusDefault, cf.FocusUsage)
iterscaleFlag := flags.Int("iterscale", cf.IterscaleDefault, cf.IterscaleUsage)
langsFlag := flags.String("langs", langsDefault, langsUsage)
mimicFlag := flags.Bool("mimic", cf.MimicDefault, cf.MimicUsage)
repsFlag := flags.Int("reps", cf.RepsDefault, cf.RepsUsage)
skipgenFlag := flags.Bool("skipgen", skipgenDefault, skipgenUsage)
skipgendepsFlag := flags.Bool("skipgendeps", skipgendepsDefault, skipgendepsUsage)
iterscaleFlag := (*int)(nil)
repsFlag := (*int)(nil)
if bench {
iterscaleFlag = flags.Int("iterscale", cf.IterscaleDefault, cf.IterscaleUsage)
repsFlag = flags.Int("reps", cf.RepsDefault, cf.RepsUsage)
}
if err := flags.Parse(args); err != nil {
return err
}
@@ -53,13 +63,15 @@ func doBenchTest(wuffsRoot string, args []string, bench bool) error {
if !cf.IsAlphaNumericIsh(*focusFlag) {
return fmt.Errorf("bad -focus flag value %q", *focusFlag)
}
if *iterscaleFlag < cf.IterscaleMin || cf.IterscaleMax < *iterscaleFlag {
return fmt.Errorf("bad -iterscale flag value %d, outside the range [%d ..= %d]",
*iterscaleFlag, cf.IterscaleMin, cf.IterscaleMax)
}
if *repsFlag < cf.RepsMin || cf.RepsMax < *repsFlag {
return fmt.Errorf("bad -reps flag value %d, outside the range [%d ..= %d]",
*repsFlag, cf.RepsMin, cf.RepsMax)
if bench {
if *iterscaleFlag < cf.IterscaleMin || cf.IterscaleMax < *iterscaleFlag {
return fmt.Errorf("bad -iterscale flag value %d, outside the range [%d ..= %d]",
*iterscaleFlag, cf.IterscaleMin, cf.IterscaleMax)
}
if *repsFlag < cf.RepsMin || cf.RepsMax < *repsFlag {
return fmt.Errorf("bad -reps flag value %d, outside the range [%d ..= %d]",
*repsFlag, cf.RepsMin, cf.RepsMax)
}
}
args = flags.Args()