ext/libsass/sass_util.cpp in sassc-0.0.9 vs ext/libsass/sass_util.cpp in sassc-0.0.10

@@ -1,18 +1,14 @@
-#ifndef SASS_AST
 #include "node.hpp"
-#endif
-
 #include "to_string.hpp"
 
-
 namespace Sass {
 
 
   /*
 		This is the equivalent of ruby's Sass::Util.paths.
-   
+
     # Return an array of all possible paths through the given arrays.
     #
     # @param arrs [NodeCollection<NodeCollection<Node>>]
     # @return [NodeCollection<NodeCollection<Node>>]
     #
@@ -20,11 +16,11 @@
     #   paths([[1, 2], [3, 4], [5]]) #=>
     #     # [[1, 3, 5],
     #     #  [2, 3, 5],
     #     #  [1, 4, 5],
     #     #  [2, 4, 5]]
-   
+
    The following is the modified version of the ruby code that was more portable to C++. You
    should be able to drop it into ruby 3.2.19 and get the same results from ruby sass.
 
     def paths(arrs)
      	// I changed the inject and maps to an iterative approach to make it easier to implement in C++
@@ -40,59 +36,59 @@
         loopStart = permutations
       end
     end
 	*/
   Node paths(const Node& arrs, Context& ctx) {
-    To_String to_string;
+    To_String to_string(&ctx);
 
     Node loopStart = Node::createCollection();
     loopStart.collection()->push_back(Node::createCollection());
-    
+
     for (NodeDeque::iterator arrsIter = arrs.collection()->begin(), arrsEndIter = arrs.collection()->end();
     	arrsIter != arrsEndIter; ++arrsIter) {
-      
+
       Node& arr = *arrsIter;
-      
+
       Node permutations = Node::createCollection();
-      
+
       for (NodeDeque::iterator arrIter = arr.collection()->begin(), arrIterEnd = arr.collection()->end();
       	arrIter != arrIterEnd; ++arrIter) {
-        
+
         Node& e = *arrIter;
-        
+
         for (NodeDeque::iterator loopStartIter = loopStart.collection()->begin(), loopStartIterEnd = loopStart.collection()->end();
           loopStartIter != loopStartIterEnd; ++loopStartIter) {
-        
+
           Node& path = *loopStartIter;
-          
+
           Node newPermutation = Node::createCollection();
           newPermutation.plus(path);
           newPermutation.collection()->push_back(e);
-          
+
           permutations.collection()->push_back(newPermutation);
         }
       }
-      
+
       loopStart = permutations;
     }
-    
+
     return loopStart;
   }
-  
 
+
 	/*
   This is the equivalent of ruby sass' Sass::Util.flatten and [].flatten.
   Sass::Util.flatten requires the number of levels to flatten, while
   [].flatten doesn't and will flatten the entire array. This function
   supports both.
-  
+
   # Flattens the first `n` nested arrays. If n == -1, all arrays will be flattened
   #
   # @param arr [NodeCollection] The array to flatten
   # @param n [int] The number of levels to flatten
   # @return [NodeCollection] The flattened array
-  
+
   The following is the modified version of the ruby code that was more portable to C++. You
   should be able to drop it into ruby 3.2.19 and get the same results from ruby sass.
 
   def flatten(arr, n = -1)
     if n != -1 and n == 0 then
@@ -116,14 +112,14 @@
     if (n != -1 && n == 0) {
       return arr;
     }
 
     Node flattened = Node::createCollection();
-    
+
     for (NodeDeque::iterator iter = arr.collection()->begin(), iterEnd = arr.collection()->end();
     	iter != iterEnd; iter++) {
     	Node& e = *iter;
-      
+
       if (e.isCollection()) {
       	Node recurseFlattened = flatten(e, ctx, n - 1);
         flattened.collection()->insert(flattened.collection()->end(), recurseFlattened.collection()->begin(), recurseFlattened.collection()->end());
       } else {
       	flattened.collection()->push_back(e);
\ No newline at end of file