From 56f5bddb7e2a6267bdfeddf8de601a057aef802f Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周六, 05 12月 2015 23:13:34 +0800
Subject: [PATCH] Extend expression.c tests
---
libscpi/src/lexer.c | 63 +++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 12 deletions(-)
diff --git a/libscpi/src/lexer.c b/libscpi/src/lexer.c
index 755c4bf..285d393 100644
--- a/libscpi/src/lexer.c
+++ b/libscpi/src/lexer.c
@@ -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++;
}
@@ -305,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++;
}
}
@@ -451,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++;
}
}
@@ -562,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++;
}
@@ -642,6 +642,8 @@
state->pos--;
break;
}
+ } else {
+ break;
}
}
}
@@ -726,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++;
@@ -865,6 +867,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 +930,3 @@
return token->len;
}
-
-
-
--
Gitblit v1.9.1