libsass 3.2.0-beta.4

sass · dahlia · Apr 5, 2015 · Apr 4, 2015 · Apr 4, 2015 · Apr 4, 2015
commit 76058a40d899c002cc5d142986128e3032fac898
diff --git a/libsass b/libsass
diff --git a/pysass.cpp b/pysass.cpp
@@ -362,10 +362,12 @@ static union Sass_Value* _to_sass_value(PyObject* value) {
 }
 
 static union Sass_Value* _call_py_f(
-        const union Sass_Value* sass_args, void* cookie
+        const union Sass_Value* sass_args,
+        Sass_Function_Entry cb,
+        struct Sass_Options* opts
 ) {
     size_t i;
-    PyObject* pyfunc = (PyObject*)cookie;
+    PyObject* pyfunc = (PyObject*)sass_function_get_cookie(cb);
     PyObject* py_args = PyTuple_New(sass_list_get_length(sass_args));
     PyObject* py_result = NULL;
     union Sass_Value* sass_result = NULL;
@@ -394,13 +396,13 @@ static void _add_custom_functions(
         struct Sass_Options* options, PyObject* custom_functions
 ) {
     Py_ssize_t i;
-    Sass_C_Function_List fn_list = sass_make_function_list(
+    Sass_Function_List fn_list = sass_make_function_list(
         PyList_Size(custom_functions)
     );
     for (i = 0; i < PyList_GET_SIZE(custom_functions); i += 1) {
         PyObject* sass_function = PyList_GET_ITEM(custom_functions, i);
         PyObject* signature = PySass_Object_Bytes(sass_function);
-        Sass_C_Function_Callback fn = sass_make_function(
+        Sass_Function_Entry fn = sass_make_function(
             PySass_Bytes_AS_STRING(signature),
             _call_py_f,
             sass_function

diff --git a/sasstests.py b/sasstests.py
@@ -1017,10 +1017,10 @@ def test_raises(self):
 
     def test_warning(self):
         with assert_raises_compile_error(
-                'Error: warning in C function returns-warning: '
+                'Error: warning in C function returns_warning: '
                 'This is a warning\n'
                 '       Backtrace:\n'
-                '       \tstdin:0, in function `returns-warning`\n'
+                '       \tstdin:0, in function `returns_warning`\n'
                 '       \tstdin:0\n'
                 '        on line 1 of stdin\n'
                 '>> a { content: returns_warning(); }\n'
@@ -1030,9 +1030,9 @@ def test_warning(self):
 
     def test_error(self):
         with assert_raises_compile_error(
-                'Error: error in C function returns-error: This is an error\n'
+                'Error: error in C function returns_error: This is an error\n'
                 '       Backtrace:\n'
-                '       \tstdin:0, in function `returns-error`\n'
+                '       \tstdin:0, in function `returns_error`\n'
                 '       \tstdin:0\n'
                 '        on line 1 of stdin\n'
                 '>> a { content: returns_error(); }\n'
@@ -1042,7 +1042,7 @@ def test_error(self):
 
     def test_returns_unknown_object(self):
         with assert_raises_compile_error(
-                'Error: error in C function returns-unknown: '
+                'Error: error in C function returns_unknown: '
                 'Unexpected type: `tuple`.\n'
                 '       Expected one of:\n'
                 '       - None\n'
@@ -1056,7 +1056,7 @@ def test_returns_unknown_object(self):
                 '       - SassWarning\n'
                 '       - SassError\n\n'
                 '       Backtrace:\n'
-                '       \tstdin:0, in function `returns-unknown`\n'
+                '       \tstdin:0, in function `returns_unknown`\n'
                 '       \tstdin:0\n'
                 '        on line 1 of stdin\n'
                 '>> a { content: returns_unknown(); }\n'
+1 −0		.gitignore
+1 −1		Makefile.am
+13 −7		ast.hpp
+3 −0		constants.cpp
+3 −0		constants.hpp
+68 −52		context.cpp
+23 −9		context.hpp
+8 −3		contextualize_eval.cpp
+36 −9		contrib/plugin.cpp
+1 −1		cssize.cpp
+25 −1		debugger.hpp
+5 −3		error_handling.cpp
+2 −2		error_handling.hpp
+22 −12		eval.cpp
+2 −5		expand.cpp
+170 −123		file.cpp
+44 −7		file.hpp
+9 −7		functions.cpp
+2 −2		functions.hpp
+2 −3		inspect.cpp
+3 −15		listize.cpp
+1 −5		listize.hpp
+2 −3		output.cpp
+86 −62		parser.cpp
+2 −0		parser.hpp
+15 −2		plugins.cpp
+6 −4		plugins.hpp
+4 −0		prelexer.cpp
+2 −0		prelexer.hpp
+21 −11		sass.cpp
+5 −2		sass.h
+105 −41		sass_context.cpp
+24 −6		sass_context.h
+49 −40		sass_functions.cpp
+55 −43		sass_functions.h
+8 −7		sass_interface.cpp
+3 −3		sass_interface.h
+3 −3		util.cpp