cmd/hopp-generate: Update generate command

This commit is contained in:
Sasha Koshka 2025-08-27 22:54:43 -04:00
parent 4dc8a30ebd
commit ea17e354a3

View File

@ -4,6 +4,7 @@ import "os"
import "fmt" import "fmt"
import "strings" import "strings"
import "path/filepath" import "path/filepath"
import "git.tebibyte.media/sashakoshka/goparse"
import "git.tebibyte.media/sashakoshka/hopp/generate" import "git.tebibyte.media/sashakoshka/hopp/generate"
func main() { func main() {
@ -18,7 +19,7 @@ func main() {
input, err := os.Open(source) input, err := os.Open(source)
handleErr(1, err) handleErr(1, err)
defer input.Close() defer input.Close()
protocol, err := generate.ParseReader(input) protocol, err := generate.ParseReader(source, input)
handleErr(1, err) handleErr(1, err)
absDestination, err := filepath.Abs(destination) absDestination, err := filepath.Abs(destination)
@ -30,14 +31,18 @@ func main() {
output, err := os.Create(destination) output, err := os.Create(destination)
handleErr(1, err) handleErr(1, err)
err = protocol.Generate(output, packageName) generator := generate.Generator {
Output: output,
PackageName: packageName,
}
_, err = generator.Generate(protocol)
handleErr(1, err) handleErr(1, err)
fmt.Fprintf(os.Stderr, "%s: OK\n", name) fmt.Fprintf(os.Stderr, "%s: OK\n", name)
} }
func handleErr(code int, err error) { func handleErr(code int, err error) {
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "%s: %v\n", os.Args[0], err) fmt.Fprintf(os.Stderr, "%s: %v\n", os.Args[0], parse.Format(err))
os.Exit(code) os.Exit(code)
} }
} }