Equals -> Equal

Author: pascallouisperez

tools/wstest.go

@@ -212,7 +212,7 @@ var stepFuncs = map[*regexp.Regexp]func(*runner, []string, interface{}) error{
 			actual, err := ws.Get(key)
 			if err != nil {
 				return err
-			} else if !value.Equals(actual) {
+			} else if !value.Equal(actual) {
 				return fmt.Errorf("%s.%s expected %s, actual %s", varname, key, value, actual)
 			}
 		}

values.go

@@ -24,8 +24,8 @@ type Value interface {
 	// Type returns this value's type.
 	Type() Type
 
-	// Equals returns a comparison on this value against that value.
-	Equals(that Value) bool
+	// Equal returns a comparison on this value against that value.
+	Equal(that Value) bool
 
 	// String returns a string representation of the value.
 	String() string
@@ -68,7 +68,7 @@ func (value *tUndefined) Type() Type {
 	return &tUndefinedType{}
 }
 
-func (value *tUndefined) Equals(that Value) bool {
+func (value *tUndefined) Equal(that Value) bool {
 	_, ok := that.(*tUndefined)
 	return ok
 }
@@ -81,7 +81,7 @@ func (value *tNumber) Type() Type {
 	return value.typ
 }
 
-func (value *tNumber) Equals(that Value) bool {
+func (value *tNumber) Equal(that Value) bool {
 	typed, ok := that.(*tNumber)
 	if !ok {
 		return false
@@ -136,7 +136,7 @@ func (value *tText) String() string {
 	return strconv.Quote(value.value)
 }
 
-func (value *tText) Equals(that Value) bool {
+func (value *tText) Equal(that Value) bool {
 	typed, ok := that.(*tText)
 	if !ok {
 		return false
@@ -152,7 +152,7 @@ func (value *tBool) Type() Type {
 	return &tBoolType{}
 }
 
-func (value *tBool) Equals(that Value) bool {
+func (value *tBool) Equal(that Value) bool {
 	typed, ok := that.(*tBool)
 	if !ok {
 		return false

values_test.go

@@ -36,7 +36,7 @@ func (s *Zuite) TestValueString() {
 	}
 }
 
-func (s *Zuite) TestValueEquals() {
+func (s *Zuite) TestValueEqual() {
 	// a.k.a. congruence classes
 	buckets := [][]Value{
 		{
@@ -78,7 +78,7 @@ func (s *Zuite) TestValueEquals() {
 			for j = i + 1; j < len(bucket); j++ {
 				this := bucket[i]
 				that := bucket[j]
-				assert.True(s.T(), this.Equals(that), "%s == %s", this, that)
+				assert.True(s.T(), this.Equal(that), "%s == %s", this, that)
 			}
 		}
 	}
@@ -90,7 +90,7 @@ func (s *Zuite) TestValueEquals() {
 			thatBucket := buckets[j]
 			for _, this := range thisBucket {
 				for _, that := range thatBucket {
-					assert.True(s.T(), !this.Equals(that), "%s != %s", this, that)
+					assert.True(s.T(), !this.Equal(that), "%s != %s", this, that)
 				}
 			}
 		}

worksheets.go

@@ -264,7 +264,7 @@ func (ws *Worksheet) diff() map[int]Value {
 			diff[index] = &tUndefined{}
 		} else if !hasOrig && hasData {
 			diff[index] = data
-		} else if !orig.Equals(data) {
+		} else if !orig.Equal(data) {
 			diff[index] = data
 		}
 	}