diff --git a/cmd/puffs-gen-c/main.go b/cmd/puffs-gen-c/main.go index 414f9527..18681d98 100644 --- a/cmd/puffs-gen-c/main.go +++ b/cmd/puffs-gen-c/main.go @@ -10,15 +10,10 @@ package main import ( - "os" - "github.com/google/puffs/cmd/internal/cgen" "github.com/google/puffs/lang/generate" ) func main() { - if err := generate.Main(&cgen.Generator{Extension: 'c'}); err != nil { - os.Stderr.WriteString(err.Error() + "\n") - os.Exit(1) - } + generate.Main(&cgen.Generator{Extension: 'c'}) } diff --git a/cmd/puffs-gen-h/main.go b/cmd/puffs-gen-h/main.go index f0c5c0b1..43c0e795 100644 --- a/cmd/puffs-gen-h/main.go +++ b/cmd/puffs-gen-h/main.go @@ -10,15 +10,10 @@ package main import ( - "os" - "github.com/google/puffs/cmd/internal/cgen" "github.com/google/puffs/lang/generate" ) func main() { - if err := generate.Main(&cgen.Generator{Extension: 'h'}); err != nil { - os.Stderr.WriteString(err.Error() + "\n") - os.Exit(1) - } + generate.Main(&cgen.Generator{Extension: 'h'}) } diff --git a/lang/generate/generate.go b/lang/generate/generate.go index 31ce124a..623c7df8 100644 --- a/lang/generate/generate.go +++ b/lang/generate/generate.go @@ -26,7 +26,14 @@ type Generator interface { Format(rawSource []byte) ([]byte, error) } -func Main(g Generator) error { +func Main(g Generator) { + if err := main1(g); err != nil { + os.Stderr.WriteString(err.Error() + "\n") + os.Exit(1) + } +} + +func main1(g Generator) error { flag.Parse() idMap := &token.IDMap{} files, err := parseFiles(idMap)