refactor bc_str2num

Author: SakiTakamachi

ext/bcmath/libbcmath/src/str2num.c

@@ -39,51 +39,71 @@ bool bc_str2num(bc_num *num, char *str, size_t scale)
 {
 	size_t digits = 0;
 	size_t strscale = 0;
-	char *ptr, *nptr;
-	size_t trailing_zeros = 0;
+	char *ptr, *nptr, *integer_ptr, *integer_end, *fractional_ptr = NULL, *fractional_end = NULL, *decimal_point;
 	bool zero_int = false;
+	size_t len = strlen(str);
+	sign num_sign = PLUS;
 
 	/* Prepare num. */
 	bc_free_num (num);
 
 	/* Check for valid number and count digits. */
 	ptr = str;
 
-	if ((*ptr == '+') || (*ptr == '-')) {
+	if (*ptr == '+') {
 		/* Skip Sign */
 		ptr++;
+	} else if (*ptr == '-') {
+		/* Skip Sign */
+		num_sign = MINUS;
+		ptr++;
 	}
+
 	/* Skip leading zeros. */
 	while (*ptr == '0') {
 		ptr++;
 	}
-	/* digits before the decimal point */
+	integer_ptr = ptr;
+
+	/* Count digits. */
 	while (*ptr >= '0' && *ptr <= '9') {
 		ptr++;
 		digits++;
 	}
 	/* decimal point */
-	if (*ptr == '.') {
-		ptr++;
+	decimal_point = (*ptr == '.') ? ptr : NULL;
+
+	/* If a string other than numbers exists */
+	if (!decimal_point && *ptr != '\0') {
+		goto fail;
 	}
-	/* digits after the decimal point */
-	while (*ptr >= '0' && *ptr <= '9') {
-		if (*ptr == '0') {
-			trailing_zeros++;
-		} else {
-			trailing_zeros = 0;
+
+	/* search and validate fractional end if exists */
+	if (decimal_point) {
+		/* search */
+		fractional_ptr = decimal_point + 1;
+		fractional_end = str + len - 1;
+		bool has_trailing_zero = false;
+		while (*fractional_end == '0' && fractional_end >= fractional_ptr) {
+			fractional_end--;
+			has_trailing_zero = true;
+		}
+		if (has_trailing_zero) {
+			fractional_end++;
 		}
-		ptr++;
-		strscale++;
-	}
 
-	if (trailing_zeros > 0) {
-		/* Trailing zeros should not take part in the computation of the overall scale, as it is pointless. */
-		strscale = strscale - trailing_zeros;
+		/* validate */
+		strscale = fractional_end - fractional_ptr;
+		if (strspn(fractional_ptr, "0123456789") < strscale) {
+			/* invalid num */
+			*num = bc_copy_num(BCG(_zero_));
+			return false;
+		}
 	}
-	if ((*ptr != '\0') || (digits + strscale == 0)) {
+
+	if (digits + strscale == 0) {
 		*num = bc_copy_num(BCG(_zero_));
-		return *ptr == '\0';
+		return true;
 	}
 
 	/* Adjust numbers and allocate storage and initialize fields. */
@@ -92,42 +112,39 @@ bool bc_str2num(bc_num *num, char *str, size_t scale)
 		zero_int = true;
 		digits = 1;
 	}
-	*num = bc_new_num (digits, strscale);
 
-	/* Build the whole number. */
-	ptr = str;
-	if (*ptr == '-') {
-		(*num)->n_sign = MINUS;
-		ptr++;
-	} else {
-		(*num)->n_sign = PLUS;
-		if (*ptr == '+') ptr++;
-	}
-	/* Skip leading zeros. */
-	while (*ptr == '0') {
-		ptr++;
-	}
+	*num = bc_new_num(digits, strscale);
+	(*num)->n_sign = num_sign;
 	nptr = (*num)->n_value;
-	if (zero_int) {
-		*nptr++ = 0;
-		digits = 0;
-	}
-	for (; digits > 0; digits--) {
-		*nptr++ = CH_VAL(*ptr++);
-	}
 
-	/* Build the fractional part. */
-	if (strscale > 0) {
-		/* skip the decimal point! */
-		ptr++;
-		for (; strscale > 0; strscale--) {
-			*nptr++ = CH_VAL(*ptr++);
+	if (zero_int) {
+		nptr++;
+		if (decimal_point) {
+			while (fractional_ptr <= fractional_end) {
+				*nptr = CH_VAL(*fractional_ptr);
+				nptr++;
+				fractional_ptr++;
+			}
+		}
+	} else {
+		integer_end = integer_ptr + digits - 1;
+		while (integer_ptr <= integer_end) {
+			*nptr = CH_VAL(*integer_ptr);
+			nptr++;
+			integer_ptr++;
+		}
+		if (decimal_point) {
+			while (fractional_ptr <= fractional_end) {
+				*nptr = CH_VAL(*fractional_ptr);
+				nptr++;
+				fractional_ptr++;
+			}
 		}
-	}
-
-	if (bc_is_zero(*num)) {
-		(*num)->n_sign = PLUS;
 	}
 
 	return true;
+
+fail:
+	*num = bc_copy_num(BCG(_zero_));
+	return false;
 }