RubyGems - sassc - Versions diffs - 1.9.0 → 1.10.0 - Mend

sassc 1.9.0 → 1.10.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (71) hide show

checksums.yaml +4 -4
data/README.md +30 -3
data/ext/libsass/.gitignore +3 -0
data/ext/libsass/.travis.yml +1 -1
data/ext/libsass/GNUmakefile.am +7 -7
data/ext/libsass/Makefile +7 -4
data/ext/libsass/Makefile.conf +0 -1
data/ext/libsass/appveyor.yml +6 -2
data/ext/libsass/docs/api-context.md +4 -4
data/ext/libsass/docs/api-doc.md +29 -11
data/ext/libsass/docs/api-importer-example.md +5 -5
data/ext/libsass/docs/build-on-windows.md +1 -1
data/ext/libsass/include/sass/base.h +10 -0
data/ext/libsass/include/sass/version.h +4 -0
data/ext/libsass/include/sass/version.h.in +4 -0
data/ext/libsass/include/sass2scss.h +1 -1
data/ext/libsass/script/ci-build-libsass +15 -3
data/ext/libsass/src/ast.cpp +161 -6
data/ext/libsass/src/ast.hpp +71 -44
data/ext/libsass/src/ast_factory.hpp +1 -1
data/ext/libsass/src/ast_fwd_decl.hpp +2 -2
data/ext/libsass/src/constants.cpp +2 -4
data/ext/libsass/src/constants.hpp +3 -4
data/ext/libsass/src/context.cpp +16 -17
data/ext/libsass/src/context.hpp +2 -2
data/ext/libsass/src/cssize.cpp +19 -8
data/ext/libsass/src/cssize.hpp +5 -2
data/ext/libsass/src/debugger.hpp +6 -3
data/ext/libsass/src/emitter.cpp +1 -1
data/ext/libsass/src/environment.cpp +1 -1
data/ext/libsass/src/eval.cpp +42 -14
data/ext/libsass/src/eval.hpp +1 -1
data/ext/libsass/src/expand.cpp +24 -8
data/ext/libsass/src/expand.hpp +2 -1
data/ext/libsass/src/extend.cpp +55 -15
data/ext/libsass/src/extend.hpp +5 -1
data/ext/libsass/src/functions.cpp +10 -5
data/ext/libsass/src/inspect.cpp +25 -19
data/ext/libsass/src/inspect.hpp +2 -2
data/ext/libsass/src/json.cpp +20 -9
data/ext/libsass/src/json.hpp +5 -5
data/ext/libsass/src/lexer.cpp +4 -1
data/ext/libsass/src/lexer.hpp +21 -0
data/ext/libsass/src/listize.cpp +2 -1
data/ext/libsass/src/operation.hpp +4 -4
data/ext/libsass/src/output.cpp +1 -1
data/ext/libsass/src/output.hpp +1 -1
data/ext/libsass/src/parser.cpp +189 -90
data/ext/libsass/src/parser.hpp +42 -2
data/ext/libsass/src/prelexer.cpp +474 -7
data/ext/libsass/src/prelexer.hpp +15 -2
data/ext/libsass/src/remove_placeholders.cpp +5 -5
data/ext/libsass/src/remove_placeholders.hpp +3 -2
data/ext/libsass/src/sass.cpp +33 -3
data/ext/libsass/src/sass2scss.cpp +7 -0
data/ext/libsass/src/sass_context.cpp +32 -62
data/ext/libsass/src/sass_functions.cpp +3 -3
data/ext/libsass/src/sass_values.cpp +5 -5
data/ext/libsass/src/utf8/unchecked.h +16 -16
data/ext/libsass/src/util.cpp +51 -30
data/ext/libsass/src/util.hpp +6 -1
data/ext/libsass/win/libsass.targets +0 -2
data/ext/libsass/win/libsass.vcxproj.filters +0 -6
data/lib/sassc/engine.rb +4 -1
data/lib/sassc/error.rb +23 -1
data/lib/sassc/version.rb +1 -1
data/test/error_test.rb +27 -0
data/test/native_test.rb +1 -1
metadata +5 -5
data/ext/libsass/include/sass/interface.h +0 -105
data/ext/libsass/src/sass_interface.cpp +0 -215

data/ext/libsass/src/sass_interface.cpp DELETED

