niklas/rcl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Accept quoted int or float values as strings (#464)

Browse source 
Signed-off-by: ivanpauno <ivanpauno@ekumenlabs.com>
This commit is contained in:
ivanpauno 2019-06-27 17:51:05 -03:00 • committed by GitHub
parent b6f4bc97fa
commit d6ab086b02
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 57 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

56
rcl_yaml_param_parser/src/parser.c
View file

@ -772,40 +772,48 @@ static void * get_value(
}
/// Check for int
errno = 0;
ival = strtol(value, &endptr, 0);
if ((0 == errno) && (NULL != endptr)) {
if ((NULL != endptr) && (endptr != value)) {
if (('\0' != *value) && ('\0' == *endptr)) {
*val_type = DATA_TYPE_INT64;
ret_val = allocator.zero_allocate(1U, sizeof(int64_t), allocator.state);
if (NULL == ret_val) {
return NULL;
if (style != YAML_SINGLE_QUOTED_SCALAR_STYLE &&
style != YAML_DOUBLE_QUOTED_SCALAR_STYLE)
{
errno = 0;
ival = strtol(value, &endptr, 0);
if ((0 == errno) && (NULL != endptr)) {
if ((NULL != endptr) && (endptr != value)) {
if (('\0' != *value) && ('\0' == *endptr)) {
*val_type = DATA_TYPE_INT64;
ret_val = allocator.zero_allocate(1U, sizeof(int64_t), allocator.state);
if (NULL == ret_val) {
return NULL;
}
*((int64_t *)ret_val) = ival;
return ret_val;
}
*((int64_t *)ret_val) = ival;
return ret_val;
}
}
}
/// Check for float
errno = 0;
endptr = NULL;
dval = strtod(value, &endptr);
if ((0 == errno) && (NULL != endptr)) {
if ((NULL != endptr) && (endptr != value)) {
if (('\0' != *value) && ('\0' == *endptr)) {
*val_type = DATA_TYPE_DOUBLE;
ret_val = allocator.zero_allocate(1U, sizeof(double), allocator.state);
if (NULL == ret_val) {
return NULL;
if (style != YAML_SINGLE_QUOTED_SCALAR_STYLE &&
style != YAML_DOUBLE_QUOTED_SCALAR_STYLE)
{
errno = 0;
endptr = NULL;
dval = strtod(value, &endptr);
if ((0 == errno) && (NULL != endptr)) {
if ((NULL != endptr) && (endptr != value)) {
if (('\0' != *value) && ('\0' == *endptr)) {
*val_type = DATA_TYPE_DOUBLE;
ret_val = allocator.zero_allocate(1U, sizeof(double), allocator.state);
if (NULL == ret_val) {
return NULL;
}
*((double *)ret_val) = dval;
return ret_val;
}
*((double *)ret_val) = dval;
return ret_val;
}
}
errno = 0;
}
errno = 0;
/// It is a string
*val_type = DATA_TYPE_STRING;