mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 00:32:11 +01:00
Emit stricter vtable function-pointer type
This commit is contained in:
1 parent
fd5c0143ab
commit
4fd9637e5a
4 files changed
+44
-22
No files matched your search
@@ -403,7 +403,7 @@ func insertInterfaceDefinitions(buf *buffer) error {
|
||||
|
||||
buf.writes("typedef struct {\n\n")
|
||||
for _, f := range builtInInterfaceMethods[qid] {
|
||||
if err := g.writeFuncSignature(buf, f, wfsCFuncPtr); err != nil {
|
||||
if err := g.writeFuncSignature(buf, f, wfsCFuncPtrField); err != nil {
|
||||
return err
|
||||
}
|
||||
buf.writes(";\n")
|
||||
@@ -1157,7 +1157,11 @@ func (g *gen) writeVTableImpl(b *buffer, n *a.Struct) error {
|
||||
builtInTokenMap.ByName(iQID[1].Str(g.tm)),
|
||||
}
|
||||
for _, f := range builtInInterfaceMethods[altQID] {
|
||||
b.printf("(void*)(&%s%s__%s),\n",
|
||||
b.writeb('(')
|
||||
if err := g.writeFuncSignature(b, f, wfsCFuncPtrType); err != nil {
|
||||
return err
|
||||
}
|
||||
b.printf(")(&%s%s__%s),\n",
|
||||
g.pkgPrefix, nQID[1].Str(g.tm),
|
||||
f.FuncName().Str(&builtInTokenMap),
|
||||
)
|
||||
|
||||
+15
-9
@@ -363,9 +363,11 @@ func (g *gen) writeCTypeName(b *buffer, n *a.TypeExpr, varNamePrefix string, var
|
||||
o := n.Inner()
|
||||
if o.Decorator() == 0 && o.QID() == (t.QID{t.IDBase, t.IDU8}) && !o.IsRefined() {
|
||||
b.writes("wuffs_base__slice_u8")
|
||||
b.writeb(' ')
|
||||
b.writes(varNamePrefix)
|
||||
b.writes(varName)
|
||||
if varNamePrefix != "" {
|
||||
b.writeb(' ')
|
||||
b.writes(varNamePrefix)
|
||||
b.writes(varName)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
return fmt.Errorf("cannot convert Wuffs type %q to C", n.Str(g.tm))
|
||||
@@ -374,9 +376,11 @@ func (g *gen) writeCTypeName(b *buffer, n *a.TypeExpr, varNamePrefix string, var
|
||||
o := n.Inner()
|
||||
if o.Decorator() == 0 && o.QID() == (t.QID{t.IDBase, t.IDU8}) && !o.IsRefined() {
|
||||
b.writes("wuffs_base__table_u8")
|
||||
b.writeb(' ')
|
||||
b.writes(varNamePrefix)
|
||||
b.writes(varName)
|
||||
if varNamePrefix != "" {
|
||||
b.writeb(' ')
|
||||
b.writes(varNamePrefix)
|
||||
b.writes(varName)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
return fmt.Errorf("cannot convert Wuffs type %q to C", n.Str(g.tm))
|
||||
@@ -420,9 +424,11 @@ func (g *gen) writeCTypeName(b *buffer, n *a.TypeExpr, varNamePrefix string, var
|
||||
b.writeb('*')
|
||||
}
|
||||
|
||||
b.writeb(' ')
|
||||
b.writes(varNamePrefix)
|
||||
b.writes(varName)
|
||||
if varNamePrefix != "" {
|
||||
b.writeb(' ')
|
||||
b.writes(varNamePrefix)
|
||||
b.writes(varName)
|
||||
}
|
||||
|
||||
x = n
|
||||
for ; x != nil && x.IsArrayType(); x = x.Inner() {
|
||||
|
||||
+19
-9
@@ -74,9 +74,10 @@ func (g *gen) funcCName(n *a.Func) string {
|
||||
|
||||
// writeFunctionSignature modes.
|
||||
const (
|
||||
wfsCDecl = 0
|
||||
wfsCppDecl = 1
|
||||
wfsCFuncPtr = 2
|
||||
wfsCDecl = 0
|
||||
wfsCppDecl = 1
|
||||
wfsCFuncPtrField = 2
|
||||
wfsCFuncPtrType = 3
|
||||
)
|
||||
|
||||
func (g *gen) writeFuncSignature(b *buffer, n *a.Func, wfs uint32) error {
|
||||
@@ -91,7 +92,7 @@ func (g *gen) writeFuncSignature(b *buffer, n *a.Func, wfs uint32) error {
|
||||
case wfsCppDecl:
|
||||
b.writes("inline ")
|
||||
|
||||
case wfsCFuncPtr:
|
||||
case wfsCFuncPtrField, wfsCFuncPtrType:
|
||||
// No-op.
|
||||
}
|
||||
|
||||
@@ -107,7 +108,7 @@ 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.
|
||||
if wfs != wfsCFuncPtr {
|
||||
if (wfs != wfsCFuncPtrField) && (wfs != wfsCFuncPtrType) {
|
||||
b.writes("//\n")
|
||||
}
|
||||
|
||||
@@ -128,14 +129,19 @@ func (g *gen) writeFuncSignature(b *buffer, n *a.Func, wfs uint32) error {
|
||||
b.writes(n.FuncName().Str(g.tm))
|
||||
b.writeb('(')
|
||||
|
||||
case wfsCFuncPtr:
|
||||
case wfsCFuncPtrField, wfsCFuncPtrType:
|
||||
b.writes("(*")
|
||||
b.writes(n.FuncName().Str(g.tm))
|
||||
if wfs == wfsCFuncPtrField {
|
||||
b.writes(n.FuncName().Str(g.tm))
|
||||
}
|
||||
b.writes(")(")
|
||||
if n.Effect().Pure() {
|
||||
b.writes("const ")
|
||||
}
|
||||
b.writes("void* self")
|
||||
b.writes("void*")
|
||||
if wfs == wfsCFuncPtrField {
|
||||
b.writes(" self")
|
||||
}
|
||||
comma = true
|
||||
}
|
||||
|
||||
@@ -145,7 +151,11 @@ func (g *gen) writeFuncSignature(b *buffer, n *a.Func, wfs uint32) error {
|
||||
}
|
||||
comma = true
|
||||
o := o.AsField()
|
||||
if err := g.writeCTypeName(b, o.XType(), aPrefix, o.Name().Str(g.tm)); err != nil {
|
||||
varNamePrefix, varName := "", ""
|
||||
if wfs != wfsCFuncPtrType {
|
||||
varNamePrefix, varName = aPrefix, o.Name().Str(g.tm)
|
||||
}
|
||||
if err := g.writeCTypeName(b, o.XType(), varNamePrefix, varName); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4915,7 +4915,8 @@ wuffs_base__pixel_swizzler__swizzle_interleaved(
|
||||
|
||||
const wuffs_base__hasher_u32__func_ptrs
|
||||
wuffs_adler32__hasher__func_ptrs_for__wuffs_base__hasher_u32 = {
|
||||
(void*)(&wuffs_adler32__hasher__update_u32),
|
||||
(uint32_t(*)(void*, wuffs_base__slice_u8))(
|
||||
&wuffs_adler32__hasher__update_u32),
|
||||
};
|
||||
|
||||
// ---------------- Initializer Implementations
|
||||
@@ -5937,7 +5938,8 @@ static const uint32_t //
|
||||
|
||||
const wuffs_base__hasher_u32__func_ptrs
|
||||
wuffs_crc32__ieee_hasher__func_ptrs_for__wuffs_base__hasher_u32 = {
|
||||
(void*)(&wuffs_crc32__ieee_hasher__update_u32),
|
||||
(uint32_t(*)(void*, wuffs_base__slice_u8))(
|
||||
&wuffs_crc32__ieee_hasher__update_u32),
|
||||
};
|
||||
|
||||
// ---------------- Initializer Implementations
|
||||
|
||||
Reference in new issue
Block a user