Clean up

Author: jpbetz

fieldpath/fromvalue.go

@@ -27,7 +27,7 @@ func SetFromValue(v value.Value) *Set {
 	w := objectWalker{
 		path:      Path{},
 		value:     v,
-		allocator: value.NewValueFreelist(),
+		allocator: value.NewFreelistAllocator(),
 		do:        func(p Path) { s.Insert(p) },
 	}
 
@@ -38,7 +38,7 @@ func SetFromValue(v value.Value) *Set {
 type objectWalker struct {
 	path      Path
 	value     value.Value
-	allocator *value.ValueFreelist
+	allocator value.Allocator
 
 	do func(Path)
 }

typed/helpers.go

@@ -225,7 +225,7 @@ func setItemToPathElement(list *schema.List, index int, child value.Value) (fiel
 	}
 }
 
-func listItemToPathElement(a *value.ValueFreelist, list *schema.List, index int, child value.Value) (fieldpath.PathElement, error) {
+func listItemToPathElement(a value.Allocator, list *schema.List, index int, child value.Value) (fieldpath.PathElement, error) {
 	if list.ElementRelationship == schema.Associative {
 		if len(list.Keys) > 0 {
 			return keyedAssociativeListItemToPathElement(a, list, index, child)

typed/merge.go

@@ -49,7 +49,7 @@ type mergingWalker struct {
 	// Allocate only as many walkers as needed for the depth by storing them here.
 	spareWalkers *[]*mergingWalker
 
-	allocator *value.ValueFreelist
+	allocator value.Allocator
 }
 
 // merge rules examine w.lhs and w.rhs (up to one of which may be nil) and

typed/remove.go

@@ -24,15 +24,15 @@ type removingWalker struct {
 	out      interface{}
 	schema   *schema.Schema
 	toRemove *fieldpath.Set
-	allocator *value.ValueFreelist
+	allocator value.Allocator
 }
 
 func removeItemsWithSchema(val value.Value, toRemove *fieldpath.Set, schema *schema.Schema, typeRef schema.TypeRef) value.Value {
 	w := &removingWalker{
 		value:    val,
 		schema:   schema,
 		toRemove: toRemove,
-		allocator: value.NewValueFreelist(),
+		allocator: value.NewFreelistAllocator(),
 	}
 	resolveSchema(schema, typeRef, val, w)
 	return value.NewValueInterface(w.out)

typed/tofieldset.go

@@ -34,7 +34,7 @@ func (tv TypedValue) toFieldSetWalker() *toFieldSetWalker {
 	v.schema = tv.schema
 	v.typeRef = tv.typeRef
 	v.set = &fieldpath.Set{}
-	v.allocator = value.NewValueFreelist()
+	v.allocator = value.NewFreelistAllocator()
 	return v
 }
 
@@ -56,7 +56,7 @@ type toFieldSetWalker struct {
 
 	// Allocate only as many walkers as needed for the depth by storing them here.
 	spareWalkers *[]*toFieldSetWalker
-	allocator *value.ValueFreelist
+	allocator value.Allocator
 }
 
 func (v *toFieldSetWalker) prepareDescent(pe fieldpath.PathElement, tr schema.TypeRef) *toFieldSetWalker {

typed/typed.go

@@ -239,7 +239,7 @@ func merge(lhs, rhs *TypedValue, rule, postRule mergeRule) (*TypedValue, error)
 	mw.rule = rule
 	mw.postItemHook = postRule
 	if mw.allocator == nil {
-		mw.allocator = value.NewValueFreelist()
+		mw.allocator = value.NewFreelistAllocator()
 	}
 
 	errs := mw.merge(nil)

typed/validate.go

@@ -34,7 +34,7 @@ func (tv TypedValue) walker() *validatingObjectWalker {
 	v.schema = tv.schema
 	v.typeRef = tv.typeRef
 	if v.allocator == nil {
-		v.allocator = value.NewValueFreelist()
+		v.allocator = value.NewFreelistAllocator()
 	}
 	return v
 }
@@ -52,7 +52,7 @@ type validatingObjectWalker struct {
 
 	// Allocate only as many walkers as needed for the depth by storing them here.
 	spareWalkers *[]*validatingObjectWalker
-	allocator    *value.ValueFreelist
+	allocator    value.Allocator
 }
 
 func (v *validatingObjectWalker) prepareDescent(tr schema.TypeRef) *validatingObjectWalker {

value/list.go

@@ -41,7 +41,7 @@ type ListRange interface {
 	// Item returns the index and value of the current item in the range. or panics if there is no current item.
 	// For efficiency, Item may reuse the values returned by previous Item calls. Callers should be careful avoid holding
 	// pointers to the value returned by Item() that escape the iteration loop since they become invalid once either
-	// Item() or Recycle() is called.
+	// Item() or Allocator.Free() is called.
 	Item() (index int, value Value)
 }
 
@@ -57,15 +57,13 @@ func (_ *emptyRange) Item() (index int, value Value) {
 	panic("Item called on empty ListRange")
 }
 
-func (_ *emptyRange) Recycle() {}
-
 // ListEquals compares two lists lexically.
 // WARN: This is a naive implementation, calling lhs.Equals(rhs) is typically the most efficient.
 func ListEquals(lhs, rhs List) bool {
-	return listEqualsInto(defaultAllocator, lhs, rhs)
+	return ListEqualsInto(defaultAllocator, lhs, rhs)
 }
 
-func listEqualsInto(a Allocator, lhs, rhs List) bool {
+func ListEqualsInto(a Allocator, lhs, rhs List) bool {
 	if lhs.Length() != rhs.Length() {
 		return false
 	}
@@ -78,7 +76,7 @@ func listEqualsInto(a Allocator, lhs, rhs List) bool {
 	for lhsRange.Next() && rhsRange.Next() {
 		_, lv := lhsRange.Item()
 		_, rv := rhsRange.Item()
-		if !equalsInto(a, lv, rv) {
+		if !EqualsInto(a, lv, rv) {
 			return false
 		}
 	}
@@ -93,9 +91,9 @@ func ListLess(lhs, rhs List) bool {
 // ListCompare compares two lists lexically. The result will be 0 if l==rhs, -1
 // if l < rhs, and +1 if l > rhs.
 func ListCompare(lhs, rhs List) int {
-	return listCompareInto(defaultAllocator, lhs, rhs)
+	return ListCompareInto(defaultAllocator, lhs, rhs)
 }
-func listCompareInto(a Allocator, lhs, rhs List) int {
+func ListCompareInto(a Allocator, lhs, rhs List) int {
 	lhsRange := lhs.RangeInto(a)
 	defer a.Free(lhsRange)
 	rhsRange := rhs.RangeInto(a)
@@ -118,7 +116,7 @@ func listCompareInto(a Allocator, lhs, rhs List) int {
 		}
 		_, lv := lhsRange.Item()
 		_, rv := rhsRange.Item()
-		if c := compareInto(a, lv, rv); c != 0 {
+		if c := CompareInto(a, lv, rv); c != 0 {
 			return c
 		}
 		// The items are equal; continue.

value/listreflect.go

@@ -71,7 +71,7 @@ func (r listReflect) EqualsInto(a Allocator, other List) bool {
 	if otherReflectList, ok := other.(*listReflect); ok {
 		return reflect.DeepEqual(r.Value.Interface(), otherReflectList.Value.Interface())
 	}
-	return listEqualsInto(a, &r, other)
+	return ListEqualsInto(a, &r, other)
 }
 
 type listReflectRange struct {

value/listunstructured.go

@@ -35,7 +35,7 @@ func (l listUnstructured) Equals(other List) bool {
 }
 
 func (l listUnstructured) EqualsInto(a Allocator, other List) bool {
-	return listEqualsInto(a, &l, other)
+	return ListEqualsInto(a, &l, other)
 }
 
 func (l listUnstructured) Range() ListRange {