hcl/ast: Get should return a list
This commit is contained in:
parent
8754ac7343
commit
32411ba6af
33
decoder.go
33
decoder.go
@ -533,19 +533,10 @@ func (d *decoder) decodeStruct(name string, node ast.Node, result reflect.Value)
|
||||
// Determine the element we'll use to decode. If it is a single
|
||||
// match (only object with the field), then we decode it exactly.
|
||||
// If it is a prefix match, then we decode the matches.
|
||||
var decodeNode ast.Node
|
||||
matches := list.Prefix(fieldName)
|
||||
if len(matches.Items) == 0 {
|
||||
single := list.Get(fieldName)
|
||||
if single == nil {
|
||||
continue
|
||||
}
|
||||
decodeNode = single.Val
|
||||
if ot, ok := decodeNode.(*ast.ObjectType); ok {
|
||||
decodeNode = &ast.ObjectList{Items: ot.List.Items}
|
||||
}
|
||||
} else {
|
||||
decodeNode = matches
|
||||
prefixMatches := list.Prefix(fieldName)
|
||||
matches := list.Get(fieldName)
|
||||
if len(matches.Items) == 0 && len(prefixMatches.Items) == 0 {
|
||||
continue
|
||||
}
|
||||
|
||||
// Track the used key
|
||||
@ -554,8 +545,20 @@ func (d *decoder) decodeStruct(name string, node ast.Node, result reflect.Value)
|
||||
// Create the field name and decode. We range over the elements
|
||||
// because we actually want the value.
|
||||
fieldName = fmt.Sprintf("%s.%s", name, fieldName)
|
||||
if err := d.decode(fieldName, decodeNode, field); err != nil {
|
||||
return err
|
||||
if len(prefixMatches.Items) > 0 {
|
||||
if err := d.decode(fieldName, prefixMatches, field); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
for _, match := range matches.Items {
|
||||
var decodeNode ast.Node = match.Val
|
||||
if ot, ok := decodeNode.(*ast.ObjectType); ok {
|
||||
decodeNode = &ast.ObjectList{Items: ot.List.Items}
|
||||
}
|
||||
|
||||
if err := d.decode(fieldName, decodeNode, field); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
decodedFields = append(decodedFields, fieldType.Name)
|
||||
|
@ -45,19 +45,20 @@ func (o *ObjectList) Add(item *ObjectItem) {
|
||||
o.Items = append(o.Items, item)
|
||||
}
|
||||
|
||||
func (o *ObjectList) Get(key string) *ObjectItem {
|
||||
func (o *ObjectList) Get(key string) *ObjectList {
|
||||
var result ObjectList
|
||||
for _, item := range o.Items {
|
||||
if len(item.Keys) == 0 {
|
||||
if len(item.Keys) != 1 {
|
||||
continue
|
||||
}
|
||||
|
||||
text := item.Keys[0].Token.Text
|
||||
if text == key || strings.EqualFold(text, key) {
|
||||
return item
|
||||
result.Add(item)
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
return &result
|
||||
}
|
||||
|
||||
func (o *ObjectList) Prefix(keys ...string) *ObjectList {
|
||||
|
Loading…
Reference in New Issue
Block a user