From 4925f462dc0eeb608d7adba379dd04771f92eb51 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周一, 24 6月 2013 21:51:20 +0800
Subject: [PATCH] Add support for optional command header part
---
libscpi/test/test_scpi_utils.c | 211 ++++++++++----------
libscpi/src/utils.c | 335 +++++++++------------------------
examples/common/scpi-def.c | 6
3 files changed, 203 insertions(+), 349 deletions(-)
diff --git a/examples/common/scpi-def.c b/examples/common/scpi-def.c
index d35ddf7..9f1926a 100644
--- a/examples/common/scpi-def.c
+++ b/examples/common/scpi-def.c
@@ -106,8 +106,7 @@
{ .pattern = "*WAI", .callback = SCPI_CoreWai,},
/* Required SCPI commands (SCPI std V1999.0 4.2.1) */
- {.pattern = "SYSTem:ERRor?", .callback = SCPI_SystemErrorNextQ,},
- {.pattern = "SYSTem:ERRor:NEXT?", .callback = SCPI_SystemErrorNextQ,},
+ {.pattern = "SYSTem:ERRor[:NEXT]?", .callback = SCPI_SystemErrorNextQ,},
{.pattern = "SYSTem:ERRor:COUNt?", .callback = SCPI_SystemErrorCountQ,},
{.pattern = "SYSTem:VERSion?", .callback = SCPI_SystemVersionQ,},
@@ -117,8 +116,7 @@
//{.pattern = "STATus:OPERation:ENABle", .callback = scpi_stub_callback,},
//{.pattern = "STATus:OPERation:ENABle?", .callback = scpi_stub_callback,},
- {.pattern = "STATus:QUEStionable?", .callback = SCPI_StatusQuestionableEventQ,},
- {.pattern = "STATus:QUEStionable:EVENt?", .callback = SCPI_StatusQuestionableEventQ,},
+ {.pattern = "STATus:QUEStionable[:EVENt]?", .callback = SCPI_StatusQuestionableEventQ,},
//{.pattern = "STATus:QUEStionable:CONDition?", .callback = scpi_stub_callback,},
{.pattern = "STATus:QUEStionable:ENABle", .callback = SCPI_StatusQuestionableEnable,},
{.pattern = "STATus:QUEStionable:ENABle?", .callback = SCPI_StatusQuestionableEnableQ,},
diff --git a/libscpi/src/utils.c b/libscpi/src/utils.c
index 876ce01..f8e09fa 100644
--- a/libscpi/src/utils.c
+++ b/libscpi/src/utils.c
@@ -75,6 +75,7 @@
* @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;
int_fast8_t digit;
@@ -159,208 +160,6 @@
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;
- 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)) {
- 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;
-
- for (nfa.i = 0; nfa.i < len1; nfa.i++) {
- if(FALSE == locateTextAutomaton(&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;
-}
-
-/**
- * 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
* @param cmd - command
@@ -370,20 +169,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 +186,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 +200,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 +223,9 @@
} else {
result = separator - cmd;
}
-
+
return result;
}
-
/**
* Match pattern and str. Pattern is in format UPPERCASElowercase
@@ -460,62 +249,125 @@
* @return TRUE if pattern matches, FALSE otherwise
*/
bool_t matchCommand(const char * pattern, const char * cmd, size_t len) {
- int result = FALSE;
-
+ bool_t result = FALSE;
+ int leftFlag = 0; // flag for '[' on left
+ int rightFlag = 0; // flag for ']' on right
+
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 ++;
+
+ /* TODO: 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++;
+ }
+
+ /* errornouse ":*IDN?" is handled in parser */
+ if (cmd_ptr[0] == ':') {
+ 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);
+ int cmd_sep_pos;
+ 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 +380,14 @@
* 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
diff --git a/libscpi/test/test_scpi_utils.c b/libscpi/test/test_scpi_utils.c
index 0774f45..c54d79d 100644
--- a/libscpi/test/test_scpi_utils.c
+++ b/libscpi/test/test_scpi_utils.c
@@ -1,3 +1,32 @@
+/*-
+ * Copyright (c) 2013 Jan Breuer
+ * Richard.hmm
+ * Copyright (c) 2012 Jan Breuer
+ *
+ * All Rights Reserved
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
/*
* File: test_scpi_utils.c
* Author: Jan Breuer
@@ -136,107 +165,9 @@
CU_ASSERT_FALSE(compareStr("ABCD", 4, "abcd", 3));
}
-void test_locateText() {
-
- const char * v;
- const char * b;
- size_t l;
- int result;
-
-
-#define TEST_LOCATE_TEXT(s, ex_res, ex_off, ex_len) \
- do { \
- v = (s); \
- b = NULL; \
- l = 0; \
- result = locateText(v, strlen(v), &b, &l); \
- CU_ASSERT(result == ex_res); \
- if (result == TRUE) { \
- CU_ASSERT(b == (v + ex_off)); \
- CU_ASSERT(l == ex_len); \
- } else { \
- CU_ASSERT(b == NULL); \
- CU_ASSERT(l == 0); \
- } \
- } while(0) \
-
-
- TEST_LOCATE_TEXT("", TRUE, 0, 0);
- TEST_LOCATE_TEXT(",", TRUE, 0, 0);
- TEST_LOCATE_TEXT("\"\",", TRUE, 1, 0);
- TEST_LOCATE_TEXT(" ", TRUE, 3, 0);
- TEST_LOCATE_TEXT("a", TRUE, 0, 1);
- TEST_LOCATE_TEXT("ab", TRUE, 0, 2);
- TEST_LOCATE_TEXT("abc", TRUE, 0, 3);
- TEST_LOCATE_TEXT(" abc", TRUE, 1, 3);
- TEST_LOCATE_TEXT(" abc def", TRUE, 1, 7);
- TEST_LOCATE_TEXT(" abc def ", TRUE, 1, 7);
- TEST_LOCATE_TEXT("\"\"", TRUE, 1, 0);
- TEST_LOCATE_TEXT("\"a\"", TRUE, 1, 1);
- TEST_LOCATE_TEXT(" \"a\" ", TRUE, 2, 1);
- TEST_LOCATE_TEXT(" \"a\" ", TRUE, 2, 1);
- TEST_LOCATE_TEXT(" \"a\" ,", TRUE, 2, 1);
- TEST_LOCATE_TEXT(" \"a,b\"", TRUE, 2, 3);
- TEST_LOCATE_TEXT(" \"a,b\" ,", TRUE, 2, 3);
- TEST_LOCATE_TEXT(" a b ", TRUE, 1, 3);
- TEST_LOCATE_TEXT(" a b ,", TRUE, 1, 3);
- TEST_LOCATE_TEXT(" \"a \" ", TRUE, 2, 2);
- TEST_LOCATE_TEXT(" \"a ", FALSE, 0, 0);
- TEST_LOCATE_TEXT(" \"a\" a, a ", FALSE, 0, 0);
- TEST_LOCATE_TEXT(" \"a\" , a ", TRUE, 2, 1);
-}
-
-void test_locateStr() {
-
- const char * v;
- const char * b;
- size_t l;
- int result;
-
-
-#define TEST_LOCATE_STR(s, ex_res, ex_off, ex_len) \
- do { \
- v = (s); \
- b = NULL; \
- l = 0; \
- result = locateStr(v, strlen(v), &b, &l); \
- CU_ASSERT(result == ex_res); \
- if (result == TRUE) { \
- CU_ASSERT(b == (s + ex_off)); \
- CU_ASSERT(l == ex_len); \
- } else { \
- CU_ASSERT(b == NULL); \
- CU_ASSERT(l == 0); \
- } \
- } while(0) \
-
- TEST_LOCATE_STR("", TRUE, 0, 0);
- TEST_LOCATE_STR(",", TRUE, 0, 0);
- TEST_LOCATE_STR(" ", TRUE, 3, 0);
- TEST_LOCATE_STR("a", TRUE, 0, 1);
- TEST_LOCATE_STR("ab", TRUE, 0, 2);
- TEST_LOCATE_STR("abc", TRUE, 0, 3);
- TEST_LOCATE_STR(" abc", TRUE, 1, 3);
- TEST_LOCATE_STR(" abc def", TRUE, 1, 7);
- TEST_LOCATE_STR(" abc def ", TRUE, 1, 7);
- TEST_LOCATE_STR("\"\"", TRUE, 0, 2);
- TEST_LOCATE_STR("\"a\"", TRUE, 0, 3);
- TEST_LOCATE_STR(" \"a\" ", TRUE, 1, 3);
- TEST_LOCATE_STR(" \"a\" ", TRUE, 1, 3);
- TEST_LOCATE_STR(" \"a\" ,", TRUE, 1, 3);
- TEST_LOCATE_STR(" \"a,b\"", TRUE, 1, 2);
- TEST_LOCATE_STR(" \"a,b\" ,", TRUE, 1, 2);
- TEST_LOCATE_STR(" a b ", TRUE, 1, 3);
- TEST_LOCATE_STR(" a b ,", TRUE, 1, 3);
- TEST_LOCATE_STR(" \"a \" ", TRUE, 1, 4);
- TEST_LOCATE_STR(" \"a ", TRUE, 1, 2);
- TEST_LOCATE_STR(" \"a\" a, a ", TRUE, 1, 5);
- TEST_LOCATE_STR(" \"a\" , a ", TRUE, 1, 3);
-}
-
void test_matchPattern() {
bool_t result;
-
+
#define TEST_MATCH_PATTERN(p, s, r) \
do { \
result = matchPattern(p, strlen(p), s, strlen(s)); \
@@ -252,8 +183,8 @@
void test_matchCommand() {
bool_t result;
-
- #define TEST_MATCH_COMMAND(p, s, r) \
+
+#define TEST_MATCH_COMMAND(p, s, r) \
do { \
result = matchCommand(p, s, strlen(s)); \
CU_ASSERT_EQUAL(result, r); \
@@ -274,6 +205,82 @@
TEST_MATCH_COMMAND("ABc:AACddd", ":abc:aacddd", TRUE);
TEST_MATCH_COMMAND("ABc:AACddd", ":abc:aacdd", FALSE);
TEST_MATCH_COMMAND("ABc:AACddd", ":a:aac", FALSE);
+ TEST_MATCH_COMMAND("?", "?", TRUE);
+ TEST_MATCH_COMMAND("A?", "A?", TRUE);
+ TEST_MATCH_COMMAND("A", "A?", FALSE);
+ TEST_MATCH_COMMAND("A?", "A", FALSE);
+ TEST_MATCH_COMMAND("[:ABc]:AACddd", ":ab:aac", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("[:ABc]:AACddd", "aac", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("[:ABc]:AACddd", "aac?", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("[:ABc]:AACddd?", ":ab:aac?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("[:ABc]:AACddd?", "aac?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("[:ABc]:AACddd?", "aac", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd]:CDe", "ab:bc:cd", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd]:CDe", "ab:cd", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd]:CDe", "ab:cd?", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd]:CDe?", "ab:bc:cd?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd]:CDe?", "ab:cd?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd]:CDe?", "ab:cd", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc:BCd[:CDe]", "ab:bc:cd", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc:BCd[:CDe]", "ab:bc", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc:BCd[:CDe]", "ab:bc?", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc:BCd[:CDe]?", "ab:bc:cd?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc:BCd[:CDe]?", "ab:bc?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc:BCd[:CDe]?", "ab:bc", FALSE); // test optional keyword
+
+ TEST_MATCH_COMMAND("[:ABc]:BCd[:CDe]", "ab:bc:cd", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("[:ABc]:BCd[:CDe]", "ab:bc", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("[:ABc]:BCd[:CDe]", "bc:cd", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("[:ABc]:BCd[:CDe]", "ab:bc?", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("[:ABc]:BCd[:CDe]", "bc:cd?", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("[:ABc]:BCd[:CDe]?", "ab:bc:cd?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("[:ABc]:BCd[:CDe]?", "ab:bc?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("[:ABc]:BCd[:CDe]?", "bc:cd?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("[:ABc]:BCd[:CDe]?", "ab:bc", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("[:ABc]:BCd[:CDe]?", "bc:cd", FALSE); // test optional keyword
+
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe]", "ab:bc:cd", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe]", "ab:bc", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe]", "ab:cd", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe]", "ab:bc?", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe]", "ab:cd?", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe]?", "ab:bc:cd?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe]?", "ab:bc?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe]?", "ab:cd?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe]?", "ab:bc", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe]?", "ab:cd", FALSE); // test optional keyword
+
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]", "ab:bc:cd:de", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]", "ab:bc:cd", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]", "ab:bc:de", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]", "ab:cd:de", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]", "ab:bc", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]", "ab:cd", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]", "ab:de", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]", "ab", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]", "ab:bc:cd?", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]", "ab:bc:de?", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]", "ab:cd:de?", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]", "ab:bc?", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]", "ab:cd?", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]", "ab:de?", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]", "ab?", FALSE); // test optional keyword
+
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]?", "ab:bc:cd:de?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]?", "ab:bc:cd?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]?", "ab:bc:de?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]?", "ab:cd:de?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]?", "ab:bc?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]?", "ab:cd?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]?", "ab:de?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]?", "ab?", TRUE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]?", "ab:bc:cd", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]?", "ab:bc:de", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]?", "ab:cd:de", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]?", "ab:bc", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]?", "ab:cd", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]?", "ab:de", FALSE); // test optional keyword
+ TEST_MATCH_COMMAND("ABc[:BCd][:CDe][:DEf]?", "ab", FALSE); // test optional keyword
}
int main() {
@@ -298,8 +305,6 @@
|| (NULL == CU_add_test(pSuite, "strToLong", test_strToLong))
|| (NULL == CU_add_test(pSuite, "strToDouble", test_strToDouble))
|| (NULL == CU_add_test(pSuite, "compareStr", test_compareStr))
- || (NULL == CU_add_test(pSuite, "locateText", test_locateText))
- || (NULL == CU_add_test(pSuite, "locateStr", test_locateStr))
|| (NULL == CU_add_test(pSuite, "matchPattern", test_matchPattern))
|| (NULL == CU_add_test(pSuite, "matchCommand", test_matchCommand))
) {
--
Gitblit v1.9.1