sassc 1.8.1 → 1.8.2

data/ext/libsass/src/sass_functions.cpp

@@ -2,17 +2,11 @@
 #include "util.hpp"
 #include "context.hpp"
 #include "sass/functions.h"
+#include "sass_functions.hpp"
 
 extern "C" {
   using namespace Sass;
 
-  // Struct to hold custom function callback
-  struct Sass_Function {
-    const char*      signature;
-    Sass_Function_Fn function;
-    void*            cookie;
-  };
-
   Sass_Function_List ADDCALL sass_make_function_list(size_t length)
   {
     return (Sass_Function_List) calloc(length + 1, sizeof(Sass_Function_Entry));
@@ -36,25 +30,6 @@ extern "C" {
   Sass_Function_Fn ADDCALL sass_function_get_function(Sass_Function_Entry cb) { return cb->function; }
   void* ADDCALL sass_function_get_cookie(Sass_Function_Entry cb) { return cb->cookie; }
 
-  // External import entry
-  struct Sass_Import {
-    char* imp_path; // path as found in the import statement
-    char *abs_path; // path after importer has resolved it
-    char* source;
-    char* srcmap;
-    // error handling
-    char* error;
-    size_t line;
-    size_t column;
-  };
-
-  // Struct to hold importer callback
-  struct Sass_Importer {
-    Sass_Importer_Fn importer;
-    double           priority;
-    void*            cookie;
-  };
-
   Sass_Importer_Entry ADDCALL sass_make_importer(Sass_Importer_Fn importer, double priority, void* cookie)
   {
     Sass_Importer_Entry cb = (Sass_Importer_Entry) calloc(1, sizeof(Sass_Importer));

data/ext/libsass/src/sass_functions.hpp

@@ -0,0 +1,32 @@
+#ifndef SASS_SASS_FUNCTIONS_H
+#define SASS_SASS_FUNCTIONS_H
+
+#include "sass.h"
+
+// Struct to hold custom function callback
+struct Sass_Function {
+  const char*      signature;
+  Sass_Function_Fn function;
+  void*            cookie;
+};
+
+// External import entry
+struct Sass_Import {
+  char* imp_path; // path as found in the import statement
+  char *abs_path; // path after importer has resolved it
+  char* source;
+  char* srcmap;
+  // error handling
+  char* error;
+  size_t line;
+  size_t column;
+};
+
+// Struct to hold importer callback
+struct Sass_Importer {
+  Sass_Importer_Fn importer;
+  double           priority;
+  void*            cookie;
+};
+
+#endif

data/ext/libsass/src/sass_interface.cpp

@@ -69,26 +69,8 @@ extern "C" {
       else {
           output_path = c_ctx->output_path;
       }
-      Context cpp_ctx(
-        Context::Data().source_c_str(c_ctx->source_string)
-                       .output_path(output_path)
-                       .output_style((Output_Style) c_ctx->options.output_style)
-                       .is_indented_syntax_src(c_ctx->options.is_indented_syntax_src)
-                       .source_comments(c_ctx->options.source_comments)
-                       .source_map_file(safe_str(c_ctx->options.source_map_file))
-                       .source_map_root(safe_str(c_ctx->options.source_map_root))
-                       .source_map_embed(c_ctx->options.source_map_embed)
-                       .source_map_contents(c_ctx->options.source_map_contents)
-                       .omit_source_map_url(c_ctx->options.omit_source_map_url)
-                       .include_paths_c_str(c_ctx->options.include_paths)
-                       .plugin_paths_c_str(c_ctx->options.plugin_paths)
-                       // .include_paths_array(0)
-                       // .plugin_paths_array(0)
-                       .include_paths(std::vector<std::string>())
-                       .plugin_paths(std::vector<std::string>())
-                       .precision(c_ctx->options.precision ? c_ctx->options.precision : 5)
-                       .indent(c_ctx->options.indent ? c_ctx->options.indent : "  ")
-                       .linefeed(c_ctx->options.linefeed ? c_ctx->options.linefeed : LFEED)
+      Data_Context cpp_ctx(
+        (Sass_Data_Context*) 0
       );
       if (c_ctx->c_functions) {
         Sass_Function_List this_func_data = c_ctx->c_functions;
@@ -97,17 +79,18 @@ extern "C" {
           ++this_func_data;
         }
       }
-      c_ctx->output_string = cpp_ctx.compile_string();
-      c_ctx->source_map_string = cpp_ctx.generate_source_map();
+      Block* root = cpp_ctx.parse();
+      c_ctx->output_string = cpp_ctx.render(root);
+      c_ctx->source_map_string = cpp_ctx.render_srcmap();
       c_ctx->error_message = 0;
       c_ctx->error_status = 0;
 
       if (copy_strings(cpp_ctx.get_included_files(true), &c_ctx->included_files, 1) == NULL)
         throw(std::bad_alloc());
     }
-    catch (Error_Invalid& e) {
+    catch (Exception::InvalidSass& e) {
       std::stringstream msg_stream;
-      msg_stream << e.pstate.path << ":" << e.pstate.line << ": " << e.message << std::endl;
+      msg_stream << e.pstate.path << ":" << e.pstate.line << ": " << e.what() << std::endl;
       c_ctx->error_message = sass_strdup(msg_stream.str().c_str());
       c_ctx->error_status = 1;
       c_ctx->output_string = 0;
@@ -162,26 +145,8 @@ extern "C" {
       else {
           output_path = c_ctx->output_path;
       }
-      Context cpp_ctx(
-        Context::Data().entry_point(input_path)
-                       .output_path(output_path)
-                       .output_style((Output_Style) c_ctx->options.output_style)
-                       .is_indented_syntax_src(c_ctx->options.is_indented_syntax_src)
-                       .source_comments(c_ctx->options.source_comments)
-                       .source_map_file(safe_str(c_ctx->options.source_map_file))
-                       .source_map_root(safe_str(c_ctx->options.source_map_root))
-                       .source_map_embed(c_ctx->options.source_map_embed)
-                       .source_map_contents(c_ctx->options.source_map_contents)
-                       .omit_source_map_url(c_ctx->options.omit_source_map_url)
-                       .include_paths_c_str(c_ctx->options.include_paths)
-                       .plugin_paths_c_str(c_ctx->options.plugin_paths)
-                       // .include_paths_array(0)
-                       // .plugin_paths_array(0)
-                       .include_paths(std::vector<std::string>())
-                       .plugin_paths(std::vector<std::string>())
-                       .precision(c_ctx->options.precision ? c_ctx->options.precision : 5)
-                       .indent(c_ctx->options.indent ? c_ctx->options.indent : "  ")
-                       .linefeed(c_ctx->options.linefeed ? c_ctx->options.linefeed : LFEED)
+      File_Context cpp_ctx(
+        (Sass_File_Context*) 0
       );
       if (c_ctx->c_functions) {
         Sass_Function_List this_func_data = c_ctx->c_functions;
@@ -190,17 +155,18 @@ extern "C" {
           ++this_func_data;
         }
       }
-      c_ctx->output_string = cpp_ctx.compile_file();
-      c_ctx->source_map_string = cpp_ctx.generate_source_map();
+      Block* root = cpp_ctx.parse();
+      c_ctx->output_string = cpp_ctx.render(root);
+      c_ctx->source_map_string = cpp_ctx.render_srcmap();
       c_ctx->error_message = 0;
       c_ctx->error_status = 0;
 
       if (copy_strings(cpp_ctx.get_included_files(false), &c_ctx->included_files) == NULL)
         throw(std::bad_alloc());
     }
-    catch (Error_Invalid& e) {
+    catch (Exception::InvalidSass& e) {
       std::stringstream msg_stream;
-      msg_stream << e.pstate.path << ":" << e.pstate.line << ": " << e.message << std::endl;
+      msg_stream << e.pstate.path << ":" << e.pstate.line << ": " << e.what() << std::endl;
       c_ctx->error_message = sass_strdup(msg_stream.str().c_str());
       c_ctx->error_status = 1;
       c_ctx->output_string = 0;

data/ext/libsass/src/sass_values.cpp

@@ -4,85 +4,11 @@
 #include "eval.hpp"
 #include "values.hpp"
 #include "sass/values.h"
+#include "sass_values.hpp"
 
 extern "C" {
   using namespace Sass;
 
-  struct Sass_Unknown {
-    enum Sass_Tag tag;
-  };
-
-  struct Sass_Boolean {
-    enum Sass_Tag tag;
-    bool          value;
-  };
-
-  struct Sass_Number {
-    enum Sass_Tag tag;
-    double        value;
-    char*         unit;
-  };
-
-  struct Sass_Color {
-    enum Sass_Tag tag;
-    double        r;
-    double        g;
-    double        b;
-    double        a;
-  };
-
-  struct Sass_String {
-    enum Sass_Tag tag;
-    bool          quoted;
-    char*         value;
-  };
-
-  struct Sass_List {
-    enum Sass_Tag       tag;
-    enum Sass_Separator separator;
-    size_t              length;
-    // null terminated "array"
-    union Sass_Value**  values;
-  };
-
-  struct Sass_Map {
-    enum Sass_Tag        tag;
-    size_t               length;
-    struct Sass_MapPair* pairs;
-  };
-
-  struct Sass_Null {
-    enum Sass_Tag tag;
-  };
-
-  struct Sass_Error {
-    enum Sass_Tag tag;
-    char*         message;
-  };
-
-  struct Sass_Warning {
-    enum Sass_Tag tag;
-    char*         message;
-  };
-
-  union Sass_Value {
-    struct Sass_Unknown unknown;
-    struct Sass_Boolean boolean;
-    struct Sass_Number  number;
-    struct Sass_Color   color;
-    struct Sass_String  string;
-    struct Sass_List    list;
-    struct Sass_Map     map;
-    struct Sass_Null    null;
-    struct Sass_Error   error;
-    struct Sass_Warning warning;
-  };
-
-  struct Sass_MapPair {
-    union Sass_Value* key;
-    union Sass_Value* value;
-  };
-
   // Return the sass tag for a generic sass value
   enum Sass_Tag ADDCALL sass_value_get_tag(const union Sass_Value* v) { return v->unknown.tag; }
 
@@ -411,8 +337,8 @@ extern "C" {
     }
 
     // simply pass the error message back to the caller for now
-    catch (Error_Invalid& e) { return sass_make_error(e.message.c_str()); }
-    catch (std::bad_alloc& ba) { return sass_make_error("memory exhausted"); }
+    catch (Exception::InvalidSass& e) { return sass_make_error(e.what()); }
+    catch (std::bad_alloc&) { return sass_make_error("memory exhausted"); }
     catch (std::exception& e) { return sass_make_error(e.what()); }
     catch (std::string& e) { return sass_make_error(e.c_str()); }
     catch (const char* e) { return sass_make_error(e); }

data/ext/libsass/src/sass_values.hpp

@@ -0,0 +1,81 @@
+#ifndef SASS_SASS_VALUES_H
+#define SASS_SASS_VALUES_H
+
+#include "sass.h"
+
+struct Sass_Unknown {
+  enum Sass_Tag tag;
+};
+
+struct Sass_Boolean {
+  enum Sass_Tag tag;
+  bool          value;
+};
+
+struct Sass_Number {
+  enum Sass_Tag tag;
+  double        value;
+  char*         unit;
+};
+
+struct Sass_Color {
+  enum Sass_Tag tag;
+  double        r;
+  double        g;
+  double        b;
+  double        a;
+};
+
+struct Sass_String {
+  enum Sass_Tag tag;
+  bool          quoted;
+  char*         value;
+};
+
+struct Sass_List {
+  enum Sass_Tag       tag;
+  enum Sass_Separator separator;
+  size_t              length;
+  // null terminated "array"
+  union Sass_Value**  values;
+};
+
+struct Sass_Map {
+  enum Sass_Tag        tag;
+  size_t               length;
+  struct Sass_MapPair* pairs;
+};
+
+struct Sass_Null {
+  enum Sass_Tag tag;
+};
+
+struct Sass_Error {
+  enum Sass_Tag tag;
+  char*         message;
+};
+
+struct Sass_Warning {
+  enum Sass_Tag tag;
+  char*         message;
+};
+
+union Sass_Value {
+  struct Sass_Unknown unknown;
+  struct Sass_Boolean boolean;
+  struct Sass_Number  number;
+  struct Sass_Color   color;
+  struct Sass_String  string;
+  struct Sass_List    list;
+  struct Sass_Map     map;
+  struct Sass_Null    null;
+  struct Sass_Error   error;
+  struct Sass_Warning warning;
+};
+
+struct Sass_MapPair {
+  union Sass_Value* key;
+  union Sass_Value* value;
+};
+
+#endif

data/ext/libsass/src/source_map.cpp

@@ -14,11 +14,11 @@ namespace Sass {
   SourceMap::SourceMap() : current_position(0, 0, 0), file("stdin") { }
   SourceMap::SourceMap(const std::string& file) : current_position(0, 0, 0), file(file) { }
 
-  std::string SourceMap::generate_source_map(Context &ctx) {
+  std::string SourceMap::render_srcmap(Context &ctx) {
 
-    const bool include_sources = ctx.source_map_contents;
-    const std::vector<std::string> includes = ctx.include_links;
-    const std::vector<char*> sources = ctx.sources;
+    const bool include_sources = ctx.c_options->source_map_contents;
+    const std::vector<std::string> links = ctx.srcmap_links;
+    const std::vector<Resource>& sources(ctx.resources);
 
     JsonNode* json_srcmap = json_mkobject();
 
@@ -36,7 +36,7 @@ namespace Sass {
 
     JsonNode *json_includes = json_mkarray();
     for (size_t i = 0; i < source_index.size(); ++i) {
-      const char *include = includes[source_index[i]].c_str();
+      const char *include = links[source_index[i]].c_str();
       JsonNode *json_include = json_mkstring(include);
       json_append_element(json_includes, json_include);
     }
@@ -45,8 +45,8 @@ namespace Sass {
     if (include_sources) {
       JsonNode *json_contents = json_mkarray();
       for (size_t i = 0; i < source_index.size(); ++i) {
-        const char *content = sources[source_index[i]];
-        JsonNode *json_content = json_mkstring(content);
+        const Resource& resource(sources[source_index[i]]);
+        JsonNode *json_content = json_mkstring(resource.contents);
         json_append_element(json_contents, json_content);
       }
       if (json_contents->children.head)

data/ext/libsass/src/source_map.hpp

@@ -24,9 +24,6 @@ namespace Sass {
     SourceMap();
     SourceMap(const std::string& file);
 
-    void setFile(const std::string& str) {
-      file = str;
-    }
     void append(const Offset& offset);
     void prepend(const Offset& offset);
     void append(const OutputBuffer& out);
@@ -34,7 +31,7 @@ namespace Sass {
     void add_open_mapping(AST_Node* node);
     void add_close_mapping(AST_Node* node);
 
-    std::string generate_source_map(Context &ctx);
+    std::string render_srcmap(Context &ctx);
     ParserState remap(const ParserState& pstate);
 
   private:

data/ext/libsass/src/to_string.cpp

@@ -10,8 +10,8 @@
 
 namespace Sass {
 
-  To_String::To_String(Context* ctx, bool in_declaration)
-  : ctx(ctx), in_declaration(in_declaration) { }
+  To_String::To_String(Context* ctx, bool in_declaration, bool in_debug)
+  : ctx(ctx), in_declaration(in_declaration), in_debug(in_debug) { }
   To_String::~To_String() { }
 
   inline std::string To_String::fallback_impl(AST_Node* n)
@@ -19,6 +19,7 @@ namespace Sass {
     Emitter emitter(ctx);
     Inspect i(emitter);
     i.in_declaration = in_declaration;
+    i.in_debug = in_debug;
     if (n) n->perform(&i);
     return i.get_buffer();
   }
@@ -43,5 +44,5 @@ namespace Sass {
   }
 
   inline std::string To_String::operator()(Null* n)
-  { return ""; }
+  { return in_debug ? "null" : ""; }
 }

data/ext/libsass/src/to_string.hpp

@@ -18,10 +18,11 @@ namespace Sass {
 
     Context* ctx;
     bool in_declaration;
+    bool in_debug;
 
   public:
 
-    To_String(Context* ctx = 0, bool in_declaration = true);
+    To_String(Context* ctx = 0, bool in_declaration = true, bool in_debug = false);
     virtual ~To_String();
 
     std::string operator()(Null* n);