Skip to content

Commit 52efdba

Browse files
xzyferxzyfer
committed
Revert "Merge pull request #2282 from xzyfer/bracketed-list-c-api"
This reverts commit 6537833, reversing changes made to 01074d8.
1 parent 51ea6ed commit 52efdba

File tree

9 files changed

+21
-33
lines changed

9 files changed

+21
-33
lines changed

‎docs/api-value.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ union Sass_Value* sass_make_string (const char* val);
5858
union Sass_Value* sass_make_qstring (const char* val);
5959
union Sass_Value* sass_make_number (double val, const char* unit);
6060
union Sass_Value* sass_make_color (double r, double g, double b, double a);
61-
union Sass_Value* sass_make_list (size_t len, enum Sass_Separator sep, bool is_bracketed);
61+
union Sass_Value* sass_make_list (size_t len, enum Sass_Separator sep);
6262
union Sass_Value* sass_make_map (size_t len);
6363
union Sass_Value* sass_make_error (const char* msg);
6464
union Sass_Value* sass_make_warning (const char* msg);
@@ -124,8 +124,6 @@ size_t sass_list_get_length (const union Sass_Value* v);
124124
// Getters and setters for Sass_List
125125
enum Sass_Separator sass_list_get_separator (const union Sass_Value* v);
126126
void sass_list_set_separator (union Sass_Value* v, enum Sass_Separator value);
127-
bool sass_list_get_is_bracketed (const union Sass_Value* v);
128-
void sass_list_set_is_bracketed (union Sass_Value* v, bool value);
129127
// Getters and setters for Sass_List values
130128
union Sass_Value* sass_list_get_value (const union Sass_Value* v, size_t i);
131129
void sass_list_set_value (union Sass_Value* v, size_t i, union Sass_Value* value);

‎docs/custom-functions-internal.md

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,14 @@ The cookie can hold any pointer you want. In the `perl-libsass` implementation i
4545

