From fea06605af79832c6abe7a8e6a24c142987994d6 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周二, 22 10月 2013 17:59:45 +0800
Subject: [PATCH] Add more robust detection of case insensitive string compare
---
libscpi/src/parser.c | 201 +++++++++++++++++++++++++-------------------------
1 files changed, 100 insertions(+), 101 deletions(-)
diff --git a/libscpi/src/parser.c b/libscpi/src/parser.c
index 2ff12c2..e333fc7 100644
--- a/libscpi/src/parser.c
+++ b/libscpi/src/parser.c
@@ -41,16 +41,14 @@
#include "scpi/parser.h"
#include "utils.h"
#include "scpi/error.h"
+#include "scpi/constants.h"
-static size_t patternSeparatorPos(const char * pattern, size_t len);
-static size_t cmdSeparatorPos(const char * cmd, size_t len);
static size_t cmdTerminatorPos(const char * cmd, size_t len);
static size_t cmdlineSeparatorPos(const char * cmd, size_t len);
static const char * cmdlineSeparator(const char * cmd, size_t len);
static const char * cmdlineTerminator(const char * cmd, size_t len);
static const char * cmdlineNext(const char * cmd, size_t len);
-static bool_t cmdMatch(const char * pattern, const char * cmd, size_t len);
static void paramSkipBytes(scpi_t * context, size_t num);
static void paramSkipWhitespace(scpi_t * context);
@@ -73,40 +71,6 @@
return result;
}
*/
-
-/**
- * Find pattern separator position
- * @param pattern
- * @param len - max search length
- * @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;
- } else {
- return separator - pattern;
- }
-}
-
-/**
- * Find command separator position
- * @param cmd - input command
- * @param len - max search length
- * @return position of separator or len
- */
-size_t cmdSeparatorPos(const char * cmd, size_t len) {
- char * separator = strnpbrk(cmd, len, ":?");
- size_t result;
- if (separator == NULL) {
- result = len;
- } else {
- result = separator - cmd;
- }
-
- return result;
-}
/**
* Find command termination character
@@ -174,67 +138,6 @@
}
/**
- * Compare pattern and command
- * @param pattern
- * @param cmd - command
- * @param len - max search length
- * @return TRUE if pattern matches, FALSE otherwise
- */
-bool_t cmdMatch(const char * pattern, const char * cmd, size_t len) {
- int result = FALSE;
-
- const char * pattern_ptr = pattern;
- int pattern_len = SCPI_strnlen(pattern, len);
- 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;
-
- 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 (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) {
- 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 {
- result = FALSE;
- break;
- }
- } else {
- result = FALSE;
- break;
- }
- }
-
- return result;
-}
-
-/**
* Write data to SCPI output
* @param context
* @param data
@@ -272,9 +175,9 @@
}
/**
- * Zapis nove radky na SCPI vystup
+ * Conditionaly write "New Line"
* @param context
- * @return pocet zapsanych znaku
+ * @return number of characters written
*/
static size_t writeNewLine(scpi_t * context) {
if (context->output_count > 0) {
@@ -329,7 +232,7 @@
for (i = 0; context->cmdlist[i].pattern != NULL; i++) {
cmd = &context->cmdlist[i];
- if (cmdMatch(cmd->pattern, cmdline_ptr, cmd_len)) {
+ if (matchCommand(cmd->pattern, cmdline_ptr, cmd_len)) {
context->paramlist.cmd = cmd;
context->paramlist.parameters = cmdline_ptr + cmd_len;
context->paramlist.length = cmdline_len - cmd_len;
@@ -370,6 +273,7 @@
}
}
cmdline_ptr = cmdlineNext(cmdline_ptr, cmdline_end - cmdline_ptr);
+ cmdline_ptr += skipWhitespace(cmdline_ptr, cmdline_end - cmdline_ptr);
}
return result;
}
@@ -382,6 +286,19 @@
* @param interface
*/
void SCPI_Init(scpi_t * context) {
+ if (context->idn[0] == NULL) {
+ context->idn[0] = SCPI_DEFAULT_1_MANUFACTURE;
+ }
+ if (context->idn[1] == NULL) {
+ context->idn[1] = SCPI_DEFAULT_2_MODEL;
+ }
+ if (context->idn[2] == NULL) {
+ context->idn[2] = SCPI_DEFAULT_3;
+ }
+ if (context->idn[3] == NULL) {
+ context->idn[3] = SCPI_DEFAULT_4_REVISION;
+ }
+
context->buffer.position = 0;
SCPI_ErrorInit(context);
}
@@ -458,6 +375,16 @@
result += writeData(context, buffer, len);
context->output_count++;
return result;
+}
+
+/**
+ * Write boolean value to the result
+ * @param context
+ * @param val
+ * @return
+ */
+size_t SCPI_ResultBool(scpi_t * context, bool_t val) {
+ return SCPI_ResultInt(context, val ? 1 : 0);
}
/**
@@ -664,3 +591,75 @@
return FALSE;
}
+
+/**
+ * Parse boolean parameter as described in the spec SCPI-99 7.3 Boolean Program Data
+ * @param context
+ * @param value
+ * @param mandatory
+ * @return
+ */
+bool_t SCPI_ParamBool(scpi_t * context, bool_t * value, bool_t mandatory) {
+ const char * param;
+ size_t param_len;
+ size_t num_len;
+ int32_t i;
+
+ if (!value) {
+ return FALSE;
+ }
+
+ if (!SCPI_ParamString(context, ¶m, ¶m_len, mandatory)) {
+ return FALSE;
+ }
+
+ if (matchPattern("ON", 2, param, param_len)) {
+ *value = TRUE;
+ } else if (matchPattern("OFF", 3, param, param_len)) {
+ *value = FALSE;
+ } else {
+ num_len = strToLong(param, &i);
+
+ if (num_len != param_len) {
+ SCPI_ErrorPush(context, SCPI_ERROR_SUFFIX_NOT_ALLOWED);
+ return FALSE;
+ }
+
+ *value = i ? TRUE : FALSE;
+ }
+
+ return TRUE;
+}
+
+/**
+ * Parse choice parameter
+ * @param context
+ * @param options
+ * @param value
+ * @param mandatory
+ * @return
+ */
+bool_t SCPI_ParamChoice(scpi_t * context, const char * options[], int32_t * value, bool_t mandatory) {
+ const char * param;
+ size_t param_len;
+ size_t res;
+
+ if (!options || !value) {
+ return FALSE;
+ }
+
+ if (!SCPI_ParamString(context, ¶m, ¶m_len, mandatory)) {
+ return FALSE;
+ }
+
+ for (res = 0; options[res]; ++res) {
+ if (matchPattern(options[res], strlen(options[res]), param, param_len)) {
+ *value = res;
+ return TRUE;
+ }
+ }
+
+ SCPI_ErrorPush(context, SCPI_ERROR_ILLEGAL_PARAMETER_VALUE);
+ return FALSE;
+}
+
--
Gitblit v1.9.1