Skip to content

Three two #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 30, 2015
Merged

Three two #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
373277f
Update to 3.2.0-beta.6
asottile Apr 27, 2015
39e4f75
Bump to 3.2.0
asottile Apr 27, 2015
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 22 files
+2 −0 .travis.yml
+9 −3 Makefile
+1 −0 Readme.md
+9 −0 ast.cpp
+50 −4 ast.hpp
+2 −2 backtrace.hpp
+23 −1 bind.cpp
+1 −1 constants.cpp
+221 −69 debugger.hpp
+2 −6 environment.hpp
+66 −13 eval.cpp
+47 −10 expand.cpp
+34 −15 functions.cpp
+132 −135 json.cpp
+25 −10 lexer.hpp
+34 −21 parser.cpp
+9 −3 parser.hpp
+6 −0 position.hpp
+24 −15 prelexer.cpp
+3 −3 script/ci-build-libsass
+87 −8 util.cpp
+5 −0 util.hpp
30 changes: 15 additions & 15 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': ';AAKI,IAAI,CAAH;EAHH,gBAAgB,EAAE,KAAM,GAGpB;;EAEH,IAAI,CAAC,CAAC,CAAL;IACA,KAAK,EAAE,IAAK,GADX',
'mappings': ';AAKA,IAAI,CAAC;EAHH,gBAAgB,EAAE,KAAM,GAGpB;;EAEJ,IAAI,CAAC,CAAC,CAAJ;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': ';AACG,CAAC,CAAC,CAAC,CAAF;EACA,SAAS,EAAE,IAAI,GADd',
'mappings': ';AACE,CAAC,CAAC,CAAC,CAAD;EACA,SAAS,EAAE,IAAK,GADf',
},
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': ';;AAKI,IAAI,CAAH;EAHH,gBAAgB,EAAE,KAAM,GAGpB;;EAEH,IAAI,CAAC,CAAC,CAAL;IACA,IAAI,EAAE,0BAA2B,GADhC',
'mappings': ';;AAKA,IAAI,CAAC;EAHH,gBAAgB,EAAE,KAAM,GAGpB;;EAEJ,IAAI,CAAC,CAAC,CAAJ;IACA,IAAI,EAAE,0BAA2B,GADhC',
},
os.path.join(d, 'css', 'd.scss.css.map')
)
Expand Down Expand Up @@ -1017,11 +1017,11 @@ def test_raises(self):
r'.+'
r'AssertionError: foo\n\n'
r' Backtrace:\n'
r' \tstdin:0, in function `raises`\n'
r' \tstdin:0\n'
r' \tstdin:1, in function `raises`\n'
r' \tstdin:1\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 @@ -1030,23 +1030,23 @@ def test_warning(self):
'Error: warning in C function returns_warning: '
'This is a warning\n'
' Backtrace:\n'
' \tstdin:0, in function `returns_warning`\n'
' \tstdin:0\n'
' \tstdin:1, in function `returns_warning`\n'
' \tstdin:1\n'
' on line 1 of stdin\n'
'>> a { content: returns_warning(); }\n'
' -----------------------------^\n'
' -------------^\n'
):
compile_with_func('a { content: returns_warning(); }')

def test_error(self):
with assert_raises_compile_error(
'Error: error in C function returns_error: This is an error\n'
' Backtrace:\n'
' \tstdin:0, in function `returns_error`\n'
' \tstdin:0\n'
' \tstdin:1, in function `returns_error`\n'
' \tstdin:1\n'
' on line 1 of stdin\n'
'>> a { content: returns_error(); }\n'
' ---------------------------^\n'
' -------------^\n'
):
compile_with_func('a { content: returns_error(); }')

Expand All @@ -1066,11 +1066,11 @@ def test_returns_unknown_object(self):
' - SassWarning\n'
' - SassError\n\n'
' Backtrace:\n'
' \tstdin:0, in function `returns_unknown`\n'
' \tstdin:0\n'
' \tstdin:1, in function `returns_unknown`\n'
' \tstdin:1\n'
' on line 1 of stdin\n'
'>> a { content: returns_unknown(); }\n'
' -----------------------------^\n'
' -------------^\n'
):
compile_with_func('a { content: returns_unknown(); }')

Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy