sass · asottile · Mar 17, 2018 · Mar 17, 2018
diff --git a/libsass b/libsass
diff --git a/sasstests.py b/sasstests.py
@@ -1128,11 +1128,9 @@ def test_raises(self):
                 r'^Error: error in C function raises: \n'
                 r'       Traceback \(most recent call last\):\n'
                 r'.+'
-                r'AssertionError: foo\n\n\n'
-                r'       Backtrace:\n'
-                r'       \tstdin:1, in function `raises`\n'
-                r'       \tstdin:1\n'
-                r'        on line 1 of stdin\n'
+                r'AssertionError: foo\n'
+                r'        on line 1 of stdin, in function `raises`\n'
+                r'        from line 1 of stdin\n'
                 r'>> a { content: raises\(\); }\n'
                 r'   -------------\^\n$'
         )):
@@ -1141,11 +1139,9 @@ def test_raises(self):
     def test_warning(self):
         with assert_raises_compile_error(
                 'Error: warning in C function returns_warning: '
-                'This is a warning\n\n'
-                '       Backtrace:\n'
-                '       \tstdin:1, in function `returns_warning`\n'
-                '       \tstdin:1\n'
-                '        on line 1 of stdin\n'
+                'This is a warning\n'
+                '        on line 1 of stdin, in function `returns_warning`\n'
+                '        from line 1 of stdin\n'
                 '>> a { content: returns_warning(); }\n'
                 '   -------------^\n'
         ):
@@ -1154,11 +1150,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\n'
-                '       Backtrace:\n'
-                '       \tstdin:1, in function `returns_error`\n'
-                '       \tstdin:1\n'
-                '        on line 1 of stdin\n'
+                'This is an error\n'
+                '        on line 1 of stdin, in function `returns_error`\n'
+                '        from line 1 of stdin\n'
                 '>> a { content: returns_error(); }\n'
                 '   -------------^\n'
         ):
@@ -1178,11 +1172,9 @@ def test_returns_unknown_object(self):
                 '       - dict\n'
                 '       - SassMap\n'
                 '       - SassWarning\n'
-                '       - SassError\n\n\n'
-                '       Backtrace:\n'
-                '       \tstdin:1, in function `returns_unknown`\n'
-                '       \tstdin:1\n'
-                '        on line 1 of stdin\n'
+                '       - SassError\n'
+                '        on line 1 of stdin, in function `returns_unknown`\n'
+                '        from line 1 of stdin\n'
                 '>> a { content: returns_unknown(); }\n'
                 '   -------------^\n'
         ):
+2 −0		Makefile.conf
+21 −18		src/ast.cpp
+51 −61		src/ast.hpp
+1 −1		src/ast_def_macros.hpp
+3 −0		src/ast_fwd_decl.hpp
+46 −0		src/backtrace.cpp
+7 −54		src/backtrace.hpp
+14 −9		src/bind.cpp
+67 −62		src/check_nesting.cpp
+9 −7		src/check_nesting.hpp
+25 −17		src/context.cpp
+4 −1		src/context.hpp
+9 −7		src/cssize.cpp
+4 −4		src/cssize.hpp
+2 −1		src/debugger.hpp
+62 −65		src/error_handling.cpp
+46 −45		src/error_handling.hpp
+80 −287		src/eval.cpp
+3 −13		src/eval.hpp
+32 −30		src/expand.cpp
+2 −3		src/expand.hpp
+2 −2		src/extend.cpp
+19 −2		src/file.cpp
+89 −96		src/functions.cpp
+2 −2		src/functions.hpp
+240 −0		src/operators.cpp
+30 −0		src/operators.hpp
+6 −5		src/output.cpp
+70 −61		src/parser.cpp
+13 −8		src/parser.hpp
+7 −11		src/sass_context.cpp
+13 −12		src/sass_values.cpp
+19 −1		src/util.cpp
+2 −1		src/util.hpp
+2 −0		win/libsass.targets
+6 −0		win/libsass.vcxproj.filters