From 1b5f5b0611b0633b58b3ddefba0bbfc2272091e1 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周三, 19 6月 2013 20:52:11 +0800
Subject: [PATCH] Converted command header parser
---
examples/test-parser/main.c | 4
libscpi/src/parser.c | 223 ++++++++++++++++++-------------------------
libscpi/test/test_lexer_parser.c | 21 +--
libscpi/inc/scpi/parser.h | 6
4 files changed, 108 insertions(+), 146 deletions(-)
diff --git a/examples/test-parser/main.c b/examples/test-parser/main.c
index 0ab2b2a..fef4bdb 100644
--- a/examples/test-parser/main.c
+++ b/examples/test-parser/main.c
@@ -101,9 +101,9 @@
TEST_SCPI_INPUT(""); // emulate command timeout
TEST_SCPI_INPUT("*ESE\r\n"); // cause error -109, missing parameter
- TEST_SCPI_INPUT("*ESE 0x20\r\n");
+ TEST_SCPI_INPUT("*ESE #H20\r\n");
- TEST_SCPI_INPUT("*SRE 0xFF\r\n");
+ TEST_SCPI_INPUT("*SRE #HFF\r\n");
TEST_SCPI_INPUT("IDN?\r\n"); // cause error -113, undefined header
diff --git a/libscpi/inc/scpi/parser.h b/libscpi/inc/scpi/parser.h
index a8d5959..172b0d4 100644
--- a/libscpi/inc/scpi/parser.h
+++ b/libscpi/inc/scpi/parser.h
@@ -46,8 +46,8 @@
#endif
void SCPI_Init(scpi_t * context);
- int SCPI_Input(scpi_t * context, const char * data, size_t len);
- int SCPI_Parse(scpi_t * context, const char * data, size_t len);
+ int SCPI_Input(scpi_t * context, const char * data, int len);
+ int SCPI_Parse(scpi_t * context, const char * data, int len);
size_t SCPI_ResultString(scpi_t * context, const char * data);
@@ -63,7 +63,7 @@
int SCPI_ParseProgramData(lex_state_t * state, token_t * token);
int SCPI_ParseAllProgramData(lex_state_t * state, token_t * token, int * numberOfParameters);
- int SCPI_DetectProgramMessageUnit(scpi_t * context);
+ int SCPI_DetectProgramMessageUnit(scpi_parser_state_t * state, const char * buffer, int len);
#ifdef __cplusplus
}
diff --git a/libscpi/src/parser.c b/libscpi/src/parser.c
index af66202..aa3806a 100644
--- a/libscpi/src/parser.c
+++ b/libscpi/src/parser.c
@@ -2,7 +2,7 @@
* Copyright (c) 2012-2013 Jan Breuer,
*
* All Rights Reserved
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
@@ -11,7 +11,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -28,10 +28,10 @@
/**
* @file scpi_parser.c
* @date Thu Nov 15 10:58:45 UTC 2012
- *
+ *
* @brief SCPI parser implementation
- *
- *
+ *
+ *
*/
#include <ctype.h>
@@ -43,19 +43,12 @@
#include "utils.h"
#include "scpi/error.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 void paramSkipBytes(scpi_t * context, size_t num);
static void paramSkipWhitespace(scpi_t * context);
static bool_t paramNext(scpi_t * context, bool_t mandatory);
/*
-int _strnicmp(const char* s1, const char* s2, size_t len) {
+int _strnicmp(const char* s1, const char* s2, int len) {
int result = 0;
int i;
@@ -71,71 +64,6 @@
return result;
}
*/
-
-/**
- * Find command termination character
- * @param cmd - input command
- * @param len - max search length
- * @return position of terminator or len
- */
-size_t cmdTerminatorPos(const char * cmd, size_t len) {
- const char * terminator = strnpbrk(cmd, len, "; \r\n\t");
- if (terminator == NULL) {
- return len;
- } else {
- return terminator - cmd;
- }
-}
-
-/**
- * Find command line separator
- * @param cmd - input command
- * @param len - max search length
- * @return pointer to line separator or NULL
- */
-const char * cmdlineSeparator(const char * cmd, size_t len) {
- return strnpbrk(cmd, len, ";\r\n");
-}
-
-/**
- * Find command line terminator
- * @param cmd - input command
- * @param len - max search length
- * @return pointer to command line terminator or NULL
- */
-const char * cmdlineTerminator(const char * cmd, size_t len) {
- return strnpbrk(cmd, len, "\r\n");
-}
-
-/**
- * Find command line separator position
- * @param cmd - input command
- * @param len - max search length
- * @return position of line separator or len
- */
-size_t cmdlineSeparatorPos(const char * cmd, size_t len) {
- const char * separator = cmdlineSeparator(cmd, len);
- if (separator == NULL) {
- return len;
- } else {
- return separator - cmd;
- }
-}
-
-/**
- * Find next part of command
- * @param cmd - input command
- * @param len - max search length
- * @return Pointer to next part of command
- */
-const char * cmdlineNext(const char * cmd, size_t len) {
- const char * separator = cmdlineSeparator(cmd, len);
- if (separator == NULL) {
- return cmd + len;
- } else {
- return separator + 1;
- }
-}
/**
* Write data to SCPI output
@@ -226,16 +154,14 @@
* @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 bool_t findCommandHeader(scpi_t * context, const char * header, int len) {
int32_t i;
const scpi_command_t * cmd;
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, header, len)) {
context->paramlist.cmd = cmd;
- context->paramlist.parameters = cmdline_ptr + cmd_len;
- context->paramlist.length = cmdline_len - cmd_len;
return TRUE;
}
}
@@ -249,30 +175,43 @@
* @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, const char * data, int len) {
int result = 0;
- const char * cmdline_end = data + len;
- const char * cmdline_ptr = data;
- size_t cmd_len;
- size_t cmdline_len;
+ scpi_parser_state_t * state;
+ int r;
if (context == NULL) {
return -1;
}
- while (cmdline_ptr < cmdline_end) {
+ state = &context->parser_state;
+
+ while (1) {
result = 0;
- cmd_len = cmdTerminatorPos(cmdline_ptr, cmdline_end - cmdline_ptr);
- cmdline_len = cmdlineSeparatorPos(cmdline_ptr, cmdline_end - cmdline_ptr);
- if (cmd_len > 0) {
- if (findCommand(context, cmdline_ptr, cmdline_len, cmd_len)) {
+
+ r = SCPI_DetectProgramMessageUnit(state, data, len);
+
+ if (state->programHeader.len > 0) {
+ if (findCommandHeader(context, state->programHeader.ptr, state->programHeader.len)) {
+
+ context->paramlist.parameters = state->programData.ptr;
+ context->paramlist.length = state->programData.len;
+
processCommand(context);
+
result = 1;
} else {
SCPI_ErrorPush(context, SCPI_ERROR_UNDEFINED_HEADER);
}
}
- cmdline_ptr = cmdlineNext(cmdline_ptr, cmdline_end - cmdline_ptr);
+
+ if (r < len) {
+ data += r;
+ len -= r;
+ } else {
+ break;
+ }
+
}
return result;
}
@@ -293,22 +232,24 @@
* Interface to the application. Adds data to system buffer and try to search
* command line termination. If the termination is found or if len=0, command
* parser is called.
- *
+ *
* @param context
* @param data - data to process
* @param len - length of data
- * @return
+ * @return
*/
-int SCPI_Input(scpi_t * context, const char * data, size_t len) {
+int SCPI_Input(scpi_t * context, const char * data, int len) {
int result = 0;
- const char * cmd_term;
+ size_t totcmdlen = 0;
+ int cmdlen = 0;
+
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;
+ int buffer_free;
+
buffer_free = context->buffer.length - context->buffer.position;
if (len > (buffer_free - 1)) {
return -1;
@@ -317,13 +258,19 @@
context->buffer.position += len;
context->buffer.data[context->buffer.position] = 0;
- ws = skipWhitespace(context->buffer.data, context->buffer.position);
- cmd_term = cmdlineTerminator(context->buffer.data + ws, context->buffer.position - ws);
- if (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;
+
+ while (1) {
+ cmdlen = SCPI_DetectProgramMessageUnit(&context->parser_state, context->buffer.data + totcmdlen, context->buffer.position - totcmdlen);
+ totcmdlen += cmdlen;
+ if (context->parser_state.termination == PmutNewLine) break;
+ if (context->parser_state.programHeader.type == TokUnknown) break;
+ if (totcmdlen >= context->buffer.position) break;
+ }
+
+ if (context->parser_state.termination == PmutNewLine) {
+ result = SCPI_Parse(context, context->buffer.data, totcmdlen);
+ memmove(context->buffer.data, context->buffer.data + totcmdlen, context->buffer.position - totcmdlen);
+ context->buffer.position -= totcmdlen;
}
}
@@ -336,7 +283,7 @@
* Write raw string result to the output
* @param context
* @param data
- * @return
+ * @return
*/
size_t SCPI_ResultString(scpi_t * context, const char * data) {
size_t len = strlen(data);
@@ -351,7 +298,7 @@
* Write integer value to the result
* @param context
* @param val
- * @return
+ * @return
*/
size_t SCPI_ResultInt(scpi_t * context, int32_t val) {
char buffer[12];
@@ -367,7 +314,7 @@
* Write double walue to the result
* @param context
* @param val
- * @return
+ * @return
*/
size_t SCPI_ResultDouble(scpi_t * context, double val) {
char buffer[32];
@@ -384,7 +331,7 @@
* Write string withn " to the result
* @param context
* @param data
- * @return
+ * @return
*/
size_t SCPI_ResultText(scpi_t * context, const char * data) {
size_t result = 0;
@@ -424,7 +371,7 @@
* Find next parameter
* @param context
* @param mandatory
- * @return
+ * @return
*/
bool_t paramNext(scpi_t * context, bool_t mandatory) {
paramSkipWhitespace(context);
@@ -452,7 +399,7 @@
* @param context
* @param value
* @param mandatory
- * @return
+ * @return
*/
bool_t SCPI_ParamInt(scpi_t * context, int32_t * value, bool_t mandatory) {
const char * param;
@@ -482,7 +429,7 @@
* @param context
* @param value
* @param mandatory
- * @return
+ * @return
*/
bool_t SCPI_ParamDouble(scpi_t * context, double * value, bool_t mandatory) {
const char * param;
@@ -513,7 +460,7 @@
* @param value
* @param len
* @param mandatory
- * @return
+ * @return
*/
bool_t SCPI_ParamString(scpi_t * context, const char ** value, size_t * len, bool_t mandatory) {
size_t length;
@@ -544,7 +491,7 @@
* @param value
* @param len
* @param mandatory
- * @return
+ * @return
*/
bool_t SCPI_ParamText(scpi_t * context, const char ** value, size_t * len, bool_t mandatory) {
size_t length;
@@ -617,6 +564,7 @@
if (result == 0) {
token->type = TokUnknown;
token->len = 0;
+ paramCount = -1;
break;
}
@@ -626,6 +574,7 @@
} else {
token->type = TokUnknown;
token->len = 0;
+ paramCount = -1;
break;
}
paramCount++;
@@ -641,33 +590,49 @@
return token->len;
}
-int SCPI_DetectProgramMessageUnit(scpi_t * context) {
- lex_state_t state;
+int SCPI_DetectProgramMessageUnit(scpi_parser_state_t * state, const char * buffer, int len) {
+ lex_state_t lex_state;
token_t tmp;
int result = 0;
- state.buffer = state.pos = context->buffer.data;
- state.len = context->buffer.position;
+ lex_state.buffer = lex_state.pos = buffer;
+ lex_state.len = len;
/* ignore whitespace at the begginig */
- SCPI_LexWhiteSpace(&state, &tmp);
+ SCPI_LexWhiteSpace(&lex_state, &tmp);
- SCPI_LexProgramHeader(&state, &context->parser_state.programHeader);
+ if (SCPI_LexProgramHeader(&lex_state, &state->programHeader) >= 0) {
+ if (SCPI_LexWhiteSpace(&lex_state, &tmp) > 0) {
+ SCPI_ParseAllProgramData(&lex_state, &state->programData, &state->numberOfParameters);
+ } else {
+ state->programData.len = 0;
+ state->programData.ptr = lex_state.pos;
+ state->programData.type = TokUnknown;
+ state->numberOfParameters = 0;
+ }
+ } else {
+ state->programHeader.len = 0;
+ state->programData.ptr = lex_state.buffer;
+ state->programHeader.type = TokUnknown;
- SCPI_LexWhiteSpace(&state, &tmp);
+ state->programData.len = 0;
+ state->programData.ptr = lex_state.buffer;
+ state->programData.type = TokUnknown;
+ state->numberOfParameters = 0;
+ }
- SCPI_ParseAllProgramData(&state, &context->parser_state.programData, &context->parser_state.numberOfParameters);
-
- if (result == 0) result = SCPI_LexNewLine(&state, &tmp);
- if (result == 0) result = SCPI_LexSemicolon(&state, &tmp);
+ if (result == 0) result = SCPI_LexNewLine(&lex_state, &tmp);
+ if (result == 0) result = SCPI_LexSemicolon(&lex_state, &tmp);
if (TokSemicolon == tmp.type) {
- context->parser_state.termination = PmutSemicolon;
+ state->termination = PmutSemicolon;
} else if (TokNewLine == tmp.type) {
- context->parser_state.termination = PmutNewLine;
+ state->termination = PmutNewLine;
} else {
- context->parser_state.termination = PmutNone;
+ state->termination = PmutNone;
}
+
+ return lex_state.pos - lex_state.buffer;
}
diff --git a/libscpi/test/test_lexer_parser.c b/libscpi/test/test_lexer_parser.c
index 4b94e13..13dd4e7 100644
--- a/libscpi/test/test_lexer_parser.c
+++ b/libscpi/test/test_lexer_parser.c
@@ -230,7 +230,7 @@
void testAllProgramData(void) {
TEST_ALL_TOKEN("1.5E12 V", SCPI_ParseAllProgramData, 0, 8, TokAllProgramData, 1);
TEST_ALL_TOKEN("1.5E12 V, abc_213as564, 10, #H123fe5A", SCPI_ParseAllProgramData, 0, 37, TokAllProgramData, 4);
- TEST_ALL_TOKEN("1.5E12 V, ", SCPI_ParseAllProgramData, 0, 0, TokUnknown, 1);
+ TEST_ALL_TOKEN("1.5E12 V, ", SCPI_ParseAllProgramData, 0, 0, TokUnknown, -1);
TEST_ALL_TOKEN("#12\r\n, 1.5E12 V", SCPI_ParseAllProgramData, 0, 15, TokAllProgramData, 2);
TEST_ALL_TOKEN(" ( 1 + 2 ) ,#12\r\n, 1.5E12 V", SCPI_ParseAllProgramData, 0, 27, TokAllProgramData, 3);
TEST_ALL_TOKEN("\"ahoj\" , #12AB", SCPI_ParseAllProgramData, 0, 14, TokAllProgramData, 2);
@@ -239,17 +239,14 @@
#define TEST_DETECT(s, h, ht, d, dc, t) do { \
const char * str = s; \
- scpi_t context; \
+ scpi_parser_state_t state; \
int result; \
- context.buffer.data = s; \
- context.buffer.length = strlen(s); \
- context.buffer.position = context.buffer.length; \
- result = SCPI_DetectProgramMessageUnit(&context); \
- CU_ASSERT_EQUAL(context.parser_state.programHeader.ptr, str+h); \
- CU_ASSERT_EQUAL(context.parser_state.programHeader.type, ht); \
- CU_ASSERT_EQUAL(context.parser_state.programData.ptr, str+d); \
- CU_ASSERT_EQUAL(context.parser_state.numberOfParameters, dc); \
- CU_ASSERT_EQUAL(context.parser_state.termination, t); \
+ result = SCPI_DetectProgramMessageUnit(&state, str, strlen(str)); \
+ CU_ASSERT_EQUAL(state.programHeader.ptr, str+h); \
+ CU_ASSERT_EQUAL(state.programHeader.type, ht); \
+ CU_ASSERT_EQUAL(state.programData.ptr, str + d); \
+ CU_ASSERT_EQUAL(state.numberOfParameters, dc); \
+ CU_ASSERT_EQUAL(state.termination, t); \
} while(0)
void testDetectProgramMessageUnit(void) {
@@ -258,7 +255,7 @@
TEST_DETECT(" MEAS:VOLT:DC? 1.2 V\r\n", 1, TokCompoundQueryProgramHeader, 15, 1, PmutNewLine);
TEST_DETECT(" CONF:VOLT:DC 1.2 V, 100mv;", 1, TokCompoundProgramHeader, 14, 2, PmutSemicolon);
TEST_DETECT(" CONF:VOLT:DC 1.2 V, 100mv", 1, TokCompoundProgramHeader, 14, 2, PmutNone);
- TEST_DETECT(" CONF:VOLT:DC 1.2 V, \r\n", 1, TokCompoundProgramHeader, 14, 1, PmutNewLine);
+ TEST_DETECT(" CONF:VOLT:DC 1.2 V, \r\n", 1, TokCompoundProgramHeader, 14, -1, PmutNewLine);
}
int main() {
--
Gitblit v1.9.1