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 | 182 ++++++++++++++++++++++++++++++---------------
1 files changed, 122 insertions(+), 60 deletions(-)
diff --git a/libscpi/src/lexer.c b/libscpi/src/lexer.c
index c0505cc..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.
*/
/**
@@ -160,7 +161,7 @@
/* skip characters */
/* 7.4.1 <PROGRAM MESSAGE UNIT SEPARATOR>*/
-// TODO: static int skipProgramMessageUnitSeparator(lex_state_t * state)
+/* TODO: static int skipProgramMessageUnitSeparator(lex_state_t * state) */
/**
* Skip all whitespaces
@@ -178,10 +179,10 @@
}
/* 7.4.2 <PROGRAM DATA SEPARATOR> */
-// static int skipProgramDataSeparator(lex_state_t * state)
+/* static int skipProgramDataSeparator(lex_state_t * state) */
/* 7.5.2 <PROGRAM MESSAGE TERMINATOR> */
-// static int skipProgramMessageTerminator(lex_state_t * state)
+/* static int skipProgramMessageTerminator(lex_state_t * state) */
/**
* Skip decimal digit
@@ -189,7 +190,7 @@
* @return
*/
static int skipDigit(lex_state_t * state) {
- if (!iseos(state) && isdigit(state->pos[0])) {
+ if (!iseos(state) && isdigit((uint8_t)(state->pos[0]))) {
state->pos++;
return SKIP_OK;
} else {
@@ -204,7 +205,7 @@
*/
static int skipNumbers(lex_state_t * state) {
int someNumbers = 0;
- while (!iseos(state) && isdigit(state->pos[0])) {
+ while (!iseos(state) && isdigit((uint8_t)(state->pos[0]))) {
state->pos++;
someNumbers++;
}
@@ -232,7 +233,7 @@
*/
static int skipAlpha(lex_state_t * state) {
int someLetters = 0;
- while (!iseos(state) && isalpha(state->pos[0])) {
+ while (!iseos(state) && isalpha((uint8_t)(state->pos[0]))) {
state->pos++;
someLetters++;
}
@@ -245,7 +246,7 @@
* @param chr
* @return
*/
-static int skipChr(lex_state_t * state, int chr) {
+static int skipChr(lex_state_t * state, char chr) {
if (!iseos(state) && ischr(state, chr)) {
state->pos++;
return SKIP_OK;
@@ -305,9 +306,9 @@
*/
static int skipProgramMnemonic(lex_state_t * state) {
const char * startPos = state->pos;
- if (!iseos(state) && isalpha(state->pos[0])) {
+ if (!iseos(state) && isalpha((uint8_t)(state->pos[0]))) {
state->pos++;
- while (!iseos(state) && (isalnum(state->pos[0]) || ischr(state, '_'))) {
+ while (!iseos(state) && (isalnum((uint8_t)(state->pos[0])) || ischr(state, '_'))) {
state->pos++;
}
}
@@ -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 {
@@ -451,9 +472,9 @@
int scpiLex_CharacterProgramData(lex_state_t * state, scpi_token_t * token) {
token->ptr = state->pos;
- if (!iseos(state) && isalpha(state->pos[0])) {
+ if (!iseos(state) && isalpha((uint8_t)(state->pos[0]))) {
state->pos++;
- while (!iseos(state) && (isalnum(state->pos[0]) || ischr(state, '_'))) {
+ while (!iseos(state) && (isalnum((uint8_t)(state->pos[0])) || ischr(state, '_'))) {
state->pos++;
}
}
@@ -535,7 +556,7 @@
skipChr(state, '/');
- // TODO: strict parsing : SLASH? (ALPHA+ (MINUS? DIGIT)?) ((SLASH | DOT) (ALPHA+ (MINUS? DIGIT)?))*
+ /* TODO: strict parsing : SLASH? (ALPHA+ (MINUS? DIGIT)?) ((SLASH | DOT) (ALPHA+ (MINUS? DIGIT)?))* */
if (skipAlpha(state)) {
skipChr(state, '-');
skipDigit(state);
@@ -562,7 +583,7 @@
/* 7.7.4 <NONDECIMAL NUMERIC PROGRAM DATA> */
static int skipHexNum(lex_state_t * state) {
int someNumbers = 0;
- while (!iseos(state) && isxdigit(state->pos[0])) {
+ while (!iseos(state) && isxdigit((uint8_t)(state->pos[0]))) {
state->pos++;
someNumbers++;
}
@@ -594,8 +615,8 @@
* @return
*/
int scpiLex_NondecimalNumericData(lex_state_t * state, scpi_token_t * token) {
- token->ptr = state->pos;
int someNumbers = 0;
+ token->ptr = state->pos;
if (skipChr(state, '#')) {
if (!iseos(state)) {
if (isH(state->pos[0])) {
@@ -615,7 +636,7 @@
}
if (someNumbers) {
- token->ptr += 2; // ignore number prefix
+ token->ptr += 2; /* ignore number prefix */
token->len = state->pos - token->ptr;
} else {
token->type = SCPI_TOKEN_UNKNOWN;
@@ -630,7 +651,7 @@
return (c >= 0) && (c <= 0x7f);
}
-static int skipQuoteProgramData(lex_state_t * state, int quote) {
+static void skipQuoteProgramData(lex_state_t * state, char quote) {
while (!iseos(state)) {
if (isascii7bit(state->pos[0]) && !ischr(state, quote)) {
state->pos++;
@@ -642,15 +663,17 @@
state->pos--;
break;
}
+ } else {
+ break;
}
}
}
-static int skipDoubleQuoteProgramData(lex_state_t * state) {
+static void skipDoubleQuoteProgramData(lex_state_t * state) {
skipQuoteProgramData(state, '"');
}
-static int skipSingleQuoteProgramData(lex_state_t * state) {
+static void skipSingleQuoteProgramData(lex_state_t * state) {
skipQuoteProgramData(state, '\'');
}
@@ -690,15 +713,15 @@
token->len = state->pos - token->ptr;
if ((token->len > 0)) {
- token->ptr++;
- token->len -= 2;
+ /* token->ptr++;
+ * token->len -= 2; */
} else {
token->type = SCPI_TOKEN_UNKNOWN;
state->pos = token->ptr;
token->len = 0;
}
- return token->len > 0 ? token->len + 2 : 0;
+ return token->len > 0 ? token->len : 0;
}
/* 7.7.6 <ARBITRARY BLOCK PROGRAM DATA> */
@@ -716,8 +739,8 @@
int i;
int arbitraryBlockLength = 0;
const char * ptr = state->pos;
- token->ptr = state->pos;
int validData = -1;
+ token->ptr = state->pos;
if (skipChr(state, '#')) {
if (!iseos(state) && isNonzeroDigit(state->pos[0])) {
@@ -726,7 +749,7 @@
state->pos++;
for (; i > 0; i--) {
- if (!iseos(state) && isdigit(state->pos[0])) {
+ if (!iseos(state) && isdigit((uint8_t)(state->pos[0]))) {
arbitraryBlockLength *= 10;
arbitraryBlockLength += (state->pos[0] - '0');
state->pos++;
@@ -741,6 +764,8 @@
token->ptr = state->pos - arbitraryBlockLength;
token->len = arbitraryBlockLength;
validData = 1;
+ } else {
+ validData = 0;
}
} else if (iseos(state)) {
validData = 0;
@@ -751,15 +776,15 @@
}
if (validData == 1) {
- // valid
+ /* valid */
token->type = SCPI_TOKEN_ARBITRARY_BLOCK_PROGRAM_DATA;
} else if (validData == 0) {
- // incomplete
+ /* incomplete */
token->type = SCPI_TOKEN_UNKNOWN;
token->len = 0;
state->pos = state->buffer + state->len;
} else {
- // invalid
+ /* invalid */
token->type = SCPI_TOKEN_UNKNOWN;
state->pos = token->ptr;
token->len = 0;
@@ -771,12 +796,12 @@
/* 7.7.7 <EXPRESSION PROGRAM DATA> */
static int isProgramExpression(int c) {
if ((c >= 0x20) && (c <= 0x7e)) {
- if ((c != 0x22)
- && (c != 0x23)
- && (c != 0x27)
- && (c != 0x28)
- && (c != 0x29)
- && (c != 0x3B)) {
+ if ((c != '"')
+ && (c != '#')
+ && (c != '\'')
+ && (c != '(')
+ && (c != ')')
+ && (c != ';')) {
return 1;
}
}
@@ -790,7 +815,7 @@
}
}
-// TODO: 7.7.7.2-2 recursive - any program data
+/* TODO: 7.7.7.2-2 recursive - any program data */
/**
* Detect token Expression
@@ -865,6 +890,46 @@
}
/**
+ * Detect token colon
+ * @param state
+ * @param token
+ * @return
+ */
+int scpiLex_Colon(lex_state_t * state, scpi_token_t * token) {
+ token->ptr = state->pos;
+
+ if (skipChr(state, ':')) {
+ token->len = 1;
+ token->type = SCPI_TOKEN_COLON;
+ } else {
+ token->len = 0;
+ token->type = SCPI_TOKEN_UNKNOWN;
+ }
+
+ return token->len;
+}
+
+/**
+ * Detect specified character
+ * @param state
+ * @param token
+ * @return
+ */
+int scpiLex_SpecificCharacter(lex_state_t * state, scpi_token_t * token, char chr) {
+ token->ptr = state->pos;
+
+ if (skipChr(state, chr)) {
+ token->len = 1;
+ token->type = SCPI_TOKEN_SPECIFIC_CHARACTER;
+ } else {
+ token->len = 0;
+ token->type = SCPI_TOKEN_UNKNOWN;
+ }
+
+ return token->len;
+}
+
+/**
* Detect token New line
* @param state
* @param token
@@ -888,6 +953,3 @@
return token->len;
}
-
-
-
--
Gitblit v1.9.1