Refactor generate.Main.

This commit is contained in:
Nigel Tao committed 2017-05-26 11:01:39 +10:00
1 parent 5d5381ea17
commit ddba103284
3 files changed
+10 -13

No files matched your search

+1 -6
View File
@@ -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'})
}
+1 -6
View File
@@ -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'})
}
+8 -1
View File
@@ -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)