sassc 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4aafee4a5710a8ea851a5702e8a0cc565072af21
-  data.tar.gz: 1971d63aab1fabbbf3354dcf3f4c722c37884e43
+  metadata.gz: b52db28344dd1103c3d9c82150b7670f31e040d6
+  data.tar.gz: 0ce1622190528f513b5460017c4033da8932fb4d
 SHA512:
-  metadata.gz: da80b6d5c99d360c2a015b30a26758eb58823e44082532b058c159e36f0bffa2b5b0ebc95da828274874e1ed6182b9d9b2cfbff27cc22cc9d1c8b9a9c3523743
-  data.tar.gz: 3f8022f8d73ea4ab6cced6b8bcb7c39a47ae1039c2919777d27f9bce7e7a9af763834bd05196c40fe1c5322c6ea5523d99836c062e72fa6a41604fa0d963adb7
+  metadata.gz: ca2d6b6f548d6c73c419dc6ba94c3d0a20fbed1af6a95862a8ff3c68fb55e583c9a51f33b5122e353d6514d9998fad8a388131a9b74b3a9d06433eacae5461e6
+  data.tar.gz: 06e7cb73e2e52f756aa0980c449b8f32d6f10c6be9a9e8a4e223d9f34603221e2859ae80a41eca0e9066e0d9e8cc0848ab259b0c03a0f20dd927542b50609d7a

data/README.md

