pkg/gen: generate (almost) all pkg.go files in one call

This change centralizes the pkg code generation to a single call to `go run pkg/gen` instead of having an individual invocation of `go run gen.go` inside each package. The `go:generate` line is moved into `pkg/gen.go`. This significantly speeds up code generation (from ~15s to ~3s when I last tested it). We also avoid the cyclic dependency of the code generator on the code that's been generated by avoiding the use of `cue/load` which depends in turn on the standard library which is generated by `pkg/gen`. This is an intermediate step towards refactoring the pkg code generation to allow easy specification of arbitrary function signatures. Signed-off-by: Roger Peppe <[email protected]> Change-Id: I118d678809e33da3349b598967967bda91613cfd Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/538503 Reviewed-by: Marcel van Lohuizen <[email protected]> Reviewed-by: Daniel Martí <[email protected]>
cue-lang · Jun 27, 2022 · 23dc354 · 23dc354
1 parent b30eb99
commit 23dc354
Show file tree

Hide file tree

Showing 33 changed files with 210 additions and 223 deletions.
diff --git a/cue/marshal.go b/cue/marshal.go
@@ -95,8 +95,8 @@ func compileInstances(r *Runtime, data []*instanceData) (instances []*Instance,
 	return r.build(builds)
 }
 
-// Unmarshal creates an Instance from bytes generated by the MarshalBinary
-// method of an instance.
+// Unmarshal returns a slice of instances from bytes generated by
+// Runtime.Marshal.
 func (r *Runtime) Unmarshal(b []byte) ([]*Instance, error) {
 	if len(b) == 0 {
 		return nil, errors.Newf(token.NoPos, "unmarshal failed: empty buffer")

diff --git a/pkg/crypto/ed25519/pkg.go b/pkg/crypto/ed25519/pkg.go
diff --git a/pkg/crypto/hmac/pkg.go b/pkg/crypto/hmac/pkg.go
diff --git a/pkg/crypto/md5/pkg.go b/pkg/crypto/md5/pkg.go
diff --git a/pkg/crypto/sha1/pkg.go b/pkg/crypto/sha1/pkg.go
diff --git a/pkg/crypto/sha256/pkg.go b/pkg/crypto/sha256/pkg.go
diff --git a/pkg/crypto/sha512/pkg.go b/pkg/crypto/sha512/pkg.go
diff --git a/pkg/encoding/base64/pkg.go b/pkg/encoding/base64/pkg.go
diff --git a/pkg/encoding/csv/pkg.go b/pkg/encoding/csv/pkg.go
diff --git a/pkg/encoding/hex/pkg.go b/pkg/encoding/hex/pkg.go
diff --git a/pkg/encoding/json/pkg.go b/pkg/encoding/json/pkg.go
diff --git a/pkg/encoding/yaml/pkg.go b/pkg/encoding/yaml/pkg.go
diff --git a/pkg/gen.go b/pkg/gen.go
@@ -0,0 +1,3 @@
+package pkg
+
+//go:generate go run ./gen