Skip to content

Upstream to 3.4.0rc1 #166

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 1 commit into from
Oct 25, 2016
Merged

Upstream to 3.4.0rc1 #166

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 74 files
+65 −0 .github/CONTRIBUTING.md
+29 −0 .github/ISSUE_TEMPLATE.md
+8 −3 Makefile
+28 −22 Makefile.conf
+14 −7 Readme.md
+5 −8 configure.ac
+3 −0 docs/api-context-internal.md
+7 −0 docs/api-context.md
+4 −0 docs/api-doc.md
+2 −0 docs/api-importer.md
+55 −0 docs/api-value-example.md
+49 −22 docs/api-value.md
+4 −0 docs/implementations.md
+5 −4 include/sass/base.h
+3 −0 include/sass/context.h
+28 −27 include/sass/values.h
+1 −1 include/sass/version.h
+1 −1 include/sass2scss.h
+3 −3 script/ci-build-libsass
+12 −3 script/ci-install-deps
+321 −212 src/ast.cpp
+273 −165 src/ast.hpp
+4 −5 src/ast_factory.hpp
+8 −7 src/ast_fwd_decl.hpp
+2 −7 src/bind.cpp
+0 −1 src/bind.hpp
+379 −0 src/check_nesting.cpp
+60 −0 src/check_nesting.hpp
+7 −6 src/constants.cpp
+2 −1 src/constants.hpp
+7 −1 src/context.cpp
+1 −1 src/context.hpp
+76 −32 src/cssize.cpp
+7 −8 src/cssize.hpp
+70 −40 src/debugger.hpp
+15 −2 src/error_handling.cpp
+19 −0 src/error_handling.hpp
+99 −160 src/eval.cpp
+12 −8 src/eval.hpp
+81 −74 src/expand.cpp
+13 −12 src/expand.hpp
+149 −142 src/extend.cpp
+10 −3 src/extend.hpp
+2 −1 src/file.cpp
+96 −59 src/functions.cpp
+2 −2 src/functions.hpp
+33 −45 src/inspect.cpp
+7 −7 src/inspect.hpp
+17 −5 src/json.cpp
+3 −3 src/lexer.cpp
+10 −10 src/listize.cpp
+3 −3 src/listize.hpp
+30 −30 src/node.cpp
+13 −13 src/node.hpp
+21 −19 src/operation.hpp
+48 −103 src/output.cpp
+0 −1 src/output.hpp
+160 −132 src/parser.cpp
+10 −7 src/parser.hpp
+6 −6 src/remove_placeholders.cpp
+1 −1 src/remove_placeholders.hpp
+21 −0 src/sass.cpp
+8 −1 src/sass.hpp
+14 −3 src/sass2scss.cpp
+69 −24 src/sass_context.cpp
+3 −0 src/sass_context.hpp
+22 −10 src/source_map.cpp
+2 −2 src/to_value.cpp
+1 −1 src/to_value.hpp
+3 −1 src/units.hpp
+20 −16 src/util.cpp
+2 −1 src/util.hpp
+2 −0 win/libsass.targets
+6 −0 win/libsass.vcxproj.filters
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 @@ -58,8 +58,8 @@ def normalize_path(path):
'sources': ['test/a.scss'],
'names': [],
'mappings': (
'AAKA,AAAA,IAAI,CAAC;EAHH,gBAAgB,EAAE,KAAM,GAQzB;EALD,AAEE,'
'IAFE,CAEF,CAAC,CAAC;IACA,KAAK,EAAE,IAAK,GACb'
'AAKA,AAAA,IAAI,CAAC;EAHH,gBAAgB,EAAE,KAAK,GAQxB;EALD,AAEE,IAFE,CAEF,'
'CAAC,CAAC;IACA,KAAK,EAAE,IAAI,GACZ'
),
}

Expand Down Expand Up @@ -596,8 +596,8 @@ def replace_source_path(s, name):
'sources': ['../test/b.scss'],
'names': [],
'mappings': (
'AAAA,AACE,CADD,CACC,CAAC,CAAC;EACA,SAAS,EAAE,IAAK,'
'GACjB'
'AAAA,AACE,CADD,CACC,CAAC,CAAC;EACA,SAAS,EAAE,IAAI,'
'GAChB'
),
},
os.path.join(d, 'css', 'b.scss.css.map')
Expand All @@ -617,9 +617,9 @@ def replace_source_path(s, name):
'sources': ['../test/d.scss'],
'names': [],
'mappings': (
';AAKA,AAAA,IAAI,CAAC;EAHH,gBAAgB,EAAE,KAAM,GAQzB;'
'EALD,AAEE,IAFE,CAEF,CAAC,CAAC;IACA,IAAI,EAAE,0BAA2B,'
'GAClC'
';AAKA,AAAA,IAAI,CAAC;EAHH,gBAAgB,EAAE,KAAK,GAQxB;'
'EALD,AAEE,IAFE,CAEF,CAAC,CAAC;IACA,IAAI,EAAE,0BAA0B,'
'GACjC'
),
},
os.path.join(d, 'css', 'd.scss.css.map')
Expand Down