Merge branch 'master' into str_len_func

Author: wonja

constants.cpp

@@ -54,20 +54,22 @@ namespace Sass {
     extern const char vendor_khtml_kwd[]    = "-khtml-";
 
     // css functions and keywords
-    extern const char charset_kwd[]    = "@charset";
-    extern const char media_kwd[]      = "@media";
-    extern const char keyframes_kwd[]  = "keyframes";
-    extern const char only_kwd[]       = "only";
-    extern const char rgb_kwd[]        = "rgb(";
-    extern const char url_kwd[]        = "url(";
-    extern const char image_url_kwd[]  = "image-url(";
-    extern const char important_kwd[]  = "important";
-    extern const char pseudo_not_kwd[] = ":not(";
-    extern const char even_kwd[]       = "even";
-    extern const char odd_kwd[]        = "odd";
-    extern const char progid_kwd[]     = "progid";
-    extern const char expression_kwd[] = "expression";
-    extern const char calc_kwd[]       = "calc(";
+    extern const char charset_kwd[]      = "@charset";
+    extern const char media_kwd[]        = "@media";
+    extern const char keyframes_kwd[]    = "keyframes";
+    extern const char only_kwd[]         = "only";
+    extern const char rgb_kwd[]          = "rgb(";
+    extern const char url_kwd[]          = "url(";
+    extern const char image_url_kwd[]    = "image-url(";
+    extern const char important_kwd[]    = "important";
+    extern const char pseudo_not_kwd[]   = ":not(";
+    extern const char even_kwd[]         = "even";
+    extern const char odd_kwd[]          = "odd";
+    extern const char progid_kwd[]       = "progid";
+    extern const char expression_kwd[]   = "expression";
+    extern const char calc_kwd[]         = "calc(";
+    extern const char moz_calc_kwd[]     = "-moz-calc(";
+    extern const char webkit_calc_kwd[]  = "-webkit-calc(";
 
     // css attribute-matching operators
     extern const char tilde_equal[]  = "~=";

constants.hpp

@@ -68,6 +68,8 @@ namespace Sass {
     extern const char progid_kwd[];
     extern const char expression_kwd[];
     extern const char calc_kwd[];
+    extern const char moz_calc_kwd[];
+    extern const char webkit_calc_kwd[];
 
     // css attribute-matching operators
     extern const char tilde_equal[];

eval.cpp

@@ -477,7 +477,7 @@ namespace Sass {
   Expression* Eval::operator()(String_Schema* s)
   {
     string acc;
-    To_String to_string(&ctx);
+    To_String to_string(0);
     for (size_t i = 0, L = s->length(); i < L; ++i) {
       string chunk((*s)[i]->perform(this)->perform(&to_string));
       if (((s->quote_mark() && is_quoted(chunk)) || !s->quote_mark()) && (*s)[i]->is_interpolant()) { // some redundancy in that test

parser.cpp

@@ -916,7 +916,9 @@ namespace Sass {
       }
       return kwd_arg;
     }
-    else if (peek< exactly<calc_kwd> >()) {
+    else if (peek< exactly< calc_kwd > >() ||
+             peek< exactly< moz_calc_kwd > >() ||
+             peek< exactly< webkit_calc_kwd > >()) {
       return parse_calc_function();
     }
     else if (peek< functional_schema >()) {
@@ -1469,6 +1471,7 @@ namespace Sass {
   {
     const char* p = start ? start : position;
     const char* q;
+    bool saw_stuff = false;
     bool saw_interpolant = false;
 
     while ((q = peek< identifier >(p))                             ||
@@ -1508,12 +1511,13 @@ namespace Sass {
            (q = peek< sequence< exactly<'-'>, interpolant > >(p))  ||
            (q = peek< sequence< pseudo_prefix, interpolant > >(p)) ||
            (q = peek< interpolant >(p))) {
+      saw_stuff = true;
       p = q;
       if (*(p - 1) == '}') saw_interpolant = true;
     }
 
     Selector_Lookahead result;
-    result.found            = peek< exactly<'{'> >(p) ? p : 0;
+    result.found            = saw_stuff && peek< exactly<'{'> >(p) ? p : 0;
     result.has_interpolants = saw_interpolant;
 
     return result;