sassc 0.0.9 → 0.0.10

data/ext/libsass/sass_context.h

@@ -1,5 +1,5 @@
-#ifndef SASS_C_CONTEXT
-#define SASS_C_CONTEXT
+#ifndef SASS_C_CONTEXT_H
+#define SASS_C_CONTEXT_H
 
 #include <stddef.h>
 #include <stdbool.h>
@@ -50,7 +50,7 @@ ADDAPI void ADDCALL sass_delete_data_context (struct Sass_Data_Context* ctx);
 ADDAPI struct Sass_Context* ADDCALL sass_file_context_get_context (struct Sass_File_Context* file_ctx);
 ADDAPI struct Sass_Context* ADDCALL sass_data_context_get_context (struct Sass_Data_Context* data_ctx);
 
-// Getters for context options from Sass_Context
+// Getters for Context_Options from Sass_Context
 ADDAPI struct Sass_Options* ADDCALL sass_context_get_options (struct Sass_Context* ctx);
 ADDAPI struct Sass_Options* ADDCALL sass_file_context_get_options (struct Sass_File_Context* file_ctx);
 ADDAPI struct Sass_Options* ADDCALL sass_data_context_get_options (struct Sass_Data_Context* data_ctx);
@@ -58,7 +58,7 @@ ADDAPI void ADDCALL sass_file_context_set_options (struct Sass_File_Context* fil
 ADDAPI void ADDCALL sass_data_context_set_options (struct Sass_Data_Context* data_ctx, struct Sass_Options* opt);
 
 
-// Getters for options
+// Getters for Context_Option values
 ADDAPI int ADDCALL sass_option_get_precision (struct Sass_Options* options);
 ADDAPI enum Sass_Output_Style ADDCALL sass_option_get_output_style (struct Sass_Options* options);
 ADDAPI bool ADDCALL sass_option_get_source_comments (struct Sass_Options* options);
@@ -66,15 +66,18 @@ ADDAPI bool ADDCALL sass_option_get_source_map_embed (struct Sass_Options* optio
 ADDAPI bool ADDCALL sass_option_get_source_map_contents (struct Sass_Options* options);
 ADDAPI bool ADDCALL sass_option_get_omit_source_map_url (struct Sass_Options* options);
 ADDAPI bool ADDCALL sass_option_get_is_indented_syntax_src (struct Sass_Options* options);
+ADDAPI const char* ADDCALL sass_option_get_indent (struct Sass_Options* options);
+ADDAPI const char* ADDCALL sass_option_get_linefeed (struct Sass_Options* options);
 ADDAPI const char* ADDCALL sass_option_get_input_path (struct Sass_Options* options);
 ADDAPI const char* ADDCALL sass_option_get_output_path (struct Sass_Options* options);
-ADDAPI const char* ADDCALL sass_option_get_image_path (struct Sass_Options* options);
+ADDAPI const char* ADDCALL sass_option_get_plugin_path (struct Sass_Options* options);
 ADDAPI const char* ADDCALL sass_option_get_include_path (struct Sass_Options* options);
 ADDAPI const char* ADDCALL sass_option_get_source_map_file (struct Sass_Options* options);
+ADDAPI const char* ADDCALL sass_option_get_source_map_root (struct Sass_Options* options);
 ADDAPI Sass_C_Function_List ADDCALL sass_option_get_c_functions (struct Sass_Options* options);
 ADDAPI Sass_C_Import_Callback ADDCALL sass_option_get_importer (struct Sass_Options* options);
 
-// Setters for options
+// Setters for Context_Option values
 ADDAPI void ADDCALL sass_option_set_precision (struct Sass_Options* options, int precision);
 ADDAPI void ADDCALL sass_option_set_output_style (struct Sass_Options* options, enum Sass_Output_Style output_style);
 ADDAPI void ADDCALL sass_option_set_source_comments (struct Sass_Options* options, bool source_comments);
@@ -82,19 +85,23 @@ ADDAPI void ADDCALL sass_option_set_source_map_embed (struct Sass_Options* optio
 ADDAPI void ADDCALL sass_option_set_source_map_contents (struct Sass_Options* options, bool source_map_contents);
 ADDAPI void ADDCALL sass_option_set_omit_source_map_url (struct Sass_Options* options, bool omit_source_map_url);
 ADDAPI void ADDCALL sass_option_set_is_indented_syntax_src (struct Sass_Options* options, bool is_indented_syntax_src);
+ADDAPI void ADDCALL sass_option_set_indent (struct Sass_Options* options, const char* indent);
+ADDAPI void ADDCALL sass_option_set_linefeed (struct Sass_Options* options, const char* linefeed);
 ADDAPI void ADDCALL sass_option_set_input_path (struct Sass_Options* options, const char* input_path);
 ADDAPI void ADDCALL sass_option_set_output_path (struct Sass_Options* options, const char* output_path);
-ADDAPI void ADDCALL sass_option_set_image_path (struct Sass_Options* options, const char* image_path);
+ADDAPI void ADDCALL sass_option_set_plugin_path (struct Sass_Options* options, const char* plugin_path);
 ADDAPI void ADDCALL sass_option_set_include_path (struct Sass_Options* options, const char* include_path);
 ADDAPI void ADDCALL sass_option_set_source_map_file (struct Sass_Options* options, const char* source_map_file);
+ADDAPI void ADDCALL sass_option_set_source_map_root (struct Sass_Options* options, const char* source_map_root);
 ADDAPI void ADDCALL sass_option_set_c_functions (struct Sass_Options* options, Sass_C_Function_List c_functions);
 ADDAPI void ADDCALL sass_option_set_importer (struct Sass_Options* options, Sass_C_Import_Callback importer);
 
 
-// Getter for context
+// Getters for Sass_Context values
 ADDAPI const char* ADDCALL sass_context_get_output_string (struct Sass_Context* ctx);
 ADDAPI int ADDCALL sass_context_get_error_status (struct Sass_Context* ctx);
 ADDAPI const char* ADDCALL sass_context_get_error_json (struct Sass_Context* ctx);
+ADDAPI const char* ADDCALL sass_context_get_error_text (struct Sass_Context* ctx);
 ADDAPI const char* ADDCALL sass_context_get_error_message (struct Sass_Context* ctx);
 ADDAPI const char* ADDCALL sass_context_get_error_file (struct Sass_Context* ctx);
 ADDAPI size_t ADDCALL sass_context_get_error_line (struct Sass_Context* ctx);
@@ -104,12 +111,14 @@ ADDAPI char** ADDCALL sass_context_get_included_files (struct Sass_Context* ctx)
 
 // Take ownership of memory (value on context is set to 0)
 ADDAPI char* ADDCALL sass_context_take_error_json (struct Sass_Context* ctx);
+ADDAPI char* ADDCALL sass_context_take_error_text (struct Sass_Context* ctx);
 ADDAPI char* ADDCALL sass_context_take_error_message (struct Sass_Context* ctx);
 ADDAPI char* ADDCALL sass_context_take_error_file (struct Sass_Context* ctx);
 ADDAPI char* ADDCALL sass_context_take_output_string (struct Sass_Context* ctx);
 ADDAPI char* ADDCALL sass_context_take_source_map_string (struct Sass_Context* ctx);
 
-// Push function for include paths (no manipulation support for now)
+// Push function for paths (no manipulation support for now)
+ADDAPI void ADDCALL sass_option_push_plugin_path (struct Sass_Options* options, const char* path);
 ADDAPI void ADDCALL sass_option_push_include_path (struct Sass_Options* options, const char* path);
 
 
@@ -117,4 +126,4 @@ ADDAPI void ADDCALL sass_option_push_include_path (struct Sass_Options* options,
 } // __cplusplus defined.
 #endif
 
-#endif
+#endif

data/ext/libsass/sass_functions.cpp

@@ -4,11 +4,14 @@
 #include <unistd.h>
 #endif
 
+#include <cstring>
+#include "util.hpp"
 #include "context.hpp"
 #include "sass_functions.h"
 
 extern "C" {
   using namespace std;
+  using namespace Sass;
 
   // Struct to hold custom function callback
   struct Sass_C_Function_Descriptor {
@@ -46,6 +49,10 @@ extern "C" {
     char* base;
     char* source;
     char* srcmap;
+    // error handling
+    char* error;
+    size_t line;
+    size_t column;
   };
 
   // Struct to hold importer callback
@@ -84,10 +91,13 @@ extern "C" {
   {
     Sass_Import* v = (Sass_Import*) calloc(1, sizeof(Sass_Import));
     if (v == 0) return 0;
-    v->path = path ? strdup(path) : 0;
-    v->base = base ? strdup(base) : 0;
+    v->path = path ? sass_strdup(path) : 0;
+    v->base = base ? sass_strdup(base) : 0;
     v->source = source;
     v->srcmap = srcmap;
+    v->error = 0;
+    v->line = -1;
+    v->column = -1;
     return v;
   }
 
@@ -97,6 +107,17 @@ extern "C" {
     return sass_make_import(path, path, source, srcmap);
   }
 
+  // Upgrade a normal import entry to throw an error (original path can be re-used by error reporting)
+  struct Sass_Import* ADDCALL sass_import_set_error(struct Sass_Import* import, const char* error, size_t line, size_t col)
+  {
+    if (import == 0) return 0;
+    if (import->error) free(import->error);
+    import->error = error ? strdup(error) : 0;
+    import->line = line ? line : -1;
+    import->column = col ? col : -1;
+    return import;
+  }
+
   // Setters and getters for entries on the import list
   void ADDCALL sass_import_set_list_entry(struct Sass_Import** list, size_t idx, struct Sass_Import* entry) { list[idx] = entry; }
   struct Sass_Import* ADDCALL sass_import_get_list_entry(struct Sass_Import** list, size_t idx) { return list[idx]; }
@@ -120,6 +141,7 @@ extern "C" {
     free(import->base);
     free(import->source);
     free(import->srcmap);
+    free(import->error);
     free(import);
   }
 
@@ -129,6 +151,11 @@ extern "C" {
   const char* ADDCALL sass_import_get_source(struct Sass_Import* entry) { return entry->source; }
   const char* ADDCALL sass_import_get_srcmap(struct Sass_Import* entry) { return entry->srcmap; }
 
+  // Getter for import error entry
+  size_t ADDCALL sass_import_get_error_line(struct Sass_Import* entry) { return entry->line; }
+  size_t ADDCALL sass_import_get_error_column(struct Sass_Import* entry) { return entry->column; }
+  const char* ADDCALL sass_import_get_error_message(struct Sass_Import* entry) { return entry->error; }
+
   // Explicit functions to take ownership of the memory
   // Resets our own property since we do not know if it is still alive
   char* ADDCALL sass_import_take_source(struct Sass_Import* entry) { char* ptr = entry->source; entry->source = 0; return ptr; }

data/ext/libsass/sass_functions.h

@@ -1,5 +1,5 @@
-#ifndef SASS_C_FUNCTIONS
-#define SASS_C_FUNCTIONS
+#ifndef SASS_C_FUNCTIONS_H
+#define SASS_C_FUNCTIONS_H
 
 #include <stddef.h>
 #include <stdbool.h>
@@ -37,6 +37,8 @@ ADDAPI struct Sass_Import** ADDCALL sass_make_import_list (size_t length);
 // Creator for a single import entry returned by the custom importer inside the list
 ADDAPI struct Sass_Import* ADDCALL sass_make_import_entry (const char* path, char* source, char* srcmap);
 ADDAPI struct Sass_Import* ADDCALL sass_make_import (const char* path, const char* base, char* source, char* srcmap);
+// set error message to abort import and to print out a message (path from existing object is used in output)
+ADDAPI struct Sass_Import* ADDCALL sass_import_set_error(struct Sass_Import* import, const char* message, size_t line, size_t col);
 
 // Setters to insert an entry into the import list (you may also use [] access directly)
 // Since we are dealing with pointers they should have a guaranteed and fixed size
@@ -52,6 +54,10 @@ ADDAPI const char* ADDCALL sass_import_get_srcmap (struct Sass_Import*);
 // The property on our struct will be reset to NULL
 ADDAPI char* ADDCALL sass_import_take_source (struct Sass_Import*);
 ADDAPI char* ADDCALL sass_import_take_srcmap (struct Sass_Import*);
+// Getters from import error entry
+ADDAPI size_t ADDCALL sass_import_get_error_line (struct Sass_Import*);
+ADDAPI size_t ADDCALL sass_import_get_error_column (struct Sass_Import*);
+ADDAPI const char* ADDCALL sass_import_get_error_message (struct Sass_Import*);
 
 // Deallocator for associated memory (incl. entries)
 ADDAPI void ADDCALL sass_delete_import_list (struct Sass_Import**);

data/ext/libsass/sass_interface.cpp

@@ -1,22 +1,23 @@
 #ifdef _WIN32
 #include <io.h>
+#define LFEED "\n"
 #else
 #include <unistd.h>
+#define LFEED "\n"
 #endif
 
-#include "sass_interface.h"
+#include <string>
+#include <cstdlib>
+#include <cstring>
+#include <sstream>
+#include <iostream>
+
+#include "util.hpp"
 #include "context.hpp"
 #include "inspect.hpp"
-
-#ifndef SASS_ERROR_HANDLING
 #include "error_handling.hpp"
-#endif
+#include "sass_interface.h"
 
-#include <iostream>
-#include <sstream>
-#include <string>
-#include <cstdlib>
-#include <cstring>
 
 extern "C" {
   using namespace std;
@@ -114,14 +115,19 @@ extern "C" {
                        .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)
-                       .image_path(safe_str(c_ctx->options.image_path))
                        .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(vector<string>())
+                       .plugin_paths(vector<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)
                        .importer(0)
       );
       if (c_ctx->c_functions) {
@@ -140,8 +146,8 @@ extern "C" {
     }
     catch (Sass_Error& e) {
       stringstream msg_stream;
-      msg_stream << e.path << ":" << e.position.line << ": " << e.message << endl;
-      c_ctx->error_message = strdup(msg_stream.str().c_str());
+      msg_stream << e.pstate.path << ":" << e.pstate.line << ": " << e.message << endl;
+      c_ctx->error_message = sass_strdup(msg_stream.str().c_str());
       c_ctx->error_status = 1;
       c_ctx->output_string = 0;
       c_ctx->source_map_string = 0;
@@ -149,7 +155,7 @@ extern "C" {
     catch(bad_alloc& ba) {
       stringstream msg_stream;
       msg_stream << "Unable to allocate memory: " << ba.what() << endl;
-      c_ctx->error_message = strdup(msg_stream.str().c_str());
+      c_ctx->error_message = sass_strdup(msg_stream.str().c_str());
       c_ctx->error_status = 1;
       c_ctx->output_string = 0;
       c_ctx->source_map_string = 0;
@@ -157,7 +163,7 @@ extern "C" {
     catch (std::exception& e) {
       stringstream msg_stream;
       msg_stream << "Error: " << e.what() << endl;
-      c_ctx->error_message = strdup(msg_stream.str().c_str());
+      c_ctx->error_message = sass_strdup(msg_stream.str().c_str());
       c_ctx->error_status = 1;
       c_ctx->output_string = 0;
       c_ctx->source_map_string = 0;
@@ -165,7 +171,7 @@ extern "C" {
     catch (string& e) {
       stringstream msg_stream;
       msg_stream << "Error: " << e << endl;
-      c_ctx->error_message = strdup(msg_stream.str().c_str());
+      c_ctx->error_message = sass_strdup(msg_stream.str().c_str());
       c_ctx->error_status = 1;
       c_ctx->output_string = 0;
       c_ctx->source_map_string = 0;
@@ -174,7 +180,7 @@ extern "C" {
       // couldn't find the specified file in the include paths; report an error
       stringstream msg_stream;
       msg_stream << "Unknown error occurred" << endl;
-      c_ctx->error_message = strdup(msg_stream.str().c_str());
+      c_ctx->error_message = sass_strdup(msg_stream.str().c_str());
       c_ctx->error_status = 1;
       c_ctx->output_string = 0;
       c_ctx->source_map_string = 0;
@@ -202,13 +208,16 @@ extern "C" {
                        .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)
-                       .image_path(safe_str(c_ctx->options.image_path))
                        .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(vector<string>())
+                       .plugin_paths(vector<string>())
                        .precision(c_ctx->options.precision ? c_ctx->options.precision : 5)
       );
       if (c_ctx->c_functions) {
@@ -227,8 +236,8 @@ extern "C" {
     }
     catch (Sass_Error& e) {
       stringstream msg_stream;
-      msg_stream << e.path << ":" << e.position.line << ": " << e.message << endl;
-      c_ctx->error_message = strdup(msg_stream.str().c_str());
+      msg_stream << e.path << ":" << e.pstate.line << ": " << e.message << endl;
+      c_ctx->error_message = sass_strdup(msg_stream.str().c_str());
       c_ctx->error_status = 1;
       c_ctx->output_string = 0;
       c_ctx->source_map_string = 0;
@@ -236,7 +245,7 @@ extern "C" {
     catch(bad_alloc& ba) {
       stringstream msg_stream;
       msg_stream << "Unable to allocate memory: " << ba.what() << endl;
-      c_ctx->error_message = strdup(msg_stream.str().c_str());
+      c_ctx->error_message = sass_strdup(msg_stream.str().c_str());
       c_ctx->error_status = 1;
       c_ctx->output_string = 0;
       c_ctx->source_map_string = 0;
@@ -244,7 +253,7 @@ extern "C" {
     catch (std::exception& e) {
       stringstream msg_stream;
       msg_stream << "Error: " << e.what() << endl;
-      c_ctx->error_message = strdup(msg_stream.str().c_str());
+      c_ctx->error_message = sass_strdup(msg_stream.str().c_str());
       c_ctx->error_status = 1;
       c_ctx->output_string = 0;
       c_ctx->source_map_string = 0;
@@ -252,7 +261,7 @@ extern "C" {
     catch (string& e) {
       stringstream msg_stream;
       msg_stream << "Error: " << e << endl;
-      c_ctx->error_message = strdup(msg_stream.str().c_str());
+      c_ctx->error_message = sass_strdup(msg_stream.str().c_str());
       c_ctx->error_status = 1;
       c_ctx->output_string = 0;
       c_ctx->source_map_string = 0;
@@ -261,7 +270,7 @@ extern "C" {
       // couldn't find the specified file in the include paths; report an error
       stringstream msg_stream;
       msg_stream << "Unknown error occurred" << endl;
-      c_ctx->error_message = strdup(msg_stream.str().c_str());
+      c_ctx->error_message = sass_strdup(msg_stream.str().c_str());
       c_ctx->error_status = 1;
       c_ctx->output_string = 0;
       c_ctx->source_map_string = 0;

data/ext/libsass/sass_interface.h

@@ -1,5 +1,5 @@
-#ifndef SASS_C_INTERFACE
-#define SASS_C_INTERFACE
+#ifndef SASS_C_INTERFACE_H
+#define SASS_C_INTERFACE_H
 
 #include <stddef.h>
 #include <stdbool.h>
@@ -28,13 +28,18 @@ struct sass_options {
   bool source_map_embed;
   // embed include contents in maps
   bool source_map_contents;
+  // Pass-through as sourceRoot property
+  const char* source_map_root;
   // Treat source_string as sass (as opposed to scss)
   bool is_indented_syntax_src;
   // Colon-separated list of paths
   // Semicolon-separated on Windows
   const char* include_paths;
-  // For the image-url Sass function
-  const char* image_path;
+  const char* plugin_paths;
+  // String to be used for indentation
+  const char* indent;
+  // String to be used to for line feeds
+  const char* linefeed;
   // Precision for outputting fractional numbers
   int precision;
 };

data/ext/libsass/sass_util.cpp

@@ -1,16 +1,12 @@
-#ifndef SASS_AST
 #include "node.hpp"
-#endif
-
 #include "to_string.hpp"
 
-
 namespace Sass {
 
 
   /*
 		This is the equivalent of ruby's Sass::Util.paths.
-   
+
     # Return an array of all possible paths through the given arrays.
     #
     # @param arrs [NodeCollection<NodeCollection<Node>>]
@@ -22,7 +18,7 @@ namespace Sass {
     #     #  [2, 3, 5],
     #     #  [1, 4, 5],
     #     #  [2, 4, 5]]
-   
+
    The following is the modified version of the ruby code that was more portable to C++. You
    should be able to drop it into ruby 3.2.19 and get the same results from ruby sass.
 
@@ -42,55 +38,55 @@ namespace Sass {
     end
 	*/
   Node paths(const Node& arrs, Context& ctx) {
-    To_String to_string;
+    To_String to_string(&ctx);
 
     Node loopStart = Node::createCollection();
     loopStart.collection()->push_back(Node::createCollection());
-    
+
     for (NodeDeque::iterator arrsIter = arrs.collection()->begin(), arrsEndIter = arrs.collection()->end();
     	arrsIter != arrsEndIter; ++arrsIter) {
-      
+
       Node& arr = *arrsIter;
-      
+
       Node permutations = Node::createCollection();
-      
+
       for (NodeDeque::iterator arrIter = arr.collection()->begin(), arrIterEnd = arr.collection()->end();
       	arrIter != arrIterEnd; ++arrIter) {
-        
+
         Node& e = *arrIter;
-        
+
         for (NodeDeque::iterator loopStartIter = loopStart.collection()->begin(), loopStartIterEnd = loopStart.collection()->end();
           loopStartIter != loopStartIterEnd; ++loopStartIter) {
-        
+
           Node& path = *loopStartIter;
-          
+
           Node newPermutation = Node::createCollection();
           newPermutation.plus(path);
           newPermutation.collection()->push_back(e);
-          
+
           permutations.collection()->push_back(newPermutation);
         }
       }
-      
+
       loopStart = permutations;
     }
-    
+
     return loopStart;
   }
-  
+
 
 	/*
   This is the equivalent of ruby sass' Sass::Util.flatten and [].flatten.
   Sass::Util.flatten requires the number of levels to flatten, while
   [].flatten doesn't and will flatten the entire array. This function
   supports both.
-  
+
   # Flattens the first `n` nested arrays. If n == -1, all arrays will be flattened
   #
   # @param arr [NodeCollection] The array to flatten
   # @param n [int] The number of levels to flatten
   # @return [NodeCollection] The flattened array
-  
+
   The following is the modified version of the ruby code that was more portable to C++. You
   should be able to drop it into ruby 3.2.19 and get the same results from ruby sass.
 
@@ -118,11 +114,11 @@ namespace Sass {
     }
 
     Node flattened = Node::createCollection();
-    
+
     for (NodeDeque::iterator iter = arr.collection()->begin(), iterEnd = arr.collection()->end();
     	iter != iterEnd; iter++) {
     	Node& e = *iter;
-      
+
       if (e.isCollection()) {
       	Node recurseFlattened = flatten(e, ctx, n - 1);
         flattened.collection()->insert(flattened.collection()->end(), recurseFlattened.collection()->begin(), recurseFlattened.collection()->end());