From 4b0735826d550afbc99033919966f2fab48f5a57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw=20Barzowski?= <sbarzowski@google.com>
Date: Mon, 9 Oct 2017 14:01:34 -0400
Subject: [PATCH] Rename valueSimpleObjectField -> simpleObjectField

A field on it's own is not a value
---
 builtins.go    |  4 ++--
 interpreter.go | 10 +++++-----
 value.go       | 12 +++++-------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/builtins.go b/builtins.go
index c5c6440..a44b2c8 100644
--- a/builtins.go
+++ b/builtins.go
@@ -556,7 +556,7 @@ func builtinUglyObjectFlatMerge(e *evaluator, objarrp potentialValue) (value, er
 	if len(objarr.elements) == 0 {
 		return &valueSimpleObject{}, nil
 	}
-	newFields := make(valueSimpleObjectFieldMap)
+	newFields := make(simpleObjectFieldMap)
 	for _, elem := range objarr.elements {
 		obj, err := e.evaluateObject(elem)
 		if err != nil {
@@ -568,7 +568,7 @@ func builtinUglyObjectFlatMerge(e *evaluator, objarrp potentialValue) (value, er
 			if _, alreadyExists := newFields[fieldName]; alreadyExists {
 				return nil, e.Error(duplicateFieldNameErrMsg(fieldName))
 			}
-			newFields[fieldName] = valueSimpleObjectField{
+			newFields[fieldName] = simpleObjectField{
 				hide: fieldVal.hide,
 				field: &bindingsUnboundField{
 					inner:    fieldVal.field,
diff --git a/interpreter.go b/interpreter.go
index 68c9261..7399153 100644
--- a/interpreter.go
+++ b/interpreter.go
@@ -305,7 +305,7 @@ func (i *interpreter) evaluate(a ast.Node) (value, error) {
 
 	case *ast.DesugaredObject:
 		// Evaluate all the field names.  Check for null, dups, etc.
-		fields := make(valueSimpleObjectFieldMap)
+		fields := make(simpleObjectFieldMap)
 		for _, field := range ast.Fields {
 			fieldNameValue, err := e.evalInCurrentContext(field.Name)
 			if err != nil {
@@ -329,7 +329,7 @@ func (i *interpreter) evaluate(a ast.Node) (value, error) {
 			if field.PlusSuper {
 				f = &PlusSuperUnboundField{f}
 			}
-			fields[fieldName] = valueSimpleObjectField{field.Hide, f}
+			fields[fieldName] = simpleObjectField{field.Hide, f}
 		}
 		var asserts []unboundField
 		for _, assert := range ast.Asserts {
@@ -734,7 +734,7 @@ func buildStdObject(i *interpreter) (valueObject, error) {
 	}
 
 	for name, value := range builtinFields {
-		obj.fields[name] = valueSimpleObjectField{ast.ObjectFieldHidden, value}
+		obj.fields[name] = simpleObjectField{ast.ObjectFieldHidden, value}
 	}
 	return obj, nil
 }
@@ -774,9 +774,9 @@ func prepareExtVars(i *interpreter, ext vmExtMap) map[ast.Identifier]potentialVa
 }
 
 func buildObject(hide ast.ObjectFieldHide, fields map[string]value) valueObject {
-	fieldMap := valueSimpleObjectFieldMap{}
+	fieldMap := simpleObjectFieldMap{}
 	for name, v := range fields {
-		fieldMap[name] = valueSimpleObjectField{hide, &readyValue{v}}
+		fieldMap[name] = simpleObjectField{hide, &readyValue{v}}
 	}
 	return makeValueSimpleObject(bindingFrame{}, fieldMap, nil)
 }
diff --git a/value.go b/value.go
index 9fa2a70..0aa37b5 100644
--- a/value.go
+++ b/value.go
@@ -453,7 +453,7 @@ func (obj *valueObjectBase) getAssertionsCheckResult() error {
 type valueSimpleObject struct {
 	valueObjectBase
 	upValues bindingFrame
-	fields   valueSimpleObjectFieldMap
+	fields   simpleObjectFieldMap
 	asserts  []unboundField
 }
 
@@ -501,7 +501,7 @@ func (*valueSimpleObject) inheritanceSize() int {
 	return 1
 }
 
-func makeValueSimpleObject(b bindingFrame, fields valueSimpleObjectFieldMap, asserts []unboundField) *valueSimpleObject {
+func makeValueSimpleObject(b bindingFrame, fields simpleObjectFieldMap, asserts []unboundField) *valueSimpleObject {
 	return &valueSimpleObject{
 		upValues: b,
 		fields:   fields,
@@ -509,11 +509,9 @@ func makeValueSimpleObject(b bindingFrame, fields valueSimpleObjectFieldMap, ass
 	}
 }
 
-type valueSimpleObjectFieldMap map[string]valueSimpleObjectField
+type simpleObjectFieldMap map[string]simpleObjectField
 
-// TODO(sbarzowski) this is not a value and the name suggests it is...
-// TODO(sbarzowski) better name? This is basically just a (hide, field) pair.
-type valueSimpleObjectField struct {
+type simpleObjectField struct {
 	hide  ast.ObjectFieldHide
 	field unboundField
 }
@@ -566,7 +564,7 @@ func makeValueExtendedObject(left, right valueObject) *valueExtendedObject {
 // findField returns a field in object curr, with superDepth at least minSuperDepth
 // It also returns an associated bindingFrame and actual superDepth that the field
 // was found at.
-func findField(curr value, minSuperDepth int, f string) (*valueSimpleObjectField, bindingFrame, int) {
+func findField(curr value, minSuperDepth int, f string) (*simpleObjectField, bindingFrame, int) {
 	switch curr := curr.(type) {
 	case *valueExtendedObject:
 		if curr.right.inheritanceSize() > minSuperDepth {