From 364c396ae885f86e98b6ca7c1651fed1591c1d43 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Mon, 4 Jan 2021 23:26:32 +1100 Subject: [PATCH] Have cgen.go call aNode.Public() more often --- internal/cgen/cgen.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/cgen/cgen.go b/internal/cgen/cgen.go index 8ba27c2f..f0002bda 100644 --- a/internal/cgen/cgen.go +++ b/internal/cgen/cgen.go @@ -854,8 +854,8 @@ func (g *gen) forEachConst(b *buffer, v visibility, f func(*gen, *buffer, *a.Con for _, file := range g.files { for _, tld := range file.TopLevelDecls() { if tld.Kind() != a.KConst || - (v == pubOnly && tld.AsRaw().Flags()&a.FlagsPublic == 0) || - (v == priOnly && tld.AsRaw().Flags()&a.FlagsPublic != 0) { + ((v == pubOnly) && !tld.AsConst().Public()) || + ((v == priOnly) && tld.AsConst().Public()) { continue } if err := f(g, b, tld.AsConst()); err != nil { @@ -870,8 +870,8 @@ func (g *gen) forEachFunc(b *buffer, v visibility, f func(*gen, *buffer, *a.Func for _, file := range g.files { for _, tld := range file.TopLevelDecls() { if tld.Kind() != a.KFunc || - (v == pubOnly && tld.AsRaw().Flags()&a.FlagsPublic == 0) || - (v == priOnly && tld.AsRaw().Flags()&a.FlagsPublic != 0) { + ((v == pubOnly) && !tld.AsFunc().Public()) || + ((v == priOnly) && tld.AsFunc().Public()) { continue } if err := f(g, b, tld.AsFunc()); err != nil { @@ -886,8 +886,8 @@ func (g *gen) forEachStatus(b *buffer, v visibility, f func(*gen, *buffer, *a.St for _, file := range g.files { for _, tld := range file.TopLevelDecls() { if tld.Kind() != a.KStatus || - (v == pubOnly && tld.AsRaw().Flags()&a.FlagsPublic == 0) || - (v == priOnly && tld.AsRaw().Flags()&a.FlagsPublic != 0) { + ((v == pubOnly) && !tld.AsStatus().Public()) || + ((v == priOnly) && tld.AsStatus().Public()) { continue } if err := f(g, b, tld.AsStatus()); err != nil { @@ -1167,7 +1167,7 @@ func (g *gen) writeStruct(b *buffer, n *a.Struct) error { return err } - if n.AsNode().AsRaw().Flags()&a.FlagsPublic != 0 { + if n.Public() { if err := g.writeCppMethods(b, n); err != nil { return err } @@ -1244,7 +1244,7 @@ func (g *gen) writeCppMethods(b *buffer, n *a.Struct) error { structID := n.QID()[1] for _, file := range g.files { for _, tld := range file.TopLevelDecls() { - if (tld.Kind() != a.KFunc) || (tld.AsRaw().Flags()&a.FlagsPublic == 0) { + if (tld.Kind() != a.KFunc) || !tld.AsFunc().Public() { continue } f := tld.AsFunc()