Submodule: Updates LibSass to v3.2.0-beta.1.

* Updates sass-spec to corresponding commit. * Prevents source_string from freeing in data context case in binding code. * Corresponds to sass/libsass#925.
am11 · Mar 18, 2015 · 86593f2 · 86593f2
1 parent 2aa5bb6
commit 86593f2
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 7 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -11,6 +11,10 @@ environment:
     # io.js
     - nodejs_version: 1    # will fetch the latest io.js version
 
+matrix:
+  allow_failures:
+    - nodejs_version: 1
+
 install:
   - ps: Install-Product node $env:nodejs_version
   - node --version

diff --git a/libsass.gyp b/libsass.gyp
@@ -11,7 +11,8 @@
         'src/libsass/constants.cpp',
         'src/libsass/context.cpp',
         'src/libsass/contextualize.cpp',
-        'src/libsass/copy_c_str.cpp',
+        'src/libsass/cssize.cpp',
+        'src/libsass/emitter.cpp',
         'src/libsass/error_handling.cpp',
         'src/libsass/eval.cpp',
         'src/libsass/expand.cpp',
@@ -21,9 +22,10 @@
         'src/libsass/inspect.cpp',
         'src/libsass/json.cpp',
         'src/libsass/node.cpp',
-        'src/libsass/output_compressed.cpp',
-        'src/libsass/output_nested.cpp',
+        'src/libsass/output.cpp',
         'src/libsass/parser.cpp',
+        'src/libsass/plugins.cpp',
+        'src/libsass/position.cpp',
         'src/libsass/prelexer.cpp',
         'src/libsass/remove_placeholders.cpp',
         'src/libsass/sass.cpp',

diff --git a/src/binding.cpp b/src/binding.cpp
@@ -272,7 +272,7 @@ NAN_METHOD(render_sync) {
 
   int result = get_result(ctx_w, ctx, true);
 
-  sass_wrapper_dispose(ctx_w, source_string);
+  sass_free_context_wrapper(ctx_w);
 
   NanReturnValue(NanNew<Boolean>(result == 0));
 }

diff --git a/src/libsass b/src/libsass
diff --git a/test/fixtures/source-map/expected.map b/test/fixtures/source-map/expected.map
@@ -5,6 +5,6 @@
 		"index.scss"
 	],
 	"sourcesContent": [],
-	"mappings": "AAAA;EACE,AAAO;EACP,AAAQ;;AAGV,AAAQ;EACN,AAAiB;;AAGnB,AAAQ;EACN,AAAO;EAET,AAAQ,AAAG;IACP,AAAa",
+	"mappings": "AAAA,OAAO,CAAC;EACN,KAAK,EAAE,GAAI;EACX,MAAM,EAAE,IAAI,GAFL;;AAKD,OAAO,CAAC,EAAE,CAAP;EACT,eAAe,EAAE,IAAK,GADZ;;AAIJ,OAAO,CAAC,EAAE,CAAP;EACT,KAAK,EAAE,IAAK,GADF;EAGV,OAAO,CAAC,EAAE,CAAC,CAAC,CAAV;IACA,WAAW,EAAE,IAAK,GADjB",
 	"names": []
 }
diff --git a/test/fixtures/spec b/test/fixtures/spec
diff --git a/test/spec.js b/test/spec.js
@@ -7,6 +7,7 @@ var assert = require('assert'),
     util = require('./util');
 
 describe('spec', function() {
+  this.timeout(0);
   var suites = util.getSuites();
 
   describe('test/sass-spec directory', function() {