[*] refactor: Reduce complexity a little bit

Andrew-M-C · Andrew-M-C · commit 285843705511 · 2024-09-28T22:30:38.000+08:00
diff --git a/conv.go b/conv.go
@@ -134,62 +134,19 @@ func escapeStringToBuff(s string, buf buffer.Buffer, opt *Opt) {
 }
 
 func anyToInt(v any) (u int, err error) {
-	switch v := v.(type) {
-	case int:
-		u = v
-	case uint:
-		u = int(v)
-	case int64:
-		u = int(v)
-	case uint64:
-		u = int(v)
-	case int32:
-		u = int(v)
-	case uint32:
-		u = int(v)
-	case int16:
-		u = int(v)
-	case uint16:
-		u = int(v)
-	case int8:
-		u = int(v)
-	case uint8:
-		u = int(v)
+	if v == nil {
+		return 0, fmt.Errorf("%w: parameter is nil", ErrParameterError)
+	}
+	value := reflect.ValueOf(v)
+	switch value.Kind() {
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		return int(value.Int()), nil
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
+		return int(value.Uint()), nil
 	default:
-		err = fmt.Errorf("%s is not a number", reflect.TypeOf(v).String())
+		return 0, fmt.Errorf("%v is not a number", reflect.TypeOf(v))
 	}
-
-	return
-}
-
-// func anyToInt64(v any) (i int64, err error) {
-// 	switch v.(type) {
-// 	case int:
-// 		i = int64(v.(int))
-// 	case uint:
-// 		i = int64(v.(uint))
-// 	case int64:
-// 		i = int64(v.(int64))
-// 	case uint64:
-// 		i = int64(v.(uint64))
-// 	case int32:
-// 		i = int64(v.(int32))
-// 	case uint32:
-// 		i = int64(v.(uint32))
-// 	case int16:
-// 		i = int64(v.(int16))
-// 	case uint16:
-// 		i = int64(v.(uint16))
-// 	case int8:
-// 		i = int64(v.(int8))
-// 	case uint8:
-// 		i = int64(v.(uint8))
-// 	default:
-// 		err = fmt.Errorf("%s is not a number", reflect.TypeOf(v).String())
-// 	}
-
-// 	return
-// }
+}
 
 func anyToString(v any) (s string, err error) {
 	if v == nil {
diff --git a/get.go b/get.go
@@ -96,33 +96,40 @@ func getFromObjectChildren(v *V, caseless bool, key string) (child *V, exist boo
 }
 
 func getInCurrentValue(v *V, caseless bool, param any) (*V, error) {
-	if v.valueType == Array {
-		// integer expected
-		pos, err := anyToInt(param)
-		if err != nil {
-			return &V{}, err
-		}
-		child, ok := childAtIndex(v, pos)
-		if !ok {
-			return &V{}, ErrOutOfRange
-		}
-		return child, nil
+	switch v.valueType {
+	case Array:
+		return getInCurrentArray(v, param)
+	case Object:
+		return getInCurrentObject(v, caseless, param)
+	default:
+		return &V{}, fmt.Errorf("%v type does not supports Get()", v.valueType)
+	}
+}
 
-	} else if v.valueType == Object {
-		// string expected
-		key, err := anyToString(param)
-		if err != nil {
-			return &V{}, err
-		}
-		child, exist := getFromObjectChildren(v, caseless, key)
-		if !exist {
-			return &V{}, ErrNotFound
-		}
-		return child, nil
+func getInCurrentArray(v *V, param any) (*V, error) {
+	// integer expected
+	pos, err := anyToInt(param)
+	if err != nil {
+		return &V{}, err
+	}
+	child, ok := childAtIndex(v, pos)
+	if !ok {
+		return &V{}, ErrOutOfRange
+	}
+	return child, nil
+}
 
-	} else {
-		return &V{}, fmt.Errorf("%v type does not supports Get()", v.valueType)
+func getInCurrentObject(v *V, caseless bool, param any) (*V, error) {
+	// string expected
+	key, err := anyToString(param)
+	if err != nil {
+		return &V{}, err
+	}
+	child, exist := getFromObjectChildren(v, caseless, key)
+	if !exist {
+		return &V{}, ErrNotFound
 	}
+	return child, nil
 }
 
 // GetBytes is similar with v, err := Get(...); v.Bytes(). But if error occurs or Base64 decode error, returns error.
diff --git a/insert_append_delete.go b/insert_append_delete.go
@@ -587,36 +587,41 @@ func (v *V) delete(caseless bool, firstParam any, otherParams ...any) error {
 }
 
 func deleteInCurrentValue(v *V, caseless bool, param any) error {
-	if v.valueType == Object {
-		// string expected
-		key, err := anyToString(param)
-		if err != nil {
-			return err
-		}
-
-		if exist := delFromObjectChildren(v, caseless, key); !exist {
-			return ErrNotFound
-		}
-		return nil
+	switch v.valueType {
+	case Object:
+		return deleteInCurrentObject(v, caseless, param)
+	case Array:
+		return deleteInCurrentArray(v, param)
+	default:
+		// else, this is an object value
+		return fmt.Errorf("%v type does not supports Delete()", v.valueType)
 	}
+}
 
-	if v.valueType == Array {
-		// integer expected
-		pos, err := anyToInt(param)
-		if err != nil {
-			return err
-		}
-
-		pos = posAtIndexForRead(v, pos)
-		if pos < 0 {
-			return ErrOutOfRange
-		}
-		deleteInArr(v, pos)
-		return nil
+func deleteInCurrentObject(v *V, caseless bool, param any) error {
+	// string expected
+	key, err := anyToString(param)
+	if err != nil {
+		return err
 	}
+	if exist := delFromObjectChildren(v, caseless, key); !exist {
+		return ErrNotFound
+	}
+	return nil
+}
 
-	// else, this is an object value
-	return fmt.Errorf("%v type does not supports Delete()", v.valueType)
+func deleteInCurrentArray(v *V, param any) error {
+	// integer expected
+	pos, err := anyToInt(param)
+	if err != nil {
+		return err
+	}
+	pos = posAtIndexForRead(v, pos)
+	if pos < 0 {
+		return ErrOutOfRange
+	}
+	deleteInArr(v, pos)
+	return nil
 }
 
 func deleteInArr(v *V, pos int) {
diff --git a/marshal_test.go b/marshal_test.go
@@ -464,12 +464,12 @@ func testMarshalIndent(t *testing.T) {
 		bJS, _ := json.MarshalIndent(m, "", "  ")
 
 		so(string(b), eq, string(bJS))
-		t.Logf(string(b))
+		t.Log(string(b))
 
 		b = v.MustMarshal(OptIndent("+", "  "))
 		bJS, _ = json.MarshalIndent(m, "+", "  ")
 		so(string(b), eq, string(bJS))
-		t.Logf(string(b))
+		t.Log(string(b))
 	})
 
 	cv("array", func() {
@@ -485,12 +485,12 @@ func testMarshalIndent(t *testing.T) {
 		bJS, _ := json.MarshalIndent(m, "", "  ")
 
 		so(string(b), eq, string(bJS))
-		t.Logf(string(b))
+		t.Log(string(b))
 
 		b = v.MustMarshal(OptIndent("+", "  "))
 		bJS, _ = json.MarshalIndent(m, "+", "  ")
 		so(string(b), eq, string(bJS))
-		t.Logf(string(b))
+		t.Log(string(b))
 	})
 
 	cv("multiple indents", func() {
@@ -525,7 +525,7 @@ func testMarshalIndent(t *testing.T) {
 		bJS, _ := json.MarshalIndent(data, "", "  ")
 
 		so(string(b), eq, string(bJS))
-		t.Logf(string(b))
+		t.Log(string(b))
 	})
 
 	cv("empty indent", func() {
@@ -538,7 +538,7 @@ func testMarshalIndent(t *testing.T) {
 		bJS, _ := json.MarshalIndent(m, "", "")
 
 		so(string(b), eq, string(bJS))
-		t.Logf(string(b))
+		t.Log(string(b))
 	})
 }
 
diff --git a/unmarshal_iter_test.go b/unmarshal_iter_test.go
@@ -53,8 +53,8 @@ func testIterAssignWideRune(t *testing.T) {
 
 func testIterChrSearching(t *testing.T) {
 	raw := []byte("   {  [ {  } ]  }  ")
-	t.Logf("")
-	t.Logf(string(raw))
+	t.Log("")
+	t.Log(string(raw))
 	t.Logf("01234567890123456789")
 
 	it := iter(raw)
@@ -93,7 +93,7 @@ func testIterParseNumber(t *testing.T) {
 		v, end, reachEnd, err := it.parseNumber(globalPool{}, 0)
 		t.Logf("i64 = %v, u64 = %v, f64 = %v", v.num.i64, v.num.u64, v.num.f64)
 		t.Logf("end = %d, reachEnd = %v", end, reachEnd)
-		t.Logf(string(b[:end]))
+		t.Log(string(b[:end]))
 		so(err, isNil)
 		so(v.num.f64, eq, -12345.6789)
 		so(reachEnd, isTrue)
@@ -108,7 +108,7 @@ func testIterParseNumber(t *testing.T) {
 		so(reachEnd, isFalse)
 		t.Logf("i64 = %v, u64 = %v, f64 = %v", v.num.i64, v.num.u64, v.num.f64)
 		t.Logf("end = %d, reachEnd = %v", end, reachEnd)
-		t.Logf(string(b[:end]))
+		t.Log(string(b[:end]))
 	})
 }
 
