Commit de9f259e by Aaron Leung

Getting things to compile again.

parent 4576338f
...@@ -113,8 +113,10 @@ namespace Sass { ...@@ -113,8 +113,10 @@ namespace Sass {
Node parse_import(); Node parse_import();
Node parse_include(bool delay = false); Node parse_include(bool delay = false);
void parse_mixin_def(); void parse_mixin_def();
Node parse_parameter();
Node parse_arguments(bool delay = false);
Node parse_mixin_params(); Node parse_mixin_params();
void parse_var_def(); Node parse_var_def(bool delay = false);
Node parse_ruleset(); Node parse_ruleset();
Node parse_selector_group(); Node parse_selector_group();
Node parse_selector(); Node parse_selector();
......
...@@ -57,7 +57,7 @@ namespace Sass { ...@@ -57,7 +57,7 @@ namespace Sass {
lex< include >(); lex< include >();
lex< identifier >(); lex< identifier >();
Node name(line_number, Node::identifier, lexed); Node name(line_number, Node::identifier, lexed);
Node args(line_number, Node::arguments, parse_arguments(delay)); Node args(line_number, Node::parameters, parse_arguments(delay));
Node call(line_number, Node::mixin_call, 2); Node call(line_number, Node::mixin_call, 2);
call << name << args; call << name << args;
if (!delay) { if (!delay) {
...@@ -76,7 +76,7 @@ namespace Sass { ...@@ -76,7 +76,7 @@ namespace Sass {
lex< exactly<')'> )(); lex< exactly<')'> >();
} }
void Document::parse_mixin_def() void Document::parse_mixin_def()
...@@ -90,7 +90,7 @@ namespace Sass { ...@@ -90,7 +90,7 @@ namespace Sass {
mixin << name << params << body; mixin << name << params << body;
context.mixins[name.token] = mixin; context.mixins[name.token] = mixin;
cerr << "parsing mixin definition: "; cerr << "parsed mixin definition: ";
cerr << string(mixin[0].token) << "("; cerr << string(mixin[0].token) << "(";
if (params.size() > 0) { if (params.size() > 0) {
cerr << string(params[0].token); cerr << string(params[0].token);
...@@ -132,7 +132,7 @@ namespace Sass { ...@@ -132,7 +132,7 @@ namespace Sass {
Node Document::parse_var_def(bool delay) Node Document::parse_var_def(bool delay)
{ {
lex< variable >(); lex< variable >();
const Token key(lexed); Token key(lexed);
lex< exactly<':'> >(); lex< exactly<':'> >();
// context.environment[key] = parse_values(); // context.environment[key] = parse_values();
Node val(parse_list(delay)); Node val(parse_list(delay));
......
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