Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Improve selectors parsing for nth-child binomials #1197

Merged
merged 1 commit into from
May 12, 2015
Merged

Improve selectors parsing for nth-child binomials #1197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions ast.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1359,21 +1359,22 @@ namespace Sass {
////////////////////////////////////////////////////////
class String_Constant : public String {
ADD_PROPERTY(char, quote_mark);
ADD_PROPERTY(bool, can_compress_whitespace);
ADD_PROPERTY(string, value);
protected:
size_t hash_;
public:
String_Constant(ParserState pstate, string val)
: String(pstate), quote_mark_(0), value_(read_css_string(val)), hash_(0)
: String(pstate), quote_mark_(0), can_compress_whitespace_(false), value_(read_css_string(val)), hash_(0)
{ }
String_Constant(ParserState pstate, const char* beg)
: String(pstate), quote_mark_(0), value_(read_css_string(string(beg))), hash_(0)
: String(pstate), quote_mark_(0), can_compress_whitespace_(false), value_(read_css_string(string(beg))), hash_(0)
{ }
String_Constant(ParserState pstate, const char* beg, const char* end)
: String(pstate), quote_mark_(0), value_(read_css_string(string(beg, end-beg))), hash_(0)
: String(pstate), quote_mark_(0), can_compress_whitespace_(false), value_(read_css_string(string(beg, end-beg))), hash_(0)
{ }
String_Constant(ParserState pstate, const Token& tok)
: String(pstate), quote_mark_(0), value_(read_css_string(string(tok.begin, tok.end))), hash_(0)
: String(pstate), quote_mark_(0), can_compress_whitespace_(false), value_(read_css_string(string(tok.begin, tok.end))), hash_(0)
{ }
string type() { return "string"; }
static string type_name() { return "string"; }
Expand Down
2 changes: 1 addition & 1 deletion debugger.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ inline void debug_ast(AST_Node* node, string ind = "", Env* env = 0)
Binary_Expression* expression = dynamic_cast<Binary_Expression*>(node);
cerr << ind << "Binary_Expression " << expression;
cerr << " (" << pstate_source_position(node) << ")";
cerr << " [" << expression->type() << "]" << endl;
cerr << " [" << expression->type_name() << "]" << endl;
debug_ast(expression->left(), ind + " left: ", env);
debug_ast(expression->right(), ind + " right: ", env);
} else if (dynamic_cast<Map*>(node)) {
Expand Down
12 changes: 9 additions & 3 deletions output.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,10 +385,16 @@ namespace Sass {
{
if (String_Quoted* quoted = dynamic_cast<String_Quoted*>(s)) {
return Output::operator()(quoted);
} else if (!in_comment) {
append_token(string_to_output(s->value()), s);
} else {
append_token(s->value(), s);
string value(s->value());
if (s->can_compress_whitespace() && output_style() == COMPRESSED) {
value.erase(std::remove_if(value.begin(), value.end(), ::isspace), value.end());
}
if (!in_comment) {
append_token(string_to_output(value), s);
} else {
append_token(value, s);
}
}
}

Expand Down
15 changes: 3 additions & 12 deletions parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -710,18 +710,9 @@ namespace Sass {
if (lex< alternatives< even, odd > >()) {
expr = new (ctx.mem) String_Quoted(p, lexed);
}
else if (peek< binomial >(position)) {
lex< sequence< optional< coefficient >, exactly<'n'> > >();
String_Constant* var_coef = new (ctx.mem) String_Quoted(p, lexed);
lex< sign >();
String_Constant* op = new (ctx.mem) String_Quoted(p, lexed);
// Binary_Expression::Type op = (lexed == "+" ? Binary_Expression::ADD : Binary_Expression::SUB);
lex< one_plus < digit > >();
String_Constant* constant = new (ctx.mem) String_Quoted(p, lexed);
// expr = new (ctx.mem) Binary_Expression(p, op, var_coef, constant);
String_Schema* schema = new (ctx.mem) String_Schema(p, 3);
*schema << var_coef << op << constant;
expr = schema;
else if (lex< binomial >(position)) {
expr = new (ctx.mem) String_Constant(p, lexed);
((String_Constant*)expr)->can_compress_whitespace(true);
}
else if (peek< sequence< optional<sign>,
zero_plus<digit>,
Expand Down