From 11f2f2e329ef404d0e9c022cb2f9fbbb45bae285 Mon Sep 17 00:00:00 2001
From: nancy.liao <huihui.liao@greentest.com.cn>
Date: 周日, 27 4月 2025 17:33:31 +0800
Subject: [PATCH] 完成了SCPI命令语法分析器的完整规则
---
libscpi/src/parser.c | 131 +++++++++++++++++++++++++++++++++----------
1 files changed, 100 insertions(+), 31 deletions(-)
diff --git a/libscpi/src/parser.c b/libscpi/src/parser.c
index de14418..a6376cf 100644
--- a/libscpi/src/parser.c
+++ b/libscpi/src/parser.c
@@ -37,6 +37,7 @@
#include <ctype.h>
#include <string.h>
+#include "scpi/externinterface.h"
#include "scpi/config.h"
#include "scpi/parser.h"
@@ -45,7 +46,7 @@
#include "scpi/error.h"
#include "scpi/constants.h"
#include "scpi/utils.h"
-
+#include "scpi/externinterface.h"
/**
* Write data to SCPI output
* @param context
@@ -55,7 +56,8 @@
*/
static size_t writeData(scpi_t * context, const char * data, size_t len) {
if ((len > 0) && (data != NULL)) {
- return context->interface->write(context, data, len);
+ return 0;
+ // return context->interface->write(context, data, len);
} else {
return 0;
}
@@ -123,23 +125,30 @@
* Process command
* @param context
*/
+
+ //璐熷懡浠ゅ洖璋冪殑鎵ц銆佸弬鏁板鐞嗗拰閿欒绠＄悊
static scpi_bool_t processCommand(scpi_t * context) {
+ //杩欎釜鍦版柟淇敼涓� 璇籧omdlist->pattern
const scpi_command_t * cmd = context->param_list.cmd;
+ //const scpi_command_t * cmd = context->cmdlist->pattern;
lex_state_t * state = &context->param_list.lex_state;
scpi_bool_t result = TRUE;
+ // 鍏堟娴嬫槸鍚︿负鏌ヨ鍛戒护(浠�?缁撳熬)
scpi_bool_t is_query = context->param_list.cmd_raw.data[context->param_list.cmd_raw.length - 1] == '?';
/* conditionally write ; */
+ //杈撳嚭鍒嗛殧绗�
if(!context->first_output && is_query) {
writeData(context, ";", 1);
}
-
+ //閲嶇疆context涓婁笅鏂囩姸鎬�
context->cmd_error = FALSE;
context->output_count = 0;
context->input_count = 0;
context->arbitrary_remaining = 0;
/* if callback exists - call command callback */
+ //鍛戒护鍥炶皟鎵ц scpi_commands[]鏌ユ壘杩欓噷闈㈢殑鍛戒护绫诲瀷
if (cmd->callback != NULL) {
if ((cmd->callback(context) != SCPI_RES_OK)) {
if (!context->cmd_error) {
@@ -158,6 +167,7 @@
}
/* set error if command callback did not read all parameters */
+ //妫�鏌ュ弬鏁板畬鏁存��
if (state->pos < (state->buffer + state->len) && !context->cmd_error) {
SCPI_ErrorPush(context, SCPI_ERROR_PARAMETER_NOT_ALLOWED);
result = FALSE;
@@ -171,17 +181,18 @@
* @param context
* @result TRUE if context->paramlist is filled with correct values
*/
-static scpi_bool_t findCommandHeader(scpi_t * context, const char * header, int len) {
- int32_t i;
- const scpi_command_t * cmd;
+scpi_bool_t findCommandHeader(scpi_t * context, const char * header, int len)
+{
- for (i = 0; context->cmdlist[i].pattern != NULL; i++) {
- cmd = &context->cmdlist[i];
- if (matchCommand(cmd->pattern, header, len, NULL, 0, 0)) {
- context->param_list.cmd = cmd;
+ for(int i=0;i<get_pattern_count();i++)
+ {
+ if( match_segments_global(header,i) )
+ {
+ context->param_list.cmd = &context->cmdlist[i];
return TRUE;
}
}
+ context->SCPIerror = RETURN_NotFind;
return FALSE;
}
@@ -191,6 +202,15 @@
* @param data - complete command line
* @param len - command line length
* @return FALSE if there was some error during evaluation of commands
+ */
+
+ /*
+ 鎸囦护瑙ｆ瀽鍑芥暟
+ 瑙ｆ瀽娴佺▼锛�
+ 1.鍏堟鏌ュ懡浠ゅご鏄惁鍚堟硶锛屾鏌ュ叕鍏卞懡浠� 鎴栬�呭鍚堝懡浠� 浠ュ強鏅�氬懡浠ゆ垨鑰呮煡璇㈠懡浠�
+ 2.鍛戒护鍚堟硶鍚庣粍鍚堝鍚堝懡浠� 濡�* :: ? 涓夌绫诲瀷
+ 3.閫氳繃瀹屾暣鐨勫懡浠ゆ煡鎵� 鏄惁鏈夌浉瀵瑰簲鐨勭被鍨�
+
*/
scpi_bool_t SCPI_Parse(scpi_t * context, char * data, int len) {
scpi_bool_t result = TRUE;
@@ -202,20 +222,26 @@
return FALSE;
}
+ //鍒濆鍖朿ontext鐨勮В鏋愬櫒鐘舵��
state = &context->parser_state;
context->output_count = 0;
context->first_output = TRUE;
while (1) {
+
+ //鍒濇鐨勬鏌ュ懡浠ゆ槸鍚﹀悎娉�
r = scpiParser_detectProgramMessageUnit(state, data, len);
if (state->programHeader.type == SCPI_TOKEN_INVALID) {
SCPI_ErrorPush(context, SCPI_ERROR_INVALID_CHARACTER);
+ context->SCPIerror = RETURN_IllegalCommand;
result = FALSE;
- } else if (state->programHeader.len > 0) {
-
+ }
+ else if (state->programHeader.len > 0)
+ {
+ //鍛戒护鏈夋晥寮�濮嬪鐞�
composeCompoundCommand(&cmd_prev, &state->programHeader);
-
+ //鏌ユ壘鍛戒护鍚庡苟涓旇缃В鏋愮姸鎬佸苟涓旀墽琛屽懡浠�
if (findCommandHeader(context, state->programHeader.ptr, state->programHeader.len)) {
context->param_list.lex_state.buffer = state->programData.ptr;
@@ -224,15 +250,17 @@
context->param_list.cmd_raw.data = state->programHeader.ptr;
context->param_list.cmd_raw.position = 0;
context->param_list.cmd_raw.length = state->programHeader.len;
-
+ //鍛戒护鏌ユ壘
result &= processCommand(context);
cmd_prev = state->programHeader;
} else {
+ //濡傛灉鍛戒护娌℃湁瀹氫箟鍒欐姏鍑洪敊璇�
/* place undefined header with error */
/* calculate length of errorenous header and trim \r\n */
size_t r2 = r;
while (r2 > 0 && (data[r2 - 1] == '\r' || data[r2 - 1] == '\n')) r2--;
SCPI_ErrorPushEx(context, SCPI_ERROR_UNDEFINED_HEADER, data, r2);
+ context->SCPIerror = RETURN_UnDefine;
result = FALSE;
}
}
@@ -247,6 +275,7 @@
}
/* conditionally write new line */
+ //瑙ｆ瀽瀹屾瘯浠ュ悗绛夊緟涓嬩竴鏉℃寚浠ょ殑杈撳叆
writeNewLine(context);
return result;
@@ -257,7 +286,9 @@
* @param context
* @param commands
* @param interface
- * @param units
+ * @param unitsfind_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets)
+set(project_link_libraries Qt::Widgets)
+
* @param idn1
* @param idn2
* @param idn3
@@ -279,12 +310,15 @@
context->interface = interface;
context->units = units;
context->idn[0] = idn1;
+
context->idn[1] = idn2;
context->idn[2] = idn3;
context->idn[3] = idn4;
context->buffer.data = input_buffer;
context->buffer.length = input_buffer_length;
context->buffer.position = 0;
+
+
SCPI_ErrorInit(context, error_queue_data, error_queue_size);
}
@@ -296,7 +330,9 @@
* @param data
* @param len
* @return
- */
+ */find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets)
+ set(project_link_libraries Qt::Widgets)
+
void SCPI_InitHeap(scpi_t * context,
char * error_info_heap, size_t error_info_heap_length) {
scpiheap_init(&context->error_info_heap, error_info_heap, error_info_heap_length);
@@ -313,25 +349,40 @@
* @param len - length of data
* @return
*/
-scpi_bool_t SCPI_Input(scpi_t * context, const char * data, int len) {
- scpi_bool_t result = TRUE;
+
+ /*
+ 杈撳叆澶勭悊鍑芥暟锛岃緭鍏ユ暟鎹苟涓斿鐞嗗畬鏁寸殑SCPI鍛戒护
+ context:涓婁笅鏂囩殑context
+ data锛氳緭鍏ョ殑鏁版嵁
+ len锛氳緭鍏ユ暟鎹殑闀垮害
+ */
+scpi_bool_t SCPI_Input(scpi_t * context, const char * data, int len)
+{
+ scpi_bool_t result = FALSE;
size_t totcmdlen = 0;
int cmdlen = 0;
-
+ //褰撻暱搴︿负0鏃� 瑙ｆ瀽褰撳墠鐨勬暟鎹� 骞朵笖娓呯┖context鐨刡uff鏍囪浣�
if (len == 0) {
context->buffer.data[context->buffer.position] = 0;
+ //SCPI_Parse 瑙ｆ瀽瀹屾垚鍚庝細杩斿洖鐘舵��
result = SCPI_Parse(context, context->buffer.data, context->buffer.position);
context->buffer.position = 0;
} else {
+ /*
+ 濡傛灉闀垮害婧㈠嚭鍒欐寚浠ゆ棤鏁�
+ 姝ｅ父鎯呭喌涓嬩細灏嗚緭鍏ョ殑鎸囦护浼犵粰context鍐�
+ */
int buffer_free;
buffer_free = context->buffer.length - context->buffer.position;
+
if (len > (buffer_free - 1)) {
/* Input buffer overrun - invalidate buffer */
context->buffer.position = 0;
context->buffer.data[context->buffer.position] = 0;
SCPI_ErrorPush(context, SCPI_ERROR_INPUT_BUFFER_OVERRUN);
- return FALSE;
+ context->SCPIerror = RETURN_LengthOverFlow;
+ return result;
}
memcpy(&context->buffer.data[context->buffer.position], data, len);
context->buffer.position += len;
@@ -339,9 +390,10 @@
while (1) {
+ //鍒濇妫�鏌ュ懡浠ゆ槸鍚﹀悎娉�
cmdlen = scpiParser_detectProgramMessageUnit(&context->parser_state, context->buffer.data + totcmdlen, context->buffer.position - totcmdlen);
totcmdlen += cmdlen;
-
+ //濡傛灉鍛戒护鍚堟硶鍒欏皢鍛戒护瑙ｆ瀽,鍚屾椂鍒犻櫎context鍐呯殑宸茬粡澶勭悊瀹屾垚鐨勫懡浠�
if (context->parser_state.termination == SCPI_MESSAGE_TERMINATION_NL) {
result = SCPI_Parse(context, context->buffer.data, totcmdlen);
memmove(context->buffer.data, context->buffer.data + totcmdlen, context->buffer.position - totcmdlen);
@@ -448,6 +500,7 @@
*/
size_t SCPI_ResultInt32(scpi_t * context, int32_t val) {
return resultUInt32BaseSign(context, val, 10, TRUE);
+
}
/**
@@ -1008,6 +1061,9 @@
return result;
}
+
+
+
/**
* Read signed/unsigned 32 bit integer parameter
* @param context
@@ -1435,25 +1491,36 @@
* @param len
* @return
*/
+ //璇嗗埆瀹屾暣鐨凷CPI鍛戒护
int scpiParser_detectProgramMessageUnit(scpi_parser_state_t * state, char * buffer, int len) {
- lex_state_t lex_state;
- scpi_token_t tmp;
+ lex_state_t lex_state = {};
+ scpi_token_t tmp = {};
int result = 0;
-
+ // 鍒濆鍖栬瘝娉曞垎鏋�
lex_state.buffer = lex_state.pos = buffer;
lex_state.len = len;
+ // 閲嶇疆鍙傛暟璁℃暟鍣�
state->numberOfParameters = 0;
/* ignore whitespace at the begginig */
+ //棰勫鐞� 璺宠繃绌虹櫧瀛楃
scpiLex_WhiteSpace(&lex_state, &tmp);
-
- if (scpiLex_ProgramHeader(&lex_state, &state->programHeader) >= 0) {
- if (scpiLex_WhiteSpace(&lex_state, &tmp) > 0) {
+ //鎵惧埌鍛戒护澶村悗瑙ｆ瀽鎵�鏈夊懡浠�
+ if (scpiLex_ProgramHeader(&lex_state, &state->programHeader) >= 0)
+ {
+ if (scpiLex_WhiteSpace(&lex_state, &tmp) > 0)
+ {
scpiParser_parseAllProgramData(&lex_state, &state->programData, &state->numberOfParameters);
- } else {
+ }
+ else
+ {
+ //鏃犳晥鍛戒护鏍囪
invalidateToken(&state->programData, lex_state.pos);
}
- } else {
+ }
+ else
+ {
+ //澶勭悊瑙ｆ瀽澶辫触鐨勫懡浠ゅご
invalidateToken(&state->programHeader, lex_state.buffer);
invalidateToken(&state->programData, lex_state.buffer);
}
@@ -1461,15 +1528,17 @@
if (result == 0) result = scpiLex_NewLine(&lex_state, &tmp);
if (result == 0) result = scpiLex_Semicolon(&lex_state, &tmp);
+ //鏃犳晥瀛楃澶勭悊
if (!scpiLex_IsEos(&lex_state) && (result == 0)) {
+ // 璺宠繃鏃犳晥瀛楃
lex_state.pos++;
-
+ //鏍囪浣嶅懡浠ゅご瑙ｆ瀽澶辫触
state->programHeader.len = 1;
state->programHeader.type = SCPI_TOKEN_INVALID;
invalidateToken(&state->programData, lex_state.buffer);
}
-
+ //璁剧疆缁堟绗�
if (SCPI_TOKEN_SEMICOLON == tmp.type) {
state->termination = SCPI_MESSAGE_TERMINATION_SEMICOLON;
} else if (SCPI_TOKEN_NL == tmp.type) {
--
Gitblit v1.9.1