@@ -1,215 +0,0 @@
-#include "sass.hpp"
-#include <string>
-#include <cstdlib>
-#include <cstring>
-#include <sstream>
-#include <iostream>
-#include "util.hpp"
-#include "context.hpp"
-#include "inspect.hpp"
-#include "error_handling.hpp"
-#include "sass/base.h"
-#include "sass/interface.h"
-#define LFEED "\n"
-extern "C" {
-  sass_context* sass_new_context()
-  { return (sass_context*) calloc(1, sizeof(sass_context)); }
-  void sass_free_context(sass_context* ctx)
-  {
-    if (ctx->output_string)     free(ctx->output_string);
-    if (ctx->source_map_string) free(ctx->source_map_string);
-    if (ctx->error_message)     free(ctx->error_message);
-    if (ctx->c_functions)       free(ctx->c_functions);
-    Sass::free_string_array(ctx->included_files);
-    free(ctx);
-  }
-  sass_file_context* sass_new_file_context()
-  { return (sass_file_context*) calloc(1, sizeof(sass_file_context)); }
-  void sass_free_file_context(sass_file_context* ctx)
-  {
-    if (ctx->output_string)     free(ctx->output_string);
-    if (ctx->source_map_string) free(ctx->source_map_string);
-    if (ctx->error_message)     free(ctx->error_message);
-    if (ctx->c_functions)       free(ctx->c_functions);
-    Sass::free_string_array(ctx->included_files);
-    free(ctx);
-  }
-  sass_folder_context* sass_new_folder_context()
-  { return (sass_folder_context*) calloc(1, sizeof(sass_folder_context)); }
-  void sass_free_folder_context(sass_folder_context* ctx)
-  {
-    Sass::free_string_array(ctx->included_files);
-    free(ctx);
-  }
-  int sass_compile(sass_context* c_ctx)
-  {
-    using namespace Sass;
-    try {
-      std::string input_path = safe_str(c_ctx->input_path);
-      int lastindex = static_cast<int>(input_path.find_last_of("."));
-      std::string output_path;
-      if (!c_ctx->output_path) {
-        if (input_path != "") {
-          output_path = (lastindex > -1 ? input_path.substr(0, lastindex) : input_path) + ".css";
-        }
-      }
-      else {
-          output_path = c_ctx->output_path;
-      }
-      struct Sass_Data_Context opt;
-      Data_Context cpp_ctx(opt);
-      if (c_ctx->c_functions) {
-        Sass_Function_List this_func_data = c_ctx->c_functions;
-        while ((this_func_data) && (*this_func_data)) {
-          cpp_ctx.c_functions.push_back(*this_func_data);
-          ++this_func_data;
-        }
-      }
-      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 (Exception::InvalidSass& e) {
-      std::stringstream msg_stream;
-      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;
-      c_ctx->source_map_string = 0;
-    }
-    catch(std::bad_alloc& ba) {
-      std::stringstream msg_stream;
-      msg_stream << "Unable to allocate memory: " << ba.what() << std::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;
-    }
-    catch (std::exception& e) {
-      std::stringstream msg_stream;
-      msg_stream << "Error: " << 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;
-      c_ctx->source_map_string = 0;
-    }
-    catch (std::string& e) {
-      std::stringstream msg_stream;
-      msg_stream << "Error: " << e << std::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;
-    }
-    catch (...) {
-      // couldn't find the specified file in the include paths; report an error
-      std::stringstream msg_stream;
-      msg_stream << "Unknown error occurred" << std::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;
-    }
-    return 0;
-  }
-  int sass_compile_file(sass_file_context* c_ctx)
-  {
-    using namespace Sass;
-    try {
-      std::string input_path = safe_str(c_ctx->input_path);
-      int lastindex = static_cast<int>(input_path.find_last_of("."));
-      std::string output_path;
-      if (!c_ctx->output_path) {
-          output_path = (lastindex > -1 ? input_path.substr(0, lastindex) : input_path) + ".css";
-      }
-      else {
-          output_path = c_ctx->output_path;
-      }
-      struct Sass_File_Context opt;
-      File_Context cpp_ctx(opt);
-      if (c_ctx->c_functions) {
-        Sass_Function_List this_func_data = c_ctx->c_functions;
-        while ((this_func_data) && (*this_func_data)) {
-          cpp_ctx.c_functions.push_back(*this_func_data);
-          ++this_func_data;
-        }
-      }
-      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 (Exception::InvalidSass& e) {
-      std::stringstream msg_stream;
-      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;
-      c_ctx->source_map_string = 0;
-    }
-    catch(std::bad_alloc& ba) {
-      std::stringstream msg_stream;
-      msg_stream << "Unable to allocate memory: " << ba.what() << std::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;
-    }
-    catch (std::exception& e) {
-      std::stringstream msg_stream;
-      msg_stream << "Error: " << 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;
-      c_ctx->source_map_string = 0;
-    }
-    catch (std::string& e) {
-      std::stringstream msg_stream;
-      msg_stream << "Error: " << e << std::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;
-    }
-    catch (...) {
-      // couldn't find the specified file in the include paths; report an error
-      std::stringstream msg_stream;
-      msg_stream << "Unknown error occurred" << std::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;
-    }
-    return 0;
-  }
-  int sass_compile_folder(sass_folder_context* c_ctx)
-  {
-    return 1;
-  }
-}