Skip to content

Use case-insensitive lookup to parse colors. #2463

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 1 commit into from
Aug 16, 2017
Merged

Use case-insensitive lookup to parse colors. #2463

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 10 additions & 6 deletions src/color_maps.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,16 +607,20 @@ namespace Sass {

Color_Ptr_Const name_to_color(const char* key)
{
auto p = names_to_colors.find(key);
if (p != names_to_colors.end()) {
return p->second;
}
return 0;
return name_to_color(std::string(key));
}

Color_Ptr_Const name_to_color(const std::string& key)
{
return name_to_color(key.c_str());
// case insensitive lookup. See #2462
std::string lower{key};
std::transform(lower.begin(), lower.end(), lower.begin(), ::tolower);

auto p = names_to_colors.find(lower.c_str());
if (p != names_to_colors.end()) {
return p->second;
}
return 0;
}

const char* color_to_name(const int key)
Expand Down