Refactor supports/feature query parsing [WIP]

sass · May 30, 2015 · c82290e · c82290e
1 parent 9dbf151
commit c82290e
Show file tree

Hide file tree

Showing 24 changed files with 161 additions and 141 deletions.
diff --git a/ast.hpp b/ast.hpp
@@ -260,7 +260,7 @@ namespace Sass {
       RULESET,
       MEDIA,
       DIRECTIVE,
-      FEATURE,
+      SUPPORTS,
       ATROOT,
       BUBBLE,
       KEYFRAMERULE
@@ -388,16 +388,15 @@ namespace Sass {
     ATTACH_OPERATIONS();
   };
 
-  ///////////////////
-  // Feature queries.
-  ///////////////////
-  class Feature_Block : public Has_Block {
-    ADD_PROPERTY(Feature_Query*, feature_queries);
-    ADD_PROPERTY(Selector*, selector);
+  //////////////////
+  // Query features.
+  //////////////////
+  class Supports_Block : public Has_Block {
+    ADD_PROPERTY(Supports_Query*, queries);
   public:
-    Feature_Block(ParserState pstate, Feature_Query* fqs, Block* b)
-    : Has_Block(pstate, b), feature_queries_(fqs), selector_(0)
-    { statement_type(FEATURE); }
+    Supports_Block(ParserState pstate, Supports_Query* queries = 0, Block* block = 0)
+    : Has_Block(pstate, block), queries_(queries)
+    { statement_type(SUPPORTS); }
     bool is_hoistable() { return true; }
     bool bubbles() { return true; }
     ATTACH_OPERATIONS();
@@ -1458,18 +1457,18 @@ namespace Sass {
   ///////////////////
   // Feature queries.
   ///////////////////
-  class Feature_Query : public Expression, public Vectorized<Feature_Query_Condition*> {
+  class Supports_Query : public Expression, public Vectorized<Supports_Condition*> {
   public:
-    Feature_Query(ParserState pstate, size_t s = 0)
-    : Expression(pstate), Vectorized<Feature_Query_Condition*>(s)
+    Supports_Query(ParserState pstate, size_t s = 0)
+    : Expression(pstate), Vectorized<Supports_Condition*>(s)
     { }
     ATTACH_OPERATIONS();
   };
 
   ////////////////////////////////////////////////////////
   // Feature expressions (for use inside feature queries).
   ////////////////////////////////////////////////////////
-  class Feature_Query_Condition : public Expression, public Vectorized<Feature_Query_Condition*> {
+  class Supports_Condition : public Expression, public Vectorized<Supports_Condition*> {
   public:
     enum Operand { NONE, AND, OR, NOT };
   private:
@@ -1478,9 +1477,9 @@ namespace Sass {
     ADD_PROPERTY(Operand, operand);
     ADD_PROPERTY(bool, is_root);
   public:
-    Feature_Query_Condition(ParserState pstate, size_t s = 0, String* f = 0,
+    Supports_Condition(ParserState pstate, size_t s = 0, String* f = 0,
                             Expression* v = 0, Operand o = NONE, bool r = false)
-    : Expression(pstate), Vectorized<Feature_Query_Condition*>(s),
+    : Expression(pstate), Vectorized<Supports_Condition*>(s),
       feature_(f), value_(v), operand_(o), is_root_(r)
     { }
     ATTACH_OPERATIONS();
@@ -1553,7 +1552,7 @@ namespace Sass {
       {
         return expression()->exclude("rule");
       }
-      if (s->statement_type() == Statement::FEATURE)
+      if (s->statement_type() == Statement::SUPPORTS)
       {
         return expression()->exclude("supports");
       }

diff --git a/ast_factory.hpp b/ast_factory.hpp
@@ -15,7 +15,7 @@ namespace Sass {
     Block* new_Block(string p, size_t l, size_t s = 0, bool r = false);
     Ruleset* new_Ruleset(string p, size_t l, Selector* s, Block* b);
     Propset* new_Propset(string p, size_t l, String* pf, Block* b);
-    Feature_Query* new_Feature_Query(string p, size_t l, Feature_Query* f, Block* b);
+    Supports_Query* new_Feature_Query(string p, size_t l, Supports_Query* f, Block* b);
     Media_Query* new_Media_Query(string p, size_t l, List* q, Block* b);
     At_Root_Block* new_At_Root_Block(string p, size_t l, Selector* sel, Block* b);
     At_Rule* new_At_Rule(string p, size_t l, string kwd, Selector* sel, Block* b);
@@ -67,7 +67,7 @@ namespace Sass {
     String_Constant* new_String_Constant(string p, size_t l, string val);
     String_Constant* new_String_Constant(string p, size_t l, const char* beg);
     String_Constant* new_String_Constant(string p, size_t l, const char* beg, const char* end);
-    Feature_Query_Condition* new_Feature_Query_Condition(string p, size_t l, String* f, Expression* v);
+    Supports_Condition* new_Feature_Query_Condition(string p, size_t l, String* f, Expression* v);
     Media_Expression* new_Media_Expression(string p, size_t l, String* f, Expression* v);
     Parent_Selector* new_Parent_Selector(string p, size_t l, Selector* s);
     // parameters and arguments

diff --git a/ast_fwd_decl.hpp b/ast_fwd_decl.hpp
@@ -16,7 +16,7 @@ namespace Sass {
   class Propset;
   class Bubble;
   class Media_Block;
-  class Feature_Block;
+  class Supports_Block;
   class At_Rule;
   class Keyframe_Rule;
   class At_Root_Block;
@@ -56,8 +56,8 @@ namespace Sass {
   class String_Quoted;
   class Media_Query;
   class Media_Query_Expression;
-  class Feature_Query;
-  class Feature_Query_Condition;
+  class Supports_Query;
+  class Supports_Condition;
   class At_Root_Expression;
   class Null;
   class Parent_Selector;

diff --git a/cssize.cpp b/cssize.cpp
@@ -161,7 +161,7 @@ namespace Sass {
     return debubble(mm->block(), mm)->block();
   }
 
-  Statement* Cssize::operator()(Feature_Block* m)
+  Statement* Cssize::operator()(Supports_Block* m)
   {
     if (!m->block()->length())
     { return m; }
@@ -171,8 +171,8 @@ namespace Sass {
 
     p_stack.push_back(m);
 
-    Feature_Block* mm = new (ctx.mem) Feature_Block(m->pstate(),
-                                                    m->feature_queries(),
+    Supports_Block* mm = new (ctx.mem) Supports_Block(m->pstate(),
+                                                    m->queries(),
                                                     m->block()->perform(this)->block());
     mm->tabs(m->tabs());
 
@@ -253,7 +253,7 @@ namespace Sass {
     return bubble;
   }
 
-  Statement* Cssize::bubble(Feature_Block* m)
+  Statement* Cssize::bubble(Supports_Block* m)
   {
     Ruleset* parent = static_cast<Ruleset*>(shallow_copy(this->parent()));
 
@@ -269,8 +269,8 @@ namespace Sass {
 
     Block* wrapper_block = new (ctx.mem) Block(m->block()->pstate());
     *wrapper_block << new_rule;
-    Feature_Block* mm = new (ctx.mem) Feature_Block(m->pstate(),
-                                                    m->feature_queries(),
+    Supports_Block* mm = new (ctx.mem) Supports_Block(m->pstate(),
+                                                    m->queries(),
                                                     wrapper_block);
 
     mm->tabs(m->tabs());
@@ -365,8 +365,8 @@ namespace Sass {
         return new (ctx.mem) Bubble(*static_cast<Bubble*>(s));
       case Statement::DIRECTIVE:
         return new (ctx.mem) At_Rule(*static_cast<At_Rule*>(s));
-      case Statement::FEATURE:
-        return new (ctx.mem) Feature_Block(*static_cast<Feature_Block*>(s));
+      case Statement::SUPPORTS:
+        return new (ctx.mem) Supports_Block(*static_cast<Supports_Block*>(s));
       case Statement::ATROOT:
         return new (ctx.mem) At_Root_Block(*static_cast<At_Root_Block*>(s));
       case Statement::KEYFRAMERULE:

diff --git a/cssize.hpp b/cssize.hpp
@@ -36,7 +36,7 @@ namespace Sass {
     // Statement* operator()(Propset*);
     // Statement* operator()(Bubble*);
     Statement* operator()(Media_Block*);
-    Statement* operator()(Feature_Block*);
+    Statement* operator()(Supports_Block*);
     Statement* operator()(At_Root_Block*);
     Statement* operator()(At_Rule*);
     Statement* operator()(Keyframe_Rule*);
@@ -63,7 +63,7 @@ namespace Sass {
     Statement* bubble(At_Rule*);
     Statement* bubble(At_Root_Block*);
     Statement* bubble(Media_Block*);
-    Statement* bubble(Feature_Block*);
+    Statement* bubble(Supports_Block*);
     Statement* shallow_copy(Statement*);
     Statement* debubble(Block* children, Statement* parent = 0);
     Statement* flatten(Statement*);

diff --git a/debugger.hpp b/debugger.hpp
@@ -212,9 +212,9 @@ inline void debug_ast(AST_Node* node, string ind = "", Env* env = 0)
     debug_ast(block->media_queries(), ind + " =@ ");
     debug_ast(block->selector(), ind + " -@ ");
     if (block->block()) for(auto i : block->block()->elements()) { debug_ast(i, ind + " ", env); }
-  } else if (dynamic_cast<Feature_Block*>(node)) {
-    Feature_Block* block = dynamic_cast<Feature_Block*>(node);
-    cerr << ind << "Feature_Block " << block;
+  } else if (dynamic_cast<Supports_Block*>(node)) {
+    Supports_Block* block = dynamic_cast<Supports_Block*>(node);
+    cerr << ind << "Supports_Block " << block;
     cerr << " (" << pstate_source_position(node) << ")";
     cerr << " " << block->tabs() << endl;
     if (block->block()) for(auto i : block->block()->elements()) { debug_ast(i, ind + " ", env); }

diff --git a/eval.cpp b/eval.cpp
@@ -957,29 +957,29 @@ string qwe = sel ? sel->perform(&to_string) : "";
     return s;
   }
 
-  Expression* Eval::operator()(Feature_Query* q)
+  Expression* Eval::operator()(Supports_Query* q)
   {
-    Feature_Query* qq = new (ctx.mem) Feature_Query(q->pstate(),
+    Supports_Query* qq = new (ctx.mem) Supports_Query(q->pstate(),
                                                     q->length());
     for (size_t i = 0, L = q->length(); i < L; ++i) {
-      *qq << static_cast<Feature_Query_Condition*>((*q)[i]->perform(this));
+      *qq << static_cast<Supports_Condition*>((*q)[i]->perform(this));
     }
     return qq;
   }
 
-  Expression* Eval::operator()(Feature_Query_Condition* c)
+  Expression* Eval::operator()(Supports_Condition* c)
   {
     String* feature = c->feature();
     Expression* value = c->value();
     value = (value ? value->perform(this) : 0);
-    Feature_Query_Condition* cc = new (ctx.mem) Feature_Query_Condition(c->pstate(),
+    Supports_Condition* cc = new (ctx.mem) Supports_Condition(c->pstate(),
                                                  c->length(),
                                                  feature,
                                                  value,
                                                  c->operand(),
                                                  c->is_root());
     for (size_t i = 0, L = c->length(); i < L; ++i) {
-      *cc << static_cast<Feature_Query_Condition*>((*c)[i]->perform(this));
+      *cc << static_cast<Supports_Condition*>((*c)[i]->perform(this));
     }
     return cc;
   }

diff --git a/eval.hpp b/eval.hpp
@@ -60,8 +60,8 @@ namespace Sass {
     Expression* operator()(Media_Query*);
     Expression* operator()(Media_Query_Expression*);
     Expression* operator()(At_Root_Expression*);
-    Expression* operator()(Feature_Query*);
-    Expression* operator()(Feature_Query_Condition*);
+    Expression* operator()(Supports_Query*);
+    Expression* operator()(Supports_Condition*);
     Expression* operator()(Null*);
     Expression* operator()(Argument*);
     Expression* operator()(Arguments*);

diff --git a/expand.cpp b/expand.cpp
@@ -191,13 +191,13 @@ namespace Sass {
     return 0;
   }
 
-  Statement* Expand::operator()(Feature_Block* f)
+  Statement* Expand::operator()(Supports_Block* f)
   {
-    Expression* feature_queries = f->feature_queries()->perform(&eval);
-    Feature_Block* ff = new (ctx.mem) Feature_Block(f->pstate(),
-                                                    static_cast<Feature_Query*>(feature_queries),
+    Expression* queries = f->queries()->perform(&eval);
+    Supports_Block* ff = new (ctx.mem) Supports_Block(f->pstate(),
+                                                    static_cast<Supports_Query*>(queries),
                                                     f->block()->perform(this)->block());
-    ff->selector(selector());
+    // ff->selector(selector());
     return ff;
   }
 

diff --git a/expand.hpp b/expand.hpp
@@ -62,7 +62,7 @@ namespace Sass {
     Statement* operator()(Ruleset*);
     Statement* operator()(Propset*);
     Statement* operator()(Media_Block*);
-    Statement* operator()(Feature_Block*);
+    Statement* operator()(Supports_Block*);
     Statement* operator()(At_Root_Block*);
     Statement* operator()(At_Rule*);
     Statement* operator()(Declaration*);

diff --git a/extend.cpp b/extend.cpp
@@ -1988,11 +1988,11 @@ namespace Sass {
     pRuleset->block()->perform(this);
   }
 
-  void Extend::operator()(Feature_Block* pFeatureBlock)
+  void Extend::operator()(Supports_Block* pFeatureBlock)
   {
-    if (pFeatureBlock->selector()) {
-      extendObjectWithSelectorAndBlock(pFeatureBlock, ctx, subset_map);
-    }
+//    if (pFeatureBlock->selector()) {
+//      extendObjectWithSelectorAndBlock(pFeatureBlock, ctx, subset_map);
+//    }
 
     pFeatureBlock->block()->perform(this);
   }

diff --git a/extend.hpp b/extend.hpp
@@ -32,7 +32,7 @@ namespace Sass {
 
     void operator()(Block*);
     void operator()(Ruleset*);
-    void operator()(Feature_Block*);
+    void operator()(Supports_Block*);
     void operator()(Media_Block*);
     void operator()(At_Rule*);
 

diff --git a/inspect.cpp b/inspect.cpp
@@ -76,12 +76,12 @@ namespace Sass {
     media_block->block()->perform(this);
   }
 
-  void Inspect::operator()(Feature_Block* feature_block)
+  void Inspect::operator()(Supports_Block* feature_block)
   {
     append_indentation();
     append_token("@supports", feature_block);
     append_mandatory_space();
-    feature_block->feature_queries()->perform(this);
+    feature_block->queries()->perform(this);
     feature_block->block()->perform(this);
   }
 
@@ -647,7 +647,7 @@ namespace Sass {
     }
   }
 
-  void Inspect::operator()(Feature_Query* fq)
+  void Inspect::operator()(Supports_Query* fq)
   {
     size_t i = 0;
     (*fq)[i++]->perform(this);
@@ -656,17 +656,17 @@ namespace Sass {
     }
   }
 
-  void Inspect::operator()(Feature_Query_Condition* fqc)
+  void Inspect::operator()(Supports_Condition* fqc)
   {
-    if (fqc->operand() == Feature_Query_Condition::AND) {
+    if (fqc->operand() == Supports_Condition::AND) {
       append_mandatory_space();
       append_token("and", fqc);
       append_mandatory_space();
-    } else if (fqc->operand() == Feature_Query_Condition::OR) {
+    } else if (fqc->operand() == Supports_Condition::OR) {
       append_mandatory_space();
       append_token("or", fqc);
       append_mandatory_space();
-    } else if (fqc->operand() == Feature_Query_Condition::NOT) {
+    } else if (fqc->operand() == Supports_Condition::NOT) {
       append_mandatory_space();
       append_token("not", fqc);
       append_mandatory_space();

diff --git a/inspect.hpp b/inspect.hpp
@@ -28,7 +28,7 @@ namespace Sass {
     virtual void operator()(Ruleset*);
     virtual void operator()(Propset*);
     virtual void operator()(Bubble*);
-    virtual void operator()(Feature_Block*);
+    virtual void operator()(Supports_Block*);
     virtual void operator()(Media_Block*);
     virtual void operator()(At_Root_Block*);
     virtual void operator()(At_Rule*);
@@ -65,8 +65,8 @@ namespace Sass {
     virtual void operator()(String_Schema*);
     virtual void operator()(String_Constant*);
     virtual void operator()(String_Quoted*);
-    virtual void operator()(Feature_Query*);
-    virtual void operator()(Feature_Query_Condition*);
+    virtual void operator()(Supports_Query*);
+    virtual void operator()(Supports_Condition*);
     virtual void operator()(Media_Query*);
     virtual void operator()(Media_Query_Expression*);
     virtual void operator()(At_Root_Expression*);