From f2dbd1cc2948f4a52e952f2b10c5ac8bca10dba6 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周二, 19 8月 2014 21:19:22 +0800
Subject: [PATCH] Add support for matching number suffix
---
libscpi/src/utils.c | 151 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 134 insertions(+), 17 deletions(-)
diff --git a/libscpi/src/utils.c b/libscpi/src/utils.c
index 5498cf2..8c3cbd6 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 "scpi/utils_private.h"
static size_t patternSeparatorShortPos(const char * pattern, size_t len);
static size_t patternSeparatorPos(const char * pattern, size_t len);
@@ -54,7 +54,7 @@
* @param set
* @return
*/
-char * strnpbrk(const char *str, size_t size, const char *set) {
+const char * strnpbrk(const char *str, size_t size, const char *set) {
const char *scanp;
long c, sc;
const char * strend = str + size;
@@ -62,7 +62,7 @@
while ((strend != str) && ((c = *str++) != 0)) {
for (scanp = set; (sc = *scanp++) != '\0';)
if (sc == c)
- return ((char *) (str - 1));
+ return str - 1;
}
return (NULL);
}
@@ -146,7 +146,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;
}
@@ -156,6 +156,36 @@
}
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) {
+ scpi_bool_t result = FALSE;
+ size_t i;
+
+ if (len2 < len1) {
+ return FALSE;
+ }
+
+ if (SCPI_strncasecmp(str1, str2, len1) == 0) {
+ result = TRUE;
+ }
+
+ for (i = len1; i<len2; i++) {
+ if (!isdigit(str2[i])) {
+ result = FALSE;
+ break;
+ }
+ }
+
+ return result;
}
enum _locate_text_states {
@@ -179,7 +209,7 @@
/**
* Test locate text state, if it is correct final state
*/
-static bool_t isFinalState(locate_text_states state) {
+static scpi_bool_t isFinalState(locate_text_states state) {
return (
((state) == STATE_COMMA)
|| ((state) == STATE_LAST_WHITESPACE)
@@ -193,7 +223,7 @@
* @param nfa stores automaton state
* @param c current char processed
*/
-static bool_t locateTextAutomaton(locate_text_nfa * nfa, unsigned char c) {
+static scpi_bool_t locateTextAutomaton(locate_text_nfa * nfa, unsigned char c) {
switch(nfa->state) {
/* first state locating only white spaces */
case STATE_FIRST_WHITESPACE:
@@ -257,7 +287,7 @@
* @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) {
+scpi_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;
@@ -288,7 +318,7 @@
* @param nfa stores automaton state
* @param c current char processed
*/
-static bool_t locateStrAutomaton(locate_text_nfa * nfa, unsigned char c) {
+static scpi_bool_t locateStrAutomaton(locate_text_nfa * nfa, unsigned char c) {
switch(nfa->state) {
/* first state locating only white spaces */
case STATE_FIRST_WHITESPACE:
@@ -332,7 +362,7 @@
* @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) {
+scpi_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;
@@ -401,7 +431,7 @@
*/
size_t patternSeparatorPos(const char * pattern, size_t len) {
- char * separator = strnpbrk(pattern, len, "?:[]");
+ const char * separator = strnpbrk(pattern, len, "?:[]");
if (separator == NULL) {
return len;
} else {
@@ -416,7 +446,7 @@
* @return position of separator or len
*/
size_t cmdSeparatorPos(const char * cmd, size_t len) {
- char * separator = strnpbrk(cmd, len, ":?");
+ const char * separator = strnpbrk(cmd, len, ":?");
size_t result;
if (separator == NULL) {
result = len;
@@ -435,10 +465,23 @@
* @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);
+ }
}
/**
@@ -448,8 +491,8 @@
* @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) {
+ scpi_bool_t result = FALSE;
int leftFlag = 0; // flag for '[' on left
int rightFlag = 0; // flag for ']' on right
int cmd_sep_pos = 0;
@@ -573,6 +616,80 @@
return result;
}
+/**
+ * Compose command from previsou command anc current command
+ *
+ * @param ptr_prev pointer to previous command
+ * @param len_prev length of previous command
+ * @param pptr pointer to pointer of current command
+ * @param plen pointer to length of current command
+ *
+ * ptr_prev and ptr should be in the same memory buffer
+ *
+ * Function will add part of previous command prior to ptr_prev
+ *
+ * char * cmd = "meas:volt:dc?;ac?"
+ * char * ptr_prev = cmd;
+ * size_t len_prev = 13;
+ * char * ptr = cmd + 14;
+ * size_t len = 3;
+ *
+ * composeCompoundCommand(ptr_prev, len_prev, &ptr, &len);
+ *
+ * after calling this
+ *
+ *
+ *
+ */
+scpi_bool_t composeCompoundCommand(char * ptr_prev, size_t len_prev,
+ char ** pptr, size_t * plen) {
+ char * ptr;
+ size_t len;
+ size_t i;
+
+ /* Invalid input */
+ if (pptr == NULL || plen == NULL)
+ return FALSE;
+
+ /* no previous command - nothing to do*/
+ if (ptr_prev == NULL || len_prev == 0)
+ return TRUE;
+
+ ptr = *pptr;
+ len = *plen;
+
+ /* No current command */
+ if (len == 0 || ptr == NULL)
+ return FALSE;
+
+ /* Common command or command root - nothing to do */
+ if (ptr[0] == '*' || ptr[0] == ':')
+ return TRUE;
+
+ /* Previsou command was common command - nothing to do */
+ if (ptr_prev[0] == '*')
+ return TRUE;
+
+ /* Find last occurence of ':' */
+ for (i = len_prev; i > 0; i--) {
+ if (ptr_prev[i-1] == ':') {
+ break;
+ }
+ }
+
+ /* Previous command was simple command - nothing to do*/
+ if (i == 0)
+ return TRUE;
+
+ ptr -= i;
+ len += i;
+ memmove(ptr, ptr_prev, i);
+ *plen = len;
+ *pptr = ptr;
+ return TRUE;
+}
+
+
#if !HAVE_STRNLEN
/* use FreeBSD strnlen */
--
Gitblit v1.9.1