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/lexer.c |   69 ++++++++++++++++++++++------------
 1 files changed, 45 insertions(+), 24 deletions(-)

diff --git a/libscpi/src/lexer.c b/libscpi/src/lexer.c
index 5d5582d..07284c1 100644
--- a/libscpi/src/lexer.c
+++ b/libscpi/src/lexer.c
@@ -1,28 +1,29 @@
 /*-
- * Copyright (c) 2012-2013 Jan Breuer,
+ * BSD 2-Clause License
  *
- * All Rights Reserved
- * 
+ * Copyright (c) 2012-2018, 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:
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 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
- * DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * 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 COPYRIGHT HOLDERS AND CONTRIBUTORS "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
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 /**
@@ -340,7 +341,9 @@
         token->type = SCPI_TOKEN_UNKNOWN;
     }
 
-    return token->len;
+   return token->len;
+
+
 }
 
 /* 7.6.1 <COMMAND PROGRAM HEADER> */
@@ -402,12 +405,28 @@
  * @param token
  * @return 
  */
+
+ /*璇嗗埆鍜屽垎绫籗CPI鍛戒护澶�     
+    鍏叡鍛戒护澶� 浠�*璇嗗埆  濡�  *IDN?
+    澶嶅悎鍛戒护澶� 浠�:璇嗗埆 濡�  SYSTem:ERRor?
+    鍛戒护鏌ヨ  浠ワ紵璇嗗埆
+    鏅�氬懡浠わ細MEAS:VOLT
+    鏌ヨ鍛戒护锛歁EAS:VOLT?
+
+    @param state 璇嶆硶瑙ｆ瀽鍣�
+    @param token 鐢ㄤ簬瀛樺偍瑙ｆ瀽缁撴灉鐨則oken
+    @return 杩斿洖瑙ｆ瀽缁撴灉鐨勯暱搴�
+
+ */
 int scpiLex_ProgramHeader(lex_state_t * state, scpi_token_t * token) {
+    
+     // 璁板綍璧峰浣嶇疆 骞朵笖鍒濆鍖栫被鍨�
     int res;
     token->ptr = state->pos;
     token->type = SCPI_TOKEN_UNKNOWN;
 
     res = skipCommonProgramHeader(state);
+    // 瑙ｆ瀽鍒板叕鍏卞懡浠ゅご鍚庢鏌ユ煡璇㈢
     if (res >= SKIP_OK) {
         if (skipChr(state, '?') >= SKIP_OK) {
             token->type = SCPI_TOKEN_COMMON_QUERY_PROGRAM_HEADER;
@@ -417,6 +436,8 @@
     } else if (res <= SKIP_INCOMPLETE) {
         token->type = SCPI_TOKEN_INCOMPLETE_COMMON_PROGRAM_HEADER;
     } else if (res == SKIP_NONE) {
+
+         // 瑙ｆ瀽鍒板鍚堝懡浠ゅ悗妫�鏌ユ煡璇㈢
         res = skipCompoundProgramHeader(state);
 
         if (res >= SKIP_OK) {
@@ -429,7 +450,7 @@
             token->type = SCPI_TOKEN_INCOMPLETE_COMPOUND_PROGRAM_HEADER;
         }
     }
-
+    // 璁＄畻闀垮害
     if (token->type != SCPI_TOKEN_UNKNOWN) {
         token->len = state->pos - token->ptr;
     } else {

--
Gitblit v1.9.1