sassc 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84e3ac644262800f310def2ddd6a33b788173644
-  data.tar.gz: 60a9b9684751c114079664615eac210ca91b50f3
+  metadata.gz: 0c834fe7f6b0359169fc1f6ba7d1cab0e98c90db
+  data.tar.gz: fb01c0beb052582b9b7f642b0c723d9c12754c22
 SHA512:
-  metadata.gz: 447d7bf985003fb37bf86ae08e9b7f2aca73b440ff073926f809225eec7ccb152a9a8361111e2349f3894bda5b4c6f2c2a52a781ebb5cebe9873f37ebe90edfc
-  data.tar.gz: d5f9074a354e20f40b43cb48ae8ce8cae436f6c9b1a7cf7a5c3f3b8f6b6ba81bdd4ca5dd375ac921f565786e44e316885a6596ffab7f13f9173873b467d12a26
+  metadata.gz: 76ac15bb37435e1979a62a05fdd90ab3eaa017e7bce9726e386ee01718f7989929554f878f73924aa5d94d0fbea742503a8d2ee46421a5916e7c6e85c4fde7a1
+  data.tar.gz: 5838c775f6078cd2be03c47f2ef5637fcea57e521f7d2bbc6af1f78d8aa3c1e42bfe3b165f5ce1ea5ace1b22e6d17d33f8759bf65333a49df74f56b92642aa7f

data/README.md

