From 0c63d6e4892e8e0aa943ce17676bf6321c7b960e Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Mon, 6 Jan 2020 22:08:37 +1100 Subject: [PATCH] Rename writeFunctionSignature modes --- internal/cgen/cgen.go | 8 ++++---- internal/cgen/func.go | 30 ++++++++++++------------------ 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/internal/cgen/cgen.go b/internal/cgen/cgen.go index 124fac52..9812a4fe 100644 --- a/internal/cgen/cgen.go +++ b/internal/cgen/cgen.go @@ -344,7 +344,7 @@ func insertInterfaceDeclarations(buf *buffer) error { buf.printf("typedef struct wuffs_base__%s__struct wuffs_base__%s;\n\n", n, n) for _, f := range builtInInterfaceMethods[qid] { - if err := g.writeFuncSignature(buf, f, cppNone); err != nil { + if err := g.writeFuncSignature(buf, f, wfsCDecl); err != nil { return err } buf.writes(";\n\n") @@ -361,7 +361,7 @@ func insertInterfaceDeclarations(buf *buffer) error { buf.writes("\n#ifdef __cplusplus\n\n") for _, f := range builtInInterfaceMethods[qid] { - if err := g.writeFuncSignature(buf, f, cppInsideStruct); err != nil { + if err := g.writeFuncSignature(buf, f, wfsCppDecl); err != nil { return err } buf.writes("{ return ") @@ -405,7 +405,7 @@ func insertInterfaceDefinitions(buf *buffer) error { returnsStatus := f.Effect().Coroutine() || ((f.Out() != nil) && f.Out().IsStatus()) - if err := g.writeFuncSignature(buf, f, cppNone); err != nil { + if err := g.writeFuncSignature(buf, f, wfsCDecl); err != nil { return err } buf.writes("{\n") @@ -1045,7 +1045,7 @@ func (g *gen) writeCppMethods(b *buffer, n *a.Struct) error { continue } - if err := g.writeFuncSignature(b, f, cppInsideStruct); err != nil { + if err := g.writeFuncSignature(b, f, wfsCppDecl); err != nil { return err } b.writes("{ return ") diff --git a/internal/cgen/func.go b/internal/cgen/func.go index f3cf09af..4f188276 100644 --- a/internal/cgen/func.go +++ b/internal/cgen/func.go @@ -72,15 +72,14 @@ func (g *gen) funcCName(n *a.Func) string { return g.pkgPrefix + n.FuncName().Str(g.tm) } -// C++ related function signature constants. +// writeFunctionSignature modes. const ( - cppNone = 0 // Not C++, just plain C. - cppInsideStruct = 1 - cppOutsideStruct = 2 + wfsCDecl = 0 + wfsCppDecl = 1 ) -func (g *gen) writeFuncSignature(b *buffer, n *a.Func, cpp uint32) error { - if cpp != cppNone { +func (g *gen) writeFuncSignature(b *buffer, n *a.Func, wfs uint32) error { + if wfs != wfsCDecl { b.writes("inline ") } else if n.Public() { b.writes("WUFFS_BASE__MAYBE_STATIC ") @@ -102,21 +101,16 @@ func (g *gen) writeFuncSignature(b *buffer, n *a.Func, cpp uint32) error { // start of a line. b.writes("//\n") - switch cpp { - case cppNone: + switch wfs { + case wfsCDecl: b.writes(g.funcCName(n)) - case cppInsideStruct: - b.writes(n.FuncName().Str(g.tm)) - case cppOutsideStruct: - b.writes(g.pkgPrefix) - b.writes(n.Receiver().Str(g.tm)) - b.writes("::") + case wfsCppDecl: b.writes(n.FuncName().Str(g.tm)) } b.writeb('(') comma := false - if cpp == cppNone { + if wfs == wfsCDecl { if r := n.Receiver(); !r.IsZero() { if n.Effect().Pure() { b.writes("const ") @@ -138,14 +132,14 @@ func (g *gen) writeFuncSignature(b *buffer, n *a.Func, cpp uint32) error { } b.printf(")") - if cpp != cppNone && !n.Receiver().IsZero() && n.Effect().Pure() { + if wfs != wfsCDecl && !n.Receiver().IsZero() && n.Effect().Pure() { b.writes(" const ") } return nil } func (g *gen) writeFuncPrototype(b *buffer, n *a.Func) error { - if err := g.writeFuncSignature(b, n, cppNone); err != nil { + if err := g.writeFuncSignature(b, n, wfsCDecl); err != nil { return err } b.writes(";\n\n") @@ -156,7 +150,7 @@ func (g *gen) writeFuncImpl(b *buffer, n *a.Func) error { k := g.funks[n.QQID()] b.printf("// -------- func %s.%s\n\n", g.pkgName, n.QQID().Str(g.tm)) - if err := g.writeFuncSignature(b, n, cppNone); err != nil { + if err := g.writeFuncSignature(b, n, wfsCDecl); err != nil { return err } b.writes("{\n")