[WIP] [DNM] Backport dart sass parser 12

Author: mgreter

src/ast.cpp

@@ -742,30 +742,6 @@ namespace Sass {
     operand_(ptr->operand_),
     hash_(ptr->hash_)
   { }
-  const std::string Unary_Expression::type_name() {
-    switch (optype_) {
-      case PLUS: return "plus";
-      case MINUS: return "minus";
-      case SLASH: return "slash";
-      case NOT: return "not";
-      default: return "invalid";
-    }
-  }
-  bool Unary_Expression::operator==(const Expression& rhs) const
-  {
-    try
-    {
-      const Unary_Expression* m = Cast<Unary_Expression>(&rhs);
-      if (m == 0) return false;
-      return type() == m->type() &&
-              *operand() == *m->operand();
-    }
-    catch (std::bad_cast&)
-    {
-      return false;
-    }
-    catch (...) { throw; }
-  }
   size_t Unary_Expression::hash() const
   {
     if (hash_ == 0) {
@@ -798,21 +774,6 @@ namespace Sass {
     is_delayed(delayed);
   }
 
-  bool Argument::operator==(const Expression& rhs) const
-  {
-    try
-    {
-      const Argument* m = Cast<Argument>(&rhs);
-      if (!(m && name() == m->name())) return false;
-      return *value() == *m->value();
-    }
-    catch (std::bad_cast&)
-    {
-      return false;
-    }
-    catch (...) { throw; }
-  }
-
   size_t Argument::hash() const
   {
     if (hash_ == 0) {

src/ast.hpp

@@ -912,8 +912,6 @@ namespace Sass {
     mutable size_t hash_;
   public:
     Unary_Expression(ParserState pstate, Type t, Expression_Obj o);
-    const std::string type_name();
-    virtual bool operator==(const Expression& rhs) const override;
     size_t hash() const override;
     ATTACH_COPY_OPERATIONS(Unary_Expression)
     ATTACH_CRTP_PERFORM_METHODS()
@@ -999,7 +997,6 @@ namespace Sass {
   public:
     Argument(ParserState pstate, Expression_Obj val, std::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;
     ATTACH_COPY_OPERATIONS(Argument)
       ATTACH_CRTP_PERFORM_METHODS()

src/ast_values.cpp

@@ -375,7 +375,6 @@ namespace Sass {
   : Value(ptr),
     Units(ptr),
     value_(ptr->value_),
-    zero_(ptr->zero_),
     lhsAsSlash_(ptr->lhsAsSlash_),
     rhsAsSlash_(ptr->rhsAsSlash_),
     hash_(ptr->hash_)

src/eval.cpp

@@ -1256,7 +1256,6 @@ namespace Sass {
     if (rv.found) value = static_cast<Expression*>(rv.it->second.ptr());
     else error("Undefined variable: \"" + v->name() + "\".", v->pstate(), traces);
     if (Argument* arg = Cast<Argument>(value)) value = arg->value();
-    if (Number* nr = Cast<Number>(value)) nr->zero(true); // force flag
     value->is_interpolant(v->is_interpolant());
     if (force) value->is_expanded(false);
     value->set_delayed(false); // verified

src/inspect.cpp

@@ -210,20 +210,10 @@ namespace Sass {
       append_mandatory_space();
       import->urls().front()->perform(this);
       if (import->urls().size() == 1) {
-        if (import->import_queries()) {
-          append_mandatory_space();
-          import->import_queries()->perform(this);
-        }
         for (auto query : import->queries()) {
           append_mandatory_space();
           query->perform(this);
         }
-          /*
-        if (import->queries()) {
-          append_mandatory_space();
-          import->import_queries()->perform(this);
-        }
-        */
       }
       append_delimiter();
       for (size_t i = 1, S = import->urls().size(); i < S; ++i) {
@@ -233,10 +223,6 @@ namespace Sass {
 
         import->urls()[i]->perform(this);
         if (import->urls().size() - 1 == i) {
-          if (import->import_queries()) {
-            append_mandatory_space();
-            import->import_queries()->perform(this);
-          }
           for (auto query : import->queries()) {
             append_mandatory_space();
             query->perform(this);
@@ -668,15 +654,6 @@ namespace Sass {
     else if (res == "") res = "0";
     else if (res == "-0") res = "0";
     else if (res == "-0.0") res = "0";
-    else if (opt.output_style == COMPRESSED)
-    {
-      if (n->zero()) {
-        // check if handling negative nr
-        size_t off = res[0] == '-' ? 1 : 0;
-        // remove leading zero from floating point in compressed mode
-        if (res[off] == '0' && res[off+1] == '.') res.erase(off, 1);
-      }
-    }
 
     // add unit now
     res += n->unit();

src/parser.cpp

@@ -56,12 +56,12 @@ namespace Sass {
   }
 
   // Like [whitespace], but returns whether any was consumed.
-  bool Parser::scanWhitespace()
-  {
-    auto start = scanner.position;
-    whitespace(); // consume spaces
-    return scanner.position != start;
-  }
+  // bool Parser::scanWhitespace()
+  // {
+  //   auto start = scanner.position;
+  //   whitespace(); // consume spaces
+  //   return scanner.position != start;
+  // }
 
   // Consumes whitespace, but not comments.
   void Parser::whitespaceWithoutComments()
@@ -651,25 +651,25 @@ namespace Sass {
   // last separating newline. Otherwise returns [position]. This helps avoid 
   // missing token errors pointing at the next closing bracket rather than
   // the line where the problem actually occurred.
-  const char* Parser::_firstNewlineBefore(const char* position)
-  {
-    const char* lastNewline = 0;
-    const char* index = position - 1;
-    while (index >= scanner.startpos) {
-      if (!isWhitespace(*index)) {
-        return lastNewline == 0 ?
-          position : lastNewline;
-      }
-      if (isNewline(*index)) {
-        lastNewline = index;
-      }
-      index -= 1;
-    }
-
-    // If the document *only* contains whitespace
-    // before [position], always return [position].
-    return position;
-  }
+  // const char* Parser::_firstNewlineBefore(const char* position)
+  // {
+  //   const char* lastNewline = 0;
+  //   const char* index = position - 1;
+  //   while (index >= scanner.startpos) {
+  //     if (!isWhitespace(*index)) {
+  //       return lastNewline == 0 ?
+  //         position : lastNewline;
+  //     }
+  //     if (isNewline(*index)) {
+  //       lastNewline = index;
+  //     }
+  //     index -= 1;
+  //   }
+  // 
+  //   // If the document *only* contains whitespace
+  //   // before [position], always return [position].
+  //   return position;
+  // }
   // EO _firstNewlineBefore
 
 }

src/parser.hpp

@@ -61,7 +61,7 @@ namespace Sass {
     virtual void whitespace();
 
     // Like [whitespace], but returns whether any was consumed.
-    bool scanWhitespace();
+    // bool scanWhitespace();
 
     // Consumes whitespace, but not comments.
     void whitespaceWithoutComments();
@@ -207,7 +207,7 @@ namespace Sass {
     // last separating newline. Otherwise returns [position]. This helps avoid 
     // missing token errors pointing at the next closing bracket rather than
     // the line where the problem actually occurred.
-    const char* _firstNewlineBefore(const char* position);
+    // const char* _firstNewlineBefore(const char* position);
 
   };