Merge pull request #2028 from mgreter/bugfix/issue_1706

Fix parsing of calc function invocations

Author: mgreter

src/constants.cpp

@@ -88,10 +88,6 @@ namespace Sass {
     extern const char progid_kwd[]       = "progid";
     extern const char expression_kwd[]   = "expression";
     extern const char calc_fn_kwd[]      = "calc";
-    extern const char calc_kwd[]         = "calc(";
-    extern const char moz_calc_kwd[]     = "-moz-calc(";
-    extern const char webkit_calc_kwd[]  = "-webkit-calc(";
-    extern const char ms_calc_kwd[]      = "-ms-calc(";
 
     // css selector keywords
     extern const char sel_deep_kwd[] = "/deep/";

src/constants.hpp

@@ -87,11 +87,7 @@ namespace Sass {
     extern const char odd_kwd[];
     extern const char progid_kwd[];
     extern const char expression_kwd[];
-    extern const char calc_kwd[];
     extern const char calc_fn_kwd[];
-    extern const char moz_calc_kwd[];
-    extern const char webkit_calc_kwd[];
-    extern const char ms_calc_kwd[];
 
     // css selector keywords
     extern const char sel_deep_kwd[];

src/expand.cpp

@@ -652,7 +652,7 @@ namespace Sass {
                         (d->type() == Definition::MIXIN ? "[m]" : "[f]")] = dd;
 
     if (d->type() == Definition::FUNCTION && (
-      d->name() == "calc"       ||
+      Prelexer::calc_fn_call(d->name().c_str()) ||
       d->name() == "element"    ||
       d->name() == "expression" ||
       d->name() == "url"

src/lexer.cpp

@@ -121,13 +121,15 @@ namespace Sass {
     const char* xdigit(const char* src) { return is_xdigit(*src) ? src + 1 : 0; }
     const char* alnum(const char* src) { return is_alnum(*src) ? src + 1 : 0; }
     const char* punct(const char* src) { return is_punct(*src) ? src + 1 : 0; }
+    const char* hyphen(const char* src) { return *src && *src == '-' ? src + 1 : 0; }
     const char* character(const char* src) { return is_character(*src) ? src + 1 : 0; }
     const char* uri_character(const char* src) { return is_uri_character(*src) ? src + 1 : 0; }
     const char* escapable_character(const char* src) { return is_escapable_character(*src) ? src + 1 : 0; }
 
     // Match multiple ctype characters.
     const char* spaces(const char* src) { return one_plus<space>(src); }
     const char* digits(const char* src) { return one_plus<digit>(src); }
+    const char* hyphens(const char* src) { return one_plus<hyphen>(src); }
 
     // Whitespace handling.
     const char* no_spaces(const char* src) { return negate< space >(src); }

src/lexer.hpp

@@ -44,6 +44,7 @@ namespace Sass {
     const char* xdigit(const char* src);
     const char* alnum(const char* src);
     const char* punct(const char* src);
+    const char* hyphen(const char* src);
     const char* unicode(const char* src);
     const char* nonascii(const char* src);
     const char* character(const char* src);
@@ -53,6 +54,7 @@ namespace Sass {
     // Match multiple ctype characters.
     const char* spaces(const char* src);
     const char* digits(const char* src);
+    const char* hyphens(const char* src);
 
     // Whitespace handling.
     const char* no_spaces(const char* src);

src/parser.cpp

@@ -1325,10 +1325,7 @@ namespace Sass {
     else if (peek< ie_keyword_arg >()) {
       return parse_ie_keyword_arg();
     }
-    else if (peek< exactly< calc_kwd > >() ||
-             peek< exactly< moz_calc_kwd > >() ||
-             peek< exactly< ms_calc_kwd > >() ||
-             peek< exactly< webkit_calc_kwd > >()) {
+    else if (peek< sequence < calc_fn_call, exactly <'('> > >()) {
       return parse_calc_function();
     }
     else if (lex < functional_schema >()) {

src/prelexer.cpp

@@ -825,6 +825,22 @@ namespace Sass {
       return sequence<exactly<'$'>, identifier>(src);
     }
 
+    // parse `calc`, `-a-calc` and `--b-c-calc`
+    // but do not parse `foocalc` or `foo-calc`
+    const char* calc_fn_call(const char* src) {
+      return sequence <
+        optional < sequence <
+          hyphens,
+          one_plus < sequence <
+            strict_identifier,
+            hyphens
+          > >
+        > >,
+        exactly < calc_fn_kwd >,
+        word_boundary
+      >(src);
+    }
+
     // Match Sass boolean keywords.
     const char* kwd_true(const char* src) {
       return word<true_kwd>(src);
@@ -1183,6 +1199,12 @@ namespace Sass {
     // lexer special_fn: these functions cannot be overloaded
     // (/((-[\w-]+-)?(calc|element)|expression|progid:[a-z\.]*)\(/i)
     const char* re_special_fun(const char* src) {
+
+      // match this first as we test prefix hyphens
+      if (const char* calc = calc_fn_call(src)) {
+        return calc;
+      }
+
       return sequence <
         optional <
           sequence <
@@ -1197,7 +1219,6 @@ namespace Sass {
           >
         >,
         alternatives <
-          word < calc_fn_kwd >,
           word < expression_kwd >,
           sequence <
             sequence <

src/prelexer.hpp

@@ -331,6 +331,7 @@ namespace Sass {
 
     // Match SCSS variable names.
     const char* variable(const char* src);
+    const char* calc_fn_call(const char* src);
 
     // IE stuff
     const char* ie_progid(const char* src);