CLI2: No longer attempts to canonicalize rc:<file> and rc.<name>:<value>

This commit is contained in:
Paul Beckingham 2015-07-06 12:14:52 -04:00
parent dcb13bd2b4
commit 0ee26a0cae

View file

@ -869,13 +869,23 @@ void CLI2::canonicalizeNames ()
{
if (a._lextype == Lexer::Type::pair)
{
std::string name = a.attribute ("name");
std::string canonical;
if (canonicalize (canonical, "pseudo", name) ||
canonicalize (canonical, "attribute", name) ||
canonicalize (canonical, "uda", name))
std::string raw = a.attribute ("raw");
if (raw.substr (0, 3) != "rc:" &&
raw.substr (0, 3) != "rc.")
{
a.attribute ("canonical", canonical);
std::string name = a.attribute ("name");
std::string canonical;
if (canonicalize (canonical, "pseudo", name) ||
canonicalize (canonical, "attribute", name) ||
canonicalize (canonical, "uda", name))
{
a.attribute ("canonical", canonical);
}
else
{
a._lextype = Lexer::Type::word;
}
changes = true;
}
}