Fix extend edge case

Author: mgreter

src/ast_fwd_decl.cpp

@@ -9,33 +9,4 @@
 
 namespace Sass {
 
-  #define IMPLEMENT_BASE_CAST(T) \
-  template<> \
-  T* Cast(AstNode* ptr) { \
-    return dynamic_cast<T*>(ptr); \
-  }; \
-  \
-  template<> \
-  const T* Cast(const AstNode* ptr) { \
-    return dynamic_cast<const T*>(ptr); \
-  }; \
-
-  IMPLEMENT_BASE_CAST(Expression);
-  IMPLEMENT_BASE_CAST(Statement);
-  IMPLEMENT_BASE_CAST(ParentStatement);
-  IMPLEMENT_BASE_CAST(CssParentNode);
-  IMPLEMENT_BASE_CAST(CallableDeclaration);
-  IMPLEMENT_BASE_CAST(Value);
-  IMPLEMENT_BASE_CAST(Color);
-  IMPLEMENT_BASE_CAST(List);
-  IMPLEMENT_BASE_CAST(Callable);
-  IMPLEMENT_BASE_CAST(String);
-  IMPLEMENT_BASE_CAST(SupportsCondition);
-  IMPLEMENT_BASE_CAST(Selector);
-  IMPLEMENT_BASE_CAST(SelectorComponent);
-  IMPLEMENT_BASE_CAST(SimpleSelector);
-  IMPLEMENT_BASE_CAST(NameSpaceSelector);
-  IMPLEMENT_BASE_CAST(CssNode);
-
-
 }

src/ast_fwd_decl.hpp

@@ -336,44 +336,6 @@ namespace Sass {
   typedef sass::vector<ExpressionObj> ExpressionVector;
   typedef std::unordered_set<sass::string> StringSet;
 
-  /////////////////////////////////////////////////////////////////////////#
-  // explicit type conversion functions
-  /////////////////////////////////////////////////////////////////////////#
-
-  template<class T>
-  T* Cast(AstNode* ptr);
-
-  template<class T>
-  const T* Cast(const AstNode* ptr);
-
-  // sometimes you know the class you want to cast to is final
-  // in this case a simple typeid check is faster and safe to use
-
-  #define DECLARE_BASE_CAST(T) \
-  template<> T* Cast(AstNode* ptr); \
-  template<> const T* Cast(const AstNode* ptr); \
-
-  /////////////////////////////////////////////////////////////////////////#
-  // implement specialization for final classes
-  /////////////////////////////////////////////////////////////////////////#
-
-  DECLARE_BASE_CAST(AstNode)
-  DECLARE_BASE_CAST(Expression)
-  DECLARE_BASE_CAST(Statement)
-  DECLARE_BASE_CAST(ParentStatement)
-  DECLARE_BASE_CAST(CssParentNode)
-  DECLARE_BASE_CAST(Value)
-  DECLARE_BASE_CAST(Callable)
-  DECLARE_BASE_CAST(Color)
-  DECLARE_BASE_CAST(List)
-  DECLARE_BASE_CAST(String)
-  DECLARE_BASE_CAST(SupportsCondition)
-  DECLARE_BASE_CAST(Selector)
-  DECLARE_BASE_CAST(SimpleSelector)
-  DECLARE_BASE_CAST(NameSpaceSelector);
-  DECLARE_BASE_CAST(SelectorComponent)
-  DECLARE_BASE_CAST(ImportBase);
-  DECLARE_BASE_CAST(CssNode);
 
   class Eval;
   class Logger;

src/debugger.hpp

@@ -638,18 +638,18 @@ inline void debug_ast(AstNode* node, std::string ind)
   ForwardRule* rule = Cast<ForwardRule>(node);
     std::cerr << ind << "ForwardRule " << rule;
     std::cerr << " (" << pstate_source_position(rule) << ")";
-    debug_idxs(rule->module());
+    debug_idxs(rule->module32());
     std::cerr << std::endl;
-    debug_ast(rule->root(), ind + " =@ ");
+    debug_ast(rule->root47(), ind + " =@ ");
 
   }
   else if (Cast<UseRule>(node)) {
     UseRule* rule = Cast<UseRule>(node);
     std::cerr << ind << "UseRule " << rule;
     std::cerr << " (" << pstate_source_position(rule) << ")";
-    debug_idxs(rule->module());
+    debug_idxs(rule->module32());
     std::cerr << std::endl;
-    debug_ast(rule->root(), ind + " =@ ");
+    debug_ast(rule->root47(), ind + " =@ ");
 
   }
   else if (Cast<UserDefinedCallable>(node)) {
@@ -872,9 +872,9 @@ inline void debug_ast(AstNode* node, std::string ind)
     IncludeImport* block = Cast<IncludeImport>(node);
     std::cerr << ind << "IncludeImport " << block;
     std::cerr << " (" << pstate_source_position(node) << ")";
-    debug_idxs(block->module());
+    debug_idxs(block->module32());
     std::cerr << std::endl;
-    debug_ast(block->root(), ind + " @ ");
+    debug_ast(block->root47(), ind + " @ ");
   }
   else if (Cast<ImportRule>(node)) {
     ImportRule* block = Cast<ImportRule>(node);
@@ -1121,10 +1121,10 @@ inline void debug_ast(AstNode* node, std::string ind)
     MapExpression* expression = Cast<MapExpression>(node);
     std::cerr << ind << "MapExpression " << expression;
     std::cerr << " (" << pstate_source_position(node) << ")";
-    std::cerr << " (" << expression->size() << ") " <<
+    std::cerr << " (" << expression->kvlist().size() << ") " <<
       std::endl;
-    for (size_t i = 0; i < expression->size(); i++) {
-      debug_ast(expression->get(i), ind + " ");
+    for (size_t i = 0; i < expression->kvlist().size(); i++) {
+      debug_ast(expression->kvlist().at(i), ind + " ");
     }
   }
   else if (Cast<ArgumentList>(node)) {

src/extender.cpp

@@ -72,6 +72,10 @@ namespace Sass {
       extenders[complex] = complex;
     }
 
+    ExtSelExtMap extensions;
+
+    Extender extender(mode, logger);
+
     for (auto complex : targets->elements()) {
 
       if (complex->size() > 1) {
@@ -94,23 +98,16 @@ namespace Sass {
 
       if (const CompoundSelector* compound = complex->first()->isaCompoundSelector()) {
 
-        ExtSelExtMap extensions;
-
         for (const SimpleSelectorObj& simple : compound->elements()) {
           extensions.insert(std::make_pair(simple, extenders));
         }
 
-        Extender extender(mode, logger);
-
         // if (!selector->hasInvisible()) {
         for (auto sel : selector->elements()) {
           extender.originals.insert(sel);
         }
         // }
 
-        extender.extendList(selector, extensions,
-          {}, selector->elements());
-
       }
       else {
         throw Exception::RuntimeException(logger,
@@ -120,6 +117,9 @@ namespace Sass {
 
     }
 
+    extender.extendList(selector, extensions,
+      {}, selector->elements());
+
     return selector;
 
   }