From e9becf553ad86685e79d52c4317aeb4441b91525 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周一, 19 1月 2015 02:46:22 +0800
Subject: [PATCH] Refactoring of arbitrary data, special numbers
---
libscpi/src/utils.c | 444 ++++++++++++++++++++++++-------------------------------
1 files changed, 192 insertions(+), 252 deletions(-)
diff --git a/libscpi/src/utils.c b/libscpi/src/utils.c
index 876ce01..26670b9 100644
--- a/libscpi/src/utils.c
+++ b/libscpi/src/utils.c
@@ -41,7 +41,7 @@
#include <string.h>
#include <ctype.h>
-#include "utils.h"
+#include "utils_private.h"
static size_t patternSeparatorShortPos(const char * pattern, size_t len);
static size_t patternSeparatorPos(const char * pattern, size_t len);
@@ -74,34 +74,60 @@
* @param len string buffer length
* @return number of bytes written to str (without '\0')
*/
-// TODO: add support for other bases
size_t longToStr(int32_t val, char * str, size_t len, int8_t base) {
- uint32_t x = 1000000000L;
+ 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;
+ 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
}
/**
@@ -147,7 +173,7 @@
* @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;
}
@@ -159,207 +185,35 @@
return FALSE;
}
-enum _locate_text_states {
- STATE_FIRST_WHITESPACE,
- STATE_TEXT_QUOTED,
- STATE_TEXT,
- STATE_LAST_WHITESPACE,
- STATE_COMMA,
- STATE_ERROR
-};
-typedef enum _locate_text_states locate_text_states;
-
-struct _locate_text_nfa {
- locate_text_states state;
- int32_t startIdx;
- int32_t stopIdx;
+/**
+ * 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) {
+ scpi_bool_t result = FALSE;
size_t i;
-};
-typedef struct _locate_text_nfa locate_text_nfa;
-/**
- * Test locate text state, if it is correct final state
- */
-static bool_t isFinalState(locate_text_states state) {
- return (
- ((state) == STATE_COMMA)
- || ((state) == STATE_LAST_WHITESPACE)
- || ((state) == STATE_TEXT) ||
- ((state) == STATE_FIRST_WHITESPACE)
- );
-}
-
-/**
- * Perform locateText automaton to search string pattern
- * @param nfa stores automaton state
- * @param c current char processed
- */
-static bool_t locateTextAutomaton(locate_text_nfa * nfa, unsigned char c) {
- switch(nfa->state) {
- /* first state locating only white spaces */
- case STATE_FIRST_WHITESPACE:
- if(isspace(c)) {
- nfa->startIdx = nfa->stopIdx = nfa->i + 1;
- } else if (c == ',') {
- nfa->state = STATE_COMMA;
- } else if (c == '"') {
- nfa->startIdx = nfa->i + 1;
- nfa->state = STATE_TEXT_QUOTED;
- } else {
- nfa->startIdx = nfa->i;
- nfa->stopIdx = nfa->i + 1;
- nfa->state = STATE_TEXT;
- }
- break;
- /* state locating any text inside "" */
- case STATE_TEXT_QUOTED:
- if(c == '"') {
- nfa->state = STATE_LAST_WHITESPACE;
- nfa->stopIdx = nfa->i;
- }
- break;
- /* locate text ignoring quotes */
- case STATE_TEXT:
- if (c == ',') {
- nfa->state = STATE_COMMA;
- } else if (!isspace(c)) {
- nfa->stopIdx = nfa->i + 1;
- }
- break;
- /* locating text after last quote */
- case STATE_LAST_WHITESPACE:
- if (c == ',') {
- nfa->state = STATE_COMMA;
- } else if (!isspace(c)) {
- nfa->state = STATE_ERROR;
- }
- break;
-
- default:
- break;
- }
-
- /* if it is terminating state, break from for loop */
- if ((nfa->state == STATE_COMMA) || (nfa->state == STATE_ERROR)) {
+ if (len2 < len1) {
return FALSE;
- } else {
- return TRUE;
}
-}
-/**
- * Locate text in string. Text is separated by two ""
- * example: "text", next parameter
- * regexp: ^[ \t\r\n]*"([^"]*)"[ \t\r\n]*,?
- * regexp: ^[ \t\r\n]*([^,]*)[ \t\r\n]*,?
- * @param str1 string to be searched
- * @param len1 length of string
- * @param str2 result
- * @param len2 length of result
- * @return string str1 contains text and str2 was set
- */
-bool_t locateText(const char * str1, size_t len1, const char ** str2, size_t * len2) {
- locate_text_nfa nfa;
- nfa.state = STATE_FIRST_WHITESPACE;
- nfa.startIdx = 0;
- nfa.stopIdx = 0;
+ if (SCPI_strncasecmp(str1, str2, len1) == 0) {
+ result = TRUE;
+ }
- for (nfa.i = 0; nfa.i < len1; nfa.i++) {
- if(FALSE == locateTextAutomaton(&nfa, str1[nfa.i])) {
+ for (i = len1; i < len2; i++) {
+ if (!isdigit(str2[i])) {
+ result = FALSE;
break;
}
}
- if (isFinalState(nfa.state)) {
-
- if (str2) {
- *str2 = &str1[nfa.startIdx];
- }
-
- if (len2) {
- *len2 = nfa.stopIdx - nfa.startIdx;
- }
- return TRUE;
- }
- return FALSE;
+ return result;
}
-
-/**
- * Perform locateStr automaton to search string pattern
- * @param nfa stores automaton state
- * @param c current char processed
- */
-static bool_t locateStrAutomaton(locate_text_nfa * nfa, unsigned char c) {
- switch(nfa->state) {
- /* first state locating only white spaces */
- case STATE_FIRST_WHITESPACE:
- if(isspace(c)) {
- nfa->startIdx = nfa->stopIdx = nfa->i + 1;
- } else if (c == ',') {
- nfa->state = STATE_COMMA;
- } else {
- nfa->startIdx = nfa->i;
- nfa->stopIdx = nfa->i + 1;
- nfa->state = STATE_TEXT;
- }
- break;
- /* locate text ignoring quotes */
- case STATE_TEXT:
- if (c == ',') {
- nfa->state = STATE_COMMA;
- } else if (!isspace(c)) {
- nfa->stopIdx = nfa->i + 1;
- }
- break;
-
- default:
- break;
- }
-
- /* if it is terminating state, break from for loop */
- if ((nfa->state == STATE_COMMA) || (nfa->state == STATE_ERROR)) {
- return FALSE;
- } else {
- return TRUE;
- }
-}
-
-/**
- * Locate string in string.
- * regexp: ^[ \t\r\n]*([^,]*)[ \t\r\n]*,?
- * @param str1 string to be searched
- * @param len1 length of string
- * @param str2 result
- * @param len2 length of result
- * @return string str1 contains text and str2 was set
- */
-bool_t locateStr(const char * str1, size_t len1, const char ** str2, size_t * len2) {
- locate_text_nfa nfa;
- nfa.state = STATE_FIRST_WHITESPACE;
- nfa.startIdx = 0;
- nfa.stopIdx = 0;
-
-
- for (nfa.i = 0; nfa.i < len1; nfa.i++) {
- if(FALSE == locateStrAutomaton(&nfa, str1[nfa.i])) {
- break;
- }
- }
-
- if (isFinalState(nfa.state)) {
-
- if (str2) {
- *str2 = &str1[nfa.startIdx];
- }
-
- if (len2) {
- *len2 = nfa.stopIdx - nfa.startIdx;
- }
- return TRUE;
- }
- return FALSE;
-}
-
/**
* Count white spaces from the beggining
@@ -370,20 +224,11 @@
size_t skipWhitespace(const char * cmd, size_t len) {
size_t i;
for (i = 0; i < len; i++) {
- if (!isspace((unsigned char)cmd[i])) {
+ if (!isspace((unsigned char) cmd[i])) {
return i;
}
}
return len;
-}
-
-/**
- * is colon or not
- * @param cmd - command
- * @return
- */
-static bool_t iscolon(char ch) {
- return (':' == ch) ? TRUE : FALSE;
}
/**
@@ -396,7 +241,7 @@
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])) {
+ if (islower((unsigned char) pattern[i])) {
return i;
}
}
@@ -410,7 +255,7 @@
* @return position of separator or len
*/
size_t patternSeparatorPos(const char * pattern, size_t len) {
-
+
char * separator = strnpbrk(pattern, len, "?:[]");
if (separator == NULL) {
return len;
@@ -433,10 +278,9 @@
} else {
result = separator - cmd;
}
-
+
return result;
}
-
/**
* Match pattern and str. Pattern is in format UPPERCASElowercase
@@ -446,76 +290,154 @@
* @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) {
+ int pattern_sep_pos_short;
+
+ if (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) ||
+ compareStrAndNum(pattern, pattern_sep_pos_short, str, str_len);
+ } 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) {
- int result = FALSE;
-
+scpi_bool_t matchCommand(const char * pattern, const char * cmd, size_t len) {
+ scpi_bool_t result = FALSE;
+ int leftFlag = 0; // flag for '[' on left
+ int rightFlag = 0; // flag for ']' on right
+ int cmd_sep_pos = 0;
+
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);
const char * cmd_end = cmd + cmd_len;
-
- /* TODO: now it is possible to send command ":*IDN?" which is incorrect */
- if (iscolon(cmd_ptr[0])) {
- cmd_len --;
- cmd_ptr ++;
+
+ /* now support optional keywords in pattern style, e.g. [:MEASure]:VOLTage:DC? */
+ if (pattern_ptr[0] == '[') { // skip first '['
+ pattern_len--;
+ pattern_ptr++;
+ leftFlag++;
}
-
+ if (pattern_ptr[0] == ':') { // skip first ':'
+ pattern_len--;
+ pattern_ptr++;
+ }
+
+ if (cmd_ptr[0] == ':') {
+ /* 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 = cmdSeparatorPos(cmd_ptr, cmd_end - cmd_ptr);
-
+
+ if ((leftFlag > 0) && (rightFlag > 0)) {
+ leftFlag--;
+ rightFlag--;
+ } else {
+ 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;
cmd_ptr = cmd_ptr + cmd_sep_pos;
result = TRUE;
-
+
/* command is complete */
if ((pattern_ptr == pattern_end) && (cmd_ptr >= cmd_end)) {
break;
}
-
+
/* pattern complete, but command not */
if ((pattern_ptr == pattern_end) && (cmd_ptr < cmd_end)) {
result = FALSE;
break;
}
-
+
/* command complete, but pattern not */
if (cmd_ptr >= cmd_end) {
+ if (cmd_end == cmd_ptr) {
+ if (cmd_ptr[0] == pattern_ptr[pattern_end - pattern_ptr - 1]) {
+ break; /* exist optional keyword, command is complete */
+ }
+ if (']' == pattern_ptr[pattern_end - pattern_ptr - 1]) {
+ break; /* exist optional keyword, command is complete */
+ }
+ }
result = FALSE;
break;
}
-
+
/* 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;
cmd_ptr = cmd_ptr + 1;
+ } else if ((pattern_ptr[1] == cmd_ptr[0])
+ && (pattern_ptr[0] == '[')
+ && (pattern_ptr[1] == ':')) {
+ pattern_ptr = pattern_ptr + 2; // for skip '[' in "[:"
+ cmd_ptr = cmd_ptr + 1;
+ leftFlag++;
+ } else if ((pattern_ptr[1] == cmd_ptr[0])
+ && (pattern_ptr[0] == ']')
+ && (pattern_ptr[1] == ':')) {
+ pattern_ptr = pattern_ptr + 2; // for skip ']' in "]:"
+ cmd_ptr = cmd_ptr + 1;
+ } else if ((pattern_ptr[2] == cmd_ptr[0])
+ && (pattern_ptr[0] == ']')
+ && (pattern_ptr[1] == '[')
+ && (pattern_ptr[2] == ':')) {
+ pattern_ptr = pattern_ptr + 3; // for skip '][' in "][:"
+ cmd_ptr = cmd_ptr + 1;
+ leftFlag++;
+ } else if (((pattern_ptr[0] == ']')
+ || (pattern_ptr[0] == '['))
+ && (*(pattern_end - 1) == '?') // last is '?'
+ && (cmd_ptr[0] == '?')) {
+ result = TRUE; // exist optional keyword, and they are end with '?'
+ break; // command is complete OK
} else {
result = FALSE;
break;
}
} else {
- result = FALSE;
- break;
+ pattern_ptr = pattern_ptr + 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
+ rightFlag++;
+ } else if ((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
+ rightFlag++;
+ } else {
+ result = FALSE;
+ break;
+ }
}
}
-
+
return result;
}
@@ -528,15 +450,33 @@
* All rights reserved.
*/
size_t
-BSD_strnlen(const char *s, size_t maxlen)
-{
- size_t len;
-
- for (len = 0; len < maxlen; len++, s++) {
- if (!*s)
- break;
- }
- return (len);
+BSD_strnlen(const char *s, size_t maxlen) {
+ size_t len;
+
+ for (len = 0; len < maxlen; len++, s++) {
+ if (!*s)
+ break;
+ }
+ return (len);
+}
+#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