Skip to content

Correct bool reading from yaml files #415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wjwwood merged 2 commits into from
Apr 12, 2019
Merged

Correct bool reading from yaml files #415

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf47548
Replace some wrong strncmp calls with strcmp
ivanpauno Apr 11, 2019
d453203
Add quotes checking when detecting bools
ivanpauno Apr 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 44 additions & 37 deletions rcl_yaml_param_parser/src/parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ static rcl_ret_t replace_ns(

static void * get_value(
const char * const value,
yaml_scalar_style_t style,
data_types_t * val_type,
const rcl_allocator_t allocator);

Expand Down Expand Up @@ -709,6 +710,7 @@ static rcl_ret_t add_val_to_string_arr(
///
static void * get_value(
const char * const value,
yaml_scalar_style_t style,
data_types_t * val_type,
const rcl_allocator_t allocator)
{
Expand All @@ -723,46 +725,50 @@ static void * get_value(
}

/// Check if it is bool
if ((0 == strncmp(value, "Y", strlen(value))) ||
(0 == strncmp(value, "y", strlen(value))) ||
(0 == strncmp(value, "yes", strlen(value))) ||
(0 == strncmp(value, "Yes", strlen(value))) ||
(0 == strncmp(value, "YES", strlen(value))) ||
(0 == strncmp(value, "true", strlen(value))) ||
(0 == strncmp(value, "True", strlen(value))) ||
(0 == strncmp(value, "TRUE", strlen(value))) ||
(0 == strncmp(value, "on", strlen(value))) ||
(0 == strncmp(value, "On", strlen(value))) ||
(0 == strncmp(value, "ON", strlen(value))))
if (style != YAML_SINGLE_QUOTED_SCALAR_STYLE &&
style != YAML_DOUBLE_QUOTED_SCALAR_STYLE)
{
*val_type = DATA_TYPE_BOOL;
ret_val = allocator.zero_allocate(1U, sizeof(bool), allocator.state);
if (NULL == ret_val) {
return NULL;
if ((0 == strcmp(value, "Y")) ||
(0 == strcmp(value, "y")) ||
(0 == strcmp(value, "yes")) ||
(0 == strcmp(value, "Yes")) ||
(0 == strcmp(value, "YES")) ||
(0 == strcmp(value, "true")) ||
(0 == strcmp(value, "True")) ||
(0 == strcmp(value, "TRUE")) ||
(0 == strcmp(value, "on")) ||
(0 == strcmp(value, "On")) ||
(0 == strcmp(value, "ON")))
{
*val_type = DATA_TYPE_BOOL;
ret_val = allocator.zero_allocate(1U, sizeof(bool), allocator.state);
if (NULL == ret_val) {
return NULL;
}
*((bool *)ret_val) = true;
return ret_val;
}
*((bool *)ret_val) = true;
return ret_val;
}

if ((0 == strncmp(value, "N", strlen(value))) ||
(0 == strncmp(value, "n", strlen(value))) ||
(0 == strncmp(value, "no", strlen(value))) ||
(0 == strncmp(value, "No", strlen(value))) ||
(0 == strncmp(value, "NO", strlen(value))) ||
(0 == strncmp(value, "false", strlen(value))) ||
(0 == strncmp(value, "False", strlen(value))) ||
(0 == strncmp(value, "FALSE", strlen(value))) ||
(0 == strncmp(value, "off", strlen(value))) ||
(0 == strncmp(value, "Off", strlen(value))) ||
(0 == strncmp(value, "OFF", strlen(value))))
{
*val_type = DATA_TYPE_BOOL;
ret_val = allocator.zero_allocate(1U, sizeof(bool), allocator.state);
if (NULL == ret_val) {
return NULL;
if ((0 == strcmp(value, "N")) ||
(0 == strcmp(value, "n")) ||
(0 == strcmp(value, "no")) ||
(0 == strcmp(value, "No")) ||
(0 == strcmp(value, "NO")) ||
(0 == strcmp(value, "false")) ||
(0 == strcmp(value, "False")) ||
(0 == strcmp(value, "FALSE")) ||
(0 == strcmp(value, "off")) ||
(0 == strcmp(value, "Off")) ||
(0 == strcmp(value, "OFF")))
{
*val_type = DATA_TYPE_BOOL;
ret_val = allocator.zero_allocate(1U, sizeof(bool), allocator.state);
if (NULL == ret_val) {
return NULL;
}
*((bool *)ret_val) = false;
return ret_val;
}
*((bool *)ret_val) = false;
return ret_val;
}

/// Check for int
Expand Down Expand Up @@ -834,6 +840,7 @@ static rcl_ret_t parse_value(
const size_t parameter_idx = ((params_st->params[node_idx].num_params) - 1U);
const size_t val_size = event.data.scalar.length;
const char * value = (char *)event.data.scalar.value;
yaml_scalar_style_t style = event.data.scalar.style;
const uint32_t line_num = ((uint32_t)(event.start_mark.line) + 1U);
rcl_variant_t * param_value;

Expand All @@ -860,7 +867,7 @@ static rcl_ret_t parse_value(
param_value = &(params_st->params[node_idx].parameter_values[parameter_idx]);

// param_value->string_value = rcutils_strdup(value, allocator);
ret_val = get_value(value, &val_type, allocator);
ret_val = get_value(value, style, &val_type, allocator);
if (NULL == ret_val) {
RCL_SET_ERROR_MSG_WITH_FORMAT_STRING("Error parsing value %s at line %d", value, line_num);
return RCL_RET_ERROR;
Expand Down