From 6860a39880e2a902f06e6221139e03eab5cde780 Mon Sep 17 00:00:00 2001
From: Karl Palsson <karlp@tweak.net.au>
Date: 周二, 28 1月 2014 08:29:55 +0800
Subject: [PATCH] Update documentation to reflect reality
---
libscpi/src/parser.c | 97 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 76 insertions(+), 21 deletions(-)
diff --git a/libscpi/src/parser.c b/libscpi/src/parser.c
index 59713c6..1f4e9d7 100644
--- a/libscpi/src/parser.c
+++ b/libscpi/src/parser.c
@@ -41,17 +41,18 @@
#include "scpi/parser.h"
#include "utils.h"
#include "scpi/error.h"
+#include "scpi/constants.h"
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 size_t skipCmdLine(const char * cmd, size_t len);
static void paramSkipBytes(scpi_t * context, size_t num);
static void paramSkipWhitespace(scpi_t * context);
-static bool_t paramNext(scpi_t * context, bool_t mandatory);
+static scpi_bool_t paramNext(scpi_t * context, scpi_bool_t mandatory);
/*
int _strnicmp(const char* s1, const char* s2, size_t len) {
@@ -125,14 +126,14 @@
* Find next part of command
* @param cmd - input command
* @param len - max search length
- * @return Pointer to next part of command
+ * @return number of characters to be skipped
*/
-const char * cmdlineNext(const char * cmd, size_t len) {
+size_t skipCmdLine(const char * cmd, size_t len) {
const char * separator = cmdlineSeparator(cmd, len);
if (separator == NULL) {
- return cmd + len;
+ return len;
} else {
- return separator + 1;
+ return separator + 1 - cmd;
}
}
@@ -225,7 +226,7 @@
* @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) {
+static scpi_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;
@@ -248,12 +249,14 @@
* @param len - command line length
* @return 1 if the last evaluated command was found
*/
-int SCPI_Parse(scpi_t * context, const char * data, size_t len) {
+int SCPI_Parse(scpi_t * context, char * data, size_t len) {
int result = 0;
const char * cmdline_end = data + len;
- const char * cmdline_ptr = data;
+ char * cmdline_ptr = data;
size_t cmd_len;
size_t cmdline_len;
+ char * cmdline_ptr_prev = NULL;
+ size_t cmd_len_prev = 0;
if (context == NULL) {
return -1;
@@ -262,16 +265,20 @@
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) {
+ composeCompoundCommand(cmdline_ptr_prev, cmd_len_prev,
+ &cmdline_ptr, &cmd_len);
+ cmdline_len = cmdlineSeparatorPos(cmdline_ptr, cmdline_end - cmdline_ptr);
if(findCommand(context, cmdline_ptr, cmdline_len, cmd_len)) {
processCommand(context);
result = 1;
+ cmdline_ptr_prev = cmdline_ptr;
+ cmd_len_prev = cmd_len;
} else {
SCPI_ErrorPush(context, SCPI_ERROR_UNDEFINED_HEADER);
}
}
- cmdline_ptr = cmdlineNext(cmdline_ptr, cmdline_end - cmdline_ptr);
+ cmdline_ptr += skipCmdLine(cmdline_ptr, cmdline_end - cmdline_ptr);
cmdline_ptr += skipWhitespace(cmdline_ptr, cmdline_end - cmdline_ptr);
}
return result;
@@ -285,6 +292,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);
}
@@ -319,11 +339,14 @@
ws = skipWhitespace(context->buffer.data, context->buffer.position);
cmd_term = cmdlineTerminator(context->buffer.data + ws, context->buffer.position - ws);
- if (cmd_term != NULL) {
+ while (cmd_term != NULL) {
int curr_len = cmd_term - context->buffer.data;
result = SCPI_Parse(context, context->buffer.data + ws, curr_len - ws);
memmove(context->buffer.data, cmd_term, context->buffer.position - curr_len);
context->buffer.position -= curr_len;
+
+ ws = skipWhitespace(context->buffer.data, context->buffer.position);
+ cmd_term = cmdlineTerminator(context->buffer.data + ws, context->buffer.position - ws);
}
}
@@ -369,8 +392,8 @@
* @param val
* @return
*/
-size_t SCPI_ResultBool(scpi_t * context, bool_t val) {
- return SCPI_ResultInt(context, val);
+size_t SCPI_ResultBool(scpi_t * context, scpi_bool_t val) {
+ return SCPI_ResultInt(context, val ? 1 : 0);
}
/**
@@ -436,7 +459,7 @@
* @param mandatory
* @return
*/
-bool_t paramNext(scpi_t * context, bool_t mandatory) {
+scpi_bool_t paramNext(scpi_t * context, scpi_bool_t mandatory) {
paramSkipWhitespace(context);
if (context->paramlist.length == 0) {
if (mandatory) {
@@ -464,7 +487,7 @@
* @param mandatory
* @return
*/
-bool_t SCPI_ParamInt(scpi_t * context, int32_t * value, bool_t mandatory) {
+scpi_bool_t SCPI_ParamInt(scpi_t * context, int32_t * value, scpi_bool_t mandatory) {
const char * param;
size_t param_len;
size_t num_len;
@@ -494,7 +517,7 @@
* @param mandatory
* @return
*/
-bool_t SCPI_ParamDouble(scpi_t * context, double * value, bool_t mandatory) {
+scpi_bool_t SCPI_ParamDouble(scpi_t * context, double * value, scpi_bool_t mandatory) {
const char * param;
size_t param_len;
size_t num_len;
@@ -525,7 +548,7 @@
* @param mandatory
* @return
*/
-bool_t SCPI_ParamString(scpi_t * context, const char ** value, size_t * len, bool_t mandatory) {
+scpi_bool_t SCPI_ParamString(scpi_t * context, const char ** value, size_t * len, scpi_bool_t mandatory) {
size_t length;
if (!value || !len) {
@@ -556,7 +579,7 @@
* @param mandatory
* @return
*/
-bool_t SCPI_ParamText(scpi_t * context, const char ** value, size_t * len, bool_t mandatory) {
+scpi_bool_t SCPI_ParamText(scpi_t * context, const char ** value, size_t * len, scpi_bool_t mandatory) {
size_t length;
if (!value || !len) {
@@ -579,13 +602,13 @@
}
/**
- * Parse boolean parameter
+ * 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) {
+scpi_bool_t SCPI_ParamBool(scpi_t * context, scpi_bool_t * value, scpi_bool_t mandatory) {
const char * param;
size_t param_len;
size_t num_len;
@@ -617,3 +640,35 @@
return TRUE;
}
+/**
+ * Parse choice parameter
+ * @param context
+ * @param options
+ * @param value
+ * @param mandatory
+ * @return
+ */
+scpi_bool_t SCPI_ParamChoice(scpi_t * context, const char * options[], int32_t * value, scpi_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