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/utils.c | 132 ++++++++++++++++++++++---------------------
1 files changed, 68 insertions(+), 64 deletions(-)
diff --git a/libscpi/src/utils.c b/libscpi/src/utils.c
index 328f8be..17d057c 100644
--- a/libscpi/src/utils.c
+++ b/libscpi/src/utils.c
@@ -40,7 +40,6 @@
#include <string.h>
#include <ctype.h>
#include <math.h>
-
#include "utils_private.h"
#include "scpi/utils.h"
@@ -91,20 +90,20 @@
} else {
switch (base) {
- case 2:
- x = 0x80000000L;
- break;
- case 8:
- x = 0x40000000L;
- break;
- default:
- case 10:
- base = 10;
- x = 1000000000L;
- break;
- case 16:
- x = 0x10000000L;
- break;
+ case 2:
+ x = 0x80000000L;
+ break;
+ case 8:
+ x = 0x40000000L;
+ break;
+ default:
+ case 10:
+ base = 10;
+ x = 1000000000L;
+ break;
+ case 16:
+ x = 0x10000000L;
+ break;
}
/* add sign for numbers in base 10 */
@@ -177,20 +176,20 @@
} else {
switch (base) {
- case 2:
- x = 0x8000000000000000ULL;
- break;
- case 8:
- x = 0x8000000000000000ULL;
- break;
- default:
- case 10:
- x = 10000000000000000000ULL;
- base = 10;
- break;
- case 16:
- x = 0x1000000000000000ULL;
- break;
+ case 2:
+ x = 0x8000000000000000ULL;
+ break;
+ case 8:
+ x = 0x8000000000000000ULL;
+ break;
+ default:
+ case 10:
+ x = 10000000000000000000ULL;
+ base = 10;
+ break;
+ case 16:
+ x = 0x1000000000000000ULL;
+ break;
}
/* add sign for numbers in base 10 */
@@ -484,13 +483,13 @@
pattern_sep_pos_short = patternSeparatorShortPos(pattern, new_pattern_len);
return compareStrAndNum(pattern, new_pattern_len, str, str_len, num) ||
- compareStrAndNum(pattern, pattern_sep_pos_short, str, str_len, num);
+ compareStrAndNum(pattern, pattern_sep_pos_short, str, str_len, num);
} else {
pattern_sep_pos_short = patternSeparatorShortPos(pattern, pattern_len);
return compareStr(pattern, pattern_len, str, str_len) ||
- compareStr(pattern, pattern_sep_pos_short, str, str_len);
+ compareStr(pattern, pattern_sep_pos_short, str, str_len);
}
}
@@ -587,14 +586,14 @@
while (pattern_len) {
pattern_sep_pos = patternSeparatorPos(pattern_ptr, pattern_len);
switch (pattern_ptr[pattern_sep_pos]) {
- case '[':
- brackets++;
- break;
- case ']':
- brackets--;
- break;
- default:
- break;
+ case '[':
+ brackets++;
+ break;
+ case ']':
+ brackets--;
+ break;
+ default:
+ break;
}
SKIP_PATTERN(pattern_sep_pos + 1);
if (brackets == 0) {
@@ -613,29 +612,29 @@
/* both command and patter contains command separator at this position */
if ((pattern_len > 0)
- && ((pattern_ptr[0] == cmd_ptr[0])
+ && ((pattern_ptr[0] == cmd_ptr[0])
&& (pattern_ptr[0] == ':'))) {
SKIP_PATTERN(1);
SKIP_CMD(1);
} else if ((pattern_len > 1)
- && (pattern_ptr[1] == cmd_ptr[0])
- && (pattern_ptr[0] == '[')
- && (pattern_ptr[1] == ':')) {
+ && (pattern_ptr[1] == cmd_ptr[0])
+ && (pattern_ptr[0] == '[')
+ && (pattern_ptr[1] == ':')) {
SKIP_PATTERN(2); /* for skip '[' in "[:" */
SKIP_CMD(1);
brackets++;
} else if ((pattern_len > 1)
- && (pattern_ptr[1] == cmd_ptr[0])
- && (pattern_ptr[0] == ']')
- && (pattern_ptr[1] == ':')) {
+ && (pattern_ptr[1] == cmd_ptr[0])
+ && (pattern_ptr[0] == ']')
+ && (pattern_ptr[1] == ':')) {
SKIP_PATTERN(2); /* for skip ']' in "]:" */
SKIP_CMD(1);
brackets--;
} else if ((pattern_len > 2)
- && (pattern_ptr[2] == cmd_ptr[0])
- && (pattern_ptr[0] == ']')
- && (pattern_ptr[1] == '[')
- && (pattern_ptr[2] == ':')) {
+ && (pattern_ptr[2] == cmd_ptr[0])
+ && (pattern_ptr[0] == ']')
+ && (pattern_ptr[1] == '[')
+ && (pattern_ptr[2] == ':')) {
SKIP_PATTERN(3); /* for skip '][' in "][:" */
SKIP_CMD(1);
/* brackets++; */
@@ -650,8 +649,8 @@
SKIP_PATTERN(2); /* for skip ']' in "]:" , pattern_ptr continue, while cmd_ptr remain unchanged */
brackets--;
} else if ((pattern_len > 2) && (pattern_ptr[0] == ']')
- && (pattern_ptr[1] == '[')
- && (pattern_ptr[2] == ':')) {
+ && (pattern_ptr[1] == '[')
+ && (pattern_ptr[2] == ':')) {
SKIP_PATTERN(3); /* for skip ']' in "][:" , pattern_ptr continue, while cmd_ptr remain unchanged */
/* brackets++; */
/* brackets--; */
@@ -675,6 +674,8 @@
*
* prev and current should be in the same memory buffer
*/
+
+//缁勫悎澶嶅悎SCPI鍛戒护
scpi_bool_t composeCompoundCommand(const scpi_token_t * prev, scpi_token_t * current) {
size_t i;
@@ -687,6 +688,7 @@
return TRUE;
/* Common command or command root - nothing to do */
+ // 褰撳墠鍛戒护鏄叕鍏卞懡浠�(*)鎴栨牴鍛戒护(:)
if (current->ptr[0] == '*' || current->ptr[0] == ':')
return TRUE;
@@ -707,6 +709,7 @@
current->ptr -= i;
current->len += i;
+ //澶嶅悎鍛戒护缁勫悎
memmove(current->ptr, prev->ptr, i);
return TRUE;
}
@@ -754,7 +757,8 @@
#if USE_MEMORY_ALLOCATION_FREE && !HAVE_STRNDUP
char *OUR_strndup(const char *s, size_t n) {
size_t len = SCPIDEFINE_strnlen(s, n);
- char * result = malloc(len + 1);
+ //msvc涓嬮渶瑕佸己杞�
+ char * result =(char*) malloc(len + 1);
if (!result) {
return NULL;
}
@@ -1110,7 +1114,7 @@
*/
uint16_t SCPI_Swap16(uint16_t val) {
return ((val & 0x00FF) << 8) |
- ((val & 0xFF00) >> 8);
+ ((val & 0xFF00) >> 8);
}
/**
@@ -1120,9 +1124,9 @@
*/
uint32_t SCPI_Swap32(uint32_t val) {
return ((val & 0x000000FFul) << 24) |
- ((val & 0x0000FF00ul) << 8) |
- ((val & 0x00FF0000ul) >> 8) |
- ((val & 0xFF000000ul) >> 24);
+ ((val & 0x0000FF00ul) << 8) |
+ ((val & 0x00FF0000ul) >> 8) |
+ ((val & 0xFF000000ul) >> 24);
}
/**
@@ -1132,11 +1136,11 @@
*/
uint64_t SCPI_Swap64(uint64_t val) {
return ((val & 0x00000000000000FFull) << 56) |
- ((val & 0x000000000000FF00ull) << 40) |
- ((val & 0x0000000000FF0000ull) << 24) |
- ((val & 0x00000000FF000000ull) << 8) |
- ((val & 0x000000FF00000000ull) >> 8) |
- ((val & 0x0000FF0000000000ull) >> 24) |
- ((val & 0x00FF000000000000ull) >> 40) |
- ((val & 0xFF00000000000000ull) >> 56);
+ ((val & 0x000000000000FF00ull) << 40) |
+ ((val & 0x0000000000FF0000ull) << 24) |
+ ((val & 0x00000000FF000000ull) << 8) |
+ ((val & 0x000000FF00000000ull) >> 8) |
+ ((val & 0x0000FF0000000000ull) >> 24) |
+ ((val & 0x00FF000000000000ull) >> 40) |
+ ((val & 0xFF00000000000000ull) >> 56);
}
--
Gitblit v1.9.1