From 1e139e410744eb791486dcee0ed4b1eebdf9a515 Mon Sep 17 00:00:00 2001
From: nancy.liao <huihui.liao@greentest.com.cn>
Date: 周四, 24 4月 2025 09:32:54 +0800
Subject: [PATCH] 提交修改

---
 libscpi/src/parser.c |   40 ++++++++++++++++++++++++++++++----------
 1 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/libscpi/src/parser.c b/libscpi/src/parser.c
index 0e49a8f..e51eb7a 100644
--- a/libscpi/src/parser.c
+++ b/libscpi/src/parser.c
@@ -55,7 +55,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;
     }
@@ -126,7 +127,9 @@
 
  //璐熷懡浠ゅ洖璋冪殑鎵ц銆佸弬鏁板鐞嗗拰閿欒绠＄悊
 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;
     // 鍏堟娴嬫槸鍚︿负鏌ヨ鍛戒护(浠�?缁撳熬)
@@ -177,17 +180,26 @@
  * @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++) {
+    int32_t i;
+    const scpi_command_t * cmd = NULL;
+    for (i = 0; i<context->cmdlistSize; i++) {
         cmd = &context->cmdlist[i];
-        if (matchCommand(cmd->pattern, header, len, NULL, 0, 0)) {
-            context->param_list.cmd = cmd;
+
+        bool result =test_match(cmd->pattern, header);
+        if(result)
+        {
+             context->param_list.cmd = &context->cmdlist[i];
             return TRUE;
         }
+        // if (matchCommand(cmd->pattern, header, len, NULL, 0, 0)) {
+        //     context->param_list.cmd = cmd;
+        //     return TRUE;
+        // }
     }
+    context->SCPIerror = RETURN_NotFind;
     return FALSE;
 }
 
@@ -229,6 +241,7 @@
 
         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) 
@@ -254,6 +267,7 @@
                 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;
             }
         }
@@ -310,6 +324,8 @@
     context->buffer.data = input_buffer;
     context->buffer.length = input_buffer_length;
     context->buffer.position = 0;
+
+
     SCPI_ErrorInit(context, error_queue_data, error_queue_size);
 }
 
@@ -372,7 +388,8 @@
             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;
@@ -1051,6 +1068,9 @@
     return result;
 }
 
+
+
+
 /**
  * Read signed/unsigned 32 bit integer parameter
  * @param context
@@ -1480,8 +1500,8 @@
  */
  //璇嗗埆瀹屾暣鐨凷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;

--
Gitblit v1.9.1