sassc 2.0.1 → 2.1.0.pre1

data/ext/libsass/src/check_nesting.hpp

@@ -6,58 +6,59 @@
 
 namespace Sass {
 
-  class CheckNesting : public Operation_CRTP<Statement_Ptr, CheckNesting> {
+  class CheckNesting : public Operation_CRTP<Statement*, CheckNesting> {
 
-    std::vector<Statement_Ptr>  parents;
+    std::vector<Statement*>  parents;
     Backtraces                  traces;
-    Statement_Ptr               parent;
-    Definition_Ptr              current_mixin_definition;
+    Statement*               parent;
+    Definition*              current_mixin_definition;
 
-    Statement_Ptr fallback_impl(Statement_Ptr);
-    Statement_Ptr before(Statement_Ptr);
-    Statement_Ptr visit_children(Statement_Ptr);
+    Statement* before(Statement*);
+    Statement* visit_children(Statement*);
 
   public:
     CheckNesting();
     ~CheckNesting() { }
 
-    Statement_Ptr operator()(Block_Ptr);
-    Statement_Ptr operator()(Definition_Ptr);
-    Statement_Ptr operator()(If_Ptr);
+    Statement* operator()(Block*);
+    Statement* operator()(Definition*);
+    Statement* operator()(If*);
 
     template <typename U>
-    Statement_Ptr fallback(U x) {
-      Statement_Ptr n = Cast<Statement>(x);
-      if (this->should_visit(n)) {
-        return fallback_impl(n);
+    Statement* fallback(U x) {
+      Statement* s = Cast<Statement>(x);
+      if (s && this->should_visit(s)) {
+        Block* b1 = Cast<Block>(s);
+        Has_Block* b2 = Cast<Has_Block>(s);
+        if (b1 || b2) return visit_children(s);
       }
-      return NULL;
+      return s;
     }
 
   private:
-    void invalid_content_parent(Statement_Ptr, AST_Node_Ptr);
-    void invalid_charset_parent(Statement_Ptr, AST_Node_Ptr);
-    void invalid_extend_parent(Statement_Ptr, AST_Node_Ptr);
-    // void invalid_import_parent(Statement_Ptr);
-    void invalid_mixin_definition_parent(Statement_Ptr, AST_Node_Ptr);
-    void invalid_function_parent(Statement_Ptr, AST_Node_Ptr);
+    void invalid_content_parent(Statement*, AST_Node*);
+    void invalid_charset_parent(Statement*, AST_Node*);
+    void invalid_extend_parent(Statement*, AST_Node*);
+    // void invalid_import_parent(Statement*);
+    void invalid_mixin_definition_parent(Statement*, AST_Node*);
+    void invalid_function_parent(Statement*, AST_Node*);
 
-    void invalid_function_child(Statement_Ptr);
-    void invalid_prop_child(Statement_Ptr);
-    void invalid_prop_parent(Statement_Ptr, AST_Node_Ptr);
-    void invalid_return_parent(Statement_Ptr, AST_Node_Ptr);
-    void invalid_value_child(AST_Node_Ptr);
+    void invalid_function_child(Statement*);
+    void invalid_prop_child(Statement*);
+    void invalid_prop_parent(Statement*, AST_Node*);
+    void invalid_return_parent(Statement*, AST_Node*);
+    void invalid_value_child(AST_Node*);
 
-    bool is_transparent_parent(Statement_Ptr, Statement_Ptr);
+    bool is_transparent_parent(Statement*, Statement*);
 
-    bool should_visit(Statement_Ptr);
+    bool should_visit(Statement*);
 
-    bool is_charset(Statement_Ptr);
-    bool is_mixin(Statement_Ptr);
-    bool is_function(Statement_Ptr);
-    bool is_root_node(Statement_Ptr);
-    bool is_at_root_node(Statement_Ptr);
-    bool is_directive_node(Statement_Ptr);
+    bool is_charset(Statement*);
+    bool is_mixin(Statement*);
+    bool is_function(Statement*);
+    bool is_root_node(Statement*);
+    bool is_at_root_node(Statement*);
+    bool is_directive_node(Statement*);
   };
 
 }

data/ext/libsass/src/color_maps.cpp

@@ -1,4 +1,7 @@
+// sass.hpp must go before all system headers to get the
+// __EXTENSIONS__ fix on Solaris.
 #include "sass.hpp"
+
 #include "ast.hpp"
 #include "color_maps.hpp"
 
@@ -159,155 +162,155 @@ namespace Sass {
 
   namespace Colors {
     const ParserState color_table("[COLOR TABLE]");
-    const Color aliceblue(color_table, 240, 248, 255, 1);
-    const Color antiquewhite(color_table, 250, 235, 215, 1);
-    const Color cyan(color_table, 0, 255, 255, 1);
-    const Color aqua(color_table, 0, 255, 255, 1);
-    const Color aquamarine(color_table, 127, 255, 212, 1);
-    const Color azure(color_table, 240, 255, 255, 1);
-    const Color beige(color_table, 245, 245, 220, 1);
-    const Color bisque(color_table, 255, 228, 196, 1);
-    const Color black(color_table, 0, 0, 0, 1);
-    const Color blanchedalmond(color_table, 255, 235, 205, 1);
-    const Color blue(color_table, 0, 0, 255, 1);
-    const Color blueviolet(color_table, 138, 43, 226, 1);
-    const Color brown(color_table, 165, 42, 42, 1);
-    const Color burlywood(color_table, 222, 184, 135, 1);
-    const Color cadetblue(color_table, 95, 158, 160, 1);
-    const Color chartreuse(color_table, 127, 255, 0, 1);
-    const Color chocolate(color_table, 210, 105, 30, 1);
-    const Color coral(color_table, 255, 127, 80, 1);
-    const Color cornflowerblue(color_table, 100, 149, 237, 1);
-    const Color cornsilk(color_table, 255, 248, 220, 1);
-    const Color crimson(color_table, 220, 20, 60, 1);
-    const Color darkblue(color_table, 0, 0, 139, 1);
-    const Color darkcyan(color_table, 0, 139, 139, 1);
-    const Color darkgoldenrod(color_table, 184, 134, 11, 1);
-    const Color darkgray(color_table, 169, 169, 169, 1);
-    const Color darkgrey(color_table, 169, 169, 169, 1);
-    const Color darkgreen(color_table, 0, 100, 0, 1);
-    const Color darkkhaki(color_table, 189, 183, 107, 1);
-    const Color darkmagenta(color_table, 139, 0, 139, 1);
-    const Color darkolivegreen(color_table, 85, 107, 47, 1);
-    const Color darkorange(color_table, 255, 140, 0, 1);
-    const Color darkorchid(color_table, 153, 50, 204, 1);
-    const Color darkred(color_table, 139, 0, 0, 1);
-    const Color darksalmon(color_table, 233, 150, 122, 1);
-    const Color darkseagreen(color_table, 143, 188, 143, 1);
-    const Color darkslateblue(color_table, 72, 61, 139, 1);
-    const Color darkslategray(color_table, 47, 79, 79, 1);
-    const Color darkslategrey(color_table, 47, 79, 79, 1);
-    const Color darkturquoise(color_table, 0, 206, 209, 1);
-    const Color darkviolet(color_table, 148, 0, 211, 1);
-    const Color deeppink(color_table, 255, 20, 147, 1);
-    const Color deepskyblue(color_table, 0, 191, 255, 1);
-    const Color dimgray(color_table, 105, 105, 105, 1);
-    const Color dimgrey(color_table, 105, 105, 105, 1);
-    const Color dodgerblue(color_table, 30, 144, 255, 1);
-    const Color firebrick(color_table, 178, 34, 34, 1);
-    const Color floralwhite(color_table, 255, 250, 240, 1);
-    const Color forestgreen(color_table, 34, 139, 34, 1);
-    const Color magenta(color_table, 255, 0, 255, 1);
-    const Color fuchsia(color_table, 255, 0, 255, 1);
-    const Color gainsboro(color_table, 220, 220, 220, 1);
-    const Color ghostwhite(color_table, 248, 248, 255, 1);
-    const Color gold(color_table, 255, 215, 0, 1);
-    const Color goldenrod(color_table, 218, 165, 32, 1);
-    const Color gray(color_table, 128, 128, 128, 1);
-    const Color grey(color_table, 128, 128, 128, 1);
-    const Color green(color_table, 0, 128, 0, 1);
-    const Color greenyellow(color_table, 173, 255, 47, 1);
-    const Color honeydew(color_table, 240, 255, 240, 1);
-    const Color hotpink(color_table, 255, 105, 180, 1);
-    const Color indianred(color_table, 205, 92, 92, 1);
-    const Color indigo(color_table, 75, 0, 130, 1);
-    const Color ivory(color_table, 255, 255, 240, 1);
-    const Color khaki(color_table, 240, 230, 140, 1);
-    const Color lavender(color_table, 230, 230, 250, 1);
-    const Color lavenderblush(color_table, 255, 240, 245, 1);
-    const Color lawngreen(color_table, 124, 252, 0, 1);
-    const Color lemonchiffon(color_table, 255, 250, 205, 1);
-    const Color lightblue(color_table, 173, 216, 230, 1);
-    const Color lightcoral(color_table, 240, 128, 128, 1);
-    const Color lightcyan(color_table, 224, 255, 255, 1);
-    const Color lightgoldenrodyellow(color_table, 250, 250, 210, 1);
-    const Color lightgray(color_table, 211, 211, 211, 1);
-    const Color lightgrey(color_table, 211, 211, 211, 1);
-    const Color lightgreen(color_table, 144, 238, 144, 1);
-    const Color lightpink(color_table, 255, 182, 193, 1);
-    const Color lightsalmon(color_table, 255, 160, 122, 1);
-    const Color lightseagreen(color_table, 32, 178, 170, 1);
-    const Color lightskyblue(color_table, 135, 206, 250, 1);
-    const Color lightslategray(color_table, 119, 136, 153, 1);
-    const Color lightslategrey(color_table, 119, 136, 153, 1);
-    const Color lightsteelblue(color_table, 176, 196, 222, 1);
-    const Color lightyellow(color_table, 255, 255, 224, 1);
-    const Color lime(color_table, 0, 255, 0, 1);
-    const Color limegreen(color_table, 50, 205, 50, 1);
-    const Color linen(color_table, 250, 240, 230, 1);
-    const Color maroon(color_table, 128, 0, 0, 1);
-    const Color mediumaquamarine(color_table, 102, 205, 170, 1);
-    const Color mediumblue(color_table, 0, 0, 205, 1);
-    const Color mediumorchid(color_table, 186, 85, 211, 1);
-    const Color mediumpurple(color_table, 147, 112, 219, 1);
-    const Color mediumseagreen(color_table, 60, 179, 113, 1);
-    const Color mediumslateblue(color_table, 123, 104, 238, 1);
-    const Color mediumspringgreen(color_table, 0, 250, 154, 1);
-    const Color mediumturquoise(color_table, 72, 209, 204, 1);
-    const Color mediumvioletred(color_table, 199, 21, 133, 1);
-    const Color midnightblue(color_table, 25, 25, 112, 1);
-    const Color mintcream(color_table, 245, 255, 250, 1);
-    const Color mistyrose(color_table, 255, 228, 225, 1);
-    const Color moccasin(color_table, 255, 228, 181, 1);
-    const Color navajowhite(color_table, 255, 222, 173, 1);
-    const Color navy(color_table, 0, 0, 128, 1);
-    const Color oldlace(color_table, 253, 245, 230, 1);
-    const Color olive(color_table, 128, 128, 0, 1);
-    const Color olivedrab(color_table, 107, 142, 35, 1);
-    const Color orange(color_table, 255, 165, 0, 1);
-    const Color orangered(color_table, 255, 69, 0, 1);
-    const Color orchid(color_table, 218, 112, 214, 1);
-    const Color palegoldenrod(color_table, 238, 232, 170, 1);
-    const Color palegreen(color_table, 152, 251, 152, 1);
-    const Color paleturquoise(color_table, 175, 238, 238, 1);
-    const Color palevioletred(color_table, 219, 112, 147, 1);
-    const Color papayawhip(color_table, 255, 239, 213, 1);
-    const Color peachpuff(color_table, 255, 218, 185, 1);
-    const Color peru(color_table, 205, 133, 63, 1);
-    const Color pink(color_table, 255, 192, 203, 1);
-    const Color plum(color_table, 221, 160, 221, 1);
-    const Color powderblue(color_table, 176, 224, 230, 1);
-    const Color purple(color_table, 128, 0, 128, 1);
-    const Color red(color_table, 255, 0, 0, 1);
-    const Color rosybrown(color_table, 188, 143, 143, 1);
-    const Color royalblue(color_table, 65, 105, 225, 1);
-    const Color saddlebrown(color_table, 139, 69, 19, 1);
-    const Color salmon(color_table, 250, 128, 114, 1);
-    const Color sandybrown(color_table, 244, 164, 96, 1);
-    const Color seagreen(color_table, 46, 139, 87, 1);
-    const Color seashell(color_table, 255, 245, 238, 1);
-    const Color sienna(color_table, 160, 82, 45, 1);
-    const Color silver(color_table, 192, 192, 192, 1);
-    const Color skyblue(color_table, 135, 206, 235, 1);
-    const Color slateblue(color_table, 106, 90, 205, 1);
-    const Color slategray(color_table, 112, 128, 144, 1);
-    const Color slategrey(color_table, 112, 128, 144, 1);
-    const Color snow(color_table, 255, 250, 250, 1);
-    const Color springgreen(color_table, 0, 255, 127, 1);
-    const Color steelblue(color_table, 70, 130, 180, 1);
-    const Color tan(color_table, 210, 180, 140, 1);
-    const Color teal(color_table, 0, 128, 128, 1);
-    const Color thistle(color_table, 216, 191, 216, 1);
-    const Color tomato(color_table, 255, 99, 71, 1);
-    const Color turquoise(color_table, 64, 224, 208, 1);
-    const Color violet(color_table, 238, 130, 238, 1);
-    const Color wheat(color_table, 245, 222, 179, 1);
-    const Color white(color_table, 255, 255, 255, 1);
-    const Color whitesmoke(color_table, 245, 245, 245, 1);
-    const Color yellow(color_table, 255, 255, 0, 1);
-    const Color yellowgreen(color_table, 154, 205, 50, 1);
-    const Color rebeccapurple(color_table, 102, 51, 153, 1);
-    const Color transparent(color_table, 0, 0, 0, 0);
+    const Color_RGBA aliceblue(color_table, 240, 248, 255, 1);
+    const Color_RGBA antiquewhite(color_table, 250, 235, 215, 1);
+    const Color_RGBA cyan(color_table, 0, 255, 255, 1);
+    const Color_RGBA aqua(color_table, 0, 255, 255, 1);
+    const Color_RGBA aquamarine(color_table, 127, 255, 212, 1);
+    const Color_RGBA azure(color_table, 240, 255, 255, 1);
+    const Color_RGBA beige(color_table, 245, 245, 220, 1);
+    const Color_RGBA bisque(color_table, 255, 228, 196, 1);
+    const Color_RGBA black(color_table, 0, 0, 0, 1);
+    const Color_RGBA blanchedalmond(color_table, 255, 235, 205, 1);
+    const Color_RGBA blue(color_table, 0, 0, 255, 1);
+    const Color_RGBA blueviolet(color_table, 138, 43, 226, 1);
+    const Color_RGBA brown(color_table, 165, 42, 42, 1);
+    const Color_RGBA burlywood(color_table, 222, 184, 135, 1);
+    const Color_RGBA cadetblue(color_table, 95, 158, 160, 1);
+    const Color_RGBA chartreuse(color_table, 127, 255, 0, 1);
+    const Color_RGBA chocolate(color_table, 210, 105, 30, 1);
+    const Color_RGBA coral(color_table, 255, 127, 80, 1);
+    const Color_RGBA cornflowerblue(color_table, 100, 149, 237, 1);
+    const Color_RGBA cornsilk(color_table, 255, 248, 220, 1);
+    const Color_RGBA crimson(color_table, 220, 20, 60, 1);
+    const Color_RGBA darkblue(color_table, 0, 0, 139, 1);
+    const Color_RGBA darkcyan(color_table, 0, 139, 139, 1);
+    const Color_RGBA darkgoldenrod(color_table, 184, 134, 11, 1);
+    const Color_RGBA darkgray(color_table, 169, 169, 169, 1);
+    const Color_RGBA darkgrey(color_table, 169, 169, 169, 1);
+    const Color_RGBA darkgreen(color_table, 0, 100, 0, 1);
+    const Color_RGBA darkkhaki(color_table, 189, 183, 107, 1);
+    const Color_RGBA darkmagenta(color_table, 139, 0, 139, 1);
+    const Color_RGBA darkolivegreen(color_table, 85, 107, 47, 1);
+    const Color_RGBA darkorange(color_table, 255, 140, 0, 1);
+    const Color_RGBA darkorchid(color_table, 153, 50, 204, 1);
+    const Color_RGBA darkred(color_table, 139, 0, 0, 1);
+    const Color_RGBA darksalmon(color_table, 233, 150, 122, 1);
+    const Color_RGBA darkseagreen(color_table, 143, 188, 143, 1);
+    const Color_RGBA darkslateblue(color_table, 72, 61, 139, 1);
+    const Color_RGBA darkslategray(color_table, 47, 79, 79, 1);
+    const Color_RGBA darkslategrey(color_table, 47, 79, 79, 1);
+    const Color_RGBA darkturquoise(color_table, 0, 206, 209, 1);
+    const Color_RGBA darkviolet(color_table, 148, 0, 211, 1);
+    const Color_RGBA deeppink(color_table, 255, 20, 147, 1);
+    const Color_RGBA deepskyblue(color_table, 0, 191, 255, 1);
+    const Color_RGBA dimgray(color_table, 105, 105, 105, 1);
+    const Color_RGBA dimgrey(color_table, 105, 105, 105, 1);
+    const Color_RGBA dodgerblue(color_table, 30, 144, 255, 1);
+    const Color_RGBA firebrick(color_table, 178, 34, 34, 1);
+    const Color_RGBA floralwhite(color_table, 255, 250, 240, 1);
+    const Color_RGBA forestgreen(color_table, 34, 139, 34, 1);
+    const Color_RGBA magenta(color_table, 255, 0, 255, 1);
+    const Color_RGBA fuchsia(color_table, 255, 0, 255, 1);
+    const Color_RGBA gainsboro(color_table, 220, 220, 220, 1);
+    const Color_RGBA ghostwhite(color_table, 248, 248, 255, 1);
+    const Color_RGBA gold(color_table, 255, 215, 0, 1);
+    const Color_RGBA goldenrod(color_table, 218, 165, 32, 1);
+    const Color_RGBA gray(color_table, 128, 128, 128, 1);
+    const Color_RGBA grey(color_table, 128, 128, 128, 1);
+    const Color_RGBA green(color_table, 0, 128, 0, 1);
+    const Color_RGBA greenyellow(color_table, 173, 255, 47, 1);
+    const Color_RGBA honeydew(color_table, 240, 255, 240, 1);
+    const Color_RGBA hotpink(color_table, 255, 105, 180, 1);
+    const Color_RGBA indianred(color_table, 205, 92, 92, 1);
+    const Color_RGBA indigo(color_table, 75, 0, 130, 1);
+    const Color_RGBA ivory(color_table, 255, 255, 240, 1);
+    const Color_RGBA khaki(color_table, 240, 230, 140, 1);
+    const Color_RGBA lavender(color_table, 230, 230, 250, 1);
+    const Color_RGBA lavenderblush(color_table, 255, 240, 245, 1);
+    const Color_RGBA lawngreen(color_table, 124, 252, 0, 1);
+    const Color_RGBA lemonchiffon(color_table, 255, 250, 205, 1);
+    const Color_RGBA lightblue(color_table, 173, 216, 230, 1);
+    const Color_RGBA lightcoral(color_table, 240, 128, 128, 1);
+    const Color_RGBA lightcyan(color_table, 224, 255, 255, 1);
+    const Color_RGBA lightgoldenrodyellow(color_table, 250, 250, 210, 1);
+    const Color_RGBA lightgray(color_table, 211, 211, 211, 1);
+    const Color_RGBA lightgrey(color_table, 211, 211, 211, 1);
+    const Color_RGBA lightgreen(color_table, 144, 238, 144, 1);
+    const Color_RGBA lightpink(color_table, 255, 182, 193, 1);
+    const Color_RGBA lightsalmon(color_table, 255, 160, 122, 1);
+    const Color_RGBA lightseagreen(color_table, 32, 178, 170, 1);
+    const Color_RGBA lightskyblue(color_table, 135, 206, 250, 1);
+    const Color_RGBA lightslategray(color_table, 119, 136, 153, 1);
+    const Color_RGBA lightslategrey(color_table, 119, 136, 153, 1);
+    const Color_RGBA lightsteelblue(color_table, 176, 196, 222, 1);
+    const Color_RGBA lightyellow(color_table, 255, 255, 224, 1);
+    const Color_RGBA lime(color_table, 0, 255, 0, 1);
+    const Color_RGBA limegreen(color_table, 50, 205, 50, 1);
+    const Color_RGBA linen(color_table, 250, 240, 230, 1);
+    const Color_RGBA maroon(color_table, 128, 0, 0, 1);
+    const Color_RGBA mediumaquamarine(color_table, 102, 205, 170, 1);
+    const Color_RGBA mediumblue(color_table, 0, 0, 205, 1);
+    const Color_RGBA mediumorchid(color_table, 186, 85, 211, 1);
+    const Color_RGBA mediumpurple(color_table, 147, 112, 219, 1);
+    const Color_RGBA mediumseagreen(color_table, 60, 179, 113, 1);
+    const Color_RGBA mediumslateblue(color_table, 123, 104, 238, 1);
+    const Color_RGBA mediumspringgreen(color_table, 0, 250, 154, 1);
+    const Color_RGBA mediumturquoise(color_table, 72, 209, 204, 1);
+    const Color_RGBA mediumvioletred(color_table, 199, 21, 133, 1);
+    const Color_RGBA midnightblue(color_table, 25, 25, 112, 1);
+    const Color_RGBA mintcream(color_table, 245, 255, 250, 1);
+    const Color_RGBA mistyrose(color_table, 255, 228, 225, 1);
+    const Color_RGBA moccasin(color_table, 255, 228, 181, 1);
+    const Color_RGBA navajowhite(color_table, 255, 222, 173, 1);
+    const Color_RGBA navy(color_table, 0, 0, 128, 1);
+    const Color_RGBA oldlace(color_table, 253, 245, 230, 1);
+    const Color_RGBA olive(color_table, 128, 128, 0, 1);
+    const Color_RGBA olivedrab(color_table, 107, 142, 35, 1);
+    const Color_RGBA orange(color_table, 255, 165, 0, 1);
+    const Color_RGBA orangered(color_table, 255, 69, 0, 1);
+    const Color_RGBA orchid(color_table, 218, 112, 214, 1);
+    const Color_RGBA palegoldenrod(color_table, 238, 232, 170, 1);
+    const Color_RGBA palegreen(color_table, 152, 251, 152, 1);
+    const Color_RGBA paleturquoise(color_table, 175, 238, 238, 1);
+    const Color_RGBA palevioletred(color_table, 219, 112, 147, 1);
+    const Color_RGBA papayawhip(color_table, 255, 239, 213, 1);
+    const Color_RGBA peachpuff(color_table, 255, 218, 185, 1);
+    const Color_RGBA peru(color_table, 205, 133, 63, 1);
+    const Color_RGBA pink(color_table, 255, 192, 203, 1);
+    const Color_RGBA plum(color_table, 221, 160, 221, 1);
+    const Color_RGBA powderblue(color_table, 176, 224, 230, 1);
+    const Color_RGBA purple(color_table, 128, 0, 128, 1);
+    const Color_RGBA red(color_table, 255, 0, 0, 1);
+    const Color_RGBA rosybrown(color_table, 188, 143, 143, 1);
+    const Color_RGBA royalblue(color_table, 65, 105, 225, 1);
+    const Color_RGBA saddlebrown(color_table, 139, 69, 19, 1);
+    const Color_RGBA salmon(color_table, 250, 128, 114, 1);
+    const Color_RGBA sandybrown(color_table, 244, 164, 96, 1);
+    const Color_RGBA seagreen(color_table, 46, 139, 87, 1);
+    const Color_RGBA seashell(color_table, 255, 245, 238, 1);
+    const Color_RGBA sienna(color_table, 160, 82, 45, 1);
+    const Color_RGBA silver(color_table, 192, 192, 192, 1);
+    const Color_RGBA skyblue(color_table, 135, 206, 235, 1);
+    const Color_RGBA slateblue(color_table, 106, 90, 205, 1);
+    const Color_RGBA slategray(color_table, 112, 128, 144, 1);
+    const Color_RGBA slategrey(color_table, 112, 128, 144, 1);
+    const Color_RGBA snow(color_table, 255, 250, 250, 1);
+    const Color_RGBA springgreen(color_table, 0, 255, 127, 1);
+    const Color_RGBA steelblue(color_table, 70, 130, 180, 1);
+    const Color_RGBA tan(color_table, 210, 180, 140, 1);
+    const Color_RGBA teal(color_table, 0, 128, 128, 1);
+    const Color_RGBA thistle(color_table, 216, 191, 216, 1);
+    const Color_RGBA tomato(color_table, 255, 99, 71, 1);
+    const Color_RGBA turquoise(color_table, 64, 224, 208, 1);
+    const Color_RGBA violet(color_table, 238, 130, 238, 1);
+    const Color_RGBA wheat(color_table, 245, 222, 179, 1);
+    const Color_RGBA white(color_table, 255, 255, 255, 1);
+    const Color_RGBA whitesmoke(color_table, 245, 245, 245, 1);
+    const Color_RGBA yellow(color_table, 255, 255, 0, 1);
+    const Color_RGBA yellowgreen(color_table, 154, 205, 50, 1);
+    const Color_RGBA rebeccapurple(color_table, 102, 51, 153, 1);
+    const Color_RGBA transparent(color_table, 0, 0, 0, 0);
   }
 
   const std::map<const int, const char*> colors_to_names {
@@ -452,7 +455,7 @@ namespace Sass {
     { 102 * 0x10000 +  51 * 0x100 + 153, ColorNames::rebeccapurple }
   };
 
-  const std::map<const char*, Color_Ptr_Const, map_cmp_str> names_to_colors
+  const std::map<const char*, const Color_RGBA*, map_cmp_str> names_to_colors
   {
     { ColorNames::aliceblue, &Colors::aliceblue },
     { ColorNames::antiquewhite, &Colors::antiquewhite },
@@ -605,12 +608,12 @@ namespace Sass {
     { ColorNames::transparent, &Colors::transparent }
   };
 
-  Color_Ptr_Const name_to_color(const char* key)
+  const Color_RGBA* name_to_color(const char* key)
   {
     return name_to_color(std::string(key));
   }
 
-  Color_Ptr_Const name_to_color(const std::string& key)
+  const Color_RGBA* name_to_color(const std::string& key)
   {
     // case insensitive lookup.  See #2462
     std::string lower{key};
@@ -637,7 +640,7 @@ namespace Sass {
     return color_to_name((int)key);
   }
 
-  const char* color_to_name(const Color& c)
+  const char* color_to_name(const Color_RGBA& c)
   {
     double key = c.r() * 0x10000
                + c.g() * 0x100

data/ext/libsass/src/color_maps.hpp

@@ -169,161 +169,161 @@ namespace Sass {
   }
 
   namespace Colors {
-    extern const Color aliceblue;
-    extern const Color antiquewhite;
-    extern const Color cyan;
-    extern const Color aqua;
-    extern const Color aquamarine;
-    extern const Color azure;
-    extern const Color beige;
-    extern const Color bisque;
-    extern const Color black;
-    extern const Color blanchedalmond;
-    extern const Color blue;
-    extern const Color blueviolet;
-    extern const Color brown;
-    extern const Color burlywood;
-    extern const Color cadetblue;
-    extern const Color chartreuse;
-    extern const Color chocolate;
-    extern const Color coral;
-    extern const Color cornflowerblue;
-    extern const Color cornsilk;
-    extern const Color crimson;
-    extern const Color darkblue;
-    extern const Color darkcyan;
-    extern const Color darkgoldenrod;
-    extern const Color darkgray;
-    extern const Color darkgrey;
-    extern const Color darkgreen;
-    extern const Color darkkhaki;
-    extern const Color darkmagenta;
-    extern const Color darkolivegreen;
-    extern const Color darkorange;
-    extern const Color darkorchid;
-    extern const Color darkred;
-    extern const Color darksalmon;
-    extern const Color darkseagreen;
-    extern const Color darkslateblue;
-    extern const Color darkslategray;
-    extern const Color darkslategrey;
-    extern const Color darkturquoise;
-    extern const Color darkviolet;
-    extern const Color deeppink;
-    extern const Color deepskyblue;
-    extern const Color dimgray;
-    extern const Color dimgrey;
-    extern const Color dodgerblue;
-    extern const Color firebrick;
-    extern const Color floralwhite;
-    extern const Color forestgreen;
-    extern const Color magenta;
-    extern const Color fuchsia;
-    extern const Color gainsboro;
-    extern const Color ghostwhite;
-    extern const Color gold;
-    extern const Color goldenrod;
-    extern const Color gray;
-    extern const Color grey;
-    extern const Color green;
-    extern const Color greenyellow;
-    extern const Color honeydew;
-    extern const Color hotpink;
-    extern const Color indianred;
-    extern const Color indigo;
-    extern const Color ivory;
-    extern const Color khaki;
-    extern const Color lavender;
-    extern const Color lavenderblush;
-    extern const Color lawngreen;
-    extern const Color lemonchiffon;
-    extern const Color lightblue;
-    extern const Color lightcoral;
-    extern const Color lightcyan;
-    extern const Color lightgoldenrodyellow;
-    extern const Color lightgray;
-    extern const Color lightgrey;
-    extern const Color lightgreen;
-    extern const Color lightpink;
-    extern const Color lightsalmon;
-    extern const Color lightseagreen;
-    extern const Color lightskyblue;
-    extern const Color lightslategray;
-    extern const Color lightslategrey;
-    extern const Color lightsteelblue;
-    extern const Color lightyellow;
-    extern const Color lime;
-    extern const Color limegreen;
-    extern const Color linen;
-    extern const Color maroon;
-    extern const Color mediumaquamarine;
-    extern const Color mediumblue;
-    extern const Color mediumorchid;
-    extern const Color mediumpurple;
-    extern const Color mediumseagreen;
-    extern const Color mediumslateblue;
-    extern const Color mediumspringgreen;
-    extern const Color mediumturquoise;
-    extern const Color mediumvioletred;
-    extern const Color midnightblue;
-    extern const Color mintcream;
-    extern const Color mistyrose;
-    extern const Color moccasin;
-    extern const Color navajowhite;
-    extern const Color navy;
-    extern const Color oldlace;
-    extern const Color olive;
-    extern const Color olivedrab;
-    extern const Color orange;
-    extern const Color orangered;
-    extern const Color orchid;
-    extern const Color palegoldenrod;
-    extern const Color palegreen;
-    extern const Color paleturquoise;
-    extern const Color palevioletred;
-    extern const Color papayawhip;
-    extern const Color peachpuff;
-    extern const Color peru;
-    extern const Color pink;
-    extern const Color plum;
-    extern const Color powderblue;
-    extern const Color purple;
-    extern const Color red;
-    extern const Color rosybrown;
-    extern const Color royalblue;
-    extern const Color saddlebrown;
-    extern const Color salmon;
-    extern const Color sandybrown;
-    extern const Color seagreen;
-    extern const Color seashell;
-    extern const Color sienna;
-    extern const Color silver;
-    extern const Color skyblue;
-    extern const Color slateblue;
-    extern const Color slategray;
-    extern const Color slategrey;
-    extern const Color snow;
-    extern const Color springgreen;
-    extern const Color steelblue;
-    extern const Color tan;
-    extern const Color teal;
-    extern const Color thistle;
-    extern const Color tomato;
-    extern const Color turquoise;
-    extern const Color violet;
-    extern const Color wheat;
-    extern const Color white;
-    extern const Color whitesmoke;
-    extern const Color yellow;
-    extern const Color yellowgreen;
-    extern const Color rebeccapurple;
-    extern const Color transparent;
+    extern const Color_RGBA aliceblue;
+    extern const Color_RGBA antiquewhite;
+    extern const Color_RGBA cyan;
+    extern const Color_RGBA aqua;
+    extern const Color_RGBA aquamarine;
+    extern const Color_RGBA azure;
+    extern const Color_RGBA beige;
+    extern const Color_RGBA bisque;
+    extern const Color_RGBA black;
+    extern const Color_RGBA blanchedalmond;
+    extern const Color_RGBA blue;
+    extern const Color_RGBA blueviolet;
+    extern const Color_RGBA brown;
+    extern const Color_RGBA burlywood;
+    extern const Color_RGBA cadetblue;
+    extern const Color_RGBA chartreuse;
+    extern const Color_RGBA chocolate;
+    extern const Color_RGBA coral;
+    extern const Color_RGBA cornflowerblue;
+    extern const Color_RGBA cornsilk;
+    extern const Color_RGBA crimson;
+    extern const Color_RGBA darkblue;
+    extern const Color_RGBA darkcyan;
+    extern const Color_RGBA darkgoldenrod;
+    extern const Color_RGBA darkgray;
+    extern const Color_RGBA darkgrey;
+    extern const Color_RGBA darkgreen;
+    extern const Color_RGBA darkkhaki;
+    extern const Color_RGBA darkmagenta;
+    extern const Color_RGBA darkolivegreen;
+    extern const Color_RGBA darkorange;
+    extern const Color_RGBA darkorchid;
+    extern const Color_RGBA darkred;
+    extern const Color_RGBA darksalmon;
+    extern const Color_RGBA darkseagreen;
+    extern const Color_RGBA darkslateblue;
+    extern const Color_RGBA darkslategray;
+    extern const Color_RGBA darkslategrey;
+    extern const Color_RGBA darkturquoise;
+    extern const Color_RGBA darkviolet;
+    extern const Color_RGBA deeppink;
+    extern const Color_RGBA deepskyblue;
+    extern const Color_RGBA dimgray;
+    extern const Color_RGBA dimgrey;
+    extern const Color_RGBA dodgerblue;
+    extern const Color_RGBA firebrick;
+    extern const Color_RGBA floralwhite;
+    extern const Color_RGBA forestgreen;
+    extern const Color_RGBA magenta;
+    extern const Color_RGBA fuchsia;
+    extern const Color_RGBA gainsboro;
+    extern const Color_RGBA ghostwhite;
+    extern const Color_RGBA gold;
+    extern const Color_RGBA goldenrod;
+    extern const Color_RGBA gray;
+    extern const Color_RGBA grey;
+    extern const Color_RGBA green;
+    extern const Color_RGBA greenyellow;
+    extern const Color_RGBA honeydew;
+    extern const Color_RGBA hotpink;
+    extern const Color_RGBA indianred;
+    extern const Color_RGBA indigo;
+    extern const Color_RGBA ivory;
+    extern const Color_RGBA khaki;
+    extern const Color_RGBA lavender;
+    extern const Color_RGBA lavenderblush;
+    extern const Color_RGBA lawngreen;
+    extern const Color_RGBA lemonchiffon;
+    extern const Color_RGBA lightblue;
+    extern const Color_RGBA lightcoral;
+    extern const Color_RGBA lightcyan;
+    extern const Color_RGBA lightgoldenrodyellow;
+    extern const Color_RGBA lightgray;
+    extern const Color_RGBA lightgrey;
+    extern const Color_RGBA lightgreen;
+    extern const Color_RGBA lightpink;
+    extern const Color_RGBA lightsalmon;
+    extern const Color_RGBA lightseagreen;
+    extern const Color_RGBA lightskyblue;
+    extern const Color_RGBA lightslategray;
+    extern const Color_RGBA lightslategrey;
+    extern const Color_RGBA lightsteelblue;
+    extern const Color_RGBA lightyellow;
+    extern const Color_RGBA lime;
+    extern const Color_RGBA limegreen;
+    extern const Color_RGBA linen;
+    extern const Color_RGBA maroon;
+    extern const Color_RGBA mediumaquamarine;
+    extern const Color_RGBA mediumblue;
+    extern const Color_RGBA mediumorchid;
+    extern const Color_RGBA mediumpurple;
+    extern const Color_RGBA mediumseagreen;
+    extern const Color_RGBA mediumslateblue;
+    extern const Color_RGBA mediumspringgreen;
+    extern const Color_RGBA mediumturquoise;
+    extern const Color_RGBA mediumvioletred;
+    extern const Color_RGBA midnightblue;
+    extern const Color_RGBA mintcream;
+    extern const Color_RGBA mistyrose;
+    extern const Color_RGBA moccasin;
+    extern const Color_RGBA navajowhite;
+    extern const Color_RGBA navy;
+    extern const Color_RGBA oldlace;
+    extern const Color_RGBA olive;
+    extern const Color_RGBA olivedrab;
+    extern const Color_RGBA orange;
+    extern const Color_RGBA orangered;
+    extern const Color_RGBA orchid;
+    extern const Color_RGBA palegoldenrod;
+    extern const Color_RGBA palegreen;
+    extern const Color_RGBA paleturquoise;
+    extern const Color_RGBA palevioletred;
+    extern const Color_RGBA papayawhip;
+    extern const Color_RGBA peachpuff;
+    extern const Color_RGBA peru;
+    extern const Color_RGBA pink;
+    extern const Color_RGBA plum;
+    extern const Color_RGBA powderblue;
+    extern const Color_RGBA purple;
+    extern const Color_RGBA red;
+    extern const Color_RGBA rosybrown;
+    extern const Color_RGBA royalblue;
+    extern const Color_RGBA saddlebrown;
+    extern const Color_RGBA salmon;
+    extern const Color_RGBA sandybrown;
+    extern const Color_RGBA seagreen;
+    extern const Color_RGBA seashell;
+    extern const Color_RGBA sienna;
+    extern const Color_RGBA silver;
+    extern const Color_RGBA skyblue;
+    extern const Color_RGBA slateblue;
+    extern const Color_RGBA slategray;
+    extern const Color_RGBA slategrey;
+    extern const Color_RGBA snow;
+    extern const Color_RGBA springgreen;
+    extern const Color_RGBA steelblue;
+    extern const Color_RGBA tan;
+    extern const Color_RGBA teal;
+    extern const Color_RGBA thistle;
+    extern const Color_RGBA tomato;
+    extern const Color_RGBA turquoise;
+    extern const Color_RGBA violet;
+    extern const Color_RGBA wheat;
+    extern const Color_RGBA white;
+    extern const Color_RGBA whitesmoke;
+    extern const Color_RGBA yellow;
+    extern const Color_RGBA yellowgreen;
+    extern const Color_RGBA rebeccapurple;
+    extern const Color_RGBA transparent;
   }
 
-  Color_Ptr_Const name_to_color(const char*);
-  Color_Ptr_Const name_to_color(const std::string&);
+  const Color_RGBA* name_to_color(const char*);
+  const Color_RGBA* name_to_color(const std::string&);
   const char* color_to_name(const int);
-  const char* color_to_name(const Color&);
+  const char* color_to_name(const Color_RGBA&);
   const char* color_to_name(const double);
 
 }