@@ -6,12 +6,36 @@ This gem combines the speed of `libsass`, the [Sass C implementation](https://gi
 
 ### libsass Version
 
-[3.3.3](https://github.com/sass/libsass/releases/tag/3.3.3)
+[3.3.6](https://github.com/sass/libsass/releases/tag/3.3.6)
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'sassc'
+```
+
+And then execute:
+
+```bash
+bundle
+```
+
+Or install it yourself as:
+
+```bash
+gem install sassc
+```
 
 ## Usage
 
 This library utilizes `libsass` to allow you to compile SCSS or SASS syntax
-to CSS.  To compile, use a `SassC::Engine`.
+to CSS.  To compile, use a `SassC::Engine`, e.g.:
+
+```ruby
+SassC::Engine.new(sass, style: :compressed).render
+```
 
 **Note**:  If you want to use this library with Rails/Sprockets, check out
 [sassc-rails](https://github.com/bolandrm/sassc-rails).
@@ -25,8 +49,11 @@ and [awesome contributors](https://github.com/bolandrm/sassc-ruby/graphs/contrib
 
 ## Changelog
 
+- **1.10.0**
+  - [Improved error messages](https://github.com/sass/sassc-ruby/pull/34)
+  - Update to Libsass 3.3.6
 - **1.9.0**
-    Support boolean script support
+  - Support boolean script support
 - **1.8.5**
   - Update to Libsass 3.3.4
 - **1.8.4**

data/ext/libsass/.gitignore

@@ -1,5 +1,8 @@
 # Miscellaneous stuff
 
+/sassc
+/sass-spec
+
 VERSION
 .DS_Store
 .sass-cache

data/ext/libsass/.travis.yml

@@ -37,7 +37,7 @@ matrix:
     - os: osx
       compiler: gcc
     - os: osx
-      env: AUTOTOOLS=no COVERAGE=yes BUILD=static
+      env: AUTOTOOLS=no BUILD=static
 
 script: ./script/ci-build-libsass
 before_install: ./script/ci-install-deps

data/ext/libsass/GNUmakefile.am

@@ -57,9 +57,9 @@ TESTS = \
 	$(SASS_SPEC_PATH)/spec/scss-tests \
 	$(SASS_SPEC_PATH)/spec/types
 
-SASS_TEST_FLAGS =
+SASS_TEST_FLAGS = -V 3.4 --impl libsass
 LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) ./script/tap-driver
-AM_LOG_FLAGS = -c ./tester --ignore-todo $(LOG_FLAGS)
+AM_LOG_FLAGS = -c ./tester $(LOG_FLAGS)
 if USE_TAP
 	AM_LOG_FLAGS += -t
 	SASS_TEST_FLAGS += -t | tapout
@@ -72,16 +72,16 @@ SASS_TESTER = $(RUBY) $(SASS_SPEC_PATH)/sass-spec.rb
 SASS_TESTER += -c $(SASS_LIBSASS_PATH)/tester$(EXEEXT)
 
 test:
-	$(SASS_TESTER) --ignore-todo $(LOG_FLAGS) $(SASS_SPEC_PATH) $(SASS_TEST_FLAGS)
+	$(SASS_TESTER) $(LOG_FLAGS) $(SASS_SPEC_PATH) $(SASS_TEST_FLAGS)
 
 test_build:
-	$(SASS_TESTER) --ignore-todo $(LOG_FLAGS) $(SASS_SPEC_PATH) $(SASS_TEST_FLAGS)
+	$(SASS_TESTER) $(LOG_FLAGS) $(SASS_SPEC_PATH) $(SASS_TEST_FLAGS)
 
 test_full:
-	$(SASS_TESTER) $(LOG_FLAGS) $(SASS_SPEC_PATH) $(SASS_TEST_FLAGS)
+	$(SASS_TESTER) --run-todo $(LOG_FLAGS) $(SASS_SPEC_PATH) $(SASS_TEST_FLAGS)
 
-test_issues:
-	$(SASS_TESTER) $(LOG_FLAGS) $(SASS_SPEC_PATH)/spec/issues $(SASS_TEST_FLAGS)
+test_probe:
+	$(SASS_TESTER) --probe-todo $(LOG_FLAGS) $(SASS_SPEC_PATH) $(SASS_TEST_FLAGS)
 
 endif
 

data/ext/libsass/Makefile

@@ -300,13 +300,16 @@ version: $(SASSC_BIN)
 	$(SASSC_BIN) -v
 
 test: $(SASSC_BIN)
-	$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) -s $(LOG_FLAGS) $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR)
+	$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -V 3.4 -c $(SASSC_BIN) --impl libsass $(LOG_FLAGS) $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR)
 
 test_build: $(SASSC_BIN)
-	$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) -s --ignore-todo $(LOG_FLAGS) $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR)
+	$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -V 3.4 -c $(SASSC_BIN) --impl libsass $(LOG_FLAGS) $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR)
 
-test_issues: $(SASSC_BIN)
-	$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) $(LOG_FLAGS) $(SASS_SPEC_PATH)/spec/issues
+test_full: $(SASSC_BIN)
+	$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -V 3.4 -c $(SASSC_BIN) --impl libsass --run-todo $(LOG_FLAGS) $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR)
+
+test_probe: $(SASSC_BIN)
+	$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -V 3.4 -c $(SASSC_BIN) --impl libsass --probe-todo $(LOG_FLAGS) $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR)
 
 clean-objects: lib
 	-$(RM) lib/*.a lib/*.so lib/*.dll lib/*.la

data/ext/libsass/Makefile.conf

@@ -33,7 +33,6 @@ SOURCES = \
 	sass_values.cpp \
 	sass_context.cpp \
 	sass_functions.cpp \
-	sass_interface.cpp \
 	sass2scss.cpp \
 	source_map.cpp \
 	to_c.cpp \

data/ext/libsass/appveyor.yml

@@ -63,8 +63,11 @@ test_script:
           git -C sass-spec checkout -q --force ci-spec-pr-$SPEC_PR
         }
       }
-      ruby sass-spec/sass-spec.rb -c $env:TargetPath -s --ignore-todo sass-spec/spec
-
+      ruby sass-spec/sass-spec.rb -V 3.4 --probe-todo --impl libsass -c $env:TargetPath -s sass-spec/spec
+      if(-not($?)) {
+        echo "sass-spec tests failed"
+        exit 1
+      }
       Write-Host "Explicitly testing the case when cwd has Cyrillic characters: " -nonewline
       # See comments in gh-1774 for details.
       $env:TargetPath =  Join-Path $pwd.Path $env:TargetPath
@@ -76,3 +79,4 @@ test_script:
       } else {
         echo "Success!"
       }
+

data/ext/libsass/docs/api-context.md

@@ -88,7 +88,7 @@ char* source_map_file;
 char* source_map_root;
 ```
 ```C
-// Custom functions that can be called from sccs code
+// Custom functions that can be called from Sass code
 Sass_C_Function_List c_functions;
 ```
 ```C
@@ -168,12 +168,12 @@ struct Sass_Compiler* sass_make_data_compiler (struct Sass_Data_Context* data_ct
 
 // Execute the different compilation steps individually
 // Usefull if you only want to query the included files
-int sass_compiler_parse(struct Sass_Compiler* compiler);
-int sass_compiler_execute(struct Sass_Compiler* compiler);
+int sass_compiler_parse (struct Sass_Compiler* compiler);
+int sass_compiler_execute (struct Sass_Compiler* compiler);
 
 // Release all memory allocated with the compiler
 // This does _not_ include any contexts or options
-void sass_delete_compiler(struct Sass_Compiler* compiler);
+void sass_delete_compiler (struct Sass_Compiler* compiler);
 
 // Release all memory allocated and also ourself
 void sass_delete_file_context (struct Sass_File_Context* ctx);

data/ext/libsass/docs/api-doc.md

@@ -16,16 +16,6 @@ This will automatically load all other headers too!
 #include "sass/context.h"
 ```
 
-### Deprecated usage
-
-The old API is kept in the source for backward compatibility.
-It's deprecated and incompatible with this documentation, use `sass/context.h`!
-
-```C
-// deprecated interface
-#include "sass/interface.h"
-```
-
 ## Basic C Example
 
 ```C
@@ -33,7 +23,7 @@ It's deprecated and incompatible with this documentation, use `sass/context.h`!
 #include "sass/context.h"
 
 int main() {
-  puts(libsass_VERSION());
+  puts(libsass_version());
   return 0;
 }
 ```
@@ -114,6 +104,34 @@ This mirrors very well how `libsass` uses these structures.
 
 Structs can be down-casted to access `context` or `options`!
 
+## Memory handling and life-cycles
+
+We keep memory around for as long as the main [context](api-context.md) object is not destroyed (`sass_delete_context`). LibSass will create copies of most inputs/options beside the main sass code.
+You need to allocate and fill that buffer before passing it to LibSass. You may also overtake memory management from libsass for certain return values (i.e. `sass_context_take_output_string`).
+
+```C
+// to allocate buffer to be filled
+void* sass_alloc_memory(size_t size);
+// to allocate a buffer from existing string
+char* sass_copy_c_string(const char* str);
+// to free overtaken memory when done
+void sass_free_memory(void* ptr);
+```
+
+## Miscellaneous API functions
+
+```C
+// Some convenient string helper function
+char* sass_string_unquote (const char* str);
+char* sass_string_quote (const char* str, const char quote_mark);
+
+// Resolve a file via the given include paths in the include char* array
+char* sass_resolve_file (const char* path, const char* incs[]);
+
+// Get compiled libsass version
+const char* libsass_version(void);
+```
+
 ## Common Pitfalls
 
 **input_path**

data/ext/libsass/docs/api-importer-example.md

@@ -10,10 +10,10 @@ Sass_Import_List sass_importer(const char* path, Sass_Importer_Entry cb, struct
   // get the cookie from importer descriptor
   void* cookie = sass_importer_get_cookie(cb);
   Sass_Import_List list = sass_make_import_list(2);
-  const char* local = "local { color: green; }";
-  const char* remote = "remote { color: red; }";
-  list[0] = sass_make_import_entry("/tmp/styles.scss", strdup(local), 0);
-  list[1] = sass_make_import_entry("http://www.example.com", strdup(remote), 0);
+  char* local = sass_copy_c_string("local { color: green; }");
+  char* remote = sass_copy_c_string("remote { color: red; }");
+  list[0] = sass_make_import_entry("/tmp/styles.scss", local, 0);
+  list[1] = sass_make_import_entry("http://www.example.com", remote, 0);
   return list;
 }
 
@@ -84,7 +84,7 @@ Sass_Import_List importer(const char* path, Sass_Importer_Entry cb, struct Sass_
   Sass_Import_List list = sass_make_import_list(1);
   const char* message = "some error message";
   list[0] = sass_make_import_entry(path, 0, 0);
-  sass_import_set_error(list[0], strdup(message), 0, 0);
+  sass_import_set_error(list[0], sass_copy_c_string(message), 0, 0);
   return list;
 }
 

data/ext/libsass/docs/build-on-windows.md

@@ -130,7 +130,7 @@ cd libsass
 REM set PATH=%PATH%;%PROGRAMFILES%\MSBuild\12.0\Bin
 msbuild /m:4 /p:Configuration=Release win\libsass.sln
 REM running the spec test-suite manually (needs ruby and minitest gem)
-ruby sass-spec\sass-spec.rb -c win\bin\sassc.exe -s --ignore-todo sass-spec/spec
+ruby sass-spec\sass-spec.rb -V 3.4 -c win\bin\sassc.exe -s --impl libsass sass-spec/spec
 cd ..
 ```
 

data/ext/libsass/include/sass/base.h

@@ -62,6 +62,13 @@ enum Sass_Output_Style {
   SASS_STYLE_TO_SASS
 };
 
+// to allocate buffer to be filled
+void* sass_alloc_memory(size_t size);
+// to allocate a buffer from existing string
+char* sass_copy_c_string(const char* str);
+// to free overtaken memory when done
+void sass_free_memory(void* ptr);
+
 // Some convenient string helper function
 ADDAPI char* ADDCALL sass_string_quote (const char* str, const char quote_mark);
 ADDAPI char* ADDCALL sass_string_unquote (const char* str);
@@ -72,6 +79,9 @@ ADDAPI char* ADDCALL sass_resolve_file (const char* path, const char* incs[]);
 // Get compiled libsass version
 ADDAPI const char* ADDCALL libsass_version(void);
 
+// Get compiled libsass language
+ADDAPI const char* ADDCALL libsass_language_version(void);
+
 #ifdef __cplusplus
 } // __cplusplus defined.
 #endif

data/ext/libsass/include/sass/version.h

@@ -5,4 +5,8 @@
 #define LIBSASS_VERSION "[NA]"
 #endif
 
+#ifndef LIBSASS_LANGUAGE_VERSION
+#define LIBSASS_LANGUAGE_VERSION "[NA]"
+#endif
+
 #endif

data/ext/libsass/include/sass/version.h.in

@@ -5,4 +5,8 @@
 #define LIBSASS_VERSION "@PACKAGE_VERSION@"
 #endif
 
+#ifndef LIBSASS_LANGUAGE_VERSION
+#define LIBSASS_LANGUAGE_VERSION "3.4"
+#endif
+
 #endif

data/ext/libsass/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.0.5"
+#define SASS2SCSS_VERSION "1.0.6"
 #endif
 
 // add namespace for c++

data/ext/libsass/script/ci-build-libsass

@@ -48,6 +48,18 @@ if [ "x$PREFIX" == "x" ]; then
   fi
 fi
 
+# enable address sanitation
+# https://en.wikipedia.org/wiki/AddressSanitizer
+if [ "x$CC" == "xclang" ]; then
+  if [ "x$COVERAGE" != "xyes" ]; then
+    if [ "$TRAVIS_OS_NAME" == "linux" ]; then
+      export EXTRA_CFLAGS="$EXTRA_CFLAGS -fsanitize=address"
+      export EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -fsanitize=address"
+      export EXTRA_LDFLAGS="$EXTRA_LDFLAGS -fsanitize=address"
+    fi
+  fi
+fi
+
 echo SASS_LIBSASS_PATH: $SASS_LIBSASS_PATH
 echo TRAVIS_BUILD_DIR: $TRAVIS_BUILD_DIR
 echo SASS_SASSC_PATH: $SASS_SASSC_PATH
@@ -108,10 +120,10 @@ then
     echo "Fetching Sass Spec PR $SPEC_PR"
     git -C sass-spec fetch -u origin pull/$SPEC_PR/head:ci-spec-pr-$SPEC_PR
     git -C sass-spec checkout --force ci-spec-pr-$SPEC_PR
-    LD_LIBRARY_PATH="$PREFIX/lib/" make $MAKE_OPTS test_build
+    LD_LIBRARY_PATH="$PREFIX/lib/" make $MAKE_OPTS test_probe
   else
-    LD_LIBRARY_PATH="$PREFIX/lib/" make $MAKE_OPTS test_build
+    LD_LIBRARY_PATH="$PREFIX/lib/" make $MAKE_OPTS test_probe
   fi
 else
-  LD_LIBRARY_PATH="$PREFIX/lib/" make $MAKE_OPTS test_build
+  LD_LIBRARY_PATH="$PREFIX/lib/" make $MAKE_OPTS test_probe
 fi

data/ext/libsass/src/ast.cpp

@@ -7,8 +7,11 @@
 #include "color_maps.hpp"
 #include <set>
 #include <iomanip>
-#include <algorithm>
 #include <iostream>
+#include <algorithm>
+#include <functional>
+#include <cctype>
+#include <locale>
 
 namespace Sass {
 
@@ -25,6 +28,80 @@ namespace Sass {
           dynamic_cast<Supports_Operator*>(cond);
   }
 
+  std::string & str_ltrim(std::string & str)
+  {
+    auto it2 =  std::find_if( str.begin() , str.end() , [](char ch){ return !std::isspace<char>(ch , std::locale::classic() ) ; } );
+    str.erase( str.begin() , it2);
+    return str;
+  }
+
+  std::string & str_rtrim(std::string & str)
+  {
+    auto it1 =  std::find_if( str.rbegin() , str.rend() , [](char ch){ return !std::isspace<char>(ch , std::locale::classic() ) ; } );
+    str.erase( it1.base() , str.end() );
+    return str;
+  }
+
+  void String_Constant::rtrim()
+  {
+    value_ = str_rtrim(value_);
+  }
+  void String_Constant::ltrim()
+  {
+    value_ = str_ltrim(value_);
+  }
+  void String_Constant::trim()
+  {
+    rtrim();
+    ltrim();
+  }
+
+  void String_Schema::rtrim()
+  {
+    if (!empty()) {
+      if (String* str = dynamic_cast<String*>(last())) str->rtrim();
+    }
+  }
+  void String_Schema::ltrim()
+  {
+    if (!empty()) {
+      if (String* str = dynamic_cast<String*>(first())) str->ltrim();
+    }
+  }
+  void String_Schema::trim()
+  {
+    rtrim();
+    ltrim();
+  }
+
+  bool At_Root_Query::exclude(std::string str)
+  {
+    bool with = feature() && unquote(feature()->to_string()).compare("with") == 0;
+    List* l = static_cast<List*>(value());
+    std::string v;
+
+    if (with)
+    {
+      if (!l || l->length() == 0) return str.compare("rule") != 0;
+      for (size_t i = 0, L = l->length(); i < L; ++i)
+      {
+        v = unquote((*l)[i]->to_string());
+        if (v.compare("all") == 0 || v == str) return false;
+      }
+      return true;
+    }
+    else
+    {
+      if (!l || !l->length()) return str.compare("rule") == 0;
+      for (size_t i = 0, L = l->length(); i < L; ++i)
+      {
+        v = unquote((*l)[i]->to_string());
+        if (v.compare("all") == 0 || v == str) return true;
+      }
+      return false;
+    }
+  }
+
   void AST_Node::update_pstate(const ParserState& pstate)
   {
     pstate_.offset += pstate - pstate_ + pstate.offset;
@@ -60,7 +137,7 @@ namespace Sass {
   bool Compound_Selector::has_parent_ref()
   {
     for (Simple_Selector* s : *this) {
-      if (s->has_parent_ref()) return true;
+      if (s && s->has_parent_ref()) return true;
     }
     return false;
   }
@@ -209,6 +286,7 @@ namespace Sass {
 
   bool Simple_Selector::operator== (const Simple_Selector& rhs) const
   {
+    if (const Pseudo_Selector* lp = dynamic_cast<const Pseudo_Selector*>(this)) return *lp == rhs;
     if (const Wrapped_Selector* lw = dynamic_cast<const Wrapped_Selector*>(this)) return *lw == rhs;
     if (const Attribute_Selector* la = dynamic_cast<const Attribute_Selector*>(this)) return *la == rhs;
     if (is_ns_eq(ns(), rhs.ns()))
@@ -218,6 +296,7 @@ namespace Sass {
 
   bool Simple_Selector::operator< (const Simple_Selector& rhs) const
   {
+    if (const Pseudo_Selector* lp = dynamic_cast<const Pseudo_Selector*>(this)) return *lp == rhs;
     if (const Wrapped_Selector* lw = dynamic_cast<const Wrapped_Selector*>(this)) return *lw < rhs;
     if (const Attribute_Selector* la = dynamic_cast<const Attribute_Selector*>(this)) return *la < rhs;
     if (is_ns_eq(ns(), rhs.ns()))
@@ -481,6 +560,49 @@ namespace Sass {
     return ns() == rhs.ns();
   }
 
+  bool Pseudo_Selector::operator== (const Pseudo_Selector& rhs) const
+  {
+    if (is_ns_eq(ns(), rhs.ns()) && name() == rhs.name())
+    {
+      Expression* lhs_ex = expression();
+      Expression* rhs_ex = rhs.expression();
+      if (rhs_ex && lhs_ex) return *lhs_ex == *rhs_ex;
+      else return lhs_ex == rhs_ex;
+    }
+    else return false;
+  }
+
+  bool Pseudo_Selector::operator== (const Simple_Selector& rhs) const
+  {
+    if (const Pseudo_Selector* w = dynamic_cast<const Pseudo_Selector*>(&rhs))
+    {
+      return *this == *w;
+    }
+    if (is_ns_eq(ns(), rhs.ns()))
+    { return name() == rhs.name(); }
+    return ns() == rhs.ns();
+  }
+
+  bool Pseudo_Selector::operator< (const Pseudo_Selector& rhs) const
+  {
+    if (is_ns_eq(ns(), rhs.ns()) && name() == rhs.name())
+    { return *(expression()) < *(rhs.expression()); }
+    if (is_ns_eq(ns(), rhs.ns()))
+    { return name() < rhs.name(); }
+    return ns() < rhs.ns();
+  }
+
+  bool Pseudo_Selector::operator< (const Simple_Selector& rhs) const
+  {
+    if (const Pseudo_Selector* w = dynamic_cast<const Pseudo_Selector*>(&rhs))
+    {
+      return *this < *w;
+    }
+    if (is_ns_eq(ns(), rhs.ns()))
+    { return name() < rhs.name(); }
+    return ns() < rhs.ns();
+  }
+
   bool Wrapped_Selector::operator== (const Wrapped_Selector& rhs) const
   {
     if (is_ns_eq(ns(), rhs.ns()) && name() == rhs.name())
@@ -1230,10 +1352,12 @@ namespace Sass {
       if ((*this)[i]->head()->is_empty_reference()) {
         // simply move to the next tail if we have "no" combinator
         if ((*this)[i]->combinator() == Complex_Selector::ANCESTOR_OF) {
-          if ((*this)[i]->tail() && (*this)[i]->has_line_feed()) {
-            (*this)[i]->tail()->has_line_feed(true);
+          if ((*this)[i]->tail() != NULL) {
+            if ((*this)[i]->has_line_feed()) {
+              (*this)[i]->tail()->has_line_feed(true);
+            }
+            (*this)[i] = (*this)[i]->tail();
           }
-          (*this)[i] = (*this)[i]->tail();
         }
         // otherwise remove the first item from head
         else {
@@ -1246,7 +1370,15 @@ namespace Sass {
   bool Selector_List::has_parent_ref()
   {
     for (Complex_Selector* s : *this) {
-      if (s->has_parent_ref()) return true;
+      if (s && s->has_parent_ref()) return true;
+    }
+    return false;
+  }
+
+  bool Selector_Schema::has_parent_ref()
+  {
+    if (String_Schema* schema = dynamic_cast<String_Schema*>(contents())) {
+      return schema->length() > 0 && dynamic_cast<Parent_Selector*>(schema->at(0)) != NULL;
     }
     return false;
   }
@@ -2017,6 +2149,29 @@ namespace Sass {
     return is_interpolant() || (right() && right()->is_right_interpolant());
   }
 
+  // delay binary expressions in function arguments
+  // https://github.com/sass/libsass/issues/1417
+  bool Binary_Expression::can_delay(void) const
+  {
+    bool l_delay = false;
+    bool r_delay = false;
+    if (op().operand == Sass_OP::DIV) {
+      if (Textual* tl = dynamic_cast<Textual*>(left())) {
+        l_delay = tl->type() == Textual::NUMBER ||
+                  tl->type() == Textual::DIMENSION;
+      } else {
+        l_delay = dynamic_cast<Number*>(left()) != NULL;
+      }
+      if (Textual* tr = dynamic_cast<Textual*>(right())) {
+        r_delay = tr->type() == Textual::NUMBER ||
+                  tr->type() == Textual::DIMENSION;
+      } else {
+        r_delay = dynamic_cast<Number*>(right()) != NULL;
+      }
+    }
+    return l_delay && r_delay;
+  }
+
   std::string AST_Node::to_string(Sass_Inspect_Options opt) const
   {
     Sass_Output_Options out(opt);