cmd/cue/cmd: unshadow type names in get go
Quote fields that would otherwise shadow type
names. The new algorithm always quotes field
names of structs, and then relies on format's
simplify to remove quotes where not needed.
Fixes #228.
Change-Id: I08d39374ba35b340d8a225ff2c2d217140b6552b
Reviewed-on: https://cue-review.googlesource.com/c/cue/+/4385
Reviewed-by: Marcel van Lohuizen <mpvl@golang.org>
diff --git a/cmd/cue/cmd/get_go.go b/cmd/cue/cmd/get_go.go
index b3de7a1..226c8f0 100644
--- a/cmd/cue/cmd/get_go.go
+++ b/cmd/cue/cmd/get_go.go
@@ -475,7 +475,7 @@
file = strings.Replace(file, ".go", "_go", 1)
file += "_gen.cue"
- b, err := format.Node(f)
+ b, err := format.Node(f, format.Simplify())
if err != nil {
return err
}
@@ -557,11 +557,8 @@
}
}
-func (e *extractor) label(name string) cueast.Label {
- if !cueast.IsValidIdent(name) {
- return cueast.NewString(name)
- }
- return cueast.NewIdent(name)
+func (e *extractor) strLabel(name string) cueast.Label {
+ return cueast.NewString(name)
}
func (e *extractor) ident(name string) *cueast.Ident {
@@ -570,7 +567,7 @@
func (e *extractor) def(doc *ast.CommentGroup, name string, value cueast.Expr, newline bool) *cueast.Field {
f := &cueast.Field{
- Label: e.label(name),
+ Label: e.ident(name), // Go identifiers are always valid CUE identifiers.
Token: cuetoken.ISA,
Value: value,
}
@@ -866,11 +863,13 @@
func (e *extractor) makeField(name string, kind cuetoken.Token, expr types.Type, doc *ast.CommentGroup, newline bool) (f *cueast.Field, typename string) {
typ := e.makeType(expr)
- f = &cueast.Field{
- Label: e.label(name),
- Token: kind,
- Value: typ,
+ var label cueast.Label
+ if kind == cuetoken.ISA {
+ label = e.ident(name)
+ } else {
+ label = e.strLabel(name)
}
+ f = &cueast.Field{Label: label, Token: kind, Value: typ}
if doc := makeDoc(doc, newline); doc != nil {
f.AddComment(doc)
cueast.SetRelPos(doc, cuetoken.NewSection)
diff --git a/cmd/cue/cmd/testdata/pkg/cuelang.org/go/cmd/cue/cmd/testdata/code/go/pkg1/file1_go_gen.cue b/cmd/cue/cmd/testdata/pkg/cuelang.org/go/cmd/cue/cmd/testdata/code/go/pkg1/file1_go_gen.cue
index b56e20b..abf6b27 100644
--- a/cmd/cue/cmd/testdata/pkg/cuelang.org/go/cmd/cue/cmd/testdata/code/go/pkg1/file1_go_gen.cue
+++ b/cmd/cue/cmd/testdata/pkg/cuelang.org/go/cmd/cue/cmd/testdata/code/go/pkg1/file1_go_gen.cue
@@ -16,12 +16,12 @@
String: string
Inline
- NoInline: NoInline
- CustomJSON: CustomJSON
- CustomYAML?: null | CustomYAML @go(,*CustomYAML)
- AnyJSON: _ @go(,json.Marshaler)
- AnyText: string @go(,encoding.TextMarshaler)
- bar?: int @go(Bar)
+ "NoInline": NoInline
+ "CustomJSON": CustomJSON
+ "CustomYAML"?: null | CustomYAML @go(,*CustomYAML)
+ AnyJSON: _ @go(,json.Marshaler)
+ AnyText: string @go(,encoding.TextMarshaler)
+ bar?: int @go(Bar)
// Time is mapped to CUE's internal type.
Time: time.Time
@@ -36,14 +36,14 @@
Intf: Interface @protobuf(2,varint,name=intf)
Intf2: _ @go(,interface{})
Intf3: {
- Interface: Interface
+ "Interface": Interface
} @go(,struct{Interface})
Intf4: _ @go(,"interface{Foo()}")
// Even though this struct as a type implements MarshalJSON, it is known
// that it is really only implemented by the embedded field.
Embed: {
- CustomJSON: CustomJSON
+ "CustomJSON": CustomJSON
} @go(,struct{CustomJSON})
}
@@ -72,12 +72,8 @@
CustomYAML :: {
}
-Inline :: {
- Kind: string
-}
+Inline :: Kind: string
-NoInline :: {
- Kind: string
-}
+NoInline :: Kind: string
Interface :: _
