Cleanup some allocator code paths

mgreter · mgreter · commit 5aae535a6dbf · 2019-11-14T04:51:03.000+01:00
- Remove unused allocator functions
- Fix return type of wstring_to_string
- Use `sass::ostream` instead of `sass::sstream`
diff --git a/src/backtrace.cpp b/src/backtrace.cpp
@@ -4,7 +4,7 @@ namespace Sass {
 
   const sass::string traces_to_string(Backtraces traces, sass::string indent) {
 
-    sass::sstream ss;
+    sass::ostream ss;
     sass::string cwd(File::get_cwd());
 
     bool first = true;
diff --git a/src/bind.cpp b/src/bind.cpp
@@ -52,7 +52,7 @@ namespace Sass {
             }
           }
         }
-        sass::sstream msg;
+        sass::ostream msg;
         msg << "wrong number of arguments (" << LA << " for " << LP << ")";
         msg << " for `" << name << "'";
         return error(msg.str(), as->pstate(), traces);
@@ -189,7 +189,7 @@ namespace Sass {
         } else {
           if (arglist->length() > LP - ip && !ps->has_rest_parameter()) {
             size_t arg_count = (arglist->length() + LA - 1);
-            sass::sstream msg;
+            sass::ostream msg;
             msg << callee << " takes " << LP;
             msg << (LP == 1 ? " argument" : " arguments");
             msg << " but " << arg_count;
@@ -229,7 +229,7 @@ namespace Sass {
           sass::string param = "$" + unquote(val->value());
 
           if (!param_map.count(param)) {
-            sass::sstream msg;
+            sass::ostream msg;
             msg << callee << " has no parameter named " << param;
             error(msg.str(), a->pstate(), traces);
           }
@@ -243,7 +243,7 @@ namespace Sass {
 
       if (a->name().empty()) {
         if (env->has_local(p->name())) {
-          sass::sstream msg;
+          sass::ostream msg;
           msg << "parameter " << p->name()
           << " provided more than once in call to " << callee;
           error(msg.str(), a->pstate(), traces);
@@ -258,21 +258,21 @@ namespace Sass {
           if (ps->has_rest_parameter()) {
             varargs->append(a);
           } else {
-            sass::sstream msg;
+            sass::ostream msg;
             msg << callee << " has no parameter named " << a->name();
             error(msg.str(), a->pstate(), traces);
           }
         }
         if (param_map[a->name()]) {
           if (param_map[a->name()]->is_rest_parameter()) {
-            sass::sstream msg;
+            sass::ostream msg;
             msg << "argument " << a->name() << " of " << callee
                 << "cannot be used as named argument";
             error(msg.str(), a->pstate(), traces);
           }
         }
         if (env->has_local(a->name())) {
-          sass::sstream msg;
+          sass::ostream msg;
           msg << "parameter " << p->name()
               << "provided more than once in call to " << callee;
           error(msg.str(), a->pstate(), traces);
diff --git a/src/context.cpp b/src/context.cpp
@@ -334,7 +334,7 @@ namespace Sass {
 
     // error nicely on ambiguous imp_path
     if (resolved.size() > 1) {
-      sass::sstream msg_stream;
+      sass::ostream msg_stream;
       msg_stream << "It's not clear which file to import for ";
       msg_stream << "'@import \"" << imp.imp_path << "\"'." << "\n";
       msg_stream << "Candidates:" << "\n";
@@ -423,7 +423,7 @@ namespace Sass {
           // create unique path to use as key
           sass::string uniq_path = load_path;
           if (!only_one && count) {
-            sass::sstream path_strm;
+            sass::ostream path_strm;
             path_strm << uniq_path << ":" << count;
             uniq_path = path_strm.str();
           }
@@ -676,7 +676,7 @@ namespace Sass {
   {
     sass::string map = emitter.render_srcmap(*this);
     sass::istream is( map.c_str() );
-    sass::sstream buffer;
+    sass::ostream buffer;
     base64::encoder E;
     E.encode(is, buffer);
     sass::string url = "data:application/json;base64," + buffer.str();
@@ -722,7 +722,7 @@ namespace Sass {
   void register_function(Context& ctx, Signature sig, Native_Function f, size_t arity, Env* env)
   {
     Definition* def = make_native_function(sig, f, ctx);
-    sass::sstream ss;
+    sass::ostream ss;
     ss << def->name() << "[f]" << arity;
     def->environment(env);
     (*env)[ss.str()] = def;
diff --git a/src/eval.cpp b/src/eval.cpp
@@ -184,7 +184,7 @@ namespace Sass {
     Number_Obj sass_end = Cast<Number>(high);
     // check if units are valid for sequence
     if (sass_start->unit() != sass_end->unit()) {
-      sass::sstream msg; msg << "Incompatible units: '"
+      sass::ostream msg; msg << "Incompatible units: '"
         << sass_end->unit() << "' and '"
         << sass_start->unit() << "'.";
       error(msg.str(), low->pstate(), traces);
@@ -1010,7 +1010,7 @@ namespace Sass {
     if (c->func()) def = c->func()->definition();
 
     if (def->is_overload_stub()) {
-      sass::sstream ss;
+      sass::ostream ss;
       size_t L = args->length();
       // account for rest arguments
       if (args->has_rest_argument() && args->length() > 0) {
diff --git a/src/expand.cpp b/src/expand.cpp
@@ -531,7 +531,7 @@ namespace Sass {
     Number_Obj sass_end = Cast<Number>(high);
     // check if units are valid for sequence
     if (sass_start->unit() != sass_end->unit()) {
-      sass::sstream msg; msg << "Incompatible units: '"
+      sass::ostream msg; msg << "Incompatible units: '"
         << sass_start->unit() << "' and '"
         << sass_end->unit() << "'.";
       error(msg.str(), low->pstate(), traces);
@@ -698,7 +698,7 @@ namespace Sass {
 
           if (compound->length() != 1) {
 
-            sass::sstream sels; bool addComma = false;
+            sass::ostream sels; bool addComma = false;
             sels << "Compound selectors may no longer be extended.\n";
             sels << "Consider `@extend ";
             for (auto sel : compound->elements()) {
diff --git a/src/file.cpp b/src/file.cpp
@@ -32,7 +32,7 @@
 
 # ifdef _MSC_VER
 # include <codecvt>
-inline static std::string wstring_to_string(const std::wstring& wstr)
+inline static Sass::sass::string wstring_to_string(const std::wstring& wstr)
 {
     std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> wchar_converter;
     return wchar_converter.to_bytes(wstr);
@@ -68,7 +68,7 @@ namespace Sass {
         wchar_t wd[wd_len];
         wchar_t* pwd = _wgetcwd(wd, wd_len);
         if (pwd == NULL) throw Exception::OperationError("cwd gone missing");
-        sass::string cwd = wstring_to_string(pwd).c_str();
+        sass::string cwd = wstring_to_string(pwd);
         //convert backslashes to forward slashes
         replace(cwd.begin(), cwd.end(), '\\', '/');
       #endif
diff --git a/src/fn_colors.cpp b/src/fn_colors.cpp
@@ -104,7 +104,7 @@ namespace Sass {
       if (
         string_argument(env["$alpha"])
       ) {
-        sass::sstream strm;
+        sass::ostream strm;
         strm << "rgba("
                  << (int)c_arg->r() << ", "
                  << (int)c_arg->g() << ", "
@@ -579,7 +579,7 @@ namespace Sass {
       double b = clip(c->b(), 0.0, 255.0);
       double a = clip(c->a(), 0.0, 1.0) * 255.0;
 
-      sass::sstream ss;
+      sass::ostream ss;
       ss << '#' << std::setw(2) << std::setfill('0');
       ss << std::hex << std::setw(2) << static_cast<unsigned long>(Sass::round(a, ctx.c_options.precision));
       ss << std::hex << std::setw(2) << static_cast<unsigned long>(Sass::round(r, ctx.c_options.precision));
diff --git a/src/fn_numbers.cpp b/src/fn_numbers.cpp
@@ -154,13 +154,13 @@ namespace Sass {
       if (l) {
         double lv = l->value();
         if (lv < 1) {
-          sass::sstream err;
+          sass::ostream err;
           err << "$limit " << lv << " must be greater than or equal to 1 for `random'";
           error(err.str(), pstate, traces);
         }
         bool eq_int = std::fabs(trunc(lv) - lv) < NUMBER_EPSILON;
         if (!eq_int) {
-          sass::sstream err;
+          sass::ostream err;
           err << "Expected $limit to be an integer but got " << lv << " for `random'";
           error(err.str(), pstate, traces);
         }
@@ -184,7 +184,7 @@ namespace Sass {
     Signature unique_id_sig = "unique-id()";
     BUILT_IN(unique_id)
     {
-      sass::sstream ss;
+      sass::ostream ss;
       std::uniform_real_distribution<> distributor(0, 4294967296); // 16^8
       uint_fast32_t distributed = static_cast<uint_fast32_t>(distributor(rand));
       ss << "u" << std::setfill('0') << std::setw(8) << std::hex << distributed;
diff --git a/src/fn_utils.cpp b/src/fn_utils.cpp
@@ -71,7 +71,7 @@ namespace Sass {
       tmpnr.reduce();
       double v = tmpnr.value();
       if (!(lo <= v && v <= hi)) {
-        sass::sstream msg;
+        sass::ostream msg;
         msg << "argument `" << argname << "` of `" << sig << "` must be between ";
         msg << lo << " and " << hi;
         error(msg.str(), pstate, traces);
@@ -121,7 +121,7 @@ namespace Sass {
     SelectorListObj get_arg_sels(const sass::string& argname, Env& env, Signature sig, SourceSpan pstate, Backtraces traces, Context& ctx) {
       ExpressionObj exp = ARG(argname, Expression);
       if (exp->concrete_type() == Expression::NULL_VAL) {
-        sass::sstream msg;
+        sass::ostream msg;
         msg << argname << ": null is not a valid selector: it must be a string,\n";
         msg << "a list of strings, or a list of lists of strings for `" << function_name(sig) << "'";
         error(msg.str(), exp->pstate(), traces);
@@ -136,7 +136,7 @@ namespace Sass {
     CompoundSelectorObj get_arg_sel(const sass::string& argname, Env& env, Signature sig, SourceSpan pstate, Backtraces traces, Context& ctx) {
       ExpressionObj exp = ARG(argname, Expression);
       if (exp->concrete_type() == Expression::NULL_VAL) {
-        sass::sstream msg;
+        sass::ostream msg;
         msg << argname << ": null is not a string for `" << function_name(sig) << "'";
         error(msg.str(), exp->pstate(), traces);
       }
diff --git a/src/inspect.cpp b/src/inspect.cpp
@@ -570,7 +570,7 @@ namespace Sass {
     // reduce units
     n->reduce();
 
-    sass::sstream ss;
+    sass::ostream ss;
     ss.precision(opt.precision);
     ss << std::fixed << n->value();
 
@@ -627,7 +627,7 @@ namespace Sass {
   void Inspect::operator()(Color_RGBA* c)
   {
     // output the final token
-    sass::sstream ss;
+    sass::ostream ss;
 
     // original color name
     // maybe an unknown token
@@ -656,7 +656,7 @@ namespace Sass {
         res_name = color_to_name(numval);
     }
 
-    sass::sstream hexlet;
+    sass::ostream hexlet;
     // dart sass compressed all colors in regular css always
     // ruby sass and libsass does it only when not delayed
     // since color math is going to be removed, this can go too
diff --git a/src/memory/allocator.hpp b/src/memory/allocator.hpp
@@ -16,8 +16,6 @@ namespace Sass {
 #ifndef SASS_CUSTOM_ALLOCATOR
 
   template <typename T> using Allocator = std::allocator<T>;
-  inline void* allocateMem(size_t size) { return malloc(size); }
-  inline void deallocateMem(void* ptr, size_t = 1) { free(ptr); }
 
 #else
 
diff --git a/src/output.cpp b/src/output.cpp
@@ -135,7 +135,7 @@ namespace Sass {
       indentation += r->tabs();
     }
     if (opt.source_comments) {
-      sass::sstream ss;
+      sass::ostream ss;
       append_indentation();
       sass::string path(File::abs2rel(r->pstate().path));
       ss << "/* line " << r->pstate().line + 1 << ", " << path << " */";
diff --git a/src/sass_context.cpp b/src/sass_context.cpp
@@ -11,7 +11,7 @@
 // C++ helper
 namespace Sass {
   // see sass_copy_c_string(sass::string str)
-  static inline JsonNode* json_mkstream(const sass::sstream& stream)
+  static inline JsonNode* json_mkstream(const sass::ostream& stream)
   {
     // hold on to string on stack!
     sass::string str(stream.str());
@@ -20,7 +20,7 @@ namespace Sass {
 
   static void handle_string_error(Sass_Context* c_ctx, const sass::string& msg, int severety)
   {
-    sass::sstream msg_stream;
+    sass::ostream msg_stream;
     JsonNode* json_err = json_mkobject();
     msg_stream << "Internal Error: " << msg << std::endl;
     json_append_member(json_err, "status", json_mknumber(severety));
@@ -41,7 +41,7 @@ namespace Sass {
       throw;
     }
     catch (Exception::Base& e) {
-      sass::sstream msg_stream;
+      sass::ostream msg_stream;
       sass::string cwd(Sass::File::get_cwd());
       sass::string msg_prefix(e.errtype());
       bool got_newline = false;
@@ -128,7 +128,7 @@ namespace Sass {
       json_delete(json_err);
     }
     catch (std::bad_alloc& ba) {
-      sass::sstream msg_stream;
+      sass::ostream msg_stream;
       msg_stream << "Unable to allocate memory: " << ba.what();
       handle_string_error(c_ctx, msg_stream.str(), 2);
     }
