Cleanup and refactor env-stack methods

Author: mgreter

src/ast_containers.hpp

@@ -315,6 +315,8 @@ namespace Sass {
 
     bool erase(const K& key)
     {
+      // Would be faster by quite a bit (2% for bolt)
+      // return elements_.unordered_erase(key) != 0;
       return elements_.erase(key) != 0;
     }
 

src/ast_expressions.hpp

@@ -283,7 +283,7 @@ namespace Sass {
   {
     ADD_CONSTREF(EnvKey, name);
     ADD_REF(sass::vector<EnvIdx>, vidxs);
-    ADD_REF(EnvIdx, vidx2);
+    // ADD_REF(EnvIdx, vidx2);
     ADD_CONSTREF(sass::string, ns);
     ADD_PROPERTY(bool, withinLoop);
   public:

src/ast_statements.hpp

@@ -792,12 +792,14 @@ namespace Sass {
     // The name of the mixin being invoked.
     ADD_CONSTREF(EnvKey, name);
 
+    ADD_CONSTREF(EnvIdx, midx);
+
     // The block that will be invoked for [ContentRule]s in the mixin
     // being invoked, or `null` if this doesn't pass a content block.
     ADD_CONSTREF(ContentBlockObj, content);
 
 
-    ADD_PROPERTY(CallableObj, cached); // circular?
+    // ADD_PROPERTY(CallableObj, cached); // circular?
 
   public:
 

src/compiler.cpp

@@ -41,32 +41,35 @@ namespace Sass {
 
   struct SassValue* get_global(struct SassCompiler* comp, struct SassValue* name)
   {
-    Value& value(Value::unwrap(name));
-    Compiler& compiler(Compiler::unwrap(comp));
-    ValueObj rv = compiler.findVariable(
-      value.assertString(compiler, "name")->getText(), true);
-    if (rv) rv->refcount += 1;
-    return rv ? Value::wrap(rv) : sass_make_null();
+    // Value& value(Value::unwrap(name));
+    // Compiler& compiler(Compiler::unwrap(comp));
+    // ValueObj rv = compiler.findVariable(
+    //   value.assertString(compiler, "name")->getText(), true);
+    // if (rv) rv->refcount += 1;
+    // return rv ? Value::wrap(rv) : sass_make_null();
+    return sass_make_null();
   }
 
   struct SassValue* get_lexical(struct SassCompiler* comp, struct SassValue* name)
   {
-    Value& value(Value::unwrap(name));
-    Compiler& compiler(Compiler::unwrap(comp));
-    ValueObj rv = compiler.findVariable(
-      value.assertString(compiler, "name")->getText());
-    if (rv) rv->refcount += 1;
-    return rv ? Value::wrap(rv) : sass_make_null();
+    // Value& value(Value::unwrap(name));
+    // Compiler& compiler(Compiler::unwrap(comp));
+    // ValueObj rv = compiler.findVariable(
+    //   value.assertString(compiler, "name")->getText());
+    // if (rv) rv->refcount += 1;
+    // return rv ? Value::wrap(rv) : sass_make_null();
+    return sass_make_null();
   }
 
   struct SassValue* get_local(struct SassCompiler* comp, struct SassValue* name)
   {
-    Value& value(Value::unwrap(name));
-    Compiler& compiler(Compiler::unwrap(comp));
-    ValueObj rv = compiler.findVariable(
-      value.assertString(compiler, "name")->getText());
-    if (rv) rv->refcount += 1;
-    return rv ? Value::wrap(rv) : sass_make_null();
+    // Value& value(Value::unwrap(name));
+    // Compiler& compiler(Compiler::unwrap(comp));
+    // ValueObj rv = compiler.findVariable(
+    //   value.assertString(compiler, "name")->getText());
+    // if (rv) rv->refcount += 1;
+    // return rv ? Value::wrap(rv) : sass_make_null();
+    return sass_make_null();
   }
 
   struct SassValue* set_global(struct SassCompiler* comp, struct SassValue* name, struct SassValue* value)

src/compiler.hpp

@@ -65,18 +65,8 @@ namespace Sass {
     // and (custom) functions plus mixins are registered.
     EnvRoot varRoot; // Must be after varStack!
 
-    // Get the value object for the variable by [name] on runtime.
-    // If [global] flag is given, we 
-    ValueObj findVariable(const EnvKey& name, bool global = false) {
-      return varRoot.findVariable(name, global);
-    }
-
-    EnvIdx setVariable(const EnvKey& name, bool guarded, bool global) {
-      return varRoot.setVariable(name, guarded, global);
-    }
-
     // Functions only for evaluation phase (C-API functions and eval itself)
-    CallableObj* findFunction(const EnvKey& name) { return varRoot.findFunction(name); }
+    // CallableObj* findFunction(const EnvKey& name) { return varRoot.findFunction(name); }
 
     // The current state the compiler is in.
     enum SassCompilerState state;

src/environment.cpp

@@ -153,10 +153,8 @@ namespace Sass {
 
     if (a->ns().empty()) {
 
-      a->vidx2(compiler.varRoot.setVariable(
-        a->variable(),
-        a->is_default(),
-        a->is_global()));
+      a->vidx2(compiler.varRoot.findVarIdx(
+        a->variable(), a->ns(), a->is_global()));
       assigne = &compiler.varRoot.getVariable(a->vidx2());
       if (!result) result = a->value()->accept(this);
       compiler.varRoot.setVariable(