修改通用的版本 现阶段可用[:MEASure][:DC]

nancy.liao

6 天以前 5061da0712c43dcd07384e5275b2bcab76e8667e

 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--; */
@@ -676,7 +675,7 @@
 * prev and current should be in the same memory buffer
 */

 //组合复合SCPI命令
//组合复合SCPI命令
scpi_bool_t composeCompoundCommand(const scpi_token_t * prev, scpi_token_t * current) {
    size_t i;

@@ -1115,7 +1114,7 @@
 */
uint16_t SCPI_Swap16(uint16_t val) {
    return ((val & 0x00FF) << 8) |
            ((val & 0xFF00) >> 8);
           ((val & 0xFF00) >> 8);
}

/**
@@ -1125,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);
}

/**
@@ -1137,11 +1136,116 @@
 */
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);
}

int parse_pattern(const char* pattern, Segment segments[], int max_segments) {
    int seg_count = 0;
    const char* p = pattern;

    while (*p && seg_count < max_segments)
    {
        if (*p == '[')
        {
            // 处理可变段
            segments[seg_count].is_variable = TRUE;
            // 跳过'['
            p++;

            int i = 0;
            while (*p && *p != ']' && i < sizeof(segments[seg_count].text)-1)
            {
                segments[seg_count].text[i++] = toupper(*p++);
            }
            segments[seg_count].text[i] = '\0';

            if (*p == ']')
            {
                // 跳过']'
                p++;
            }
        }
        else
        {
            // 处理固定段
            segments[seg_count].is_variable = FALSE;

            int i = 0;
            while (*p && *p != '[' && i < sizeof(segments[seg_count].text)-1)
            {
                segments[seg_count].text[i++] = toupper(*p++);
            }
            segments[seg_count].text[i] = '\0';
        }

        seg_count++;
    }

    return seg_count;
}

// 匹配命令与模式
bool match_command(const char* command, Segment segments[], int seg_count)
{
    const char* cmd = command;
    int current_seg = 0;

    while (*cmd && current_seg < seg_count)
    {
        // 跳过命令中的分隔符（冒号）
        if (*cmd == ':')
        {
            cmd++;
            // 模式中也应该有对应的分隔符
            if (segments[current_seg].text[0] != ':')
            {
                return FALSE;
            }
            continue;
        }

        // 获取当前段长度
        size_t seg_len = strlen(segments[current_seg].text);

        if (segments[current_seg].is_variable)
        {
            // 可变段 - 跳过对应长度的字符
            int i = 0;
            while (*cmd && *cmd != ':' && i < seg_len)
            {
                cmd++;
                i++;
            }
        } else
        {
            // 固定段 - 必须精确匹配
            if (strncasecmp(cmd, segments[current_seg].text, seg_len) != 0)
            {
                return FALSE;
            }
            cmd += seg_len;
        }

        current_seg++;
    }

    // 检查是否处理完所有命令和所有段
    return (*cmd == '\0') && (current_seg == seg_count);
}

// 测试函数
bool test_match(const char* pattern, const char* command)
{
    Segment segments[16];
    int seg_count = parse_pattern(pattern, segments, 16);
    return (match_command(command, segments, seg_count));

}