Soon you will compile again. Yessss....

Makefile

@@ -4,7 +4,7 @@ LDFLAGS=
 SOURCES = \
 	context.cpp functions.cpp document.cpp \
 	document_parser.cpp eval_apply.cpp node.cpp \
-	node_comparisons.cpp values.cpp prelexer.cpp \
+	node_factory.cpp node_emitters.cpp prelexer.cpp \
 	sass_interface.cpp
 OBJECTS = $(SOURCES:.cpp=.o)
 

eval_apply.cpp

@@ -328,7 +328,7 @@ namespace Sass {
       acc << new_Node(acc.path(), acc.line(), r, g, b, a);
     }
     else if (lhs.type() == Node::numeric_color && rhs.type() == Node::numeric_color) {
-      if (lhs[3].numeric_value() != rhs[3].numeric_value()) throw_eval_error("alpha channels must be equal for " + lhs.to_string("") + " + " + rhs.to_string(""), lhs.line(), lhs.path());
+      if (lhs[3].numeric_value() != rhs[3].numeric_value()) throw_eval_error("alpha channels must be equal for " + lhs.to_string("") + " + " + rhs.to_string(""), lhs.path(), lhs.line());
       double r = operate(op, lhs[0].numeric_value(), rhs[0].numeric_value());
       double g = operate(op, lhs[1].numeric_value(), rhs[1].numeric_value());
       double b = operate(op, lhs[2].numeric_value(), rhs[2].numeric_value());
@@ -376,7 +376,7 @@ namespace Sass {
             break;
           }
         }
-        if (!valid_param) throw_eval_error("mixin " + mixin[0].to_string("") + " has no parameter named " + name.to_string(), arg.line(), arg.path());
+        if (!valid_param) throw_eval_error("mixin " + mixin[0].to_string("") + " has no parameter named " + name.to_string(), arg.path(), arg.line());
         if (!bindings.query(name)) {
           bindings[name] = eval(arg[1], env, f_env, new_Node);
         }

node.hpp

@@ -203,6 +203,9 @@ namespace Sass {
                          const vector<string>& prefixes);
     void emit_nested_css(stringstream& buf, size_t depth);
     void emit_propset(stringstream& buf, size_t depth, const string& prefix);
+    void echo(stringstream& buf, size_t depth = 0);
+    void emit_expanded_css(stringstream& buf, const string& prefix);
+
   };
   
   struct Node_Impl {

node_emitters.cpp

@@ -434,7 +434,7 @@ namespace Sass {
   
   void Node::emit_propset(stringstream& buf, size_t depth, const string& prefix) {
     string new_prefix(prefix);
-    bool has_prefix = false;
+    // bool has_prefix = false;
     if (new_prefix.empty()) {
       new_prefix += "\n";
       new_prefix += string(2*depth, ' ');
@@ -443,7 +443,7 @@ namespace Sass {
     else {
       new_prefix += "-";
       new_prefix += at(0).token().to_string();
-      has_prefix = true;
+      // has_prefix = true;
     }
     Node rules(at(1));
     for (size_t i = 0, S = rules.size(); i < S; ++i) {
@@ -460,5 +460,8 @@ namespace Sass {
     }
   }
 
+  void Node::echo(stringstream& buf, size_t depth) { }
+  void Node::emit_expanded_css(stringstream& buf, const string& prefix) { }
+
 
 }
\ No newline at end of file