From bb1e6a5844a00c27f0b9253e13282a6b71fa2b9f Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 11 Jan 2020 10:25:01 +1100 Subject: [PATCH] Remove unused check.Checker argument --- internal/cgen/cgen.go | 9 +++------ lang/generate/generate.go | 9 ++++----- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/internal/cgen/cgen.go b/internal/cgen/cgen.go index b83454e2..ea572f7d 100644 --- a/internal/cgen/cgen.go +++ b/internal/cgen/cgen.go @@ -28,7 +28,6 @@ import ( "strings" "github.com/google/wuffs/lang/builtin" - "github.com/google/wuffs/lang/check" "github.com/google/wuffs/lang/generate" cf "github.com/google/wuffs/cmd/commonflags" @@ -105,7 +104,7 @@ func Do(args []string) error { 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) { + return generate.Do(&flags, args, func(pkgName string, tm *t.Map, files []*a.File) ([]byte, error) { if !cf.IsAlphaNumericIsh(*cformatterFlag) { return nil, fmt.Errorf("bad -cformatter flag value %q", *cformatterFlag) } @@ -150,7 +149,6 @@ func Do(args []string) error { pkgPrefix: "wuffs_" + pkgName + "__", pkgName: pkgName, tm: tm, - checker: c, files: files, genlinenum: *genlinenumFlag, } @@ -475,9 +473,8 @@ type gen struct { pkgPrefix string // e.g. "wuffs_jpeg__" pkgName string // e.g. "jpeg" - tm *t.Map - checker *check.Checker - files []*a.File + tm *t.Map + 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 diff --git a/lang/generate/generate.go b/lang/generate/generate.go index 5f0f6166..65441770 100644 --- a/lang/generate/generate.go +++ b/lang/generate/generate.go @@ -30,7 +30,7 @@ import ( t "github.com/google/wuffs/lang/token" ) -type Generator func(packageName string, tm *t.Map, c *check.Checker, files []*a.File) ([]byte, error) +type Generator func(packageName string, tm *t.Map, files []*a.File) ([]byte, error) func Do(flags *flag.FlagSet, args []string, g Generator) error { packageName := flags.String("package_name", "", "the package name of the Wuffs input code") @@ -41,7 +41,7 @@ func Do(flags *flag.FlagSet, args []string, g Generator) error { if *packageName == "base" && len(flags.Args()) == 0 { var err error - out, err = g("base", nil, nil, nil) + out, err = g("base", nil, nil) if err != nil { return err } @@ -58,12 +58,11 @@ func Do(flags *flag.FlagSet, args []string, g Generator) error { return err } - c, err := check.Check(tm, files, resolveUse) - if err != nil { + if _, err := check.Check(tm, files, resolveUse); err != nil { return err } - out, err = g(pkgName, tm, c, files) + out, err = g(pkgName, tm, files) if err != nil { return err }