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 | 815 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 543 insertions(+), 272 deletions(-)
diff --git a/libscpi/src/lexer.c b/libscpi/src/lexer.c
index abca2de..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.
*/
/**
@@ -38,31 +39,50 @@
#include <stdio.h>
#include <string.h>
-#include "scpi/lexer.h"
+#include "lexer_private.h"
+#include "scpi/error.h"
-
-/* identify character */
-static int isws ( int c ) {
+/**
+ * Is white space
+ * @param c
+ * @return
+ */
+static int isws(int c) {
if ((c == ' ') || (c == '\t')) {
return 1;
}
return 0;
}
-static int isbdigit ( int c ) {
+/**
+ * Is binary digit
+ * @param c
+ * @return
+ */
+static int isbdigit(int c) {
if ((c == '0') || (c == '1')) {
return 1;
}
return 0;
}
-static int isqdigit ( int c ) {
+/**
+ * Is hexadecimal digit
+ * @param c
+ * @return
+ */
+static int isqdigit(int c) {
if ((c == '0') || (c == '1') || (c == '2') || (c == '3') || (c == '4') || (c == '5') || (c == '6') || (c == '7')) {
return 1;
}
return 0;
}
+/**
+ * Is end of string
+ * @param state
+ * @return
+ */
static int iseos(lex_state_t * state) {
if ((state->buffer + state->len) <= (state->pos)) {
return 1;
@@ -71,337 +91,499 @@
}
}
+/**
+ * Private export of iseos
+ * @param state
+ * @return
+ */
+int scpiLex_IsEos(lex_state_t * state) {
+ return iseos(state);
+}
+
+/**
+ * Test current character
+ * @param state
+ * @param chr
+ * @return
+ */
static int ischr(lex_state_t * state, char chr) {
return (state->pos[0] == chr);
}
+/**
+ * Is plus or minus
+ * @param c
+ * @return
+ */
static int isplusmn(int c) {
return c == '+' || c == '-';
}
+/**
+ * Is letter H
+ * @param c
+ * @return
+ */
static int isH(int c) {
- return c == 'h' || c == 'H';
+ return c == 'h' || c == 'H';
}
+/**
+ * Is letter B
+ * @param c
+ * @return
+ */
static int isB(int c) {
- return c == 'b' || c == 'B';
+ return c == 'b' || c == 'B';
}
+/**
+ * Is letter Q
+ * @param c
+ * @return
+ */
static int isQ(int c) {
- return c == 'q' || c == 'Q';
+ return c == 'q' || c == 'Q';
}
+/**
+ * Is letter E
+ * @param c
+ * @return
+ */
static int isE(int c) {
- return c == 'e' || c == 'E';
+ return c == 'e' || c == 'E';
}
+
+#define SKIP_NONE 0
+#define SKIP_OK 1
+#define SKIP_INCOMPLETE -1
/* 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
+ * @param state
+ * @return
+ */
static int skipWs(lex_state_t * state) {
int someSpace = 0;
- while(!iseos(state) && isws(state->pos[0])) {
+ while (!iseos(state) && isws(state->pos[0])) {
state->pos++;
someSpace++;
}
-
+
return someSpace;
}
/* 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
+ * @param state
+ * @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 1;
+ return SKIP_OK;
} else {
- return 0;
+ return SKIP_NONE;
}
}
+/**
+ * Skip multiple decimal digits
+ * @param state
+ * @return
+ */
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++;
}
return someNumbers;
}
+/**
+ * Skip plus or minus
+ * @param state
+ * @return
+ */
static int skipPlusmn(lex_state_t * state) {
- if(!iseos(state) && isplusmn(state->pos[0])) {
+ if (!iseos(state) && isplusmn(state->pos[0])) {
state->pos++;
- return 1;
+ return SKIP_OK;
} else {
- return 0;
+ return SKIP_NONE;
}
}
+/**
+ * Skip any character from 'a'-'Z'
+ * @param state
+ * @return
+ */
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++;
}
- return someLetters;
+ return someLetters;
}
-static int skipChr(lex_state_t * state, int chr) {
- if(!iseos(state) && ischr(state, chr)) {
+/**
+ * Skip exact character chr or nothing
+ * @param state
+ * @param chr
+ * @return
+ */
+static int skipChr(lex_state_t * state, char chr) {
+ if (!iseos(state) && ischr(state, chr)) {
state->pos++;
- return 1;
+ return SKIP_OK;
} else {
- return 0;
+ return SKIP_NONE;
}
}
+/**
+ * Skip slash or dot
+ * @param state
+ * @return
+ */
static int skipSlashDot(lex_state_t * state) {
- if(!iseos(state) && (ischr(state, '/') | ischr(state, '.'))) {
+ if (!iseos(state) && (ischr(state, '/') | ischr(state, '.'))) {
state->pos++;
- return 1;
+ return SKIP_OK;
} else {
- return 0;
- }
+ return SKIP_NONE;
+ }
}
+/**
+ * Skip star
+ * @param state
+ * @return
+ */
static int skipStar(lex_state_t * state) {
- if(!iseos(state) && ischr(state, '*')) {
+ if (!iseos(state) && ischr(state, '*')) {
state->pos++;
- return 1;
+ return SKIP_OK;
} else {
- return 0;
- }
+ return SKIP_NONE;
+ }
}
+/**
+ * Skip colon
+ * @param state
+ * @return
+ */
static int skipColon(lex_state_t * state) {
- if(!iseos(state) && ischr(state, ':')) {
+ if (!iseos(state) && ischr(state, ':')) {
state->pos++;
- return 1;
+ return SKIP_OK;
} else {
- return 0;
- }
+ return SKIP_NONE;
+ }
}
/* 7.6.1.2 <COMMAND PROGRAM HEADER> */
+
+/**
+ * Skip program mnemonic [a-z][a-z0-9_]*
+ * @param state
+ * @return
+ */
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++;
}
}
-
- return state->pos - startPos;
+
+ if (iseos(state)) {
+ return (state->pos - startPos) * SKIP_INCOMPLETE;
+ } else {
+ return (state->pos - startPos) * SKIP_OK;
+ }
}
/* tokens */
-int SCPI_LexWhiteSpace(lex_state_t * state, token_t * token) {
+
+/**
+ * Detect token white space
+ * @param state
+ * @param token
+ * @return
+ */
+int scpiLex_WhiteSpace(lex_state_t * state, scpi_token_t * token) {
token->ptr = state->pos;
-
+
skipWs(state);
-
- token->len = state->pos - token->ptr;
-
+
+ token->len = state->pos - token->ptr;
+
if (token->len > 0) {
- token->type = TokWhiteSpace;
+ token->type = SCPI_TOKEN_WS;
} else {
- token->type = TokUnknown;
- }
-
- return token->len;
+ token->type = SCPI_TOKEN_UNKNOWN;
+ }
+
+ return token->len;
+
+
}
/* 7.6.1 <COMMAND PROGRAM HEADER> */
-int SCPI_LexCommonProgramHeader(lex_state_t * state, token_t * token) {
- token->ptr = state->pos;
-
+
+/**
+ * Skip command program header \*<PROGRAM MNEMONIC>
+ * @param state
+ * @return
+ */
+static int skipCommonProgramHeader(lex_state_t * state) {
+ int res;
if (skipStar(state)) {
- if(!skipProgramMnemonic(state)) {
- state->pos--;
+ res = skipProgramMnemonic(state);
+ if (res == SKIP_NONE && iseos(state)) {
+ return SKIP_INCOMPLETE;
+ } else if (res <= SKIP_INCOMPLETE) {
+ return SKIP_OK;
+ } else if (res >= SKIP_OK) {
+ return SKIP_OK;
+ } else {
+ return SKIP_INCOMPLETE;
}
}
-
- token->len = state->pos - token->ptr;
-
- if((token->len > 0)) {
- token->type = TokCommonProgramHeader;
- } else {
- token->type = TokUnknown;
- state->pos = token->ptr;
- token->len = 0;
- }
-
- return token->len;
+ return SKIP_NONE;
}
-int SCPI_LexCompoundProgramHeader(lex_state_t * state, token_t * token) {
- token->ptr = state->pos;
-
- skipColon(state);
-
- if(skipProgramMnemonic(state)) {
- while(skipColon(state)) {
- if(!skipProgramMnemonic(state)) {
- // TODO: lexer error
- break;
+/**
+ * Skip compound program header :<PROGRAM MNEMONIC>:<PROGRAM MNEMONIC>...
+ * @param state
+ * @return
+ */
+static int skipCompoundProgramHeader(lex_state_t * state) {
+ int res;
+ int firstColon = skipColon(state);
+
+ res = skipProgramMnemonic(state);
+ if (res >= SKIP_OK) {
+ while (skipColon(state)) {
+ res = skipProgramMnemonic(state);
+ if (res <= SKIP_INCOMPLETE) {
+ return SKIP_OK;
+ } else if (res == SKIP_NONE) {
+ return SKIP_INCOMPLETE;
}
}
- }
-
- token->len = state->pos - token->ptr;
-
- if((token->len > 0)) {
- token->type = TokCompoundProgramHeader;
+ return SKIP_OK;
+ } else if (res <= SKIP_INCOMPLETE) {
+ return SKIP_OK;
+ } else if (firstColon) {
+ return SKIP_INCOMPLETE;
} else {
- token->type = TokUnknown;
- state->pos = token->ptr;
- token->len = 0;
+ return SKIP_NONE;
}
-
- return token->len;
}
-int SCPI_LexProgramHeader(lex_state_t * state, token_t * token) {
+/**
+ * Detect token command or compound program header
+ * @param state
+ * @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;
-
- res = SCPI_LexCommonProgramHeader(state, token);
- if(res > 0) return res;
-
- res = SCPI_LexCompoundProgramHeader(state, token);
- if(res > 0) return res;
-
- return 0;
-}
-
-int SCPI_LexQuestion(lex_state_t * state, token_t * token) {
token->ptr = state->pos;
-
- if (skipChr(state, '?')) {
- token->len = 1;
- token->type = TokQuiestion;
+ 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;
+ } else {
+ token->type = SCPI_TOKEN_COMMON_PROGRAM_HEADER;
+ }
+ } 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) {
+ if (skipChr(state, '?') >= SKIP_OK) {
+ token->type = SCPI_TOKEN_COMPOUND_QUERY_PROGRAM_HEADER;
+ } else {
+ token->type = SCPI_TOKEN_COMPOUND_PROGRAM_HEADER;
+ }
+ } else if (res <= SKIP_INCOMPLETE) {
+ token->type = SCPI_TOKEN_INCOMPLETE_COMPOUND_PROGRAM_HEADER;
+ }
+ }
+ // 璁＄畻闀垮害
+ if (token->type != SCPI_TOKEN_UNKNOWN) {
+ token->len = state->pos - token->ptr;
} else {
token->len = 0;
- token->type = TokUnknown;
+ state->pos = token->ptr;
}
-
+
return token->len;
}
/* 7.7.1 <CHARACTER PROGRAM DATA> */
-int SCPI_LexCharacterProgramData(lex_state_t * state, token_t * token) {
+
+/**
+ * Detect token "Character program data"
+ * @param state
+ * @param token
+ * @return
+ */
+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++;
}
}
-
+
token->len = state->pos - token->ptr;
- if(token->len > 0) {
- token->type = TokProgramMnemonic;
+ if (token->len > 0) {
+ token->type = SCPI_TOKEN_PROGRAM_MNEMONIC;
} else {
- token->type = TokUnknown;
+ token->type = SCPI_TOKEN_UNKNOWN;
}
-
+
return token->len;
}
/* 7.7.2 <DECIMAL NUMERIC PROGRAM DATA> */
static int skipMantisa(lex_state_t * state) {
int someNumbers = 0;
-
+
skipPlusmn(state);
-
+
someNumbers += skipNumbers(state);
-
- if(skipChr(state, '.')) {
+
+ if (skipChr(state, '.')) {
someNumbers += skipNumbers(state);
}
-
+
return someNumbers;
}
static int skipExponent(lex_state_t * state) {
int someNumbers = 0;
-
- if(!iseos(state) && isE(state->pos[0])) {
+
+ if (!iseos(state) && isE(state->pos[0])) {
state->pos++;
-
+
skipWs(state);
-
+
skipPlusmn(state);
-
+
someNumbers = skipNumbers(state);
}
-
+
return someNumbers;
}
-int SCPI_LexDecimalNumericProgramData(lex_state_t * state, token_t * token) {
- const char * rollback;
+/**
+ * Detect token Decimal number
+ * @param state
+ * @param token
+ * @return
+ */
+int scpiLex_DecimalNumericProgramData(lex_state_t * state, scpi_token_t * token) {
+ char * rollback;
token->ptr = state->pos;
-
+
if (skipMantisa(state)) {
rollback = state->pos;
skipWs(state);
- if(!skipExponent(state)) {
+ if (!skipExponent(state)) {
state->pos = rollback;
}
} else {
state->pos = token->ptr;
}
-
+
token->len = state->pos - token->ptr;
- if(token->len > 0) {
- token->type = TokDecimalNumericProgramData;
+ if (token->len > 0) {
+ token->type = SCPI_TOKEN_DECIMAL_NUMERIC_PROGRAM_DATA;
} else {
- token->type = TokUnknown;
+ token->type = SCPI_TOKEN_UNKNOWN;
}
-
+
return token->len;
}
/* 7.7.3 <SUFFIX PROGRAM DATA> */
-int SCPI_LexSuffixProgramData(lex_state_t * state, token_t * token) {
+int scpiLex_SuffixProgramData(lex_state_t * state, scpi_token_t * token) {
token->ptr = state->pos;
-
+
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);
-
+
while (skipSlashDot(state)) {
skipAlpha(state);
skipChr(state, '-');
- skipDigit(state);
+ skipDigit(state);
}
}
-
+
token->len = state->pos - token->ptr;
- if((token->len > 0)) {
- token->type = TokSuffixProgramData;
+ if ((token->len > 0)) {
+ token->type = SCPI_TOKEN_SUFFIX_PROGRAM_DATA;
} else {
- token->type = TokUnknown;
+ token->type = SCPI_TOKEN_UNKNOWN;
state->pos = token->ptr;
token->len = 0;
}
-
+
return token->len;
}
/* 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++;
}
@@ -410,7 +592,7 @@
static int skipOctNum(lex_state_t * state) {
int someNumbers = 0;
- while(!iseos(state) && isqdigit(state->pos[0])) {
+ while (!iseos(state) && isqdigit(state->pos[0])) {
state->pos++;
someNumbers++;
}
@@ -419,54 +601,58 @@
static int skipBinNum(lex_state_t * state) {
int someNumbers = 0;
- while(!iseos(state) && isbdigit(state->pos[0])) {
+ while (!iseos(state) && isbdigit(state->pos[0])) {
state->pos++;
someNumbers++;
}
return someNumbers;
}
-
-int SCPI_LexNondecimalNumericData(lex_state_t * state, token_t * token) {
- token->ptr = state->pos;
+/**
+ * Detect token nondecimal number
+ * @param state
+ * @param token
+ * @return
+ */
+int scpiLex_NondecimalNumericData(lex_state_t * state, scpi_token_t * token) {
int someNumbers = 0;
- if(skipChr(state, '#')) {
- if(!iseos(state)) {
- if(isH(state->pos[0])) {
+ token->ptr = state->pos;
+ if (skipChr(state, '#')) {
+ if (!iseos(state)) {
+ if (isH(state->pos[0])) {
state->pos++;
someNumbers = skipHexNum(state);
- token->type = TokHexnum;
- } else if(isQ(state->pos[0])) {
+ token->type = SCPI_TOKEN_HEXNUM;
+ } else if (isQ(state->pos[0])) {
state->pos++;
someNumbers = skipOctNum(state);
- token->type = TokOctnum;
- } else if(isB(state->pos[0])) {
+ token->type = SCPI_TOKEN_OCTNUM;
+ } else if (isB(state->pos[0])) {
state->pos++;
someNumbers = skipBinNum(state);
- token->type = TokBinnum;
+ token->type = SCPI_TOKEN_BINNUM;
}
}
}
-
+
if (someNumbers) {
- token->ptr += 2; // ignore number prefix
+ token->ptr += 2; /* ignore number prefix */
token->len = state->pos - token->ptr;
} else {
- token->type = TokUnknown;
+ token->type = SCPI_TOKEN_UNKNOWN;
state->pos = token->ptr;
+ token->len = 0;
}
- return token->len;
+ return token->len > 0 ? token->len + 2 : 0;
}
-
/* 7.7.5 <STRING PROGRAM DATA> */
static int isascii7bit(int c) {
return (c >= 0) && (c <= 0x7f);
}
-
-static int skipQuoteProgramData(lex_state_t * state, int quote) {
- while(!iseos(state)) {
+static void skipQuoteProgramData(lex_state_t * state, char quote) {
+ while (!iseos(state)) {
if (isascii7bit(state->pos[0]) && !ischr(state, quote)) {
state->pos++;
} else if (ischr(state, quote)) {
@@ -477,25 +663,33 @@
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, '\'');
}
-int SCPI_LexStringProgramData(lex_state_t * state, token_t * token) {
+/**
+ * Detect token String data
+ * @param state
+ * @param token
+ * @return
+ */
+int scpiLex_StringProgramData(lex_state_t * state, scpi_token_t * token) {
token->ptr = state->pos;
-
+
if (!iseos(state)) {
if (ischr(state, '"')) {
state->pos++;
- token->type = TokDoubleQuoteProgramData;
+ token->type = SCPI_TOKEN_DOUBLE_QUOTE_PROGRAM_DATA;
skipDoubleQuoteProgramData(state);
if (!iseos(state) && ischr(state, '"')) {
state->pos++;
@@ -505,7 +699,7 @@
}
} else if (ischr(state, '\'')) {
state->pos++;
- token->type = TokSingleQuoteProgramData;
+ token->type = SCPI_TOKEN_SINGLE_QUOTE_PROGRAM_DATA;
skipSingleQuoteProgramData(state);
if (!iseos(state) && ischr(state, '\'')) {
state->pos++;
@@ -515,19 +709,19 @@
}
}
}
-
+
token->len = state->pos - token->ptr;
-
- if((token->len > 0)) {
- token->ptr++;
- token->len -= 2;
+
+ if ((token->len > 0)) {
+ /* token->ptr++;
+ * token->len -= 2; */
} else {
- token->type = TokUnknown;
+ token->type = SCPI_TOKEN_UNKNOWN;
state->pos = token->ptr;
token->len = 0;
}
-
- return token->len;
+
+ return token->len > 0 ? token->len : 0;
}
/* 7.7.6 <ARBITRARY BLOCK PROGRAM DATA> */
@@ -535,10 +729,17 @@
return isdigit(c) && (c != '0');
}
-int SCPI_LexArbitraryBlockProgramData(lex_state_t * state, token_t * token) {
+/**
+ * Detect token Block Data
+ * @param state
+ * @param token
+ * @return
+ */
+int scpiLex_ArbitraryBlockProgramData(lex_state_t * state, scpi_token_t * token) {
int i;
- int j = 0;
-
+ int arbitraryBlockLength = 0;
+ const char * ptr = state->pos;
+ int validData = -1;
token->ptr = state->pos;
if (skipChr(state, '#')) {
@@ -546,74 +747,89 @@
/* Get number of digits */
i = state->pos[0] - '0';
state->pos++;
-
- for(; i > 0; i--) {
- if (!iseos(state) && isdigit(state->pos[0])) {
- j *= 10;
- j += (state->pos[0] - '0');
+
+ for (; i > 0; i--) {
+ if (!iseos(state) && isdigit((uint8_t)(state->pos[0]))) {
+ arbitraryBlockLength *= 10;
+ arbitraryBlockLength += (state->pos[0] - '0');
state->pos++;
} else {
break;
}
}
-
- if(i == 0) {
- state->pos += j;
- if (!iseos(state)) {
- token->ptr = state->pos - j;
- token->len = j;
+
+ if (i == 0) {
+ state->pos += arbitraryBlockLength;
+ if ((state->buffer + state->len) >= (state->pos)) {
+ token->ptr = state->pos - arbitraryBlockLength;
+ token->len = arbitraryBlockLength;
+ validData = 1;
} else {
- token->len = 0;
+ validData = 0;
}
- } else {
- token->len = 0;
+ } else if (iseos(state)) {
+ validData = 0;
}
- } else {
- token->len = 0;
+ } else if (iseos(state)) {
+ validData = 0;
}
}
- if((token->len > 0)) {
- token->type = TokArbitraryBlockProgramData;
+ if (validData == 1) {
+ /* valid */
+ token->type = SCPI_TOKEN_ARBITRARY_BLOCK_PROGRAM_DATA;
+ } else if (validData == 0) {
+ /* incomplete */
+ token->type = SCPI_TOKEN_UNKNOWN;
+ token->len = 0;
+ state->pos = state->buffer + state->len;
} else {
- token->type = TokUnknown;
+ /* invalid */
+ token->type = SCPI_TOKEN_UNKNOWN;
state->pos = token->ptr;
token->len = 0;
}
-
- return token->len;
+
+ return token->len + (token->ptr - ptr);
}
/* 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 >= 0x20) && (c <= 0x7e)) {
+ if ((c != '"')
+ && (c != '#')
+ && (c != '\'')
+ && (c != '(')
+ && (c != ')')
+ && (c != ';')) {
return 1;
}
}
-
+
return 0;
}
static void skipProgramExpression(lex_state_t * state) {
- while(!iseos(state) && isProgramExpression(state->pos[0])) {
+ while (!iseos(state) && isProgramExpression(state->pos[0])) {
state->pos++;
}
}
-// TODO: 7.7.7.2-2 recursive - any program data
-int SCPI_LexProgramExpression(lex_state_t * state, token_t * token) {
+/* TODO: 7.7.7.2-2 recursive - any program data */
+
+/**
+ * Detect token Expression
+ * @param state
+ * @param token
+ * @return
+ */
+int scpiLex_ProgramExpression(lex_state_t * state, scpi_token_t * token) {
token->ptr = state->pos;
-
+
if (!iseos(state) && ischr(state, '(')) {
state->pos++;
skipProgramExpression(state);
-
+
if (!iseos(state) && ischr(state, ')')) {
state->pos++;
token->len = state->pos - token->ptr;
@@ -621,64 +837,119 @@
token->len = 0;
}
}
-
- if((token->len > 0)) {
- token->type = TokProgramExpression;
+
+ if ((token->len > 0)) {
+ token->type = SCPI_TOKEN_PROGRAM_EXPRESSION;
} else {
- token->type = TokUnknown;
+ token->type = SCPI_TOKEN_UNKNOWN;
state->pos = token->ptr;
token->len = 0;
}
-
+
return token->len;
}
-int SCPI_LexComma(lex_state_t * state, token_t * token) {
+/**
+ * Detect token comma
+ * @param state
+ * @param token
+ * @return
+ */
+int scpiLex_Comma(lex_state_t * state, scpi_token_t * token) {
token->ptr = state->pos;
-
+
if (skipChr(state, ',')) {
token->len = 1;
- token->type = TokComma;
+ token->type = SCPI_TOKEN_COMMA;
} else {
token->len = 0;
- token->type = TokUnknown;
+ token->type = SCPI_TOKEN_UNKNOWN;
}
-
+
return token->len;
}
-int SCPI_LexSemicolon(lex_state_t * state, token_t * token) {
+/**
+ * Detect token semicolon
+ * @param state
+ * @param token
+ * @return
+ */
+int scpiLex_Semicolon(lex_state_t * state, scpi_token_t * token) {
token->ptr = state->pos;
-
+
if (skipChr(state, ';')) {
token->len = 1;
- token->type = TokSemicolon;
+ token->type = SCPI_TOKEN_SEMICOLON;
} else {
token->len = 0;
- token->type = TokUnknown;
+ token->type = SCPI_TOKEN_UNKNOWN;
}
-
+
return token->len;
}
-int SCPI_LexNewLine(lex_state_t * state, token_t * token) {
+/**
+ * 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
+ * @return
+ */
+int scpiLex_NewLine(lex_state_t * state, scpi_token_t * token) {
+ token->ptr = state->pos;
+
skipChr(state, '\r');
skipChr(state, '\n');
-
+
token->len = state->pos - token->ptr;
-
- if((token->len > 0)) {
- token->type = TokNewLine;
+
+ if ((token->len > 0)) {
+ token->type = SCPI_TOKEN_NL;
} else {
- token->type = TokUnknown;
+ token->type = SCPI_TOKEN_UNKNOWN;
state->pos = token->ptr;
token->len = 0;
}
-
+
return token->len;
}
-
-
-
--
Gitblit v1.9.1