Commit ac778660 by Aaron Leung

Fixed an aliasing bug in a builtin Sass function.

parent abc0f0ab
...@@ -33,7 +33,6 @@ namespace Sass { ...@@ -33,7 +33,6 @@ namespace Sass {
register_function(rgb_descriptor, rgb); register_function(rgb_descriptor, rgb);
register_function(rgba_4_descriptor, rgba_4); register_function(rgba_4_descriptor, rgba_4);
register_function(rgba_2_descriptor, rgba_2); register_function(rgba_2_descriptor, rgba_2);
register_function(curse_descriptor, curse);
} }
} }
\ No newline at end of file
...@@ -32,13 +32,9 @@ namespace Sass { ...@@ -32,13 +32,9 @@ namespace Sass {
Function_Descriptor rgba_2_descriptor = Function_Descriptor rgba_2_descriptor =
{ "rgba", "$color", "$alpha", 0 }; { "rgba", "$color", "$alpha", 0 };
Node rgba_2(const vector<Token>& parameters, map<Token, Node>& bindings) { Node rgba_2(const vector<Token>& parameters, map<Token, Node>& bindings) {
return bindings[parameters[0]] << bindings[parameters[1]]; return bindings[parameters[0]].clone() << bindings[parameters[1]];
} }
extern const char* the_curse = "Damn!";
Function_Descriptor curse_descriptor = { "curse", 0 };
Node curse(const vector<Token>& parameters, map<Token, Node>& bindings) {
return Node(Node::identifier, 0, Token::make(the_curse, the_curse + std::strlen(the_curse)));
}
} }
} }
\ No newline at end of file
...@@ -51,9 +51,6 @@ namespace Sass { ...@@ -51,9 +51,6 @@ namespace Sass {
extern Function_Descriptor rgba_2_descriptor; extern Function_Descriptor rgba_2_descriptor;
Node rgba_2(const vector<Token>& parameters, map<Token, Node>& bindings); Node rgba_2(const vector<Token>& parameters, map<Token, Node>& bindings);
extern Function_Descriptor curse_descriptor;
Node curse(const vector<Token>& parameters, map<Token, Node>& bindings);
} }
} }
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