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

8
rcl_yaml_param_parser/src/parser.c
View file

@ -772,6 +772,9 @@ static void * get_value(
}
/// Check for int
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)) {
@ -787,8 +790,12 @@ static void * get_value(
}
}
}
}
/// Check for float
if (style != YAML_SINGLE_QUOTED_SCALAR_STYLE &&
style != YAML_DOUBLE_QUOTED_SCALAR_STYLE)
{
errno = 0;
endptr = NULL;
dval = strtod(value, &endptr);
@ -806,6 +813,7 @@ static void * get_value(
}
}
errno = 0;
}
/// It is a string
*val_type = DATA_TYPE_STRING;

4
rcl_yaml_param_parser/test/string_array_with_quoted_number.yaml Normal file
View file

@ -0,0 +1,4 @@
initial_params_node:
ros__parameters:
sa1: ["Four", "score"]
sa2: ["and", "7"]

22
rcl_yaml_param_parser/test/test_parse_yaml.cpp
View file

@ -22,7 +22,6 @@
#include "rcutils/filesystem.h"
static char cur_dir[1024];
rcutils_allocator_t allocator = rcutils_get_default_allocator();
TEST(test_file_parser, correct_syntax) {
rcutils_reset_error();
@ -43,6 +42,27 @@ TEST(test_file_parser, correct_syntax) {
allocator.deallocate(path, allocator.state);
}
TEST(test_file_parser, string_array_with_quoted_number) {
rcutils_reset_error();
EXPECT_TRUE(rcutils_get_cwd(cur_dir, 1024));
rcutils_allocator_t allocator = rcutils_get_default_allocator();
char * test_path = rcutils_join_path(cur_dir, "test", allocator);
char * path = rcutils_join_path(test_path, "string_array_with_quoted_number.yaml", allocator);
fprintf(stderr, "cur_path: %s\n", path);
EXPECT_TRUE(rcutils_exists(path));
rcl_params_t * params_hdl = rcl_yaml_node_struct_init(allocator);
EXPECT_TRUE(params_hdl);
if (params_hdl) {
bool res = rcl_parse_yaml_file(path, params_hdl);
fprintf(stderr, "%s\n", rcutils_get_error_string().str);
EXPECT_TRUE(res);
rcl_yaml_node_struct_print(params_hdl);
rcl_yaml_node_struct_fini(params_hdl);
}
allocator.deallocate(test_path, allocator.state);
allocator.deallocate(path, allocator.state);
}
TEST(test_file_parser, multi_ns_correct_syntax) {
rcutils_reset_error();
EXPECT_TRUE(rcutils_get_cwd(cur_dir, 1024));