mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 00:32:11 +01:00
Add a genlinenum flag
This commit is contained in:
1 parent
dd94ad3821
commit
20c474b32a
4 files changed
+24
-13
No files matched your search
@@ -34,6 +34,9 @@ const (
|
||||
FocusDefault = ""
|
||||
FocusUsage = `comma-separated list of tests or benchmarks (name prefixes) to focus on, e.g. "wuffs_gif_decode"`
|
||||
|
||||
GenlinenumDefault = false
|
||||
GenlinenumUsage = `whether to generate filename:line_number comments`
|
||||
|
||||
IterscaleDefault = 100
|
||||
IterscaleMin = 0
|
||||
IterscaleMax = 1000000
|
||||
|
||||
@@ -98,6 +98,7 @@ const (
|
||||
func Do(args []string) error {
|
||||
flags := flag.FlagSet{}
|
||||
cformatterFlag := flags.String("cformatter", cf.CformatterDefault, cf.CformatterUsage)
|
||||
genlinenumFlag := flags.Bool("genlinenum", cf.GenlinenumDefault, cf.GenlinenumUsage)
|
||||
|
||||
return generate.Do(&flags, args, func(pkgName string, tm *t.Map, c *check.Checker, files []*a.File) ([]byte, error) {
|
||||
if !cf.IsAlphaNumericIsh(*cformatterFlag) {
|
||||
@@ -139,11 +140,12 @@ func Do(args []string) error {
|
||||
|
||||
} else {
|
||||
g := &gen{
|
||||
pkgPrefix: "wuffs_" + pkgName + "__",
|
||||
pkgName: pkgName,
|
||||
tm: tm,
|
||||
checker: c,
|
||||
files: files,
|
||||
pkgPrefix: "wuffs_" + pkgName + "__",
|
||||
pkgName: pkgName,
|
||||
tm: tm,
|
||||
checker: c,
|
||||
files: files,
|
||||
genlinenum: *genlinenumFlag,
|
||||
}
|
||||
var err error
|
||||
unformatted, err = g.generate()
|
||||
@@ -310,6 +312,12 @@ type gen struct {
|
||||
checker *check.Checker
|
||||
files []*a.File
|
||||
|
||||
// genlinenum is whether to print "// foo.wuffs:123" comments in the
|
||||
// generated C code. This can be useful for debugging, although it is not
|
||||
// enabled by default as it can lead to many spurious changes in the
|
||||
// generated C code (due to line numbers changing) when editing Wuffs code.
|
||||
genlinenum bool
|
||||
|
||||
statusList []status
|
||||
statusMap map[t.QID]status
|
||||
structList []*a.Struct
|
||||
|
||||
@@ -22,12 +22,6 @@ import (
|
||||
t "github.com/google/wuffs/lang/token"
|
||||
)
|
||||
|
||||
// genFilenameLineComments is whether to print "// foo.wuffs:123\n" comments in
|
||||
// the generated code. This can be useful for debugging, although it is not
|
||||
// enabled by default as it can lead to many spurious changes in the generated
|
||||
// C code (due to line numbers changing) when editing Wuffs code.
|
||||
const genFilenameLineComments = false
|
||||
|
||||
func (g *gen) writeStatement(b *buffer, n *a.Node, depth uint32) error {
|
||||
if depth > a.MaxBodyDepth {
|
||||
return fmt.Errorf("body recursion depth too large")
|
||||
@@ -48,7 +42,7 @@ func (g *gen) writeStatement(b *buffer, n *a.Node, depth uint32) error {
|
||||
defer b.writes("}\n")
|
||||
}
|
||||
|
||||
if genFilenameLineComments {
|
||||
if g.genlinenum {
|
||||
filename, line := n.AsRaw().FilenameLine()
|
||||
if i := strings.LastIndexByte(filename, '/'); i >= 0 {
|
||||
filename = filename[i+1:]
|
||||
|
||||
+7
-1
@@ -39,6 +39,7 @@ 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)
|
||||
genlinenumFlag := flags.Bool("genlinenum", cf.GenlinenumDefault, cf.GenlinenumUsage)
|
||||
langsFlag := flags.String("langs", langsDefault, langsUsage)
|
||||
skipgendepsFlag := flags.Bool("skipgendeps", skipgendepsDefault, skipgendepsUsage)
|
||||
|
||||
@@ -78,6 +79,7 @@ func doGenGenlib(wuffsRoot string, args []string, genlib bool) error {
|
||||
wuffsRoot: wuffsRoot,
|
||||
langs: langs,
|
||||
cformatter: *cformatterFlag,
|
||||
genlinenum: *genlinenumFlag,
|
||||
skipgen: genlib && *skipgenFlag,
|
||||
skipgendeps: *skipgendepsFlag,
|
||||
}
|
||||
@@ -106,6 +108,7 @@ type genHelper struct {
|
||||
wuffsRoot string
|
||||
langs []string
|
||||
cformatter string
|
||||
genlinenum bool
|
||||
skipgen bool
|
||||
skipgendeps bool
|
||||
|
||||
@@ -180,9 +183,12 @@ func (h *genHelper) genDir(dirname string, qualFilenames []string) error {
|
||||
for _, lang := range h.langs {
|
||||
command := "wuffs-" + lang
|
||||
cmdArgs := []string{"gen", "-package_name", packageName}
|
||||
if lang == "c" {
|
||||
if (lang == "c") && (h.cformatter != cf.CformatterDefault) {
|
||||
cmdArgs = append(cmdArgs, fmt.Sprintf("-cformatter=%s", h.cformatter))
|
||||
}
|
||||
if h.genlinenum != cf.GenlinenumDefault {
|
||||
cmdArgs = append(cmdArgs, fmt.Sprintf("-genlinenum=%t", h.genlinenum))
|
||||
}
|
||||
cmdArgs = append(cmdArgs, qualFilenames...)
|
||||
stdout := &bytes.Buffer{}
|
||||
|
||||
|
||||
Reference in new issue
Block a user