Skip to content
This repository was archived by the owner on Oct 24, 2025. It is now read-only.

3.2.0-beta.5 #58

Merged
merged 1 commit into from
Apr 11, 2015
Merged

3.2.0-beta.5 #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libsass
Open in desktop
Submodule libsass updated 24 files
+3 −1 .travis.yml
+64 −33 ast.hpp
+19 −2 constants.cpp
+18 −2 constants.hpp
+2 −0 cssize.cpp
+18 −9 debugger.hpp
+1 −1 emitter.cpp
+1 −1 emitter.hpp
+2 −2 error_handling.cpp
+2 −2 error_handling.hpp
+23 −20 expand.cpp
+2 −2 extend.cpp
+3 −1 functions.cpp
+9 −10 inspect.cpp
+15 −1 lexer.cpp
+18 −4 lexer.hpp
+2 −2 output.cpp
+66 −96 parser.cpp
+10 −6 parser.hpp
+18 −5 prelexer.cpp
+12 −4 prelexer.hpp
+35 −41 sass_context.cpp
+2 −1 script/ci-report-coverage
+4 −0 win/libsass.vcxproj
14 changes: 7 additions & 7 deletions sasstests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def normalize_path(path):
'sources': ['test/a.scss'],
'sourcesContent': [],
'names': [],
'mappings': ';AAKA,IAAI,CAAC;EAHH,gBAAgB,EAAE,KAAM,GAGpB;;EAEJ,IAAI,CAAC,CAAC,CAAJ;IACA,KAAK,EAAE,IAAK,GADX',
'mappings': ';AAKI,IAAI,CAAH;EAHH,gBAAgB,EAAE,KAAM,GAGpB;;EAEH,IAAI,CAAC,CAAC,CAAL;IACA,KAAK,EAAE,IAAK,GADX',
}

B_EXPECTED_CSS = '''\
Expand Down Expand Up @@ -457,7 +457,7 @@ def test_build_one(self):
'sources': ['../test/b.scss'],
'sourcesContent': [],
'names': [],
'mappings': ';AACE,CAAC,CAAC,CAAC,CAAD;EACA,SAAS,EAAE,IAAI,GADd',
'mappings': ';AACG,CAAC,CAAC,CAAC,CAAF;EACA,SAAS,EAAE,IAAI,GADd',
},
os.path.join(d, 'css', 'b.scss.css.map')
)
Expand All @@ -475,7 +475,7 @@ def test_build_one(self):
'sources': ['../test/d.scss'],
'sourcesContent': [],
'names': [],
'mappings': ';;AAKA,IAAI,CAAC;EAHH,gBAAgB,EAAE,KAAM,GAGpB;;EAEJ,IAAI,CAAC,CAAC,CAAJ;IACA,IAAI,EAAE,0BAA2B,GADhC',
'mappings': ';;AAKI,IAAI,CAAH;EAHH,gBAAgB,EAAE,KAAM,GAGpB;;EAEH,IAAI,CAAC,CAAC,CAAL;IACA,IAAI,EAAE,0BAA2B,GADhC',
},
os.path.join(d, 'css', 'd.scss.css.map')
)
Expand Down Expand Up @@ -1021,7 +1021,7 @@ def test_raises(self):
r' \tstdin:0\n'
r' on line 1 of stdin\n'
r'>> a { content: raises\(\); }\n'
r' -------------\^\n$'
r' --------------------\^\n$'
)):
compile_with_func('a { content: raises(); }')

Expand All @@ -1034,7 +1034,7 @@ def test_warning(self):
' \tstdin:0\n'
' on line 1 of stdin\n'
'>> a { content: returns_warning(); }\n'
' -------------^\n'
' -----------------------------^\n'
):
compile_with_func('a { content: returns_warning(); }')

Expand All @@ -1046,7 +1046,7 @@ def test_error(self):
' \tstdin:0\n'
' on line 1 of stdin\n'
'>> a { content: returns_error(); }\n'
' -------------^\n'
' ---------------------------^\n'
):
compile_with_func('a { content: returns_error(); }')

Expand All @@ -1070,7 +1070,7 @@ def test_returns_unknown_object(self):
' \tstdin:0\n'
' on line 1 of stdin\n'
'>> a { content: returns_unknown(); }\n'
' -------------^\n'
' -----------------------------^\n'
):
compile_with_func('a { content: returns_unknown(); }')

Expand Down