piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Added support for empty spaces within attribute names and double quotes

Browse Source
This commit is contained in:
Raphael Coeffic
2021-11-22 13:23:28 +01:00
committed by Raphael Coeffic
parent 7cccb0e76e
commit df4a44274b
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/storage/yaml/yaml_parser.cpp
+18 -8
View File
@@ -148,17 +148,24 @@ YamlParser::parse(const char* buffer, unsigned int size)
}
state = ps_Attr;
if (*c == '\"') {
state = ps_AttrQuo;
break;
}
CONCAT_STR(scratch_buf, scratch_len, *c);
break;
case ps_AttrQuo:
if (*c == '\"') {
state = ps_Attr;
break;
}
CONCAT_STR(scratch_buf, scratch_len, *c);
break;
case ps_Attr:
if (*c == ' ') {// assumes nothing else comes after spaces start
node_found = calls->find_node(ctx, scratch_buf, scratch_len);
if (!node_found) {
TRACE_YAML("YAML_PARSER: Could not find node '%.*s' (1)\n",
scratch_len, scratch_buf);
}
state = ps_AttrSP;
if (*c == '\"') {
state = ps_AttrQuo;
break;
}
if ((*c != ':') && (*c != '\r') && (*c != '\n'))
@@ -167,6 +174,7 @@ YamlParser::parse(const char* buffer, unsigned int size)
case ps_AttrSP:
if (*c == '\r' || *c == '\n') {
if (state == ps_Attr) {
// TODO: trim spaces at the end?
node_found = calls->find_node(ctx, scratch_buf, scratch_len);
if (!node_found) {
TRACE_YAML("YAML_PARSER: Could not find node '%.*s' (2)\n",
@@ -179,6 +187,7 @@ YamlParser::parse(const char* buffer, unsigned int size)
}
if (*c == ':') {
if (state == ps_Attr) {
// TODO: trim spaces at the end?
node_found = calls->find_node(ctx, scratch_buf, scratch_len);
if (!node_found) {
TRACE_YAML("YAML_PARSER: Could not find node '%.*s' (3)\n",
@@ -261,9 +270,10 @@ YamlParser::parse(const char* buffer, unsigned int size)
return DONE_PARSING;
case ps_Val:
if (*c == ' ' || *c == '\r' || *c == '\n') {
if (*c == '\r' || *c == '\n') {
// set attribute
if (node_found) {
// TODO: trim spaces at the end?
calls->set_attr(ctx, scratch_buf, scratch_len);
}
saved_state = state;
radio/src/storage/yaml/yaml_parser.h
+1
View File
@@ -42,6 +42,7 @@ class YamlParser
ps_Indent=0,
ps_Dash,
ps_Attr,
ps_AttrQuo,
ps_AttrSP,
ps_Sep,
ps_Val,