Merge pull request sass#1319 from xzyfer/fix/1307

Fix parsing edge case for number units
scantist-ossops-m2 · Jul 8, 2015 · efd7b76 · efd7b76
2 parents 5f93d91 + 0939984
commit efd7b76
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/ast.cpp b/ast.cpp
@@ -668,12 +668,15 @@ namespace Sass {
       bool nominator = true;
       while (true) {
         r = u.find_first_of("*/", l);
-        string unit(u.substr(l, r - l));
+        string unit(u.substr(l, r == string::npos ? r : r - l));
         if (nominator) numerator_units_.push_back(unit);
         else denominator_units_.push_back(unit);
-        if (u[r] == '/') nominator = false;
         if (r == string::npos) break;
-        else l = r + 1;
+        // ToDo: should error for multiple slashes
+        // if (!nominator && u[r] == '/') error(...)
+        if (u[r] == '/')
+          nominator = false;
+        l = r + 1;
       }
     }
     concrete_type(NUMBER);