Fixed Bitwise codegen being flipped

This commit is contained in:
diamondburned 2020-10-08 23:58:58 -07:00
parent 89b5ede1d8
commit 32fa6266db
3 changed files with 13 additions and 13 deletions

View File

@ -100,8 +100,8 @@ const (
StatusInvisible StatusInvisible
) )
func (s Status) Has(has Status) bool { func (s Status) Is(is Status) bool {
return s&has == has return s == is
} }
// AuthenticateEntry represents a single authentication entry, usually an email // AuthenticateEntry represents a single authentication entry, usually an email

View File

@ -49,15 +49,6 @@ func generateEnums(enums []repository.Enumeration) jen.Code {
var recv = genutils.RecvName(enum.Name) var recv = genutils.RecvName(enum.Name)
if enum.Bitwise { if enum.Bitwise {
fn := stmt.Func()
fn.Params(jen.Id(recv).Id(enum.Name))
fn.Id("Is")
fn.Params(jen.Id("is").Id(enum.Name))
fn.Bool()
fn.BlockFunc(func(g *jen.Group) {
g.Return(jen.Id(recv).Id("==").Id("is"))
})
} else {
fn := stmt.Func() fn := stmt.Func()
fn.Params(jen.Id(recv).Id(enum.Name)) fn.Params(jen.Id(recv).Id(enum.Name))
fn.Id("Has") fn.Id("Has")
@ -66,6 +57,15 @@ func generateEnums(enums []repository.Enumeration) jen.Code {
fn.BlockFunc(func(g *jen.Group) { fn.BlockFunc(func(g *jen.Group) {
g.Return(jen.Id(recv).Op("&").Id("has").Op("==").Id("has")) g.Return(jen.Id(recv).Op("&").Id("has").Op("==").Id("has"))
}) })
} else {
fn := stmt.Func()
fn.Params(jen.Id(recv).Id(enum.Name))
fn.Id("Is")
fn.Params(jen.Id("is").Id(enum.Name))
fn.Bool()
fn.BlockFunc(func(g *jen.Group) {
g.Return(jen.Id(recv).Id("==").Id("is"))
})
} }
stmt.Line() stmt.Line()

View File

@ -35,8 +35,8 @@ const (
AttributeDimmed AttributeDimmed
) )
func (a Attribute) Is(is Attribute) bool { func (a Attribute) Has(has Attribute) bool {
return a == is return a&has == has
} }
// Rich is a normal text wrapped with optional format segments. // Rich is a normal text wrapped with optional format segments.