ext/libsass/src/prelexer.hpp in sassc-1.11.4 vs ext/libsass/src/prelexer.hpp in sassc-1.12.0

- old
+ new

@@ -44,11 +44,11 @@ template <char beg, char end, bool esc> const char* delimited_by(const char* src) { src = exactly<beg>(src); if (!src) return 0; const char* stop; - while (1) { + while (true) { if (!*src) return 0; stop = exactly<end>(src); if (stop && (!esc || *(src - 1) != '\\')) return stop; src = stop ? stop : src + 1; } @@ -137,11 +137,11 @@ template <const char* beg, const char* end, bool esc> const char* delimited_by(const char* src) { src = exactly<beg>(src); if (!src) return 0; const char* stop; - while (1) { + while (true) { if (!*src) return 0; stop = exactly<end>(src); if (stop && (!esc || *(src - 1) != '\\')) return stop; src = stop ? stop : src + 1; } @@ -262,11 +262,10 @@ const char* kwd_in(const char* src); const char* kwd_while_directive(const char* src); const char* re_nothing(const char* src); - const char* re_type_selector2(const char* src); const char* re_special_fun(const char* src); const char* kwd_warn(const char* src); const char* kwd_err(const char* src); @@ -353,17 +352,22 @@ const char* ie_property(const char* src); const char* ie_keyword_arg(const char* src); const char* ie_keyword_arg_value(const char* src); const char* ie_keyword_arg_property(const char* src); + // characters that terminate parsing of a list + const char* list_terminator(const char* src); + const char* space_list_terminator(const char* src); + // match url() const char* H(const char* src); const char* W(const char* src); // `UNICODE` makes VS sad const char* UUNICODE(const char* src); const char* NONASCII(const char* src); const char* ESCAPE(const char* src); + const char* real_uri(const char* src); const char* real_uri_suffix(const char* src); // const char* real_uri_prefix(const char* src); const char* real_uri_value(const char* src); // Path matching functions. @@ -373,9 +377,12 @@ const char* static_string(const char* src); const char* static_component(const char* src); const char* static_property(const char* src); const char* static_value(const char* src); + + const char* css_variable_value(const char* src); + const char* css_variable_top_level_value(const char* src); // Utility functions for finding and counting characters in a string. template<char c> const char* find_first(const char* src) { while (*src && *src != c) ++src;