@@ -6,7 +6,7 @@ This gem combines the speed of `libsass`, the [Sass C implementation](https://gi
 
 ### libsass Version
 
-[3.1.0](https://github.com/sass/libsass/releases/tag/3.1.0)
+[3.2.0-beta.6](https://github.com/sass/libsass/releases/tag/3.2.0-beta.6)
 
 ## Contributing
 

data/ext/libsass/.gitignore

@@ -1,5 +1,6 @@
 # Miscellaneous stuff
 
+VERSION
 .DS_Store
 .sass-cache
 *.gem
@@ -19,12 +20,14 @@ Makefile.in
 /config.log
 /config.status
 /configure
+include/
 /libtool
 /m4/libtool.m4
 /m4/ltoptions.m4
 /m4/ltsugar.m4
 /m4/ltversion.m4
 /m4/lt~obsolete.m4
+/script/ar-lib
 /script/compile
 /script/config.guess
 /script/config.sub
@@ -44,6 +47,9 @@ libsass/*
 *.so
 *.dll
 *.a
+*.suo
+*.sdf
+*.opensdf
 a.out
 libsass.js
 tester

data/ext/libsass/.travis.yml

@@ -2,7 +2,7 @@ language: cpp
 
 os:
   - linux
-  # - osx
+  - osx
 
 compiler:
   - gcc
@@ -31,6 +31,10 @@ matrix:
   exclude:
     - compiler: clang
       env: AUTOTOOLS=yes COVERAGE=yes BUILD=static
+    - os: osx
+      compiler: gcc
+    - os: osx
+      env: AUTOTOOLS=no COVERAGE=yes BUILD=static
 
 script: ./script/ci-build-libsass
 before_install: ./script/ci-install-deps

data/ext/libsass/Makefile

@@ -4,9 +4,15 @@ RM       ?= rm -f
 CP       ?= cp -a
 MKDIR    ?= mkdir
 WINDRES  ?= windres
-CFLAGS   ?= -Wall -O2
-CXXFLAGS ?= -Wall -O2
-LDFLAGS  ?= -Wall -O2 -Wl,--no-undefined
+CFLAGS   ?= -Wall
+CXXFLAGS ?= -Wall
+LDFLAGS  ?= -Wall
+ifneq "$(COVERAGE)" "yes"
+  CFLAGS   += -O2
+  CXXFLAGS += -O2
+  LDFLAGS  += -O2
+endif
+LDFLAGS  += -Wl,-undefined,error
 CAT      ?= $(if $(filter $(OS),Windows_NT),type,cat)
 
 ifneq (,$(findstring /cygdrive/,$(PATH)))
@@ -112,7 +118,9 @@ SOURCES = \
 	constants.cpp \
 	context.cpp \
 	contextualize.cpp \
+	contextualize_eval.cpp \
 	cssize.cpp \
+	listize.cpp \
 	error_handling.cpp \
 	eval.cpp \
 	expand.cpp \
@@ -120,6 +128,7 @@ SOURCES = \
 	file.cpp \
 	functions.cpp \
 	inspect.cpp \
+	lexer.cpp \
 	node.cpp \
 	json.cpp \
 	emitter.cpp \

data/ext/libsass/Makefile.am

@@ -1,29 +1,21 @@
 ACLOCAL_AMFLAGS = -I m4
 
-AM_LDFLAGS = -lstdc++ -lm
-AM_CFLAGS = -Wall
-AM_CXXFLAGS = -Wall
+AM_COPT = -Wall -O2
+AM_COVLDFLAGS =
 
-if COMPILER_IS_MINGW32
-  AM_CXXFLAGS += -std=gnu++0x
-else
-  AM_CFLAGS += -fPIC
-  AM_CXXFLAGS += -fPIC
-  AM_CXXFLAGS += -std=c++0x
-  AM_LDFLAGS += -ldl
+if ENABLE_COVERAGE
+	AM_COPT = -O0 --coverage
+	AM_COVLDFLAGS += -lgcov
 endif
 
-AM_CFLAGS += -DLIBSASS_VERSION="\"$(VERSION)\""
-AM_CXXFLAGS += -DLIBSASS_VERSION="\"$(VERSION)\""
+AM_CFLAGS =   $(AM_COPT)
+AM_CXXFLAGS = $(AM_COPT)
+AM_LDFLAGS =  $(AM_COPT) $(AM_COVLDFLAGS)
 
-if ENABLE_COVERAGE
-	AM_CFLAGS += -O0 --coverage
-	AM_CXXFLAGS += -O0 --coverage
-	AM_LDFLAGS += -O0 --coverage -lgcov
+if COMPILER_IS_MINGW32
+  AM_CXXFLAGS += -std=gnu++0x
 else
-	AM_CFLAGS += -O2
-	AM_CXXFLAGS += -O2
-	AM_LDFLAGS += -O2
+  AM_CXXFLAGS += -std=c++0x
 endif
 
 EXTRA_DIST = \
@@ -55,14 +47,17 @@ libsass_la_SOURCES = \
 	constants.cpp constants.hpp \
 	context.cpp context.hpp \
 	contextualize.cpp contextualize.hpp \
+	contextualize_eval.cpp contextualize_eval.hpp \
 	error_handling.cpp error_handling.hpp \
 	eval.cpp eval.hpp \
 	expand.cpp expand.hpp \
 	extend.cpp extend.hpp \
 	cssize.cpp cssize.hpp \
+	listize.cpp listize.hpp \
 	file.cpp file.hpp \
 	functions.cpp functions.hpp \
 	inspect.cpp inspect.hpp \
+	lexer.cpp lexer.hpp \
 	node.cpp node.hpp \
 	json.cpp json.hpp \
 	emitter.cpp emitter.hpp \
@@ -85,11 +80,9 @@ libsass_la_SOURCES = \
 	utf8_string.cpp utf8_string.hpp \
 	util.cpp util.hpp
 
-libsass_la_CFLAGS = $(AM_CFLAGS)
-libsass_la_CXXFLAGS = $(AM_CXXFLAGS)
 libsass_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined -version-info 0:9:0
 
-include_HEADERS = sass2scss.h sass_context.h sass_functions.h sass_values.h sass.h
+include_HEADERS = sass2scss.h sass_context.h sass_functions.h sass_values.h sass.h sass_version.h
 
 if ENABLE_TESTS
 
@@ -136,12 +129,7 @@ else
 endif
 
 SASS_TESTER = $(RUBY) $(SASS_SPEC_PATH)/sass-spec.rb
-
-if COMPILER_IS_MINGW32
-  SASS_TESTER += -c $(SASS_LIBSASS_PATH)/tester.exe
-else
-  SASS_TESTER += -c $(SASS_LIBSASS_PATH)/tester
-endif
+SASS_TESTER += -c $(SASS_LIBSASS_PATH)/tester$(EXEEXT)
 
 test:
 	$(SASS_TESTER) --ignore-todo $(LOG_FLAGS) $(SASS_SPEC_PATH) $(SASS_TEST_FLAGS)

data/ext/libsass/Readme.md

@@ -7,6 +7,7 @@ by Aaron Leung ([@akhleung]) and Hampton Catlin ([@hcatlin])
 [![Windows CI](https://ci.appveyor.com/api/projects/status/github/sass/libsass?svg=true)](https://ci.appveyor.com/project/sass/libsass/branch/master)
 [![Bountysource](https://www.bountysource.com/badge/tracker?tracker_id=283068)](https://www.bountysource.com/trackers/283068-libsass?utm_source=283068&utm_medium=shield&utm_campaign=TRACKER_BADGE)
 [![Coverage Status](https://img.shields.io/coveralls/sass/libsass.svg)](https://coveralls.io/r/sass/libsass?branch=feature%2Ftest-travis-ci-3)
+[![Join us](https://still-ridge-9421.herokuapp.com/badge.svg)](https://still-ridge-9421.herokuapp.com/)
 
 https://github.com/sass/libsass
 

data/ext/libsass/appveyor.yml

@@ -15,7 +15,6 @@ environment:
     ruby_version: "21-x64"
 
 cache:
-  - C:\mingw64
   - C:\Ruby%ruby_version%\lib\ruby\gems
 
 install:
@@ -64,7 +63,7 @@ test_script:
         ruby sass-spec\sass-spec.rb -c sassc\bin\sassc.exe -s --ignore-todo sass-spec/spec
       } else {
         if ($env:Config -eq "Debug") {
-          echo test runner in debug mode build via msvc will throw debug assertions
+          echo "test runner in debug mode build via msvc will throw debug assertions"
           echo ruby sass-spec\sass-spec.rb -c win\bin\Debug\sassc.exe -s --ignore-todo sass-spec/spec
         } else {
           ruby sass-spec\sass-spec.rb -c win\bin\sassc.exe -s --ignore-todo sass-spec/spec

data/ext/libsass/ast.cpp

@@ -8,6 +8,8 @@
 namespace Sass {
   using namespace std;
 
+  static Null sass_null(Sass::Null(ParserState("null")));
+
   bool Compound_Selector::operator<(const Compound_Selector& rhs) const
   {
     To_String to_string;
@@ -587,5 +589,12 @@ namespace Sass {
     return result;
   }*/
 
+  Expression* Hashed::at(Expression* k) const
+  {
+    if (elements_.count(k))
+    { return elements_.at(k); }
+    else { return &sass_null; }
+  }
+
 }
 

data/ext/libsass/ast.hpp

@@ -87,6 +87,7 @@ namespace Sass {
       STRING,
       LIST,
       MAP,
+      SELECTOR,
       NULL_VAL,
       NUM_TYPES
     };
@@ -209,9 +210,10 @@ namespace Sass {
     size_t length() const                  { return list_.size(); }
     bool empty() const                     { return list_.empty(); }
     bool has(Expression* k) const          { return elements_.count(k) == 1; }
-    Expression* at(Expression* k) const    { return elements_.at(k); }
+    Expression* at(Expression* k) const;
     bool has_duplicate_key() const         { return duplicate_key_ != 0; }
     Expression* get_duplicate_key() const  { return duplicate_key_; }
+    const unordered_map<Expression*, Expression*> elements() { return elements_; }
     Hashed& operator<<(pair<Expression*, Expression*> p)
     {
       reset_hash();
@@ -430,10 +432,10 @@ namespace Sass {
   // Keyframe-rules -- the child blocks of "@keyframes" nodes.
   ///////////////////////////////////////////////////////////////////////
   class Keyframe_Rule : public Has_Block {
-    ADD_PROPERTY(String*, rules);
+    ADD_PROPERTY(Selector*, selector);
   public:
     Keyframe_Rule(ParserState pstate, Block* b)
-    : Has_Block(pstate, b), rules_(0)
+    : Has_Block(pstate, b), selector_(0)
     { statement_type(KEYFRAMERULE); }
     ATTACH_OPERATIONS();
   };
@@ -459,14 +461,14 @@ namespace Sass {
   class Assignment : public Statement {
     ADD_PROPERTY(string, variable);
     ADD_PROPERTY(Expression*, value);
-    ADD_PROPERTY(bool, is_guarded);
+    ADD_PROPERTY(bool, is_default);
     ADD_PROPERTY(bool, is_global);
   public:
     Assignment(ParserState pstate,
                string var, Expression* val,
-               bool guarded = false,
-               bool global = false)
-    : Statement(pstate), variable_(var), value_(val), is_guarded_(guarded), is_global_(global)
+               bool is_default = false,
+               bool is_global = false)
+    : Statement(pstate), variable_(var), value_(val), is_default_(is_default), is_global_(is_global)
     { }
     ATTACH_OPERATIONS();
   };
@@ -643,8 +645,9 @@ namespace Sass {
     ADD_PROPERTY(Env*, environment);
     ADD_PROPERTY(Type, type);
     ADD_PROPERTY(Native_Function, native_function);
-    ADD_PROPERTY(Sass_C_Function, c_function);
+    ADD_PROPERTY(Sass_Function_Entry, c_function);
     ADD_PROPERTY(void*, cookie);
+    ADD_PROPERTY(Context*, ctx);
     ADD_PROPERTY(bool, is_overload_stub);
     ADD_PROPERTY(Signature, signature);
   public:
@@ -652,6 +655,7 @@ namespace Sass {
                string n,
                Parameters* params,
                Block* b,
+               Context* ctx,
                Type t)
     : Has_Block(pstate, b),
       name_(n),
@@ -661,6 +665,7 @@ namespace Sass {
       native_function_(0),
       c_function_(0),
       cookie_(0),
+      ctx_(ctx),
       is_overload_stub_(false),
       signature_(0)
     { }
@@ -669,6 +674,7 @@ namespace Sass {
                string n,
                Parameters* params,
                Native_Function func_ptr,
+               Context* ctx,
                bool overload_stub = false)
     : Has_Block(pstate, 0),
       name_(n),
@@ -678,6 +684,7 @@ namespace Sass {
       native_function_(func_ptr),
       c_function_(0),
       cookie_(0),
+      ctx_(ctx),
       is_overload_stub_(overload_stub),
       signature_(sig)
     { }
@@ -685,8 +692,8 @@ namespace Sass {
                Signature sig,
                string n,
                Parameters* params,
-               Sass_C_Function func_ptr,
-               void* cookie,
+               Sass_Function_Entry c_func,
+               Context* ctx,
                bool whatever,
                bool whatever2)
     : Has_Block(pstate, 0),
@@ -695,8 +702,9 @@ namespace Sass {
       environment_(0),
       type_(FUNCTION),
       native_function_(0),
-      c_function_(func_ptr),
-      cookie_(cookie),
+      c_function_(c_func),
+      cookie_(sass_function_get_cookie(c_func)),
+      ctx_(ctx),
       is_overload_stub_(false),
       signature_(sig)
     { }
@@ -843,11 +851,34 @@ namespace Sass {
     ADD_PROPERTY(Type, type);
     ADD_PROPERTY(Expression*, left);
     ADD_PROPERTY(Expression*, right);
+    size_t hash_;
   public:
     Binary_Expression(ParserState pstate,
                       Type t, Expression* lhs, Expression* rhs)
-    : Expression(pstate), type_(t), left_(lhs), right_(rhs)
+    : Expression(pstate), type_(t), left_(lhs), right_(rhs), hash_(0)
     { }
+    virtual bool operator==(Expression& rhs) const
+    {
+      try
+      {
+        Binary_Expression& m = dynamic_cast<Binary_Expression&>(rhs);
+        if (m == 0) return false;
+        return type() == m.type() &&
+               left() == m.left() &&
+               right() == m.right();
+      }
+      catch (std::bad_cast&)
+      {
+        return false;
+      }
+      catch (...) { throw; }
+    }
+    virtual size_t hash()
+    {
+      if (hash_ > 0) return hash_;
+      hash_ = left()->hash() ^ right()->hash() ^ std::hash<size_t>()(type_);
+      return hash_;
+    }
     ATTACH_OPERATIONS();
   };
 
@@ -860,10 +891,32 @@ namespace Sass {
   private:
     ADD_PROPERTY(Type, type);
     ADD_PROPERTY(Expression*, operand);
+    size_t hash_;
   public:
     Unary_Expression(ParserState pstate, Type t, Expression* o)
-    : Expression(pstate), type_(t), operand_(o)
+    : Expression(pstate), type_(t), operand_(o), hash_(0)
     { }
+    virtual bool operator==(Expression& rhs) const
+    {
+      try
+      {
+        Unary_Expression& m = dynamic_cast<Unary_Expression&>(rhs);
+        if (m == 0) return false;
+        return type() == m.type() &&
+               operand() == m.operand();
+      }
+      catch (std::bad_cast&)
+      {
+        return false;
+      }
+      catch (...) { throw; }
+    }
+    virtual size_t hash()
+    {
+      if (hash_ > 0) return hash_;
+      hash_ = operand()->hash() ^ std::hash<size_t>()(type_);
+      return hash_;
+    }
     ATTACH_OPERATIONS();
   };
 
@@ -891,7 +944,7 @@ namespace Sass {
       {
         Argument& m = dynamic_cast<Argument&>(rhs);
         if (!(m && name() == m.name())) return false;
-        return *value() == *value();
+        return *value() == *m.value();
       }
       catch (std::bad_cast&)
       {
@@ -1392,16 +1445,16 @@ namespace Sass {
     size_t hash_;
   public:
     String_Constant(ParserState pstate, string val)
-    : String(pstate), quote_mark_(0), value_(val), hash_(0)
+    : String(pstate), quote_mark_(0), value_(read_css_string(val)), hash_(0)
     { }
     String_Constant(ParserState pstate, const char* beg)
-    : String(pstate), quote_mark_(0), value_(string(beg)), hash_(0)
+    : String(pstate), quote_mark_(0), value_(read_css_string(string(beg))), hash_(0)
     { }
     String_Constant(ParserState pstate, const char* beg, const char* end)
-    : String(pstate), quote_mark_(0), value_(string(beg, end-beg)), hash_(0)
+    : String(pstate), quote_mark_(0), value_(read_css_string(string(beg, end-beg))), hash_(0)
     { }
     String_Constant(ParserState pstate, const Token& tok)
-    : String(pstate), quote_mark_(0), value_(string(tok.begin, tok.end)), hash_(0)
+    : String(pstate), quote_mark_(0), value_(read_css_string(string(tok.begin, tok.end))), hash_(0)
     { }
     string type() { return "string"; }
     static string type_name() { return "string"; }
@@ -1666,9 +1719,6 @@ namespace Sass {
         if (has_rest_parameter_) {
           error("functions and mixins cannot have more than one variable-length parameter", p->pstate());
         }
-        if (has_optional_parameters_) {
-          error("optional parameters may not be combined with variable-length parameters", p->pstate());
-        }
         has_rest_parameter_ = true;
       }
       else {
@@ -1695,6 +1745,22 @@ namespace Sass {
   //////////////////////////////////////////////////////////////////////////////////////////
   inline Expression* List::value_at_index(size_t i) { return is_arglist_ ? ((Argument*)(*this)[i])->value() : (*this)[i]; }
 
+  ////////////
+  // The Parent Selector Expression.
+  ////////////
+  class Parent_Selector : public Expression {
+    ADD_PROPERTY(Selector*, selector);
+  public:
+    Parent_Selector(ParserState pstate, Selector* r = 0)
+    : Expression(pstate), selector_(r)
+    { concrete_type(SELECTOR); }
+    virtual Selector* selector() { return selector_; }
+    string type() { return "selector"; }
+    static string type_name() { return "selector"; }
+
+    ATTACH_OPERATIONS();
+  };
+
   /////////////////////////////////////////
   // Abstract base class for CSS selectors.
   /////////////////////////////////////////
@@ -1722,7 +1788,9 @@ namespace Sass {
     { }
     virtual ~Selector() = 0;
     // virtual Selector_Placeholder* find_placeholder();
-    virtual int specificity() { return Constants::SPECIFICITY_BASE; }
+    virtual unsigned long specificity() {
+      return Constants::Specificity_Universal;
+    };
   };
   inline Selector::~Selector() { }
 
@@ -1750,6 +1818,7 @@ namespace Sass {
     virtual ~Simple_Selector() = 0;
     virtual Compound_Selector* unify_with(Compound_Selector*, Context&);
     virtual bool is_pseudo_element() { return false; }
+    virtual bool is_pseudo_class() { return false; }
 
     bool operator==(const Simple_Selector& rhs) const;
     inline bool operator!=(const Simple_Selector& rhs) const { return !(*this == rhs); }
@@ -1767,10 +1836,10 @@ namespace Sass {
     Selector_Reference(ParserState pstate, Selector* r = 0)
     : Simple_Selector(pstate), selector_(r)
     { has_reference(true); }
-    virtual int specificity()
+    virtual unsigned long specificity()
     {
-      if (selector()) return selector()->specificity();
-      else            return 0;
+      if (!selector()) return 0;
+      return selector()->specificity();
     }
     ATTACH_OPERATIONS();
   };
@@ -1797,10 +1866,11 @@ namespace Sass {
     Type_Selector(ParserState pstate, string n)
     : Simple_Selector(pstate), name_(n)
     { }
-    virtual int specificity()
+    virtual unsigned long specificity()
     {
-      if (name() == "*") return 0;
-      else               return 1;
+      // ToDo: What is the specificity of the star selector?
+      if (name() == "*") return Constants::Specificity_Universal;
+      else               return Constants::Specificity_Type;
     }
     virtual Compound_Selector* unify_with(Compound_Selector*, Context&);
     ATTACH_OPERATIONS();
@@ -1815,10 +1885,11 @@ namespace Sass {
     Selector_Qualifier(ParserState pstate, string n)
     : Simple_Selector(pstate), name_(n)
     { }
-    virtual int specificity()
+    virtual unsigned long specificity()
     {
-      if (name()[0] == '#') return Constants::SPECIFICITY_BASE * Constants::SPECIFICITY_BASE;
-      else                  return Constants::SPECIFICITY_BASE;
+      if (name()[0] == '#') return Constants::Specificity_ID;
+      if (name()[0] == '.') return Constants::Specificity_Class;
+      else                  return Constants::Specificity_Type;
     }
     virtual Compound_Selector* unify_with(Compound_Selector*, Context&);
     ATTACH_OPERATIONS();
@@ -1835,12 +1906,28 @@ namespace Sass {
     Attribute_Selector(ParserState pstate, string n, string m, String* v)
     : Simple_Selector(pstate), name_(n), matcher_(m), value_(v)
     { }
+    virtual unsigned long specificity()
+    {
+      return Constants::Specificity_Attr;
+    }
     ATTACH_OPERATIONS();
   };
 
   //////////////////////////////////////////////////////////////////
   // Pseudo selectors -- e.g., :first-child, :nth-of-type(...), etc.
   //////////////////////////////////////////////////////////////////
+  /* '::' starts a pseudo-element, ':' a pseudo-class */
+  /* Except :first-line, :first-letter, :before and :after */
+  /* Note that pseudo-elements are restricted to one per selector */
+  /* and occur only in the last simple_selector_sequence. */
+  inline bool is_pseudo_class_element(const string& name)
+  {
+    return name == ":before"       ||
+           name == ":after"        ||
+           name == ":first-line"   ||
+           name == ":first-letter";
+  }
+
   class Pseudo_Selector : public Simple_Selector {
     ADD_PROPERTY(string, name);
     ADD_PROPERTY(String*, expression);
@@ -1848,29 +1935,33 @@ namespace Sass {
     Pseudo_Selector(ParserState pstate, string n, String* expr = 0)
     : Simple_Selector(pstate), name_(n), expression_(expr)
     { }
-    virtual int specificity()
+
+    // A pseudo-class always consists of a "colon" (:) followed by the name
+    // of the pseudo-class and optionally by a value between parentheses.
+    virtual bool is_pseudo_class()
     {
-      // TODO: clean up the pseudo-element checking
-      if (name() == ":before"       || name() == "::before"     ||
-          name() == ":after"        || name() == "::after"      ||
-          name() == ":first-line"   || name() == "::first-line" ||
-          name() == ":first-letter" || name() == "::first-letter")
-        return 1;
-      else
-        return Constants::SPECIFICITY_BASE;
+      return (name_[0] == ':' && name_[1] != ':')
+             && ! is_pseudo_class_element(name_);
     }
+
+    // A pseudo-element is made of two colons (::) followed by the name.
+    // The `::` notation is introduced by the current document in order to
+    // establish a discrimination between pseudo-classes and pseudo-elements.
+    // For compatibility with existing style sheets, user agents must also
+    // accept the previous one-colon notation for pseudo-elements introduced
+    // in CSS levels 1 and 2 (namely, :first-line, :first-letter, :before and
+    // :after). This compatibility is not allowed for the new pseudo-elements
+    // introduced in this specification.
     virtual bool is_pseudo_element()
     {
-      if (name() == ":before"       || name() == "::before"     ||
-          name() == ":after"        || name() == "::after"      ||
-          name() == ":first-line"   || name() == "::first-line" ||
-          name() == ":first-letter" || name() == "::first-letter") {
-        return true;
-      }
-      else {
-        // If it's not a known pseudo-element, check whether it looks like one. This is similar to the type method on the Pseudo class in ruby sass.
-        return name().find("::") == 0;
-      }
+      return (name_[0] == ':' && name_[1] == ':')
+             || is_pseudo_class_element(name_);
+    }
+    virtual unsigned long specificity()
+    {
+      if (is_pseudo_element())
+        return Constants::Specificity_Type;
+      return Constants::Specificity_Pseudo;
     }
     virtual Compound_Selector* unify_with(Compound_Selector*, Context&);
     ATTACH_OPERATIONS();
@@ -1886,6 +1977,12 @@ namespace Sass {
     Wrapped_Selector(ParserState pstate, string n, Selector* sel)
     : Simple_Selector(pstate), name_(n), selector_(sel)
     { }
+    // Selectors inside the negation pseudo-class are counted like any
+    // other, but the negation itself does not count as a pseudo-class.
+    virtual unsigned long specificity()
+    {
+      return selector_ ? selector_->specificity() : 0;
+    }
     ATTACH_OPERATIONS();
   };
 
@@ -1926,7 +2023,7 @@ namespace Sass {
       return 0;
     }
     bool is_superselector_of(Compound_Selector* rhs);
-    virtual int specificity()
+    virtual unsigned long specificity()
     {
       int sum = 0;
       for (size_t i = 0, L = length(); i < L; ++i)
@@ -1987,7 +2084,7 @@ namespace Sass {
     // virtual Selector_Placeholder* find_placeholder();
     Combinator clear_innermost();
     void set_innermost(Complex_Selector*, Combinator);
-    virtual int specificity() const
+    virtual unsigned long specificity() const
     {
       int sum = 0;
       if (head()) sum += head()->specificity();
@@ -2068,9 +2165,9 @@ namespace Sass {
     : Selector(pstate), Vectorized<Complex_Selector*>(s), wspace_(0)
     { }
     // virtual Selector_Placeholder* find_placeholder();
-    virtual int specificity()
+    virtual unsigned long specificity()
     {
-      int sum = 0;
+      unsigned long sum = 0;
       for (size_t i = 0, L = length(); i < L; ++i)
       { sum += (*this)[i]->specificity(); }
       return sum;