pkstn: INCONVERTIBLE overhaul

1 files changed, 59 insertions, 58 deletions

diff --git a/pkstn.h b/pkstn.h
index d3131f7..7dbf495 100644
--- a/pkstn.h
+++ b/pkstn.h
@@ -14,53 +14,56 @@ enum PK_STN_RES {
 	PK_STN_RES_INCONVERTIBLE
 };
 
-enum PK_STN_RES pk_stn_int64_t(int64_t *i, char const *s, int base);
-enum PK_STN_RES pk_stn_uint64_t(uint64_t *i, char const *s, int base);
-enum PK_STN_RES pk_stn_int32_t(int32_t *i, char const *s, int base);
-enum PK_STN_RES pk_stn_uint32_t(uint32_t *i, char const *s, int base);
-enum PK_STN_RES pk_stn_int16_t(int16_t *i, char const *s, int base);
-enum PK_STN_RES pk_stn_uint16_t(uint16_t *i, char const *s, int base);
-enum PK_STN_RES pk_stn_int8_t(int8_t *i, char const *s, int base);
-enum PK_STN_RES pk_stn_uint8_t(uint8_t *i, char const *s, int base);
-enum PK_STN_RES pk_stn_float(float *f, char const *s);
-enum PK_STN_RES pk_stn_double(double *d, char const *s);
-enum PK_STN_RES pk_stn_float_e(float *f, char const *s, char **pEnd);
-enum PK_STN_RES pk_stn_double_e(double *d, char const *s, char **pEnd);
+enum PK_STN_RES pk_stn_int64_t(int64_t *i, char const *s, char **pEnd, int base);
+enum PK_STN_RES pk_stn_uint64_t(uint64_t *i, char const *s, char **pEnd, int base);
+enum PK_STN_RES pk_stn_int32_t(int32_t *i, char const *s, char **pEnd, int base);
+enum PK_STN_RES pk_stn_uint32_t(uint32_t *i, char const *s, char **pEnd, int base);
+enum PK_STN_RES pk_stn_int16_t(int16_t *i, char const *s, char **pEnd, int base);
+enum PK_STN_RES pk_stn_uint16_t(uint16_t *i, char const *s, char **pEnd, int base);
+enum PK_STN_RES pk_stn_int8_t(int8_t *i, char const *s, char **pEnd, int base);
+enum PK_STN_RES pk_stn_uint8_t(uint8_t *i, char const *s, char **pEnd, int base);
+enum PK_STN_RES pk_stn_float(float *f, char const *s, char **pEnd);
+enum PK_STN_RES pk_stn_double(double *d, char const *s, char **pEnd);
 
 #if defined(__cplusplus)
 
 template <typename T>
-enum PK_STN_RES pk_stn(T *n, char const *s, int base = 0)
+enum PK_STN_RES pk_stn(T *n, char const *s, char **pEnd, int base = 0)
 {
 	if constexpr(std::is_same<T, int64_t>::value) {
-		return pk_stn_int64_t(n, s, base);
+		return pk_stn_int64_t(n, s, pEnd, base);
 	}
 	if constexpr(std::is_same<T, uint64_t>::value) {
-		return pk_stn_uint64_t(n, s, base);
+		return pk_stn_uint64_t(n, s, pEnd, base);
 	}
 	if constexpr(std::is_same<T, int32_t>::value) {
-		return pk_stn_int32_t(n, s, base);
+		return pk_stn_int32_t(n, s, pEnd, base);
 	}
 	if constexpr(std::is_same<T, uint32_t>::value) {
-		return pk_stn_uint32_t(n, s, base);
+		return pk_stn_uint32_t(n, s, pEnd, base);
 	}
 	if constexpr(std::is_same<T, int16_t>::value) {
-		return pk_stn_int16_t(n, s, base);
+		return pk_stn_int16_t(n, s, pEnd, base);
 	}
 	if constexpr(std::is_same<T, uint16_t>::value) {
-		return pk_stn_uint16_t(n, s, base);
+		return pk_stn_uint16_t(n, s, pEnd, base);
 	}
 	if constexpr(std::is_same<T, int8_t>::value) {
-		return pk_stn_int8_t(n, s, base);
+		return pk_stn_int8_t(n, s, pEnd, base);
 	}
 	if constexpr(std::is_same<T, uint8_t>::value) {
-		return pk_stn_uint8_t(n, s, base);
+		return pk_stn_uint8_t(n, s, pEnd, base);
+	}
+	if constexpr(std::is_same<T, bool>::value) {
+		static_assert(sizeof(bool) == sizeof(uint8_t));
+		static_assert(alignof(bool) == alignof(uint8_t));
+		return pk_stn_uint8_t((uint8_t*)n, s, pEnd, base);
 	}
 	if constexpr(std::is_same<T, float>::value) {
-		return pk_stn_float(n, s);
+		return pk_stn_float(n, s, pEnd);
 	}
 	if constexpr(std::is_same<T, double>::value) {
-		return pk_stn_double(n, s);
+		return pk_stn_double(n, s, pEnd);
 	}
 	return (PK_STN_RES)-1;
 }
