Skip to content

Commit

Permalink
Enable url function overloading
Browse files Browse the repository at this point in the history 
sass#674
  • Loading branch information
@mgreter
mgreter committed Apr 3, 2015
1 parent 70992f4 commit fd1814c
Show file tree
Hide file tree
Showing 8 changed files with 126 additions and 95 deletions.
5 changes: 4 additions & 1 deletion constants.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ namespace Sass {
extern const char sign_chars[] = "-+";
extern const char hyphen[] = "-";
extern const char ellipsis[] = "...";
extern const char url_space_chars[] = " \t\r\n\f";
// extern const char url_space_chars[] = " \t\r\n\f";
extern const char escape_chars[] = " -~"; // need to include unicode spaces too
// type names
extern const char numeric_name[] = "numeric value";
Expand All @@ -137,6 +137,9 @@ namespace Sass {
extern const char map_name[] = "map";
extern const char arglist_name[] = "arglist";

// constants for uri parsing (RFC 3986 Appendix A.)
extern const char uri_chars[] = ":/?!$%&#@[]{}'\"*+-._=";

// some specific constant character classes
// they must be static to be useable by lexer
extern const char static_ops[] = "*/%";
Expand Down
5 changes: 4 additions & 1 deletion constants.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ namespace Sass {
extern const char sign_chars[];
extern const char hyphen[];
extern const char ellipsis[];
extern const char url_space_chars[];
// extern const char url_space_chars[];
extern const char escape_chars[];

// type names
Expand All @@ -139,6 +139,9 @@ namespace Sass {
extern const char map_name[];
extern const char arglist_name[];

// constants for uri parsing (RFC 3986 Appendix A.)
extern const char uri_chars[];

// some specific constant character classes
// they must be static to be useable by lexer
extern const char static_ops[];
Expand Down
16 changes: 15 additions & 1 deletion lexer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,20 @@ namespace Sass {

namespace Prelexer {

//####################################
// BASIC CHARACTER MATCHERS
//####################################

// Match standard control chars
const char* kwd_at(const char* src) { return exactly<'@'>(src); }
const char* kwd_dot(const char* src) { return exactly<'.'>(src); }
const char* kwd_comma(const char* src) { return exactly<','>(src); };
const char* kwd_colon(const char* src) { return exactly<':'>(src); };
const char* kwd_star(const char* src) { return exactly<'*'>(src); };
const char* kwd_plus(const char* src) { return exactly<'+'>(src); };
const char* kwd_minus(const char* src) { return exactly<'-'>(src); };
const char* kwd_slash(const char* src) { return exactly<'/'>(src); };

//####################################
// implement some function that do exist in the standard
// but those are locale aware which brought some trouble
Expand Down Expand Up @@ -69,7 +83,7 @@ namespace Sass {
}

//####################################
// BASIC CHARACTER MATCHERS
// BASIC CLASS MATCHERS
//####################################

// create matchers that advance the position
Expand Down
22 changes: 18 additions & 4 deletions lexer.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,20 @@ namespace Sass {
// BASIC CHARACTER MATCHERS
//####################################

// Match standard control chars
const char* kwd_at(const char* src);
const char* kwd_dot(const char* src);
const char* kwd_comma(const char* src);
const char* kwd_colon(const char* src);
const char* kwd_star(const char* src);
const char* kwd_plus(const char* src);
const char* kwd_minus(const char* src);
const char* kwd_slash(const char* src);

//####################################
// BASIC CLASS MATCHERS
//####################################

// These are locale independant
const bool is_space(const char& src);
const bool is_alpha(const char& src);
Expand Down Expand Up @@ -120,10 +134,10 @@ namespace Sass {
// Aka. zero-width positive lookahead.
// Regex equivalent: /(?=literal)/
// just hangs around until we need it
// template <prelexer mx>
// const char* lookahead(const char* src) {
// return mx(src) ? src : 0;
// }
template <prelexer mx>
const char* lookahead(const char* src) {
return mx(src) ? src : 0;
}

// Tries supplied matchers in order.
// Succeeds if one of them succeeds.
Expand Down
118 changes: 45 additions & 73 deletions parser.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,8 +266,18 @@ namespace Sass {
import_single_file(imp, lexed);
}
}
else if (peek< uri_prefix >()) {
imp->urls().push_back(parse_value());
else if (lex< uri_prefix >()) {
Arguments* args = new (ctx.mem) Arguments(pstate);
Function_Call* result = new (ctx.mem) Function_Call(pstate, "url", args);
if (lex < uri_value >()) { // chunk seems to work too!
String* the_url = parse_interpolated_chunk(lexed);
*args << new (ctx.mem) Argument(the_url->pstate(), the_url);
}
else {
error("malformed URL", pstate);
}
if (!lex< exactly<')'> >()) error("URI is missing ')'", pstate);
imp->urls().push_back(result);
}
else {
if (first) error("@import directive requires a url or quoted path", pstate);
Expand Down Expand Up @@ -301,16 +311,16 @@ namespace Sass {

Parameters* Parser::parse_parameters()
{
string name(lexed); // for the error message
string name(lexed);
Position position = after_token;
Parameters* params = new (ctx.mem) Parameters(pstate);
if (lex< exactly<'('> >()) {
if (lex_css< exactly<'('> >()) {
// if there's anything there at all
if (!peek< exactly<')'> >()) {
if (!peek_css< exactly<')'> >()) {
do (*params) << parse_parameter();
while (lex_css< exactly<','> >());
}
while (lex< alternatives < spaces, block_comment > >()) {};
if (!lex< exactly<')'> >()) error("expected a variable name (e.g. $x) or ')' for the parameter list for " + name, pstate);
if (!lex_css< exactly<')'> >()) error("expected a variable name (e.g. $x) or ')' for the parameter list for " + name, position);
}
return params;
}
Expand Down Expand Up @@ -351,34 +361,36 @@ namespace Sass {
return the_call;
}

Arguments* Parser::parse_arguments()
Arguments* Parser::parse_arguments(bool has_url)
{
string name(lexed);
Position position = after_token;
Arguments* args = new (ctx.mem) Arguments(pstate);

if (lex< exactly<'('> >()) {
if (lex_css< exactly<'('> >()) {
// if there's anything there at all
if (!peek< exactly<')'> >()) {
do (*args) << parse_argument();
if (!peek_css< exactly<')'> >()) {
do (*args) << parse_argument(has_url);
while (lex_css< exactly<','> >());
}
while (lex< block_comment >());
if (!lex< exactly<')'> >()) error("expected a variable name (e.g. $x) or ')' for the parameter list for " + name, pstate);
if (!lex_css< exactly<')'> >()) error("expected a variable name (e.g. $x) or ')' for the parameter list for " + name, position);
}

return args;
}

Argument* Parser::parse_argument()
Argument* Parser::parse_argument(bool has_url)
{

Argument* arg;
while (lex< alternatives < spaces, block_comment > >());
if (peek< sequence < variable, zero_plus < alternatives < spaces, line_comment, block_comment > >, exactly<':'> > >()) {
lex< variable >();
// some urls can look like line comments (parse literally - chunk would not work)
if (has_url && lex< sequence < uri_value, lookahead < exactly<')'> > > >(false)) {
String* the_url = parse_interpolated_chunk(lexed);
arg = new (ctx.mem) Argument(the_url->pstate(), the_url);
}
else if (peek_css< sequence < variable, optional_css_comments, exactly<':'> > >()) {
lex_css< variable >();
string name(Util::normalize_underscores(lexed));
ParserState p = pstate;
while (lex< alternatives < spaces, block_comment > >()) {};
lex< exactly<':'> >();
lex_css< exactly<':'> >();
Expression* val = parse_space_list();
val->is_delayed(false);
arg = new (ctx.mem) Argument(p, val, name);
Expand All @@ -388,7 +400,7 @@ namespace Sass {
bool is_keyword = false;
Expression* val = parse_space_list();
val->is_delayed(false);
if (lex< exactly< ellipsis > >()) {
if (lex_css< exactly< ellipsis > >()) {
if (val->concrete_type() == Expression::MAP) is_keyword = true;
else is_arglist = true;
}
Expand Down Expand Up @@ -1118,10 +1130,10 @@ namespace Sass {
{
Expression* conj1 = parse_conjunction();
// if it's a singleton, return it directly; don't wrap it
if (!peek< sequence< kwd_or, negate< identifier > > >()) return conj1;
if (!peek_css< kwd_or >()) return conj1;

vector<Expression*> operands;
while (lex< sequence< kwd_or, negate< identifier > > >())
while (lex_css< kwd_or >())
operands.push_back(parse_conjunction());

return fold_operands(conj1, operands, Binary_Expression::OR);
Expand All @@ -1131,10 +1143,10 @@ namespace Sass {
{
Expression* rel1 = parse_relation();
// if it's a singleton, return it directly; don't wrap it
if (!peek< sequence< kwd_and, negate< identifier > > >()) return rel1;
if (!peek_css< kwd_and >()) return rel1;

vector<Expression*> operands;
while (lex< sequence< kwd_and, negate< identifier > > >())
while (lex_css< kwd_and >())
operands.push_back(parse_relation());

return fold_operands(rel1, operands, Binary_Expression::AND);
Expand Down Expand Up @@ -1249,7 +1261,7 @@ namespace Sass {
else if (peek< sequence< identifier_schema, negate< exactly<'%'> > > >()) {
return parse_identifier_schema();
}
else if (peek< functional >() && !peek< uri_prefix >()) {
else if (peek< functional >()) {
return parse_function_call();
}
else if (lex< sequence< exactly<'+'>, optional_css_whitespace, negate< number > > >()) {
Expand All @@ -1272,45 +1284,7 @@ namespace Sass {

Expression* Parser::parse_value()
{
while (lex< block_comment >());
if (lex< uri_prefix >()) {
Arguments* args = new (ctx.mem) Arguments(pstate);
Function_Call* result = new (ctx.mem) Function_Call(pstate, "url", args);
const char* here = position;
Position here_p = before_token;
// Try to parse a SassScript expression. If it succeeds and we can munch
// a matching rparen, then that's our url. If we can't munch a matching
// rparen, or if the attempt to parse an expression fails, then try to
// munch a regular CSS url.
try {
// special case -- if there's a comment, treat it as part of a URL
lex<spaces>();
if (peek<line_comment>() || peek<block_comment_prefix>()) error("comment in URL", pstate); // doesn't really matter what we throw
Expression* expr = parse_list();
if (!lex< exactly<')'> >()) error("dangling expression in URL", pstate); // doesn't really matter what we throw
Argument* arg = new (ctx.mem) Argument(expr->pstate(), expr);
*args << arg;
return result;
}
catch (Sass_Error&) {
// back up so we can try again
position = here;
before_token = here_p;
}
catch (...) { throw; }
lex< spaces >();
if (lex< url >()) {
String* the_url = parse_interpolated_chunk(lexed);
Argument* arg = new (ctx.mem) Argument(the_url->pstate(), the_url);
*args << arg;
}
else {
error("malformed URL", pstate);
}
if (!lex< exactly<')'> >()) error("URI is missing ')'", pstate);
return result;
}

lex< css_comments >();
if (lex< ampersand >())
{
return new (ctx.mem) Parent_Selector(pstate, parse_selector_group()); }
Expand All @@ -1322,13 +1296,13 @@ namespace Sass {
if ((stop = peek< value_schema >()))
{ return parse_value_schema(stop); }

if (lex< sequence< kwd_true, negate< identifier > > >())
if (lex< kwd_true >())
{ return new (ctx.mem) Boolean(pstate, true); }

if (lex< sequence< kwd_false, negate< identifier > > >())
if (lex< kwd_false >())
{ return new (ctx.mem) Boolean(pstate, false); }

if (lex< sequence< kwd_null, negate< identifier > > >())
if (lex< kwd_null >())
{ return new (ctx.mem) Null(pstate); }

if (lex< identifier >()) {
Expand Down Expand Up @@ -1634,10 +1608,8 @@ namespace Sass {
{
lex< identifier >();
string name(lexed);
ParserState source_position_of_call = pstate;

Function_Call* the_call = new (ctx.mem) Function_Call(source_position_of_call, name, parse_arguments());
return the_call;
Arguments* args = parse_arguments(name == "url");
return new (ctx.mem) Function_Call(pstate, name, args);
}

Function_Call_Schema* Parser::parse_function_call_schema()
Expand Down
16 changes: 10 additions & 6 deletions parser.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,7 @@ namespace Sass {
const char* it_position = start ? start : position;

// skip white-space?
if (mx == url ||
mx == spaces ||
if (mx == spaces ||
mx == no_spaces ||
mx == css_comments ||
mx == css_whitespace ||
Expand Down Expand Up @@ -123,12 +122,17 @@ namespace Sass {
// sourcemap offset and we modify the position pointer!
// lex will only skip over space, tabs and line comment
template <prelexer mx>
const char* lex()
const char* lex(bool lazy = true)
{

// position considered before lexed token
// we can skip whitespace or comments for
// lazy developers (but we need control)
const char* it_before_token = position;

// sneak up to the actual token we want to lex
// this should skip over white-space if desired
const char* it_before_token = sneak < mx >(position);
if (lazy) it_before_token = sneak < mx >(position);

// now call matcher to get position after token
const char* it_after_token = mx(it_before_token);
Expand Down Expand Up @@ -196,8 +200,8 @@ namespace Sass {
Parameters* parse_parameters();
Parameter* parse_parameter();
Mixin_Call* parse_mixin_call();
Arguments* parse_arguments();
Argument* parse_argument();
Arguments* parse_arguments(bool has_url = false);
Argument* parse_argument(bool has_url = false);
Assignment* parse_assignment();
// Propset* parse_propset();
Ruleset* parse_ruleset(Selector_Lookahead lookahead);
Expand Down
Loading

0 comments on commit fd1814c

Please sign in to comment.