sassc 1.7.1 → 1.8.0.pre1

data/ext/libsass/Makefile.conf

@@ -0,0 +1,47 @@
+# this is merely a common Makefile multiple implementers can use
+
+SOURCES = \
+	ast.cpp \
+	base64vlq.cpp \
+	bind.cpp \
+	color_maps.cpp \
+	constants.cpp \
+	context.cpp \
+	cssize.cpp \
+	emitter.cpp \
+	environment.cpp \
+	error_handling.cpp \
+	eval.cpp \
+	expand.cpp \
+	extend.cpp \
+	file.cpp \
+	functions.cpp \
+	inspect.cpp \
+	json.cpp \
+	lexer.cpp \
+	listize.cpp \
+	memory_manager.cpp \
+	node.cpp \
+	output.cpp \
+	parser.cpp \
+	plugins.cpp \
+	position.cpp \
+	prelexer.cpp \
+	remove_placeholders.cpp \
+	sass.cpp \
+	sass_util.cpp \
+	sass_values.cpp \
+	sass_context.cpp \
+	sass_functions.cpp \
+	sass_interface.cpp \
+	sass2scss.cpp \
+	source_map.cpp \
+	to_c.cpp \
+	to_string.cpp \
+	to_value.cpp \
+	units.cpp \
+	utf8_string.cpp \
+	values.cpp \
+	util.cpp
+
+CSOURCES = cencode.c

data/ext/libsass/Readme.md

@@ -1,4 +1,4 @@
-Libsass
+LibSass
 =======
 
 by Aaron Leung ([@akhleung]) and Hampton Catlin ([@hcatlin])
@@ -11,7 +11,7 @@ by Aaron Leung ([@akhleung]) and Hampton Catlin ([@hcatlin])
 
 https://github.com/sass/libsass
 
