Skip to content

N
node-sass
Commit 13d63d86 by Andrew Nesbitt
Options

Merge pull request #210 from nschonni/normalize-binding-spacing 

Normalize spacing in binding.cpp
parents 09ccd48c adff6171
Showing with 152 additions and 152 deletions
binding.cpp
...@@ -10,199 +10,199 @@ using namespace std; ...@@ -10,199 +10,199 @@ using namespace std;
void WorkOnContext(uv_work_t* req) { void WorkOnContext(uv_work_t* req) {
sass_context_wrapper* ctx_w = static_cast<sass_context_wrapper*>(req->data); sass_context_wrapper* ctx_w = static_cast<sass_context_wrapper*>(req->data);
if (ctx_w->ctx) { if (ctx_w->ctx) {
sass_context* ctx = static_cast<sass_context*>(ctx_w->ctx); sass_context* ctx = static_cast<sass_context*>(ctx_w->ctx);
sass_compile(ctx); sass_compile(ctx);
} else if (ctx_w->fctx) { } else if (ctx_w->fctx) {
sass_file_context* ctx = static_cast<sass_file_context*>(ctx_w->fctx); sass_file_context* ctx = static_cast<sass_file_context*>(ctx_w->fctx);
sass_compile_file(ctx); sass_compile_file(ctx);
} }
} }
void extractOptions(_NAN_METHOD_ARGS, void* cptr, sass_context_wrapper* ctx_w, bool isFile) { void extractOptions(_NAN_METHOD_ARGS, void* cptr, sass_context_wrapper* ctx_w, bool isFile) {
char *source; char *source;
char* pathOrData; char* pathOrData;
int output_style; int output_style;
int source_comments; int source_comments;
String::AsciiValue astr(args[0]); String::AsciiValue astr(args[0]);
if (ctx_w) { if (ctx_w) {
// async (callback) style // async (callback) style
Local<Function> callback = Local<Function>::Cast(args[1]); Local<Function> callback = Local<Function>::Cast(args[1]);
Local<Function> errorCallback = Local<Function>::Cast(args[2]); Local<Function> errorCallback = Local<Function>::Cast(args[2]);
if (isFile) {
ctx_w->fctx = (sass_file_context*) cptr;
} else {
ctx_w->ctx = (sass_context*) cptr;
}
ctx_w->request.data = ctx_w;
ctx_w->callback = new NanCallback(callback);
ctx_w->errorCallback = new NanCallback(errorCallback);
output_style = args[4]->Int32Value();
source_comments = args[5]->Int32Value();
String::AsciiValue bstr(args[3]);
pathOrData = new char[strlen(*bstr)+1];
strcpy(pathOrData, *bstr);
} else {
// synchronous style
output_style = args[2]->Int32Value();
source_comments = args[3]->Int32Value();
String::AsciiValue bstr(args[1]);
pathOrData = new char[strlen(*bstr)+1];
strcpy(pathOrData, *bstr);
}
if (isFile) { if (isFile) {
sass_file_context *ctx = (sass_file_context*)cptr; ctx_w->fctx = (sass_file_context*) cptr;
char *filename = new char[strlen(*astr)+1];
strcpy(filename, *astr);
ctx->input_path = filename;
ctx->options.image_path = new char[0];
ctx->options.output_style = output_style;
ctx->options.source_comments = source_comments;
ctx->options.include_paths = pathOrData;
if (source_comments == SASS_SOURCE_COMMENTS_MAP) {
String::AsciiValue cstr(args[6]);
ctx->source_map_file = new char[strlen(*cstr)+1];
strcpy(ctx->source_map_file, *cstr);
}
} else { } else {
sass_context *ctx = (sass_context*)cptr; ctx_w->ctx = (sass_context*) cptr;
source = new char[strlen(*astr)+1];
strcpy(source, *astr);
ctx->source_string = source;
ctx->options.image_path = new char[0];
ctx->options.output_style = output_style;
ctx->options.source_comments = source_comments;
ctx->options.include_paths = pathOrData;
} }
ctx_w->request.data = ctx_w;
ctx_w->callback = new NanCallback(callback);
ctx_w->errorCallback = new NanCallback(errorCallback);
output_style = args[4]->Int32Value();
source_comments = args[5]->Int32Value();
String::AsciiValue bstr(args[3]);
pathOrData = new char[strlen(*bstr)+1];
strcpy(pathOrData, *bstr);
} else {
// synchronous style
output_style = args[2]->Int32Value();
source_comments = args[3]->Int32Value();
String::AsciiValue bstr(args[1]);
pathOrData = new char[strlen(*bstr)+1];
strcpy(pathOrData, *bstr);
}
if (isFile) {
sass_file_context *ctx = (sass_file_context*)cptr;
char *filename = new char[strlen(*astr)+1];
strcpy(filename, *astr);
ctx->input_path = filename;
ctx->options.image_path = new char[0];
ctx->options.output_style = output_style;
ctx->options.source_comments = source_comments;
ctx->options.include_paths = pathOrData;
if (source_comments == SASS_SOURCE_COMMENTS_MAP) {
String::AsciiValue cstr(args[6]);
ctx->source_map_file = new char[strlen(*cstr)+1];
strcpy(ctx->source_map_file, *cstr);
}
} else {
sass_context *ctx = (sass_context*)cptr;
source = new char[strlen(*astr)+1];
strcpy(source, *astr);
ctx->source_string = source;
ctx->options.image_path = new char[0];
ctx->options.output_style = output_style;
ctx->options.source_comments = source_comments;
ctx->options.include_paths = pathOrData;
}
} }
void MakeCallback(uv_work_t* req) { void MakeCallback(uv_work_t* req) {
NanScope(); NanScope();
TryCatch try_catch; TryCatch try_catch;
sass_context_wrapper* ctx_w = static_cast<sass_context_wrapper*>(req->data); sass_context_wrapper* ctx_w = static_cast<sass_context_wrapper*>(req->data);
Handle<Value> val, err; Handle<Value> val, err;
const unsigned argc = 2; const unsigned argc = 2;
int error_status = ctx_w->ctx ? ctx_w->ctx->error_status : ctx_w->fctx->error_status; int error_status = ctx_w->ctx ? ctx_w->ctx->error_status : ctx_w->fctx->error_status;
if (error_status == 0) { if (error_status == 0) {
// if no error, do callback(null, result) // if no error, do callback(null, result)
Handle<Value> source_map; Handle<Value> source_map;
if (ctx_w->fctx && ctx_w->fctx->options.source_comments == SASS_SOURCE_COMMENTS_MAP) { if (ctx_w->fctx && ctx_w->fctx->options.source_comments == SASS_SOURCE_COMMENTS_MAP) {
source_map = String::New(ctx_w->fctx->source_map_string); source_map = String::New(ctx_w->fctx->source_map_string);
} else {
source_map = Null();
}
val = ctx_w->ctx ? NanNewLocal(String::New(ctx_w->ctx->output_string)) : NanNewLocal(String::New(ctx_w->fctx->output_string));
Local<Value> argv[argc] = {
NanNewLocal(val),
NanNewLocal(source_map),
};
ctx_w->callback->Call(argc, argv);
} else {
// if error, do callback(error)
err = ctx_w->ctx ? NanNewLocal(String::New(ctx_w->ctx->error_message)) : NanNewLocal(String::New(ctx_w->fctx->error_message));
Local<Value> argv[argc] = {
NanNewLocal(err),
NanNewLocal(Integer::New(error_status))
};
ctx_w->errorCallback->Call(argc, argv);
}
if (try_catch.HasCaught()) {
node::FatalException(try_catch);
}
if (ctx_w->ctx) {
delete ctx_w->ctx->source_string;
} else { } else {
delete ctx_w->fctx->input_path; source_map = Null();
} }
sass_free_context_wrapper(ctx_w);
val = ctx_w->ctx ? NanNewLocal(String::New(ctx_w->ctx->output_string)) : NanNewLocal(String::New(ctx_w->fctx->output_string));
Local<Value> argv[argc] = {
NanNewLocal(val),
NanNewLocal(source_map),
};
ctx_w->callback->Call(argc, argv);
} else {
// if error, do callback(error)
err = ctx_w->ctx ? NanNewLocal(String::New(ctx_w->ctx->error_message)) : NanNewLocal(String::New(ctx_w->fctx->error_message));
Local<Value> argv[argc] = {
NanNewLocal(err),
NanNewLocal(Integer::New(error_status))
};
ctx_w->errorCallback->Call(argc, argv);
}
if (try_catch.HasCaught()) {
node::FatalException(try_catch);
}
if (ctx_w->ctx) {
delete ctx_w->ctx->source_string;
} else {
delete ctx_w->fctx->input_path;
}
sass_free_context_wrapper(ctx_w);
} }
NAN_METHOD(Render) { NAN_METHOD(Render) {
NanScope(); NanScope();
sass_context* ctx = sass_new_context(); sass_context* ctx = sass_new_context();
sass_context_wrapper* ctx_w = sass_new_context_wrapper(); sass_context_wrapper* ctx_w = sass_new_context_wrapper();
ctx_w->ctx = ctx; ctx_w->ctx = ctx;
extractOptions(args, ctx, ctx_w, false); extractOptions(args, ctx, ctx_w, false);
int status = uv_queue_work(uv_default_loop(), &ctx_w->request, WorkOnContext, (uv_after_work_cb)MakeCallback); int status = uv_queue_work(uv_default_loop(), &ctx_w->request, WorkOnContext, (uv_after_work_cb)MakeCallback);
assert(status == 0); assert(status == 0);
NanReturnUndefined(); NanReturnUndefined();
} }
NAN_METHOD(RenderSync) { NAN_METHOD(RenderSync) {
NanScope(); NanScope();
sass_context* ctx = sass_new_context(); sass_context* ctx = sass_new_context();
extractOptions(args, ctx, NULL, false); extractOptions(args, ctx, NULL, false);
sass_compile(ctx); sass_compile(ctx);
delete ctx->source_string; delete ctx->source_string;
ctx->source_string = NULL; ctx->source_string = NULL;
delete ctx->options.include_paths; delete ctx->options.include_paths;
ctx->options.include_paths = NULL; ctx->options.include_paths = NULL;
if (ctx->error_status == 0) { if (ctx->error_status == 0) {
Local<Value> output = NanNewLocal(String::New(ctx->output_string)); Local<Value> output = NanNewLocal(String::New(ctx->output_string));
sass_free_context(ctx); sass_free_context(ctx);
NanReturnValue(output); NanReturnValue(output);
} }
Local<String> error = String::New(ctx->error_message); Local<String> error = String::New(ctx->error_message);
sass_free_context(ctx); sass_free_context(ctx);
NanThrowError(error); NanThrowError(error);
NanReturnUndefined(); NanReturnUndefined();
} }
NAN_METHOD(RenderFile) { NAN_METHOD(RenderFile) {
NanScope(); NanScope();
sass_file_context* fctx = sass_new_file_context(); sass_file_context* fctx = sass_new_file_context();
sass_context_wrapper* ctx_w = sass_new_context_wrapper(); sass_context_wrapper* ctx_w = sass_new_context_wrapper();
ctx_w->fctx = fctx; ctx_w->fctx = fctx;
extractOptions(args, fctx, ctx_w, true); extractOptions(args, fctx, ctx_w, true);
int status = uv_queue_work(uv_default_loop(), &ctx_w->request, WorkOnContext, (uv_after_work_cb)MakeCallback); int status = uv_queue_work(uv_default_loop(), &ctx_w->request, WorkOnContext, (uv_after_work_cb)MakeCallback);
assert(status == 0); assert(status == 0);
NanReturnUndefined(); NanReturnUndefined();
} }
NAN_METHOD(RenderFileSync) { NAN_METHOD(RenderFileSync) {
NanScope(); NanScope();
sass_file_context* ctx = sass_new_file_context(); sass_file_context* ctx = sass_new_file_context();
extractOptions(args, ctx, NULL, true); extractOptions(args, ctx, NULL, true);
sass_compile_file(ctx);
delete ctx->input_path; sass_compile_file(ctx);
ctx->input_path = NULL;
delete ctx->options.include_paths;
ctx->options.include_paths = NULL;
if (ctx->error_status == 0) { delete ctx->input_path;
Local<Value> output = NanNewLocal(String::New(ctx->output_string)); ctx->input_path = NULL;
sass_free_file_context(ctx); delete ctx->options.include_paths;
ctx->options.include_paths = NULL;
NanReturnValue(output); if (ctx->error_status == 0) {
} Local<Value> output = NanNewLocal(String::New(ctx->output_string));
Local<String> error = String::New(ctx->error_message);
sass_free_file_context(ctx); sass_free_file_context(ctx);
NanThrowError(error); NanReturnValue(output);
NanReturnUndefined(); }
Local<String> error = String::New(ctx->error_message);
sass_free_file_context(ctx);
NanThrowError(error);
NanReturnUndefined();
} }
void RegisterModule(v8::Handle<v8::Object> target) { void RegisterModule(v8::Handle<v8::Object> target) {
NODE_SET_METHOD(target, "render", Render); NODE_SET_METHOD(target, "render", Render);
NODE_SET_METHOD(target, "renderSync", RenderSync); NODE_SET_METHOD(target, "renderSync", RenderSync);
NODE_SET_METHOD(target, "renderFile", RenderFile); NODE_SET_METHOD(target, "renderFile", RenderFile);
NODE_SET_METHOD(target, "renderFileSync", RenderFileSync); NODE_SET_METHOD(target, "renderFileSync", RenderFileSync);
} }
NODE_MODULE(binding, RegisterModule); NODE_MODULE(binding, RegisterModule);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment