From d6f4a5106bebb23826c0867494ade7f4d7ebd1f3 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周日, 18 1月 2015 19:40:33 +0800
Subject: [PATCH] Correct *TST? callback in header file
---
libscpi/src/parser.c | 333 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 249 insertions(+), 84 deletions(-)
diff --git a/libscpi/src/parser.c b/libscpi/src/parser.c
index 42f0231..7f8f6b6 100644
--- a/libscpi/src/parser.c
+++ b/libscpi/src/parser.c
@@ -166,7 +166,7 @@
while (1) {
result = 0;
- r = detectProgramMessageUnit(state, data, len);
+ r = scpiParser_detectProgramMessageUnit(state, data, len);
if (state->programHeader.type == TokInvalid) {
SCPI_ErrorPush(context, SCPI_ERROR_INVALID_CHARACTER);
@@ -176,6 +176,9 @@
context->param_list.lex_state.buffer = state->programData.ptr;
context->param_list.lex_state.pos = context->param_list.lex_state.buffer;
context->param_list.lex_state.len = state->programData.len;
+ context->param_list.cmd_raw.data = state->programHeader.ptr;
+ context->param_list.cmd_raw.position = 0;
+ context->param_list.cmd_raw.length = state->programHeader.len;
processCommand(context);
@@ -253,7 +256,7 @@
while (1) {
- cmdlen = detectProgramMessageUnit(&context->parser_state, context->buffer.data + totcmdlen, context->buffer.position - totcmdlen);
+ cmdlen = scpiParser_detectProgramMessageUnit(&context->parser_state, context->buffer.data + totcmdlen, context->buffer.position - totcmdlen);
totcmdlen += cmdlen;
if (context->parser_state.termination == PmutNewLine) break;
if (context->parser_state.programHeader.type == TokUnknown) break;
@@ -296,6 +299,11 @@
return SCPI_ResultIntBase(context, val, 10);
}
+/**
+ * Return prefix of nondecimal base
+ * @param base
+ * @return
+ */
static const char * getBasePrefix(int8_t base) {
switch (base) {
case 2: return "#B";
@@ -305,6 +313,13 @@
}
}
+/**
+ * Write integer value in specific base to the result
+ * @param context
+ * @param val
+ * @param base
+ * @return
+ */
size_t SCPI_ResultIntBase(scpi_t * context, int32_t val, int8_t base) {
char buffer[33];
const char * basePrefix;
@@ -350,6 +365,7 @@
size_t result = 0;
result += writeDelimiter(context);
result += writeData(context, "\"", 1);
+ // TODO: convert " to ""
result += writeData(context, data, strlen(data));
result += writeData(context, "\"", 1);
context->output_count++;
@@ -368,9 +384,15 @@
/* parsing parameters */
-
+/**
+ * Get one parameter from command line
+ * @param context
+ * @param parameter
+ * @param mandatory
+ * @return
+ */
scpi_bool_t SCPI_Parameter(scpi_t * context, scpi_parameter_t * parameter, scpi_bool_t mandatory) {
- token_t token;
+ scpi_token_t token;
lex_state_t * state;
int32_t value;
@@ -394,7 +416,7 @@
return FALSE;
}
if (context->input_count != 0) {
- lexComma(state, &token);
+ scpiLex_Comma(state, &token);
if (token.type != TokComma) {
SCPI_ErrorPush(context, SCPI_ERROR_INVALID_SEPARATOR);
return FALSE;
@@ -403,7 +425,7 @@
context->input_count++;
- parseProgramData(&context->param_list.lex_state, &token);
+ scpiParser_parseProgramData(&context->param_list.lex_state, &token);
parameter->type = token.type;
parameter->data.ptr = token.ptr;
@@ -452,90 +474,219 @@
}
}
-int32_t SCPI_ParamGetIntVal(scpi_t * context, scpi_parameter_t * parameter) {
+/**
+ * Detect if parameter is number
+ * @param parameter
+ * @param suffixAllowed
+ * @return
+ */
+scpi_bool_t SCPI_ParamIsNumber(scpi_parameter_t * parameter, scpi_bool_t suffixAllowed) {
switch (parameter->type) {
case TokHexnum:
case TokOctnum:
case TokBinnum:
case TokDecimalNumericProgramData:
+ return TRUE;
case TokDecimalNumericProgramDataWithSuffix:
- return parameter->number.value;
+ return suffixAllowed;
default:
- SCPI_ErrorPush(context, SCPI_ERROR_DATA_TYPE_ERROR);
- return 0;
- }
-}
-
-double SCPI_ParamGetDoubleVal(scpi_t * context, scpi_parameter_t * parameter) {
- return parameter->number.value;
-}
-
-void SCPI_ParamGetTextVal(scpi_t * context, scpi_parameter_t * parameter, const char ** data, int32_t * len) {
- *data = parameter->data.ptr;
- *len = parameter->data.len;
-}
-
-/* SCPI-99 7.3 Boolean Program Data */
-scpi_bool_t SCPI_ParamGetBoolVal(scpi_t * context, scpi_parameter_t * parameter) {
- switch (parameter->type) {
- case TokDecimalNumericProgramData:
- return parameter->number.value ? 1 : 0;
- case TokProgramMnemonic:
- if (compareStr("ON", 2, parameter->data.ptr, parameter->data.len)) {
- return TRUE;
- } else if (compareStr("OFF", 3, parameter->data.ptr, parameter->data.len)) {
- return FALSE;
- } else {
- SCPI_ErrorPush(context, SCPI_ERROR_ILLEGAL_PARAMETER_VALUE);
- return FALSE;
- }
- default:
- SCPI_ErrorPush(context, SCPI_ERROR_DATA_TYPE_ERROR);
return FALSE;
- }
+ }
}
/**
- * Get choice parameter
+ * Read floating point parameter
+ * @param context
+ * @param value
+ * @param mandatory
+ * @return
*/
-int32_t SCPI_ParamGetChoiceVal(scpi_t * context, scpi_parameter_t * parameter, const char * options[]) {
- size_t res;
-
- if (!options) {
- SCPI_ErrorPush(context, SCPI_ERROR_SYSTEM_ERROR);
- return -1;
+scpi_bool_t SCPI_ParamDouble(scpi_t * context, double * value, scpi_bool_t mandatory)
+{
+ scpi_bool_t result;
+ scpi_parameter_t param;
+
+ if (!value) {
+ SCPI_ErrorPush(context, SCPI_ERROR_SYSTEM_ERROR);
+ return FALSE;
}
-
- switch(parameter->type) {
- case TokProgramMnemonic:
- for (res = 0; options[res]; ++res) {
- if (matchPattern(options[res], strlen(options[res]), parameter->data.ptr, parameter->data.len)) {
- return res;
- }
- }
- SCPI_ErrorPush(context, SCPI_ERROR_ILLEGAL_PARAMETER_VALUE);
- return -1;
- default:
+
+ result = SCPI_Parameter(context, ¶m, mandatory);
+ if (result) {
+ if (SCPI_ParamIsNumber(¶m, FALSE)) {
+ *value = param.number.value;
+ } else if (SCPI_ParamIsNumber(¶m, TRUE)) {
+ SCPI_ErrorPush(context, SCPI_ERROR_SUFFIX_NOT_ALLOWED);
+ result = FALSE;
+ } else {
SCPI_ErrorPush(context, SCPI_ERROR_DATA_TYPE_ERROR);
- return -1;
+ result = FALSE;
+ }
}
+ return result;
}
-int parseProgramData(lex_state_t * state, token_t * token) {
- token_t tmp;
+/**
+ * Read integer parameter
+ * @param context
+ * @param value
+ * @param mandatory
+ * @return
+ */
+scpi_bool_t SCPI_ParamInt(scpi_t * context, int32_t * value, scpi_bool_t mandatory)
+{
+ // TODO: remove dependency on double
+ double tmpVal;
+ scpi_bool_t result;
+
+ if (!value) {
+ SCPI_ErrorPush(context, SCPI_ERROR_SYSTEM_ERROR);
+ return FALSE;
+ }
+
+ result = SCPI_ParamDouble(context, &tmpVal, mandatory);
+ if (result) {
+ *value = tmpVal;
+ }
+
+ return result;
+}
+
+/**
+ * Read character parameter
+ * @param context
+ * @param value
+ * @param len
+ * @param mandatory
+ * @return
+ */
+scpi_bool_t SCPI_ParamCharacters(scpi_t * context, const char ** value, size_t * len, scpi_bool_t mandatory)
+{
+ scpi_bool_t result;
+ scpi_parameter_t param;
+
+ if (!value || !len) {
+ SCPI_ErrorPush(context, SCPI_ERROR_SYSTEM_ERROR);
+ return FALSE;
+ }
+
+ result = SCPI_Parameter(context, ¶m, mandatory);
+ if (result) {
+ *value = param.data.ptr;
+ *len = param.data.len;
+
+ // TODO: return also parameter type (ProgramMnemonic, ArbitraryBlockProgramData, SingleQuoteProgramData, DoubleQuoteProgramData
+ }
+
+ return result;
+}
+
+/**
+ * Read BOOL parameter (0,1,ON,OFF)
+ * @param context
+ * @param value
+ * @param mandatory
+ * @return
+ */
+scpi_bool_t SCPI_ParamBool(scpi_t * context, scpi_bool_t * value, scpi_bool_t mandatory)
+{
+ scpi_bool_t result;
+ scpi_parameter_t param;
+
+ if (!value) {
+ SCPI_ErrorPush(context, SCPI_ERROR_SYSTEM_ERROR);
+ return FALSE;
+ }
+
+ result = SCPI_Parameter(context, ¶m, mandatory);
+
+ if (result) {
+ switch (param.type) {
+ case TokDecimalNumericProgramData:
+ *value = param.number.value ? 1 : 0;
+ break;
+ case TokProgramMnemonic:
+ if (compareStr("ON", 2, param.data.ptr, param.data.len)) {
+ *value = TRUE;
+ } else if (compareStr("OFF", 3, param.data.ptr, param.data.len)) {
+ *value = FALSE;
+ } else {
+ SCPI_ErrorPush(context, SCPI_ERROR_ILLEGAL_PARAMETER_VALUE);
+ result = FALSE;
+ }
+ break;
+ default:
+ SCPI_ErrorPush(context, SCPI_ERROR_DATA_TYPE_ERROR);
+ result = FALSE;
+ }
+ }
+
+ return result;
+}
+
+/**
+ * Read value from list of options
+ * @param context
+ * @param options
+ * @param value
+ * @param mandatory
+ * @return
+ */
+scpi_bool_t SCPI_ParamChoice(scpi_t * context, const char * options[], int32_t * value, scpi_bool_t mandatory)
+{
+ size_t res;
+ scpi_bool_t result;
+ scpi_parameter_t param;
+
+ if (!options || !value) {
+ SCPI_ErrorPush(context, SCPI_ERROR_SYSTEM_ERROR);
+ return FALSE;
+ }
+
+ result = SCPI_Parameter(context, ¶m, mandatory);
+ if (result) {
+ if (param.type == TokProgramMnemonic) {
+ for (res = 0; options[res]; ++res) {
+ if (matchPattern(options[res], strlen(options[res]), param.data.ptr, param.data.len)) {
+ *value = res;
+ break;
+ }
+ }
+
+ if (!options[res]) {
+ SCPI_ErrorPush(context, SCPI_ERROR_ILLEGAL_PARAMETER_VALUE);
+ result = FALSE;
+ }
+ } else {
+ SCPI_ErrorPush(context, SCPI_ERROR_DATA_TYPE_ERROR);
+ result = FALSE;
+ }
+ }
+
+ return result;
+}
+
+/**
+ * Parse one parameter and detect type
+ * @param state
+ * @param token
+ * @return
+ */
+int scpiParser_parseProgramData(lex_state_t * state, scpi_token_t * token) {
+ scpi_token_t tmp;
int result = 0;
int wsLen;
int suffixLen;
int realLen = 0;
- realLen += lexWhiteSpace(state, &tmp);
+ realLen += scpiLex_WhiteSpace(state, &tmp);
- if (result == 0) result = lexNondecimalNumericData(state, token);
- if (result == 0) result = lexCharacterProgramData(state, token);
+ if (result == 0) result = scpiLex_NondecimalNumericData(state, token);
+ if (result == 0) result = scpiLex_CharacterProgramData(state, token);
if (result == 0) {
- result = lexDecimalNumericProgramData(state, token);
+ result = scpiLex_DecimalNumericProgramData(state, token);
if (result != 0) {
- wsLen = lexWhiteSpace(state, &tmp);
- suffixLen = lexSuffixProgramData(state, &tmp);
+ wsLen = scpiLex_WhiteSpace(state, &tmp);
+ suffixLen = scpiLex_SuffixProgramData(state, &tmp);
if (suffixLen > 0) {
token->len += wsLen + suffixLen;
token->type = TokDecimalNumericProgramDataWithSuffix;
@@ -544,19 +695,26 @@
}
}
- if (result == 0) result = lexStringProgramData(state, token);
- if (result == 0) result = lexArbitraryBlockProgramData(state, token);
- if (result == 0) result = lexProgramExpression(state, token);
+ if (result == 0) result = scpiLex_StringProgramData(state, token);
+ if (result == 0) result = scpiLex_ArbitraryBlockProgramData(state, token);
+ if (result == 0) result = scpiLex_ProgramExpression(state, token);
- realLen += lexWhiteSpace(state, &tmp);
+ realLen += scpiLex_WhiteSpace(state, &tmp);
return result + realLen;
}
-int parseAllProgramData(lex_state_t * state, token_t * token, int * numberOfParameters) {
+/**
+ * Skip all parameters to correctly detect end of command line.
+ * @param state
+ * @param token
+ * @param numberOfParameters
+ * @return
+ */
+int scpiParser_parseAllProgramData(lex_state_t * state, scpi_token_t * token, int * numberOfParameters) {
int result;
- token_t tmp;
+ scpi_token_t tmp;
int paramCount = 0;
token->len = -1;
@@ -564,7 +722,7 @@
token->ptr = state->pos;
- for (result = 1; result != 0; result = lexComma(state, &tmp)) {
+ for (result = 1; result != 0; result = scpiLex_Comma(state, &tmp)) {
token->len += result;
if (result == 0) {
@@ -574,7 +732,7 @@
break;
}
- result = parseProgramData(state, &tmp);
+ result = scpiParser_parseProgramData(state, &tmp);
if (tmp.type != TokUnknown) {
token->len += result;
} else {
@@ -596,15 +754,22 @@
return token->len;
}
-static void invalidateToken(token_t * token, const char * ptr) {
+static void invalidateToken(scpi_token_t * token, const char * ptr) {
token->len = 0;
token->ptr = ptr;
token->type = TokUnknown;
}
-int detectProgramMessageUnit(scpi_parser_state_t * state, const char * buffer, int len) {
+/**
+ * Skip complete command line - program header and parameters
+ * @param state
+ * @param buffer
+ * @param len
+ * @return
+ */
+int scpiParser_detectProgramMessageUnit(scpi_parser_state_t * state, const char * buffer, int len) {
lex_state_t lex_state;
- token_t tmp;
+ scpi_token_t tmp;
int result = 0;
lex_state.buffer = lex_state.pos = buffer;
@@ -612,11 +777,11 @@
state->numberOfParameters = 0;
/* ignore whitespace at the begginig */
- lexWhiteSpace(&lex_state, &tmp);
+ scpiLex_WhiteSpace(&lex_state, &tmp);
- if (lexProgramHeader(&lex_state, &state->programHeader) >= 0) {
- if (lexWhiteSpace(&lex_state, &tmp) > 0) {
- parseAllProgramData(&lex_state, &state->programData, &state->numberOfParameters);
+ if (scpiLex_ProgramHeader(&lex_state, &state->programHeader) >= 0) {
+ if (scpiLex_WhiteSpace(&lex_state, &tmp) > 0) {
+ scpiParser_parseAllProgramData(&lex_state, &state->programData, &state->numberOfParameters);
} else {
invalidateToken(&state->programData, lex_state.pos);
}
@@ -625,10 +790,10 @@
invalidateToken(&state->programData, lex_state.buffer);
}
- if (result == 0) result = lexNewLine(&lex_state, &tmp);
- if (result == 0) result = lexSemicolon(&lex_state, &tmp);
+ if (result == 0) result = scpiLex_NewLine(&lex_state, &tmp);
+ if (result == 0) result = scpiLex_Semicolon(&lex_state, &tmp);
- if (!lexIsEos(&lex_state) && (result == 0)) {
+ if (!scpiLex_IsEos(&lex_state) && (result == 0)) {
lex_state.pos++;
state->programHeader.len = 1;
--
Gitblit v1.9.1