Merge pull request sass#251 from svnieuw/sourcemaps

Fix issue sass#217: wrong file property value in source map.
scantist-ossops-m2 · Jan 15, 2014 · 4a87734 · 4a87734
2 parents 1b564b6 + 77de2b0
commit 4a87734
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 4 deletions.
diff --git a/context.cpp b/context.cpp
@@ -45,7 +45,7 @@ namespace Sass {
     include_paths   (initializers.include_paths()),
     queue           (vector<pair<string, const char*> >()),
     style_sheets    (map<string, Block*>()),
-    source_map(File::base_name(initializers.entry_point())),
+    source_map(File::base_name(initializers.output_path())),
     image_path      (initializers.image_path()),
     source_comments (initializers.source_comments()),
     source_maps     (initializers.source_maps()),
@@ -249,7 +249,7 @@ namespace Sass {
   {
     if (!source_maps) return 0;
     char* result = 0;
-    string map = source_map.generate_source_map(this);
+    string map = source_map.generate_source_map();
     result = copy_c_str(map.c_str());
     return result;
   }

diff --git a/context.hpp b/context.hpp
@@ -53,6 +53,7 @@ namespace Sass {
     KWD_ARG_SET(Data) {
       KWD_ARG(Data, const char*,     source_c_str);
       KWD_ARG(Data, string,          entry_point);
+      KWD_ARG(Data, string,          output_path);
       KWD_ARG(Data, string,          image_path);
       KWD_ARG(Data, const char*,     include_paths_c_str);
       KWD_ARG(Data, const char**,    include_paths_array);

diff --git a/sass_interface.cpp b/sass_interface.cpp
@@ -131,8 +131,10 @@ extern "C" {
         source_maps = true;
         source_map_file = c_ctx->source_map_file;
       }
+      string output_path = c_ctx->output_path ? c_ctx->output_path : "";
       Context cpp_ctx(
         Context::Data().entry_point(c_ctx->input_path)
+	               .output_path(output_path)
                        .output_style((Output_Style) c_ctx->options.output_style)
                        .source_comments(c_ctx->options.source_comments == SASS_SOURCE_COMMENTS_DEFAULT)
                        .source_maps(source_maps)

diff --git a/sass_interface.h b/sass_interface.h
@@ -35,6 +35,7 @@ struct sass_context {
 
 struct sass_file_context {
   const char* input_path;
+  const char* output_path;
   char* output_string;
   char* source_map_string;
   const char* source_map_file;

diff --git a/source_map.cpp b/source_map.cpp
@@ -8,7 +8,7 @@ namespace Sass {
 
   SourceMap::SourceMap(const string& file) : current_position(Position(1, 1)), file(file) { }
 
-  string SourceMap::generate_source_map(Context* ctx) {
+  string SourceMap::generate_source_map() {
     string result = "{\n";
     result += "  \"version\": 3,\n";
     result += "  \"file\": \"" + file + "\",\n";

diff --git a/source_map.hpp b/source_map.hpp
@@ -34,7 +34,7 @@ namespace Sass {
     void update_column();
     void add_mapping(AST_Node* node);
 
-    string generate_source_map(Context* ctx);
+    string generate_source_map();
 
   private: