From 326768484a8884767b50fbdf5472eff236ce316c Mon Sep 17 00:00:00 2001
From: Iztok Jeras <iztok.jeras@redpitaya.com>
Date: ćšć, 08 10æ 2015 03:00:34 +0800
Subject: [PATCH] integer parser: renamed some more static functions, to add Base or Sign keyword
---
libscpi/src/parser.c | 24 +++---
libscpi/test/test_scpi_utils.c | 170 ++++++++++++++++++++++++++++--------------
libscpi/src/utils_private.h | 8 +-
libscpi/src/utils.c | 30 ++++++
4 files changed, 155 insertions(+), 77 deletions(-)
diff --git a/libscpi/src/parser.c b/libscpi/src/parser.c
index ffd8de1..cac80ec 100644
--- a/libscpi/src/parser.c
+++ b/libscpi/src/parser.c
@@ -591,7 +591,7 @@
* @param sign
* @return TRUE if succesful
*/
-static scpi_bool_t ParamToInt32(scpi_t * context, scpi_parameter_t * parameter, int32_t * value, scpi_bool_t sign) {
+static scpi_bool_t ParamSignToUInt32(scpi_t * context, scpi_parameter_t * parameter, uint32_t * value, scpi_bool_t sign) {
if (!value) {
SCPI_ErrorPush(context, SCPI_ERROR_SYSTEM_ERROR);
@@ -600,17 +600,17 @@
switch (parameter->type) {
case SCPI_TOKEN_HEXNUM:
- return strToUInt32(parameter->ptr, (uint32_t *)value, 16) > 0 ? TRUE : FALSE;
+ return strBaseToUInt32(parameter->ptr, value, 16) > 0 ? TRUE : FALSE;
case SCPI_TOKEN_OCTNUM:
- return strToUInt32(parameter->ptr, (uint32_t *)value, 8) > 0 ? TRUE : FALSE;
+ return strBaseToUInt32(parameter->ptr, value, 8) > 0 ? TRUE : FALSE;
case SCPI_TOKEN_BINNUM:
- return strToUInt32(parameter->ptr, (uint32_t *)value, 2) > 0 ? TRUE : FALSE;
+ return strBaseToUInt32(parameter->ptr, value, 2) > 0 ? TRUE : FALSE;
case SCPI_TOKEN_DECIMAL_NUMERIC_PROGRAM_DATA:
case SCPI_TOKEN_DECIMAL_NUMERIC_PROGRAM_DATA_WITH_SUFFIX:
if (sign) {
- return strToInt32(parameter->ptr, value, 10) > 0 ? TRUE : FALSE;
+ return strBaseToInt32(parameter->ptr, (uint32_t *)value, 10) > 0 ? TRUE : FALSE;
} else {
- return strToUInt32(parameter->ptr, (uint32_t *)value, 10) > 0 ? TRUE : FALSE;
+ return strBaseToUInt32(parameter->ptr, value, 10) > 0 ? TRUE : FALSE;
}
default:
return FALSE;
@@ -625,7 +625,7 @@
* @return TRUE if succesful
*/
scpi_bool_t SCPI_ParamToInt32(scpi_t * context, scpi_parameter_t * parameter, int32_t * value) {
- return ParamToInt32(context, parameter, value, TRUE);
+ return ParamSignToUInt32(context, parameter, (uint32_t *)value, TRUE);
}
/**
@@ -636,7 +636,7 @@
* @return TRUE if succesful
*/
scpi_bool_t SCPI_ParamToUInt32(scpi_t * context, scpi_parameter_t * parameter, uint32_t * value) {
- return ParamToInt32(context, parameter, (int32_t *)value, FALSE);
+ return ParamSignToUInt32(context, parameter, value, FALSE);
}
/**
@@ -712,7 +712,7 @@
* @param sign
* @return
*/
-static scpi_bool_t ParamInt32(scpi_t * context, int32_t * value, scpi_bool_t mandatory, scpi_bool_t sign) {
+static scpi_bool_t ParamSignUInt32(scpi_t * context, uint32_t * value, scpi_bool_t mandatory, scpi_bool_t sign) {
scpi_bool_t result;
scpi_parameter_t param;
@@ -724,7 +724,7 @@
result = SCPI_Parameter(context, ¶m, mandatory);
if (result) {
if (SCPI_ParamIsNumber(¶m, FALSE)) {
- result = ParamToInt32(context, ¶m, value, sign);
+ result = ParamSignToUInt32(context, ¶m, value, sign);
} else if (SCPI_ParamIsNumber(¶m, TRUE)) {
SCPI_ErrorPush(context, SCPI_ERROR_SUFFIX_NOT_ALLOWED);
result = FALSE;
@@ -744,7 +744,7 @@
* @return
*/
scpi_bool_t SCPI_ParamInt32(scpi_t * context, int32_t * value, scpi_bool_t mandatory) {
- return ParamInt32(context, value, mandatory, TRUE);
+ return ParamSignUInt32(context, (uint32_t *)value, mandatory, TRUE);
}
/**
@@ -755,7 +755,7 @@
* @return
*/
scpi_bool_t SCPI_ParamUInt32(scpi_t * context, uint32_t * value, scpi_bool_t mandatory) {
- return ParamInt32(context, (int32_t *)value, mandatory, FALSE);
+ return ParamSignUInt32(context, value, mandatory, FALSE);
}
/**
diff --git a/libscpi/src/utils.c b/libscpi/src/utils.c
index c17bb18..8856003 100644
--- a/libscpi/src/utils.c
+++ b/libscpi/src/utils.c
@@ -261,7 +261,7 @@
* @param val 32bit integer result
* @return number of bytes used in string
*/
-size_t strToInt32(const char * str, int32_t * val, int8_t base) {
+size_t strBaseToInt32(const char * str, int32_t * val, int8_t base) {
char * endptr;
*val = strtol(str, &endptr, base);
return endptr - str;
@@ -273,9 +273,33 @@
* @param val 32bit integer result
* @return number of bytes used in string
*/
-size_t strToUInt32(const char * str, uint32_t * val, int8_t base) {
+size_t strBaseToUInt32(const char * str, uint32_t * val, int8_t base) {
char * endptr;
*val = strtoul(str, &endptr, base);
+ return endptr - str;
+}
+
+/**
+ * Converts string to signed 64bit integer representation
+ * @param str string value
+ * @param val 64bit integer result
+ * @return number of bytes used in string
+ */
+size_t strBaseToInt64(const char * str, int64_t * val, int8_t base) {
+ char * endptr;
+ *val = strtol(str, &endptr, base);
+ return endptr - str;
+}
+
+/**
+ * Converts string to unsigned 64bit integer representation
+ * @param str string value
+ * @param val 64bit integer result
+ * @return number of bytes used in string
+ */
+size_t strBaseToUInt64(const char * str, uint64_t * val, int8_t base) {
+ char * endptr;
+ *val = strtoull(str, &endptr, base);
return endptr - str;
}
@@ -336,7 +360,7 @@
//*num = 1;
} else {
int32_t tmpNum;
- i = len1 + strToInt32(str2 + len1, &tmpNum, 10);
+ i = len1 + strBaseToInt32(str2 + len1, &tmpNum, 10);
if (i != len2) {
result = FALSE;
} else {
diff --git a/libscpi/src/utils_private.h b/libscpi/src/utils_private.h
index 22e78c6..51b38be 100644
--- a/libscpi/src/utils_private.h
+++ b/libscpi/src/utils_private.h
@@ -56,10 +56,10 @@
scpi_bool_t compareStrAndNum(const char * str1, size_t len1, const char * str2, size_t len2, int32_t * num) LOCAL;
size_t UInt32ToStrBaseSign(uint32_t val, char * str, size_t len, int8_t base, scpi_bool_t sign) LOCAL;
size_t UInt64ToStrBaseSign(uint64_t val, char * str, size_t len, int8_t base, scpi_bool_t sign) LOCAL;
- size_t strToInt32(const char * str, int32_t * val, int8_t base) LOCAL;
- size_t strToUInt32(const char * str, uint32_t * val, int8_t base) LOCAL;
- size_t strToInt64(const char * str, int64_t * val, int8_t base) LOCAL;
- size_t strToUInt64(const char * str, uint64_t * val, int8_t base) LOCAL;
+ size_t strBaseToInt32(const char * str, int32_t * val, int8_t base) LOCAL;
+ size_t strBaseToUInt32(const char * str, uint32_t * val, int8_t base) LOCAL;
+ size_t strBaseToInt64(const char * str, int64_t * val, int8_t base) LOCAL;
+ size_t strBaseToUInt64(const char * str, uint64_t * val, int8_t base) LOCAL;
size_t strToDouble(const char * str, double * val) LOCAL;
scpi_bool_t locateText(const char * str1, size_t len1, const char ** str2, size_t * len2) LOCAL;
scpi_bool_t locateStr(const char * str1, size_t len1, const char ** str2, size_t * len2) LOCAL;
diff --git a/libscpi/test/test_scpi_utils.c b/libscpi/test/test_scpi_utils.c
index 84b382b..1f1853a 100644
--- a/libscpi/test/test_scpi_utils.c
+++ b/libscpi/test/test_scpi_utils.c
@@ -72,12 +72,13 @@
static void test_Int32ToStr() {
const size_t max=32+1;
int32_t val[] = {0, 1, -1, INT32_MIN, INT32_MAX, 0x01234567, 0x89abcdef};
+ int N = sizeof(val) / sizeof(int32_t);
char str[max];
char ref[max];
size_t len;
// test signed conversion to decimal numbers
- for (uintptr_t i=0; i<7; i++) {
+ for (uintptr_t i=0; i<N; i++) {
len = SCPI_Int32ToStr(val[i], str, max);
snprintf(ref, max, "%"PRIi32, val[i]);
CU_ASSERT(len == strlen(ref));
@@ -88,12 +89,13 @@
static void test_UInt32ToStrBase() {
const size_t max=32+1;
uint32_t val[] = {0, 1, -1, INT32_MIN, INT32_MAX, 0x01234567, 0x89abcdef};
+ int N = sizeof(val) / sizeof(uint32_t);
char str[max];
char ref[max];
size_t len;
// test conversion to decimal numbers
- for (uintptr_t i=0; i<7; i++) {
+ for (uintptr_t i=0; i<N; i++) {
len = SCPI_UInt32ToStrBase(val[i], str, max, 10);
snprintf(ref, max, "%"PRIu32, val[i]);
CU_ASSERT(len == strlen(ref));
@@ -101,7 +103,7 @@
}
// test conversion to hexadecimal numbers
- for (uintptr_t i=0; i<7; i++) {
+ for (uintptr_t i=0; i<N; i++) {
len = SCPI_UInt32ToStrBase(val[i], str, max, 16);
snprintf(ref, max, "%"PRIX32, val[i]);
CU_ASSERT(len == strlen(ref));
@@ -109,7 +111,7 @@
}
// test conversion to octal numbers
- for (uintptr_t i=0; i<7; i++) {
+ for (uintptr_t i=0; i<N; i++) {
len = SCPI_UInt32ToStrBase(val[i], str, max, 8);
snprintf(ref, max, "%"PRIo32, val[i]);
CU_ASSERT(len == strlen(ref));
@@ -141,12 +143,13 @@
static void test_Int64ToStr() {
const size_t max=64+1;
int64_t val[] = {0, 1, -1, INT64_MIN, INT64_MAX, 0x0123456789abcdef, 0xfedcba9876543210};
+ int N = sizeof(val) / sizeof(int64_t);
char str[max];
char ref[max];
size_t len;
// test conversion to decimal numbers
- for (uintptr_t i=0; i<7; i++) {
+ for (uintptr_t i=0; i<N; i++) {
len = SCPI_Int64ToStr(val[i], str, max);
snprintf(ref, max, "%"PRIi64, val[i]);
CU_ASSERT(len == strlen(ref));
@@ -157,12 +160,13 @@
static void test_UInt64ToStrBase() {
const size_t max=64+1;
uint64_t val[] = {0, 1, -1, INT64_MIN, INT64_MAX, 0x0123456789abcdef, 0xfedcba9876543210};
+ int N = sizeof(val) / sizeof(uint64_t);
char str[max];
char ref[max];
size_t len;
// test conversion to decimal numbers
- for (uintptr_t i=0; i<7; i++) {
+ for (uintptr_t i=0; i<N; i++) {
len = SCPI_UInt64ToStrBase(val[i], str, max, 10);
snprintf(ref, max, "%"PRIu64, val[i]);
CU_ASSERT(len == strlen(ref));
@@ -170,7 +174,7 @@
}
// test conversion to hexadecimal numbers
- for (uintptr_t i=0; i<7; i++) {
+ for (uintptr_t i=0; i<N; i++) {
len = SCPI_UInt64ToStrBase(val[i], str, max, 16);
snprintf(ref, max, "%"PRIX64, val[i]);
CU_ASSERT(len == strlen(ref));
@@ -178,7 +182,7 @@
}
// test conversion to octal numbers
- for (uintptr_t i=0; i<7; i++) {
+ for (uintptr_t i=0; i<N; i++) {
len = SCPI_UInt64ToStrBase(val[i], str, max, 8);
snprintf(ref, max, "%"PRIo64, val[i]);
CU_ASSERT(len == strlen(ref));
@@ -208,75 +212,123 @@
}
static void test_doubleToStr() {
- size_t result;
- char str[50];
+ const size_t max=49+1;
+ double val[] = {1, -1, 1.1, -1.1, 1e3, 1e30, -1.3e30, -1.3e-30};
+ int N = sizeof(val) / sizeof(int);
+ char str[max];
+ char ref[max];
+ size_t len;
-#define TEST_DOUBLE_TO_STR(v, r, s) \
- do { \
- result = SCPI_DoubleToStr(v, str, sizeof(str)); \
- CU_ASSERT_EQUAL(result, r); \
- CU_ASSERT_STRING_EQUAL(str, s); \
- } while(0) \
-
-
- TEST_DOUBLE_TO_STR(1, 1, "1");
- TEST_DOUBLE_TO_STR(-1, 2, "-1");
- TEST_DOUBLE_TO_STR(1.1, 3, "1.1");
- TEST_DOUBLE_TO_STR(-1.1, 4, "-1.1");
- TEST_DOUBLE_TO_STR(1e3, 4, "1000");
- TEST_DOUBLE_TO_STR(1e30, 5, "1e+30");
- TEST_DOUBLE_TO_STR(-1.3e30, 8, "-1.3e+30");
- TEST_DOUBLE_TO_STR(-1.3e-30, 8, "-1.3e-30");
+ for (uintptr_t i=0; i<N; i++) {
+ len = SCPI_DoubleToStr(val[i], str, max);
+ snprintf(ref, max, "%g", val[i]);
+ CU_ASSERT(len == strlen(ref));
+ CU_ASSERT_STRING_EQUAL(str, ref);
+ }
}
-static void test_strToInt32() {
+static void test_strBaseToInt32() {
size_t result;
int32_t val;
-#define TEST_STR_TO_LONG(s, r, v, b) \
+#define TEST_STR_TO_INT32(s, r, v, b) \
do { \
- result = strToInt32(s, &val, b); \
+ result = strBaseToInt32(s, &val, b); \
CU_ASSERT_EQUAL(val, v); \
CU_ASSERT_EQUAL(result, r); \
} while(0) \
- TEST_STR_TO_LONG("", 0, 0, 10);
- TEST_STR_TO_LONG("1", 1, 1, 10);
- TEST_STR_TO_LONG("10", 2, 10, 10);
- TEST_STR_TO_LONG("-50", 3, -50, 10);
- TEST_STR_TO_LONG("100MHz", 3, 100, 10);
- TEST_STR_TO_LONG("MHz", 0, 0, 10);
- TEST_STR_TO_LONG("1.4", 1, 1, 10);
- TEST_STR_TO_LONG(" 1", 2, 1, 10);
- TEST_STR_TO_LONG(" +100", 5, 100, 10); // space and +
- TEST_STR_TO_LONG("FF", 2, 255, 16); // hexadecimal FF
- TEST_STR_TO_LONG("77", 2, 63, 8); // octal 77
- TEST_STR_TO_LONG("18", 1, 1, 8); // octal 1, 8 is ignored
+ // TODO: extend to corner cases, use scanf as reference
+ TEST_STR_TO_INT32("", 0, 0, 10);
+ TEST_STR_TO_INT32("1", 1, 1, 10);
+ TEST_STR_TO_INT32("10", 2, 10, 10);
+ TEST_STR_TO_INT32("-50", 3, -50, 10);
+ TEST_STR_TO_INT32("100MHz", 3, 100, 10);
+ TEST_STR_TO_INT32("MHz", 0, 0, 10);
+ TEST_STR_TO_INT32("1.4", 1, 1, 10);
+ TEST_STR_TO_INT32(" 1", 2, 1, 10);
+ TEST_STR_TO_INT32(" +100", 5, 100, 10); // space and +
+ TEST_STR_TO_INT32("FF", 2, 255, 16); // hexadecimal FF
+ TEST_STR_TO_INT32("77", 2, 63, 8); // octal 77
+ TEST_STR_TO_INT32("18", 1, 1, 8); // octal 1, 8 is ignored
}
-static void test_strToUInt32() {
+static void test_strBaseToUInt32() {
size_t result;
uint32_t val;
-#define TEST_STR_TO_ULONG(s, r, v, b) \
+#define TEST_STR_TO_UINT32(s, r, v, b) \
do { \
- result = strToUInt32(s, &val, b); \
+ result = strBaseToUInt32(s, &val, b); \
CU_ASSERT_EQUAL(val, v); \
CU_ASSERT_EQUAL(result, r); \
} while(0) \
- TEST_STR_TO_ULONG("", 0, 0, 10);
- TEST_STR_TO_ULONG("1", 1, 1, 10);
- TEST_STR_TO_ULONG("10", 2, 10, 10);
- TEST_STR_TO_ULONG("100MHz", 3, 100, 10);
- TEST_STR_TO_ULONG("MHz", 0, 0, 10);
- TEST_STR_TO_ULONG("1.4", 1, 1, 10);
- TEST_STR_TO_ULONG(" 1", 2, 1, 10);
- TEST_STR_TO_ULONG(" +100", 5, 100, 10); // space and +
- TEST_STR_TO_ULONG("FF", 2, 255, 16); // hexadecimal FF
- TEST_STR_TO_ULONG("77", 2, 63, 8); // octal 77
- TEST_STR_TO_ULONG("18", 1, 1, 8); // octal 1, 8 is ignored
- TEST_STR_TO_ULONG("FFFFFFFF", 8, 0xffffffffu, 16); // octal 1, 8 is ignored
+ // TODO: extend to corner cases, use scanf as reference
+ TEST_STR_TO_UINT32("", 0, 0, 10);
+ TEST_STR_TO_UINT32("1", 1, 1, 10);
+ TEST_STR_TO_UINT32("10", 2, 10, 10);
+ TEST_STR_TO_UINT32("100MHz", 3, 100, 10);
+ TEST_STR_TO_UINT32("MHz", 0, 0, 10);
+ TEST_STR_TO_UINT32("1.4", 1, 1, 10);
+ TEST_STR_TO_UINT32(" 1", 2, 1, 10);
+ TEST_STR_TO_UINT32(" +100", 5, 100, 10); // space and +
+ TEST_STR_TO_UINT32("FF", 2, 255, 16); // hexadecimal FF
+ TEST_STR_TO_UINT32("77", 2, 63, 8); // octal 77
+ TEST_STR_TO_UINT32("18", 1, 1, 8); // octal 1, 8 is ignored
+ TEST_STR_TO_UINT32("FFFFFFFF", 8, 0xffffffffu, 16); // octal 1, 8 is ignored
+}
+
+static void test_strBaseToInt64() {
+ size_t result;
+ int64_t val;
+
+#define TEST_STR_TO_INT64(s, r, v, b) \
+ do { \
+ result = strBaseToInt64(s, &val, b); \
+ CU_ASSERT_EQUAL(val, v); \
+ CU_ASSERT_EQUAL(result, r); \
+ } while(0) \
+
+ // TODO: extend to corner cases, use scanf as reference
+ TEST_STR_TO_INT64("", 0, 0, 10);
+ TEST_STR_TO_INT64("1", 1, 1, 10);
+ TEST_STR_TO_INT64("10", 2, 10, 10);
+ TEST_STR_TO_INT64("-50", 3, -50, 10);
+ TEST_STR_TO_INT64("100MHz", 3, 100, 10);
+ TEST_STR_TO_INT64("MHz", 0, 0, 10);
+ TEST_STR_TO_INT64("1.4", 1, 1, 10);
+ TEST_STR_TO_INT64(" 1", 2, 1, 10);
+ TEST_STR_TO_INT64(" +100", 5, 100, 10); // space and +
+ TEST_STR_TO_INT64("FF", 2, 255, 16); // hexadecimal FF
+ TEST_STR_TO_INT64("77", 2, 63, 8); // octal 77
+ TEST_STR_TO_INT64("18", 1, 1, 8); // octal 1, 8 is ignored
+}
+
+static void test_strBaseToUInt64() {
+ size_t result;
+ uint64_t val;
+
+#define TEST_STR_TO_UINT64(s, r, v, b) \
+ do { \
+ result = strBaseToUInt64(s, &val, b); \
+ CU_ASSERT_EQUAL(val, v); \
+ CU_ASSERT_EQUAL(result, r); \
+ } while(0) \
+
+ // TODO: extend to corner cases, use scanf as reference
+ TEST_STR_TO_UINT64("", 0, 0, 10);
+ TEST_STR_TO_UINT64("1", 1, 1, 10);
+ TEST_STR_TO_UINT64("10", 2, 10, 10);
+ TEST_STR_TO_UINT64("100MHz", 3, 100, 10);
+ TEST_STR_TO_UINT64("MHz", 0, 0, 10);
+ TEST_STR_TO_UINT64("1.4", 1, 1, 10);
+ TEST_STR_TO_UINT64(" 1", 2, 1, 10);
+ TEST_STR_TO_UINT64(" +100", 5, 100, 10); // space and +
+ TEST_STR_TO_UINT64("FF", 2, 255, 16); // hexadecimal FF
+ TEST_STR_TO_UINT64("77", 2, 63, 8); // octal 77
+ TEST_STR_TO_UINT64("18", 1, 1, 8); // octal 1, 8 is ignored
+ TEST_STR_TO_UINT64("FFFFFFFF", 8, 0xffffffffu, 16); // octal 1, 8 is ignored
}
static void test_strToDouble() {
@@ -596,8 +648,10 @@
|| (NULL == CU_add_test(pSuite, "Int64ToStr", test_Int64ToStr))
|| (NULL == CU_add_test(pSuite, "UInt64ToStrBase", test_UInt64ToStrBase))
|| (NULL == CU_add_test(pSuite, "doubleToStr", test_doubleToStr))
- || (NULL == CU_add_test(pSuite, "strToInt32", test_strToInt32))
- || (NULL == CU_add_test(pSuite, "strToUInt32", test_strToUInt32))
+ || (NULL == CU_add_test(pSuite, "strBaseToInt32", test_strBaseToInt32))
+ || (NULL == CU_add_test(pSuite, "strBaseToUInt32", test_strBaseToUInt32))
+ || (NULL == CU_add_test(pSuite, "strBaseToInt64", test_strBaseToInt64))
+ || (NULL == CU_add_test(pSuite, "strBaseToUInt64", test_strBaseToUInt64))
|| (NULL == CU_add_test(pSuite, "strToDouble", test_strToDouble))
|| (NULL == CU_add_test(pSuite, "compareStr", test_compareStr))
|| (NULL == CU_add_test(pSuite, "compareStrAndNum", test_compareStrAndNum))
--
Gitblit v1.9.1