Merge pull request #2262 from mgreter/bugfix/issue-2261

Fixes equality compare evaluation issue

Author: mgreter

src/eval.cpp

@@ -606,9 +606,9 @@ namespace Sass {
 
     if ((s1 && s1->has_interpolants()) || (s2 && s2->has_interpolants()) || force_delay)
     {
-      // If possible upgrade LHS to a number
       if (op_type == Sass_OP::DIV || op_type == Sass_OP::MUL || op_type == Sass_OP::MOD || op_type == Sass_OP::ADD || op_type == Sass_OP::SUB ||
           op_type == Sass_OP::EQ) {
+        // If possible upgrade LHS to a number (for number to string compare)
         if (String_Constant_Ptr str = SASS_MEMORY_CAST(String_Constant, lhs)) {
           std::string value(str->value());
           const char* start = value.c_str();
@@ -617,10 +617,11 @@ namespace Sass {
             lhs = l->perform(this);
           }
         }
+        // If possible upgrade RHS to a number (for string to number compare)
         if (String_Constant_Ptr str = SASS_MEMORY_CAST(String_Constant, rhs)) {
           std::string value(str->value());
           const char* start = value.c_str();
-          if (Prelexer::sequence < Prelexer::number >(start) != 0) {
+          if (Prelexer::sequence < Prelexer::dimension, Prelexer::number >(start) != 0) {
             Textual_Obj r = SASS_MEMORY_NEW(Textual, b->pstate(), Textual::DIMENSION, str->value());
             rhs = r->perform(this);
           }