From aa03cdc4057ea720ea301651288846f740238d28 Mon Sep 17 00:00:00 2001
From: Chris Pavlina <cpavlin1@binghamton.edu>
Date: 周五, 12 12月 2014 17:55:59 +0800
Subject: [PATCH] Fixed type warning
---
libscpi/src/parser.c | 62 ++++++++++++++++++------------
1 files changed, 37 insertions(+), 25 deletions(-)
diff --git a/libscpi/src/parser.c b/libscpi/src/parser.c
index e333fc7..3b53665 100644
--- a/libscpi/src/parser.c
+++ b/libscpi/src/parser.c
@@ -39,7 +39,7 @@
#include "scpi/config.h"
#include "scpi/parser.h"
-#include "utils.h"
+#include "scpi/utils_private.h"
#include "scpi/error.h"
#include "scpi/constants.h"
@@ -48,11 +48,11 @@
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) {
@@ -126,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;
}
}
@@ -226,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;
@@ -236,6 +236,9 @@
context->paramlist.cmd = cmd;
context->paramlist.parameters = cmdline_ptr + cmd_len;
context->paramlist.length = cmdline_len - cmd_len;
+ context->paramlist.cmd_raw.data = cmdline_ptr;
+ context->paramlist.cmd_raw.length = cmd_len;
+ context->paramlist.cmd_raw.position = 0;
return TRUE;
}
}
@@ -249,12 +252,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;
@@ -263,16 +268,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;
@@ -333,11 +342,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);
}
}
@@ -383,7 +395,7 @@
* @param val
* @return
*/
-size_t SCPI_ResultBool(scpi_t * context, bool_t val) {
+size_t SCPI_ResultBool(scpi_t * context, scpi_bool_t val) {
return SCPI_ResultInt(context, val ? 1 : 0);
}
@@ -450,7 +462,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) {
@@ -478,7 +490,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;
@@ -508,7 +520,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;
@@ -534,12 +546,12 @@
/**
* Parse string parameter
* @param context
- * @param value
- * @param len
+ * @param value Pointer to string buffer where pointer to non-null terminated string will be returned
+ * @param len Length of returned non-null terminated string
* @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) {
@@ -565,12 +577,12 @@
/**
* Parse text parameter (can be inside "")
* @param context
- * @param value
- * @param len
+ * @param value Pointer to string buffer where pointer to non-null terminated string will be returned
+ * @param len Length of returned non-null terminated string
* @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) {
@@ -599,7 +611,7 @@
* @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;
@@ -639,7 +651,7 @@
* @param mandatory
* @return
*/
-bool_t SCPI_ParamChoice(scpi_t * context, const char * options[], int32_t * value, bool_t mandatory) {
+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;
--
Gitblit v1.9.1