Revert "Opportunities to unindent code (unindent)"

This commit is contained in:
Marcus Efraimsson
2018-05-02 14:06:46 +02:00
committed by GitHub
parent 6dcb9e696d
commit de0d409a23
8 changed files with 131 additions and 124 deletions
+30 -24
View File
@@ -639,24 +639,26 @@ func (v *Value) Object() (*Object, error) {
valid = true
}
if !valid {
return nil, ErrNotObject
}
obj := new(Object)
obj.valid = valid
m := make(map[string]*Value)
if valid {
for key, element := range v.data.(map[string]interface{}) {
m[key] = &Value{element, true}
obj := new(Object)
obj.valid = valid
m := make(map[string]*Value)
if valid {
for key, element := range v.data.(map[string]interface{}) {
m[key] = &Value{element, true}
}
}
obj.data = v.data
obj.m = m
return obj, nil
}
obj.data = v.data
obj.m = m
return obj, nil
return nil, ErrNotObject
}
// Attempts to typecast the current value into an object arrau.
@@ -676,19 +678,23 @@ func (v *Value) ObjectArray() ([]*Object, error) {
// Unsure if this is a good way to use slices, it's probably not
var slice []*Object
if !valid {
return nil, ErrNotObjectArray
}
for _, element := range v.data.([]interface{}) {
childValue := Value{element, true}
childObject, err := childValue.Object()
if valid {
if err != nil {
return nil, ErrNotObjectArray
for _, element := range v.data.([]interface{}) {
childValue := Value{element, true}
childObject, err := childValue.Object()
if err != nil {
return nil, ErrNotObjectArray
}
slice = append(slice, childObject)
}
slice = append(slice, childObject)
return slice, nil
}
return slice, nil
return nil, ErrNotObjectArray
}
// Attempts to typecast the current value into a string.