Elara6331/salix
Elara6331/salix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix field check for method calls

Browse Source
This commit is contained in:
Elara 2024-02-23 22:13:23 -08:00
parent 0040828d2d
commit 110f050c1c
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
salix.go
View File

@ -495,10 +495,18 @@ func (t *Template) execMethodCall(mc ast.MethodCall, local map[string]any) (any,
if mtd.IsValid() { if mtd.IsValid() {
return t.execFunc(mtd, mc, mc.Params, local) return t.execFunc(mtd, mc, mc.Params, local)
} }
// If the method doesn't exist, also check for a field storing a function. // If the method doesn't exist, we need to check for fields, so dereference any pointers
field := rval.FieldByName(mc.Name.Value) // because pointers can't have fields
if field.IsValid() && field.Kind() == reflect.Func { for rval.Kind() == reflect.Pointer {
return t.execFunc(field, mc, mc.Params, local) rval = rval.Elem()
}
// Make sure we actually have a struct
if rval.Kind() == reflect.Struct {
// If the method doesn't exist, also check for a field storing a function.
field := rval.FieldByName(mc.Name.Value)
if field.IsValid() && field.Kind() == reflect.Func {
return t.execFunc(field, mc, mc.Params, local)
}
} }
// If neither of those exist, return an error // If neither of those exist, return an error
return nil, ast.PosError(mc, "no such method: %s", mc.Name.Value) return nil, ast.PosError(mc, "no such method: %s", mc.Name.Value)