Merge branch 'jlinton-JL_CHANGES't push origin master

Author: Hampton Catlin

context.cpp

@@ -211,7 +211,8 @@ namespace Sass {
   {
     Block* root = 0;
     for (size_t i = 0; i < queue.size(); ++i) {
-      Parser p(Parser::from_c_str(queue[i].second, *this, queue[i].first, Position(1 + i, 1, 1)));
+      string parsedata=string(source_c_str)+string("\n")+string(queue[i].second);
+      Parser p(Parser::from_c_str(parsedata.c_str(), *this, queue[i].first, Position(1 + i, 0, 1)));
       Block* ast = p.parse();
       if (i == 0) root = ast;
       style_sheets[queue[i].first] = ast;

sass_interface.cpp

@@ -190,8 +190,14 @@ extern "C" {
       else {
           output_path = c_ctx->output_path;
       }
+      if (c_ctx->source_string==NULL)
+      {
+          c_ctx->source_string="//";
+      }
       Context cpp_ctx(
-        Context::Data().entry_point(input_path)
+
+        Context::Data().source_c_str(c_ctx->source_string)
+                       .entry_point(input_path)
                        .output_path(output_path)
                        .output_style((Output_Style) c_ctx->options.output_style)
                        .source_comments(c_ctx->options.source_comments)

sass_interface.h

@@ -53,8 +53,12 @@ struct sass_context {
 };
 
 struct sass_file_context {
+  // Input Path is the path to the Sass file for processing
   const char* input_path;
   const char* output_path;
+  // Source string is an optional way to inject some Sass before the file is executed
+  // to allow for dynamic changes in execution w/o a file change.
+  const char* source_string;
   char* output_string;
   char* source_map_string;
   struct sass_options options;