Skip to content

Commit

Permalink
Change memory allocations from overloaded operator to macro
Browse files Browse the repository at this point in the history
  • Loading branch information
@mgreter
mgreter committed Aug 24, 2015
1 parent e24865f commit 202a4ea
Show file tree
Hide file tree
Showing 15 changed files with 799 additions and 716 deletions.
61 changes: 31 additions & 30 deletions src/ast.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,11 +287,11 @@ namespace Sass {
}
if (!found)
{
Compound_Selector* cpy = new (ctx.mem) Compound_Selector(*rhs);
Compound_Selector* cpy = SASS_MEMORY_NEW(ctx.mem, Compound_Selector, *rhs);
(*cpy) << this;
return cpy;
}
Compound_Selector* cpy = new (ctx.mem) Compound_Selector(rhs->pstate());
Compound_Selector* cpy = SASS_MEMORY_NEW(ctx.mem, Compound_Selector, rhs->pstate());
for (size_t j = 0; j < i; ++j)
{ (*cpy) << (*rhs)[j]; }
(*cpy) << this;
Expand All @@ -311,7 +311,7 @@ namespace Sass {
if (!rhs->is_universal_ns())
{
// creaty the copy inside (avoid unnecessary copies)
Type_Selector* ts = new (ctx.mem) Type_Selector(*this);
Type_Selector* ts = SASS_MEMORY_NEW(ctx.mem, Type_Selector, *this);
// overwrite the name if star is given as name
if (ts->name() == "*") { ts->name(rhs->name()); }
// now overwrite the namespace name and flag
Expand All @@ -325,7 +325,7 @@ namespace Sass {
if (name() == "*" && rhs->name() != "*")
{
// creaty the copy inside (avoid unnecessary copies)
Type_Selector* ts = new (ctx.mem) Type_Selector(*this);
Type_Selector* ts = SASS_MEMORY_NEW(ctx.mem, Type_Selector, *this);
// simply set the new name
ts->name(rhs->name());
// return copy
Expand All @@ -341,7 +341,7 @@ namespace Sass {

// if the rhs is empty, just return a copy of this
if (rhs->length() == 0) {
Compound_Selector* cpy = new (ctx.mem) Compound_Selector(rhs->pstate());
Compound_Selector* cpy = SASS_MEMORY_NEW(ctx.mem, Compound_Selector, rhs->pstate());
(*cpy) << this;
return cpy;
}
Expand All @@ -353,14 +353,14 @@ namespace Sass {
if (typeid(*rhs_0) == typeid(Type_Selector))
{
// if rhs is universal, just return this tagname + rhs's qualifiers
Compound_Selector* cpy = new (ctx.mem) Compound_Selector(*rhs);
Compound_Selector* cpy = SASS_MEMORY_NEW(ctx.mem, Compound_Selector, *rhs);
Type_Selector* ts = static_cast<Type_Selector*>(rhs_0);
(*cpy)[0] = this->unify_with(ts, ctx);
return cpy;
}
else if (dynamic_cast<Selector_Qualifier*>(rhs_0)) {
// qualifier is `.class`, so we can prefix with `ns|*.class`
Compound_Selector* cpy = new (ctx.mem) Compound_Selector(rhs->pstate());
Compound_Selector* cpy = SASS_MEMORY_NEW(ctx.mem, Compound_Selector, rhs->pstate());
if (has_ns() && !rhs_0->has_ns()) {
if (ns() != "*") (*cpy) << this;
}
Expand All @@ -378,13 +378,13 @@ namespace Sass {
// if rhs is universal, just return this tagname + rhs's qualifiers
if (rhs_0->name() != "*" && rhs_0->ns() != "*" && rhs_0->name() != name()) return 0;
// otherwise create new compound and unify first simple selector
Compound_Selector* copy = new (ctx.mem) Compound_Selector(*rhs);
Compound_Selector* copy = SASS_MEMORY_NEW(ctx.mem, Compound_Selector, *rhs);
(*copy)[0] = this->unify_with(rhs_0, ctx);
return copy;

}
// else it's a tag name and a bunch of qualifiers -- just append them
Compound_Selector* cpy = new (ctx.mem) Compound_Selector(rhs->pstate());
Compound_Selector* cpy = SASS_MEMORY_NEW(ctx.mem, Compound_Selector, rhs->pstate());
if (name() != "*") (*cpy) << this;
(*cpy) += rhs;
return cpy;
Expand Down Expand Up @@ -588,10 +588,11 @@ namespace Sass {
Complex_Selector* Compound_Selector::to_complex(Memory_Manager<AST_Node>& mem)
{
// create an intermediate complex selector
return new (mem) Complex_Selector(pstate(),
Complex_Selector::ANCESTOR_OF,
this,
0);
return SASS_MEMORY_NEW(mem, Complex_Selector,
pstate(),
Complex_Selector::ANCESTOR_OF,
this,
0);
}

Selector_List* Complex_Selector::unify_with(Complex_Selector* other, Context& ctx)
Expand Down Expand Up @@ -652,7 +653,7 @@ namespace Sass {

// do some magic we inherit from node and extend
Node node = Extend::subweave(lhsNode, rhsNode, ctx);
Selector_List* result = new (ctx.mem) Selector_List(pstate());
Selector_List* result = SASS_MEMORY_NEW(ctx.mem, Selector_List, pstate());
NodeDequePtr col = node.collection(); // move from collection to list
for (NodeDeque::iterator it = col->begin(), end = col->end(); it != end; it++)
{ (*result) << nodeToComplexSelector(Node::naiveTrim(*it, ctx), ctx); }
Expand Down Expand Up @@ -796,7 +797,7 @@ namespace Sass {
{
if (!tail()) return 0;
if (!head()) return tail()->context(ctx);
Complex_Selector* cpy = new (ctx.mem) Complex_Selector(pstate(), combinator(), head(), tail()->context(ctx));
Complex_Selector* cpy = SASS_MEMORY_NEW(ctx.mem, Complex_Selector, pstate(), combinator(), head(), tail()->context(ctx));
cpy->media_block(media_block());
return cpy;
}
Expand Down Expand Up @@ -829,7 +830,7 @@ namespace Sass {

if (last()) {
if (last()->combinator() != ANCESTOR_OF && c != ANCESTOR_OF) {
Complex_Selector* inter = new (ctx.mem) Complex_Selector(pstate());
Complex_Selector* inter = SASS_MEMORY_NEW(ctx.mem, Complex_Selector, pstate());
inter->reference(r);
inter->combinator(c);
inter->tail(t);
Expand All @@ -848,9 +849,9 @@ namespace Sass {

Selector_List* Selector_List::parentize(Selector_List* ps, Context& ctx)
{
Selector_List* ss = new (ctx.mem) Selector_List(pstate());
Selector_List* ss = SASS_MEMORY_NEW(ctx.mem, Selector_List, pstate());
for (size_t pi = 0, pL = ps->length(); pi < pL; ++pi) {
Selector_List* list = new (ctx.mem) Selector_List(pstate());
Selector_List* list = SASS_MEMORY_NEW(ctx.mem, Selector_List, pstate());
*list << (*ps)[pi];
for (size_t si = 0, sL = this->length(); si < sL; ++si) {
*ss += (*this)[si]->parentize(list, ctx);
Expand All @@ -874,7 +875,7 @@ namespace Sass {
// mix parent complex selector into the compound list
if (dynamic_cast<Parent_Selector*>((*head)[0])) {
if (parents && parents->length()) {
Selector_List* retval = new (ctx.mem) Selector_List(pstate());
Selector_List* retval = SASS_MEMORY_NEW(ctx.mem, Selector_List, pstate());
if (tails && tails->length() > 0) {
for (size_t n = 0, nL = tails->length(); n < nL; ++n) {
for (size_t i = 0, iL = parents->length(); i < iL; ++i) {
Expand Down Expand Up @@ -912,12 +913,12 @@ namespace Sass {
}
// have no parent but some tails
else {
Selector_List* retval = new (ctx.mem) Selector_List(pstate());
Selector_List* retval = SASS_MEMORY_NEW(ctx.mem, Selector_List, pstate());
if (tails && tails->length() > 0) {
for (size_t n = 0, nL = tails->length(); n < nL; ++n) {
Complex_Selector* cpy = this->clone(ctx);
cpy->tail((*tails)[n]->cloneFully(ctx));
cpy->head(new (ctx.mem) Compound_Selector(head->pstate()));
cpy->head(SASS_MEMORY_NEW(ctx.mem, Compound_Selector, head->pstate()));
for (size_t i = 1, L = this->head()->length(); i < L; ++i)
*cpy->head() << (*this->head())[i];
if (!cpy->head()->length()) cpy->head(0);
Expand All @@ -927,7 +928,7 @@ namespace Sass {
// have no parent and not tails
else {
Complex_Selector* cpy = this->clone(ctx);
cpy->head(new (ctx.mem) Compound_Selector(head->pstate()));
cpy->head(SASS_MEMORY_NEW(ctx.mem, Compound_Selector, head->pstate()));
for (size_t i = 1, L = this->head()->length(); i < L; ++i)
*cpy->head() << (*this->head())[i];
if (!cpy->head()->length()) cpy->head(0);
Expand All @@ -953,7 +954,7 @@ namespace Sass {

Selector_List* Complex_Selector::tails(Context& ctx, Selector_List* tails)
{
Selector_List* rv = new (ctx.mem) Selector_List(pstate_);
Selector_List* rv = SASS_MEMORY_NEW(ctx.mem, Selector_List, pstate_);
if (tails && tails->length()) {
for (size_t i = 0, iL = tails->length(); i < iL; ++i) {
Complex_Selector* pr = this->clone(ctx);
Expand Down Expand Up @@ -1050,14 +1051,14 @@ namespace Sass {

Complex_Selector* Complex_Selector::clone(Context& ctx) const
{
Complex_Selector* cpy = new (ctx.mem) Complex_Selector(*this);
Complex_Selector* cpy = SASS_MEMORY_NEW(ctx.mem, Complex_Selector, *this);
if (tail()) cpy->tail(tail()->clone(ctx));
return cpy;
}

Complex_Selector* Complex_Selector::cloneFully(Context& ctx) const
{
Complex_Selector* cpy = new (ctx.mem) Complex_Selector(*this);
Complex_Selector* cpy = SASS_MEMORY_NEW(ctx.mem, Complex_Selector, *this);

if (head()) {
cpy->head(head()->clone(ctx));
Expand All @@ -1072,19 +1073,19 @@ namespace Sass {

Compound_Selector* Compound_Selector::clone(Context& ctx) const
{
Compound_Selector* cpy = new (ctx.mem) Compound_Selector(*this);
Compound_Selector* cpy = SASS_MEMORY_NEW(ctx.mem, Compound_Selector, *this);
return cpy;
}

Selector_List* Selector_List::clone(Context& ctx) const
{
Selector_List* cpy = new (ctx.mem) Selector_List(*this);
Selector_List* cpy = SASS_MEMORY_NEW(ctx.mem, Selector_List, *this);
return cpy;
}

Selector_List* Selector_List::cloneFully(Context& ctx) const
{
Selector_List* cpy = new (ctx.mem) Selector_List(pstate());
Selector_List* cpy = SASS_MEMORY_NEW(ctx.mem, Selector_List, pstate());
for (size_t i = 0, L = length(); i < L; ++i) {
*cpy << (*this)[i]->cloneFully(ctx);
}
Expand Down Expand Up @@ -1182,7 +1183,7 @@ namespace Sass {
}

// Creates the final Selector_List by combining all the complex selectors
Selector_List* final_result = new (ctx.mem) Selector_List(pstate());
Selector_List* final_result = SASS_MEMORY_NEW(ctx.mem, Selector_List, pstate());
for (auto itr = unified_complex_selectors.begin(); itr != unified_complex_selectors.end(); ++itr) {
*final_result << *itr;
}
Expand Down Expand Up @@ -1235,7 +1236,7 @@ namespace Sass {
Compound_Selector* Compound_Selector::minus(Compound_Selector* rhs, Context& ctx)
{
To_String to_string(&ctx);
Compound_Selector* result = new (ctx.mem) Compound_Selector(pstate());
Compound_Selector* result = SASS_MEMORY_NEW(ctx.mem, Compound_Selector, pstate());
// result->has_parent_reference(has_parent_reference());

// not very efficient because it needs to preserve order
Expand Down
73 changes: 40 additions & 33 deletions src/bind.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,17 +74,19 @@ namespace Sass {
// otherwise we will not be able to fetch it again
else {
// create a new list object for wrapped items
List* arglist = new (ctx.mem) List(p->pstate(),
0,
rest->separator(),
true);
List* arglist = SASS_MEMORY_NEW(ctx.mem, List,
p->pstate(),
0,
rest->separator(),
true);
// wrap each item from list as an argument
for (Expression* item : rest->elements()) {
(*arglist) << new (ctx.mem) Argument(item->pstate(),
item,
"",
false,
false);
(*arglist) << SASS_MEMORY_NEW(ctx.mem, Argument,
item->pstate(),
item,
"",
false,
false);
}
// assign new arglist to environment
env->local_frame()[p->name()] = arglist;
Expand All @@ -97,25 +99,27 @@ namespace Sass {
} else if (a->is_keyword_argument()) {

// expand keyword arguments into their parameters
List* arglist = new (ctx.mem) List(p->pstate(), 0, SASS_COMMA, true);
List* arglist = SASS_MEMORY_NEW(ctx.mem, List, p->pstate(), 0, SASS_COMMA, true);
env->local_frame()[p->name()] = arglist;
Map* argmap = static_cast<Map*>(a->value());
for (auto key : argmap->keys()) {
std::string name = unquote(static_cast<String_Constant*>(key)->value());
(*arglist) << new (ctx.mem) Argument(key->pstate(),
argmap->at(key),
name,
false,
false);
(*arglist) << SASS_MEMORY_NEW(ctx.mem, Argument,
key->pstate(),
argmap->at(key),
name,
false,
false);
}

} else {

// create a new list object for wrapped items
List* arglist = new (ctx.mem) List(p->pstate(),
0,
SASS_COMMA,
true);
List* arglist = SASS_MEMORY_NEW(ctx.mem, List,
p->pstate(),
0,
SASS_COMMA,
true);
// consume the next args
while (ia < LA) {
// get and post inc
Expand All @@ -125,11 +129,12 @@ namespace Sass {
// skip any list completely if empty
if (ls && ls->empty()) continue;
// check if we have rest argument
(*arglist) << new (ctx.mem) Argument(a->pstate(),
a->value(),
a->name(),
false,
false);
(*arglist) << SASS_MEMORY_NEW(ctx.mem, Argument,
a->pstate(),
a->value(),
a->name(),
false,
false);
// check if we have rest argument
if (a->is_rest_argument()) {
// preserve the list separator from rest args
Expand Down Expand Up @@ -160,11 +165,12 @@ namespace Sass {
// otherwise move one of the rest args into the param, converting to argument if necessary
if (!(a = dynamic_cast<Argument*>((*arglist)[0]))) {
Expression* a_to_convert = (*arglist)[0];
a = new (ctx.mem) Argument(a_to_convert->pstate(),
a_to_convert,
"",
false,
false);
a = SASS_MEMORY_NEW(ctx.mem, Argument,
a_to_convert->pstate(),
a_to_convert,
"",
false,
false);
}
arglist->elements().erase(arglist->elements().begin());
if (!arglist->length() || (!arglist->is_arglist() && ip + 1 == LP)) {
Expand Down Expand Up @@ -235,10 +241,11 @@ namespace Sass {
// cerr << "********" << endl;
if (!env->has_local(leftover->name())) {
if (leftover->is_rest_parameter()) {
env->local_frame()[leftover->name()] = new (ctx.mem) List(leftover->pstate(),
0,
SASS_COMMA,
true);
env->local_frame()[leftover->name()] = SASS_MEMORY_NEW(ctx.mem, List,
leftover->pstate(),
0,
SASS_COMMA,
true);
}
else if (leftover->default_value()) {
Expression* dv = leftover->default_value()->perform(eval);
Expand Down
13 changes: 7 additions & 6 deletions src/context.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -438,12 +438,13 @@ namespace Sass {

void register_overload_stub(Context& ctx, std::string name, Env* env)
{
Definition* stub = new (ctx.mem) Definition(ParserState("[built-in function]"),
0,
name,
0,
0,
true);
Definition* stub = SASS_MEMORY_NEW(ctx.mem, Definition,
ParserState("[built-in function]"),
0,
name,
0,
0,
true);
(*env)[name + "[f]"] = stub;
}

Expand Down
Loading

0 comments on commit 202a4ea

Please sign in to comment.