Skip to content

Commit c55821a

Browse files
glebmxzyfer
glebm
authored and
xzyfer
committed
Remove _Ptr(_Const) typedefs (#2847)
Removes these typedefs because pointers should be handled with care. Having them visually stand out in the code helps us avoid common pitfalls, such as accidentally using `Ptr` instead of `Obj`. This change has been automatically generated using the following command: ```bash find src \( -name '*.cpp' -o -name '*.hpp' \) -exec sed -i \ '/typedef.*_Ptr[_;]/d;'\ 's/\([A-Za-z_]*\)_Ptr_Const/const \1*/g;'\ 's/\([A-Za-z_]*\)_Ptr/\1*/g;'\ 's/\([a-z]\)##\*/\1*/g' '{}' \+ ``` Fixes #2785
1 parent 20b91ef commit c55821a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+1439
-1595
lines changed

‎src/ast.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ namespace Sass {
7676
Inspect i(emitter);
7777
i.in_declaration = true;
7878
// ToDo: inspect should be const
79-
const_cast<AST_Node_Ptr>(this)->perform(&i);
79+
const_cast<AST_Node*>(this)->perform(&i);
8080
return i.get_buffer();
8181
}
8282

@@ -173,7 +173,7 @@ namespace Sass {
173173
{ statement_type(RULESET); }
174174

175175
bool Ruleset::is_invisible() const {
176-
if (Selector_List_Ptr sl = Cast<Selector_List>(selector())) {
176+
if (Selector_List* sl = Cast<Selector_List>(selector())) {
177177
for (size_t i = 0, L = sl->length(); i < L; ++i)
178178
if (!(*sl)[i]->has_placeholder()) return false;
179179
}
@@ -594,7 +594,7 @@ namespace Sass {
594594
{
595595
try
596596
{
597-
Unary_Expression_Ptr_Const m = Cast<Unary_Expression>(&rhs);
597+
const Unary_Expression* m = Cast<Unary_Expression>(&rhs);
598598
if (m == 0) return false;
599599
return type() == m->type() &&
600600
*operand() == *m->operand();
@@ -647,7 +647,7 @@ namespace Sass {
647647
{
648648
try
649649
{
650-
Argument_Ptr_Const m = Cast<Argument>(&rhs);
650+
const Argument* m = Cast<Argument>(&rhs);
651651
if (!(m && name() == m->name())) return false;
652652
return *value() == *m->value();
653653
}
@@ -794,7 +794,7 @@ namespace Sass {
794794
bool At_Root_Query::exclude(std::string str)
795795
{
796796
bool with = feature() && unquote(feature()->to_string()).compare("with") == 0;
797-
List_Ptr l = static_cast<List_Ptr>(value().ptr());
797+
List* l = static_cast<List*>(value().ptr());
798798
std::string v;
799799

800800
if (with)

‎src/ast2c.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,28 @@
77

88
namespace Sass {
99

10-
union Sass_Value* AST2C::operator()(Boolean_Ptr b)
10+
union Sass_Value* AST2C::operator()(Boolean* b)
1111
{ return sass_make_boolean(b->value()); }
1212

13-
union Sass_Value* AST2C::operator()(Number_Ptr n)
13+
union Sass_Value* AST2C::operator()(Number* n)
1414
{ return sass_make_number(n->value(), n->unit().c_str()); }
1515

16-
union Sass_Value* AST2C::operator()(Custom_Warning_Ptr w)
16+
union Sass_Value* AST2C::operator()(Custom_Warning* w)
1717
{ return sass_make_warning(w->message().c_str()); }
1818

19-
union Sass_Value* AST2C::operator()(Custom_Error_Ptr e)
19+
union Sass_Value* AST2C::operator()(Custom_Error* e)
2020
{ return sass_make_error(e->message().c_str()); }
2121

22-
union Sass_Value* AST2C::operator()(Color_RGBA_Ptr c)
22+
union Sass_Value* AST2C::operator()(Color_RGBA* c)
2323
{ return sass_make_color(c->r(), c->g(), c->b(), c->a()); }
2424

25-
union Sass_Value* AST2C::operator()(Color_HSLA_Ptr c)
25+
union Sass_Value* AST2C::operator()(Color_HSLA* c)
2626
{
2727
Color_RGBA_Obj rgba = c->copyAsRGBA();
2828
return operator()(rgba.ptr());
2929
}
3030

31-
union Sass_Value* AST2C::operator()(String_Constant_Ptr s)
31+
union Sass_Value* AST2C::operator()(String_Constant* s)
3232
{
3333
if (s->quote_mark()) {
3434
return sass_make_qstring(s->value().c_str());
@@ -37,10 +37,10 @@ namespace Sass {
3737
}
3838
}
3939

40-
union Sass_Value* AST2C::operator()(String_Quoted_Ptr s)
40+
union Sass_Value* AST2C::operator()(String_Quoted* s)
4141
{ return sass_make_qstring(s->value().c_str()); }
4242

43-
union Sass_Value* AST2C::operator()(List_Ptr l)
43+
union Sass_Value* AST2C::operator()(List* l)
4444
{
4545
union Sass_Value* v = sass_make_list(l->length(), l->separator(), l->is_bracketed());
4646
for (size_t i = 0, L = l->length(); i < L; ++i) {
@@ -49,7 +49,7 @@ namespace Sass {
4949
return v;
5050
}
5151

52-
union Sass_Value* AST2C::operator()(Map_Ptr m)
52+
union Sass_Value* AST2C::operator()(Map* m)
5353
{
5454
union Sass_Value* v = sass_make_map(m->length());
5555
int i = 0;
@@ -61,7 +61,7 @@ namespace Sass {
6161
return v;
6262
}
6363

64-
union Sass_Value* AST2C::operator()(Arguments_Ptr a)
64+
union Sass_Value* AST2C::operator()(Arguments* a)
6565
{
6666
union Sass_Value* v = sass_make_list(a->length(), SASS_COMMA, false);
6767
for (size_t i = 0, L = a->length(); i < L; ++i) {
@@ -70,11 +70,11 @@ namespace Sass {
7070
return v;
7171
}
7272

73-
union Sass_Value* AST2C::operator()(Argument_Ptr a)
73+
union Sass_Value* AST2C::operator()(Argument* a)
7474
{ return a->value()->perform(this); }
7575

7676
// not strictly necessary because of the fallback
77-
union Sass_Value* AST2C::operator()(Null_Ptr n)
77+
union Sass_Value* AST2C::operator()(Null* n)
7878
{ return sass_make_null(); }
7979

8080
};

‎src/ast2c.hpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@ namespace Sass {
1414
AST2C() { }
1515
~AST2C() { }
1616

17-
union Sass_Value* operator()(Boolean_Ptr);
18-
union Sass_Value* operator()(Number_Ptr);
19-
union Sass_Value* operator()(Color_RGBA_Ptr);
20-
union Sass_Value* operator()(Color_HSLA_Ptr);
21-
union Sass_Value* operator()(String_Constant_Ptr);
22-
union Sass_Value* operator()(String_Quoted_Ptr);
23-
union Sass_Value* operator()(Custom_Warning_Ptr);
24-
union Sass_Value* operator()(Custom_Error_Ptr);
25-
union Sass_Value* operator()(List_Ptr);
26-
union Sass_Value* operator()(Map_Ptr);
27-
union Sass_Value* operator()(Null_Ptr);
28-
union Sass_Value* operator()(Arguments_Ptr);
29-
union Sass_Value* operator()(Argument_Ptr);
17+
union Sass_Value* operator()(Boolean*);
18+
union Sass_Value* operator()(Number*);
19+
union Sass_Value* operator()(Color_RGBA*);
20+
union Sass_Value* operator()(Color_HSLA*);
21+
union Sass_Value* operator()(String_Constant*);
22+
union Sass_Value* operator()(String_Quoted*);
23+
union Sass_Value* operator()(Custom_Warning*);
24+
union Sass_Value* operator()(Custom_Error*);
25+
union Sass_Value* operator()(List*);
26+
union Sass_Value* operator()(Map*);
27+
union Sass_Value* operator()(Null*);
28+
union Sass_Value* operator()(Arguments*);
29+
union Sass_Value* operator()(Argument*);
3030

3131
// return sass error if type is not supported
32-
union Sass_Value* fallback(AST_Node_Ptr x)
32+
union Sass_Value* fallback(AST_Node* x)
3333
{ return sass_make_error("unknown type for C-API"); }
3434

3535
};

‎src/ast_def_macros.hpp

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -70,59 +70,59 @@ public: \
7070
#ifdef DEBUG_SHARED_PTR
7171

7272
#define ATTACH_ABSTRACT_AST_OPERATIONS(klass) \
73-
virtual klass##_Ptr copy(std::string, size_t) const = 0; \
74-
virtual klass##_Ptr clone(std::string, size_t) const = 0; \
73+
virtual klass* copy(std::string, size_t) const = 0; \
74+
virtual klass* clone(std::string, size_t) const = 0; \
7575

7676
#define ATTACH_VIRTUAL_AST_OPERATIONS(klass) \
7777
klass(const klass* ptr); \
78-
virtual klass##_Ptr copy(std::string, size_t) const override = 0; \
79-
virtual klass##_Ptr clone(std::string, size_t) const override = 0; \
78+
virtual klass* copy(std::string, size_t) const override = 0; \
79+
virtual klass* clone(std::string, size_t) const override = 0; \
8080

8181
#define ATTACH_AST_OPERATIONS(klass) \
8282
klass(const klass* ptr); \
83-
virtual klass##_Ptr copy(std::string, size_t) const override; \
84-
virtual klass##_Ptr clone(std::string, size_t) const override; \
83+
virtual klass* copy(std::string, size_t) const override; \
84+
virtual klass* clone(std::string, size_t) const override; \
8585

8686
#else
8787

8888
#define ATTACH_ABSTRACT_AST_OPERATIONS(klass) \
89-
virtual klass##_Ptr copy() const = 0; \
90-
virtual klass##_Ptr clone() const = 0; \
89+
virtual klass* copy() const = 0; \
90+
virtual klass* clone() const = 0; \
9191

9292
#define ATTACH_VIRTUAL_AST_OPERATIONS(klass) \
9393
klass(const klass* ptr); \
94-
virtual klass##_Ptr copy() const override = 0; \
95-
virtual klass##_Ptr clone() const override = 0; \
94+
virtual klass* copy() const override = 0; \
95+
virtual klass* clone() const override = 0; \
9696

9797
#define ATTACH_AST_OPERATIONS(klass) \
9898
klass(const klass* ptr); \
99-
virtual klass##_Ptr copy() const override; \
100-
virtual klass##_Ptr clone() const override; \
99+
virtual klass* copy() const override; \
100+
virtual klass* clone() const override; \
101101

102102
#endif
103103

104104
#ifdef DEBUG_SHARED_PTR
105105

106106
#define IMPLEMENT_AST_OPERATORS(klass) \
107-
klass##_Ptr klass::copy(std::string file, size_t line) const { \
108-
klass##_Ptr cpy = new klass(this); \
107+
klass* klass::copy(std::string file, size_t line) const { \
108+
klass* cpy = new klass(this); \
109109
cpy->trace(file, line); \
110110
return cpy; \
111111
} \
112-
klass##_Ptr klass::clone(std::string file, size_t line) const { \
113-
klass##_Ptr cpy = copy(file, line); \
112+
klass* klass::clone(std::string file, size_t line) const { \
113+
klass* cpy = copy(file, line); \
114114
cpy->cloneChildren(); \
115115
return cpy; \
116116
} \
117117

118118
#else
119119

120120
#define IMPLEMENT_AST_OPERATORS(klass) \
121-
klass##_Ptr klass::copy() const { \
121+
klass* klass::copy() const { \
122122
return new klass(this); \
123123
} \
124-
klass##_Ptr klass::clone() const { \
125-
klass##_Ptr cpy = copy(); \
124+
klass* klass::clone() const { \
125+
klass* cpy = copy(); \
126126
cpy->cloneChildren(); \
127127
return cpy; \
128128
} \

0 commit comments

Comments
 (0)