Skip to content

Commit 7cb696a

Browse files
committed
Rename stacks to use shorter typedefs
1 parent c1b3676 commit 7cb696a

10 files changed

+22
-22
lines changed

src/ast.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1259,7 +1259,7 @@ namespace Sass {
12591259
return list;
12601260
}
12611261

1262-
Selector_List_Ptr Selector_List::resolve_parent_refs(std::vector<Selector_List_Obj>& pstack, Backtraces& traces, bool implicit_parent)
1262+
Selector_List_Ptr Selector_List::resolve_parent_refs(SelectorStack& pstack, Backtraces& traces, bool implicit_parent)
12631263
{
12641264
if (!this->has_parent_ref()) return this;
12651265
Selector_List_Ptr ss = SASS_MEMORY_NEW(Selector_List, pstate());
@@ -1273,7 +1273,7 @@ namespace Sass {
12731273
return ss;
12741274
}
12751275

1276-
Selector_List_Ptr Complex_Selector::resolve_parent_refs(std::vector<Selector_List_Obj>& pstack, Backtraces& traces, bool implicit_parent)
1276+
Selector_List_Ptr Complex_Selector::resolve_parent_refs(SelectorStack& pstack, Backtraces& traces, bool implicit_parent)
12771277
{
12781278
Complex_Selector_Obj tail = this->tail();
12791279
Compound_Selector_Obj head = this->head();

src/ast.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -944,7 +944,7 @@ namespace Sass {
944944
// by a type tag.
945945
/////////////////////////////////////////////////////////////////////////////
946946
struct Backtrace;
947-
typedef Expression_Ptr (*Native_Function)(Env&, Env&, Context&, Signature, ParserState, Backtraces, std::vector<Selector_List_Obj>);
947+
typedef Expression_Ptr (*Native_Function)(Env&, Env&, Context&, Signature, ParserState, Backtraces, SelectorStack);
948948
class Definition : public Has_Block {
949949
public:
950950
enum Type { MIXIN, FUNCTION };
@@ -2860,7 +2860,7 @@ namespace Sass {
28602860
Complex_Selector_Obj innermost() { return last(); };
28612861

28622862
size_t length() const;
2863-
Selector_List_Ptr resolve_parent_refs(std::vector<Selector_List_Obj>& pstack, Backtraces& traces, bool implicit_parent = true);
2863+
Selector_List_Ptr resolve_parent_refs(SelectorStack& pstack, Backtraces& traces, bool implicit_parent = true);
28642864
virtual bool is_superselector_of(Compound_Selector_Obj sub, std::string wrapping = "");
28652865
virtual bool is_superselector_of(Complex_Selector_Obj sub, std::string wrapping = "");
28662866
virtual bool is_superselector_of(Selector_List_Obj sub, std::string wrapping = "");
@@ -2982,7 +2982,7 @@ namespace Sass {
29822982
virtual bool has_parent_ref() const;
29832983
virtual bool has_real_parent_ref() const;
29842984
void remove_parent_selectors();
2985-
Selector_List_Ptr resolve_parent_refs(std::vector<Selector_List_Obj>& pstack, Backtraces& traces, bool implicit_parent = true);
2985+
Selector_List_Ptr resolve_parent_refs(SelectorStack& pstack, Backtraces& traces, bool implicit_parent = true);
29862986
virtual bool is_superselector_of(Compound_Selector_Obj sub, std::string wrapping = "");
29872987
virtual bool is_superselector_of(Complex_Selector_Obj sub, std::string wrapping = "");
29882988
virtual bool is_superselector_of(Selector_List_Obj sub, std::string wrapping = "");

src/ast_fwd_decl.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ namespace Sass {
423423
typedef std::vector<AST_Node_Obj> CallStack;
424424
typedef std::vector<Media_Block_Ptr> MediaStack;
425425
typedef std::vector<Selector_List_Obj> SelectorStack;
426-
typedef std::vector<Sass_Import_Entry>* ImporterStack;
426+
typedef std::vector<Sass_Import_Entry> ImporterStack;
427427

428428
typedef const char* Signature;
429429

src/context.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@ namespace Sass {
4646

4747
// generic ast node garbage container
4848
// used to avoid possible circular refs
49-
std::vector<AST_Node_Obj> ast_gc;
49+
CallStack ast_gc;
5050
// resources add under our control
5151
// these are guaranteed to be freed
5252
std::vector<char*> strings;
5353
std::vector<Resource> resources;
5454
std::map<const std::string, StyleSheet> sheets;
5555
Subset_Map subset_map;
56-
std::vector<Sass_Import_Entry> import_stack;
56+
ImporterStack import_stack;
5757
std::vector<Sass_Callee> callee_stack;
5858
std::vector<Backtrace> traces;
5959

src/cssize.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace Sass {
1111
Cssize::Cssize(Context& ctx)
1212
: ctx(ctx),
1313
traces(ctx.traces),
14-
block_stack(std::vector<Block_Ptr>()),
14+
block_stack(BlockStack()),
1515
p_stack(std::vector<Statement_Ptr>())
1616
{ }
1717

src/cssize.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace Sass {
1414

1515
Context& ctx;
1616
Backtraces& traces;
17-
std::vector<Block_Ptr> block_stack;
17+
BlockStack block_stack;
1818
std::vector<Statement_Ptr> p_stack;
1919

2020
Statement_Ptr fallback_impl(AST_Node_Ptr n);

src/eval.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1529,7 +1529,7 @@ namespace Sass {
15291529

15301530
Selector_List_Ptr Eval::operator()(Selector_List_Ptr s)
15311531
{
1532-
std::vector<Selector_List_Obj> rv;
1532+
SelectorStack rv;
15331533
Selector_List_Obj sl = SASS_MEMORY_NEW(Selector_List, s->pstate());
15341534
sl->is_optional(s->is_optional());
15351535
sl->media_block(s->media_block());

src/expand.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace Sass {
1616
// simple endless recursion protection
1717
const size_t maxRecursion = 500;
1818

19-
Expand::Expand(Context& ctx, Env* env, std::vector<Selector_List_Obj>* stack)
19+
Expand::Expand(Context& ctx, Env* env, SelectorStack* stack)
2020
: ctx(ctx),
2121
traces(ctx.traces),
2222
eval(Eval(*this)),
@@ -25,10 +25,10 @@ namespace Sass {
2525
at_root_without_rule(false),
2626
old_at_root_without_rule(false),
2727
env_stack(std::vector<Env*>()),
28-
block_stack(std::vector<Block_Ptr>()),
29-
call_stack(std::vector<AST_Node_Obj>()),
30-
selector_stack(std::vector<Selector_List_Obj>()),
31-
media_block_stack(std::vector<Media_Block_Ptr>())
28+
block_stack(BlockStack()),
29+
call_stack(CallStack()),
30+
selector_stack(SelectorStack()),
31+
media_block_stack(MediaStack())
3232
{
3333
env_stack.push_back(0);
3434
env_stack.push_back(env);

src/expand.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ namespace Sass {
3131

3232
// it's easier to work with vectors
3333
std::vector<Env*> env_stack;
34-
std::vector<Block_Ptr> block_stack;
35-
std::vector<AST_Node_Obj> call_stack;
36-
std::vector<Selector_List_Obj> selector_stack;
37-
std::vector<Media_Block_Ptr> media_block_stack;
34+
BlockStack block_stack;
35+
CallStack call_stack;
36+
SelectorStack selector_stack;
37+
MediaStack media_block_stack;
3838

3939
Boolean_Obj bool_true;
4040

@@ -44,7 +44,7 @@ namespace Sass {
4444
void expand_selector_list(Selector_Obj, Selector_List_Obj extender);
4545

4646
public:
47-
Expand(Context&, Env*, std::vector<Selector_List_Obj>* stack = NULL);
47+
Expand(Context&, Env*, SelectorStack* stack = NULL);
4848
~Expand() { }
4949

5050
Block_Ptr operator()(Block_Ptr);

src/fn_utils.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
namespace Sass {
1010

1111
#define BUILT_IN(name) Expression_Ptr \
12-
name(Env& env, Env& d_env, Context& ctx, Signature sig, ParserState pstate, Backtraces traces, std::vector<Selector_List_Obj> selector_stack)
12+
name(Env& env, Env& d_env, Context& ctx, Signature sig, ParserState pstate, Backtraces traces, SelectorStack selector_stack)
1313

1414
#define ARG(argname, argtype) get_arg<argtype>(argname, env, sig, pstate, traces)
1515

0 commit comments

Comments
 (0)