sassc 1.11.1 → 1.11.2

data/ext/libsass/src/expand.hpp

@@ -13,69 +13,69 @@ namespace Sass {
   class Listize;
   class Context;
   class Eval;
-  typedef Environment<AST_Node*> Env;
+  typedef Environment<AST_Node_Obj> Env;
   struct Backtrace;
 
-  class Expand : public Operation_CRTP<Statement*, Expand> {
+  class Expand : public Operation_CRTP<Statement_Ptr, Expand> {
   public:
 
     Env* environment();
     Context& context();
-    CommaSequence_Selector* selector();
+    Selector_List_Obj selector();
     Backtrace* backtrace();
 
     Context&          ctx;
     Eval              eval;
+    size_t            recursions;
+    bool              in_keyframes;
+    bool              at_root_without_rule;
+    bool              old_at_root_without_rule;
 
     // it's easier to work with vectors
-    std::vector<Env*>           env_stack;
-    std::vector<Block*>         block_stack;
-    std::vector<AST_Node*>      call_stack;
-    std::vector<String*>        property_stack;
-    std::vector<CommaSequence_Selector*> selector_stack;
-    std::vector<Media_Block*>   media_block_stack;
-    std::vector<Backtrace*>     backtrace_stack;
-    bool                        in_keyframes;
-    bool                        at_root_without_rule;
-    bool                        old_at_root_without_rule;
-
-    Statement* fallback_impl(AST_Node* n);
+    std::vector<Env*>              env_stack;
+    std::vector<Block_Ptr>         block_stack;
+    std::vector<AST_Node_Obj>      call_stack;
+    std::vector<Selector_List_Obj> selector_stack;
+    std::vector<Media_Block_Ptr>   media_block_stack;
+    std::vector<Backtrace*>        backtrace_stack;
+
+    Statement_Ptr fallback_impl(AST_Node_Ptr n);
 
   private:
-    void expand_selector_list(Selector*, CommaSequence_Selector* extender);
+    void expand_selector_list(Selector_Obj, Selector_List_Obj extender);
 
   public:
-    Expand(Context&, Env*, Backtrace*, std::vector<CommaSequence_Selector*>* stack = NULL);
+    Expand(Context&, Env*, Backtrace*, std::vector<Selector_List_Obj>* stack = NULL);
     ~Expand() { }
 
-    Statement* operator()(Block*);
-    Statement* operator()(Ruleset*);
-    Statement* operator()(Media_Block*);
-    Statement* operator()(Supports_Block*);
-    Statement* operator()(At_Root_Block*);
-    Statement* operator()(Directive*);
-    Statement* operator()(Declaration*);
-    Statement* operator()(Assignment*);
-    Statement* operator()(Import*);
-    Statement* operator()(Import_Stub*);
-    Statement* operator()(Warning*);
-    Statement* operator()(Error*);
-    Statement* operator()(Debug*);
-    Statement* operator()(Comment*);
-    Statement* operator()(If*);
-    Statement* operator()(For*);
-    Statement* operator()(Each*);
-    Statement* operator()(While*);
-    Statement* operator()(Return*);
-    Statement* operator()(Extension*);
-    Statement* operator()(Definition*);
-    Statement* operator()(Mixin_Call*);
-    Statement* operator()(Content*);
+    Block_Ptr operator()(Block_Ptr);
+    Statement_Ptr operator()(Ruleset_Ptr);
+    Statement_Ptr operator()(Media_Block_Ptr);
+    Statement_Ptr operator()(Supports_Block_Ptr);
+    Statement_Ptr operator()(At_Root_Block_Ptr);
+    Statement_Ptr operator()(Directive_Ptr);
+    Statement_Ptr operator()(Declaration_Ptr);
+    Statement_Ptr operator()(Assignment_Ptr);
+    Statement_Ptr operator()(Import_Ptr);
+    Statement_Ptr operator()(Import_Stub_Ptr);
+    Statement_Ptr operator()(Warning_Ptr);
+    Statement_Ptr operator()(Error_Ptr);
+    Statement_Ptr operator()(Debug_Ptr);
+    Statement_Ptr operator()(Comment_Ptr);
+    Statement_Ptr operator()(If_Ptr);
+    Statement_Ptr operator()(For_Ptr);
+    Statement_Ptr operator()(Each_Ptr);
+    Statement_Ptr operator()(While_Ptr);
+    Statement_Ptr operator()(Return_Ptr);
+    Statement_Ptr operator()(Extension_Ptr);
+    Statement_Ptr operator()(Definition_Ptr);
+    Statement_Ptr operator()(Mixin_Call_Ptr);
+    Statement_Ptr operator()(Content_Ptr);
 
     template <typename U>
-    Statement* fallback(U x) { return fallback_impl(x); }
+    Statement_Ptr fallback(U x) { return fallback_impl(x); }
 
-    void append_block(Block*);
+    void append_block(Block_Ptr);
   };
 
 }

data/ext/libsass/src/extend.cpp

@@ -12,7 +12,6 @@
 #include <deque>
 #include <set>
 
-
 /*
  NOTES:
 
@@ -62,26 +61,26 @@
 namespace Sass {
 
 
-  typedef std::pair<Sequence_Selector*, SimpleSequence_Selector*> ExtensionPair;
+  typedef std::pair<Complex_Selector_Obj, Compound_Selector_Obj> ExtensionPair;
   typedef std::vector<ExtensionPair> SubsetMapEntries;
 
 #ifdef DEBUG
 
   // TODO: move the ast specific ostream operators into ast.hpp/ast.cpp
-  std::ostream& operator<<(std::ostream& os, const Sequence_Selector::Combinator combinator) {
+  std::ostream& operator<<(std::ostream& os, const Complex_Selector::Combinator combinator) {
     switch (combinator) {
-      case Sequence_Selector::ANCESTOR_OF: os << "\" \""; break;
-      case Sequence_Selector::PARENT_OF:   os << "\">\""; break;
-      case Sequence_Selector::PRECEDES:    os << "\"~\""; break;
-      case Sequence_Selector::ADJACENT_TO: os << "\"+\""; break;
-      case Sequence_Selector::REFERENCE:   os << "\"/\""; break;
+      case Complex_Selector::ANCESTOR_OF: os << "\" \""; break;
+      case Complex_Selector::PARENT_OF:   os << "\">\""; break;
+      case Complex_Selector::PRECEDES:    os << "\"~\""; break;
+      case Complex_Selector::ADJACENT_TO: os << "\"+\""; break;
+      case Complex_Selector::REFERENCE:   os << "\"/\""; break;
     }
 
     return os;
   }
 
 
-  std::ostream& operator<<(std::ostream& os, SimpleSequence_Selector& compoundSelector) {
+  std::ostream& operator<<(std::ostream& os, Compound_Selector& compoundSelector) {
     for (size_t i = 0, L = compoundSelector.length(); i < L; ++i) {
       if (i > 0) os << ", ";
       os << compoundSelector[i]->to_string();
@@ -94,7 +93,7 @@ namespace Sass {
     return os;
   }
 
-  // Print a string representation of a SimpleSequence_Selector
+  // Print a string representation of a Compound_Selector
   static void printSimpleSelector(Simple_Selector* pSimpleSelector, const char* message=NULL, bool newline=true) {
 
     if (message) {
@@ -112,13 +111,13 @@ namespace Sass {
     }
   }
 
-  // Print a string representation of a SimpleSequence_Selector
-    typedef std::pair<SimpleSequence_Selector*, Sequence_Selector*> SelsNewSeqPair;
+  // Print a string representation of a Compound_Selector
+    typedef std::pair<Compound_Selector_Obj, Complex_Selector_Obj> SelsNewSeqPair;
     typedef std::vector<SelsNewSeqPair> SelsNewSeqPairCollection;
 
 
-  // Print a string representation of a SimpleSequence_Selector
-  static void printCompoundSelector(SimpleSequence_Selector* pCompoundSelector, const char* message=NULL, bool newline=true) {
+  // Print a string representation of a Compound_Selector
+  static void printCompoundSelector(Compound_Selector_Ptr pCompoundSelector, const char* message=NULL, bool newline=true) {
 
     if (message) {
       std::cerr << message;
@@ -136,13 +135,13 @@ namespace Sass {
   }
 
 
-  std::ostream& operator<<(std::ostream& os, Sequence_Selector& complexSelector) {
+  std::ostream& operator<<(std::ostream& os, Complex_Selector& complexSelector) {
 
     os << "[";
-    Sequence_Selector* pIter = &complexSelector;
+    Complex_Selector_Ptr pIter = &complexSelector;
     bool first = true;
     while (pIter) {
-      if (pIter->combinator() != Sequence_Selector::ANCESTOR_OF) {
+      if (pIter->combinator() != Complex_Selector::ANCESTOR_OF) {
         if (!first) {
           os << ", ";
         }
@@ -169,8 +168,8 @@ namespace Sass {
   }
 
 
-  // Print a string representation of a Sequence_Selector
-  static void printComplexSelector(Sequence_Selector* pComplexSelector, const char* message=NULL, bool newline=true) {
+  // Print a string representation of a Complex_Selector
+  static void printComplexSelector(Complex_Selector_Ptr pComplexSelector, const char* message=NULL, bool newline=true) {
 
     if (message) {
       std::cerr << message;
@@ -201,8 +200,8 @@ namespace Sass {
         std::cerr << ", ";
       }
       std::cerr << "[";
-      SimpleSequence_Selector* pSels = pair.first;
-      Sequence_Selector* pNewSelector = pair.second;
+      Compound_Selector_Ptr pSels = pair.first;
+      Complex_Selector_Ptr pNewSelector = pair.second;
       std::cerr << "[" << *pSels << "], ";
       printComplexSelector(pNewSelector, NULL, false);
     }
@@ -225,7 +224,7 @@ namespace Sass {
     typedef std::deque<std::string> SourceStrings;
     SourceStrings sourceStrings;
     for (SourcesSet::iterator iterator = sources.begin(), iteratorEnd = sources.end(); iterator != iteratorEnd; ++iterator) {
-      Sequence_Selector* pSource = *iterator;
+      Complex_Selector_Ptr pSource = *iterator;
       std::stringstream sstream;
       sstream << complexSelectorToNode(pSource, ctx);
       sourceStrings.push_back(sstream.str());
@@ -254,8 +253,8 @@ namespace Sass {
     os << "SUBSET_MAP_ENTRIES[";
 
     for (SubsetMapEntries::iterator iterator = entries.begin(), endIterator = entries.end(); iterator != endIterator; ++iterator) {
-      Sequence_Selector* pExtComplexSelector = iterator->first;    // The selector up to where the @extend is (ie, the thing to merge)
-      SimpleSequence_Selector* pExtCompoundSelector = iterator->second; // The stuff after the @extend
+      Complex_Selector_Obj pExtComplexSelector = iterator->first;    // The selector up to where the @extend is (ie, the thing to merge)
+      Compound_Selector_Obj pExtCompoundSelector = iterator->second; // The stuff after the @extend
 
       if (iterator != entries.begin()) {
         os << ", ";
@@ -287,17 +286,17 @@ namespace Sass {
   }
 #endif
 
-  static bool parentSuperselector(Sequence_Selector* pOne, Sequence_Selector* pTwo, Context& ctx) {
-    // TODO: figure out a better way to create a Sequence_Selector from scratch
+  static bool parentSuperselector(Complex_Selector_Ptr pOne, Complex_Selector_Ptr pTwo, Context& ctx) {
+    // TODO: figure out a better way to create a Complex_Selector from scratch
     // TODO: There's got to be a better way. This got ugly quick...
     Position noPosition(-1, -1, -1);
-    Element_Selector fakeParent(ParserState("[FAKE]"), "temp");
-    SimpleSequence_Selector fakeHead(ParserState("[FAKE]"), 1 /*size*/);
-    fakeHead.elements().push_back(&fakeParent);
-    Sequence_Selector fakeParentContainer(ParserState("[FAKE]"), Sequence_Selector::ANCESTOR_OF, &fakeHead /*head*/, NULL /*tail*/);
+    Element_Selector_Obj fakeParent = SASS_MEMORY_NEW(Element_Selector, ParserState("[FAKE]"), "temp");
+    Compound_Selector_Obj fakeHead = SASS_MEMORY_NEW(Compound_Selector, ParserState("[FAKE]"), 1 /*size*/);
+    fakeHead->elements().push_back(&fakeParent);
+    Complex_Selector_Obj fakeParentContainer = SASS_MEMORY_NEW(Complex_Selector, ParserState("[FAKE]"), Complex_Selector::ANCESTOR_OF, &fakeHead /*head*/, NULL /*tail*/);
 
