Merge pull request #2504 from mgreter/3.4-stable

cherry pick commits from master into 3.4 stable

Author: mgreter

GNUmakefile.am

@@ -69,7 +69,7 @@ else
 endif
 
 SASS_TESTER = $(RUBY) $(SASS_SPEC_PATH)/sass-spec.rb
-SASS_TESTER += -c $(SASS_LIBSASS_PATH)/tester$(EXEEXT)
+SASS_TESTER += -c $(top_srcdir)/tester$(EXEEXT)
 
 test:
 	$(SASS_TESTER) $(LOG_FLAGS) $(SASS_SPEC_PATH) $(SASS_TEST_FLAGS)

Makefile

@@ -299,7 +299,7 @@ install-shared: $(DESTDIR)$(PREFIX)/lib/libsass.so \
                 install-headers
 
 $(SASSC_BIN): $(BUILD)
-	$(MAKE) -C $(SASS_SASSC_PATH)
+	$(MAKE) -C $(SASS_SASSC_PATH) build-$(BUILD)-dev
 
 sassc: $(SASSC_BIN)
 	$(SASSC_BIN) -v

include/sass2scss.h

@@ -37,7 +37,7 @@
 #ifndef SASS2SCSS_VERSION
 // Hardcode once the file is copied from
 // https://github.com/mgreter/sass2scss
-#define SASS2SCSS_VERSION "1.1.0"
+#define SASS2SCSS_VERSION "1.1.1"
 #endif
 
 // add namespace for c++

script/ci-install-deps

@@ -15,9 +15,6 @@ if [ "x$AUTOTOOLS" == "xyes" ]; then
     sudo apt-get -qq install automake
   fi
 
-  # https://github.com/sass/libsass/pull/2183
-  if [ "$TRAVIS_OS_NAME" == "osx" ]; then
-    brew uninstall libtool
-    brew install libtool
-  fi
 fi
+
+exit 0

src/ast.cpp

@@ -513,28 +513,28 @@ namespace Sass {
     // check for pseudo elements because they are always last
     size_t i, L;
     bool found = false;
-    if (typeid(*this) == typeid(Pseudo_Selector) || typeid(*this) == typeid(Wrapped_Selector))
+    if (typeid(*this) == typeid(Pseudo_Selector) || typeid(*this) == typeid(Wrapped_Selector) || typeid(*this) == typeid(Attribute_Selector))
     {
       for (i = 0, L = rhs->length(); i < L; ++i)
       {
-        if ((Cast<Pseudo_Selector>((*rhs)[i]) || Cast<Wrapped_Selector>((*rhs)[i])) && (*rhs)[L-1]->is_pseudo_element())
+        if ((Cast<Pseudo_Selector>((*rhs)[i]) || Cast<Wrapped_Selector>((*rhs)[i]) || Cast<Attribute_Selector>((*rhs)[i])) && (*rhs)[L-1]->is_pseudo_element())
         { found = true; break; }
       }
     }
     else
     {
       for (i = 0, L = rhs->length(); i < L; ++i)
       {
-        if (Cast<Pseudo_Selector>((*rhs)[i]) || Cast<Wrapped_Selector>((*rhs)[i]))
+        if (Cast<Pseudo_Selector>((*rhs)[i]) || Cast<Wrapped_Selector>((*rhs)[i]) || Cast<Attribute_Selector>((*rhs)[i]))
         { found = true; break; }
       }
     }
     if (!found)
     {
       rhs->append(this);
-      return rhs;
+    } else {
+      rhs->elements().insert(rhs->elements().begin() + i, this);
     }
-    rhs->elements().insert(rhs->elements().begin() + i, this);
     return rhs;
   }
 

src/bind.cpp

