Working on color name conversion stuff. Not ready yet.

Aaron Leung · Aaron Leung · commit 121f32bb40e8 · 2012-07-12T17:50:14.000-07:00
diff --git a/color_names.hpp b/color_names.hpp
@@ -153,7 +153,7 @@ namespace Sass {
 		"yellowgreen",
 		// sentinel value
 		0
-	}
+	};
 
 	const double color_values[] =
 	{
@@ -306,6 +306,6 @@ namespace Sass {
 		0x9a, 0xcd, 0x32,
 		// sentinel value
 		0xfff
-	}
+	};
 
 }
diff --git a/context.cpp b/context.cpp
@@ -2,6 +2,7 @@
 #include <iostream>
 #include <unistd.h>
 #include "prelexer.hpp"
+#include "color_names.hpp"
 using std::cerr; using std::endl;
 
 namespace Sass {
@@ -47,20 +48,22 @@ namespace Sass {
     pending_extensions(vector<pair<Node, Node> >()),
     source_refs(vector<char*>()),
     include_paths(vector<string>()),
+    color_names_to_values(map<string, Node>()),
+    color_values_to_names(map<Node, string>()),
     new_Node(Node_Factory()),
     ref_count(0),
     has_extensions(false)
   {
     register_functions();
     collect_include_paths(paths_str);
+    setup_color_map();
   }
   
   Context::~Context()
   {
     for (size_t i = 0; i < source_refs.size(); ++i) {
       delete[] source_refs[i];
     }
-
     new_Node.free();
     // cerr << "Deallocated " << i << " source string(s)." << endl;
   }
@@ -148,5 +151,21 @@ namespace Sass {
     // Boolean Functions
     register_function(not_descriptor, not_impl);
   }
+
+  void Context::setup_color_map()
+  {
+    size_t i = 0;
+    while (color_names[i] != 0) {
+      string name(color_names[i]);
+      Node value(new_Node("[COLOR TABLE]", 0,
+                          color_values[i*3],
+                          color_values[i*3+1],
+                          color_values[i*3+2],
+                          1));
+      color_names_to_values[name] = value;
+      color_values_to_names[value] = name;
+      ++i;
+    }
+  }
   
 }
diff --git a/context.hpp b/context.hpp
@@ -47,6 +47,8 @@ namespace Sass {
     vector<pair<Node, Node> > pending_extensions;
     vector<char*> source_refs; // all the source c-strings
     vector<string> include_paths;
+    map<string, Node> color_names_to_values;
+    map<Node, string> color_values_to_names;
     Node_Factory new_Node;
     size_t ref_count;
     string sass_path;
@@ -61,6 +63,7 @@ namespace Sass {
     void register_function(Function_Descriptor d, Primitive ip, size_t arity);
     void register_overload_stub(string name);
     void register_functions();
+    void setup_color_map();
   };
 
 }

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ namespace Sass {`
`153`	`153`	`"yellowgreen",`
`154`	`154`	`// sentinel value`
`155`	`155`	`0`
`156`		`- }`
	`156`	`+ };`
`157`	`157`
`158`	`158`	`const double color_values[] =`
`159`	`159`	`{`
`@@ -306,6 +306,6 @@ namespace Sass {`
`306`	`306`	`0x9a, 0xcd, 0x32,`
`307`	`307`	`// sentinel value`
`308`	`308`	`0xfff`
`309`		`- }`
	`309`	`+ };`
`310`	`310`
`311`	`311`	`}`