wowgetoffyourcellphone/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix tokenisation to ignore multiple spaces

Browse Source 
This was SVN commit r7676.
This commit is contained in:
Ykkrosh 2010-07-03 15:21:50 +00:00
parent e23d4d232a
commit df86f4d27b
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/simulation2/system/ParamNode.cpp
View File

@ -86,13 +86,18 @@ void CParamNode::ApplyLayer(const XMBFile& xmb, const XMBElement& element)
{
CParamNode& node = m_Childs[name];
std::wstring newValue(value.begin(), value.end());
// Split into tokens
std::vector<std::wstring> oldTokens;
std::vector<std::wstring> newTokens;
if (!node.m_Value.empty())
boost::algorithm::split(oldTokens, node.m_Value, boost::algorithm::is_space());
if (!newValue.empty())
boost::algorithm::split(newTokens, newValue, boost::algorithm::is_space());
boost::algorithm::split(oldTokens, node.m_Value, boost::algorithm::is_space());
boost::algorithm::split(newTokens, newValue, boost::algorithm::is_space());
// Delete empty tokens
oldTokens.erase(std::remove_if(oldTokens.begin(), oldTokens.end(), std::mem_fun_ref(&std::wstring::empty)), oldTokens.end());
newTokens.erase(std::remove_if(newTokens.begin(), newTokens.end(), std::mem_fun_ref(&std::wstring::empty)), newTokens.end());
// Merge the two lists
std::vector<std::wstring> tokens = oldTokens;
for (size_t i = 0; i < newTokens.size(); ++i)
{

4
source/simulation2/tests/test_ParamNode.h
View File

@ -112,9 +112,9 @@ public:
void test_overlay_tokens()
{
CParamNode node;
TS_ASSERT_EQUALS(CParamNode::LoadXMLString(node, "<test> <a datatype='tokens'>x y</a></test>"), PSRETURN_OK);
TS_ASSERT_EQUALS(CParamNode::LoadXMLString(node, "<test> <a datatype='tokens'>x y</a><b datatype='tokens'>a b\nc\td</b></test>"), PSRETURN_OK);
TS_ASSERT_EQUALS(CParamNode::LoadXMLString(node, "<test> <a datatype='tokens'>-y z w</a></test>"), PSRETURN_OK);
TS_ASSERT_WSTR_EQUALS(node.ToXML(), L"<test><a datatype=\"tokens\">x z w</a></test>");
TS_ASSERT_WSTR_EQUALS(node.ToXML(), L"<test><a datatype=\"tokens\">x z w</a><b datatype=\"tokens\">a b c d</b></test>");
}
void test_types()