From 06857724497cf46133f624f6ba1a0bdf70fe7ab7 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周五, 19 4月 2013 18:48:30 +0800
Subject: [PATCH] Changes inspired by HMM: startup colon, Makefile
---
libscpi/src/parser.c | 119 +++++------------------------------------------------------
1 files changed, 11 insertions(+), 108 deletions(-)
diff --git a/libscpi/src/parser.c b/libscpi/src/parser.c
index c22ae6c..9261f66 100644
--- a/libscpi/src/parser.c
+++ b/libscpi/src/parser.c
@@ -37,19 +37,17 @@
#include <ctype.h>
#include <string.h>
+#include "scpi/config.h"
#include "scpi/parser.h"
#include "utils.h"
#include "scpi/error.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);
@@ -72,40 +70,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
@@ -173,74 +137,13 @@
}
/**
- * 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 = strlen(pattern);
- const char * pattern_end = pattern + pattern_len;
-
- const char * cmd_ptr = cmd;
- size_t cmd_len = 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
* @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);
}
@@ -249,7 +152,7 @@
* @param context
* @return
*/
-static inline int flushData(scpi_t * context) {
+static int flushData(scpi_t * context) {
if (context && context->interface && context->interface->flush) {
return context->interface->flush(context);
} else {
@@ -262,7 +165,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 {
@@ -271,11 +174,11 @@
}
/**
- * Zapis nove radky na SCPI vystup
+ * Conditionaly write "New Line"
* @param context
- * @return pocet zapsanych znaku
+ * @return number of characters written
*/
-static inline size_t writeNewLine(scpi_t * context) {
+static size_t writeNewLine(scpi_t * context) {
if (context->output_count > 0) {
size_t len;
len = writeData(context, "\r\n", 2);
@@ -291,14 +194,14 @@
* @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;
- const scpi_command_t * cmd = context->paramlist.cmd;
-
SCPI_DEBUG_COMMAND(context);
- /* if callback exists - call command callback*/
+ /* 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);
@@ -328,7 +231,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;
--
Gitblit v1.9.1