@@ -137,8 +137,8 @@ namespace Sass {
               if (List_Obj rest = Cast<List>(a->value())) {
                 arglist->separator(rest->separator());
 
-                for (size_t i = 0, L = rest->size(); i < L; ++i) {
-                  Expression_Obj obj = rest->at(i);
+                for (size_t i = 0, L = rest->length(); i < L; ++i) {
+                  Expression_Obj obj = rest->value_at_index(i);
                   arglist->append(SASS_MEMORY_NEW(Argument,
                                                 obj->pstate(),
                                                 obj,

src/context.cpp

@@ -664,6 +664,7 @@ namespace Sass {
     if (!subset_map.empty()) {
       // create crtp visitor object
       Extend extend(subset_map);
+      extend.setEval(expand.eval);
       // extend tree nodes
       extend(root);
     }

src/environment.cpp

@@ -219,7 +219,7 @@ namespace Sass {
     }
     return get_local(key);
   }
-
+/*
   #ifdef DEBUG
   template <typename T>
   size_t Environment<T>::print(std::string prefix)
@@ -238,7 +238,7 @@ namespace Sass {
     return indent ;
   }
   #endif
-
+*/
   // compile implementation for AST_Node
   template class Environment<AST_Node_Obj>;
 

src/eval.cpp

@@ -1763,9 +1763,27 @@ namespace Sass {
     if (is_in_selector_schema) exp.selector_stack.push_back(0);
     Selector_List_Obj resolved = s->resolve_parent_refs(exp.selector_stack, implicit_parent);
     if (is_in_selector_schema) exp.selector_stack.pop_back();
+    for (size_t i = 0; i < resolved->length(); i++) {
+      Complex_Selector_Ptr is = resolved->at(i)->first();
+      while (is) {
+        if (is->head()) {
+          is->head()->perform(this);
+        }
+        is = is->tail();
+      }
+    }
     return resolved.detach();
   }
 
+  Compound_Selector_Ptr Eval::operator()(Compound_Selector_Ptr s)
+  {
+    for (size_t i = 0; i < s->length(); i++) {
+      Simple_Selector_Ptr ss = s->at(i);
+      if (ss) ss->perform(this);
+    }
+    return s;
+  }
+
   // XXX: this is never hit via spec tests
   Attribute_Selector_Ptr Eval::operator()(Attribute_Selector_Ptr s)
   {
@@ -1780,8 +1798,10 @@ namespace Sass {
   {
     LOCAL_FLAG(is_in_selector_schema, true);
     // the parser will look for a brace to end the selector
+    ctx.c_options.in_selector = true; // do not compress colors
     Expression_Obj sel = s->contents()->perform(this);
     std::string result_str(sel->to_string(ctx.c_options));
+    ctx.c_options.in_selector = false; // flag temporary only
     result_str = unquote(Util::rtrim(result_str));
     char* temp_cstr = sass_copy_c_string(result_str.c_str());
     ctx.strings.push_back(temp_cstr); // attach to context
@@ -1821,4 +1841,39 @@ namespace Sass {
     }
   }
 
+  // hotfix to avoid invalid nested `:not` selectors
+  // probably the wrong place, but this should ultimately
+  // be fixed by implement superselector correctly for `:not`
+  // first use of "find" (ATM only implemented for selectors)
+  bool hasNotSelector(AST_Node_Obj obj) {
+    if (Wrapped_Selector_Ptr w = Cast<Wrapped_Selector>(obj)) {
+      return w->name() == ":not";
+    }
+    return false;
+  }
+
+  Wrapped_Selector_Ptr Eval::operator()(Wrapped_Selector_Ptr s)
+  {
+
+    if (s->name() == ":not") {
+      if (exp.selector_stack.back()) {
+        if (s->selector()->find(hasNotSelector)) {
+          s->selector()->clear();
+          s->name(" ");
+        } else if (s->selector()->length() == 1) {
+          Complex_Selector_Ptr cs = s->selector()->at(0);
+          if (cs->tail()) {
+            s->selector()->clear();
+            s->name(" ");
+          }
+        } else if (s->selector()->length() > 1) {
+          s->selector()->clear();
+          s->name(" ");
+        }
+      }
+    }
+
+    return s;
+  };
+
 }

src/eval.hpp

@@ -75,11 +75,12 @@ namespace Sass {
     // these will return selectors
     Selector_List_Ptr operator()(Selector_List_Ptr);
     Selector_List_Ptr operator()(Complex_Selector_Ptr);
+    Compound_Selector_Ptr operator()(Compound_Selector_Ptr);
     Attribute_Selector_Ptr operator()(Attribute_Selector_Ptr);
     // they don't have any specific implementatio (yet)
     Element_Selector_Ptr operator()(Element_Selector_Ptr s) { return s; };
     Pseudo_Selector_Ptr operator()(Pseudo_Selector_Ptr s) { return s; };
-    Wrapped_Selector_Ptr operator()(Wrapped_Selector_Ptr s) { return s; };
+    Wrapped_Selector_Ptr operator()(Wrapped_Selector_Ptr s);
     Class_Selector_Ptr operator()(Class_Selector_Ptr s) { return s; };
     Id_Selector_Ptr operator()(Id_Selector_Ptr s) { return s; };
     Placeholder_Selector_Ptr operator()(Placeholder_Selector_Ptr s) { return s; };