Add interface method signatures

This commit is contained in:
Nigel Tao committed 2020-01-06 21:59:30 +11:00
1 parent 989e7b1c2c
commit 9e033579c8
5 files changed
+211 -73

No files matched your search

+88 -7
View File
@@ -325,13 +325,30 @@ func insertBaseImageImplC(buf *buffer) error {
}
func insertInterfaceDeclarations(buf *buffer) error {
if err := parseBuiltInInterfaceMethods(); err != nil {
return err
}
g := &gen{
pkgPrefix: "wuffs_base__",
pkgName: "base",
tm: &builtInTokenMap,
}
buf.writes("// ---------------- Interface Declarations.\n\n")
for _, n := range builtin.Interfaces {
buf.printf("extern const char* wuffs_base__%s__vtable_name;\n", n)
buf.writeb('\n')
qid := t.QID{t.IDBase, builtInTokenMap.ByName(n)}
buf.printf("typedef struct wuffs_base__%s__struct wuffs_base__%s;\n", n, n)
buf.writeb('\n')
buf.printf("extern const char* wuffs_base__%s__vtable_name;\n\n", n)
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 {
return err
}
buf.writes(";\n\n")
}
buf.writes("#if defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)\n\n")
@@ -343,7 +360,20 @@ func insertInterfaceDeclarations(buf *buffer) error {
buf.writes("} private_impl;\n\n")
buf.writes("\n#ifdef __cplusplus\n\n")
// TODO: C++ methods.
for _, f := range builtInInterfaceMethods[qid] {
if err := g.writeFuncSignature(buf, f, cppInsideStruct); err != nil {
return err
}
buf.writes("{ return ")
buf.writes(g.funcCName(f))
buf.writes("(this")
for _, o := range f.In().Fields() {
buf.writeb(',')
buf.writes(aPrefix)
buf.writes(o.AsField().Name().Str(g.tm))
}
buf.writes(");}\n\n")
}
buf.writes("#endif // __cplusplus\n\n")
buf.printf("}; // struct wuffs_base__%s__struct\n\n", n)
@@ -354,16 +384,67 @@ func insertInterfaceDeclarations(buf *buffer) error {
}
func insertInterfaceDefinitions(buf *buffer) error {
if err := parseBuiltInInterfaceMethods(); err != nil {
return err
}
g := &gen{
pkgPrefix: "wuffs_base__",
pkgName: "base",
tm: &builtInTokenMap,
}
buf.writes("// ---------------- Interface Definitions.\n\n")
for _, n := range builtin.Interfaces {
qid := t.QID{t.IDBase, builtInTokenMap.ByName(n)}
buf.printf("const char* wuffs_base__%s__vtable_name = "+
"\"{vtable}wuffs_base__%s\";\n", n, n)
"\"{vtable}wuffs_base__%s\";\n\n", n, n)
for _, f := range builtInInterfaceMethods[qid] {
returnsStatus := f.Effect().Coroutine() ||
((f.Out() != nil) && f.Out().IsStatus())
if err := g.writeFuncSignature(buf, f, cppNone); err != nil {
return err
}
buf.writes("{\n")
if err := writeFuncImplSelfMagicCheck(buf, g.tm, f); err != nil {
return err
}
// TODO.
buf.writes("return ")
if returnsStatus {
buf.writes("wuffs_base__make_status(wuffs_base__error__bad_vtable)")
} else if err := writeOutParamZeroValue(buf, g.tm, f.Out()); err != nil {
return err
}
buf.writes(";\n}\n\n")
}
}
buf.writeb('\n')
return nil
}
var (
builtInTokenMap = t.Map{}
builtInInterfaceMethods = map[t.QID][]*a.Func{}
)
func parseBuiltInInterfaceMethods() error {
if len(builtInInterfaceMethods) != 0 {
return nil
}
return builtin.ParseFuncs(&builtInTokenMap, builtin.InterfaceFuncs, false,
func(f *a.Func) error {
qid := f.Receiver()
builtInInterfaceMethods[qid] = append(builtInInterfaceMethods[qid], f)
return nil
})
}
type gen struct {
pkgPrefix string // e.g. "wuffs_jpeg__"
pkgName string // e.g. "jpeg"
+37 -29
View File
@@ -67,7 +67,7 @@ func (g *gen) funcCName(n *a.Func) string {
// TODO: this isn't right if r[0] != 0, i.e. the receiver is from a
// used package. There might be similar cases elsewhere in this
// package.
return g.pkgPrefix + r.Str(g.tm) + "__" + n.FuncName().Str(g.tm)
return g.pkgPrefix + r[1].Str(g.tm) + "__" + n.FuncName().Str(g.tm)
}
return g.pkgPrefix + n.FuncName().Str(g.tm)
}
@@ -121,7 +121,7 @@ func (g *gen) writeFuncSignature(b *buffer, n *a.Func, cpp uint32) error {
if n.Effect().Pure() {
b.writes("const ")
}
b.printf("%s%s *self", g.pkgPrefix, r.Str(g.tm))
b.printf("%s%s *self", g.pkgPrefix, r[1].Str(g.tm))
comma = true
}
}
@@ -217,7 +217,7 @@ func (g *gen) gatherFuncImpl(_ *buffer, n *a.Func) error {
return nil
}
func (g *gen) writeOutParamZeroValue(b *buffer, typ *a.TypeExpr) error {
func writeOutParamZeroValue(b *buffer, tm *t.Map, typ *a.TypeExpr) error {
if typ == nil {
b.writes("wuffs_base__make_empty_struct()")
return nil
@@ -251,39 +251,47 @@ func (g *gen) writeOutParamZeroValue(b *buffer, typ *a.TypeExpr) error {
return nil
}
}
return fmt.Errorf("internal error: cannot write the zero value of type %q", typ.Str(g.tm))
return fmt.Errorf("internal error: cannot write the zero value of type %q", typ.Str(tm))
}
func writeFuncImplSelfMagicCheck(b *buffer, tm *t.Map, f *a.Func) error {
returnsStatus := f.Effect().Coroutine() ||
((f.Out() != nil) && f.Out().IsStatus())
b.writes("if (!self) { return ")
if returnsStatus {
b.writes("wuffs_base__make_status(wuffs_base__error__bad_receiver)")
} else if err := writeOutParamZeroValue(b, tm, f.Out()); err != nil {
return err
}
b.writes(";}")
if f.Effect().Pure() {
b.writes("if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&")
b.writes(" (self->private_impl.magic != WUFFS_BASE__DISABLED)) {")
} else {
b.writes("if (self->private_impl.magic != WUFFS_BASE__MAGIC) {")
}
b.writes("return ")
if returnsStatus {
b.writes("wuffs_base__make_status(" +
"(self->private_impl.magic == WUFFS_BASE__DISABLED) " +
"? wuffs_base__error__disabled_by_previous_error " +
": wuffs_base__error__initialize_not_called)")
} else if err := writeOutParamZeroValue(b, tm, f.Out()); err != nil {
return err
}
b.writes(";}\n")
return nil
}
func (g *gen) writeFuncImplPrologue(b *buffer) error {
// Check the initialized/disabled state and the "self" arg.
if g.currFunk.astFunc.Public() && !g.currFunk.astFunc.Receiver().IsZero() {
out := g.currFunk.astFunc.Out()
b.writes("if (!self) { return ")
if g.currFunk.returnsStatus {
b.writes("wuffs_base__make_status(wuffs_base__error__bad_receiver)")
} else if err := g.writeOutParamZeroValue(b, out); err != nil {
if err := writeFuncImplSelfMagicCheck(b, g.tm, g.currFunk.astFunc); err != nil {
return err
}
b.writes(";}")
if g.currFunk.astFunc.Effect().Pure() {
b.writes("if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&")
b.writes(" (self->private_impl.magic != WUFFS_BASE__DISABLED)) {")
} else {
b.writes("if (self->private_impl.magic != WUFFS_BASE__MAGIC) {")
}
b.writes("return ")
if g.currFunk.returnsStatus {
b.writes("wuffs_base__make_status(" +
"(self->private_impl.magic == WUFFS_BASE__DISABLED) " +
"? wuffs_base__error__disabled_by_previous_error " +
": wuffs_base__error__initialize_not_called)")
} else if err := g.writeOutParamZeroValue(b, out); err != nil {
return err
}
b.writes(";}\n")
}
// For public functions, check (at runtime) the other args for bounds and