@@ -72,17 +75,18 @@ enum PK_STN_RES pk_stn(T *n, char const *s, int base = 0)
 #ifdef PK_IMPL_STN
 
 enum PK_STN_RES
-pk_stn_int64_t(int64_t *i, char const *s, int base)
+pk_stn_int64_t(int64_t *i, char const *s, char **pEnd, int base)
 {
 	char *end;
 	long long l;
 	errno = 0;
 	l = strtoll(s, &end, base);
+	if (pEnd != nullptr) *pEnd = end;
 	if (errno == ERANGE) {
 		if (l == LLONG_MAX) return PK_STN_RES_OVERFLOW;
 		return PK_STN_RES_UNDERFLOW;
 	}
-	if (*s == '\0' || *end != '\0') {
+	if (s == end) {
 		return PK_STN_RES_INCONVERTIBLE;
 	}
 	*i = l;
@@ -90,17 +94,18 @@ pk_stn_int64_t(int64_t *i, char const *s, int base)
 }
 
 enum PK_STN_RES
-pk_stn_uint64_t(uint64_t *i, char const *s, int base)
+pk_stn_uint64_t(uint64_t *i, char const *s, char **pEnd, int base)
 {
 	char *end;
 	unsigned long long l;
 	errno = 0;
 	l = strtoull(s, &end, base);
+	if (pEnd != nullptr) *pEnd = end;
 	if (errno == ERANGE) {
 		if (l == ULLONG_MAX) return PK_STN_RES_OVERFLOW;
 		return PK_STN_RES_UNDERFLOW;
 	}
-	if (*s == '\0' || *end != '\0') {
+	if (s == end) {
 		return PK_STN_RES_INCONVERTIBLE;
 	}
 	*i = l;
@@ -108,17 +113,18 @@ pk_stn_uint64_t(uint64_t *i, char const *s, int base)
 }
 
 enum PK_STN_RES
-pk_stn_int32_t(int32_t *i, char const *s, int base)
+pk_stn_int32_t(int32_t *i, char const *s, char **pEnd, int base)
 {
 	char *end;
 	long l;
 	errno = 0;
 	l = strtol(s, &end, base);
+	if (pEnd != nullptr) *pEnd = end;
 	if (errno == ERANGE) {
 		if (l == LONG_MAX) return PK_STN_RES_OVERFLOW;
 		return PK_STN_RES_UNDERFLOW;
 	}
-	if (*s == '\0' || *end != '\0') {
+	if (s == end) {
 		return PK_STN_RES_INCONVERTIBLE;
 	}
 	*i = l;
@@ -126,17 +132,18 @@ pk_stn_int32_t(int32_t *i, char const *s, int base)
 }
 
 enum PK_STN_RES
-pk_stn_uint32_t(uint32_t *i, char const *s, int base)
+pk_stn_uint32_t(uint32_t *i, char const *s, char **pEnd, int base)
 {
 	char *end;
 	unsigned long l;
 	errno = 0;
 	l = strtoul(s, &end, base);
+	if (pEnd != nullptr) *pEnd = end;
 	if (errno == ERANGE) {
 		if (l == ULONG_MAX) return PK_STN_RES_OVERFLOW;
 		return PK_STN_RES_UNDERFLOW;
 	}
-	if (*s == '\0' || *end != '\0') {
+	if (s == end) {
 		return PK_STN_RES_INCONVERTIBLE;
 	}
 	*i = l;
@@ -144,17 +151,18 @@ pk_stn_uint32_t(uint32_t *i, char const *s, int base)
 }
 
 enum PK_STN_RES
-pk_stn_int16_t(int16_t *i, char const *s, int base)
+pk_stn_int16_t(int16_t *i, char const *s, char **pEnd, int base)
 {
 	char *end;
 	long l;
 	errno = 0;
 	l = strtol(s, &end, base);
+	if (pEnd != nullptr) *pEnd = end;
 	if (errno == ERANGE) {
 		if (l == LONG_MAX) return PK_STN_RES_OVERFLOW;
 		return PK_STN_RES_UNDERFLOW;
 	}
-	if (*s == '\0' || *end != '\0') {
+	if (s == end) {
 		return PK_STN_RES_INCONVERTIBLE;
 	}
 	*i = l;
@@ -162,17 +170,18 @@ pk_stn_int16_t(int16_t *i, char const *s, int base)
 }
 
 enum PK_STN_RES
-pk_stn_uint16_t(uint16_t *i, char const *s, int base)
+pk_stn_uint16_t(uint16_t *i, char const *s, char **pEnd, int base)
 {
 	char *end;
 	unsigned long l;
 	errno = 0;
 	l = strtoul(s, &end, base);
+	if (pEnd != nullptr) *pEnd = end;
 	if (errno == ERANGE) {
 		if (l == ULONG_MAX) return PK_STN_RES_OVERFLOW;
 		return PK_STN_RES_UNDERFLOW;
 	}
-	if (*s == '\0' || *end != '\0') {
+	if (s == end) {
 		return PK_STN_RES_INCONVERTIBLE;
 	}
 	*i = l;
@@ -180,17 +189,18 @@ pk_stn_uint16_t(uint16_t *i, char const *s, int base)
 }
 
 enum PK_STN_RES
-pk_stn_int8_t(int8_t *i, char const *s, int base)
+pk_stn_int8_t(int8_t *i, char const *s, char **pEnd, int base)
 {
 	char *end;
 	long l;
 	errno = 0;
 	l = strtol(s, &end, base);
+	if (pEnd != nullptr) *pEnd = end;
 	if (errno == ERANGE) {
 		if (l == LONG_MAX) return PK_STN_RES_OVERFLOW;
 		return PK_STN_RES_UNDERFLOW;
 	}
-	if (*s == '\0' || *end != '\0') {
+	if (s == end) {
 		return PK_STN_RES_INCONVERTIBLE;
 	}
 	*i = l;
@@ -198,17 +208,18 @@ pk_stn_int8_t(int8_t *i, char const *s, int base)
 }
 
 enum PK_STN_RES
-pk_stn_uint8_t(uint8_t *i, char const *s, int base)
+pk_stn_uint8_t(uint8_t *i, char const *s, char **pEnd, int base)
 {
 	char *end;
 	unsigned long l;
 	errno = 0;
 	l = strtoul(s, &end, base);
+	if (pEnd != nullptr) *pEnd = end;
 	if (errno == ERANGE) {
 		if (l == ULONG_MAX) return PK_STN_RES_OVERFLOW;
 		return PK_STN_RES_UNDERFLOW;
 	}
-	if (*s == '\0' || *end != '\0') {
+	if (s == end) {
 		return PK_STN_RES_INCONVERTIBLE;
 	}
 	*i = l;
@@ -216,32 +227,20 @@ pk_stn_uint8_t(uint8_t *i, char const *s, int base)
 }
 
 enum PK_STN_RES
-pk_stn_float(float *f, char const *s)
-{
-	char *end;
-	return pk_stn_float_e(f, s, &end);
-}
-
-enum PK_STN_RES
-pk_stn_double(double *d, char const *s)
+pk_stn_float(float *f, char const *s, char **pEnd)
 {
 	char *end;
-	return pk_stn_double_e(d, s, &end);
-}
-
-enum PK_STN_RES
-pk_stn_float_e(float *f, char const *s, char **pEnd)
-{
 	float l;
 	errno = 0;
-	l = strtof(s, pEnd);
+	l = strtof(s, &end);
+	if (pEnd != nullptr) *pEnd = end;
 	if (errno == ERANGE && l == HUGE_VALF) {
 		return PK_STN_RES_OVERFLOW;
 	}
 	if (errno == ERANGE && l == -HUGE_VALF) {
 		return PK_STN_RES_UNDERFLOW;
 	}
-	if (*s == '\0' || &s == (const char **)pEnd) {
+	if (s == end) {
 		return PK_STN_RES_INCONVERTIBLE;
 	}
 	*f = l;
@@ -249,18 +248,20 @@ pk_stn_float_e(float *f, char const *s, char **pEnd)
 }
 
 enum PK_STN_RES
-pk_stn_double_e(double *d, char const *s, char **pEnd)
+pk_stn_double(double *d, char const *s, char **pEnd)
 {
+	char *end;
 	double l;
 	errno = 0;
-	l = strtod(s, pEnd);
+	l = strtod(s, &end);
+	if (pEnd != nullptr) *pEnd = end;
 	if (errno == ERANGE && l == HUGE_VAL) {
 		return PK_STN_RES_OVERFLOW;
 	}
 	if (errno == ERANGE && l == -HUGE_VAL) {
 		return PK_STN_RES_UNDERFLOW;
 	}
-	if (*s == '\0' || &s == (const char **)pEnd) {
+	if (s == end) {
 		return PK_STN_RES_INCONVERTIBLE;
 	}
 	*d = l;