Implement get-function inheritance

Author: mgreter

src/extender.cpp

@@ -2,6 +2,7 @@
 
 #include "permutate.hpp"
 #include "callstack.hpp"
+#include "exceptions.hpp"
 #include "dart_helpers.hpp"
 #include "ast_selectors.hpp"
 
@@ -70,10 +71,10 @@ namespace Sass {
 
     for (auto complex : targets->elements()) {
 
-      // This seems superfluous, check is done before!?
-      // if (complex->length() != 1) {
-      //   error("complex selectors may not be extended.", complex->pstate(), traces);
-      // }
+      if (complex->size() > 1) {
+        throw Exception::RuntimeException(traces,
+          "complex selectors may not be extended.");
+      }
 
       if (const CompoundSelector* compound = complex->first()->isaCompoundSelector()) {
 
@@ -94,6 +95,11 @@ namespace Sass {
         selector = extender.extendList(selector, extensions, {});
 
       }
+      else {
+        throw Exception::RuntimeException(traces,
+          "combinators cannot be extended.");
+
+      }
 
     }
 

src/fn_maps.cpp

@@ -211,6 +211,7 @@ namespace Sass {
       void registerFunctions(Compiler& ctx)
       {
         Module& module(ctx.createModule("map"));
+        // module.addFunction("get", ctx.registerBuiltInFunction("map-get", "$map, $key", set));
         module.addFunction("get", ctx.registerBuiltInFunction("map-get", "$map, $key", get));
         module.addFunction("merge", ctx.registerBuiltInFunction("map-merge", "$map1, $map2", merge));
         module.addFunction("remove", ctx.registerBuiltInOverloadFns("map-remove", {

src/fn_meta.cpp

@@ -289,20 +289,78 @@ namespace Sass {
 
         String* name = arguments[0]->assertString(compiler, Sass::Strings::name);
         bool css = arguments[1]->isTruthy(); // supports all values
-        String* plugin = arguments[2]->assertStringOrNull(compiler, Sass::Strings::module);
+        String* ns = arguments[2]->assertStringOrNull(compiler, Sass::Strings::module);
 
-        if (css && plugin != nullptr) {
+        if (css && ns != nullptr) {
           throw Exception::RuntimeException(compiler,
             "$css and $module may not both be passed at once.");
         }
 
-        CallableObj callable = css
-          ? SASS_MEMORY_NEW(PlainCssCallable, pstate, name->value())
-          : _getFunction(name->value(), compiler);
+        if (css) {
+          return SASS_MEMORY_NEW(Function, pstate,
+            SASS_MEMORY_NEW(PlainCssCallable, pstate,
+              name->value()));
+        }
+
+        // CallableObj callable = css
+        //   ? SASS_MEMORY_NEW(PlainCssCallable, pstate, name->value())
+        //   : _getFunction(name->value(), compiler);
+
+
+        CallableObj callable;
 
-        if (callable == nullptr) throw
-          Exception::RuntimeException(compiler,
-            "Function not found: " + name->value());
+        auto parent = compiler.varStack.back()->getModule();
+
+        if (ns != nullptr) {
+          auto pp = parent->fwdModule33.find(ns->value());
+          if (pp != parent->fwdModule33.end()) {
+            VarRefs* module = pp->second.first;
+            auto it = module->fnIdxs.find(name->value());
+            if (it != module->fnIdxs.end()) {
+              VarRef fidx({ module->fnFrame, it->second });
+              callable = compiler.varRoot.getFunction(fidx);
+            }
+          }
+          else {
+            throw Exception::RuntimeException(compiler,
+              "There is no module with the namespace \"" + ns->value() + "\".");
+          }
+        }
+        else {
+
+          callable = _getFunction(name->value(), compiler);
+
+          if (!callable) {
+
+            for (auto asd : parent->fwdGlobal33) {
+              VarRefs* global = asd.first;
+              auto it = global->fnIdxs.find(name->value());
+              if (it != global->fnIdxs.end()) {
+                if (callable) {
+                  throw Exception::RuntimeException(compiler,
+                    "This function is available from multiple global modules.");
+                }
+                VarRef fidx({ global->fnFrame, it->second });
+                callable = compiler.varRoot.getFunction(fidx);
+                if (callable) break;
+              }
+            }
+          }
+        }
+
+
+        if (callable == nullptr) {
+          if (name->hasQuotes()) {
+            throw
+              Exception::RuntimeException(compiler,
+                "Function not found: \"" + name->value() + "\"");
+          }
+          else {
+            throw
+              Exception::RuntimeException(compiler,
+                "Function not found: " + name->value() + "");
+          }
+        }
 
         return SASS_MEMORY_NEW(Function, pstate, callable);