Skip to content

Commit

Permalink
Clean up some code from previous refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
@mgreter
mgreter committed Mar 29, 2015
1 parent a73ae26 commit f98127a
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 19 deletions.
8 changes: 4 additions & 4 deletions ast.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -644,7 +644,7 @@ namespace Sass {
ADD_PROPERTY(Env*, environment);
ADD_PROPERTY(Type, type);
ADD_PROPERTY(Native_Function, native_function);
ADD_PROPERTY(Sass_Function_Entry, c_cb);
ADD_PROPERTY(Sass_Function_Entry, c_function);
ADD_PROPERTY(void*, cookie);
ADD_PROPERTY(Context*, ctx);
ADD_PROPERTY(bool, is_overload_stub);
Expand All @@ -662,7 +662,7 @@ namespace Sass {
environment_(0),
type_(t),
native_function_(0),
c_cb_(0),
c_function_(0),
cookie_(0),
ctx_(ctx),
is_overload_stub_(false),
Expand All @@ -681,7 +681,7 @@ namespace Sass {
environment_(0),
type_(FUNCTION),
native_function_(func_ptr),
c_cb_(0),
c_function_(0),
cookie_(0),
ctx_(ctx),
is_overload_stub_(overload_stub),
Expand All @@ -701,7 +701,7 @@ namespace Sass {
environment_(0),
type_(FUNCTION),
native_function_(0),
c_cb_(c_func),
c_function_(c_func),
cookie_(sass_function_get_cookie(c_func)),
ctx_(ctx),
is_overload_stub_(false),
Expand Down
26 changes: 13 additions & 13 deletions eval.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -256,13 +256,13 @@ namespace Sass {
Definition* def = static_cast<Definition*>((*env)["@warn[f]"]);
// Block* body = def->block();
// Native_Function func = def->native_function();
Sass_Function_Entry c_cb = def->c_cb();
Sass_Function_Fn c_func = sass_function_get_function(c_cb);
Sass_Function_Entry c_function = def->c_function();
Sass_Function_Fn c_func = sass_function_get_function(c_function);

To_C to_c;
union Sass_Value* c_args = sass_make_list(1, SASS_COMMA);
sass_list_set_value(c_args, 0, message->perform(&to_c));
Sass_Value* c_val = c_func(c_args, c_cb, ctx.c_options);
Sass_Value* c_val = c_func(c_args, c_function, ctx.c_options);
sass_delete_value(c_args);
sass_delete_value(c_val);
return 0;
Expand All @@ -288,13 +288,13 @@ namespace Sass {
Definition* def = static_cast<Definition*>((*env)["@error[f]"]);
// Block* body = def->block();
// Native_Function func = def->native_function();
Sass_Function_Entry c_cb = def->c_cb();
Sass_Function_Fn c_func = sass_function_get_function(c_cb);
Sass_Function_Entry c_function = def->c_function();
Sass_Function_Fn c_func = sass_function_get_function(c_function);

To_C to_c;
union Sass_Value* c_args = sass_make_list(1, SASS_COMMA);
sass_list_set_value(c_args, 0, message->perform(&to_c));
Sass_Value* c_val = c_func(c_args, c_cb, ctx.c_options);
Sass_Value* c_val = c_func(c_args, c_function, ctx.c_options);
sass_delete_value(c_args);
sass_delete_value(c_val);
return 0;
Expand All @@ -317,13 +317,13 @@ namespace Sass {
Definition* def = static_cast<Definition*>((*env)["@debug[f]"]);
// Block* body = def->block();
// Native_Function func = def->native_function();
Sass_Function_Entry c_cb = def->c_cb();
Sass_Function_Fn c_func = sass_function_get_function(c_cb);
Sass_Function_Entry c_function = def->c_function();
Sass_Function_Fn c_func = sass_function_get_function(c_function);

To_C to_c;
union Sass_Value* c_args = sass_make_list(1, SASS_COMMA);
sass_list_set_value(c_args, 0, message->perform(&to_c));
Sass_Value* c_val = c_func(c_args, c_cb, ctx.c_options);
Sass_Value* c_val = c_func(c_args, c_function, ctx.c_options);
sass_delete_value(c_args);
sass_delete_value(c_val);
return 0;
Expand Down Expand Up @@ -503,7 +503,7 @@ namespace Sass {
Definition* def = static_cast<Definition*>((*env)[full_name]);
Block* body = def->block();
Native_Function func = def->native_function();
Sass_Function_Entry c_cb = def->c_cb();
Sass_Function_Entry c_function = def->c_function();

if (full_name != "if[f]") {
for (size_t i = 0, L = args->length(); i < L; ++i) {
Expand Down Expand Up @@ -554,9 +554,9 @@ namespace Sass {
env = old_env;
}
// else if it's a user-defined c function
else if (c_cb) {
else if (c_function) {

Sass_Function_Fn c_func = sass_function_get_function(c_cb);
Sass_Function_Fn c_func = sass_function_get_function(c_function);
if (full_name == "*[f]") {
String_Constant *str = new (ctx.mem) String_Constant(c->pstate(), c->name());
Arguments* new_args = new (ctx.mem) Arguments(c->pstate());
Expand All @@ -581,7 +581,7 @@ namespace Sass {
Expression* arg = static_cast<Expression*>(node);
sass_list_set_value(c_args, i, arg->perform(&to_c));
}
Sass_Value* c_val = c_func(c_args, c_cb, ctx.c_options);
Sass_Value* c_val = c_func(c_args, c_function, ctx.c_options);
if (sass_value_get_tag(c_val) == SASS_ERROR) {
error("error in C function " + c->name() + ": " + sass_error_get_message(c_val), c->pstate(), backtrace);
} else if (sass_value_get_tag(c_val) == SASS_WARNING) {
Expand Down
4 changes: 2 additions & 2 deletions sass_interface.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ extern "C" {
.linefeed(c_ctx->options.linefeed ? c_ctx->options.linefeed : LFEED)
);
if (c_ctx->c_functions) {
struct Sass_Function** this_func_data = c_ctx->c_functions;
Sass_Function_List this_func_data = c_ctx->c_functions;
while ((this_func_data) && (*this_func_data)) {
cpp_ctx.c_functions.push_back(*this_func_data);
++this_func_data;
Expand Down Expand Up @@ -222,7 +222,7 @@ extern "C" {
.linefeed(c_ctx->options.linefeed ? c_ctx->options.linefeed : LFEED)
);
if (c_ctx->c_functions) {
struct Sass_Function** this_func_data = c_ctx->c_functions;
Sass_Function_List this_func_data = c_ctx->c_functions;
while ((this_func_data) && (*this_func_data)) {
cpp_ctx.c_functions.push_back(*this_func_data);
++this_func_data;
Expand Down

0 comments on commit f98127a

Please sign in to comment.