Skip to content
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

Support yaml string tag '!!str' #999

Merged
merged 3 commits into from
Jan 4, 2023
Merged

Support yaml string tag '!!str' #999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e075f55
Support yaml string tag '!!str'
Barry-Xu-2018 Aug 16, 2022
55fd74a
Address review comments
Barry-Xu-2018 Aug 18, 2022
6b516f0
Update based on review comments
Barry-Xu-2018 Dec 23, 2022
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
1 change: 1 addition & 0 deletions rcl_yaml_param_parser/src/impl/parse.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ RCUTILS_WARN_UNUSED
void * get_value(
const char * const value,
yaml_scalar_style_t style,
const yaml_char_t * const tag,
data_types_t * val_type,
const rcutils_allocator_t allocator);

Expand Down
10 changes: 9 additions & 1 deletion rcl_yaml_param_parser/src/parse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ _validate_name(const char * name, rcutils_allocator_t allocator);
void * get_value(
const char * const value,
yaml_scalar_style_t style,
const yaml_char_t * const tag,
data_types_t * val_type,
const rcutils_allocator_t allocator)
{
Expand All @@ -87,6 +88,12 @@ void * get_value(
RCUTILS_CHECK_ALLOCATOR_WITH_MSG(
&allocator, "allocator is invalid", return NULL);

/// Check for yaml string tag
if (tag != NULL && strcmp(YAML_STR_TAG, (char *)tag) == 0) {
*val_type = DATA_TYPE_STRING;
return rcutils_strdup(value, allocator);
}

/// Check if it is bool
if (style != YAML_SINGLE_QUOTED_SCALAR_STYLE &&
style != YAML_DOUBLE_QUOTED_SCALAR_STYLE)
Expand Down Expand Up @@ -233,6 +240,7 @@ rcutils_ret_t parse_value(
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 yaml_char_t * const tag = event.data.scalar.tag;
const uint32_t line_num = ((uint32_t)(event.start_mark.line) + 1U);

RCUTILS_CHECK_FOR_NULL_WITH_MSG(
Expand All @@ -254,7 +262,7 @@ rcutils_ret_t parse_value(
rcl_variant_t * param_value = &(params_st->params[node_idx].parameter_values[parameter_idx]);

data_types_t val_type;
void * ret_val = get_value(value, style, &val_type, allocator);
void * ret_val = get_value(value, style, tag, &val_type, allocator);
if (NULL == ret_val) {
RCUTILS_SET_ERROR_MSG_WITH_FORMAT_STRING(
"Error parsing value %s at line %d", value, line_num);
Expand Down
5 changes: 5 additions & 0 deletions rcl_yaml_param_parser/test/correct_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,8 @@ intel:
ros__parameters:
num_cores: 8
arch: x86_64
string_tag:
ros__parameters:
string_bool: !!str yes
string_int: !!str 1234
string_double: !!str 12.34
13 changes: 13 additions & 0 deletions rcl_yaml_param_parser/test/test_parse_yaml.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,19 @@ TEST(test_parser, correct_syntax) {
ASSERT_EQ(1U, param_value->string_array_value->size);
EXPECT_STREQ("Mobius", param_value->string_array_value->data[0]);

param_value = rcl_yaml_node_struct_get("string_tag", "string_bool", params);
ASSERT_TRUE(NULL != param_value) << rcutils_get_error_string().str;
ASSERT_TRUE(NULL != param_value->string_value);
EXPECT_STREQ("yes", param_value->string_value);
param_value = rcl_yaml_node_struct_get("string_tag", "string_int", params);
ASSERT_TRUE(NULL != param_value) << rcutils_get_error_string().str;
ASSERT_TRUE(NULL != param_value->string_value);
EXPECT_STREQ("1234", param_value->string_value);
param_value = rcl_yaml_node_struct_get("string_tag", "string_double", params);
ASSERT_TRUE(NULL != param_value) << rcutils_get_error_string().str;
ASSERT_TRUE(NULL != param_value->string_value);
EXPECT_STREQ("12.34", param_value->string_value);

rcl_yaml_node_struct_print(params);
}
}
Expand Down