-    pOne->set_innermost(&fakeParentContainer, Sequence_Selector::ANCESTOR_OF);
-    pTwo->set_innermost(&fakeParentContainer, Sequence_Selector::ANCESTOR_OF);
+    pOne->set_innermost(&fakeParentContainer, Complex_Selector::ANCESTOR_OF);
+    pTwo->set_innermost(&fakeParentContainer, Complex_Selector::ANCESTOR_OF);
 
     bool isSuperselector = pOne->is_superselector_of(pTwo);
 
@@ -318,8 +317,8 @@ namespace Sass {
     Node result = Node::createCollection();
 
     for (ComplexSelectorDeque::const_iterator iter = deque.begin(), iterEnd = deque.end(); iter != iterEnd; iter++) {
-      Sequence_Selector* pChild = *iter;
-      result.collection()->push_back(complexSelectorToNode(pChild, ctx));
+      Complex_Selector_Obj pChild = *iter;
+      result.collection()->push_back(complexSelectorToNode(&pChild, ctx));
     }
 
     return result;
@@ -331,7 +330,7 @@ namespace Sass {
 
     Context& mCtx;
 
-    bool operator()(Sequence_Selector* pOne, Sequence_Selector* pTwo, Sequence_Selector*& pOut) const {
+    bool operator()(Complex_Selector_Obj pOne, Complex_Selector_Obj pTwo, Complex_Selector_Obj& pOut) const {
       /*
       This code is based on the following block from ruby sass' subweave
         do |s1, s2|
@@ -347,16 +346,16 @@ namespace Sass {
         return true;
       }
 
-      if (pOne->combinator() != Sequence_Selector::ANCESTOR_OF || pTwo->combinator() != Sequence_Selector::ANCESTOR_OF) {
+      if (pOne->combinator() != Complex_Selector::ANCESTOR_OF || pTwo->combinator() != Complex_Selector::ANCESTOR_OF) {
         return false;
       }
 
-      if (parentSuperselector(pOne, pTwo, mCtx)) {
+      if (parentSuperselector(&pOne, &pTwo, mCtx)) {
         pOut = pTwo;
         return true;
       }
 
-      if (parentSuperselector(pTwo, pOne, mCtx)) {
+      if (parentSuperselector(&pTwo, &pOne, mCtx)) {
         pOut = pOne;
         return true;
       }
@@ -382,7 +381,7 @@ namespace Sass {
     }
 
 
-    Sequence_Selector* pCompareOut = NULL;
+    Complex_Selector_Obj pCompareOut;
     if (comparator(x[i], y[j], pCompareOut)) {
       DEBUG_PRINTLN(LCS, "RETURNING AFTER ELEM COMPARE")
       lcs_backtrace(c, x, y, i - 1, j - 1, comparator, out);
@@ -419,9 +418,9 @@ namespace Sass {
 
     for (size_t i = 1; i < x.size(); i++) {
       for (size_t j = 1; j < y.size(); j++) {
-        Sequence_Selector* pCompareOut = NULL;
+        Complex_Selector_Obj pCompareOut;
 
-        if (comparator(x[i], y[j], pCompareOut)) {
+        if (comparator(&x[i], &y[j], pCompareOut)) {
           c[i][j] = c[i - 1][j - 1] + 1;
         } else {
           c[i][j] = std::max(c[i][j - 1], c[i - 1][j]);
@@ -559,7 +558,7 @@ namespace Sass {
       for (NodeDeque::iterator seqs1Iter = seqs1.collection()->begin(), seqs1EndIter = seqs1.collection()->end(); seqs1Iter != seqs1EndIter; ++seqs1Iter) {
         Node& seq1 = *seqs1Iter;
 
-        Sequence_Selector* pSeq1 = nodeToComplexSelector(seq1, ctx);
+        Complex_Selector_Obj pSeq1 = nodeToComplexSelector(seq1, ctx);
 
         // Compute the maximum specificity. This requires looking at the "sources" of the sequence. See SimpleSequence.sources in the ruby code
         // for a good description of sources.
@@ -576,7 +575,7 @@ namespace Sass {
         DEBUG_EXEC(TRIM, printSourcesSet(sources, ctx, "TRIM SOURCES: "))
 
         for (SourcesSet::iterator sourcesSetIterator = sources.begin(), sourcesSetIteratorEnd = sources.end(); sourcesSetIterator != sourcesSetIteratorEnd; ++sourcesSetIterator) {
-          const Sequence_Selector* const pCurrentSelector = *sourcesSetIterator;
+          const Complex_Selector_Obj& pCurrentSelector = *sourcesSetIterator;
           maxSpecificity = std::max(maxSpecificity, pCurrentSelector->specificity());
         }
 
@@ -606,7 +605,7 @@ namespace Sass {
           for (NodeDeque::iterator seqs2Iter = seqs2.collection()->begin(), seqs2IterEnd = seqs2.collection()->end(); seqs2Iter != seqs2IterEnd; ++seqs2Iter) {
             Node& seq2 = *seqs2Iter;
 
-            Sequence_Selector* pSeq2 = nodeToComplexSelector(seq2, ctx);
+            Complex_Selector_Obj pSeq2 = nodeToComplexSelector(seq2, ctx);
 
             DEBUG_PRINTLN(TRIM, "SEQ2 SPEC: " << pSeq2->specificity())
             DEBUG_PRINTLN(TRIM, "IS SPEC: " << pSeq2->specificity() << " >= " << maxSpecificity << " " << (pSeq2->specificity() >= maxSpecificity ? "true" : "false"))
@@ -651,18 +650,18 @@ namespace Sass {
 
 
   static bool parentSuperselector(const Node& one, const Node& two, Context& ctx) {
-    // TODO: figure out a better way to create a Sequence_Selector from scratch
+    // TODO: figure out a better way to create a Complex_Selector from scratch
     // TODO: There's got to be a better way. This got ugly quick...
     Position noPosition(-1, -1, -1);
-    Element_Selector fakeParent(ParserState("[FAKE]"), "temp");
-    SimpleSequence_Selector fakeHead(ParserState("[FAKE]"), 1 /*size*/);
-    fakeHead.elements().push_back(&fakeParent);
-    Sequence_Selector fakeParentContainer(ParserState("[FAKE]"), Sequence_Selector::ANCESTOR_OF, &fakeHead /*head*/, NULL /*tail*/);
+    Element_Selector_Obj fakeParent = SASS_MEMORY_NEW(Element_Selector, ParserState("[FAKE]"), "temp");
+    Compound_Selector_Obj fakeHead = SASS_MEMORY_NEW(Compound_Selector, ParserState("[FAKE]"), 1 /*size*/);
+    fakeHead->elements().push_back(&fakeParent);
+    Complex_Selector_Obj fakeParentContainer = SASS_MEMORY_NEW(Complex_Selector, ParserState("[FAKE]"), Complex_Selector::ANCESTOR_OF, &fakeHead /*head*/, NULL /*tail*/);
 
-    Sequence_Selector* pOneWithFakeParent = nodeToComplexSelector(one, ctx);
-    pOneWithFakeParent->set_innermost(&fakeParentContainer, Sequence_Selector::ANCESTOR_OF);
-    Sequence_Selector* pTwoWithFakeParent = nodeToComplexSelector(two, ctx);
-    pTwoWithFakeParent->set_innermost(&fakeParentContainer, Sequence_Selector::ANCESTOR_OF);
+    Complex_Selector_Obj pOneWithFakeParent = nodeToComplexSelector(one, ctx);
+    pOneWithFakeParent->set_innermost(&fakeParentContainer, Complex_Selector::ANCESTOR_OF);
+    Complex_Selector_Obj pTwoWithFakeParent = nodeToComplexSelector(two, ctx);
+    pTwoWithFakeParent->set_innermost(&fakeParentContainer, Complex_Selector::ANCESTOR_OF);
 
     return pOneWithFakeParent->is_superselector_of(pTwoWithFakeParent);
   }
@@ -849,7 +848,7 @@ namespace Sass {
     DefaultLcsComparator lcsDefaultComparator;
     Node opsLcs = lcs(ops1, ops2, lcsDefaultComparator, ctx);
 
-    if (!(opsLcs == ops1 || opsLcs == ops2)) {
+    if (!(nodesEqual(opsLcs, ops1, true) || nodesEqual(opsLcs, ops2, true))) {
       return Node::createNil();
     }
 
@@ -946,7 +945,7 @@ namespace Sass {
 
       // If there are multiple operators, something hacky's going on. If one is a supersequence of the other, use that, otherwise give up.
 
-      if (!(opsLcs == ops1 || opsLcs == ops2)) {
+      if (!(nodesEqual(opsLcs, ops1, true) || nodesEqual(opsLcs, ops2, true))) {
         return Node::createNil();
       }
 
@@ -970,7 +969,7 @@ namespace Sass {
       Node sel2 = seq2.collection()->back();
       seq2.collection()->pop_back();
 
-      if (op1.combinator() == Sequence_Selector::PRECEDES && op2.combinator() == Sequence_Selector::PRECEDES) {
+      if (op1.combinator() == Complex_Selector::PRECEDES && op2.combinator() == Complex_Selector::PRECEDES) {
 
         if (sel1.selector()->is_superselector_of(sel2.selector())) {
 
@@ -987,9 +986,9 @@ namespace Sass {
           DEBUG_PRINTLN(ALL, "sel1: " << sel1)
           DEBUG_PRINTLN(ALL, "sel2: " << sel2)
 
-          Sequence_Selector* pMergedWrapper = sel1.selector()->clone(ctx); // Clone the Sequence_Selector to get back to something we can transform to a node once we replace the head with the unification result
+          Complex_Selector_Obj pMergedWrapper = SASS_MEMORY_CLONE(sel1.selector()); // Clone the Complex_Selector to get back to something we can transform to a node once we replace the head with the unification result
           // TODO: does subject matter? Ruby: return unless merged = sel1.unify(sel2.members, sel2.subject?)
-          SimpleSequence_Selector* pMerged = sel1.selector()->head()->unify_with(sel2.selector()->head(), ctx);
+          Compound_Selector_Ptr pMerged = sel1.selector()->head()->unify_with(&sel2.selector()->head(), ctx);
           pMergedWrapper->head(pMerged);
 
           DEBUG_EXEC(ALL, printCompoundSelector(pMerged, "MERGED: "))
@@ -998,22 +997,22 @@ namespace Sass {
 
           Node firstPerm = Node::createCollection();
           firstPerm.collection()->push_back(sel1);
-          firstPerm.collection()->push_back(Node::createCombinator(Sequence_Selector::PRECEDES));
+          firstPerm.collection()->push_back(Node::createCombinator(Complex_Selector::PRECEDES));
           firstPerm.collection()->push_back(sel2);
-          firstPerm.collection()->push_back(Node::createCombinator(Sequence_Selector::PRECEDES));
+          firstPerm.collection()->push_back(Node::createCombinator(Complex_Selector::PRECEDES));
           newRes.collection()->push_back(firstPerm);
 
           Node secondPerm = Node::createCollection();
           secondPerm.collection()->push_back(sel2);
-          secondPerm.collection()->push_back(Node::createCombinator(Sequence_Selector::PRECEDES));
+          secondPerm.collection()->push_back(Node::createCombinator(Complex_Selector::PRECEDES));
           secondPerm.collection()->push_back(sel1);
-          secondPerm.collection()->push_back(Node::createCombinator(Sequence_Selector::PRECEDES));
+          secondPerm.collection()->push_back(Node::createCombinator(Complex_Selector::PRECEDES));
           newRes.collection()->push_back(secondPerm);
 
           if (pMerged) {
             Node mergedPerm = Node::createCollection();
-            mergedPerm.collection()->push_back(Node::createSelector(pMergedWrapper, ctx));
-            mergedPerm.collection()->push_back(Node::createCombinator(Sequence_Selector::PRECEDES));
+            mergedPerm.collection()->push_back(Node::createSelector(&pMergedWrapper, ctx));
+            mergedPerm.collection()->push_back(Node::createCombinator(Complex_Selector::PRECEDES));
             newRes.collection()->push_back(mergedPerm);
           }
 
@@ -1023,13 +1022,13 @@ namespace Sass {
 
         }
 
-      } else if (((op1.combinator() == Sequence_Selector::PRECEDES && op2.combinator() == Sequence_Selector::ADJACENT_TO)) || ((op1.combinator() == Sequence_Selector::ADJACENT_TO && op2.combinator() == Sequence_Selector::PRECEDES))) {
+      } else if (((op1.combinator() == Complex_Selector::PRECEDES && op2.combinator() == Complex_Selector::ADJACENT_TO)) || ((op1.combinator() == Complex_Selector::ADJACENT_TO && op2.combinator() == Complex_Selector::PRECEDES))) {
 
           Node tildeSel = sel1;
           Node tildeOp = op1;
           Node plusSel = sel2;
           Node plusOp = op2;
-          if (op1.combinator() != Sequence_Selector::PRECEDES) {
+          if (op1.combinator() != Complex_Selector::PRECEDES) {
             tildeSel = sel2;
             tildeOp = op2;
             plusSel = sel1;
@@ -1046,9 +1045,9 @@ namespace Sass {
             DEBUG_PRINTLN(ALL, "PLUS SEL: " << plusSel)
             DEBUG_PRINTLN(ALL, "TILDE SEL: " << tildeSel)
 
-            Sequence_Selector* pMergedWrapper = plusSel.selector()->clone(ctx); // Clone the Sequence_Selector to get back to something we can transform to a node once we replace the head with the unification result
+            Complex_Selector_Obj pMergedWrapper = SASS_MEMORY_CLONE(plusSel.selector()); // Clone the Complex_Selector to get back to something we can transform to a node once we replace the head with the unification result
             // TODO: does subject matter? Ruby: merged = plus_sel.unify(tilde_sel.members, tilde_sel.subject?)
-            SimpleSequence_Selector* pMerged = plusSel.selector()->head()->unify_with(tildeSel.selector()->head(), ctx);
+            Compound_Selector_Ptr pMerged = plusSel.selector()->head()->unify_with(&tildeSel.selector()->head(), ctx);
             pMergedWrapper->head(pMerged);
 
             DEBUG_EXEC(ALL, printCompoundSelector(pMerged, "MERGED: "))
@@ -1057,15 +1056,15 @@ namespace Sass {
 
             Node firstPerm = Node::createCollection();
             firstPerm.collection()->push_back(tildeSel);
-            firstPerm.collection()->push_back(Node::createCombinator(Sequence_Selector::PRECEDES));
+            firstPerm.collection()->push_back(Node::createCombinator(Complex_Selector::PRECEDES));
             firstPerm.collection()->push_back(plusSel);
-            firstPerm.collection()->push_back(Node::createCombinator(Sequence_Selector::ADJACENT_TO));
+            firstPerm.collection()->push_back(Node::createCombinator(Complex_Selector::ADJACENT_TO));
             newRes.collection()->push_back(firstPerm);
 
             if (pMerged) {
               Node mergedPerm = Node::createCollection();
-              mergedPerm.collection()->push_back(Node::createSelector(pMergedWrapper, ctx));
-              mergedPerm.collection()->push_back(Node::createCombinator(Sequence_Selector::ADJACENT_TO));
+              mergedPerm.collection()->push_back(Node::createSelector(&pMergedWrapper, ctx));
+              mergedPerm.collection()->push_back(Node::createCombinator(Complex_Selector::ADJACENT_TO));
               newRes.collection()->push_back(mergedPerm);
             }
 
@@ -1074,7 +1073,7 @@ namespace Sass {
             DEBUG_PRINTLN(ALL, "RESULT: " << res)
 
           }
-      } else if (op1.combinator() == Sequence_Selector::PARENT_OF && (op2.combinator() == Sequence_Selector::PRECEDES || op2.combinator() == Sequence_Selector::ADJACENT_TO)) {
+      } else if (op1.combinator() == Complex_Selector::PARENT_OF && (op2.combinator() == Complex_Selector::PRECEDES || op2.combinator() == Complex_Selector::ADJACENT_TO)) {
 
         res.collection()->push_front(op2);
         res.collection()->push_front(sel2);
@@ -1082,7 +1081,7 @@ namespace Sass {
         seq1.collection()->push_back(sel1);
         seq1.collection()->push_back(op1);
 
-      } else if (op2.combinator() == Sequence_Selector::PARENT_OF && (op1.combinator() == Sequence_Selector::PRECEDES || op1.combinator() == Sequence_Selector::ADJACENT_TO)) {
+      } else if (op2.combinator() == Complex_Selector::PARENT_OF && (op1.combinator() == Complex_Selector::PRECEDES || op1.combinator() == Complex_Selector::ADJACENT_TO)) {
 
         res.collection()->push_front(op1);
         res.collection()->push_front(sel1);
@@ -1095,9 +1094,9 @@ namespace Sass {
         DEBUG_PRINTLN(ALL, "sel1: " << sel1)
         DEBUG_PRINTLN(ALL, "sel2: " << sel2)
 
-        Sequence_Selector* pMergedWrapper = sel1.selector()->clone(ctx); // Clone the Sequence_Selector to get back to something we can transform to a node once we replace the head with the unification result
+        Complex_Selector_Obj pMergedWrapper = SASS_MEMORY_CLONE(sel1.selector()); // Clone the Complex_Selector to get back to something we can transform to a node once we replace the head with the unification result
         // TODO: does subject matter? Ruby: return unless merged = sel1.unify(sel2.members, sel2.subject?)
-        SimpleSequence_Selector* pMerged = sel1.selector()->head()->unify_with(sel2.selector()->head(), ctx);
+        Compound_Selector_Ptr pMerged = sel1.selector()->head()->unify_with(&sel2.selector()->head(), ctx);
         pMergedWrapper->head(pMerged);
 
         DEBUG_EXEC(ALL, printCompoundSelector(pMerged, "MERGED: "))
@@ -1107,7 +1106,7 @@ namespace Sass {
         }
 
         res.collection()->push_front(op1);
-        res.collection()->push_front(Node::createSelector(pMergedWrapper, ctx));
+        res.collection()->push_front(Node::createSelector(&pMergedWrapper, ctx));
 
         DEBUG_PRINTLN(ALL, "RESULT: " << res)
 
@@ -1121,7 +1120,7 @@ namespace Sass {
 
       Node op1 = ops1.collection()->front();
 
-      if (op1.combinator() == Sequence_Selector::PARENT_OF && !seq2.collection()->empty() && seq2.collection()->back().selector()->is_superselector_of(seq1.collection()->back().selector())) {
+      if (op1.combinator() == Complex_Selector::PARENT_OF && !seq2.collection()->empty() && seq2.collection()->back().selector()->is_superselector_of(seq1.collection()->back().selector())) {
         seq2.collection()->pop_back();
       }
 
@@ -1136,7 +1135,7 @@ namespace Sass {
 
       Node op2 = ops2.collection()->front();
 
-      if (op2.combinator() == Sequence_Selector::PARENT_OF && !seq1.collection()->empty() && seq1.collection()->back().selector()->is_superselector_of(seq2.collection()->back().selector())) {
+      if (op2.combinator() == Complex_Selector::PARENT_OF && !seq1.collection()->empty() && seq1.collection()->back().selector()->is_superselector_of(seq2.collection()->back().selector())) {
         seq1.collection()->pop_back();
       }
 
@@ -1354,20 +1353,20 @@ namespace Sass {
 
     // Check for the simple cases
     if (one.isNil()) {
-      out.collection()->push_back(two.clone(ctx));
+      out.collection()->push_back(two.klone(ctx));
     } else if (two.isNil()) {
-      out.collection()->push_back(one.clone(ctx));
+      out.collection()->push_back(one.klone(ctx));
     } else {
       // Do the naive implementation. pOne = A B and pTwo = C D ...yields...  A B C D and C D A B
       // See https://gist.github.com/nex3/7609394 for details.
 
-      Node firstPerm = one.clone(ctx);
-      Node twoCloned = two.clone(ctx);
+      Node firstPerm = one.klone(ctx);
+      Node twoCloned = two.klone(ctx);
       firstPerm.plus(twoCloned);
       out.collection()->push_back(firstPerm);
 
-      Node secondPerm = two.clone(ctx);
-      Node oneCloned = one.clone(ctx);
+      Node secondPerm = two.klone(ctx);
+      Node oneCloned = one.klone(ctx);
       secondPerm.plus(oneCloned );
       out.collection()->push_back(secondPerm);
     }
@@ -1461,7 +1460,7 @@ namespace Sass {
     afters.plus(path);
 
     while (!afters.collection()->empty()) {
-      Node current = afters.collection()->front().clone(ctx);
+      Node current = afters.collection()->front().klone(ctx);
       afters.collection()->pop_front();
       DEBUG_PRINTLN(WEAVE, "CURRENT: " << current)
       if (current.collection()->size() == 0) continue;
@@ -1509,10 +1508,10 @@ namespace Sass {
   // This forward declaration is needed since extendComplexSelector calls extendCompoundSelector, which may recursively
   // call extendComplexSelector again.
   static Node extendComplexSelector(
-    Sequence_Selector* pComplexSelector,
+    Complex_Selector_Ptr pComplexSelector,
     Context& ctx,
-    ExtensionSubsetMap& subset_map,
-    std::set<SimpleSequence_Selector> seen, bool isReplace, bool isOriginal);
+    Subset_Map& subset_map,
+    std::set<Compound_Selector> seen, bool isReplace, bool isOriginal);
 
 
 
@@ -1532,15 +1531,15 @@ namespace Sass {
   class GroupByToAFunctor {
   public:
     KeyType operator()(ExtensionPair& extPair) const {
-      Sequence_Selector* pSelector = extPair.first;
-      return *pSelector;
+      Complex_Selector_Obj pSelector = extPair.first;
+      return &pSelector;
     }
   };
   static Node extendCompoundSelector(
-    SimpleSequence_Selector* pSelector,
+    Compound_Selector_Ptr pSelector,
     Context& ctx,
-    ExtensionSubsetMap& subset_map,
-    std::set<SimpleSequence_Selector> seen, bool isReplace) {
+    Subset_Map& subset_map,
+    std::set<Compound_Selector> seen, bool isReplace) {
 
     DEBUG_EXEC(EXTEND_COMPOUND, printCompoundSelector(pSelector, "EXTEND COMPOUND: "))
     // TODO: Ruby has another loop here to skip certain members?
@@ -1548,15 +1547,15 @@ namespace Sass {
     Node extendedSelectors = Node::createCollection();
     // extendedSelectors.got_line_feed = true;
 
-    SubsetMapEntries entries = subset_map.get_v(pSelector->to_str_vec());
+    SubsetMapEntries entries = subset_map.get_v(pSelector);
 
-    typedef std::vector<std::pair<Sequence_Selector, std::vector<ExtensionPair> > > GroupedByToAResult;
+    typedef std::vector<std::pair<Complex_Selector_Obj, std::vector<ExtensionPair> > > GroupedByToAResult;
 
-    GroupByToAFunctor<Sequence_Selector> extPairKeyFunctor;
+    GroupByToAFunctor<Complex_Selector_Obj> extPairKeyFunctor;
     GroupedByToAResult arr;
     group_by_to_a(entries, extPairKeyFunctor, arr);
 
-    typedef std::pair<SimpleSequence_Selector*, Sequence_Selector*> SelsNewSeqPair;
+    typedef std::pair<Compound_Selector_Obj, Complex_Selector_Obj> SelsNewSeqPair;
     typedef std::vector<SelsNewSeqPair> SelsNewSeqPairCollection;
 
 
@@ -1564,46 +1563,42 @@ namespace Sass {
 
 
     for (GroupedByToAResult::iterator groupedIter = arr.begin(), groupedIterEnd = arr.end(); groupedIter != groupedIterEnd; groupedIter++) {
-      std::pair<Sequence_Selector, std::vector<ExtensionPair> >& groupedPair = *groupedIter;
+      std::pair<Complex_Selector_Obj, std::vector<ExtensionPair> >& groupedPair = *groupedIter;
 
-      Sequence_Selector& seq = groupedPair.first;
+      Complex_Selector_Obj seq = groupedPair.first;
       std::vector<ExtensionPair>& group = groupedPair.second;
 
       DEBUG_EXEC(EXTEND_COMPOUND, printComplexSelector(&seq, "SEQ: "))
 
-
-      SimpleSequence_Selector* pSels = SASS_MEMORY_NEW(ctx.mem, SimpleSequence_Selector, pSelector->pstate());
+// changing this makes aua
+      Compound_Selector_Obj pSels = SASS_MEMORY_NEW(Compound_Selector, pSelector->pstate());
       for (std::vector<ExtensionPair>::iterator groupIter = group.begin(), groupIterEnd = group.end(); groupIter != groupIterEnd; groupIter++) {
         ExtensionPair& pair = *groupIter;
-        SimpleSequence_Selector* pCompound = pair.second;
+        Compound_Selector_Obj pCompound = pair.second;
         for (size_t index = 0; index < pCompound->length(); index++) {
-          Simple_Selector* pSimpleSelector = (*pCompound)[index];
-          (*pSels) << pSimpleSelector;
+          Simple_Selector_Obj pSimpleSelector = (*pCompound)[index];
+          pSels->append(&pSimpleSelector);
           pCompound->extended(true);
         }
       }
 
-      DEBUG_EXEC(EXTEND_COMPOUND, printCompoundSelector(pSels, "SELS: "))
+      DEBUG_EXEC(EXTEND_COMPOUND, printCompoundSelector(&pSels, "SELS: "))
 
-      Sequence_Selector* pExtComplexSelector = &seq;    // The selector up to where the @extend is (ie, the thing to merge)
-      SimpleSequence_Selector* pExtCompoundSelector = pSels; // All the simple selectors to be replaced from the current compound selector from all extensions
+      Complex_Selector_Ptr pExtComplexSelector = &seq;    // The selector up to where the @extend is (ie, the thing to merge)
 
-      // TODO: This can return a SimpleSequence_Selector with no elements. Should that just be returning NULL?
+      // TODO: This can return a Compound_Selector with no elements. Should that just be returning NULL?
       // RUBY: self_without_sel = Sass::Util.array_minus(members, sels)
-      SimpleSequence_Selector* pSelectorWithoutExtendSelectors = pSelector->minus(pExtCompoundSelector, ctx);
+      Compound_Selector_Obj pSelectorWithoutExtendSelectors = pSelector->minus(&pSels, ctx);
 
       DEBUG_EXEC(EXTEND_COMPOUND, printCompoundSelector(pSelector, "MEMBERS: "))
       DEBUG_EXEC(EXTEND_COMPOUND, printCompoundSelector(pSelectorWithoutExtendSelectors, "SELF_WO_SEL: "))
 
-      SimpleSequence_Selector* pInnermostCompoundSelector = pExtComplexSelector->last()->head();
-      SimpleSequence_Selector* pUnifiedSelector = NULL;
+      Compound_Selector_Obj pInnermostCompoundSelector = pExtComplexSelector->last()->head();
 
       if (!pInnermostCompoundSelector) {
-        pInnermostCompoundSelector = SASS_MEMORY_NEW(ctx.mem, SimpleSequence_Selector, pSelector->pstate());
+        pInnermostCompoundSelector = SASS_MEMORY_NEW(Compound_Selector, pSelector->pstate());
       }
-
-      pUnifiedSelector = pInnermostCompoundSelector->unify_with(pSelectorWithoutExtendSelectors, ctx);
-
+      Compound_Selector_Obj pUnifiedSelector = pInnermostCompoundSelector->unify_with(&pSelectorWithoutExtendSelectors, ctx);
 
       DEBUG_EXEC(EXTEND_COMPOUND, printCompoundSelector(pInnermostCompoundSelector, "LHS: "))
       DEBUG_EXEC(EXTEND_COMPOUND, printCompoundSelector(pSelectorWithoutExtendSelectors, "RHS: "))
@@ -1618,31 +1613,31 @@ namespace Sass {
       // next if group.map {|e, _| check_directives_match!(e, parent_directives)}.none?
 
       // TODO: This seems a little fishy to me. See if it causes any problems. From the ruby, we should be able to just
-      // get rid of the last SimpleSequence_Selector and replace it with this one. I think the reason this code is more
-      // complex is that Sequence_Selector contains a combinator, but in ruby combinators have already been filtered
+      // get rid of the last Compound_Selector and replace it with this one. I think the reason this code is more
+      // complex is that Complex_Selector contains a combinator, but in ruby combinators have already been filtered
       // out and aren't operated on.
-      Sequence_Selector* pNewSelector = pExtComplexSelector->cloneFully(ctx); // ->first();
+      Complex_Selector_Obj pNewSelector = SASS_MEMORY_CLONE(pExtComplexSelector); // ->first();
 
-      Sequence_Selector* pNewInnerMost = SASS_MEMORY_NEW(ctx.mem, Sequence_Selector, pSelector->pstate(), Sequence_Selector::ANCESTOR_OF, pUnifiedSelector, NULL);
+      Complex_Selector_Obj pNewInnerMost = SASS_MEMORY_NEW(Complex_Selector, pSelector->pstate(), Complex_Selector::ANCESTOR_OF, pUnifiedSelector, NULL);
 
-      Sequence_Selector::Combinator combinator = pNewSelector->clear_innermost();
-      pNewSelector->set_innermost(pNewInnerMost, combinator);
+      Complex_Selector::Combinator combinator = pNewSelector->clear_innermost();
+      pNewSelector->set_innermost(&pNewInnerMost, combinator);
 
 #ifdef DEBUG
       SourcesSet debugSet;
       debugSet = pNewSelector->sources();
       if (debugSet.size() > 0) {
-        throw "The new selector should start with no sources. Something needs to be cloned to fix this.";
+        throw std::runtime_error("The new selector should start with no sources. Something needs to be cloned to fix this.");
       }
       debugSet = pExtComplexSelector->sources();
       if (debugSet.size() > 0) {
-        throw "The extension selector from our subset map should not have sources. These will bleed to the new selector. Something needs to be cloned to fix this.";
+        throw std::runtime_error("The extension selector from our subset map should not have sources. These will bleed to the new selector. Something needs to be cloned to fix this.");
       }
 #endif
 
 
       // if (pSelector && pSelector->has_line_feed()) pNewInnerMost->has_line_feed(true);
-      // Set the sources on our new Sequence_Selector to the sources of this simple sequence plus the thing we're extending.
+      // Set the sources on our new Complex_Selector to the sources of this simple sequence plus the thing we're extending.
       DEBUG_PRINTLN(EXTEND_COMPOUND, "SOURCES SETTING ON NEW SEQ: " << complexSelectorToNode(pNewSelector, ctx))
 
       DEBUG_EXEC(EXTEND_COMPOUND, SourcesSet oldSet = pNewSelector->sources(); printSourcesSet(oldSet, ctx, "SOURCES NEW SEQ BEGIN: "))
@@ -1660,7 +1655,7 @@ namespace Sass {
       DEBUG_EXEC(EXTEND_COMPOUND, printSourcesSet(pSelector->sources(), ctx, "SOURCES THIS EXTEND WHICH SHOULD BE SAME STILL: "))
 
 
-      if (pSels->has_line_feed()) pNewSelector->has_line_feed(true);;
+      if (pSels->has_line_feed()) pNewSelector->has_line_feed(true);
 
       holder.push_back(std::make_pair(pSels, pNewSelector));
     }
@@ -1669,8 +1664,8 @@ namespace Sass {
     for (SelsNewSeqPairCollection::iterator holderIter = holder.begin(), holderIterEnd = holder.end(); holderIter != holderIterEnd; holderIter++) {
       SelsNewSeqPair& pair = *holderIter;
 
-      SimpleSequence_Selector* pSels = pair.first;
-      Sequence_Selector* pNewSelector = pair.second;
+      Compound_Selector_Obj pSels = pair.first;
+      Complex_Selector_Obj pNewSelector = pair.second;
 
 
       // RUBY??: next [] if seen.include?(sels)
@@ -1679,18 +1674,18 @@ namespace Sass {
       }
 
 
-      std::set<SimpleSequence_Selector> recurseSeen(seen);
+      std::set<Compound_Selector> recurseSeen(seen);
       recurseSeen.insert(*pSels);
 
 
       DEBUG_PRINTLN(EXTEND_COMPOUND, "RECURSING DO EXTEND: " << complexSelectorToNode(pNewSelector, ctx))
-      Node recurseExtendedSelectors = extendComplexSelector(pNewSelector, ctx, subset_map, recurseSeen, isReplace, false); // !:isOriginal
+      Node recurseExtendedSelectors = extendComplexSelector(&pNewSelector, ctx, subset_map, recurseSeen, isReplace, false); // !:isOriginal
 
       DEBUG_PRINTLN(EXTEND_COMPOUND, "RECURSING DO EXTEND RETURN: " << recurseExtendedSelectors)
 
       for (NodeDeque::iterator iterator = recurseExtendedSelectors.collection()->begin(), endIterator = recurseExtendedSelectors.collection()->end();
            iterator != endIterator; ++iterator) {
-        Node& newSelector = *iterator;
+        Node newSelector = *iterator;
 
 //        DEBUG_PRINTLN(EXTEND_COMPOUND, "EXTENDED AT THIS POINT: " << extendedSelectors)
 //        DEBUG_PRINTLN(EXTEND_COMPOUND, "SELECTOR EXISTS ALREADY: " << newSelector << " " << extendedSelectors.contains(newSelector, false /*simpleSelectorOrderDependent*/));
@@ -1709,20 +1704,20 @@ namespace Sass {
 
 
   static bool complexSelectorHasExtension(
-    Sequence_Selector* pComplexSelector,
+    Complex_Selector_Ptr pComplexSelector,
     Context& ctx,
-    ExtensionSubsetMap& subset_map,
-    std::set<SimpleSequence_Selector>& seen) {
+    Subset_Map& subset_map,
+    std::set<Compound_Selector>& seen) {
 
     bool hasExtension = false;
 
-    Sequence_Selector* pIter = pComplexSelector;
+    Complex_Selector_Obj pIter = pComplexSelector;
 
     while (!hasExtension && pIter) {
-      SimpleSequence_Selector* pHead = pIter->head();
+      Compound_Selector_Obj pHead = pIter->head();
 
       if (pHead) {
-        SubsetMapEntries entries = subset_map.get_v(pHead->to_str_vec());
+        SubsetMapEntries entries = subset_map.get_v(pHead);
         for (ExtensionPair ext : entries) {
           // check if both selectors have the same media block parent
           // if (ext.first->media_block() == pComplexSelector->media_block()) continue;
@@ -1769,10 +1764,10 @@ namespace Sass {
      next [[sseq_or_op]] unless sseq_or_op.is_a?(SimpleSequence)
    */
   static Node extendComplexSelector(
-    Sequence_Selector* pComplexSelector,
+    Complex_Selector_Ptr pComplexSelector,
     Context& ctx,
-    ExtensionSubsetMap& subset_map,
-    std::set<SimpleSequence_Selector> seen, bool isReplace, bool isOriginal) {
+    Subset_Map& subset_map,
+    std::set<Compound_Selector> seen, bool isReplace, bool isOriginal) {
 
     Node complexSelector = complexSelectorToNode(pComplexSelector, ctx);
     DEBUG_PRINTLN(EXTEND_COMPLEX, "EXTEND COMPLEX: " << complexSelector)
@@ -1792,7 +1787,7 @@ namespace Sass {
       // RUBY: next [[sseq_or_op]] unless sseq_or_op.is_a?(SimpleSequence)
       if (!sseqOrOp.isSelector()) {
         // Wrap our Combinator in two collections to match ruby. This is essentially making a collection Node
-        // with one collection child. The collection child represents a Sequence_Selector that is only a combinator.
+        // with one collection child. The collection child represents a Complex_Selector that is only a combinator.
         Node outer = Node::createCollection();
         Node inner = Node::createCollection();
         outer.collection()->push_back(inner);
@@ -1801,17 +1796,17 @@ namespace Sass {
         continue;
       }
 
-      SimpleSequence_Selector* pCompoundSelector = sseqOrOp.selector()->head();
+      Compound_Selector_Obj pCompoundSelector = sseqOrOp.selector()->head();
 
       // RUBY: extended = sseq_or_op.do_extend(extends, parent_directives, replace, seen)
-      Node extended = extendCompoundSelector(pCompoundSelector, ctx, subset_map, seen, isReplace);
+      Node extended = extendCompoundSelector(&pCompoundSelector, ctx, subset_map, seen, isReplace);
       if (sseqOrOp.got_line_feed) extended.got_line_feed = true;
       DEBUG_PRINTLN(EXTEND_COMPLEX, "EXTENDED: " << extended)
 
 
-      // Prepend the SimpleSequence_Selector based on the choices logic; choices seems to be extend but with an ruby Array instead of a Sequence
+      // Prepend the Compound_Selector based on the choices logic; choices seems to be extend but with an ruby Array instead of a Sequence
       // due to the member mapping: choices = extended.map {|seq| seq.members}
-      Sequence_Selector* pJustCurrentCompoundSelector = sseqOrOp.selector();
+      Complex_Selector_Obj pJustCurrentCompoundSelector = sseqOrOp.selector();
 
       // RUBY: extended.first.add_sources!([self]) if original && !has_placeholder?
       if (isOriginal && !pComplexSelector->has_placeholder()) {
@@ -1825,7 +1820,7 @@ namespace Sass {
       for (NodeDeque::iterator iterator = extended.collection()->begin(), endIterator = extended.collection()->end();
            iterator != endIterator; ++iterator) {
         Node& childNode = *iterator;
-        Sequence_Selector* pExtensionSelector = nodeToComplexSelector(childNode, ctx);
+        Complex_Selector_Obj pExtensionSelector = nodeToComplexSelector(childNode, ctx);
         if (pExtensionSelector->is_superselector_of(pJustCurrentCompoundSelector)) {
           isSuperselector = true;
           break;
@@ -1834,7 +1829,7 @@ namespace Sass {
 
       if (!isSuperselector) {
         if (sseqOrOp.got_line_feed) pJustCurrentCompoundSelector->has_line_feed(sseqOrOp.got_line_feed);
-        extended.collection()->push_front(complexSelectorToNode(pJustCurrentCompoundSelector, ctx));
+        extended.collection()->push_front(complexSelectorToNode(&pJustCurrentCompoundSelector, ctx));
       }
 
       DEBUG_PRINTLN(EXTEND_COMPLEX, "CHOICES UNSHIFTED: " << extended)
@@ -1892,39 +1887,39 @@ namespace Sass {
   /*
    This is the equivalent of ruby's CommaSequence.do_extend.
   */
-  CommaSequence_Selector* Extend::extendSelectorList(CommaSequence_Selector* pSelectorList, Context& ctx, ExtensionSubsetMap& subset_map, bool isReplace, bool& extendedSomething) {
-    std::set<SimpleSequence_Selector> seen;
+  Selector_List_Ptr Extend::extendSelectorList(Selector_List_Obj pSelectorList, Context& ctx, Subset_Map& subset_map, bool isReplace, bool& extendedSomething) {
+    std::set<Compound_Selector> seen;
     return extendSelectorList(pSelectorList, ctx, subset_map, isReplace, extendedSomething, seen);
   }
 
   /*
    This is the equivalent of ruby's CommaSequence.do_extend.
   */
-  CommaSequence_Selector* Extend::extendSelectorList(CommaSequence_Selector* pSelectorList, Context& ctx, ExtensionSubsetMap& subset_map, bool isReplace, bool& extendedSomething, std::set<SimpleSequence_Selector>& seen) {
+  Selector_List_Ptr Extend::extendSelectorList(Selector_List_Obj pSelectorList, Context& ctx, Subset_Map& subset_map, bool isReplace, bool& extendedSomething, std::set<Compound_Selector>& seen) {
 
-    CommaSequence_Selector* pNewSelectors = SASS_MEMORY_NEW(ctx.mem, CommaSequence_Selector, pSelectorList->pstate(), pSelectorList->length());
+    Selector_List_Obj pNewSelectors = SASS_MEMORY_NEW(Selector_List, pSelectorList->pstate(), pSelectorList->length());
 
     extendedSomething = false;
 
     for (size_t index = 0, length = pSelectorList->length(); index < length; index++) {
-      Sequence_Selector* pSelector = (*pSelectorList)[index];
+      Complex_Selector_Obj pSelector = (*pSelectorList)[index];
 
       // ruby sass seems to keep a list of things that have extensions and then only extend those. We don't currently do that.
       // Since it's not that expensive to check if an extension exists in the subset map and since it can be relatively expensive to
       // run through the extend code (which does a data model transformation), check if there is anything to extend before doing
       // the extend. We might be able to optimize extendComplexSelector, but this approach keeps us closer to ruby sass (which helps
       // when debugging).
-      if (!complexSelectorHasExtension(pSelector, ctx, subset_map, seen)) {
-        *pNewSelectors << pSelector;
+      if (!complexSelectorHasExtension(&pSelector, ctx, subset_map, seen)) {
+        pNewSelectors->append(&pSelector);
         continue;
       }
 
       extendedSomething = true;
 
-      Node extendedSelectors = extendComplexSelector(pSelector, ctx, subset_map, seen, isReplace, true);
+      Node extendedSelectors = extendComplexSelector(&pSelector, ctx, subset_map, seen, isReplace, true);
       if (!pSelector->has_placeholder()) {
-        if (!extendedSelectors.contains(complexSelectorToNode(pSelector, ctx), true /*simpleSelectorOrderDependent*/)) {
-          *pNewSelectors << pSelector;
+        if (!extendedSelectors.contains(complexSelectorToNode(&pSelector, ctx), true /*simpleSelectorOrderDependent*/)) {
+          pNewSelectors->append(pSelector);
           continue;
         }
       }
@@ -1934,68 +1929,69 @@ namespace Sass {
         if(isReplace && iterator == iteratorBegin && extendedSelectors.collection()->size() > 1 ) continue;
 
         Node& childNode = *iterator;
-        *pNewSelectors << nodeToComplexSelector(childNode, ctx);
+        pNewSelectors->append(nodeToComplexSelector(childNode, ctx));
       }
     }
 
     Remove_Placeholders remove_placeholders(ctx);
     // it seems that we have to remove the place holders early here
     // normally we do this as the very last step (compare to ruby sass)
-    pNewSelectors = remove_placeholders.remove_placeholders(pNewSelectors);
+    pNewSelectors = remove_placeholders.remove_placeholders(&pNewSelectors);
 
     // unwrap all wrapped selectors with inner lists
-    for (Sequence_Selector* cur : *pNewSelectors) {
+    for (Complex_Selector_Obj cur : pNewSelectors->elements()) {
       // process tails
       while (cur) {
         // process header
         if (cur->head() && seen.find(*cur->head()) == seen.end()) {
-          std::set<SimpleSequence_Selector> recseen(seen);
+          std::set<Compound_Selector> recseen(seen);
           recseen.insert(*cur->head());
           // create a copy since we add multiple items if stuff get unwrapped
-          SimpleSequence_Selector* cpy_head = SASS_MEMORY_NEW(ctx.mem, SimpleSequence_Selector, cur->pstate());
-          for (Simple_Selector* hs : *cur->head()) {
-            if (Wrapped_Selector* ws = dynamic_cast<Wrapped_Selector*>(hs)) {
-              if (CommaSequence_Selector* sl = dynamic_cast<CommaSequence_Selector*>(ws->selector())) {
+          Compound_Selector_Obj cpy_head = SASS_MEMORY_NEW(Compound_Selector, cur->pstate());
+          for (Simple_Selector_Obj hs : *cur->head()) {
+            if (Wrapped_Selector_Obj ws = SASS_MEMORY_CAST(Wrapped_Selector, hs)) {
+              ws->selector(SASS_MEMORY_CLONE(ws->selector()));
+              if (Selector_List_Obj sl = SASS_MEMORY_CAST(Selector_List, ws->selector())) {
                 // special case for ruby ass
                 if (sl->empty()) {
                   // this seems inconsistent but it is how ruby sass seems to remove parentheses
-                  *cpy_head << SASS_MEMORY_NEW(ctx.mem, Element_Selector, hs->pstate(), ws->name());
+                  cpy_head->append(SASS_MEMORY_NEW(Element_Selector, hs->pstate(), ws->name()));
                 }
                 // has wrapped selectors
                 else {
                   // extend the inner list of wrapped selector
-                  CommaSequence_Selector* ext_sl = extendSelectorList(sl, ctx, subset_map, recseen);
+                  Selector_List_Obj ext_sl = extendSelectorList(sl, ctx, subset_map, recseen);
                   for (size_t i = 0; i < ext_sl->length(); i += 1) {
-                    if (Sequence_Selector* ext_cs = ext_sl->at(i)) {
+                    if (Complex_Selector_Obj ext_cs = ext_sl->at(i)) {
                       // create clones for wrapped selector and the inner list
-                      Wrapped_Selector* cpy_ws = SASS_MEMORY_NEW(ctx.mem, Wrapped_Selector, *ws);
-                      CommaSequence_Selector* cpy_ws_sl = SASS_MEMORY_NEW(ctx.mem, CommaSequence_Selector, sl->pstate());
+                      Wrapped_Selector_Obj cpy_ws = SASS_MEMORY_COPY(&ws);
+                      Selector_List_Obj cpy_ws_sl = SASS_MEMORY_NEW(Selector_List, sl->pstate());
                       // remove parent selectors from inner selector
                       if (ext_cs->first() && ext_cs->first()->head()->length() > 0) {
-                        Wrapped_Selector* ext_ws = dynamic_cast<Wrapped_Selector*>(ext_cs->first()->head()->first());
+                        Wrapped_Selector_Ptr ext_ws = SASS_MEMORY_CAST(Wrapped_Selector, ext_cs->first()->head()->first());
                         if (ext_ws/* && ext_cs->length() == 1*/) {
-                          CommaSequence_Selector* ws_cs = dynamic_cast<CommaSequence_Selector*>(ext_ws->selector());
-                          SimpleSequence_Selector* ws_ss = ws_cs->first()->head();
+                          Selector_List_Obj ws_cs = SASS_MEMORY_CAST(Selector_List, ext_ws->selector());
+                          Compound_Selector_Obj ws_ss = ws_cs->first()->head();
                           if (!(
-                            dynamic_cast<Pseudo_Selector*>(ws_ss->first()) ||
-                            dynamic_cast<Element_Selector*>(ws_ss->first()) ||
-                            dynamic_cast<Placeholder_Selector*>(ws_ss->first())
+                            SASS_MEMORY_CAST(Pseudo_Selector, ws_ss->first()) ||
+                            SASS_MEMORY_CAST(Element_Selector, ws_ss->first()) ||
+                            SASS_MEMORY_CAST(Placeholder_Selector, ws_ss->first())
                           )) continue;
                         }
-                        *cpy_ws_sl << ext_cs->first();
+                        cpy_ws_sl->append(ext_cs->first());
                       }
                       // assign list to clone
-                      cpy_ws->selector(cpy_ws_sl);
+                      cpy_ws->selector(&cpy_ws_sl);
                       // append the clone
-                      *cpy_head << cpy_ws;
+                      cpy_head->append(&cpy_ws);
                     }
                   }
                 }
               } else {
-                *cpy_head << hs;
+                cpy_head->append(&hs);
               }
             } else {
-              *cpy_head << hs;
+              cpy_head->append(&hs);
             }
           }
           // replace header
@@ -2005,12 +2001,12 @@ namespace Sass {
         cur = cur->tail();
       }
     }
-    return pNewSelectors;
+    return pNewSelectors.detach();
 
   }
 
 
-  bool shouldExtendBlock(Block* b) {
+  bool shouldExtendBlock(Block_Obj b) {
 
     // If a block is empty, there's no reason to extend it since any rules placed on this block
     // won't have any output. The main benefit of this is for structures like:
@@ -2026,9 +2022,9 @@ namespace Sass {
     // there are no child statements. However .a .b should have extensions applied.
 
     for (size_t i = 0, L = b->length(); i < L; ++i) {
-      Statement* stm = (*b)[i];
+      Statement_Obj stm = b->at(i);
 
-      if (typeid(*stm) == typeid(Ruleset)) {
+      if (dynamic_cast<Ruleset_Ptr>(&stm)) {
         // Do nothing. This doesn't count as a statement that causes extension since we'll iterate over this rule set in a future visit and try to extend it.
       }
       else {
@@ -2043,9 +2039,9 @@ namespace Sass {
 
   // Extend a ruleset by extending the selectors and updating them on the ruleset. The block's rules don't need to change.
   template <typename ObjectType>
-  static void extendObjectWithSelectorAndBlock(ObjectType* pObject, Context& ctx, ExtensionSubsetMap& subset_map) {
+  static void extendObjectWithSelectorAndBlock(ObjectType* pObject, Context& ctx, Subset_Map& subset_map) {
 
-    DEBUG_PRINTLN(EXTEND_OBJECT, "FOUND SELECTOR: " << static_cast<CommaSequence_Selector*>(pObject->selector())->to_string(ctx.c_options))
+    DEBUG_PRINTLN(EXTEND_OBJECT, "FOUND SELECTOR: " << static_cast<Selector_List_Ptr>(pObject->selector())->to_string(ctx.c_options))
 
     // Ruby sass seems to filter nodes that don't have any content well before we get here. I'm not sure the repercussions
     // of doing so, so for now, let's just not extend things that won't be output later.
@@ -2055,13 +2051,13 @@ namespace Sass {
     }
 
     bool extendedSomething = false;
-    CommaSequence_Selector* pNewSelectorList = Extend::extendSelectorList(static_cast<CommaSequence_Selector*>(pObject->selector()), ctx, subset_map, false, extendedSomething);
+    Selector_List_Obj pNewSelectorList = Extend::extendSelectorList(SASS_MEMORY_CAST(Selector_List, pObject->selector()), ctx, subset_map, false, extendedSomething);
 
     if (extendedSomething && pNewSelectorList) {
-      DEBUG_PRINTLN(EXTEND_OBJECT, "EXTEND ORIGINAL SELECTORS: " << static_cast<CommaSequence_Selector*>(pObject->selector())->to_string(ctx.c_options))
+      DEBUG_PRINTLN(EXTEND_OBJECT, "EXTEND ORIGINAL SELECTORS: " << static_cast<Selector_List_Ptr>(pObject->selector())->to_string(ctx.c_options))
       DEBUG_PRINTLN(EXTEND_OBJECT, "EXTEND SETTING NEW SELECTORS: " << pNewSelectorList->to_string(ctx.c_options))
       pNewSelectorList->remove_parent_selectors();
-      pObject->selector(pNewSelectorList);
+      pObject->selector(&pNewSelectorList);
     } else {
       DEBUG_PRINTLN(EXTEND_OBJECT, "EXTEND DID NOT TRY TO EXTEND ANYTHING")
     }
@@ -2069,22 +2065,23 @@ namespace Sass {
 
 
 
-  Extend::Extend(Context& ctx, ExtensionSubsetMap& ssm)
+  Extend::Extend(Context& ctx, Subset_Map& ssm)
   : ctx(ctx), subset_map(ssm)
   { }
 
-  void Extend::operator()(Block* b)
+  void Extend::operator()(Block_Ptr b)
   {
     for (size_t i = 0, L = b->length(); i < L; ++i) {
-      (*b)[i]->perform(this);
+      Statement_Obj stm = b->at(i);
+      stm->perform(this);
     }
     // do final check if everything was extended
     // we set `extended` flag on extended selectors
     if (b->is_root()) {
       // debug_subset_map(subset_map);
       for(auto const &it : subset_map.values()) {
-        Sequence_Selector* sel = it.first ? it.first->first() : NULL;
-        SimpleSequence_Selector* ext = it.second ? it.second : NULL;
+        Complex_Selector_Ptr sel = it.first ? &it.first->first() : NULL;
+        Compound_Selector_Ptr ext = it.second ? &it.second : NULL;
         if (ext && (ext->extended() || ext->is_optional())) continue;
         std::string str_sel(sel->to_string({ NESTED, 5 }));
         std::string str_ext(ext->to_string({ NESTED, 5 }));
@@ -2099,25 +2096,25 @@ namespace Sass {
 
   }
 
-  void Extend::operator()(Ruleset* pRuleset)
+  void Extend::operator()(Ruleset_Ptr pRuleset)
   {
-    extendObjectWithSelectorAndBlock(pRuleset, ctx, subset_map);
+    extendObjectWithSelectorAndBlock( pRuleset, ctx, subset_map);
     pRuleset->block()->perform(this);
   }
 
-  void Extend::operator()(Supports_Block* pFeatureBlock)
+  void Extend::operator()(Supports_Block_Ptr pFeatureBlock)
   {
     pFeatureBlock->block()->perform(this);
   }
 
-  void Extend::operator()(Media_Block* pMediaBlock)
+  void Extend::operator()(Media_Block_Ptr pMediaBlock)
   {
     pMediaBlock->block()->perform(this);
   }
 
-  void Extend::operator()(Directive* a)
+  void Extend::operator()(Directive_Ptr a)
   {
-    // CommaSequence_Selector* ls = dynamic_cast<CommaSequence_Selector*>(a->selector());
+    // Selector_List_Ptr ls = dynamic_cast<Selector_List_Ptr>(a->selector());
     // selector_stack.push_back(ls);
     if (a->block()) a->block()->perform(this);
     // exp.selector_stack.pop_back();