[WIP] [DNM] Backport dart sass parser 14

Author: mgreter

src/ast.cpp

@@ -601,6 +601,7 @@ namespace Sass {
     c_function_(ptr->c_function_),
     cookie_(ptr->cookie_),
     is_overload_stub_(ptr->is_overload_stub_),
+    defaultParams_(ptr->defaultParams_),
     signature_(ptr->signature_)
   { }
 
@@ -618,6 +619,7 @@ namespace Sass {
     c_function_(0),
     cookie_(0),
     is_overload_stub_(false),
+    defaultParams_(0),
     signature_(0)
   { }
 
@@ -636,6 +638,7 @@ namespace Sass {
     c_function_(0),
     cookie_(0),
     is_overload_stub_(overload_stub),
+    defaultParams_(0),
     signature_(sig)
   { }
 
@@ -653,6 +656,7 @@ namespace Sass {
     c_function_(c_func),
     cookie_(sass_function_get_cookie(c_func)),
     is_overload_stub_(false),
+    defaultParams_(0),
     signature_(sig)
   { }
 

src/ast.hpp

@@ -827,6 +827,7 @@ namespace Sass {
     ADD_PROPERTY(Sass_Function_Entry, c_function)
     ADD_PROPERTY(void*, cookie)
     ADD_PROPERTY(bool, is_overload_stub)
+    ADD_PROPERTY(size_t, defaultParams)
     ADD_PROPERTY(Signature, signature)
   public:
     Definition(ParserState pstate,

src/bind.cpp

@@ -57,8 +57,11 @@ namespace Sass {
           }
         }
         std::stringstream msg;
-        msg << "wrong number of arguments (" << LA << " for " << LP << ")";
-        msg << " for `" << name << "'";
+        msg << "Only " << LP << " ";
+        msg << (LP == 1 ? "argument" : "arguments");
+        msg << " allowed, but " << LA << " ";
+        msg << (LA <= 1 ? "was" : "were");
+        msg << " passed.";
         return error(msg.str(), as->pstate(), traces);
       }
       Parameter_Obj p = ps->at(ip);
@@ -243,7 +246,7 @@ namespace Sass {
 
           if (!param_map.count(param)) {
             std::stringstream msg;
-            msg << callee << " has no parameter named " << param;
+            msg << "No argument named " << param << ".";
             error(msg.str(), a->pstate(), traces);
           }
           env->local_frame()[param] = argmap->at(key);
@@ -272,7 +275,7 @@ namespace Sass {
             varargs->append(a);
           } else {
             std::stringstream msg;
-            msg << callee << " has no parameter named " << a->name();
+            msg << "No argument named " << a->name() << ".";
             error(msg.str(), a->pstate(), traces);
           }
         }

src/context.cpp

@@ -512,7 +512,7 @@ namespace Sass {
 
   void register_function(Context&, Signature sig, Native_Function f, Env* env);
   void register_function(Context&, Signature sig, Native_Function f, size_t arity, Env* env);
-  void register_overload_stub(Context&, std::string name, Env* env);
+  void register_overload_stub(Context&, std::string name, Env* env, size_t defaultParams);
   void register_built_in_functions(Context&, Env* env);
   void register_c_functions(Context&, Env* env, Sass_Function_List);
   void register_c_function(Context&, Env* env, Sass_Function_Entry);
@@ -763,7 +763,7 @@ namespace Sass {
     (*env)[ss.str()] = def;
   }
 
-  void register_overload_stub(Context& ctx, std::string name, Env* env)
+  void register_overload_stub(Context& ctx, std::string name, Env* env, size_t defaultParams)
   {
     Definition* stub = SASS_MEMORY_NEW(Definition,
                                        ParserState("[built-in function]"),
@@ -772,6 +772,7 @@ namespace Sass {
                                        {},
                                        0,
                                        true);
+    stub->defaultParams(defaultParams);
     (*env)[name + "[f]"] = stub;
   }
 
@@ -781,7 +782,7 @@ namespace Sass {
     using namespace Functions;
     // RGB Functions
     register_function(ctx, rgb_sig, rgb, env);
-    register_overload_stub(ctx, "rgba", env);
+    register_overload_stub(ctx, "rgba", env, 4);
     register_function(ctx, rgba_4_sig, rgba_4, 4, env);
     register_function(ctx, rgba_2_sig, rgba_2, 2, env);
     register_function(ctx, red_sig, red, env);

src/error_handling.cpp

@@ -41,15 +41,15 @@ namespace Sass {
     InvalidArgumentType::InvalidArgumentType(ParserState pstate, Backtraces traces, std::string fn, std::string arg, std::string type, const Value* value)
     : Base(pstate, def_msg, traces), fn(fn), arg(arg), type(type), value(value)
     {
-      msg = arg + ": \"";
+      msg = arg + ": ";
       if (value) msg += value->to_string(Sass_Inspect_Options());
-      msg += "\" is not a " + type + " for `" + fn + "'";
+      msg += " is not a " + type + ".";
     }
 
     MissingArgument::MissingArgument(ParserState pstate, Backtraces traces, std::string fn, std::string arg, std::string fntype)
     : Base(pstate, def_msg, traces), fn(fn), arg(arg), fntype(fntype)
     {
-      msg = fntype + " " + fn + " is missing argument " + arg + ".";
+      msg = "Missing argument " + arg + ".";
     }
 
     InvalidCss::InvalidCss(ParserState pstate, Backtraces traces, std::string msg)

src/eval.cpp

@@ -1079,7 +1079,16 @@ namespace Sass {
       std::string resolved_name(ss.str());
       if (!env->has(resolved_name)) resolved_name = full_name + "*";
       // std::cerr << "CALLING " << resolved_name << "\n";
-      if (!env->has(resolved_name)) error("overloaded function `" + std::string(c->name()) + "` given wrong number of arguments", c->pstate(), traces);
+      if (!env->has(resolved_name)) {
+        size_t LP = def->defaultParams();
+        std::stringstream msg;
+        msg << "Only " << LP << " ";
+        msg << (LP == 1 ? "argument" : "arguments");
+        msg << " allowed, but " << L << " ";
+        msg << (L <= 1 ? "was" : "were");
+        msg << " passed.";
+        error(msg.str(), c->pstate(), traces);
+      }
       def = Cast<Definition>((*env)[resolved_name]);
 
     }