-Libsass is just a library, but if you want to RUN libsass,
+LibSass is just a library, but if you want to RUN LibSass,
 then go to https://github.com/sass/sassc or
 https://github.com/sass/ruby-libsass or
 [find your local implementer](https://github.com/sass/libsass/wiki/Implementations).
@@ -23,19 +23,19 @@ On Windows, you need MinGW with GCC 4.6+ or VS 2013 Update 4+. It is also possib
 About
 -----
 
-Libsass is a C/C++ port of the Sass CSS precompiler. The original version was written in Ruby, but this version is meant for efficiency and portability.
+LibSass is a C/C++ port of the Sass CSS precompiler. The original version was written in Ruby, but this version is meant for efficiency and portability.
 
 This library strives to be light, simple, and easy to build and integrate with a variety of platforms and languages.
 
 Developing
 ----------
 
-As you may have noticed, the libsass repo itself has
+As you may have noticed, the LibSass repo itself has
 no executables and no tests. Oh noes! How can you develop???
 
-Well, luckily, SassC is the official binary wrapper for
-libsass and is *always* kept in sync. SassC uses a git submodule
-to include libsass. When developing libsass, its best to actually
+Well, luckily, [SassC](http://github.com/sass/sassc) is the official binary wrapper for
+LibSass and is *always* kept in sync. SassC uses a git submodule
+to include LibSass. When developing LibSass, its best to actually
 check out SassC and develop in that directory with the SassC spec
 and tests there.
 
@@ -44,21 +44,21 @@ We even run Travis tests for SassC!
 Tests
 -------
 
-Since libsass is a pure library, tests are run through the [SassSpec](https://github.com/sass/sass-spec) project using the [SassC](http://github.com/sass/sassc) driver.
+Since LibSass is a pure library, tests are run through the [SassSpec](https://github.com/sass/sass-spec) project using the [SassC](http://github.com/sass/sassc) driver.
 
-To run tests against libsass while developing, you can run `./script/spec`. This will clone SassC and Sass-Spec under the project folder and then run the Sass-Spec test suite. You may want to update the clones to ensure you have the latest version.
+To run tests against LibSass while developing, you can run `./script/spec`. This will clone SassC and Sass-Spec under the project folder and then run the Sass-Spec test suite. You may want to update the clones to ensure you have the latest version.
 
 Library Usage
 -------------
 
-While libsass is a library primarily written in C++, it provides a simple
-C interface which should be used by most implementers. Libsass does not do
+While LibSass is a library primarily written in C++, it provides a simple
+C interface which should be used by most implementers. LibSass does not do
 much on its own without an implementer. This can be a command line tool, like
 [sassc](https://github.com/sass/sassc) or a [binding](https://github.com/sass/libsass/wiki/Implementations)
 to your favorite programing language.
 
-If you want to build or interface with libsass, we recommend to check out the
-wiki pages about [building libsass](https://github.com/sass/libsass/wiki/Building-Libsass) and
+If you want to build or interface with LibSass, we recommend to check out the
+wiki pages about [building LibSass](https://github.com/sass/libsass/wiki/building-libsass) and
 the [C-API documentation](https://github.com/sass/libsass/wiki/API-Documentation).
 
 About Sass
@@ -93,4 +93,3 @@ Our MIT license is designed to be as simple, and liberal as possible.
 sass2scss was originally written by [Marcel Greter](@mgreter)
 and he happily agreed to have it merged into the project.
 
-[sass_interface.h]: sass_interface.h

data/ext/libsass/appveyor.yml

@@ -1,37 +1,36 @@
+os: Visual Studio 2015
+
 environment:
   CTEST_OUTPUT_ON_FAILURE: 1
+  ruby_version: 22-x64
+  TargetPath: sassc/bin/sassc
   matrix:
-  - Compiler: mingw
-    Build: static
-    ruby_version: "21-x64"
-  - Compiler: mingw
-    Build: shared
-    ruby_version: "21-x64"
   - Compiler: msvc
     Config: Release
-    ruby_version: "21-x64"
   - Compiler: msvc
     Config: Debug
-    ruby_version: "21-x64"
+  - Compiler: mingw
+    Build: static
+  - Compiler: mingw
+    Build: shared
 
 cache:
   - C:\Ruby%ruby_version%\lib\ruby\gems
+  - C:\mingw64
 
 install:
   - git clone https://github.com/sass/sassc.git
   - git clone https://github.com/sass/sass-spec.git
   - set PATH=C:\Ruby%ruby_version%\bin;%PATH%
-  - set SASS_LIBSASS_PATH=..
   - ps: |
-      if(!(gem which minitest 2>$nul)) { gem install minitest }
+      if(!(gem which minitest 2>$nul)) { gem install minitest --no-ri --no-rdoc }
       if ($env:Compiler -eq "mingw" -AND -Not (Test-Path "C:\mingw64")) {
         # Install MinGW.
-        $url  = "http://sourceforge.net/projects/mingw-w64/files/"
-        $url += "Toolchains%20targetting%20Win64/Personal%20Builds/"
-        $url += "mingw-builds/4.9.2/threads-win32/seh/"
-        $url += "x86_64-4.9.2-release-win32-seh-rt_v3-rev0.7z/download"
-        Invoke-WebRequest -UserAgent wget -Uri $url -OutFile x86_64-4.9.2-release-win32-seh-rt_v3-rev0.7z
-        &7z x -oC:\ x86_64-4.9.2-release-win32-seh-rt_v3-rev0.7z > $null
+        $file = "x86_64-4.9.2-release-win32-seh-rt_v4-rev3.7z"
+        $url  = "https://bintray.com/artifact/download/drewwells/generic/"
+        $url += $file
+        Invoke-WebRequest -UserAgent wget -Uri $url -OutFile $file
+        &7z x -oC:\ $file > $null
       }
   - set PATH=C:\mingw64\bin;%PATH%
   - set CC=gcc
@@ -41,31 +40,16 @@ build_script:
       if ($env:Compiler -eq "mingw") {
         mingw32-make -j4 sassc
       } else {
-        msbuild /m:4 /p:Configuration=$env:Config win\libsass.sln
-      }
-  - ps: |
-      if ($env:Compiler -eq "mingw") {
-        sassc\bin\sassc.exe -v
-        ruby -v
-      } else {
-        if ($env:Config -eq "Debug") {
-          win\bin\Debug\sassc.exe -v
-          ruby -v
-        } else {
-          win\bin\sassc.exe -v
-          ruby -v
-        }
+        msbuild /m:4 /p:Configuration=$env:Config sassc\win\sassc.sln
       }
 
+      # print the branding art
+      mv script/branding script/branding.ps1
+      script/branding.ps1
+
+      # print the version info
+      &$env:TargetPath -v
+      ruby -v
+
 test_script:
-  - ps: |
-      if ($env:Compiler -eq "mingw") {
-        ruby sass-spec\sass-spec.rb -c sassc\bin\sassc.exe -s --ignore-todo sass-spec/spec
-      } else {
-        if ($env:Config -eq "Debug") {
-          echo "test runner in debug mode build via msvc will throw debug assertions"
-          echo ruby sass-spec\sass-spec.rb -c win\bin\Debug\sassc.exe -s --ignore-todo sass-spec/spec
-        } else {
-          ruby sass-spec\sass-spec.rb -c win\bin\sassc.exe -s --ignore-todo sass-spec/spec
-        }
-      }
+  - ps: ruby sass-spec/sass-spec.rb -c $env:TargetPath -s --ignore-todo sass-spec/spec

data/ext/libsass/configure.ac

@@ -4,19 +4,32 @@
 AC_PREREQ([2.61])
 
 AC_INIT([libsass], m4_esyscmd_s([./version.sh]), [support@moovweb.com])
-AC_CONFIG_SRCDIR([ast.hpp])
+AC_CONFIG_SRCDIR([src/ast.hpp])
 AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES([sass_version.h])
+AC_CONFIG_HEADERS([src/config.h])
+AC_CONFIG_FILES([include/sass/version.h])
 AC_CONFIG_AUX_DIR([script])
 # These are flags passed to automake
 # Though they look like gcc flags!
 AM_INIT_AUTOMAKE([foreign parallel-tests -Wall])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])])
+# would fail with mingw otherwise
+# m4_pattern_allow([AM_PROG_AR])
 
 # Checks for programs.
+AC_PROG_CC
 AC_PROG_CXX
-AC_LANG([C++])
+AC_LANG_PUSH([C])
+AC_LANG_PUSH([C++])
+AC_GNU_SOURCE
+# Check fails on Travis, but it works fine
+# AX_CXX_COMPILE_STDCXX_11([ext],[optional])
+AC_CHECK_TOOL([AR], [ar], [false])
+if test "x$is_mingw32" != "xyes"; then
+  AC_CHECK_TOOL([DLLTOOL], [dlltool], [false])
+  AC_CHECK_TOOL([DLLWRAP], [dllwrap], [false])
+  AC_CHECK_TOOL([WINDRES], [windres], [false])
+fi
 LT_INIT([dlopen])
 
 # Checks for header files.
@@ -33,7 +46,7 @@ AC_CHECK_FUNCS([floor getcwd strtol])
 AC_ARG_ENABLE(tests, AS_HELP_STRING([--enable-tests], [enable testing the build]),
               [enable_tests="$enableval"], [enable_tests=no])
 
-AS_CASE([$host], [*-*-mingw32], [is_mingw32=yes], [is_mingw32=no])
+AS_CASE([$target], [*-*-mingw32], [is_mingw32=yes], [is_mingw32=no])
 AM_CONDITIONAL(COMPILER_IS_MINGW32, test "x$is_mingw32" = "xyes")
 
 dnl The dlopen() function is in the C library for *BSD and in
@@ -86,7 +99,7 @@ the --with-sass-spec-dir=<dir> argument.
 
   # TODO: Remove this when automake requirements are 1.12+
   AC_MSG_CHECKING([whether we can use TAP mode])
-  tmp=`$AWK '/TEST_LOG_DRIVER/' $srcdir/Makefile.in`
+  tmp=`$AWK '/TEST_LOG_DRIVER/' $srcdir/GNUmakefile.in`
   if test "x$tmp" != "x"; then
     use_tap=yes
   else
@@ -124,5 +137,5 @@ AC_SUBST(PACKAGE_VERSION)
 
 AC_MSG_NOTICE([Building libsass ($VERSION)])
 
-AC_CONFIG_FILES([Makefile support/libsass.pc])
+AC_CONFIG_FILES([GNUmakefile src/GNUmakefile src/support/libsass.pc])
 AC_OUTPUT

data/ext/libsass/contrib/plugin.cpp

@@ -1,7 +1,7 @@
 #include <cstring>
 #include <iostream>
 #include <stdint.h>
-#include "sass_values.h"
+#include <sass.h>
 
 // gcc: g++ -shared plugin.cpp -o plugin.so -fPIC -Llib -lsass
 // mingw: g++ -shared plugin.cpp -o plugin.dll -Llib -lsass

data/ext/libsass/include/sass.h

@@ -0,0 +1,15 @@
+#ifndef SASS_H
+#define SASS_H
+
+// #define DEBUG 1
+
+// include API headers
+#include <sass/base.h>
+#include <sass/version.h>
+#include <sass/values.h>
+#include <sass/functions.h>
+#include <sass/context.h>
+#include <sass2scss.h>
+
+#endif
+

data/ext/libsass/{sass.h → include/sass/base.h}

@@ -1,5 +1,18 @@
-#ifndef SASS_H
-#define SASS_H
+#ifndef SASS_BASE_H
+#define SASS_BASE_H
+
+#ifdef _MSC_VER
+  #pragma warning(disable : 4503)
+  #ifndef _SCL_SECURE_NO_WARNINGS
+    #define _SCL_SECURE_NO_WARNINGS
+  #endif
+  #ifndef _CRT_SECURE_NO_WARNINGS
+    #define _CRT_SECURE_NO_WARNINGS
+  #endif
+  #ifndef _CRT_NONSTDC_NO_DEPRECATE
+    #define _CRT_NONSTDC_NO_DEPRECATE
+  #endif
+#endif
 
 #include <stddef.h>
 #include <stdbool.h>
@@ -18,10 +31,10 @@
   /* You should define ADD_EXPORTS *only* when building the DLL. */
   #ifdef ADD_EXPORTS
     #define ADDAPI __declspec(dllexport)
-	#define ADDCALL __cdecl
+    #define ADDCALL __cdecl
   #else
     #define ADDAPI
-	#define ADDCALL
+    #define ADDCALL
   #endif
 
 #else /* _WIN32 not defined. */
@@ -32,11 +45,6 @@
 
 #endif
 
-// include API headers
-#include "sass_version.h"
-#include "sass_values.h"
-#include "sass_functions.h"
-
 /* Make sure functions are exported with C linkage under C++ compilers. */
 #ifdef __cplusplus
 extern "C" {

data/ext/libsass/{sass_context.h → include/sass/context.h}

@@ -3,7 +3,9 @@
 
 #include <stddef.h>
 #include <stdbool.h>
-#include "sass.h"
+#include <sass/base.h>
+#include <sass/values.h>
+#include <sass/functions.h>
 
 #ifdef __cplusplus
 extern "C" {

data/ext/libsass/{sass_functions.h → include/sass/functions.h}

@@ -3,7 +3,7 @@
 
 #include <stddef.h>
 #include <stdbool.h>
-#include "sass.h"
+#include <sass/base.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -57,7 +57,7 @@ ADDAPI void ADDCALL sass_delete_importer (Sass_Importer_Entry cb);
 ADDAPI Sass_Import_List ADDCALL sass_make_import_list (size_t length);
 // Creator for a single import entry returned by the custom importer inside the list
 ADDAPI Sass_Import_Entry ADDCALL sass_make_import_entry (const char* path, char* source, char* srcmap);
-ADDAPI Sass_Import_Entry ADDCALL sass_make_import (const char* path, const char* base, char* source, char* srcmap);
+ADDAPI Sass_Import_Entry ADDCALL sass_make_import (const char* imp_path, const char* abs_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 Sass_Import_Entry ADDCALL sass_import_set_error(Sass_Import_Entry import, const char* message, size_t line, size_t col);
 
@@ -67,8 +67,8 @@ ADDAPI void ADDCALL sass_import_set_list_entry (Sass_Import_List list, size_t id
 ADDAPI Sass_Import_Entry ADDCALL sass_import_get_list_entry (Sass_Import_List list, size_t idx);
 
 // Getters for import entry
-ADDAPI const char* ADDCALL sass_import_get_path (Sass_Import_Entry);
-ADDAPI const char* ADDCALL sass_import_get_base (Sass_Import_Entry);
+ADDAPI const char* ADDCALL sass_import_get_imp_path (Sass_Import_Entry);
+ADDAPI const char* ADDCALL sass_import_get_abs_path (Sass_Import_Entry);
 ADDAPI const char* ADDCALL sass_import_get_source (Sass_Import_Entry);
 ADDAPI const char* ADDCALL sass_import_get_srcmap (Sass_Import_Entry);
 // Explicit functions to take ownership of these items

data/ext/libsass/{sass_interface.h → include/sass/interface.h}

@@ -1,9 +1,12 @@
 #ifndef SASS_C_INTERFACE_H
 #define SASS_C_INTERFACE_H
 
+// the API in this header has been deprecated
+// please use the new API from sass/context.h
+
 #include <stddef.h>
 #include <stdbool.h>
-#include "sass.h"
+#include <sass/base.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -47,7 +50,7 @@ struct sass_options {
 struct sass_context {
   const char* input_path;
   const char* output_path;
-  const char* source_string;
+  char* source_string;
   char* output_string;
   char* source_map_string;
   struct sass_options options;

data/ext/libsass/{sass_values.h → include/sass/values.h}

@@ -3,7 +3,7 @@
 
 #include <stddef.h>
 #include <stdbool.h>
-#include "sass.h"
+#include <sass/base.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -32,6 +32,14 @@ enum Sass_Separator {
   SASS_SPACE
 };
 
+// Value Operators
+enum Sass_OP {
+  AND, OR,                   // logical connectives
+  EQ, NEQ, GT, GTE, LT, LTE, // arithmetic relations
+  ADD, SUB, MUL, DIV, MOD,   // arithmetic functions
+  NUM_OPS                    // so we know how big to make the op table
+};
+
 // Return the sass tag for a generic sass value
 // Check is needed before accessing specific values!
 ADDAPI enum Sass_Tag ADDCALL sass_value_get_tag (const union Sass_Value* v);
@@ -119,6 +127,12 @@ ADDAPI void ADDCALL sass_delete_value (union Sass_Value* val);
 // Make a deep cloned copy of the given sass value
 ADDAPI union Sass_Value* ADDCALL sass_clone_value (const union Sass_Value* val);
 
+// Stringify a Sass_Values and also return the result as a Sass_Value (of type STRING)
+ADDAPI union Sass_Value* ADDCALL sass_value_stringify (const union Sass_Value* a, bool compressed, int precision);
+
+// Execute an operation for two Sass_Values and return the result as a Sass_Value too
+ADDAPI union Sass_Value* ADDCALL sass_value_op (enum Sass_OP op, const union Sass_Value* a, const union Sass_Value* b);
+
 
 #ifdef __cplusplus
 } // __cplusplus defined.