From ea17e354a32a007ad3abf7f7f7a3198cdfe785d0 Mon Sep 17 00:00:00 2001 From: Sasha Koshka Date: Wed, 27 Aug 2025 22:54:43 -0400 Subject: [PATCH] cmd/hopp-generate: Update generate command --- cmd/hopp-generate/main.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/cmd/hopp-generate/main.go b/cmd/hopp-generate/main.go index 3e38b0d..78ecb56 100644 --- a/cmd/hopp-generate/main.go +++ b/cmd/hopp-generate/main.go @@ -4,6 +4,7 @@ import "os" import "fmt" import "strings" import "path/filepath" +import "git.tebibyte.media/sashakoshka/goparse" import "git.tebibyte.media/sashakoshka/hopp/generate" func main() { @@ -18,7 +19,7 @@ func main() { input, err := os.Open(source) handleErr(1, err) defer input.Close() - protocol, err := generate.ParseReader(input) + protocol, err := generate.ParseReader(source, input) handleErr(1, err) absDestination, err := filepath.Abs(destination) @@ -30,14 +31,18 @@ func main() { output, err := os.Create(destination) handleErr(1, err) - err = protocol.Generate(output, packageName) + generator := generate.Generator { + Output: output, + PackageName: packageName, + } + _, err = generator.Generate(protocol) handleErr(1, err) fmt.Fprintf(os.Stderr, "%s: OK\n", name) } func handleErr(code int, err error) { 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) } }