Skip to content

switch from uint8() to qual #351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Unheilbar wants to merge 1 commit into
base: solana-bindings-write-report-only
Choose a base branch
from
Draft

switch from uint8() to qual #351

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 8 additions & 24 deletions cmd/generate-bindings/solana/anchor-go/generator/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,28 +174,13 @@ func (g *Generator) gen_complexEnum(name string, docs []string, typ idl.IdlTypeD
interfaceType := g.idl.Types.ByName(enumName)

for variantIndex, variant := range interfaceType.Ty.(*idl.IdlTypeDefTyEnum).Variants {
variantTypeNameComplex := formatComplexEnumVariantTypeName(enumName, variant.Name)

if variant.IsSimple() {
// TODO: the actual value is not important;
// what's important is the type.
switchGroup.Case(Lit(variantIndex)).
BlockFunc(func(caseGroup *Group) {
caseGroup.Return(
Parens(Op("*").Id(variantTypeNameComplex)).
Parens(Op("&").Id("tmp").Dot("Enum")),
Nil(),
)
})
} else {
switchGroup.Case(Lit(variantIndex)).
BlockFunc(func(caseGroup *Group) {
caseGroup.Return(
Op("&").Id("tmp").Dot(tools.ToCamelUpper(variant.Name)),
Nil(),
)
})
}
switchGroup.Case(Lit(variantIndex)).
BlockFunc(func(caseGroup *Group) {
caseGroup.Return(
Op("&").Id("tmp").Dot(tools.ToCamelUpper(variant.Name)),
Nil(),
)
})
}
switchGroup.Default().
BlockFunc(func(caseGroup *Group) {
Expand Down Expand Up @@ -249,8 +234,7 @@ func (g *Generator) gen_complexEnum(name string, docs []string, typ idl.IdlTypeD

// Declare the enum variant types:
if variant.IsSimple() {
// TODO: make the name {variantTypeName}_{interface_name} ???
code.Type().Id(variantTypeNameComplex).Uint8().Line().Line()
code.Type().Id(variantTypeNameComplex).Qual(PkgBinary, "EmptyVariant").Line().Line()
} else if variant.Fields.IsSome() {
code.Commentf("Variant %q of enum %q", variant.Name, enumTypeName).Line()
code.Type().Id(variantTypeNameComplex).StructFunc(
Expand Down