Merge pull request sass#695 from xzyfer/fix/map-keys-as-colors

Fix colours as map keys
scantist-ossops-m2 · Dec 9, 2014 · 8ba2e36 · 8ba2e36
2 parents 0042ad7 + dbb7d4a
commit 8ba2e36
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/parser.cpp b/parser.cpp
@@ -1127,7 +1127,8 @@ namespace Sass {
 
     if (lex< identifier >()) {
       String_Constant* str = new (ctx.mem) String_Constant(path, source_position, lexed);
-      str->is_delayed(true);
+      // Dont' delay this string if it is a name color. Fixes #652.
+      str->is_delayed(ctx.names_to_colors.count(lexed) == 0);
       return str;
     }