Storing the error status and message into the interface struct.

Aaron Leung · Aaron Leung · commit 5a0eae49f6d0 · 2012-04-13T16:09:11.000-07:00
diff --git a/exceptional.scss b/exceptional.scss
@@ -21,5 +21,6 @@ div[hux ~= "hello"] {
   foo: boo;
   @include moogoo;
   dux: mux;
-  @import "foogoo";
+  @import bugaboo "foogoo"
+  blah: blah;
 }
diff --git a/sass_interface.cpp b/sass_interface.cpp
@@ -1,4 +1,5 @@
 #include <iostream>
+#include <sstream>
 #include <string>
 #include <cstdlib>
 #include <unistd.h>
@@ -53,13 +54,28 @@ extern "C" {
       Context cpp_ctx(c_ctx->options.include_paths);
       Document doc(0, c_ctx->input_string, cpp_ctx);
       c_ctx->output_string = process_document(doc, c_ctx->options.output_style);
+      c_ctx->error_message = 0;
+      c_ctx->error_status = 0;
     }
     catch (Error& e) {
-      cerr << "ERROR -- " << e.file_name << ", line " << e.line_number << ": " << e.message << endl;
+      stringstream msg_stream;
+      msg_stream << "ERROR -- " << e.file_name << ", line " << e.line_number << ": " << e.message << endl;
+      string msg(msg_stream.str());
+      char* msg_str = (char*) malloc(msg.size() + 1);
+      strcpy(msg_str, msg.c_str());
+      c_ctx->error_status = 1;
       c_ctx->output_string = 0;
+      c_ctx->error_message = msg_str;
     }
     catch(bad_alloc& ba) {
-      cerr << "ERROR -- unable to allocate memory: " << ba.what() << endl;
+      stringstream msg_stream;
+      msg_stream << "ERROR -- unable to allocate memory: " << ba.what() << endl;
+      string msg(msg_stream.str());
+      char* msg_str = (char*) malloc(msg.size() + 1);
+      strcpy(msg_str, msg.c_str());
+      c_ctx->error_status = 1;
+      c_ctx->output_string = 0;
+      c_ctx->error_message = msg_str;
     }
     // TO DO: CATCH EVERYTHING ELSE
     return 0;
@@ -72,13 +88,28 @@ extern "C" {
       Context cpp_ctx(c_ctx->options.include_paths);
       Document doc(c_ctx->input_path, 0, cpp_ctx);
       c_ctx->output_string = process_document(doc, c_ctx->options.output_style);
+      c_ctx->error_message = 0;
+      c_ctx->error_status = 0;
     }
     catch (Error& e) {
-      cerr << "ERROR -- " << e.file_name << ", line " << e.line_number << ": " << e.message << endl;
+      stringstream msg_stream;
+      msg_stream << "ERROR -- " << e.file_name << ", line " << e.line_number << ": " << e.message << endl;
+      string msg(msg_stream.str());
+      char* msg_str = (char*) malloc(msg.size() + 1);
+      strcpy(msg_str, msg.c_str());
+      c_ctx->error_status = 1;
       c_ctx->output_string = 0;
+      c_ctx->error_message = msg_str;
     }
     catch(bad_alloc& ba) {
-      cerr << "ERROR -- unable to allocate memory: " << ba.what() << endl;
+      stringstream msg_stream;
+      msg_stream << "ERROR -- unable to allocate memory: " << ba.what() << endl;
+      string msg(msg_stream.str());
+      char* msg_str = (char*) malloc(msg.size() + 1);
+      strcpy(msg_str, msg.c_str());
+      c_ctx->error_status = 1;
+      c_ctx->output_string = 0;
+      c_ctx->error_message = msg_str;
     }
     // TO DO: CATCH EVERYTHING ELSE
     return 0;
diff --git a/sass_interface.h b/sass_interface.h
@@ -16,18 +16,24 @@ struct sass_context {
   char* input_string;
   char* output_string;
   struct sass_options options;
+  int error_status;
+  char* error_message;
 };
 
 struct sass_folder_context {
   char* search_path;
   char* output_path;
   struct sass_options options;
+  int error_status;
+  char* error_message;
 };
 
 struct sass_file_context {
   char* input_path;
   char* output_string;
   struct sass_options options;
+  int error_status;
+  char* error_message;
 };
 
 struct sass_context*        sass_new_context        ();
diff --git a/sassc.c b/sassc.c
@@ -34,7 +34,16 @@ int main(int argc, char** argv)
 		
 	sass_compile_file(ctx);
 	
-	if (ctx->output_string) printf("%s", ctx->output_string);
+	if (ctx->error_status) {
+    if (ctx->error_message) printf("%s", ctx->error_message);
+    else printf("An error occured; no error message available.\n");
+  }
+	else if (ctx->output_string) {
+	  printf("%s", ctx->output_string);
+  }
+  else {
+    printf("Unknown internal error.\n");
+  }
 	
   sass_free_file_context(ctx);
 	return 0;

Original file line number	Diff line number	Diff line change
`@@ -21,5 +21,6 @@ div[hux ~= "hello"] {`
`21`	`21`	`foo: boo;`
`22`	`22`	`@include moogoo;`
`23`	`23`	`dux: mux;`
`24`		`- @import "foogoo";`
	`24`	`+ @import bugaboo "foogoo"`
	`25`	`+ blah: blah;`
`25`	`26`	`}`