aboutsummaryrefslogtreecommitdiffstats
path: root/community/libsass/fix-extend-issue-being-stuck-in-endless-loop.patch
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2019-11-03 23:04:26 -0300
committerLeo <thinkabit.ukim@gmail.com>2019-11-03 23:58:52 -0300
commit73dfa2dda0ff7b52ca978edc1c5affd75bfed207 (patch)
tree055e15f289ba45e34318cd377415545798c15825 /community/libsass/fix-extend-issue-being-stuck-in-endless-loop.patch
parent8e7b4453240b1fbc21700eaec9da32bc7a790967 (diff)
downloadaports-73dfa2dda0ff7b52ca978edc1c5affd75bfed207.tar.bz2
aports-73dfa2dda0ff7b52ca978edc1c5affd75bfed207.tar.xz
community/libsass: upgrade to 3.6.3
Diffstat (limited to 'community/libsass/fix-extend-issue-being-stuck-in-endless-loop.patch')
-rw-r--r--community/libsass/fix-extend-issue-being-stuck-in-endless-loop.patch122
1 files changed, 0 insertions, 122 deletions
diff --git a/community/libsass/fix-extend-issue-being-stuck-in-endless-loop.patch b/community/libsass/fix-extend-issue-being-stuck-in-endless-loop.patch
deleted file mode 100644
index 6ade4efdc9..0000000000
--- a/community/libsass/fix-extend-issue-being-stuck-in-endless-loop.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From 1ec3876afc071a79bb2d104b0b79306392e20bc4 Mon Sep 17 00:00:00 2001
-From: Marcel Greter <marcel.greter@ocbnet.ch>
-Date: Fri, 18 Oct 2019 07:22:52 +0200
-Subject: [PATCH] Fix extend issue being stuck in endless loop
-
-Fixes https://github.com/sass/libsass/issues/3006
----
- src/eval_selectors.cpp | 6 +++---
- src/expand.cpp | 29 +++++++++++++++++++++++------
- src/expand.hpp | 3 +++
- src/extender.hpp | 4 ++--
- 4 files changed, 31 insertions(+), 11 deletions(-)
-
-diff --git a/src/eval_selectors.cpp b/src/eval_selectors.cpp
-index cc7d3409c..db797e5bd 100644
---- a/src/eval_selectors.cpp
-+++ b/src/eval_selectors.cpp
-@@ -46,10 +46,10 @@ namespace Sass {
- SelectorList* Eval::operator()(ComplexSelector* s)
- {
- bool implicit_parent = !exp.old_at_root_without_rule;
-- if (is_in_selector_schema) exp.pushToSelectorStack({});
-+ if (is_in_selector_schema) exp.pushNullSelector();
- SelectorListObj other = s->resolve_parent_refs(
-- exp.getSelectorStack(), traces, implicit_parent);
-- if (is_in_selector_schema) exp.popFromSelectorStack();
-+ exp.getOriginalStack(), traces, implicit_parent);
-+ if (is_in_selector_schema) exp.popNullSelector();
-
- for (size_t i = 0; i < other->length(); i++) {
- ComplexSelectorObj sel = other->at(i);
-diff --git a/src/expand.cpp b/src/expand.cpp
-index 1b9bf9158..0380e1cec 100644
---- a/src/expand.cpp
-+++ b/src/expand.cpp
-@@ -62,6 +62,23 @@ namespace Sass {
- return 0;
- }
-
-+ void Expand::pushNullSelector()
-+ {
-+ pushToSelectorStack({});
-+ pushToOriginalStack({});
-+ }
-+
-+ void Expand::popNullSelector()
-+ {
-+ popFromOriginalStack();
-+ popFromSelectorStack();
-+ }
-+
-+ SelectorStack Expand::getOriginalStack()
-+ {
-+ return originalStack;
-+ }
-+
- SelectorStack Expand::getSelectorStack()
- {
- return selector_stack;
-@@ -153,15 +170,15 @@ namespace Sass {
- Block* bb = operator()(r->block());
- Keyframe_Rule_Obj k = SASS_MEMORY_NEW(Keyframe_Rule, r->pstate(), bb);
- if (r->schema()) {
-- pushToSelectorStack({});
-+ pushNullSelector();
- k->name(eval(r->schema()));
-- popFromSelectorStack();
-+ popNullSelector();
- }
- else if (r->selector()) {
- if (SelectorListObj s = r->selector()) {
-- pushToSelectorStack({});
-+ pushNullSelector();
- k->name(eval(s));
-- popFromSelectorStack();
-+ popNullSelector();
- }
- }
-
-@@ -288,10 +305,10 @@ namespace Sass {
- Block* ab = a->block();
- SelectorList* as = a->selector();
- Expression* av = a->value();
-- pushToSelectorStack({});
-+ pushNullSelector();
- if (av) av = av->perform(&eval);
- if (as) as = eval(as);
-- popFromSelectorStack();
-+ popNullSelector();
- Block* bb = ab ? operator()(ab) : NULL;
- Directive* aa = SASS_MEMORY_NEW(Directive,
- a->pstate(),
-diff --git a/src/expand.hpp b/src/expand.hpp
-index db5852ce4..90edbf4ca 100644
---- a/src/expand.hpp
-+++ b/src/expand.hpp
-@@ -22,7 +22,10 @@ namespace Sass {
- SelectorListObj& selector();
- SelectorListObj& original();
- SelectorListObj popFromSelectorStack();
-+ SelectorStack getOriginalStack();
- SelectorStack getSelectorStack();
-+ void pushNullSelector();
-+ void popNullSelector();
- void pushToSelectorStack(SelectorListObj selector);
-
- SelectorListObj popFromOriginalStack();
-diff --git a/src/extender.hpp b/src/extender.hpp
-index 4b00cc3a0..5f161786a 100644
---- a/src/extender.hpp
-+++ b/src/extender.hpp
-@@ -126,8 +126,8 @@ namespace Sass {
- std::unordered_map<
- SimpleSelectorObj,
- size_t,
-- ObjHash,
-- ObjEquality
-+ ObjPtrHash,
-+ ObjPtrEquality
- > sourceSpecificity;
-
- // ##########################################################################