Skip to content

Fix parsing 'type' attibutes in plugins #809

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
merged 5 commits into from
Jan 3, 2022
Merged

Fix parsing 'type' attibutes in plugins #809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d2debc2
Fix parsing 'type' attibutes in plugins
chapulina Dec 30, 2021
c26c826
Fix test
chapulina Dec 30, 2021
5fc1571
Add line with unrecognized type
scpeters Dec 30, 2021
5ee17ec
Merge branch 'sdf12' into chapulina/12/plugin_type
scpeters Dec 30, 2021
27fc0a4
Fix for custom element with attribute 'type' (#811)
aaronchongth Dec 31, 2021
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
17 changes: 10 additions & 7 deletions src/Param.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,14 +640,17 @@ bool ParamPrivate::ValueFromStringImpl(const std::string &_typeName,
std::string tmp(trimmed);
std::string lowerTmp = lowercase(trimmed);

// "true" and "false" doesn't work properly
if (lowerTmp == "true")
// "true" and "false" doesn't work properly (except for string)
if (_typeName != "string" && _typeName != "std::string")
{
tmp = "1";
}
else if (lowerTmp == "false")
{
tmp = "0";
if (lowerTmp == "true")
{
tmp = "1";
}
else if (lowerTmp == "false")
{
tmp = "0";
}
}

bool isHex = lowerTmp.compare(0, 2, "0x") == 0;
Expand Down
3 changes: 2 additions & 1 deletion src/Plugin_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,8 @@ TEST(DOMPlugin, LoadWithChildren)
std::string pluginStr = R"(<plugin name='3D View' filename='MinimalScene'>
<ignition-gui>
<title>3D View</title>
<property type='bool' key='showTitleBar'>false</property>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the problem is related to unrecognized type values, like ignition.msgs.Boolean in triggered_publisher.sdf

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was just fixing the test failure. With my change, the parser is now converting false into 0.

I haven't touched the parser much before, so I'd appreciate some guidance on the proper fix. My assumption from #689 is that we only want to parse the /pose@type attributes here, but don't affect the rest, that's why I added the extra check for "pose" with a TODO to remove the special type handling from that function to a pose-specific function. But I suspect I may be missing some important detail.

<property type='Ignition.Msgs.Boolean'>false</property>
<property type='bool' key='showTitleBar'>0</property>
<property type='string' key='state'>docked</property>
</ignition-gui>
<engine>ogre</engine>
Expand Down
24 changes: 8 additions & 16 deletions src/parser.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1912,13 +1912,13 @@ void copyChildren(ElementPtr _sdf,
for (elemXml = _xml->FirstChildElement(); elemXml;
elemXml = elemXml->NextSiblingElement())
{
std::string elem_name = elemXml->Name();
std::string elemName = elemXml->Name();

if (_sdf->HasElementDescription(elem_name))
if (_sdf->HasElementDescription(elemName))
{
if (!_onlyUnknown)
{
sdf::ElementPtr element = _sdf->AddElement(elem_name);
sdf::ElementPtr element = _sdf->AddElement(elemName);

// FIXME: copy attributes
for (const auto *attribute = elemXml->FirstAttribute();
Expand All @@ -1941,26 +1941,18 @@ void copyChildren(ElementPtr _sdf,
{
ElementPtr element(new Element);
element->SetParent(_sdf);
element->SetName(elem_name);
std::optional<std::string> typeName = std::nullopt;
element->SetName(elemName);
for (const tinyxml2::XMLAttribute *attribute = elemXml->FirstAttribute();
attribute; attribute = attribute->Next())
{
const std::string attributeName(attribute->Name());
if (attributeName == "type")
typeName = attribute->Value();

element->AddAttribute(attributeName, "string", "", 1, "");
element->GetAttribute(attributeName)->SetFromString(
attribute->Value());
element->AddAttribute(attribute->Name(), "string", "", 1, "");
element->GetAttribute(attribute->Name())->SetFromString(
attribute->Value());
}

if (elemXml->GetText() != nullptr)
{
if (typeName.has_value())
element->AddValue(typeName.value(), elemXml->GetText(), true);
else
element->AddValue("string", elemXml->GetText(), true);
element->AddValue("string", elemXml->GetText(), true);
}

copyChildren(element, elemXml, _onlyUnknown);
Expand Down