CLI2: No longer attempts to canonicalize rc:<file> and rc.<name>:<value>
This commit is contained in:
10
src/CLI2.cpp
10
src/CLI2.cpp
@@ -868,6 +868,10 @@ void CLI2::canonicalizeNames ()
|
|||||||
for (auto& a : _args)
|
for (auto& a : _args)
|
||||||
{
|
{
|
||||||
if (a._lextype == Lexer::Type::pair)
|
if (a._lextype == Lexer::Type::pair)
|
||||||
|
{
|
||||||
|
std::string raw = a.attribute ("raw");
|
||||||
|
if (raw.substr (0, 3) != "rc:" &&
|
||||||
|
raw.substr (0, 3) != "rc.")
|
||||||
{
|
{
|
||||||
std::string name = a.attribute ("name");
|
std::string name = a.attribute ("name");
|
||||||
std::string canonical;
|
std::string canonical;
|
||||||
@@ -876,6 +880,12 @@ void CLI2::canonicalizeNames ()
|
|||||||
canonicalize (canonical, "uda", name))
|
canonicalize (canonical, "uda", name))
|
||||||
{
|
{
|
||||||
a.attribute ("canonical", canonical);
|
a.attribute ("canonical", canonical);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
a._lextype = Lexer::Type::word;
|
||||||
|
}
|
||||||
|
|
||||||
changes = true;
|
changes = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user