diff --git a/src/ast_fwd_decl.hpp b/src/ast_fwd_decl.hpp index 90c362310..e4037865f 100644 --- a/src/ast_fwd_decl.hpp +++ b/src/ast_fwd_decl.hpp @@ -426,7 +426,6 @@ namespace Sass { typedef std::vector ImporterStack; typedef const char* Signature; - // only to switch implementations for testing #define environment_map std::map diff --git a/src/bind.cpp b/src/bind.cpp index ec20ac838..fdae1fea6 100644 --- a/src/bind.cpp +++ b/src/bind.cpp @@ -10,7 +10,7 @@ namespace Sass { - void bind(std::string type, std::string name, Parameters_Obj ps, Arguments_Obj as, Context* ctx, Env* env, Eval* eval) + void bind(std::string type, std::string name, Parameters_Obj ps, Arguments_Obj as, Env* env, Eval* eval) { std::string callee(type + " " + name); diff --git a/src/bind.hpp b/src/bind.hpp index 93a503aa6..9e9e0ec4e 100644 --- a/src/bind.hpp +++ b/src/bind.hpp @@ -7,7 +7,7 @@ namespace Sass { - void bind(std::string type, std::string name, Parameters_Obj, Arguments_Obj, Context*, Env*, Eval*); + void bind(std::string type, std::string name, Parameters_Obj, Arguments_Obj, Env*, Eval*); } #endif diff --git a/src/eval.cpp b/src/eval.cpp index 512c420e2..585b56d6a 100644 --- a/src/eval.cpp +++ b/src/eval.cpp @@ -1003,7 +1003,7 @@ namespace Sass { exp.env_stack.push_back(&fn_env); if (func || body) { - bind(std::string("Function"), c->name(), params, args, &ctx, &fn_env, this); + bind(std::string("Function"), c->name(), params, args, &fn_env, this); std::string msg(", in function `" + c->name() + "`"); traces.push_back(Backtrace(c->pstate(), msg)); ctx.callee_stack.push_back({ @@ -1043,7 +1043,7 @@ namespace Sass { // populates env with default values for params std::string ff(c->name()); - bind(std::string("Function"), c->name(), params, args, &ctx, &fn_env, this); + bind(std::string("Function"), c->name(), params, args, &fn_env, this); std::string msg(", in function `" + c->name() + "`"); traces.push_back(Backtrace(c->pstate(), msg)); ctx.callee_stack.push_back({ diff --git a/src/expand.cpp b/src/expand.cpp index 7db489c57..1987c4907 100644 --- a/src/expand.cpp +++ b/src/expand.cpp @@ -740,7 +740,7 @@ namespace Sass { new_env.local_frame()["@content[m]"] = thunk; } - bind(std::string("Mixin"), c->name(), params, args, &ctx, &new_env, &eval); + bind(std::string("Mixin"), c->name(), params, args, &new_env, &eval); Block_Obj trace_block = SASS_MEMORY_NEW(Block, c->pstate()); Trace_Obj trace = SASS_MEMORY_NEW(Trace, c->pstate(), c->name(), trace_block); diff --git a/src/fn_utils.hpp b/src/fn_utils.hpp index ab03bbf4f..4d00d904c 100644 --- a/src/fn_utils.hpp +++ b/src/fn_utils.hpp @@ -16,8 +16,6 @@ namespace Sass { // special function for weird hsla percent (10px == 10% == 10 != 0.1) #define ARGVAL(argname) get_arg_val(argname, env, sig, pstate, traces) // double - typedef const char* Signature; - typedef Expression_Ptr (*Native_Function)(Env&, Env&, Context&, Signature, ParserState, Backtraces, SelectorStack); Definition_Ptr make_native_function(Signature, Native_Function, Context& ctx);