Fix more issues with parent selector interpolation

mgreter · mgreter · commit 3f536a99d322 · 2015-05-09T06:01:28.000+02:00
Fixes #1043
diff --git a/expand.cpp b/expand.cpp
@@ -54,8 +54,8 @@ namespace Sass {
     }
 
     Contextualize_Eval* contextual = contextualize_eval->with(selector_stack.back(), env, backtrace);
-    if (old_in_at_root && !r->selector()->has_reference())
-      contextual = contextualize_eval->with(at_root_selector_stack.back(), env, backtrace);
+    // if (old_in_at_root && !r->selector()->has_reference())
+    //   contextual = contextualize_eval->with(selector_stack.back(), env, backtrace);
 
     Selector* sel_ctx = r->selector()->perform(contextual);
     if (sel_ctx == 0) throw "Cannot expand null selector";

Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,8 @@ namespace Sass {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`Contextualize_Eval* contextual = contextualize_eval->with(selector_stack.back(), env, backtrace);`
`57`		`- if (old_in_at_root && !r->selector()->has_reference())`
`58`		`- contextual = contextualize_eval->with(at_root_selector_stack.back(), env, backtrace);`
	`57`	`+ // if (old_in_at_root && !r->selector()->has_reference())`
	`58`	`+ // contextual = contextualize_eval->with(selector_stack.back(), env, backtrace);`
`59`	`59`
`60`	`60`	`Selector* sel_ctx = r->selector()->perform(contextual);`
`61`	`61`	`if (sel_ctx == 0) throw "Cannot expand null selector";`