From 94ccbc305cac38eb9c54384b9f47d3da6527299b Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周六, 25 4月 2015 22:29:42 +0800
Subject: [PATCH] Solve #16 Multiple Identical Capabilities
---
libscpi/src/parser.c | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/libscpi/src/parser.c b/libscpi/src/parser.c
index 49080ff..4069944 100644
--- a/libscpi/src/parser.c
+++ b/libscpi/src/parser.c
@@ -192,6 +192,19 @@
}
/**
+ * Conditionaly write ";"
+ * @param context
+ * @return number of characters written
+ */
+static size_t writeSemicolon(scpi_t * context) {
+ if (context->output_count > 0) {
+ return writeData(context, ";", 1);
+ } else {
+ return 0;
+ }
+}
+
+/**
* Process command
* @param context
*/
@@ -199,6 +212,10 @@
const scpi_command_t * cmd = context->paramlist.cmd;
context->cmd_error = FALSE;
+
+ /* conditionaly write ; */
+ writeSemicolon(context);
+
context->output_count = 0;
context->input_count = 0;
@@ -209,9 +226,6 @@
SCPI_ErrorPush(context, SCPI_ERROR_EXECUTION_ERROR);
}
}
-
- /* conditionaly write new line */
- writeNewLine(context);
/* skip all whitespaces */
paramSkipWhitespace(context);
@@ -233,7 +247,7 @@
for (i = 0; context->cmdlist[i].pattern != NULL; i++) {
cmd = &context->cmdlist[i];
- if (matchCommand(cmd->pattern, cmdline_ptr, cmd_len)) {
+ if (matchCommand(cmd->pattern, cmdline_ptr, cmd_len, NULL, 0)) {
context->paramlist.cmd = cmd;
context->paramlist.parameters = cmdline_ptr + cmd_len;
context->paramlist.length = cmdline_len - cmd_len;
@@ -266,6 +280,8 @@
return -1;
}
+ context->output_count = 0;
+
while (cmdline_ptr < cmdline_end) {
result = 0;
cmd_len = cmdTerminatorPos(cmdline_ptr, cmdline_end - cmdline_ptr);
@@ -285,6 +301,10 @@
cmdline_ptr += skipCmdLine(cmdline_ptr, cmdline_end - cmdline_ptr);
cmdline_ptr += skipWhitespace(cmdline_ptr, cmdline_end - cmdline_ptr);
}
+
+ /* conditionaly write new line */
+ writeNewLine(context);
+
return result;
}
@@ -628,9 +648,9 @@
return FALSE;
}
- if (matchPattern("ON", 2, param, param_len)) {
+ if (matchPattern("ON", 2, param, param_len, NULL)) {
*value = TRUE;
- } else if (matchPattern("OFF", 3, param, param_len)) {
+ } else if (matchPattern("OFF", 3, param, param_len, NULL)) {
*value = FALSE;
} else {
num_len = strToLong(param, &i);
@@ -668,7 +688,7 @@
}
for (res = 0; options[res]; ++res) {
- if (matchPattern(options[res], strlen(options[res]), param, param_len)) {
+ if (matchPattern(options[res], strlen(options[res]), param, param_len, NULL)) {
*value = res;
return TRUE;
}
@@ -684,9 +704,13 @@
}
const char * pattern = context->paramlist.cmd->pattern;
- return matchCommand (pattern, cmd, strlen (cmd));
+ return matchCommand (pattern, cmd, strlen (cmd), NULL, 0);
}
scpi_bool_t SCPI_Match(const char * pattern, const char * value, size_t len) {
- return matchCommand (pattern, value, len);
+ return matchCommand (pattern, value, len, NULL, 0);
+}
+
+scpi_bool_t SCPI_CommandNumbers(scpi_t * context, int32_t * numbers, size_t len) {
+ return matchCommand (context->paramlist.cmd->pattern, context->paramlist.cmd_raw.data, context->paramlist.cmd_raw.length, numbers, len);
}
--
Gitblit v1.9.1