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

Automatically dereference field and index pointers

Browse Source
This commit is contained in:
Elara 2024-02-08 08:36:02 -08:00
parent b7669282e3
commit 4154ce5ce7
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
salix.go
View File

@ -402,6 +402,7 @@ func (t *Template) getIndex(i ast.Index, local map[string]any) (any, error) {
return nil, err return nil, err
} }
var out reflect.Value
rval := reflect.ValueOf(val) rval := reflect.ValueOf(val)
rindex := reflect.ValueOf(index) rindex := reflect.ValueOf(index)
switch rval.Kind() { switch rval.Kind() {
@ -415,7 +416,7 @@ func (t *Template) getIndex(i ast.Index, local map[string]any) (any, error) {
intIndex := rindex.Interface().(int) intIndex := rindex.Interface().(int)
if intIndex < rval.Len() { if intIndex < rval.Len() {
return rval.Index(intIndex).Interface(), nil out = rval.Index(intIndex)
} else { } else {
return nil, ast.PosError(i, "%s: index out of range: %d", valueToString(i), intIndex) return nil, ast.PosError(i, "%s: index out of range: %d", valueToString(i), intIndex)
} }
@ -425,14 +426,19 @@ func (t *Template) getIndex(i ast.Index, local map[string]any) (any, error) {
} else { } else {
return nil, ast.PosError(i, "%s: invalid map index type: %T (expected %s)", valueToString(i), index, rval.Type().Key()) return nil, ast.PosError(i, "%s: invalid map index type: %T (expected %s)", valueToString(i), index, rval.Type().Key())
} }
if out := rval.MapIndex(rindex); out.IsValid() { if mapVal := rval.MapIndex(rindex); mapVal.IsValid() {
return out.Interface(), nil out = mapVal
} else { } else {
return nil, ast.PosError(i, "%s: map index not found: %q", valueToString(i), index) return nil, ast.PosError(i, "%s: map index not found: %q", valueToString(i), index)
} }
default: default:
return nil, ast.PosError(i, "%s: cannot index type: %T", valueToString(i), val) return nil, ast.PosError(i, "%s: cannot index type: %T", valueToString(i), val)
} }
for out.Kind() == reflect.Pointer {
out = out.Elem()
}
return out.Interface(), nil
} }
// getField tries to get a struct field from the underlying value // getField tries to get a struct field from the underlying value
@ -449,6 +455,9 @@ func (t *Template) getField(fa ast.FieldAccess, local map[string]any) (any, erro
if !field.IsValid() { if !field.IsValid() {
return nil, ast.PosError(fa, "%s: no such field: %s", valueToString(fa), fa.Name.Value) return nil, ast.PosError(fa, "%s: no such field: %s", valueToString(fa), fa.Name.Value)
} }
for field.Kind() == reflect.Pointer {
field = field.Elem()
}
return field.Interface(), nil return field.Interface(), nil
} }