Skip to content

N
node-sass
Commit d3795e66 by Aaron Leung
Options

Cleaning up the list type tags and checks.

parent 068904ae
Showing with 75 additions and 122 deletions
document_parser.cpp
...@@ -664,12 +664,13 @@ namespace Sass { ...@@ -664,12 +664,13 @@ namespace Sass {
peek< exactly<'}'> >(position) || peek< exactly<'}'> >(position) ||
peek< exactly<'{'> >(position) || peek< exactly<'{'> >(position) ||
peek< exactly<')'> >(position)) peek< exactly<')'> >(position))
{ return context.new_Node(Node::nil, path, line, 0); } { return context.new_Node(Node::list, path, line, 0); }
Node list1(parse_space_list()); Node list1(parse_space_list());
// if it's a singleton, return it directly; don't wrap it // if it's a singleton, return it directly; don't wrap it
if (!peek< exactly<','> >(position)) return list1; if (!peek< exactly<','> >(position)) return list1;
Node comma_list(context.new_Node(Node::comma_list, path, line, 2)); Node comma_list(context.new_Node(Node::list, path, line, 2));
comma_list.is_comma_separated() = true;
comma_list << list1; comma_list << list1;
comma_list.should_eval() |= list1.should_eval(); comma_list.should_eval() |= list1.should_eval();
...@@ -695,7 +696,7 @@ namespace Sass { ...@@ -695,7 +696,7 @@ namespace Sass {
peek< default_flag >(position)) peek< default_flag >(position))
{ return disj1; } { return disj1; }
Node space_list(context.new_Node(Node::space_list, path, line, 2)); Node space_list(context.new_Node(Node::list, path, line, 2));
space_list << disj1; space_list << disj1;
space_list.should_eval() |= disj1.should_eval(); space_list.should_eval() |= disj1.should_eval();
...@@ -833,7 +834,7 @@ namespace Sass { ...@@ -833,7 +834,7 @@ namespace Sass {
if (lex< exactly<'('> >()) { if (lex< exactly<'('> >()) {
Node value(parse_comma_list()); Node value(parse_comma_list());
value.should_eval() = true; value.should_eval() = true;
if (value.type() == Node::comma_list || value.type() == Node::space_list) { if (value.type() == Node::list && value.size() > 0) {
value[0].should_eval() = true; value[0].should_eval() = true;
} }
if (!lex< exactly<')'> >()) throw_syntax_error("unclosed parenthesis"); if (!lex< exactly<')'> >()) throw_syntax_error("unclosed parenthesis");
......
eval_apply.cpp
...@@ -138,7 +138,7 @@ namespace Sass { ...@@ -138,7 +138,7 @@ namespace Sass {
case Node::assignment: { case Node::assignment: {
Node val(expr[1]); Node val(expr[1]);
if (val.type() == Node::comma_list || val.type() == Node::space_list) { if (val.type() == Node::list) {
for (size_t i = 0, S = val.size(); i < S; ++i) { for (size_t i = 0, S = val.size(); i < S; ++i) {
if (val[i].should_eval()) val[i] = eval(val[i], prefix, env, f_env, new_Node, ctx); if (val[i].should_eval()) val[i] = eval(val[i], prefix, env, f_env, new_Node, ctx);
} }
...@@ -163,7 +163,7 @@ namespace Sass { ...@@ -163,7 +163,7 @@ namespace Sass {
Node lhs(expr[0]); Node lhs(expr[0]);
if (lhs.should_eval()) eval(lhs, prefix, env, f_env, new_Node, ctx); if (lhs.should_eval()) eval(lhs, prefix, env, f_env, new_Node, ctx);
Node rhs(expr[1]); Node rhs(expr[1]);
if (rhs.type() == Node::comma_list || rhs.type() == Node::space_list) { if (rhs.type() == Node::list) {
for (size_t i = 0, S = rhs.size(); i < S; ++i) { for (size_t i = 0, S = rhs.size(); i < S; ++i) {
if (rhs[i].should_eval()) rhs[i] = eval(rhs[i], prefix, env, f_env, new_Node, ctx); if (rhs[i].should_eval()) rhs[i] = eval(rhs[i], prefix, env, f_env, new_Node, ctx);
} }
...@@ -177,8 +177,7 @@ namespace Sass { ...@@ -177,8 +177,7 @@ namespace Sass {
return expr; return expr;
} break; } break;
case Node::comma_list: case Node::list: {
case Node::space_list: {
if (expr.should_eval()) expr[0] = eval(expr[0], prefix, env, f_env, new_Node, ctx); if (expr.should_eval()) expr[0] = eval(expr[0], prefix, env, f_env, new_Node, ctx);
return expr; return expr;
} break; } break;
...@@ -426,8 +425,8 @@ namespace Sass { ...@@ -426,8 +425,8 @@ namespace Sass {
fake_mixin << new_Node(Node::identifier, "", 0, Token::make(each_kwd)) << (fake_param << expr[0]) << expr[2]; fake_mixin << new_Node(Node::identifier, "", 0, Token::make(each_kwd)) << (fake_param << expr[0]) << expr[2];
Node list(eval(expr[1], prefix, env, f_env, new_Node, ctx)); Node list(eval(expr[1], prefix, env, f_env, new_Node, ctx));
// If the list isn't really a list, make a singleton out of it. // If the list isn't really a list, make a singleton out of it.
if (list.type() != Node::space_list && list.type() != Node::comma_list) { if (list.type() != Node::list) {
list = (new_Node(Node::space_list, list.path(), list.line(), 1) << list); list = (new_Node(Node::list, list.path(), list.line(), 1) << list);
} }
expr.pop_back(); expr.pop_back();
expr.pop_back(); expr.pop_back();
...@@ -770,7 +769,7 @@ namespace Sass { ...@@ -770,7 +769,7 @@ namespace Sass {
{ {
case Node::assignment: { case Node::assignment: {
Node val(new_Node(stm[1])); // clone the value because it might get mutated in place Node val(new_Node(stm[1])); // clone the value because it might get mutated in place
if (val.type() == Node::comma_list || val.type() == Node::space_list) { if (val.type() == Node::list) {
for (size_t i = 0, S = val.size(); i < S; ++i) { for (size_t i = 0, S = val.size(); i < S; ++i) {
if (val[i].should_eval()) val[i] = eval(val[i], Node(), bindings, ctx.function_env, new_Node, ctx); if (val[i].should_eval()) val[i] = eval(val[i], Node(), bindings, ctx.function_env, new_Node, ctx);
} }
...@@ -835,8 +834,8 @@ namespace Sass { ...@@ -835,8 +834,8 @@ namespace Sass {
case Node::each_directive: { case Node::each_directive: {
Node iter_var(stm[0]); Node iter_var(stm[0]);
Node list(eval(new_Node(stm[1]), Node(), bindings, ctx.function_env, new_Node, ctx)); Node list(eval(new_Node(stm[1]), Node(), bindings, ctx.function_env, new_Node, ctx));
if (list.type() != Node::comma_list && list.type() != Node::space_list) { if (list.type() != Node::list) {
list = (new_Node(Node::space_list, list.path(), list.line(), 1) << list); list = (new_Node(Node::list, list.path(), list.line(), 1) << list);
} }
Node each_body(stm[2]); Node each_body(stm[2]);
Environment each_env; // re-use this env for each iteration Environment each_env; // re-use this env for each iteration
...@@ -887,8 +886,8 @@ namespace Sass { ...@@ -887,8 +886,8 @@ namespace Sass {
} break; } break;
case Node::return_directive: { case Node::return_directive: {
Node retval(eval(stm[0], Node(), bindings, ctx.function_env, new_Node, ctx)); Node retval(eval(new_Node(stm[0]), Node(), bindings, ctx.function_env, new_Node, ctx));
if (retval.type() == Node::comma_list || retval.type() == Node::space_list) { if (retval.type() == Node::list) {
for (size_t i = 0, S = retval.size(); i < S; ++i) { for (size_t i = 0, S = retval.size(); i < S; ++i) {
retval[i] = eval(retval[i], Node(), bindings, ctx.function_env, new_Node, ctx); retval[i] = eval(retval[i], Node(), bindings, ctx.function_env, new_Node, ctx);
} }
......
functions.cpp
...@@ -92,8 +92,7 @@ namespace Sass { ...@@ -92,8 +92,7 @@ namespace Sass {
return color_name; return color_name;
} break; } break;
case Node::space_list: case Node::list: {
case Node::comma_list: {
return list_name; return list_name;
} break; } break;
...@@ -134,10 +133,6 @@ namespace Sass { ...@@ -134,10 +133,6 @@ namespace Sass {
} break; } break;
} break; } break;
case Node::list: {
if (arg_type == Node::space_list || arg_type == Node::comma_list) return the_arg;
} break;
default: { default: {
if (arg_type == param_type) return the_arg; if (arg_type == param_type) return the_arg;
} break; } break;
...@@ -898,35 +893,18 @@ namespace Sass { ...@@ -898,35 +893,18 @@ namespace Sass {
extern Signature length_sig = "length($list)"; extern Signature length_sig = "length($list)";
Node length(const Node parameter_names, Environment& bindings, Node_Factory& new_Node, string& path, size_t line) { Node length(const Node parameter_names, Environment& bindings, Node_Factory& new_Node, string& path, size_t line) {
Node arg(bindings[parameter_names[0].token()]); Node arg(bindings[parameter_names[0].token()]);
switch (arg.type()) return new_Node(path, line, arg.type() == Node::list ? arg.size() : 1);
{
case Node::space_list:
case Node::comma_list: {
return new_Node(path, line, arg.size());
} break;
case Node::nil: {
return new_Node(path, line, 0);
} break;
default: {
// single objects should be reported as lists of length 1
return new_Node(path, line, 1);
} break;
}
// unreachable statement
return Node();
} }
extern Signature nth_sig = "nth($list, $n)"; extern Signature nth_sig = "nth($list, $n)";
Node nth(const Node parameter_names, Environment& bindings, Node_Factory& new_Node, string& path, size_t line) { Node nth(const Node parameter_names, Environment& bindings, Node_Factory& new_Node, string& path, size_t line) {
Node l(bindings[parameter_names[0].token()]); Node l(bindings[parameter_names[0].token()]);
if (l.type() == Node::nil) {
throw_eval_error("cannot index into an empty list", path, line);
}
// wrap the first arg if it isn't a list // wrap the first arg if it isn't a list
if (l.type() != Node::space_list && l.type() != Node::comma_list) { if (l.type() != Node::list) {
l = new_Node(Node::space_list, path, line, 1) << l; l = new_Node(Node::list, path, line, 1) << l;
}
if (l.size() == 0) {
throw_eval_error("cannot index into an empty list", path, line);
} }
// just truncate the index if it's not an integer ... more permissive than Ruby Sass // just truncate the index if it's not an integer ... more permissive than Ruby Sass
size_t n = std::floor(arg(nth_sig, path, line, parameter_names, bindings, 1, Node::numeric, 1, l.size()).numeric_value()); size_t n = std::floor(arg(nth_sig, path, line, parameter_names, bindings, 1, Node::numeric, 1, l.size()).numeric_value());
...@@ -938,12 +916,7 @@ namespace Sass { ...@@ -938,12 +916,7 @@ namespace Sass {
Node lst(bindings[parameter_names[0].token()]); Node lst(bindings[parameter_names[0].token()]);
Node val(bindings[parameter_names[1].token()]); Node val(bindings[parameter_names[1].token()]);
// if $list isn't a list, wrap it in a singleton list // if $list isn't a list, wrap it in a singleton list
Node::Type lst_type = lst.type(); if (lst.type() != Node::list) lst = (new_Node(Node::list, path, line, 1) << lst);
if (lst_type != Node::space_list && lst_type != Node::comma_list && lst_type != Node::nil) {
lst = (new_Node(Node::space_list, path, line, 1) << lst);
}
if (lst_type == Node::nil) return new_Node(Node::boolean, path, line, false);
for (size_t i = 0, S = lst.size(); i < S; ++i) { for (size_t i = 0, S = lst.size(); i < S; ++i) {
if (lst[i] == val) return new_Node(path, line, i + 1); if (lst[i] == val) return new_Node(path, line, i + 1);
...@@ -956,66 +929,54 @@ namespace Sass { ...@@ -956,66 +929,54 @@ namespace Sass {
Node join(const Node parameter_names, Environment& bindings, Node_Factory& new_Node, string& path, size_t line) { Node join(const Node parameter_names, Environment& bindings, Node_Factory& new_Node, string& path, size_t line) {
// if the args aren't lists, turn them into singleton lists // if the args aren't lists, turn them into singleton lists
Node l1(bindings[parameter_names[0].token()]); Node l1(bindings[parameter_names[0].token()]);
if (l1.type() != Node::space_list && l1.type() != Node::comma_list && l1.type() != Node::nil) { if (l1.type() != Node::list) {
l1 = new_Node(Node::space_list, path, line, 1) << l1; l1 = (new_Node(Node::list, path, line, 1) << l1);
} }
Node l2(bindings[parameter_names[1].token()]); Node l2(bindings[parameter_names[1].token()]);
if (l2.type() != Node::space_list && l2.type() != Node::comma_list && l2.type() != Node::nil) { if (l2.type() != Node::list) {
l2 = new_Node(Node::space_list, l2.path(), l2.line(), 1) << l2; l2 = (new_Node(Node::list, path, line, 1) << l2);
}
// nil + nil = nil
if (l1.type() == Node::nil && l2.type() == Node::nil) {
return new_Node(Node::nil, path, line, 0);
} }
// figure out the combined size in advance // figure out the combined size in advance
size_t size = 0; size_t size = l1.size() + l2.size();
if (l1.type() != Node::nil) size += l1.size();
if (l2.type() != Node::nil) size += l2.size();
// figure out the result type in advance // figure out the result type in advance
Node::Type rtype = Node::space_list; bool comma_sep;
string sep(bindings[parameter_names[2].token()].token().unquote()); string sep(bindings[parameter_names[2].token()].token().unquote());
if (sep == "comma") rtype = Node::comma_list;
else if (sep == "space") rtype = Node::space_list; if (sep == "comma") comma_sep = true;
else if (sep == "auto") rtype = l1.type(); else if (sep == "space") comma_sep = false;
else { else if (sep == "auto") comma_sep = l1.is_comma_separated();
throw_eval_error("third argument to 'join' must be 'space', 'comma', or 'auto'", path, line); else throw_eval_error("third argument to 'join' must be 'space', 'comma', or 'auto'", path, line);
}
if (rtype == Node::nil) rtype = l2.type(); if (l1.size() == 0) comma_sep = l2.is_comma_separated();
// accumulate the result // accumulate the result
Node lr(new_Node(rtype, path, line, size)); Node lr(new_Node(Node::list, path, line, size));
if (l1.type() != Node::nil) lr += l1; lr += l1;
if (l2.type() != Node::nil) lr += l2; lr += l2;
lr.is_comma_separated() = comma_sep;
return lr; return lr;
} }
extern Signature append_sig = "append($list1, $list2, $separator: auto)"; extern Signature append_sig = "append($list1, $list2, $separator: auto)";
Node append(const Node parameter_names, Environment& bindings, Node_Factory& new_Node, string& path, size_t line) { Node append(const Node parameter_names, Environment& bindings, Node_Factory& new_Node, string& path, size_t line) {
Node list(bindings[parameter_names[0].token()]); Node list(bindings[parameter_names[0].token()]);
switch (list.type())
{
case Node::space_list:
case Node::comma_list:
case Node::nil: {
// do nothing
} break;
// if the first arg isn't a list, wrap it in a singleton
default: {
list = (new_Node(Node::space_list, path, line, 1) << list);
} break;
}
Node::Type sep_type; // if the first arg isn't a list, wrap it in a singleton
string sep_string = bindings[parameter_names[2].token()].token().unquote(); if (list.type() != Node::list) list = (new_Node(Node::list, path, line, 1) << list);
if (sep_string == "comma") sep_type = Node::comma_list;
else if (sep_string == "space") sep_type = Node::space_list; bool comma_sep;
else if (sep_string == "auto") sep_type = list.type(); string sep(bindings[parameter_names[2].token()].token().unquote());
else throw_eval_error("third argument to 'append' must be 'space', 'comma', or 'auto'", path, line);
if (sep == "comma") comma_sep = true;
else if (sep == "space") comma_sep = false;
else if (sep == "auto") comma_sep = list.is_comma_separated();
else throw_eval_error("third argument to 'append' must be 'space', 'comma', or 'auto'", path, line);
Node new_list(new_Node(sep_type, path, line, list.size() + 1)); Node new_list(new_Node(Node::list, path, line, list.size() + 1));
new_list += list; new_list += list;
new_list << bindings[parameter_names[1].token()]; new_list << bindings[parameter_names[1].token()];
new_list.is_comma_separated() = comma_sep;
return new_list; return new_list;
} }
...@@ -1023,27 +984,29 @@ namespace Sass { ...@@ -1023,27 +984,29 @@ namespace Sass {
Node compact_1(const Node parameter_names, Environment& bindings, Node_Factory& new_Node, string& path, size_t line) { Node compact_1(const Node parameter_names, Environment& bindings, Node_Factory& new_Node, string& path, size_t line) {
Node the_arg(bindings[parameter_names[0].token()]); Node the_arg(bindings[parameter_names[0].token()]);
if (the_arg.type() == Node::comma_list || the_arg.type() == Node::space_list) { if (the_arg.type() == Node::list) {
Node non_nils(new_Node(the_arg.type(), path, line, 0)); Node non_nils(new_Node(Node::list, path, line, 0));
for (size_t i = 0, S = the_arg.size(); i < S; ++i) { for (size_t i = 0, S = the_arg.size(); i < S; ++i) {
Node elt(the_arg[i]); Node elt(the_arg[i]);
if (!elt.is_false()) non_nils << new_Node(path, line, elt); if (!elt.is_false()) non_nils << elt;
} }
return non_nils.size() > 0 ? non_nils : new_Node(Node::nil, path, line, 0); return non_nils;
} }
return new_Node(path, line, the_arg); return new_Node(Node::list, path, line, 1) << the_arg;
} }
extern Signature compact_n_sig = "compact($arg1: false, $arg2: false, $arg3: false, $arg4: false, $arg5: false, $arg6: false, $arg7: false, $arg8: false, $arg9: false, $arg10: false, $arg11: false, $arg12: false)"; extern Signature compact_n_sig = "compact($arg1: false, $arg2: false, $arg3: false, $arg4: false, $arg5: false, $arg6: false, $arg7: false, $arg8: false, $arg9: false, $arg10: false, $arg11: false, $arg12: false)";
Node compact_n(const Node parameter_names, Environment& bindings, Node_Factory& new_Node, string& path, size_t line) { Node compact_n(const Node parameter_names, Environment& bindings, Node_Factory& new_Node, string& path, size_t line) {
Node non_nils(new_Node(Node::comma_list, path, line, 0)); Node non_nils(new_Node(Node::list, path, line, 0));
non_nils.is_comma_separated() = true;
for (size_t i = 0, S = bindings.current_frame.size(); i < S; ++i) { for (size_t i = 0, S = bindings.current_frame.size(); i < S; ++i) {
Node the_arg(bindings[parameter_names[i].token()]); Node the_arg(bindings[parameter_names[i].token()]);
if (!the_arg.is_false()) non_nils << new_Node(path, line, the_arg); if (!the_arg.is_false()) non_nils << the_arg;
} }
return non_nils.size() > 0 ? non_nils : new_Node(Node::nil, path, line, 0); return non_nils;
} }
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
...@@ -1071,9 +1034,7 @@ namespace Sass { ...@@ -1071,9 +1034,7 @@ namespace Sass {
case Node::numeric_color: { case Node::numeric_color: {
type_name = Token::make(color_name); type_name = Token::make(color_name);
} break; } break;
case Node::comma_list: case Node::list: {
case Node::space_list:
case Node::nil: {
type_name = Token::make(list_name); type_name = Token::make(list_name);
} break; } break;
default: { default: {
......
node.cpp
...@@ -82,12 +82,12 @@ namespace Sass { ...@@ -82,12 +82,12 @@ namespace Sass {
switch (t) switch (t)
{ {
case comma_list: case list:
case space_list:
case expression: case expression:
case term: case term:
case numeric_color: { case numeric_color: {
if (size() != rhs.size()) return false; if (size() != rhs.size()) return false;
if ((t == list) && (is_comma_separated() != rhs.is_comma_separated())) return false;
for (size_t i = 0, L = size(); i < L; ++i) { for (size_t i = 0, L = size(); i < L; ++i) {
if (at(i) == rhs[i]) continue; if (at(i) == rhs[i]) continue;
else return false; else return false;
......
node.hpp
...@@ -74,7 +74,6 @@ namespace Sass { ...@@ -74,7 +74,6 @@ namespace Sass {
any, any,
numeric, // number, numeric_percentage, or numeric_dimension numeric, // number, numeric_percentage, or numeric_dimension
string_t, // string_constant, identifier, concatenation, schemata string_t, // string_constant, identifier, concatenation, schemata
list, // space_list or comma_list
comment, comment,
root, root,
...@@ -104,9 +103,7 @@ namespace Sass { ...@@ -104,9 +103,7 @@ namespace Sass {
rule, rule,
property, property,
nil, list,
comma_list,
space_list,
disjunction, disjunction,
conjunction, conjunction,
...@@ -196,6 +193,7 @@ namespace Sass { ...@@ -196,6 +193,7 @@ namespace Sass {
bool is_guarded() const; bool is_guarded() const;
bool& has_been_extended() const; bool& has_been_extended() const;
bool is_false() const; bool is_false() const;
bool& is_comma_separated() const;
string& path() const; string& path() const;
size_t line() const; size_t line() const;
...@@ -270,6 +268,7 @@ namespace Sass { ...@@ -270,6 +268,7 @@ namespace Sass {
bool should_eval; bool should_eval;
bool is_quoted; bool is_quoted;
bool has_been_extended; bool has_been_extended;
bool is_comma_separated;
Node_Impl() Node_Impl()
: /* value(value_t()), : /* value(value_t()),
...@@ -285,7 +284,8 @@ namespace Sass { ...@@ -285,7 +284,8 @@ namespace Sass {
from_variable(false), from_variable(false),
should_eval(false), should_eval(false),
is_quoted(false), is_quoted(false),
has_been_extended(false) has_been_extended(false),
is_comma_separated(false)
{ } { }
bool is_numeric() bool is_numeric()
...@@ -446,6 +446,7 @@ namespace Sass { ...@@ -446,6 +446,7 @@ namespace Sass {
inline bool Node::is_guarded() const { return (type() == assignment) && (size() == 3); } inline bool Node::is_guarded() const { return (type() == assignment) && (size() == 3); }
inline bool& Node::has_been_extended() const { return ip_->has_been_extended; } inline bool& Node::has_been_extended() const { return ip_->has_been_extended; }
inline bool Node::is_false() const { return (type() == boolean) && (boolean_value() == false); } inline bool Node::is_false() const { return (type() == boolean) && (boolean_value() == false); }
inline bool& Node::is_comma_separated() const { return ip_->is_comma_separated; }
inline string& Node::path() const { return ip_->path; } inline string& Node::path() const { return ip_->path; }
inline size_t Node::line() const { return ip_->line; } inline size_t Node::line() const { return ip_->line; }
......
node_emitters.cpp
...@@ -120,21 +120,12 @@ namespace Sass { ...@@ -120,21 +120,12 @@ namespace Sass {
return result; return result;
} break; } break;
case comma_list: { case list: {
if (size() == 0) return "";
string result(at(0).to_string()); string result(at(0).to_string());
for (size_t i = 1, S = size(); i < S; ++i) { for (size_t i = 1, S = size(); i < S; ++i) {
if (at(i).type() == nil) continue; if (at(i).type() == list && at(i).size() == 0) continue;
result += ", "; result += is_comma_separated() ? ", " : " ";
result += at(i).to_string();
}
return result;
} break;
case space_list: {
string result(at(0).to_string());
for (size_t i = 1, S = size(); i < S; ++i) {
if (at(i).type() == nil) continue;
result += " ";
result += at(i).to_string(); result += at(i).to_string();
} }
return result; return result;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment