From 02c004a7747e7f7f4c135c370dd82bf383750450 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周一, 07 8月 2017 03:01:58 +0800
Subject: [PATCH] Merge pull request #89 from j123b567/feature/expose-on-off
---
libscpi/src/lexer.c | 137 +++++++++++++++++++++++++++++++--------------
1 files changed, 95 insertions(+), 42 deletions(-)
diff --git a/libscpi/src/lexer.c b/libscpi/src/lexer.c
index 349bcc5..5d5582d 100644
--- a/libscpi/src/lexer.c
+++ b/libscpi/src/lexer.c
@@ -160,7 +160,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 +178,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 +189,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 +204,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 +232,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 +245,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;
@@ -297,6 +297,7 @@
}
/* 7.6.1.2 <COMMAND PROGRAM HEADER> */
+
/**
* Skip program mnemonic [a-z][a-z0-9_]*
* @param state
@@ -304,9 +305,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++;
}
}
@@ -319,6 +320,7 @@
}
/* tokens */
+
/**
* Detect token white space
* @param state
@@ -342,6 +344,7 @@
}
/* 7.6.1 <COMMAND PROGRAM HEADER> */
+
/**
* Skip command program header \*<PROGRAM MNEMONIC>
* @param state
@@ -424,7 +427,7 @@
}
} else if (res <= SKIP_INCOMPLETE) {
token->type = SCPI_TOKEN_INCOMPLETE_COMPOUND_PROGRAM_HEADER;
- }
+ }
}
if (token->type != SCPI_TOKEN_UNKNOWN) {
@@ -438,6 +441,7 @@
}
/* 7.7.1 <CHARACTER PROGRAM DATA> */
+
/**
* Detect token "Character program data"
* @param state
@@ -447,9 +451,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++;
}
}
@@ -502,7 +506,7 @@
* @return
*/
int scpiLex_DecimalNumericProgramData(lex_state_t * state, scpi_token_t * token) {
- const char * rollback;
+ char * rollback;
token->ptr = state->pos;
if (skipMantisa(state)) {
@@ -531,7 +535,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);
@@ -558,7 +562,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++;
}
@@ -590,8 +594,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])) {
@@ -611,7 +615,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;
@@ -626,7 +630,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++;
@@ -638,15 +642,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, '\'');
}
@@ -686,15 +692,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> */
@@ -712,6 +718,7 @@
int i;
int arbitraryBlockLength = 0;
const char * ptr = state->pos;
+ int validData = -1;
token->ptr = state->pos;
if (skipChr(state, '#')) {
@@ -721,7 +728,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++;
@@ -732,23 +739,31 @@
if (i == 0) {
state->pos += arbitraryBlockLength;
- if ((state->buffer + state->len) < (state->pos)) {
- token->len = 0;
- } else {
+ if ((state->buffer + state->len) >= (state->pos)) {
token->ptr = state->pos - arbitraryBlockLength;
token->len = arbitraryBlockLength;
+ validData = 1;
+ } else {
+ 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)) {
+ 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 {
+ /* invalid */
token->type = SCPI_TOKEN_UNKNOWN;
state->pos = token->ptr;
token->len = 0;
@@ -760,12 +775,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;
}
}
@@ -779,7 +794,8 @@
}
}
-// TODO: 7.7.7.2-2 recursive - any program data
+/* TODO: 7.7.7.2-2 recursive - any program data */
+
/**
* Detect token Expression
* @param state
@@ -853,6 +869,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
@@ -876,6 +932,3 @@
return token->len;
}
-
-
-
--
Gitblit v1.9.1