mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 00:32:11 +01:00
Add interface method implementations
This commit is contained in:
1 parent
0c63d6e489
commit
4323a16707
4 files changed
+84
-17
No files matched your search
+27
-1
@@ -401,6 +401,15 @@ func insertInterfaceDefinitions(buf *buffer) error {
|
||||
buf.printf("const char* wuffs_base__%s__vtable_name = "+
|
||||
"\"{vtable}wuffs_base__%s\";\n\n", n, n)
|
||||
|
||||
buf.writes("typedef struct {\n\n")
|
||||
for _, f := range builtInInterfaceMethods[qid] {
|
||||
if err := g.writeFuncSignature(buf, f, wfsCFuncPtr); err != nil {
|
||||
return err
|
||||
}
|
||||
buf.writes(";\n")
|
||||
}
|
||||
buf.printf("} wuffs_base__%s__vtable;\n\n", n)
|
||||
|
||||
for _, f := range builtInInterfaceMethods[qid] {
|
||||
returnsStatus := f.Effect().Coroutine() ||
|
||||
((f.Out() != nil) && f.Out().IsStatus())
|
||||
@@ -413,7 +422,24 @@ func insertInterfaceDefinitions(buf *buffer) error {
|
||||
return err
|
||||
}
|
||||
|
||||
// TODO.
|
||||
buf.writes("\nwuffs_base__vtable* v = &self->private_impl.first_vtable;\n")
|
||||
buf.writes("int i;\n")
|
||||
buf.printf("for (i = 0; i < %d; i++) {\n", a.MaxImplements)
|
||||
buf.printf("if (v->vtable_name == wuffs_base__%s__vtable_name) {\n", n)
|
||||
buf.printf("const wuffs_base__%s__vtable* func_ptrs = "+
|
||||
"(const wuffs_base__%s__vtable*)(v->function_pointers);\n", n, n)
|
||||
buf.printf("return (*func_ptrs->%s)(self", f.FuncName().Str(g.tm))
|
||||
for _, o := range f.In().Fields() {
|
||||
buf.writeb(',')
|
||||
buf.writes(aPrefix)
|
||||
buf.writes(o.AsField().Name().Str(g.tm))
|
||||
}
|
||||
buf.writes(");\n")
|
||||
buf.writes("} else if (v->vtable_name == NULL) {\n")
|
||||
buf.writes("break;\n")
|
||||
buf.writes("}\n")
|
||||
buf.writes("v++;\n")
|
||||
buf.writes("}\n\n")
|
||||
|
||||
buf.writes("return ")
|
||||
if returnsStatus {
|
||||
|
||||
+35
-16
@@ -74,17 +74,25 @@ func (g *gen) funcCName(n *a.Func) string {
|
||||
|
||||
// writeFunctionSignature modes.
|
||||
const (
|
||||
wfsCDecl = 0
|
||||
wfsCppDecl = 1
|
||||
wfsCDecl = 0
|
||||
wfsCppDecl = 1
|
||||
wfsCFuncPtr = 2
|
||||
)
|
||||
|
||||
func (g *gen) writeFuncSignature(b *buffer, n *a.Func, wfs uint32) error {
|
||||
if wfs != wfsCDecl {
|
||||
switch wfs {
|
||||
case wfsCDecl:
|
||||
if n.Public() {
|
||||
b.writes("WUFFS_BASE__MAYBE_STATIC ")
|
||||
} else {
|
||||
b.writes("static ")
|
||||
}
|
||||
|
||||
case wfsCppDecl:
|
||||
b.writes("inline ")
|
||||
} else if n.Public() {
|
||||
b.writes("WUFFS_BASE__MAYBE_STATIC ")
|
||||
} else {
|
||||
b.writes("static ")
|
||||
|
||||
case wfsCFuncPtr:
|
||||
// No-op.
|
||||
}
|
||||
|
||||
// TODO: write n's return values.
|
||||
@@ -99,18 +107,15 @@ func (g *gen) writeFuncSignature(b *buffer, n *a.Func, wfs uint32) error {
|
||||
|
||||
// The empty // comment makes clang-format place the function name at the
|
||||
// start of a line.
|
||||
b.writes("//\n")
|
||||
if wfs != wfsCFuncPtr {
|
||||
b.writes("//\n")
|
||||
}
|
||||
|
||||
comma := false
|
||||
switch wfs {
|
||||
case wfsCDecl:
|
||||
b.writes(g.funcCName(n))
|
||||
case wfsCppDecl:
|
||||
b.writes(n.FuncName().Str(g.tm))
|
||||
}
|
||||
|
||||
b.writeb('(')
|
||||
comma := false
|
||||
if wfs == wfsCDecl {
|
||||
b.writeb('(')
|
||||
if r := n.Receiver(); !r.IsZero() {
|
||||
if n.Effect().Pure() {
|
||||
b.writes("const ")
|
||||
@@ -118,6 +123,20 @@ func (g *gen) writeFuncSignature(b *buffer, n *a.Func, wfs uint32) error {
|
||||
b.printf("%s%s *self", g.pkgPrefix, r[1].Str(g.tm))
|
||||
comma = true
|
||||
}
|
||||
|
||||
case wfsCppDecl:
|
||||
b.writes(n.FuncName().Str(g.tm))
|
||||
b.writeb('(')
|
||||
|
||||
case wfsCFuncPtr:
|
||||
b.writes("(*")
|
||||
b.writes(n.FuncName().Str(g.tm))
|
||||
b.writes(")(")
|
||||
if n.Effect().Pure() {
|
||||
b.writes("const ")
|
||||
}
|
||||
b.writes("void* self")
|
||||
comma = true
|
||||
}
|
||||
|
||||
for _, o := range n.In().Fields() {
|
||||
@@ -132,7 +151,7 @@ func (g *gen) writeFuncSignature(b *buffer, n *a.Func, wfs uint32) error {
|
||||
}
|
||||
|
||||
b.printf(")")
|
||||
if wfs != wfsCDecl && !n.Receiver().IsZero() && n.Effect().Pure() {
|
||||
if (wfs == wfsCppDecl) && !n.Receiver().IsZero() && n.Effect().Pure() {
|
||||
b.writes(" const ")
|
||||
}
|
||||
return nil
|
||||
|
||||
@@ -887,6 +887,10 @@ func NewConst(flags Flags, filename string, line uint32, name t.ID, xType *TypeE
|
||||
}
|
||||
}
|
||||
|
||||
// MaxImplements is an advisory limit for the number of interfaces a Struct can
|
||||
// implement.
|
||||
const MaxImplements = 63
|
||||
|
||||
// Struct is "struct ID2(List0)" or "struct ID2?(List0)":
|
||||
// - FlagsPublic is "pub" vs "pri"
|
||||
// - FlagsClassy is "ID2" vs "ID2?"
|
||||
|
||||
@@ -4597,6 +4597,10 @@ const char* wuffs_base__error__too_much_data = "#base: too much data";
|
||||
const char* wuffs_base__hasher_u32__vtable_name =
|
||||
"{vtable}wuffs_base__hasher_u32";
|
||||
|
||||
typedef struct {
|
||||
uint32_t (*update_u32)(void* self, wuffs_base__slice_u8 a_x);
|
||||
} wuffs_base__hasher_u32__vtable;
|
||||
|
||||
WUFFS_BASE__MAYBE_STATIC uint32_t //
|
||||
wuffs_base__hasher_u32__update_u32(wuffs_base__hasher_u32* self,
|
||||
wuffs_base__slice_u8 a_x) {
|
||||
@@ -4606,6 +4610,20 @@ wuffs_base__hasher_u32__update_u32(wuffs_base__hasher_u32* self,
|
||||
if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
wuffs_base__vtable* v = &self->private_impl.first_vtable;
|
||||
int i;
|
||||
for (i = 0; i < 63; i++) {
|
||||
if (v->vtable_name == wuffs_base__hasher_u32__vtable_name) {
|
||||
const wuffs_base__hasher_u32__vtable* func_ptrs =
|
||||
(const wuffs_base__hasher_u32__vtable*)(v->function_pointers);
|
||||
return (*func_ptrs->update_u32)(self, a_x);
|
||||
} else if (v->vtable_name == NULL) {
|
||||
break;
|
||||
}
|
||||
v++;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user