sassc 2.1.0.pre3 → 2.4.0

data/ext/libsass/src/ast.hpp

@@ -5,47 +5,22 @@
 // __EXTENSIONS__ fix on Solaris.
 #include "sass.hpp"
 
-#include <set>
-#include <deque>
-#include <vector>
-#include <string>
-#include <sstream>
-#include <iostream>
 #include <typeinfo>
-#include <algorithm>
+#include <unordered_map>
+
 #include "sass/base.h"
+#include "ast_helpers.hpp"
 #include "ast_fwd_decl.hpp"
+#include "ast_def_macros.hpp"
 
-#include "util.hpp"
-#include "units.hpp"
-#include "context.hpp"
+#include "file.hpp"
 #include "position.hpp"
-#include "constants.hpp"
 #include "operation.hpp"
-#include "position.hpp"
-#include "inspect.hpp"
-#include "source_map.hpp"
 #include "environment.hpp"
-#include "error_handling.hpp"
-#include "ast_def_macros.hpp"
-#include "ast_fwd_decl.hpp"
-#include "source_map.hpp"
 #include "fn_utils.hpp"
 
-#include "sass.h"
-
 namespace Sass {
 
-  // easier to search with name
-  const bool DELAYED = true;
-
-  // ToDo: should this really be hardcoded
-  // Note: most methods follow precision option
-  const double NUMBER_EPSILON = 1e-12;
-
-  // macro to test if numbers are equal within a small error margin
-  #define NEAR_EQUAL(lhs, rhs) std::fabs(lhs - rhs) < NUMBER_EPSILON
-
   // ToDo: where does this fit best?
   // We don't share this with C-API?
   class Operand {
@@ -80,9 +55,9 @@ namespace Sass {
   // Abstract base class for all abstract syntax tree nodes.
   //////////////////////////////////////////////////////////
   class AST_Node : public SharedObj {
-    ADD_PROPERTY(ParserState, pstate)
+    ADD_PROPERTY(SourceSpan, pstate)
   public:
-    AST_Node(ParserState pstate)
+    AST_Node(SourceSpan pstate)
     : pstate_(pstate)
     { }
     AST_Node(const AST_Node* ptr)
@@ -91,7 +66,7 @@ namespace Sass {
 
     // allow implicit conversion to string
     // needed for by SharedPtr implementation
-    operator std::string() {
+    operator sass::string() {
       return to_string();
     }
 
@@ -99,17 +74,30 @@ namespace Sass {
 
     virtual ~AST_Node() = 0;
     virtual size_t hash() const { return 0; }
-    virtual std::string inspect() const { return to_string({ INSPECT, 5 }); }
-    virtual std::string to_sass() const { return to_string({ TO_SASS, 5 }); }
-    virtual const std::string to_string(Sass_Inspect_Options opt) const;
-    virtual const std::string to_string() const;
+    virtual sass::string inspect() const { return to_string({ INSPECT, 5 }); }
+    virtual sass::string to_sass() const { return to_string({ TO_SASS, 5 }); }
+    virtual sass::string to_string(Sass_Inspect_Options opt) const;
+    virtual sass::string to_css(Sass_Inspect_Options opt) const;
+    virtual sass::string to_string() const;
     virtual void cloneChildren() {};
     // generic find function (not fully implemented yet)
-    // ToDo: add specific implementions to all children
+    // ToDo: add specific implementations to all children
     virtual bool find ( bool (*f)(AST_Node_Obj) ) { return f(this); };
-    void update_pstate(const ParserState& pstate);
-    Offset off() { return pstate(); }
-    Position pos() { return pstate(); }
+    void update_pstate(const SourceSpan& pstate);
+
+    // Some objects are not meant to be compared
+    // ToDo: maybe fall-back to pointer comparison?
+    virtual bool operator== (const AST_Node& rhs) const {
+      throw std::runtime_error("operator== not implemented");
+    }
+
+    // We can give some reasonable implementations by using
+    // invert operators on the specialized implementations
+    virtual bool operator!= (const AST_Node& rhs) const {
+      // Unequal if not equal
+      return !(*this == rhs);
+    }
+
     ATTACH_ABSTRACT_AST_OPERATIONS(AST_Node);
     ATTACH_ABSTRACT_CRTP_PERFORM_METHODS()
   };
@@ -163,13 +151,13 @@ namespace Sass {
     ADD_PROPERTY(bool, is_interpolant)
     ADD_PROPERTY(Type, concrete_type)
   public:
-    Expression(ParserState pstate, bool d = false, bool e = false, bool i = false, Type ct = NONE);
+    Expression(SourceSpan pstate, bool d = false, bool e = false, bool i = false, Type ct = NONE);
     virtual operator bool() { return true; }
     virtual ~Expression() { }
     virtual bool is_invisible() const { return false; }
 
-    virtual std::string type() const { return ""; }
-    static std::string type_name() { return ""; }
+    virtual sass::string type() const { return ""; }
+    static sass::string type_name() { return ""; }
 
     virtual bool is_false() { return false; }
     // virtual bool is_true() { return !is_false(); }
@@ -194,17 +182,17 @@ namespace Sass {
 
 namespace std {
   template<>
-  struct hash<Sass::Expression_Obj>
+  struct hash<Sass::ExpressionObj>
   {
-    size_t operator()(Sass::Expression_Obj s) const
+    size_t operator()(Sass::ExpressionObj s) const
     {
       return s->hash();
     }
   };
   template<>
-  struct equal_to<Sass::Expression_Obj>
+  struct equal_to<Sass::ExpressionObj>
   {
-    bool operator()( Sass::Expression_Obj lhs,  Sass::Expression_Obj rhs) const
+    bool operator()( Sass::ExpressionObj lhs,  Sass::ExpressionObj rhs) const
     {
       return lhs->hash() == rhs->hash();
     }
@@ -220,7 +208,7 @@ namespace Sass {
   /////////////////////////////////////////////////////////////////////////////
   template <typename T>
   class Vectorized {
-    std::vector<T> elements_;
+    sass::vector<T> elements_;
   protected:
     mutable size_t hash_;
     void reset_hash() { hash_ = 0; }
@@ -228,37 +216,112 @@ namespace Sass {
   public:
     Vectorized(size_t s = 0) : hash_(0)
     { elements_.reserve(s); }
+    Vectorized(sass::vector<T> vec) :
+      elements_(std::move(vec)),
+      hash_(0)
+    {}
     virtual ~Vectorized() = 0;
     size_t length() const   { return elements_.size(); }
     bool empty() const      { return elements_.empty(); }
     void clear()            { return elements_.clear(); }
-    T last() const          { return elements_.back(); }
-    T first() const         { return elements_.front(); }
+    T& last()               { return elements_.back(); }
+    T& first()              { return elements_.front(); }
+    const T& last() const   { return elements_.back(); }
+    const T& first() const  { return elements_.front(); }
+
+    bool operator== (const Vectorized<T>& rhs) const {
+      // Abort early if sizes do not match
+      if (length() != rhs.length()) return false;
+      // Otherwise test each node for object equalicy in order
+      return std::equal(begin(), end(), rhs.begin(), ObjEqualityFn<T>);
+    }
+
+    bool operator!= (const Vectorized<T>& rhs) const {
+      return !(*this == rhs);
+    }
+
     T& operator[](size_t i) { return elements_[i]; }
     virtual const T& at(size_t i) const { return elements_.at(i); }
     virtual T& at(size_t i) { return elements_.at(i); }
     const T& get(size_t i) const { return elements_[i]; }
     const T& operator[](size_t i) const { return elements_[i]; }
-    virtual void append(T element)
+
+    // Implicitly get the sass::vector from our object
+    // Makes the Vector directly assignable to sass::vector
+    // You are responsible to make a copy if needed
+    // Note: since this returns the real object, we can't
+    // Note: guarantee that the hash will not get out of sync
+    operator sass::vector<T>&() { return elements_; }
+    operator const sass::vector<T>&() const { return elements_; }
+
+    // Explicitly request all elements as a real sass::vector
+    // You are responsible to make a copy if needed
+    // Note: since this returns the real object, we can't
+    // Note: guarantee that the hash will not get out of sync
+    sass::vector<T>& elements() { return elements_; }
+    const sass::vector<T>& elements() const { return elements_; }
+
+    // Insert all items from compatible vector
+    void concat(const sass::vector<T>& v)
+    {
+      if (!v.empty()) reset_hash();
+      elements().insert(end(), v.begin(), v.end());
+    }
+
+    // Syntatic sugar for pointers
+    void concat(const Vectorized<T>* v)
     {
-      if (element) {
-        reset_hash();
-        elements_.push_back(element);
-        adjust_after_pushing(element);
+      if (v != nullptr) {
+        return concat(*v);
       }
     }
-    virtual void concat(Vectorized* v)
+
+    // Insert one item on the front
+    void unshift(T element)
     {
-      for (size_t i = 0, L = v->length(); i < L; ++i) this->append((*v)[i]);
+      reset_hash();
+      elements_.insert(begin(), element);
     }
-    Vectorized& unshift(T element)
+
+    // Remove and return item on the front
+    // ToDo: handle empty vectors
+    T shift() {
+      reset_hash();
+      T first = get(0);
+      elements_.erase(begin());
+      return first;
+    }
+
+    // Insert one item on the back
+    // ToDo: rename this to push
+    void append(T element)
     {
-      elements_.insert(elements_.begin(), element);
-      return *this;
+      reset_hash();
+      elements_.insert(end(), element);
+      // ToDo: Mostly used by parameters and arguments
+      // ToDo: Find a more elegant way to support this
+      adjust_after_pushing(element);
+    }
+
+    // Check if an item already exists
+    // Uses underlying object `operator==`
+    // E.g. compares the actual objects
+    bool contains(const T& el) const {
+      for (const T& rhs : elements_) {
+        // Test the underlying objects for equality
+        // A std::find checks for pointer equality
+        if (ObjEqualityFn(el, rhs)) {
+          return true;
+        }
+      }
+      return false;
+    }
+
+    // This might be better implemented as `operator=`?
+    void elements(sass::vector<T> e) {
+      reset_hash();
+      elements_ = std::move(e);
     }
-    std::vector<T>& elements() { return elements_; }
-    const std::vector<T>& elements() const { return elements_; }
-    std::vector<T>& elements(std::vector<T>& e) { elements_ = e; return elements_; }
 
     virtual size_t hash() const
     {
@@ -271,17 +334,17 @@ namespace Sass {
     }
 
     template <typename P, typename V>
-    typename std::vector<T>::iterator insert(P position, const V& val) {
+    typename sass::vector<T>::iterator insert(P position, const V& val) {
       reset_hash();
       return elements_.insert(position, val);
     }
 
-    typename std::vector<T>::iterator end() { return elements_.end(); }
-    typename std::vector<T>::iterator begin() { return elements_.begin(); }
-    typename std::vector<T>::const_iterator end() const { return elements_.end(); }
-    typename std::vector<T>::const_iterator begin() const { return elements_.begin(); }
-    typename std::vector<T>::iterator erase(typename std::vector<T>::iterator el) { return elements_.erase(el); }
-    typename std::vector<T>::const_iterator erase(typename std::vector<T>::const_iterator el) { return elements_.erase(el); }
+    typename sass::vector<T>::iterator end() { return elements_.end(); }
+    typename sass::vector<T>::iterator begin() { return elements_.begin(); }
+    typename sass::vector<T>::const_iterator end() const { return elements_.end(); }
+    typename sass::vector<T>::const_iterator begin() const { return elements_.begin(); }
+    typename sass::vector<T>::iterator erase(typename sass::vector<T>::iterator el) { reset_hash(); return elements_.erase(el); }
+    typename sass::vector<T>::const_iterator erase(typename sass::vector<T>::const_iterator el) { reset_hash(); return elements_.erase(el); }
 
   };
   template <typename T>
@@ -289,38 +352,63 @@ namespace Sass {
 
   /////////////////////////////////////////////////////////////////////////////
   // Mixin class for AST nodes that should behave like a hash table. Uses an
-  // extra <std::vector> internally to maintain insertion order for interation.
+  // extra <sass::vector> internally to maintain insertion order for interation.
   /////////////////////////////////////////////////////////////////////////////
+  template <typename K, typename T, typename U>
   class Hashed {
   private:
-    ExpressionMap elements_;
-    std::vector<Expression_Obj> list_;
+    std::unordered_map<
+      K, T, ObjHash, ObjEquality
+    > elements_;
+
+    sass::vector<K> _keys;
+    sass::vector<T> _values;
   protected:
     mutable size_t hash_;
-    Expression_Obj duplicate_key_;
+    K duplicate_key_;
     void reset_hash() { hash_ = 0; }
     void reset_duplicate_key() { duplicate_key_ = {}; }
-    virtual void adjust_after_pushing(std::pair<Expression_Obj, Expression_Obj> p) { }
+    virtual void adjust_after_pushing(std::pair<K, T> p) { }
   public:
     Hashed(size_t s = 0)
-    : elements_(ExpressionMap(s)),
-      list_(std::vector<Expression_Obj>()),
+    : elements_(),
+      _keys(),
+      _values(),
       hash_(0), duplicate_key_({})
-    { elements_.reserve(s); list_.reserve(s); }
+    {
+      _keys.reserve(s);
+      _values.reserve(s);
+      elements_.reserve(s);
+    }
     virtual ~Hashed();
-    size_t length() const                  { return list_.size(); }
-    bool empty() const                     { return list_.empty(); }
-    bool has(Expression_Obj k) const          { return elements_.count(k) == 1; }
-    Expression_Obj at(Expression_Obj k) const;
+    size_t length() const                  { return _keys.size(); }
+    bool empty() const                     { return _keys.empty(); }
+    bool has(K k) const          {
+      return elements_.find(k) != elements_.end();
+    }
+    T at(K k) const {
+      if (elements_.count(k))
+      {
+        return elements_.at(k);
+      }
+      else { return {}; }
+    }
     bool has_duplicate_key() const         { return duplicate_key_ != nullptr; }
-    Expression_Obj get_duplicate_key() const  { return duplicate_key_; }
-    const ExpressionMap elements() { return elements_; }
-    Hashed& operator<<(std::pair<Expression_Obj, Expression_Obj> p)
+    K get_duplicate_key() const  { return duplicate_key_; }
+    const std::unordered_map<
+      K, T, ObjHash, ObjEquality
+    >& elements() { return elements_; }
+    Hashed& operator<<(std::pair<K, T> p)
     {
       reset_hash();
 
-      if (!has(p.first)) list_.push_back(p.first);
-      else if (!duplicate_key_) duplicate_key_ = p.first;
+      if (!has(p.first)) {
+        _keys.push_back(p.first);
+        _values.push_back(p.second);
+      }
+      else if (!duplicate_key_) {
+        duplicate_key_ = p.first;
+      }
 
       elements_[p.first] = p.second;
 
@@ -331,7 +419,8 @@ namespace Sass {
     {
       if (length() == 0) {
         this->elements_ = h->elements_;
-        this->list_ = h->list_;
+        this->_values = h->_values;
+        this->_keys = h->_keys;
         return *this;
       }
 
@@ -342,17 +431,21 @@ namespace Sass {
       reset_duplicate_key();
       return *this;
     }
-    const ExpressionMap& pairs() const { return elements_; }
-    const std::vector<Expression_Obj>& keys() const { return list_; }
+    const std::unordered_map<
+      K, T, ObjHash, ObjEquality
+    >& pairs() const { return elements_; }
 
-//    std::unordered_map<Expression_Obj, Expression_Obj>::iterator end() { return elements_.end(); }
-//    std::unordered_map<Expression_Obj, Expression_Obj>::iterator begin() { return elements_.begin(); }
-//    std::unordered_map<Expression_Obj, Expression_Obj>::const_iterator end() const { return elements_.end(); }
-//    std::unordered_map<Expression_Obj, Expression_Obj>::const_iterator begin() const { return elements_.begin(); }
+    const sass::vector<K>& keys() const { return _keys; }
+    const sass::vector<T>& values() const { return _values; }
 
-  };
-  inline Hashed::~Hashed() { }
+//    std::unordered_map<ExpressionObj, ExpressionObj>::iterator end() { return elements_.end(); }
+//    std::unordered_map<ExpressionObj, ExpressionObj>::iterator begin() { return elements_.begin(); }
+//    std::unordered_map<ExpressionObj, ExpressionObj>::const_iterator end() const { return elements_.end(); }
+//    std::unordered_map<ExpressionObj, ExpressionObj>::const_iterator begin() const { return elements_.begin(); }
 
+  };
+  template <typename K, typename T, typename U>
+  inline Hashed<K, T, U>::~Hashed() { }
 
   /////////////////////////////////////////////////////////////////////////
   // Abstract base class for statements. This side of the AST hierarchy
@@ -391,7 +484,7 @@ namespace Sass {
     ADD_PROPERTY(size_t, tabs)
     ADD_PROPERTY(bool, group_end)
   public:
-    Statement(ParserState pstate, Type st = NONE, size_t t = 0);
+    Statement(SourceSpan pstate, Type st = NONE, size_t t = 0);
     virtual ~Statement() = 0; // virtual destructor
     // needed for rearranging nested rulesets during CSS emission
     virtual bool bubbles();
@@ -410,7 +503,8 @@ namespace Sass {
   protected:
     void adjust_after_pushing(Statement_Obj s) override {}
   public:
-    Block(ParserState pstate, size_t s = 0, bool r = false);
+    Block(SourceSpan pstate, size_t s = 0, bool r = false);
+    bool isInvisible() const;
     bool has_content() override;
     ATTACH_AST_OPERATIONS(Block)
     ATTACH_CRTP_PERFORM_METHODS()
@@ -419,27 +513,28 @@ namespace Sass {
   ////////////////////////////////////////////////////////////////////////
   // Abstract base class for statements that contain blocks of statements.
   ////////////////////////////////////////////////////////////////////////
-  class Has_Block : public Statement {
+  class ParentStatement : public Statement {
     ADD_PROPERTY(Block_Obj, block)
   public:
-    Has_Block(ParserState pstate, Block_Obj b);
-    Has_Block(const Has_Block* ptr); // copy constructor
-    virtual ~Has_Block() = 0; // virtual destructor
+    ParentStatement(SourceSpan pstate, Block_Obj b);
+    ParentStatement(const ParentStatement* ptr); // copy constructor
+    virtual ~ParentStatement() = 0; // virtual destructor
     virtual bool has_content() override;
   };
-  inline Has_Block::~Has_Block() { }
+  inline ParentStatement::~ParentStatement() { }
 
   /////////////////////////////////////////////////////////////////////////////
   // Rulesets (i.e., sets of styles headed by a selector and containing a block
   // of style declarations.
   /////////////////////////////////////////////////////////////////////////////
-  class Ruleset final : public Has_Block {
-    ADD_PROPERTY(Selector_List_Obj, selector)
+  class StyleRule final : public ParentStatement {
+    ADD_PROPERTY(SelectorListObj, selector)
+    ADD_PROPERTY(Selector_Schema_Obj, schema)
     ADD_PROPERTY(bool, is_root);
   public:
-    Ruleset(ParserState pstate, Selector_List_Obj s = {}, Block_Obj b = {});
+    StyleRule(SourceSpan pstate, SelectorListObj s = {}, Block_Obj b = {});
     bool is_invisible() const override;
-    ATTACH_AST_OPERATIONS(Ruleset)
+    ATTACH_AST_OPERATIONS(StyleRule)
     ATTACH_CRTP_PERFORM_METHODS()
   };
 
@@ -450,7 +545,7 @@ namespace Sass {
     ADD_PROPERTY(Statement_Obj, node)
     ADD_PROPERTY(bool, group_end)
   public:
-    Bubble(ParserState pstate, Statement_Obj n, Statement_Obj g = {}, size_t t = 0);
+    Bubble(SourceSpan pstate, Statement_Obj n, Statement_Obj g = {}, size_t t = 0);
     bool bubbles() override;
     ATTACH_AST_OPERATIONS(Bubble)
     ATTACH_CRTP_PERFORM_METHODS()
@@ -459,54 +554,41 @@ namespace Sass {
   /////////////////
   // Trace.
   /////////////////
-  class Trace final : public Has_Block {
+  class Trace final : public ParentStatement {
     ADD_CONSTREF(char, type)
-    ADD_CONSTREF(std::string, name)
+    ADD_CONSTREF(sass::string, name)
   public:
-    Trace(ParserState pstate, std::string n, Block_Obj b = {}, char type = 'm');
+    Trace(SourceSpan pstate, sass::string n, Block_Obj b = {}, char type = 'm');
     ATTACH_AST_OPERATIONS(Trace)
     ATTACH_CRTP_PERFORM_METHODS()
   };
 
-  /////////////////
-  // Media queries.
-  /////////////////
-  class Media_Block final : public Has_Block {
-    ADD_PROPERTY(List_Obj, media_queries)
-  public:
-    Media_Block(ParserState pstate, List_Obj mqs, Block_Obj b);
-    bool bubbles() override;
-    bool is_invisible() const override;
-    ATTACH_AST_OPERATIONS(Media_Block)
-    ATTACH_CRTP_PERFORM_METHODS()
-  };
-
   ///////////////////////////////////////////////////////////////////////
   // At-rules -- arbitrary directives beginning with "@" that may have an
   // optional statement block.
   ///////////////////////////////////////////////////////////////////////
-  class Directive final : public Has_Block {
-    ADD_CONSTREF(std::string, keyword)
-    ADD_PROPERTY(Selector_List_Obj, selector)
-    ADD_PROPERTY(Expression_Obj, value)
+  class AtRule final : public ParentStatement {
+    ADD_CONSTREF(sass::string, keyword)
+    ADD_PROPERTY(SelectorListObj, selector)
+    ADD_PROPERTY(ExpressionObj, value)
   public:
-    Directive(ParserState pstate, std::string kwd, Selector_List_Obj sel = {}, Block_Obj b = {}, Expression_Obj val = {});
+    AtRule(SourceSpan pstate, sass::string kwd, SelectorListObj sel = {}, Block_Obj b = {}, ExpressionObj val = {});
     bool bubbles() override;
     bool is_media();
     bool is_keyframes();
-    ATTACH_AST_OPERATIONS(Directive)
+    ATTACH_AST_OPERATIONS(AtRule)
     ATTACH_CRTP_PERFORM_METHODS()
   };
 
   ///////////////////////////////////////////////////////////////////////
   // Keyframe-rules -- the child blocks of "@keyframes" nodes.
   ///////////////////////////////////////////////////////////////////////
-  class Keyframe_Rule final : public Has_Block {
+  class Keyframe_Rule final : public ParentStatement {
     // according to css spec, this should be <keyframes-name>
     // <keyframes-name> = <custom-ident> | <string>
-    ADD_PROPERTY(Selector_List_Obj, name)
+    ADD_PROPERTY(SelectorListObj, name)
   public:
-    Keyframe_Rule(ParserState pstate, Block_Obj b);
+    Keyframe_Rule(SourceSpan pstate, Block_Obj b);
     ATTACH_AST_OPERATIONS(Keyframe_Rule)
     ATTACH_CRTP_PERFORM_METHODS()
   };
@@ -514,14 +596,14 @@ namespace Sass {
   ////////////////////////////////////////////////////////////////////////
   // Declarations -- style rules consisting of a property name and values.
   ////////////////////////////////////////////////////////////////////////
-  class Declaration final : public Has_Block {
+  class Declaration final : public ParentStatement {
     ADD_PROPERTY(String_Obj, property)
-    ADD_PROPERTY(Expression_Obj, value)
+    ADD_PROPERTY(ExpressionObj, value)
     ADD_PROPERTY(bool, is_important)
     ADD_PROPERTY(bool, is_custom_property)
     ADD_PROPERTY(bool, is_indented)
   public:
-    Declaration(ParserState pstate, String_Obj prop, Expression_Obj val, bool i = false, bool c = false, Block_Obj b = {});
+    Declaration(SourceSpan pstate, String_Obj prop, ExpressionObj val, bool i = false, bool c = false, Block_Obj b = {});
     bool is_invisible() const override;
     ATTACH_AST_OPERATIONS(Declaration)
     ATTACH_CRTP_PERFORM_METHODS()
@@ -531,12 +613,12 @@ namespace Sass {
   // Assignments -- variable and value.
   /////////////////////////////////////
   class Assignment final : public Statement {
-    ADD_CONSTREF(std::string, variable)
-    ADD_PROPERTY(Expression_Obj, value)
+    ADD_CONSTREF(sass::string, variable)
+    ADD_PROPERTY(ExpressionObj, value)
     ADD_PROPERTY(bool, is_default)
     ADD_PROPERTY(bool, is_global)
   public:
-    Assignment(ParserState pstate, std::string var, Expression_Obj val, bool is_default = false, bool is_global = false);
+    Assignment(SourceSpan pstate, sass::string var, ExpressionObj val, bool is_default = false, bool is_global = false);
     ATTACH_AST_OPERATIONS(Assignment)
     ATTACH_CRTP_PERFORM_METHODS()
   };
@@ -546,13 +628,13 @@ namespace Sass {
   // necessary to store a list of each in an Import node.
   ////////////////////////////////////////////////////////////////////////////
   class Import final : public Statement {
-    std::vector<Expression_Obj> urls_;
-    std::vector<Include>        incs_;
+    sass::vector<ExpressionObj> urls_;
+    sass::vector<Include>        incs_;
     ADD_PROPERTY(List_Obj,      import_queries);
   public:
-    Import(ParserState pstate);
-    std::vector<Include>& incs();
-    std::vector<Expression_Obj>& urls();
+    Import(SourceSpan pstate);
+    sass::vector<Include>& incs();
+    sass::vector<ExpressionObj>& urls();
     ATTACH_AST_OPERATIONS(Import)
     ATTACH_CRTP_PERFORM_METHODS()
   };
@@ -562,10 +644,10 @@ namespace Sass {
   class Import_Stub final : public Statement {
     Include resource_;
   public:
-    Import_Stub(ParserState pstate, Include res);
+    Import_Stub(SourceSpan pstate, Include res);
     Include resource();
-    std::string imp_path();
-    std::string abs_path();
+    sass::string imp_path();
+    sass::string abs_path();
     ATTACH_AST_OPERATIONS(Import_Stub)
     ATTACH_CRTP_PERFORM_METHODS()
   };
@@ -573,33 +655,33 @@ namespace Sass {
   //////////////////////////////
   // The Sass `@warn` directive.
   //////////////////////////////
-  class Warning final : public Statement {
-    ADD_PROPERTY(Expression_Obj, message)
+  class WarningRule final : public Statement {
+    ADD_PROPERTY(ExpressionObj, message)
   public:
-    Warning(ParserState pstate, Expression_Obj msg);
-    ATTACH_AST_OPERATIONS(Warning)
+    WarningRule(SourceSpan pstate, ExpressionObj msg);
+    ATTACH_AST_OPERATIONS(WarningRule)
     ATTACH_CRTP_PERFORM_METHODS()
   };
 
   ///////////////////////////////
   // The Sass `@error` directive.
   ///////////////////////////////
-  class Error final : public Statement {
-    ADD_PROPERTY(Expression_Obj, message)
+  class ErrorRule final : public Statement {
+    ADD_PROPERTY(ExpressionObj, message)
   public:
-    Error(ParserState pstate, Expression_Obj msg);
-    ATTACH_AST_OPERATIONS(Error)
+    ErrorRule(SourceSpan pstate, ExpressionObj msg);
+    ATTACH_AST_OPERATIONS(ErrorRule)
     ATTACH_CRTP_PERFORM_METHODS()
   };
 
   ///////////////////////////////
   // The Sass `@debug` directive.
   ///////////////////////////////
-  class Debug final : public Statement {
-    ADD_PROPERTY(Expression_Obj, value)
+  class DebugRule final : public Statement {
+    ADD_PROPERTY(ExpressionObj, value)
   public:
-    Debug(ParserState pstate, Expression_Obj val);
-    ATTACH_AST_OPERATIONS(Debug)
+    DebugRule(SourceSpan pstate, ExpressionObj val);
+    ATTACH_AST_OPERATIONS(DebugRule)
     ATTACH_CRTP_PERFORM_METHODS()
   };
 
@@ -610,7 +692,7 @@ namespace Sass {
     ADD_PROPERTY(String_Obj, text)
     ADD_PROPERTY(bool, is_important)
   public:
-    Comment(ParserState pstate, String_Obj txt, bool is_important);
+    Comment(SourceSpan pstate, String_Obj txt, bool is_important);
     virtual bool is_invisible() const override;
     ATTACH_AST_OPERATIONS(Comment)
     ATTACH_CRTP_PERFORM_METHODS()
@@ -619,11 +701,11 @@ namespace Sass {
   ////////////////////////////////////
   // The Sass `@if` control directive.
   ////////////////////////////////////
-  class If final : public Has_Block {
-    ADD_PROPERTY(Expression_Obj, predicate)
+  class If final : public ParentStatement {
+    ADD_PROPERTY(ExpressionObj, predicate)
     ADD_PROPERTY(Block_Obj, alternative)
   public:
-    If(ParserState pstate, Expression_Obj pred, Block_Obj con, Block_Obj alt = {});
+    If(SourceSpan pstate, ExpressionObj pred, Block_Obj con, Block_Obj alt = {});
     virtual bool has_content() override;
     ATTACH_AST_OPERATIONS(If)
     ATTACH_CRTP_PERFORM_METHODS()
@@ -632,37 +714,37 @@ namespace Sass {
   /////////////////////////////////////
   // The Sass `@for` control directive.
   /////////////////////////////////////
-  class For final : public Has_Block {
-    ADD_CONSTREF(std::string, variable)
-    ADD_PROPERTY(Expression_Obj, lower_bound)
-    ADD_PROPERTY(Expression_Obj, upper_bound)
+  class ForRule final : public ParentStatement {
+    ADD_CONSTREF(sass::string, variable)
+    ADD_PROPERTY(ExpressionObj, lower_bound)
+    ADD_PROPERTY(ExpressionObj, upper_bound)
     ADD_PROPERTY(bool, is_inclusive)
   public:
-    For(ParserState pstate, std::string var, Expression_Obj lo, Expression_Obj hi, Block_Obj b, bool inc);
-    ATTACH_AST_OPERATIONS(For)
+    ForRule(SourceSpan pstate, sass::string var, ExpressionObj lo, ExpressionObj hi, Block_Obj b, bool inc);
+    ATTACH_AST_OPERATIONS(ForRule)
     ATTACH_CRTP_PERFORM_METHODS()
   };
 
   //////////////////////////////////////
   // The Sass `@each` control directive.
   //////////////////////////////////////
-  class Each final : public Has_Block {
-    ADD_PROPERTY(std::vector<std::string>, variables)
-    ADD_PROPERTY(Expression_Obj, list)
+  class EachRule final : public ParentStatement {
+    ADD_PROPERTY(sass::vector<sass::string>, variables)
+    ADD_PROPERTY(ExpressionObj, list)
   public:
-    Each(ParserState pstate, std::vector<std::string> vars, Expression_Obj lst, Block_Obj b);
-    ATTACH_AST_OPERATIONS(Each)
+    EachRule(SourceSpan pstate, sass::vector<sass::string> vars, ExpressionObj lst, Block_Obj b);
+    ATTACH_AST_OPERATIONS(EachRule)
     ATTACH_CRTP_PERFORM_METHODS()
   };
 
   ///////////////////////////////////////
   // The Sass `@while` control directive.
   ///////////////////////////////////////
-  class While final : public Has_Block {
-    ADD_PROPERTY(Expression_Obj, predicate)
+  class WhileRule final : public ParentStatement {
+    ADD_PROPERTY(ExpressionObj, predicate)
   public:
-    While(ParserState pstate, Expression_Obj pred, Block_Obj b);
-    ATTACH_AST_OPERATIONS(While)
+    WhileRule(SourceSpan pstate, ExpressionObj pred, Block_Obj b);
+    ATTACH_AST_OPERATIONS(WhileRule)
     ATTACH_CRTP_PERFORM_METHODS()
   };
 
@@ -670,32 +752,21 @@ namespace Sass {
   // The @return directive for use inside SassScript functions.
   /////////////////////////////////////////////////////////////
   class Return final : public Statement {
-    ADD_PROPERTY(Expression_Obj, value)
+    ADD_PROPERTY(ExpressionObj, value)
   public:
-    Return(ParserState pstate, Expression_Obj val);
+    Return(SourceSpan pstate, ExpressionObj val);
     ATTACH_AST_OPERATIONS(Return)
     ATTACH_CRTP_PERFORM_METHODS()
   };
 
-  ////////////////////////////////
-  // The Sass `@extend` directive.
-  ////////////////////////////////
-  class Extension final : public Statement {
-    ADD_PROPERTY(Selector_List_Obj, selector)
-  public:
-    Extension(ParserState pstate, Selector_List_Obj s);
-    ATTACH_AST_OPERATIONS(Extension)
-    ATTACH_CRTP_PERFORM_METHODS()
-  };
-
   /////////////////////////////////////////////////////////////////////////////
   // Definitions for both mixins and functions. The two cases are distinguished
   // by a type tag.
   /////////////////////////////////////////////////////////////////////////////
-  class Definition final : public Has_Block {
+  class Definition final : public ParentStatement {
   public:
     enum Type { MIXIN, FUNCTION };
-    ADD_CONSTREF(std::string, name)
+    ADD_CONSTREF(sass::string, name)
     ADD_PROPERTY(Parameters_Obj, parameters)
     ADD_PROPERTY(Env*, environment)
     ADD_PROPERTY(Type, type)
@@ -705,20 +776,20 @@ namespace Sass {
     ADD_PROPERTY(bool, is_overload_stub)
     ADD_PROPERTY(Signature, signature)
   public:
-    Definition(ParserState pstate,
-               std::string n,
+    Definition(SourceSpan pstate,
+               sass::string n,
                Parameters_Obj params,
                Block_Obj b,
                Type t);
-    Definition(ParserState pstate,
+    Definition(SourceSpan pstate,
                Signature sig,
-               std::string n,
+               sass::string n,
                Parameters_Obj params,
                Native_Function func_ptr,
                bool overload_stub = false);
-    Definition(ParserState pstate,
+    Definition(SourceSpan pstate,
                Signature sig,
-               std::string n,
+               sass::string n,
                Parameters_Obj params,
                Sass_Function_Entry c_func);
     ATTACH_AST_OPERATIONS(Definition)
@@ -728,12 +799,12 @@ namespace Sass {
   //////////////////////////////////////
   // Mixin calls (i.e., `@include ...`).
   //////////////////////////////////////
-  class Mixin_Call final : public Has_Block {
-    ADD_CONSTREF(std::string, name)
+  class Mixin_Call final : public ParentStatement {
+    ADD_CONSTREF(sass::string, name)
     ADD_PROPERTY(Arguments_Obj, arguments)
     ADD_PROPERTY(Parameters_Obj, block_parameters)
   public:
-    Mixin_Call(ParserState pstate, std::string n, Arguments_Obj args, Parameters_Obj b_params = {}, Block_Obj b = {});
+    Mixin_Call(SourceSpan pstate, sass::string n, Arguments_Obj args, Parameters_Obj b_params = {}, Block_Obj b = {});
     ATTACH_AST_OPERATIONS(Mixin_Call)
     ATTACH_CRTP_PERFORM_METHODS()
   };
@@ -744,7 +815,7 @@ namespace Sass {
   class Content final : public Statement {
     ADD_PROPERTY(Arguments_Obj, arguments)
   public:
-    Content(ParserState pstate, Arguments_Obj args);
+    Content(SourceSpan pstate, Arguments_Obj args);
     ATTACH_AST_OPERATIONS(Content)
     ATTACH_CRTP_PERFORM_METHODS()
   };
@@ -757,11 +828,11 @@ namespace Sass {
     enum Type { PLUS, MINUS, NOT, SLASH };
   private:
     HASH_PROPERTY(Type, optype)
-    HASH_PROPERTY(Expression_Obj, operand)
+    HASH_PROPERTY(ExpressionObj, operand)
     mutable size_t hash_;
   public:
-    Unary_Expression(ParserState pstate, Type t, Expression_Obj o);
-    const std::string type_name();
+    Unary_Expression(SourceSpan pstate, Type t, ExpressionObj o);
+    const sass::string type_name();
     virtual bool operator==(const Expression& rhs) const override;
     size_t hash() const override;
     ATTACH_AST_OPERATIONS(Unary_Expression)
@@ -772,13 +843,13 @@ namespace Sass {
   // Individual argument objects for mixin and function calls.
   ////////////////////////////////////////////////////////////
   class Argument final : public Expression {
-    HASH_PROPERTY(Expression_Obj, value)
-    HASH_CONSTREF(std::string, name)
+    HASH_PROPERTY(ExpressionObj, value)
+    HASH_CONSTREF(sass::string, name)
     ADD_PROPERTY(bool, is_rest_argument)
     ADD_PROPERTY(bool, is_keyword_argument)
     mutable size_t hash_;
   public:
-    Argument(ParserState pstate, Expression_Obj val, std::string n = "", bool rest = false, bool keyword = false);
+    Argument(SourceSpan pstate, ExpressionObj val, sass::string n = "", bool rest = false, bool keyword = false);
     void set_delayed(bool delayed) override;
     bool operator==(const Expression& rhs) const override;
     size_t hash() const override;
@@ -798,7 +869,7 @@ namespace Sass {
   protected:
     void adjust_after_pushing(Argument_Obj a) override;
   public:
-    Arguments(ParserState pstate);
+    Arguments(SourceSpan pstate);
     void set_delayed(bool delayed) override;
     Argument_Obj get_rest_argument();
     Argument_Obj get_keyword_argument();
@@ -806,29 +877,117 @@ namespace Sass {
     ATTACH_CRTP_PERFORM_METHODS()
   };
 
-  /////////////////
-  // Media queries.
-  /////////////////
+
+  // A Media StyleRule before it has been evaluated
+  // Could be already final or an interpolation
+  class MediaRule final : public ParentStatement {
+    ADD_PROPERTY(List_Obj, schema)
+  public:
+    MediaRule(SourceSpan pstate, Block_Obj block = {});
+
+    bool bubbles() override { return true; };
+    bool is_invisible() const override { return false; };
+    ATTACH_AST_OPERATIONS(MediaRule)
+    ATTACH_CRTP_PERFORM_METHODS()
+  };
+
+  // A Media StyleRule after it has been evaluated
+  // Representing the static or resulting css
+  class CssMediaRule final : public ParentStatement,
+    public Vectorized<CssMediaQuery_Obj> {
+  public:
+    CssMediaRule(SourceSpan pstate, Block_Obj b);
+    bool bubbles() override { return true; };
+    bool isInvisible() const { return empty(); }
+    bool is_invisible() const override { return false; };
+
+  public:
+    // Hash and equality implemtation from vector
+    size_t hash() const override { return Vectorized::hash(); }
+    // Check if two instances are considered equal
+    bool operator== (const CssMediaRule& rhs) const {
+      return Vectorized::operator== (rhs);
+    }
+    bool operator!=(const CssMediaRule& rhs) const {
+      // Invert from equality
+      return !(*this == rhs);
+    }
+
+    ATTACH_AST_OPERATIONS(CssMediaRule)
+    ATTACH_CRTP_PERFORM_METHODS()
+  };
+
+  // Media Queries after they have been evaluated
+  // Representing the static or resulting css
+  class CssMediaQuery final : public AST_Node {
+
+    // The modifier, probably either "not" or "only".
+    // This may be `null` if no modifier is in use.
+    ADD_PROPERTY(sass::string, modifier);
+
+    // The media type, for example "screen" or "print".
+    // This may be `null`. If so, [features] will not be empty.
+    ADD_PROPERTY(sass::string, type);
+
+    // Feature queries, including parentheses.
+    ADD_PROPERTY(sass::vector<sass::string>, features);
+
+  public:
+    CssMediaQuery(SourceSpan pstate);
+
+    // Check if two instances are considered equal
+    bool operator== (const CssMediaQuery& rhs) const;
+    bool operator!=(const CssMediaQuery& rhs) const {
+      // Invert from equality
+      return !(*this == rhs);
+    }
+
+    // Returns true if this query is empty
+    // Meaning it has no type and features
+    bool empty() const {
+      return type_.empty()
+        && modifier_.empty()
+        && features_.empty();
+    }
+
+    // Whether this media query matches all media types.
+    bool matchesAllTypes() const {
+      return type_.empty() || Util::equalsLiteral("all", type_);
+    }
+
+    // Merges this with [other] and adds a query that matches the intersection
+    // of both inputs to [result]. Returns false if the result is unrepresentable
+    CssMediaQuery_Obj merge(CssMediaQuery_Obj& other);
+
+    ATTACH_AST_OPERATIONS(CssMediaQuery)
+    ATTACH_CRTP_PERFORM_METHODS()
+  };
+
+  ////////////////////////////////////////////////////
+  // Media queries (replaced by MediaRule at al).
+  // ToDo: only used for interpolation case
+  ////////////////////////////////////////////////////
   class Media_Query final : public Expression,
-                            public Vectorized<Media_Query_Expression_Obj> {
+                            public Vectorized<Media_Query_ExpressionObj> {
     ADD_PROPERTY(String_Obj, media_type)
     ADD_PROPERTY(bool, is_negated)
     ADD_PROPERTY(bool, is_restricted)
   public:
-    Media_Query(ParserState pstate, String_Obj t = {}, size_t s = 0, bool n = false, bool r = false);
+    Media_Query(SourceSpan pstate, String_Obj t = {}, size_t s = 0, bool n = false, bool r = false);
     ATTACH_AST_OPERATIONS(Media_Query)
     ATTACH_CRTP_PERFORM_METHODS()
   };
 
   ////////////////////////////////////////////////////
   // Media expressions (for use inside media queries).
+  // ToDo: only used for interpolation case
   ////////////////////////////////////////////////////
   class Media_Query_Expression final : public Expression {
-    ADD_PROPERTY(Expression_Obj, feature)
-    ADD_PROPERTY(Expression_Obj, value)
+    ADD_PROPERTY(ExpressionObj, feature)
+    ADD_PROPERTY(ExpressionObj, value)
     ADD_PROPERTY(bool, is_interpolated)
   public:
-    Media_Query_Expression(ParserState pstate, Expression_Obj f, Expression_Obj v, bool i = false);
+    Media_Query_Expression(SourceSpan pstate, ExpressionObj f, ExpressionObj v, bool i = false);
     ATTACH_AST_OPERATIONS(Media_Query_Expression)
     ATTACH_CRTP_PERFORM_METHODS()
   };
@@ -838,11 +997,11 @@ namespace Sass {
   /////////////////////////////////////////////////
   class At_Root_Query final : public Expression {
   private:
-    ADD_PROPERTY(Expression_Obj, feature)
-    ADD_PROPERTY(Expression_Obj, value)
+    ADD_PROPERTY(ExpressionObj, feature)
+    ADD_PROPERTY(ExpressionObj, value)
   public:
-    At_Root_Query(ParserState pstate, Expression_Obj f = {}, Expression_Obj v = {}, bool i = false);
-    bool exclude(std::string str);
+    At_Root_Query(SourceSpan pstate, ExpressionObj f = {}, ExpressionObj v = {}, bool i = false);
+    bool exclude(sass::string str);
     ATTACH_AST_OPERATIONS(At_Root_Query)
     ATTACH_CRTP_PERFORM_METHODS()
   };
@@ -850,13 +1009,13 @@ namespace Sass {
   ///////////
   // At-root.
   ///////////
-  class At_Root_Block final : public Has_Block {
+  class AtRootRule final : public ParentStatement {
     ADD_PROPERTY(At_Root_Query_Obj, expression)
   public:
-    At_Root_Block(ParserState pstate, Block_Obj b = {}, At_Root_Query_Obj e = {});
+    AtRootRule(SourceSpan pstate, Block_Obj b = {}, At_Root_Query_Obj e = {});
     bool bubbles() override;
     bool exclude_node(Statement_Obj s);
-    ATTACH_AST_OPERATIONS(At_Root_Block)
+    ATTACH_AST_OPERATIONS(AtRootRule)
     ATTACH_CRTP_PERFORM_METHODS()
   };
 
@@ -864,11 +1023,11 @@ namespace Sass {
   // Individual parameter objects for mixins and functions.
   /////////////////////////////////////////////////////////
   class Parameter final : public AST_Node {
-    ADD_CONSTREF(std::string, name)
-    ADD_PROPERTY(Expression_Obj, default_value)
+    ADD_CONSTREF(sass::string, name)
+    ADD_PROPERTY(ExpressionObj, default_value)
     ADD_PROPERTY(bool, is_rest_parameter)
   public:
-    Parameter(ParserState pstate, std::string n, Expression_Obj def = {}, bool rest = false);
+    Parameter(SourceSpan pstate, sass::string n, ExpressionObj def = {}, bool rest = false);
     ATTACH_AST_OPERATIONS(Parameter)
     ATTACH_CRTP_PERFORM_METHODS()
   };
@@ -884,7 +1043,7 @@ namespace Sass {
   protected:
     void adjust_after_pushing(Parameter_Obj p) override;
   public:
-    Parameters(ParserState pstate);
+    Parameters(SourceSpan pstate);
     ATTACH_AST_OPERATIONS(Parameters)
     ATTACH_CRTP_PERFORM_METHODS()
   };