From 8f0bdc79c16ba873958a1c164e732dbda5045401 Mon Sep 17 00:00:00 2001
From: Marcel Greter <marcel.greter@ocbnet.ch>
Date: Sat, 17 Mar 2018 07:38:49 +0100
Subject: [PATCH] Remove obsolete function constructor arguments

---
 src/ast.hpp      |  4 +---
 src/expand.cpp   | 12 ++++++------
 src/expand.hpp   |  6 +++---
 src/fn_utils.cpp |  3 +--
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/ast.hpp b/src/ast.hpp
index 5dd26f79c..8f247f8cc 100644
--- a/src/ast.hpp
+++ b/src/ast.hpp
@@ -977,9 +977,7 @@ namespace Sass {
                Signature sig,
                std::string n,
                Parameters_Obj params,
-               Sass_Function_Entry c_func,
-               bool whatever,
-               bool whatever2)
+               Sass_Function_Entry c_func)
     : Has_Block(pstate, 0),
       name_(n),
       parameters_(params),
diff --git a/src/expand.cpp b/src/expand.cpp
index 3ff8b728d..0e2c22e17 100644
--- a/src/expand.cpp
+++ b/src/expand.cpp
@@ -28,7 +28,7 @@ namespace Sass {
     block_stack(BlockStack()),
     call_stack(CallStack()),
     selector_stack(SelectorStack()),
-    media_block_stack(MediaStack())
+    media_stack(MediaStack())
   {
     env_stack.push_back(0);
     env_stack.push_back(env);
@@ -36,7 +36,7 @@ namespace Sass {
     call_stack.push_back(0);
     if (stack == NULL) { selector_stack.push_back(0); }
     else { selector_stack.insert(selector_stack.end(), stack->begin(), stack->end()); }
-    media_block_stack.push_back(0);
+    media_stack.push_back(0);
   }
 
   Env* Expand::environment()
@@ -139,7 +139,7 @@ namespace Sass {
     if (block_stack.back()->is_root()) {
       env_stack.push_back(&env);
     }
-    sel->set_media_block(media_block_stack.back());
+    sel->set_media_block(media_stack.back());
     Block_Obj blk = 0;
     if (r->block()) blk = operator()(r->block());
     Ruleset_Ptr rr = SASS_MEMORY_NEW(Ruleset,
@@ -183,13 +183,13 @@ namespace Sass {
     Parser p(Parser::from_c_str(str, ctx, traces, mq->pstate()));
     mq = p.parse_media_queries(); // re-assign now
     cpy->media_queries(mq);
-    media_block_stack.push_back(cpy);
+    media_stack.push_back(cpy);
     Block_Obj blk = operator()(m->block());
     Media_Block_Ptr mm = SASS_MEMORY_NEW(Media_Block,
                                       m->pstate(),
                                       mq,
                                       blk);
-    media_block_stack.pop_back();
+    media_stack.pop_back();
     mm->tabs(m->tabs());
     return mm;
   }
@@ -658,7 +658,7 @@ namespace Sass {
       }
       for (Complex_Selector_Obj cs : sl->elements()) {
         if (!cs.isNull() && !cs->head().isNull()) {
-          cs->head()->media_block(media_block_stack.back());
+          cs->head()->media_block(media_stack.back());
         }
       }
       selector_stack.push_back(0);
diff --git a/src/expand.hpp b/src/expand.hpp
index d88305e09..401843b67 100644
--- a/src/expand.hpp
+++ b/src/expand.hpp
@@ -31,10 +31,10 @@ namespace Sass {
 
     // it's easier to work with vectors
     std::vector<Env*>              env_stack;
-    BlockStack         block_stack;
-    CallStack      call_stack;
+    BlockStack    block_stack;
+    CallStack     call_stack;
     SelectorStack selector_stack;
-    MediaStack   media_block_stack;
+    MediaStack    media_stack;
 
     Boolean_Obj bool_true;
 
diff --git a/src/fn_utils.cpp b/src/fn_utils.cpp
index 7480f030f..2c86852b0 100644
--- a/src/fn_utils.cpp
+++ b/src/fn_utils.cpp
@@ -39,8 +39,7 @@ namespace Sass {
                           sig,
                           name,
                           params,
-                          c_func,
-                          false, true);
+                          c_func);
   }
 
   namespace Functions {