Remove obsolete code

sass · Apr 30, 2016 · e74268c · e74268c
1 parent 3edc713
commit e74268c
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 22 deletions.
diff --git a/src/ast.hpp b/src/ast.hpp
@@ -1467,10 +1467,9 @@ namespace Sass {
   // "flat" strings.
   ////////////////////////////////////////////////////////////////////////
   class String : public Value {
-    ADD_PROPERTY(bool, sass_fix_1291)
   public:
-    String(ParserState pstate, bool delayed = false, bool sass_fix_1291 = false)
-    : Value(pstate, delayed), sass_fix_1291_(sass_fix_1291)
+    String(ParserState pstate, bool delayed = false)
+    : Value(pstate, delayed)
     { concrete_type(STRING); }
     static std::string type_name() { return "string"; }
     virtual ~String() = 0;

diff --git a/src/debugger.hpp b/src/debugger.hpp
@@ -596,7 +596,6 @@ inline void debug_ast(AST_Node* node, std::string ind, Env* env)
     std::cerr << " (" << pstate_source_position(node) << ")";
     std::cerr << " [" << prettyprint(expression->value()) << "]";
     if (expression->is_delayed()) std::cerr << " [delayed]";
-    if (expression->sass_fix_1291()) std::cerr << " [sass_fix_1291]";
     if (expression->is_interpolant()) std::cerr << " [interpolant]";
     if (expression->quote_mark()) std::cerr << " [quote_mark: " << expression->quote_mark() << "]";
     std::cerr << " <" << prettyprint(expression->pstate().token.ws_before()) << ">" << std::endl;
@@ -609,7 +608,6 @@ inline void debug_ast(AST_Node* node, std::string ind, Env* env)
     std::cerr << " (" << pstate_source_position(node) << ")";
     std::cerr << " [" << prettyprint(expression->value()) << "]";
     if (expression->is_delayed()) std::cerr << " [delayed]";
-    if (expression->sass_fix_1291()) std::cerr << " [sass_fix_1291]";
     if (expression->is_interpolant()) std::cerr << " [interpolant]";
     std::cerr << " <" << prettyprint(expression->pstate().token.ws_before()) << ">" << std::endl;
   } else if (dynamic_cast<String_Schema*>(node)) {
@@ -628,7 +626,6 @@ inline void debug_ast(AST_Node* node, std::string ind, Env* env)
     std::cerr << ind << "String " << expression;
     std::cerr << " " << expression->concrete_type();
     std::cerr << " (" << pstate_source_position(node) << ")";
-    if (expression->sass_fix_1291()) std::cerr << " [sass_fix_1291]";
     if (expression->is_interpolant()) std::cerr << " [interpolant]";
     std::cerr << " <" << prettyprint(expression->pstate().token.ws_before()) << ">" << std::endl;
   } else if (dynamic_cast<Expression*>(node)) {

diff --git a/src/eval.cpp b/src/eval.cpp
@@ -495,7 +495,7 @@ namespace Sass {
 
   Expression* Eval::operator()(Binary_Expression* b)
   {
-// debug_ast(b);
+
     String_Schema* ret_schema = 0;
     enum Sass_OP op_type = b->type();
 
@@ -890,7 +890,7 @@ namespace Sass {
     if (result->pstate().file == std::string::npos)
       result->pstate(c->pstate());
 
-    if (!result->is_delayed()) result = result->perform(this);
+    result = result->perform(this);
     result->is_interpolant(c->is_interpolant());
     exp.env_stack.pop_back();
     return result;
@@ -1136,7 +1136,7 @@ namespace Sass {
       bool is_quoted = dynamic_cast<String_Quoted*>((*s)[i]) != NULL;
       if (was_quoted && !(*s)[i]->is_interpolant() && !was_interpolant) { res += " "; }
       else if (i > 0 && is_quoted && !(*s)[i]->is_interpolant() && !was_interpolant) { res += " "; }
-      Expression* ex = (*s)[i]->is_delayed() ? (*s)[i] : (*s)[i]->perform(this);
+      Expression* ex = (*s)[i]->perform(this);
       interpolation(ctx, res, ex, into_quotes, ex->is_interpolant());
       was_quoted = dynamic_cast<String_Quoted*>((*s)[i]) != NULL;
       was_interpolant = (*s)[i]->is_interpolant();
@@ -1279,8 +1279,6 @@ namespace Sass {
   Expression* Eval::operator()(Argument* a)
   {
     Expression* val = a->value();
-    // delay missin function arguments?
-    val->is_delayed(a->is_delayed());
     val = val->perform(this);
 
     bool is_rest_argument = a->is_rest_argument();

diff --git a/src/functions.cpp b/src/functions.cpp
@@ -880,7 +880,6 @@ namespace Sass {
       if (String_Quoted* string_quoted = dynamic_cast<String_Quoted*>(arg)) {
         String_Constant* result = SASS_MEMORY_NEW(ctx.mem, String_Constant, pstate, string_quoted->value());
         // remember if the string was quoted (color tokens)
-        result->sass_fix_1291(string_quoted->quote_mark() != 0);
         result->is_delayed(true); // delay colors
         return result;
       }

diff --git a/src/inspect.cpp b/src/inspect.cpp
@@ -443,10 +443,8 @@ namespace Sass {
          (output_style() == INSPECT) || (
           expr->op().ws_before
           && (!expr->is_interpolant())
-          && (!expr->is_delayed() ||
-          expr->is_left_interpolant() ||
-          expr->is_right_interpolant()
-          )
+          && (expr->is_left_interpolant() ||
+              expr->is_right_interpolant())
 
     )) append_string(" ");
     switch (expr->type()) {
@@ -469,10 +467,8 @@ namespace Sass {
          (output_style() == INSPECT) || (
           expr->op().ws_after
           && (!expr->is_interpolant())
-          && (!expr->is_delayed()
-              || expr->is_left_interpolant()
-              || expr->is_right_interpolant()
-          )
+          && (expr->is_left_interpolant() ||
+              expr->is_right_interpolant())
     )) append_string(" ");
     expr->right()->perform(this);
   }

diff --git a/src/parser.cpp b/src/parser.cpp
@@ -442,7 +442,6 @@ namespace Sass {
       lex_css< exactly<':'> >();
       Expression* val = parse_space_list();
       arg = SASS_MEMORY_NEW(ctx.mem, Argument, p, val, name);
-      arg->is_delayed(val->is_delayed()); // inherit from value
     }
     else {
       bool is_arglist = false;
@@ -456,7 +455,6 @@ namespace Sass {
         else is_arglist = true;
       }
       arg = SASS_MEMORY_NEW(ctx.mem, Argument, pstate, val, "", is_arglist, is_keyword);
-      arg->is_delayed(val->is_delayed()); // inherit from value
     }
     return arg;
   }