mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-21 16:47:28 +01:00
Remove std/nie decoder.swizzle derived var hack
This commit is contained in:
1 parent
f6d11c78da
commit
332fb46b5c
4 files changed
+30
-10
No files matched your search
@@ -43,7 +43,8 @@ var (
|
||||
|
||||
maxInt64 = big.NewInt((1 << 63) - 1)
|
||||
|
||||
typeExprUtility = a.NewTypeExpr(0, t.IDBase, t.IDUtility, nil, nil, nil)
|
||||
typeExprPixelSwizzler = a.NewTypeExpr(0, t.IDBase, t.IDPixelSwizzler, nil, nil, nil)
|
||||
typeExprUtility = a.NewTypeExpr(0, t.IDBase, t.IDUtility, nil, nil, nil)
|
||||
)
|
||||
|
||||
// Prefixes are prepended to names to form a namespace and to avoid e.g.
|
||||
|
||||
+28
-2
@@ -24,6 +24,18 @@ import (
|
||||
|
||||
var errNeedDerivedVar = errors.New("cgen: internal error: need derived var")
|
||||
|
||||
// argsContainsArgsDotFoo returns whether the argNodes, a slice of *ast.Node
|
||||
// where each ast.Node is an ast.Arg, contains a "name: value" element whose
|
||||
// value is "args.foo".
|
||||
func argsContainsArgsDotFoo(argNodes []*a.Node, foo t.ID) bool {
|
||||
for _, o := range argNodes {
|
||||
if foo == o.AsArg().Value().IsArgsDotFoo() {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func (g *gen) needDerivedVar(name t.ID) bool {
|
||||
if name == 0 {
|
||||
return false
|
||||
@@ -34,10 +46,24 @@ func (g *gen) needDerivedVar(name t.ID) bool {
|
||||
if p.Kind() != a.KExpr {
|
||||
return nil
|
||||
}
|
||||
recv, _, _ := p.AsExpr().IsMethodCall()
|
||||
if (recv != nil) && (recv.IsArgsDotFoo() == name) {
|
||||
recv, meth, args := p.AsExpr().IsMethodCall()
|
||||
if recv == nil {
|
||||
return nil
|
||||
}
|
||||
if recv.IsArgsDotFoo() == name {
|
||||
return errNeedDerivedVar
|
||||
}
|
||||
// Some built-in methods will also need a derived var for their
|
||||
// arguments.
|
||||
//
|
||||
// TODO: use a comprehensive list of such methods.
|
||||
switch meth {
|
||||
case t.IDLimitedSwizzleU32InterleavedFromReader,
|
||||
t.IDSwizzleInterleavedFromReader:
|
||||
if recv.MType().Eq(typeExprPixelSwizzler) && argsContainsArgsDotFoo(args, name) {
|
||||
return errNeedDerivedVar
|
||||
}
|
||||
}
|
||||
return nil
|
||||
})
|
||||
if err == errNeedDerivedVar {
|
||||
|
||||
Reference in new issue
Block a user