From 6c9f908c87fd03503494029ca1845ec5e6b09286 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: ćšć, 21 3æ 2013 02:58:22 +0800
Subject: [PATCH] C++ friendly modifications
---
libscpi/src/parser.c | 153 +++++++++++++++++++++++++++++++++------------------
1 files changed, 99 insertions(+), 54 deletions(-)
diff --git a/libscpi/src/parser.c b/libscpi/src/parser.c
index adf7e90..2ff12c2 100644
--- a/libscpi/src/parser.c
+++ b/libscpi/src/parser.c
@@ -37,6 +37,7 @@
#include <ctype.h>
#include <string.h>
+#include "scpi/config.h"
#include "scpi/parser.h"
#include "utils.h"
#include "scpi/error.h"
@@ -46,8 +47,8 @@
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 char * cmdlineSeparator(const char * cmd, size_t len);
-static char * cmdlineTerminator(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);
@@ -114,7 +115,7 @@
* @return position of terminator or len
*/
size_t cmdTerminatorPos(const char * cmd, size_t len) {
- char * terminator = strnpbrk(cmd, len, "; \r\n\t");
+ const char * terminator = strnpbrk(cmd, len, "; \r\n\t");
if (terminator == NULL) {
return len;
} else {
@@ -128,7 +129,7 @@
* @param len - max search length
* @return pointer to line separator or NULL
*/
-char * cmdlineSeparator(const char * cmd, size_t len) {
+const char * cmdlineSeparator(const char * cmd, size_t len) {
return strnpbrk(cmd, len, ";\r\n");
}
@@ -138,7 +139,7 @@
* @param len - max search length
* @return pointer to command line terminator or NULL
*/
-char * cmdlineTerminator(const char * cmd, size_t len) {
+const char * cmdlineTerminator(const char * cmd, size_t len) {
return strnpbrk(cmd, len, "\r\n");
}
@@ -149,7 +150,7 @@
* @return position of line separator or len
*/
size_t cmdlineSeparatorPos(const char * cmd, size_t len) {
- char * separator = cmdlineSeparator(cmd, len);
+ const char * separator = cmdlineSeparator(cmd, len);
if (separator == NULL) {
return len;
} else {
@@ -183,11 +184,11 @@
int result = FALSE;
const char * pattern_ptr = pattern;
- int pattern_len = strlen(pattern);
+ int pattern_len = SCPI_strnlen(pattern, len);
const char * pattern_end = pattern + pattern_len;
const char * cmd_ptr = cmd;
- size_t cmd_len = strnlen(cmd, len);
+ size_t cmd_len = SCPI_strnlen(cmd, len);
const char * cmd_end = cmd + cmd_len;
while (1) {
@@ -199,24 +200,24 @@
cmd_ptr = cmd_ptr + cmd_sep_pos;
result = TRUE;
- // command is complete
+ /* command is complete */
if ((pattern_ptr == pattern_end) && (cmd_ptr >= cmd_end)) {
break;
}
- // pattern complete, but command not
+ /* pattern complete, but command not */
if ((pattern_ptr == pattern_end) && (cmd_ptr < cmd_end)) {
result = FALSE;
break;
}
- // command complete, but pattern not
+ /* command complete, but pattern not */
if (cmd_ptr >= cmd_end) {
result = FALSE;
break;
}
- // both command and patter contains command separator at this position
+ /* 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;
@@ -240,8 +241,21 @@
* @param len - lenght of data to be written
* @return number of bytes written
*/
-static inline size_t writeData(scpi_t * context, const char * data, size_t len) {
+static size_t writeData(scpi_t * context, const char * data, size_t len) {
return context->interface->write(context, data, len);
+}
+
+/**
+ * Flush data to SCPI output
+ * @param context
+ * @return
+ */
+static int flushData(scpi_t * context) {
+ if (context && context->interface && context->interface->flush) {
+ return context->interface->flush(context);
+ } else {
+ return SCPI_RES_OK;
+ }
}
/**
@@ -249,7 +263,7 @@
* @param context
* @return number of bytes written
*/
-static inline size_t writeDelimiter(scpi_t * context) {
+static size_t writeDelimiter(scpi_t * context) {
if (context->output_count > 0) {
return writeData(context, ", ", 2);
} else {
@@ -262,12 +276,67 @@
* @param context
* @return pocet zapsanych znaku
*/
-static inline size_t writeNewLine(scpi_t * context) {
+static size_t writeNewLine(scpi_t * context) {
if (context->output_count > 0) {
- return writeData(context, "\r\n", 2);
+ size_t len;
+ len = writeData(context, "\r\n", 2);
+ flushData(context);
+ return len;
} else {
return 0;
}
+}
+
+/**
+ * Process command
+ * @param context
+ */
+static void processCommand(scpi_t * context) {
+ const scpi_command_t * cmd = context->paramlist.cmd;
+
+ context->cmd_error = FALSE;
+ context->output_count = 0;
+ context->input_count = 0;
+
+ SCPI_DEBUG_COMMAND(context);
+ /* if callback exists - call command callback */
+ if (cmd->callback != NULL) {
+ if ((cmd->callback(context) != SCPI_RES_OK) && !context->cmd_error) {
+ SCPI_ErrorPush(context, SCPI_ERROR_EXECUTION_ERROR);
+ }
+ }
+
+ /* conditionaly write new line */
+ writeNewLine(context);
+
+ /* skip all whitespaces */
+ paramSkipWhitespace(context);
+
+ /* set error if command callback did not read all parameters */
+ if (context->paramlist.length != 0 && !context->cmd_error) {
+ SCPI_ErrorPush(context, SCPI_ERROR_PARAMETER_NOT_ALLOWED);
+ }
+}
+
+/**
+ * Cycle all patterns and search matching pattern. Execute command callback.
+ * @param context
+ * @result TRUE if context->paramlist is filled with correct values
+ */
+static bool_t findCommand(scpi_t * context, const char * cmdline_ptr, size_t cmdline_len, size_t cmd_len) {
+ int32_t i;
+ const scpi_command_t * cmd;
+
+ for (i = 0; context->cmdlist[i].pattern != NULL; i++) {
+ cmd = &context->cmdlist[i];
+ if (cmdMatch(cmd->pattern, cmdline_ptr, cmd_len)) {
+ context->paramlist.cmd = cmd;
+ context->paramlist.parameters = cmdline_ptr + cmd_len;
+ context->paramlist.length = cmdline_len - cmd_len;
+ return TRUE;
+ }
+ }
+ return FALSE;
}
/**
@@ -278,53 +347,29 @@
* @return 1 if the last evaluated command was found
*/
int SCPI_Parse(scpi_t * context, const char * data, size_t len) {
- int32_t i;
int result = 0;
const char * cmdline_end = data + len;
const char * cmdline_ptr = data;
size_t cmd_len;
+ size_t cmdline_len;
+
if (context == NULL) {
return -1;
}
while (cmdline_ptr < cmdline_end) {
-
result = 0;
cmd_len = cmdTerminatorPos(cmdline_ptr, cmdline_end - cmdline_ptr);
+ cmdline_len = cmdlineSeparatorPos(cmdline_ptr, cmdline_end - cmdline_ptr);
if (cmd_len > 0) {
- for (i = 0; context->cmdlist[i].pattern != NULL; i++) {
- if (cmdMatch(context->cmdlist[i].pattern, cmdline_ptr, cmd_len)) {
- if (context->cmdlist[i].callback != NULL) {
- context->cmd_error = FALSE;
- context->paramlist.cmd = &context->cmdlist[i];
- context->paramlist.parameters = cmdline_ptr + cmd_len;
- context->paramlist.length = cmdlineSeparatorPos(context->paramlist.parameters, cmdline_end - context->paramlist.parameters);
- context->output_count = 0;
- context->input_count = 0;
-
- SCPI_DEBUG_COMMAND(context);
- if ((context->cmdlist[i].callback(context) != SCPI_RES_OK) && !context->cmd_error) {
- SCPI_ErrorPush(context, SCPI_ERROR_EXECUTION_ERROR);
- }
-
- writeNewLine(context); // conditionaly write new line
-
- paramSkipWhitespace(context);
- if (context->paramlist.length != 0 && !context->cmd_error) {
- SCPI_ErrorPush(context, SCPI_ERROR_PARAMETER_NOT_ALLOWED);
- }
-
- result = 1;
- break;
- }
- }
- }
- if (result == 0) {
+ if(findCommand(context, cmdline_ptr, cmdline_len, cmd_len)) {
+ processCommand(context);
+ result = 1;
+ } else {
SCPI_ErrorPush(context, SCPI_ERROR_UNDEFINED_HEADER);
}
}
cmdline_ptr = cmdlineNext(cmdline_ptr, cmdline_end - cmdline_ptr);
-
}
return result;
}
@@ -353,14 +398,14 @@
*/
int SCPI_Input(scpi_t * context, const char * data, size_t len) {
int result = 0;
- size_t buffer_free;
- char * cmd_term;
- int ws;
+ const char * cmd_term;
if (len == 0) {
context->buffer.data[context->buffer.position] = 0;
result = SCPI_Parse(context, context->buffer.data, context->buffer.position);
context->buffer.position = 0;
} else {
+ size_t buffer_free;
+ int ws;
buffer_free = context->buffer.length - context->buffer.position;
if (len > (buffer_free - 1)) {
return -1;
@@ -507,7 +552,7 @@
* @return
*/
bool_t SCPI_ParamInt(scpi_t * context, int32_t * value, bool_t mandatory) {
- char * param;
+ const char * param;
size_t param_len;
size_t num_len;
@@ -537,7 +582,7 @@
* @return
*/
bool_t SCPI_ParamDouble(scpi_t * context, double * value, bool_t mandatory) {
- char * param;
+ const char * param;
size_t param_len;
size_t num_len;
@@ -567,7 +612,7 @@
* @param mandatory
* @return
*/
-bool_t SCPI_ParamString(scpi_t * context, char ** value, size_t * len, bool_t mandatory) {
+bool_t SCPI_ParamString(scpi_t * context, const char ** value, size_t * len, bool_t mandatory) {
size_t length;
if (!value || !len) {
@@ -598,7 +643,7 @@
* @param mandatory
* @return
*/
-bool_t SCPI_ParamText(scpi_t * context, char ** value, size_t * len, bool_t mandatory) {
+bool_t SCPI_ParamText(scpi_t * context, const char ** value, size_t * len, bool_t mandatory) {
size_t length;
if (!value || !len) {
--
Gitblit v1.9.1