From b7e9d6858699f5ea9a23ecf6587e98e7b0e1bc28 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周三, 14 10月 2015 16:49:41 +0800
Subject: [PATCH] Resolve #58: Illegal parameter value and unit test
---
libscpi/src/parser.c | 126 +++++++++++++++++++++++++++++++++--------
1 files changed, 101 insertions(+), 25 deletions(-)
diff --git a/libscpi/src/parser.c b/libscpi/src/parser.c
index 6cc21d4..acb53a8 100644
--- a/libscpi/src/parser.c
+++ b/libscpi/src/parser.c
@@ -339,7 +339,7 @@
* @return
*/
static size_t resultUInt32BaseSign(scpi_t * context, uint32_t val, int8_t base, scpi_bool_t sign) {
- char buffer[32+1];
+ char buffer[32 + 1];
const char * basePrefix;
size_t result = 0;
size_t len;
@@ -365,7 +365,7 @@
* @return
*/
static size_t resultUInt64BaseSign(scpi_t * context, uint64_t val, int8_t base, scpi_bool_t sign) {
- char buffer[64+1];
+ char buffer[64 + 1];
const char * basePrefix;
size_t result = 0;
size_t len;
@@ -424,7 +424,23 @@
}
/**
- * Write double value to the result
+ * Write float (32 bit) value to the result
+ * @param context
+ * @param val
+ * @return
+ */
+size_t SCPI_ResultFloat(scpi_t * context, float val) {
+ char buffer[32];
+ size_t result = 0;
+ size_t len = SCPI_FloatToStr(val, buffer, sizeof (buffer));
+ result += writeDelimiter(context);
+ result += writeData(context, buffer, len);
+ context->output_count++;
+ return result;
+}
+
+/**
+ * Write double (64bit) value to the result
* @param context
* @param val
* @return
@@ -437,7 +453,6 @@
result += writeData(context, buffer, len);
context->output_count++;
return result;
-
}
/**
@@ -472,7 +487,7 @@
SCPI_UInt32ToStrBase((uint32_t) len, block_header + 2, 10, 10);
header_len = strlen(block_header + 2);
- block_header[1] = (char)(header_len + '0');
+ block_header[1] = (char) (header_len + '0');
result += writeData(context, block_header, header_len + 2);
result += writeData(context, data, len);
@@ -608,7 +623,7 @@
case SCPI_TOKEN_DECIMAL_NUMERIC_PROGRAM_DATA:
case SCPI_TOKEN_DECIMAL_NUMERIC_PROGRAM_DATA_WITH_SUFFIX:
if (sign) {
- return strBaseToInt32(parameter->ptr, (uint32_t *)value, 10) > 0 ? TRUE : FALSE;
+ return strBaseToInt32(parameter->ptr, (int32_t *) value, 10) > 0 ? TRUE : FALSE;
} else {
return strBaseToUInt32(parameter->ptr, value, 10) > 0 ? TRUE : FALSE;
}
@@ -642,7 +657,7 @@
case SCPI_TOKEN_DECIMAL_NUMERIC_PROGRAM_DATA:
case SCPI_TOKEN_DECIMAL_NUMERIC_PROGRAM_DATA_WITH_SUFFIX:
if (sign) {
- return strBaseToInt64(parameter->ptr, (uint64_t *)value, 10) > 0 ? TRUE : FALSE;
+ return strBaseToInt64(parameter->ptr, (int64_t *) value, 10) > 0 ? TRUE : FALSE;
} else {
return strBaseToUInt64(parameter->ptr, value, 10) > 0 ? TRUE : FALSE;
}
@@ -659,7 +674,7 @@
* @return TRUE if succesful
*/
scpi_bool_t SCPI_ParamToInt32(scpi_t * context, scpi_parameter_t * parameter, int32_t * value) {
- return ParamSignToUInt32(context, parameter, (uint32_t *)value, TRUE);
+ return ParamSignToUInt32(context, parameter, (uint32_t *) value, TRUE);
}
/**
@@ -669,7 +684,7 @@
* @param value result
* @return TRUE if succesful
*/
-scpi_bool_t SCPI_ParamToUInt32(scpi_t * context, scpi_parameter_t * parameter, uint32_t * value) {
+scpi_bool_t SCPI_ParamToUInt32(scpi_t * context, scpi_parameter_t * parameter, uint32_t * value) {
return ParamSignToUInt32(context, parameter, value, FALSE);
}
@@ -681,7 +696,7 @@
* @return TRUE if succesful
*/
scpi_bool_t SCPI_ParamToInt64(scpi_t * context, scpi_parameter_t * parameter, int64_t * value) {
- return ParamSignToUInt64(context, parameter, (uint64_t *)value, TRUE);
+ return ParamSignToUInt64(context, parameter, (uint64_t *) value, TRUE);
}
/**
@@ -691,19 +706,18 @@
* @param value result
* @return TRUE if succesful
*/
-scpi_bool_t SCPI_ParamToUInt64(scpi_t * context, scpi_parameter_t * parameter, uint64_t * value) {
+scpi_bool_t SCPI_ParamToUInt64(scpi_t * context, scpi_parameter_t * parameter, uint64_t * value) {
return ParamSignToUInt64(context, parameter, value, FALSE);
}
/**
- * Convert parameter to double
+ * Convert parameter to float (32 bit)
* @param context
* @param parameter
* @param value result
* @return TRUE if succesful
*/
-#include "stdio.h"
-scpi_bool_t SCPI_ParamToDouble(scpi_t * context, scpi_parameter_t * parameter, double * value) {
+scpi_bool_t SCPI_ParamToFloat(scpi_t * context, scpi_parameter_t * parameter, float * value) {
scpi_bool_t result;
uint32_t valint;
@@ -721,6 +735,39 @@
break;
case SCPI_TOKEN_DECIMAL_NUMERIC_PROGRAM_DATA:
case SCPI_TOKEN_DECIMAL_NUMERIC_PROGRAM_DATA_WITH_SUFFIX:
+ result = strToFloat(parameter->ptr, value) > 0 ? TRUE : FALSE;
+ break;
+ default:
+ result = FALSE;
+ }
+ return result;
+}
+
+/**
+ * Convert parameter to double (64 bit)
+ * @param context
+ * @param parameter
+ * @param value result
+ * @return TRUE if succesful
+ */
+scpi_bool_t SCPI_ParamToDouble(scpi_t * context, scpi_parameter_t * parameter, double * value) {
+ scpi_bool_t result;
+ uint64_t valint;
+
+ if (!value) {
+ SCPI_ErrorPush(context, SCPI_ERROR_SYSTEM_ERROR);
+ return FALSE;
+ }
+
+ switch (parameter->type) {
+ case SCPI_TOKEN_HEXNUM:
+ case SCPI_TOKEN_OCTNUM:
+ case SCPI_TOKEN_BINNUM:
+ result = SCPI_ParamToUInt64(context, parameter, &valint);
+ *value = valint;
+ break;
+ case SCPI_TOKEN_DECIMAL_NUMERIC_PROGRAM_DATA:
+ case SCPI_TOKEN_DECIMAL_NUMERIC_PROGRAM_DATA_WITH_SUFFIX:
result = strToDouble(parameter->ptr, value) > 0 ? TRUE : FALSE;
break;
default:
@@ -730,7 +777,38 @@
}
/**
- * Read floating point parameter
+ * Read floating point float (32 bit) parameter
+ * @param context
+ * @param value
+ * @param mandatory
+ * @return
+ */
+scpi_bool_t SCPI_ParamFloat(scpi_t * context, float * 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) {
+ if (SCPI_ParamIsNumber(¶m, FALSE)) {
+ SCPI_ParamToFloat(context, ¶m, 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);
+ result = FALSE;
+ }
+ }
+ return result;
+}
+
+/**
+ * Read floating point double (64 bit) parameter
* @param context
* @param value
* @param mandatory
@@ -832,7 +910,7 @@
* @return
*/
scpi_bool_t SCPI_ParamInt32(scpi_t * context, int32_t * value, scpi_bool_t mandatory) {
- return ParamSignUInt32(context, (uint32_t *)value, mandatory, TRUE);
+ return ParamSignUInt32(context, (uint32_t *) value, mandatory, TRUE);
}
/**
@@ -854,7 +932,7 @@
* @return
*/
scpi_bool_t SCPI_ParamInt64(scpi_t * context, int64_t * value, scpi_bool_t mandatory) {
- return ParamSignUInt64(context, (uint64_t *)value, mandatory, TRUE);
+ return ParamSignUInt64(context, (uint64_t *) value, mandatory, TRUE);
}
/**
@@ -887,7 +965,7 @@
result = SCPI_Parameter(context, ¶m, mandatory);
if (result) {
- switch(param.type) {
+ switch (param.type) {
case SCPI_TOKEN_SINGLE_QUOTE_PROGRAM_DATA:
case SCPI_TOKEN_DOUBLE_QUOTE_PROGRAM_DATA:
*value = param.ptr + 1;
@@ -1256,7 +1334,7 @@
}
pattern = context->param_list.cmd->pattern;
- return matchCommand (pattern, cmd, strlen (cmd), NULL, 0, 0);
+ return matchCommand(pattern, cmd, strlen(cmd), NULL, 0, 0);
}
/**
@@ -1273,11 +1351,11 @@
}
scpi_bool_t SCPI_Match(const char * pattern, const char * value, size_t len) {
- return matchCommand (pattern, value, len, NULL, 0, 0);
+ return matchCommand(pattern, value, len, NULL, 0, 0);
}
scpi_bool_t SCPI_CommandNumbers(scpi_t * context, int32_t * numbers, size_t len, int32_t default_value) {
- return matchCommand (context->param_list.cmd->pattern, context->param_list.cmd_raw.data, context->param_list.cmd_raw.length, numbers, len, default_value);
+ return matchCommand(context->param_list.cmd->pattern, context->param_list.cmd_raw.data, context->param_list.cmd_raw.length, numbers, len, default_value);
}
/**
@@ -1286,8 +1364,7 @@
* @param parameter
* @return
*/
-scpi_bool_t SCPI_ParamIsValid(scpi_parameter_t * parameter)
-{
+scpi_bool_t SCPI_ParamIsValid(scpi_parameter_t * parameter) {
return parameter->type == SCPI_TOKEN_UNKNOWN ? FALSE : TRUE;
}
@@ -1296,7 +1373,6 @@
* @param context
* @return
*/
-scpi_bool_t SCPI_ParamErrorOccurred(scpi_t * context)
-{
+scpi_bool_t SCPI_ParamErrorOccurred(scpi_t * context) {
return context->cmd_error;
}
--
Gitblit v1.9.1