Merge branch 'master' into arg_checking

Conflicts:
	functions.cpp

node_factory.cpp

@@ -27,6 +27,21 @@ namespace Sass {
     return ip_cpy;
   }
 
+  // returns a deep-copy of its argument, but uses the path and line that are passed in
+  Node_Impl* Node_Factory::alloc_Node_Impl(string& path, size_t line, Node_Impl* ip)
+  {
+    Node_Impl* ip_cpy = new Node_Impl(*ip);
+    pool_.push_back(ip_cpy);
+    if (ip_cpy->has_children) {
+      for (size_t i = 0, S = ip_cpy->size(); i < S; ++i) {
+        Node n(ip_cpy->at(i));
+        ip_cpy->at(i) = (*this)(path, line, n);
+      }
+    }
+    return ip_cpy;
+  }
+
+
   // for cloning nodes
   Node Node_Factory::operator()(const Node& n1)
   {
@@ -34,6 +49,15 @@ namespace Sass {
     return Node(ip_cpy);
   }
 
+  // for cloning nodes and resetting their path and line-number fields
+  Node Node_Factory::operator()(string& path, size_t line, const Node& n1)
+  {
+    Node_Impl* ip_cpy = alloc_Node_Impl(path, line, n1.ip_); // deep-copy the implementation object
+    ip_cpy->path = path;
+    ip_cpy->line = line;
+    return Node(ip_cpy);
+  }
+
   // for making leaf nodes out of terminals/tokens
   Node Node_Factory::operator()(Node::Type type, string path, size_t line, Token t)
   {

node_factory.hpp

@@ -17,9 +17,11 @@ namespace Sass {
     Node_Impl* alloc_Node_Impl(Node::Type type, string file, size_t line);
     // returns a deep-copy of its argument
     Node_Impl* alloc_Node_Impl(Node_Impl* ip);
+    Node_Impl* alloc_Node_Impl(string& path, size_t line, Node_Impl* ip);
   public:
     // for cloning nodes
     Node operator()(const Node& n1);
+    Node operator()(string& path, size_t line, const Node& n1);
     // for making leaf nodes out of terminals/tokens
     Node operator()(Node::Type type, string file, size_t line, Token t);
     // for making boolean values or interior nodes that have children