From 4c34d16a4f475fa719d39831b9a89d3d6657e52f Mon Sep 17 00:00:00 2001 From: Marcel Greter Date: Sat, 17 Mar 2018 04:27:18 +0100 Subject: [PATCH] Remove obsolete `in_selector` flag --- src/eval.cpp | 2 -- src/inspect.cpp | 9 --------- src/sass.hpp | 7 ++----- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/eval.cpp b/src/eval.cpp index c5f514fd9..17bc910cd 100644 --- a/src/eval.cpp +++ b/src/eval.cpp @@ -1534,10 +1534,8 @@ namespace Sass { { LOCAL_FLAG(is_in_selector_schema, true); // the parser will look for a brace to end the selector - ctx.c_options.in_selector = true; // do not compress colors Expression_Obj sel = s->contents()->perform(this); std::string result_str(sel->to_string(ctx.c_options)); - ctx.c_options.in_selector = false; // flag temporary only result_str = unquote(Util::rtrim(result_str)); char* temp_cstr = sass_copy_c_string(result_str.c_str()); ctx.strings.push_back(temp_cstr); // attach to context diff --git a/src/inspect.cpp b/src/inspect.cpp index a83ed25a6..7510b19da 100644 --- a/src/inspect.cpp +++ b/src/inspect.cpp @@ -42,9 +42,7 @@ namespace Sass { void Inspect::operator()(Ruleset_Ptr ruleset) { if (ruleset->selector()) { - opt.in_selector = true; ruleset->selector()->perform(this); - opt.in_selector = false; } if (ruleset->block()) { ruleset->block()->perform(this); @@ -623,11 +621,6 @@ namespace Sass { // maybe an unknown token std::string name = c->disp(); - if (opt.in_selector && name != "") { - append_token(name, c); - return; - } - // resolved color std::string res_name = name; @@ -915,9 +908,7 @@ namespace Sass { void Inspect::operator()(Selector_Schema_Ptr s) { - opt.in_selector = true; s->contents()->perform(this); - opt.in_selector = false; } void Inspect::operator()(Parent_Selector_Ptr p) diff --git a/src/sass.hpp b/src/sass.hpp index 68f15f923..fdeface14 100644 --- a/src/sass.hpp +++ b/src/sass.hpp @@ -96,13 +96,10 @@ struct Sass_Inspect_Options { // Precision for fractional numbers int precision; - // Do not compress colors in selectors - bool in_selector; - // initialization list (constructor with defaults) Sass_Inspect_Options(Sass_Output_Style style = Sass::NESTED, - int precision = 5, bool in_selector = false) - : output_style(style), precision(precision), in_selector(in_selector) + int precision = 5) + : output_style(style), precision(precision) { } };