From a5b6afb1b12e7ed64353c680e0caa4fb58a9ee1d Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周日, 24 4月 2016 16:29:55 +0800
Subject: [PATCH] Just code formatting
---
libscpi/src/lexer.c | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/libscpi/src/lexer.c b/libscpi/src/lexer.c
index ee4696c..6a646f0 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++;
@@ -741,6 +743,8 @@
token->ptr = state->pos - arbitraryBlockLength;
token->len = arbitraryBlockLength;
validData = 1;
+ } else {
+ validData = 0;
}
} else if (iseos(state)) {
validData = 0;
--
Gitblit v1.9.1