4646
```C
4747
// allocate memory (copies passed strings)
48-
union Sass_Value* sass_make_null (void);
49-
union Sass_Value* sass_make_boolean (bool val);
50-
union Sass_Value* sass_make_string (const char* val);
51-
union Sass_Value* sass_make_qstring (const char* val);
52-
union Sass_Value* sass_make_number (double val, const char* unit);
53-
union Sass_Value* sass_make_color (double r, double g, double b, double a);
54-
union Sass_Value* sass_make_list (size_t len, enum Sass_Separator sep, bool is_bracketed);
55-
union Sass_Value* sass_make_map (size_t len);
56-
union Sass_Value* sass_make_error (const char* msg);
57-
union Sass_Value* sass_make_warning (const char* msg);
48+
union Sass_Value* make_sass_boolean (int val);
49+
union Sass_Value* make_sass_number (double val, const char* unit);
50+
union Sass_Value* make_sass_color (double r, double g, double b, double a);
51+
union Sass_Value* make_sass_string (const char* val);
52+
union Sass_Value* make_sass_list (size_t len, enum Sass_Separator sep);
53+
union Sass_Value* make_sass_map (size_t len);
54+
union Sass_Value* make_sass_null ();
55+
union Sass_Value* make_sass_error (const char* msg);
5856

5957
// Make a deep cloned copy of the given sass value
6058
union Sass_Value* sass_clone_value (const union Sass_Value* val);

‎include/sass/values.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ ADDAPI union Sass_Value* ADDCALL sass_make_string (const char* val);
5050
ADDAPI union Sass_Value* ADDCALL sass_make_qstring (const char* val);
5151
ADDAPI union Sass_Value* ADDCALL sass_make_number (double val, const char* unit);
5252
ADDAPI union Sass_Value* ADDCALL sass_make_color (double r, double g, double b, double a);
53-
ADDAPI union Sass_Value* ADDCALL sass_make_list (size_t len, enum Sass_Separator sep, bool is_bracketed);
53+
ADDAPI union Sass_Value* ADDCALL sass_make_list (size_t len, enum Sass_Separator sep);
5454
ADDAPI union Sass_Value* ADDCALL sass_make_map (size_t len);
5555
ADDAPI union Sass_Value* ADDCALL sass_make_error (const char* msg);
5656
ADDAPI union Sass_Value* ADDCALL sass_make_warning (const char* msg);
@@ -116,8 +116,6 @@ ADDAPI size_t ADDCALL sass_list_get_length (const union Sass_Value* v);
116116
// Getters and setters for Sass_List
117117
ADDAPI enum Sass_Separator ADDCALL sass_list_get_separator (const union Sass_Value* v);
118118
ADDAPI void ADDCALL sass_list_set_separator (union Sass_Value* v, enum Sass_Separator value);
119-
ADDAPI bool ADDCALL sass_list_get_is_bracketed (const union Sass_Value* v);
120-
ADDAPI void ADDCALL sass_list_set_is_bracketed (union Sass_Value* v, bool value);
121119
// Getters and setters for Sass_List values
122120
ADDAPI union Sass_Value* ADDCALL sass_list_get_value (const union Sass_Value* v, size_t i);
123121
ADDAPI void ADDCALL sass_list_set_value (union Sass_Value* v, size_t i, union Sass_Value* value);

‎src/GNUmakefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ include $(top_srcdir)/Makefile.conf
3434

3535
libsass_la_SOURCES = ${CSOURCES} ${SOURCES}
3636

37-
libsass_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined -version-info 1:0:0
37+
libsass_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined -version-info 0:9:0
3838

3939
if ENABLE_TESTS
4040
if ENABLE_COVERAGE

‎src/eval.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ namespace Sass {
353353
Sass_Function_Fn c_func = sass_function_get_function(c_function);
354354

355355
To_C to_c;
356-
union Sass_Value* c_args = sass_make_list(1, SASS_COMMA, false);
356+
union Sass_Value* c_args = sass_make_list(1, SASS_COMMA);
357357
sass_list_set_value(c_args, 0, message->perform(&to_c));
358358
union Sass_Value* c_val = c_func(c_args, c_function, ctx.c_compiler);
359359
ctx.c_options.output_style = outstyle;
@@ -400,7 +400,7 @@ namespace Sass {
400400
Sass_Function_Fn c_func = sass_function_get_function(c_function);
401401

402402
To_C to_c;
403-
union Sass_Value* c_args = sass_make_list(1, SASS_COMMA, false);
403+
union Sass_Value* c_args = sass_make_list(1, SASS_COMMA);
404404
sass_list_set_value(c_args, 0, message->perform(&to_c));
405405
union Sass_Value* c_val = c_func(c_args, c_function, ctx.c_compiler);
406406
ctx.c_options.output_style = outstyle;
@@ -444,7 +444,7 @@ namespace Sass {
444444
Sass_Function_Fn c_func = sass_function_get_function(c_function);
445445

446446
To_C to_c;
447-
union Sass_Value* c_args = sass_make_list(1, SASS_COMMA, false);
447+
union Sass_Value* c_args = sass_make_list(1, SASS_COMMA);
448448
sass_list_set_value(c_args, 0, message->perform(&to_c));
449449
union Sass_Value* c_val = c_func(c_args, c_function, ctx.c_compiler);
450450
ctx.c_options.output_style = outstyle;
@@ -1052,7 +1052,7 @@ namespace Sass {
10521052
});
10531053

10541054
To_C to_c;
1055-
union Sass_Value* c_args = sass_make_list(params->length(), SASS_COMMA, false);
1055+
union Sass_Value* c_args = sass_make_list(params->length(), SASS_COMMA);
10561056
for(size_t i = 0; i < params->length(); i++) {
10571057
Parameter_Obj param = params->at(i);
10581058
std::string key = param->name();
@@ -1690,7 +1690,6 @@ namespace Sass {
16901690
for (size_t i = 0, L = sass_list_get_length(v); i < L; ++i) {
16911691
l->append(cval_to_astnode(sass_list_get_value(v, i), backtrace, pstate));
16921692
}
1693-
l->is_bracketed(sass_list_get_is_bracketed(v));
16941693
e = l;
16951694
} break;
16961695
case SASS_MAP: {

‎src/sass_values.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@ extern "C" {
5454
size_t ADDCALL sass_list_get_length(const union Sass_Value* v) { return v->list.length; }
5555
enum Sass_Separator ADDCALL sass_list_get_separator(const union Sass_Value* v) { return v->list.separator; }
5656
void ADDCALL sass_list_set_separator(union Sass_Value* v, enum Sass_Separator separator) { v->list.separator = separator; }
57-
bool ADDCALL sass_list_get_is_bracketed(const union Sass_Value* v) { return v->list.is_bracketed; }
58-
void ADDCALL sass_list_set_is_bracketed(union Sass_Value* v, bool is_bracketed) { v->list.is_bracketed = is_bracketed; }
5957
// Getters and setters for Sass_List values
6058
union Sass_Value* ADDCALL sass_list_get_value(const union Sass_Value* v, size_t i) { return v->list.values[i]; }
6159
void ADDCALL sass_list_set_value(union Sass_Value* v, size_t i, union Sass_Value* value) { v->list.values[i] = value; }
@@ -132,14 +130,13 @@ extern "C" {
132130
return v;
133131
}
134132

135-
union Sass_Value* ADDCALL sass_make_list(size_t len, enum Sass_Separator sep, bool is_bracketed)
133+
union Sass_Value* ADDCALL sass_make_list(size_t len, enum Sass_Separator sep)
136134
{
137135
union Sass_Value* v = (Sass_Value*) calloc(1, sizeof(Sass_Value));
138136
if (v == 0) return 0;
139137
v->list.tag = SASS_LIST;
140138
v->list.length = len;
141139
v->list.separator = sep;
142-
v->list.is_bracketed = is_bracketed;
143140
v->list.values = (union Sass_Value**) calloc(len, sizeof(union Sass_Value*));
144141
if (v->list.values == 0) { free(v); return 0; }
145142
return v;
@@ -251,7 +248,7 @@ extern "C" {
251248
return sass_string_is_quoted(val) ? sass_make_qstring(val->string.value) : sass_make_string(val->string.value);
252249
}
253250
case SASS_LIST: {
254-
union Sass_Value* list = sass_make_list(val->list.length, val->list.separator, val->list.is_bracketed);
251+
union Sass_Value* list = sass_make_list(val->list.length, val->list.separator);
255252
for (i = 0; i < list->list.length; i++) {
256253
list->list.values[i] = sass_clone_value(val->list.values[i]);
257254
}

‎src/sass_values.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ struct Sass_String {
3535
struct Sass_List {
3636
enum Sass_Tag tag;
3737
enum Sass_Separator separator;
38-
bool is_bracketed;
3938
size_t length;
4039
// null terminated "array"
4140
union Sass_Value** values;
@@ -79,4 +78,4 @@ struct Sass_MapPair {
7978
union Sass_Value* value;
8079
};
8180

82-
#endif
81+
#endif

‎src/to_c.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ namespace Sass {
3636

3737
union Sass_Value* To_C::operator()(List_Ptr l)
3838
{
39-
union Sass_Value* v = sass_make_list(l->length(), l->separator(), l->is_bracketed());
39+
union Sass_Value* v = sass_make_list(l->length(), l->separator());
4040
for (size_t i = 0, L = l->length(); i < L; ++i) {
4141
sass_list_set_value(v, i, (*l)[i]->perform(this));
4242
}
@@ -57,7 +57,7 @@ namespace Sass {
5757

5858
union Sass_Value* To_C::operator()(Arguments_Ptr a)
5959
{
60-
union Sass_Value* v = sass_make_list(a->length(), SASS_COMMA, false);
60+
union Sass_Value* v = sass_make_list(a->length(), SASS_COMMA);
6161
for (size_t i = 0, L = a->length(); i < L; ++i) {
6262
sass_list_set_value(v, i, (*a)[i]->perform(this));
6363
}

‎src/values.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace Sass {
2222
else if (val->concrete_type() == Expression::LIST)
2323
{
2424
List_Ptr_Const l = Cast<List>(val);
25-
union Sass_Value* list = sass_make_list(l->size(), l->separator(), l->is_bracketed());
25+
union Sass_Value* list = sass_make_list(l->size(), l->separator());
2626
for (size_t i = 0, L = l->length(); i < L; ++i) {
2727
Expression_Obj obj = l->at(i);
2828
auto val = ast_node_to_sass_value(obj);
@@ -101,7 +101,6 @@ namespace Sass {
101101
for (size_t i = 0, L = sass_list_get_length(val); i < L; ++i) {
102102
l->append(sass_value_to_ast_node(sass_list_get_value(val, i)));
103103
}
104-
l->is_bracketed(sass_list_get_is_bracketed(val));
105104
return l;
106105
}
107106
case SASS_MAP: {

0 commit comments

Comments
 (0)