refactor

AsaiYusuke · Dec 31, 2020 · cb4bb10 · cb4bb10
1 parent b7f562e
commit cb4bb10
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 32 deletions.
diff --git a/syntax_basic_comparator_any_value.go b/syntax_basic_comparator_any_value.go
@@ -5,11 +5,12 @@ import "encoding/json"
 type syntaxBasicAnyValueComparator struct {
 }
 
-func (c *syntaxBasicAnyValueComparator) typeCast(value interface{}) (interface{}, bool) {
-	if number, ok := value.(json.Number); ok {
-		if floatNumber, err := number.Float64(); err == nil {
-			return floatNumber, true
+func (c *syntaxBasicAnyValueComparator) typeCast(values map[int]interface{}) {
+	for index := range values {
+		if number, ok := values[index].(json.Number); ok {
+			if floatNumber, err := number.Float64(); err == nil {
+				values[index] = floatNumber
+			}
 		}
 	}
-	return value, true
 }
diff --git a/syntax_basic_comparator_numeric.go b/syntax_basic_comparator_numeric.go
@@ -5,15 +5,18 @@ import "encoding/json"
 type syntaxBasicNumericComparator struct {
 }
 
-func (c *syntaxBasicNumericComparator) typeCast(value interface{}) (interface{}, bool) {
-	switch value.(type) {
-	case float64:
-		return value, true
-	case json.Number:
-		number := value.(json.Number)
-		if floatNumber, err := number.Float64(); err == nil {
-			return floatNumber, true
+func (c *syntaxBasicNumericComparator) typeCast(values map[int]interface{}) {
+	for index, value := range values {
+		switch value.(type) {
+		case float64:
+			continue
+		case json.Number:
+			number := value.(json.Number)
+			if floatNumber, err := number.Float64(); err == nil {
+				values[index] = floatNumber
+			}
+		default:
+			delete(values, index)
 		}
 	}
-	return 0, false
 }
diff --git a/syntax_basic_comparator_string.go b/syntax_basic_comparator_string.go
@@ -3,7 +3,10 @@ package jsonpath
 type syntaxBasicStringComparator struct {
 }
 
-func (c *syntaxBasicStringComparator) typeCast(value interface{}) (interface{}, bool) {
-	_, ok := value.(string)
-	return value, ok
+func (c *syntaxBasicStringComparator) typeCast(values map[int]interface{}) {
+	for index := range values {
+		if _, ok := values[index].(string); !ok {
+			delete(values, index)
+		}
+	}
 }
diff --git a/syntax_basic_compare_query.go b/syntax_basic_compare_query.go
@@ -10,22 +10,10 @@ func (q *syntaxBasicCompareQuery) compute(
 	root interface{}, currentMap map[int]interface{}) map[int]interface{} {
 
 	leftValues := q.leftParam.get(root, currentMap)
-	for index := range leftValues {
-		if cast, ok := q.comparator.typeCast(leftValues[index]); ok {
-			leftValues[index] = cast
-		} else {
-			delete(leftValues, index)
-		}
-	}
+	q.comparator.typeCast(leftValues)
 
 	rightValues := q.rightParam.get(root, currentMap)
-	for index := range rightValues {
-		if cast, ok := q.comparator.typeCast(rightValues[index]); ok {
-			rightValues[index] = cast
-		} else {
-			delete(rightValues, index)
-		}
-	}
+	q.comparator.typeCast(rightValues)
 
 	for leftIndex := range leftValues {
 		for rightIndex := range rightValues {

diff --git a/syntax_if_comparator.go b/syntax_if_comparator.go
@@ -2,5 +2,5 @@ package jsonpath
 
 type syntaxComparator interface {
 	comparator(left, right interface{}) bool
-	typeCast(value interface{}) (interface{}, bool)
+	typeCast(values map[int]interface{})
 }