Moving selector expansion into the eval phase. Necessary for inheritance.

eval_apply.hpp

@@ -11,10 +11,12 @@
 namespace Sass {
   using std::map;
   
-  Node eval(Node expr, Environment& env, map<pair<string, size_t>, Function>& f_env, Node_Factory& new_Node, Context& src_refs);
+  Node eval(Node expr, Node prefix, Environment& env, map<pair<string, size_t>, Function>& f_env, Node_Factory& new_Node, Context& src_refs);
   Node accumulate(Node::Type op, Node acc, Node rhs, Node_Factory& new_Node);
   double operate(Node::Type op, double lhs, double rhs);
   
-  Node apply_mixin(Node mixin, const Node args, Environment& env, map<pair<string, size_t>, Function>& f_env, Node_Factory& new_Node, Context& src_refs);
-  Node apply_function(const Function& f, const Node args, Environment& env, map<pair<string, size_t>, Function>& f_env, Node_Factory& new_Node, Context& src_refs);
+  Node apply_mixin(Node mixin, const Node args, Node prefix, Environment& env, map<pair<string, size_t>, Function>& f_env, Node_Factory& new_Node, Context& src_refs);
+  Node apply_function(const Function& f, const Node args, Node prefix, Environment& env, map<pair<string, size_t>, Function>& f_env, Node_Factory& new_Node, Context& src_refs);
+  Node expand_selector(Node sel, Node pre, Node_Factory& new_Node);
+  Node expand_backref(Node sel, Node pre);
 }
\ No newline at end of file

sass_interface.cpp

@@ -39,7 +39,12 @@ extern "C" {
   {
     using namespace Sass;
     doc.parse_scss();
-    eval(doc.root, doc.context.global_env, doc.context.function_env, doc.context.new_Node, doc.context);
+    eval(doc.root,
+         doc.context.new_Node(Node::none, doc.path, doc.line, 0),
+         doc.context.global_env,
+         doc.context.function_env,
+         doc.context.new_Node,
+         doc.context);
     string output(doc.emit_css(static_cast<Document::CSS_Style>(style)));
     char* c_output = (char*) malloc(output.size() + 1);
     strcpy(c_output, output.c_str());

test_node_factory.cpp

 #include <iostream>
+#include <string>
+#include <tr1/unordered_map>
+#include <map>
 
 #ifndef SASS_NODE_INCLUDED
 #include "node.hpp"
@@ -60,9 +63,21 @@ int main()
   cout << block2[1][3].numeric_value() << endl;
   block2[1][3] = new_Node("", 0, .9876);
   cout << block1[1][3].numeric_value() << endl;
-  cout << block2[1][3].numeric_value() << endl;
+  cout << block2[1][3].numeric_value() << endl << endl;
+
+  map<Node, string> dict;
+
+  Node n(new_Node("", 0, 42));
+  Node m(new_Node("", 0, 41));
+
+  dict[n] = "hello";
+  dict[m] = "goodbye";
+
+  cout << dict[m] << " " << dict[n] << endl;
+
+
+
 
   new_Node.free();
-  
   return 0;
 }
\ No newline at end of file