From e9785c888dddb7449e741ed53796e995f0efa9f7 Mon Sep 17 00:00:00 2001
From: Iztok Jeras <iztok.jeras@redpitaya.com>
Date: ćšć, 08 10æ 2015 03:00:33 +0800
Subject: [PATCH] added most new function declarations, replaced all usecases for old functions, missing are most new implementations
---
libscpi/src/utils.c | 464 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 414 insertions(+), 50 deletions(-)
diff --git a/libscpi/src/utils.c b/libscpi/src/utils.c
index f8e09fa..c0f26ff 100644
--- a/libscpi/src/utils.c
+++ b/libscpi/src/utils.c
@@ -41,7 +41,8 @@
#include <string.h>
#include <ctype.h>
-#include "utils.h"
+#include "utils_private.h"
+#include "scpi/utils.h"
static size_t patternSeparatorShortPos(const char * pattern, size_t len);
static size_t patternSeparatorPos(const char * pattern, size_t len);
@@ -72,37 +73,241 @@
* @param val integer value
* @param str converted textual representation
* @param len string buffer length
+ * @param base output base
* @return number of bytes written to str (without '\0')
*/
-// TODO: add support for other bases
+size_t SCPI_Int32ToStr(int32_t val, char * str, size_t len, int8_t base) {
+ const char digits[] = "0123456789ABCDEF";
-size_t longToStr(int32_t val, char * str, size_t len, int8_t base) {
- uint32_t x = 1000000000L;
+#define ADD_CHAR(c) if (pos < len) str[pos++] = (c)
+ uint32_t x = 0;
int_fast8_t digit;
size_t pos = 0;
+ uint32_t uval = val;
- if (val == 0) {
- if (pos < len) str[pos++] = '0';
+ if (uval == 0) {
+ ADD_CHAR('0');
} else {
- if (val < 0) {
- val = -val;
- if (pos < len) str[pos++] = '-';
+
+ switch (base) {
+ case 2:
+ x = 0x80000000L;
+ break;
+ case 8:
+ x = 0x40000000L;
+ break;
+ case 10:
+ x = 1000000000L;
+ break;
+ case 0x10:
+ x = 0x10000000L;
+ break;
+ default:
+ x = 1000000000L;
+ base = 10;
+ break;
}
- while ((val / x) == 0) {
- x /= 10;
+ // add sign for numbers in base 10
+ if ((val < 0) && (base == 10)) {
+ uval = -val;
+ ADD_CHAR('-');
+ }
+
+ // remove leading zeros
+ while ((uval / x) == 0) {
+ x /= base;
}
do {
- digit = (uint8_t) (val / x);
- if (pos < len) str[pos++] = digit + '0';
- val -= digit * x;
- x /= 10;
+ digit = (uint8_t) (uval / x);
+ ADD_CHAR(digits[digit]);
+ uval -= digit * x;
+ x /= base;
} while (x && (pos < len));
}
if (pos < len) str[pos] = 0;
return pos;
+#undef ADD_CHAR
+}
+
+/**
+ * Converts unsigned 32b integer value to string
+ * @param val integer value
+ * @param str converted textual representation
+ * @param len string buffer length
+ * @param base output base
+ * @return number of bytes written to str (without '\0')
+ */
+size_t SCPI_UInt32ToStr(uint32_t val, char * str, size_t len, int8_t base) {
+ const char digits[] = "0123456789ABCDEF";
+
+#define ADD_CHAR(c) if (pos < len) str[pos++] = (c)
+ uint32_t x = 0;
+ int_fast8_t digit;
+ size_t pos = 0;
+
+ if (val == 0) {
+ ADD_CHAR('0');
+ } else {
+
+ switch (base) {
+ case 2:
+ x = 0x80000000L;
+ break;
+ case 8:
+ x = 0x40000000L;
+ break;
+ case 10:
+ x = 1000000000L;
+ break;
+ case 0x10:
+ x = 0x10000000L;
+ break;
+ default:
+ x = 1000000000L;
+ base = 10;
+ break;
+ }
+
+ // remove leading zeros
+ while ((val / x) == 0) {
+ x /= base;
+ }
+
+ do {
+ digit = (uint8_t) (val / x);
+ ADD_CHAR(digits[digit]);
+ val -= digit * x;
+ x /= base;
+ } while (x && (pos < len));
+ }
+
+ if (pos < len) str[pos] = 0;
+ return pos;
+#undef ADD_CHAR
+}
+
+/**
+ * Converts signed 64b integer value to string
+ * @param val integer value
+ * @param str converted textual representation
+ * @param len string buffer length
+ * @param base output base
+ * @return number of bytes written to str (without '\0')
+ */
+size_t SCPI_Int64ToStr(int64_t val, char * str, size_t len, int8_t base) {
+ const char digits[] = "0123456789ABCDEF";
+
+#define ADD_CHAR(c) if (pos < len) str[pos++] = (c)
+ uint64_t x = 0;
+ int_fast8_t digit;
+ size_t pos = 0;
+ uint64_t uval = val;
+
+ if (uval == 0) {
+ ADD_CHAR('0');
+ } else {
+
+ switch (base) {
+ case 2:
+ x = 0x8000000000000000LL;
+ break;
+ case 8:
+ x = 0x4000000000000000LL;
+ break;
+ case 10:
+ x = 100000000000000000LL;
+ break;
+ case 0x10:
+ x = 0x1000000000000000LL;
+ break;
+ default:
+ x = 100000000000000000LL;
+ base = 10;
+ break;
+ }
+
+ // add sign for numbers in base 10
+ if ((val < 0) && (base == 10)) {
+ uval = -val;
+ ADD_CHAR('-');
+ }
+
+ // remove leading zeros
+ while ((uval / x) == 0) {
+ x /= base;
+ }
+
+ do {
+ digit = (uint8_t) (uval / x);
+ ADD_CHAR(digits[digit]);
+ uval -= digit * x;
+ x /= base;
+ } while (x && (pos < len));
+ }
+
+ if (pos < len) str[pos] = 0;
+ return pos;
+#undef ADD_CHAR
+}
+
+/**
+ * Converts unsigned 64b integer value to string
+ * @param val integer value
+ * @param str converted textual representation
+ * @param len string buffer length
+ * @param base output base
+ * @return number of bytes written to str (without '\0')
+ */
+size_t SCPI_UInt64ToStr(uint64_t val, char * str, size_t len, int8_t base) {
+ const char digits[] = "0123456789ABCDEF";
+
+#define ADD_CHAR(c) if (pos < len) str[pos++] = (c)
+ uint64_t x = 0;
+ int_fast8_t digit;
+ size_t pos = 0;
+
+ if (val == 0) {
+ ADD_CHAR('0');
+ } else {
+
+ switch (base) {
+ case 2:
+ x = 0x8000000000000000LL;
+ break;
+ case 8:
+ x = 0x4000000000000000LL;
+ break;
+ case 10:
+ x = 100000000000000000LL;
+ break;
+ case 0x10:
+ x = 0x1000000000000000LL;
+ break;
+ default:
+ x = 1000000000L;
+ base = 10;
+ break;
+ }
+
+ // remove leading zeros
+ while ((val / x) == 0) {
+ x /= base;
+ }
+
+ do {
+ digit = (uint8_t) (val / x);
+ ADD_CHAR(digits[digit]);
+ val -= digit * x;
+ x /= base;
+ } while (x && (pos < len));
+ }
+
+ if (pos < len) str[pos] = 0;
+ return pos;
+#undef ADD_CHAR
}
/**
@@ -112,8 +317,8 @@
* @param len string buffer length
* @return number of bytes written to str (without '\0')
*/
-size_t doubleToStr(double val, char * str, size_t len) {
- return snprintf(str, len, "%lg", val);
+size_t SCPI_DoubleToStr(double val, char * str, size_t len) {
+ return SCPIDEFINE_doubleToStr(val, str, len);
}
/**
@@ -122,11 +327,24 @@
* @param val 32bit integer result
* @return number of bytes used in string
*/
-size_t strToLong(const char * str, int32_t * val, int8_t base) {
+size_t strToInt32(const char * str, int32_t * val, int8_t base) {
char * endptr;
*val = strtol(str, &endptr, base);
return endptr - str;
}
+
+/**
+ * Converts string to unsigned 32bit integer representation
+ * @param str string value
+ * @param val 32bit integer result
+ * @return number of bytes used in string
+ */
+size_t strToUInt32(const char * str, uint32_t * val, int8_t base) {
+ char * endptr;
+ *val = strtoul(str, &endptr, base);
+ return endptr - str;
+}
+
/**
* Converts string to double representation
@@ -148,16 +366,60 @@
* @param len2
* @return TRUE if len1==len2 and "len" characters of both strings are equal
*/
-bool_t compareStr(const char * str1, size_t len1, const char * str2, size_t len2) {
+scpi_bool_t compareStr(const char * str1, size_t len1, const char * str2, size_t len2) {
if (len1 != len2) {
return FALSE;
}
- if (SCPI_strncasecmp(str1, str2, len2) == 0) {
+ if (SCPIDEFINE_strncasecmp(str1, str2, len2) == 0) {
return TRUE;
}
return FALSE;
+}
+
+/**
+ * Compare two strings, one be longer but may contains only numbers in that section
+ * @param str1
+ * @param len1
+ * @param str2
+ * @param len2
+ * @return TRUE if strings match
+ */
+scpi_bool_t compareStrAndNum(const char * str1, size_t len1, const char * str2, size_t len2, int32_t * num) {
+ scpi_bool_t result = FALSE;
+ size_t i;
+
+ if (len2 < len1) {
+ return FALSE;
+ }
+
+ if (SCPIDEFINE_strncasecmp(str1, str2, len1) == 0) {
+ result = TRUE;
+
+ if (num) {
+ if (len1 == len2) {
+ //*num = 1;
+ } else {
+ int32_t tmpNum;
+ i = len1 + strToInt32(str2 + len1, &tmpNum, 10);
+ if (i != len2) {
+ result = FALSE;
+ } else {
+ *num = tmpNum;
+ }
+ }
+ } else {
+ for (i = len1; i<len2; i++) {
+ if (!isdigit((int) str2[i])) {
+ result = FALSE;
+ break;
+ }
+ }
+ }
+ }
+
+ return result;
}
/**
@@ -183,7 +445,7 @@
* @param len - max search length
* @return position of separator or len
*/
-size_t patternSeparatorShortPos(const char * pattern, size_t len) {
+static size_t patternSeparatorShortPos(const char * pattern, size_t len) {
size_t i;
for (i = 0; (i < len) && pattern[i]; i++) {
if (islower((unsigned char) pattern[i])) {
@@ -199,7 +461,7 @@
* @param len - max search length
* @return position of separator or len
*/
-size_t patternSeparatorPos(const char * pattern, size_t len) {
+static size_t patternSeparatorPos(const char * pattern, size_t len) {
char * separator = strnpbrk(pattern, len, "?:[]");
if (separator == NULL) {
@@ -215,7 +477,7 @@
* @param len - max search length
* @return position of separator or len
*/
-size_t cmdSeparatorPos(const char * cmd, size_t len) {
+static size_t cmdSeparatorPos(const char * cmd, size_t len) {
char * separator = strnpbrk(cmd, len, ":?");
size_t result;
if (separator == NULL) {
@@ -235,33 +497,50 @@
* @param str_len
* @return
*/
-bool_t matchPattern(const char * pattern, size_t pattern_len, const char * str, size_t str_len) {
- int pattern_sep_pos_short = patternSeparatorShortPos(pattern, pattern_len);
- return compareStr(pattern, pattern_len, str, str_len) ||
- compareStr(pattern, pattern_sep_pos_short, str, str_len);
+scpi_bool_t matchPattern(const char * pattern, size_t pattern_len, const char * str, size_t str_len, int32_t * num) {
+ int pattern_sep_pos_short;
+
+ if ((pattern_len > 0) && pattern[pattern_len - 1] == '#') {
+ size_t new_pattern_len = pattern_len - 1;
+
+ pattern_sep_pos_short = patternSeparatorShortPos(pattern, new_pattern_len);
+
+ return compareStrAndNum(pattern, new_pattern_len, str, str_len, num) ||
+ compareStrAndNum(pattern, pattern_sep_pos_short, str, str_len, num);
+ } else {
+
+ pattern_sep_pos_short = patternSeparatorShortPos(pattern, pattern_len);
+
+ return compareStr(pattern, pattern_len, str, str_len) ||
+ compareStr(pattern, pattern_sep_pos_short, str, str_len);
+ }
}
/**
* Compare pattern and command
- * @param pattern
+ * @param pattern eg. [:MEASure]:VOLTage:DC?
* @param cmd - command
* @param len - max search length
* @return TRUE if pattern matches, FALSE otherwise
*/
-bool_t matchCommand(const char * pattern, const char * cmd, size_t len) {
- bool_t result = FALSE;
+scpi_bool_t matchCommand(const char * pattern, const char * cmd, size_t len, int32_t *numbers, size_t numbers_len, int32_t default_value) {
+ scpi_bool_t result = FALSE;
int leftFlag = 0; // flag for '[' on left
int rightFlag = 0; // flag for ']' on right
+ int cmd_sep_pos = 0;
+
+ size_t numbers_idx = 0;
+ int32_t *number_ptr = NULL;
const char * pattern_ptr = pattern;
int pattern_len = strlen(pattern);
const char * pattern_end = pattern + pattern_len;
const char * cmd_ptr = cmd;
- size_t cmd_len = SCPI_strnlen(cmd, len);
+ size_t cmd_len = SCPIDEFINE_strnlen(cmd, len);
const char * cmd_end = cmd + cmd_len;
- /* TODO: now support optional keywords in pattern style, e.g. [:MEASure]:VOLTage:DC? */
+ /* now support optional keywords in pattern style, e.g. [:MEASure]:VOLTage:DC? */
if (pattern_ptr[0] == '[') { // skip first '['
pattern_len--;
pattern_ptr++;
@@ -272,16 +551,17 @@
pattern_ptr++;
}
- /* errornouse ":*IDN?" is handled in parser */
if (cmd_ptr[0] == ':') {
- cmd_len--;
- cmd_ptr++;
+ /* handle errornouse ":*IDN?" */
+ if ((cmd_len >= 2) && (cmd_ptr[1] != '*')) {
+ cmd_len--;
+ cmd_ptr++;
+ }
}
while (1) {
int pattern_sep_pos = patternSeparatorPos(pattern_ptr, pattern_end - pattern_ptr);
- int cmd_sep_pos;
-
+
if ((leftFlag > 0) && (rightFlag > 0)) {
leftFlag--;
rightFlag--;
@@ -289,8 +569,21 @@
cmd_sep_pos = cmdSeparatorPos(cmd_ptr, cmd_end - cmd_ptr);
}
- if (matchPattern(pattern_ptr, pattern_sep_pos, cmd_ptr, cmd_sep_pos)) {
- pattern_ptr = pattern_ptr + pattern_sep_pos;
+ if ((pattern_sep_pos > 0) && pattern_ptr[pattern_sep_pos - 1] == '#') {
+ if (numbers && (numbers_idx < numbers_len)) {
+ number_ptr = numbers + numbers_idx;
+ *number_ptr = default_value; // default value
+ } else {
+ number_ptr = NULL;
+ }
+ numbers_idx++;
+ } else {
+ number_ptr = NULL;
+ }
+
+ if (matchPattern(pattern_ptr, pattern_sep_pos, cmd_ptr, cmd_sep_pos, number_ptr)) {
+ pattern_ptr += pattern_sep_pos;
+ pattern_len -= pattern_sep_pos;
cmd_ptr = cmd_ptr + cmd_sep_pos;
result = TRUE;
@@ -321,24 +614,28 @@
/* both command and patter contains command separator at this position */
if ((pattern_ptr[0] == cmd_ptr[0]) && ((pattern_ptr[0] == ':') || (pattern_ptr[0] == '?'))) {
- pattern_ptr = pattern_ptr + 1;
+ pattern_ptr += 1;
+ pattern_len -= 1;
cmd_ptr = cmd_ptr + 1;
- } else if ((pattern_ptr[1] == cmd_ptr[0])
+ } else if ((pattern_len > 1) && (pattern_ptr[1] == cmd_ptr[0])
&& (pattern_ptr[0] == '[')
&& (pattern_ptr[1] == ':')) {
- pattern_ptr = pattern_ptr + 2; // for skip '[' in "[:"
+ pattern_ptr += 2; // for skip '[' in "[:"
+ pattern_len -= 2;
cmd_ptr = cmd_ptr + 1;
leftFlag++;
- } else if ((pattern_ptr[1] == cmd_ptr[0])
+ } else if ((pattern_len > 1) && (pattern_ptr[1] == cmd_ptr[0])
&& (pattern_ptr[0] == ']')
&& (pattern_ptr[1] == ':')) {
- pattern_ptr = pattern_ptr + 2; // for skip ']' in "]:"
+ pattern_ptr += 2; // for skip ']' in "]:"
+ pattern_len -= 2;
cmd_ptr = cmd_ptr + 1;
- } else if ((pattern_ptr[2] == cmd_ptr[0])
+ } else if ((pattern_len > 2) && (pattern_ptr[2] == cmd_ptr[0])
&& (pattern_ptr[0] == ']')
&& (pattern_ptr[1] == '[')
&& (pattern_ptr[2] == ':')) {
- pattern_ptr = pattern_ptr + 3; // for skip '][' in "][:"
+ pattern_ptr += 3; // for skip '][' in "][:"
+ pattern_len -= 3;
cmd_ptr = cmd_ptr + 1;
leftFlag++;
} else if (((pattern_ptr[0] == ']')
@@ -352,14 +649,17 @@
break;
}
} else {
- pattern_ptr = pattern_ptr + pattern_sep_pos;
+ pattern_ptr += pattern_sep_pos;
+ pattern_len -= pattern_sep_pos;
if ((pattern_ptr[0] == ']') && (pattern_ptr[1] == ':')) {
- pattern_ptr = pattern_ptr + 2; // for skip ']' in "]:" , pattern_ptr continue, while cmd_ptr remain unchanged
+ pattern_ptr += 2; // for skip ']' in "]:" , pattern_ptr continue, while cmd_ptr remain unchanged
+ pattern_len -= 2;
rightFlag++;
- } else if ((pattern_ptr[0] == ']')
+ } else if ((pattern_len > 2) && (pattern_ptr[0] == ']')
&& (pattern_ptr[1] == '[')
&& (pattern_ptr[2] == ':')) {
- pattern_ptr = pattern_ptr + 3; // for skip ']' in "][:" , pattern_ptr continue, while cmd_ptr remain unchanged
+ pattern_ptr += 3; // for skip ']' in "][:" , pattern_ptr continue, while cmd_ptr remain unchanged
+ pattern_len -= 3;
rightFlag++;
} else {
result = FALSE;
@@ -370,6 +670,51 @@
return result;
}
+
+/**
+ * Compose command from previous command anc current command
+ *
+ * @param prev pointer to previous command
+ * @param current pointer of current command
+ *
+ * prev and current should be in the same memory buffer
+ */
+scpi_bool_t composeCompoundCommand(const scpi_token_t * prev, scpi_token_t * current) {
+ size_t i;
+
+ /* Invalid input */
+ if (current == NULL || current->ptr == NULL || current->len == 0)
+ return FALSE;
+
+ /* no previous command - nothing to do*/
+ if (prev->ptr == NULL || prev->len == 0)
+ return TRUE;
+
+ /* Common command or command root - nothing to do */
+ if (current->ptr[0] == '*' || current->ptr[0] == ':')
+ return TRUE;
+
+ /* Previsou command was common command - nothing to do */
+ if (prev->ptr[0] == '*')
+ return TRUE;
+
+ /* Find last occurence of ':' */
+ for (i = prev->len; i > 0; i--) {
+ if (prev->ptr[i - 1] == ':') {
+ break;
+ }
+ }
+
+ /* Previous command was simple command - nothing to do*/
+ if (i == 0)
+ return TRUE;
+
+ current->ptr -= i;
+ current->len += i;
+ memmove(current->ptr, prev->ptr, i);
+ return TRUE;
+}
+
#if !HAVE_STRNLEN
@@ -391,3 +736,22 @@
}
#endif
+#if !HAVE_STRNCASECMP && !HAVE_STRNICMP
+
+int OUR_strncasecmp(const char *s1, const char *s2, size_t n) {
+ unsigned char c1, c2;
+
+ for (; n != 0; n--) {
+ c1 = tolower((unsigned char) *s1++);
+ c2 = tolower((unsigned char) *s2++);
+ if (c1 != c2) {
+ return c1 - c2;
+ }
+ if (c1 == '\0') {
+ return 0;
+ }
+ }
+ return 0;
+}
+#endif
+
--
Gitblit v1.9.1