Remove using namespace std from source

Add new `sass.hpp` header for minimal std includes and
exporting only specific symbols from std into our `Sass`
namespace. Also removed some redundant includes!

include/sass.h

@@ -1,5 +1,5 @@
-#ifndef SASS_H
-#define SASS_H
+#ifndef SASS_C_H
+#define SASS_C_H
 
 // #define DEBUG 1
 

include/sass2scss.h

@@ -32,13 +32,14 @@
 #define SASS2SCSS_VERSION "1.0.3"
 #endif
 
-// using std::string
-using namespace std;
-
 // add namespace for c++
 namespace Sass
 {
 
+	using std::stack;
+	using std::string;
+	using std::stringstream;
+
 	// pretty print options
 	const int SASS2SCSS_PRETTIFY_0 = 0;
 	const int SASS2SCSS_PRETTIFY_1 = 1;

src/ast.cpp

@@ -1,4 +1,5 @@
 #include "ast.hpp"
+#include "sass.hpp"
 #include "context.hpp"
 #include "node.hpp"
 #include "extend.hpp"
@@ -10,7 +11,6 @@
 #include <iostream>
 
 namespace Sass {
-  using namespace std;
 
   static Null sass_null(Sass::Null(ParserState("null")));
 
@@ -1451,6 +1451,10 @@ namespace Sass {
 
   string Color::to_string(bool compressed, int precision) const
   {
+    using std::hex;
+    using std::setw;
+    using std::setfill;
+
     stringstream ss;
 
     // original color name
@@ -1550,8 +1554,8 @@ namespace Sass {
     // check if we got scientific notation in result
     if (ss.str().find_first_of("e") != string::npos) {
       ss.clear(); ss.str(string());
-      ss.precision(max(12, precision));
-      ss << fixed << value_;
+      ss.precision(std::max(12, precision));
+      ss << std::fixed << value_;
     }
 
     string tmp = ss.str();
@@ -1567,7 +1571,7 @@ namespace Sass {
     if (is_int)
     {
       ss.precision(0);
-      ss << fixed << value_;
+      ss << std::fixed << value_;
       res = string(ss.str());
     }
     // process floats
@@ -1578,7 +1582,7 @@ namespace Sass {
       { precision = pos_fract - pos_point; }
       // round value again
       ss.precision(precision);
-      ss << fixed << value_;
+      ss << std::fixed << value_;
       res = string(ss.str());
       // maybe we truncated up to decimal point
       size_t pos = res.find_last_not_of("0");

src/ast.hpp

@@ -3,9 +3,6 @@
 
 #include <set>
 #include <deque>
-#include <vector>
-#include <string>
-#include <sstream>
 #include <iostream>
 #include <typeinfo>
 #include <algorithm>
@@ -30,6 +27,7 @@
 
 #endif
 
+#include "sass.hpp"
 #include "util.hpp"
 #include "units.hpp"
 #include "context.hpp"
@@ -52,7 +50,6 @@
 #include "sass_functions.h"
 
 namespace Sass {
-  using namespace std;
 
   // from boost (functional/hash):
   // http://www.boost.org/doc/libs/1_35_0/doc/html/hash/combine.html
@@ -173,7 +170,12 @@ namespace std {
 }
 
 namespace Sass {
-  using namespace std;
+
+  using std::deque;
+  using std::make_pair;
+  using std::istringstream;
+  using std::ostringstream;
+  using std::unordered_map;
 
   /////////////////////////////////////////////////////////////////////////////
   // Mixin class for AST nodes that should behave like vectors. Uses the

src/ast_factory.hpp

@@ -6,7 +6,6 @@
 #include "ast.hpp"
 
 namespace Sass {
-  using namespace std;
 
   class AST_Factory {
     vector<AST_Node*> nodes;

src/backtrace.hpp

@@ -1,15 +1,12 @@
 #ifndef SASS_BACKTRACE_H
 #define SASS_BACKTRACE_H
 
-#include <sstream>
-
+#include "sass.hpp"
 #include "file.hpp"
 #include "position.hpp"
 
 namespace Sass {
 
-  using namespace std;
-
   struct Backtrace {
 
     Backtrace*  parent;

src/bind.cpp

@@ -1,5 +1,6 @@
 #include "bind.hpp"
 #include "ast.hpp"
+#include "sass.hpp"
 #include "context.hpp"
 #include "eval.hpp"
 #include <map>
@@ -8,7 +9,6 @@
 #include "to_string.hpp"
 
 namespace Sass {
-  using namespace std;
 
   void bind(string callee, Parameters* ps, Arguments* as, Context& ctx, Env* env, Eval* eval)
   {

src/bind.hpp

@@ -1,7 +1,6 @@
 #ifndef SASS_BIND_H
 #define SASS_BIND_H
 
-#include <string>
 #include "environment.hpp"
 
 namespace Sass {

src/context.cpp

@@ -34,11 +34,10 @@
 #include "emitter.hpp"
 
 namespace Sass {
-  using namespace Constants;
-  using namespace File;
-  using namespace Sass;
-  using std::cerr;
-  using std::endl;
+
+  using std::unordered_map;
+  using File::make_canonical_path;
+  using File::resolve_relative_path;
 
   Sass_Queued::Sass_Queued(const string& load_path, const string& abs_path, const char* source)
   {

src/context.hpp

@@ -1,13 +1,12 @@
 #ifndef SASS_CONTEXT_H
 #define SASS_CONTEXT_H
 
-#include <string>
-#include <vector>
 #include <map>
 
 #define BUFFERSIZE 255
 #include "b64/encode.h"
 
+#include "sass.hpp"
 #include "ast_fwd_decl.hpp"
 #include "kwd_arg_macros.hpp"
 #include "memory_manager.hpp"
@@ -21,7 +20,7 @@
 struct Sass_Function;
 
 namespace Sass {
-  using namespace std;
+
   struct Sass_Queued {
     string abs_path;
     string load_path;

src/cssize.hpp

@@ -10,7 +10,6 @@
 #include "environment.hpp"
 
 namespace Sass {
-  using namespace std;
 
   typedef Environment<AST_Node*> Env;
   struct Backtrace;

src/debugger.hpp

@@ -1,14 +1,9 @@
 #ifndef SASS_DEBUGGER_H
 #define SASS_DEBUGGER_H
 
-#include <string>
-#include <sstream>
 #include "node.hpp"
 #include "ast_fwd_decl.hpp"
 
-using namespace std;
-using namespace Sass;
-
 /*
 inline void debug_extenstion_map(Sass::ExtensionSubsetMap* map, string ind = "")
 {
@@ -68,6 +63,8 @@ inline string pstate_source_position(AST_Node* node)
 
 inline void debug_ast(AST_Node* node, string ind = "", Env* env = 0)
 {
+  using std::string;
+  using namespace Sass;
   if (node == 0) return;
   if (ind == "") cerr << "####################################################################\n";
   if (dynamic_cast<Bubble*>(node)) {

src/emitter.cpp

@@ -5,7 +5,6 @@
 #include "utf8_string.hpp"
 
 namespace Sass {
-  using namespace std;
 
   Emitter::Emitter(Context* ctx)
   : wbuf(),

src/emitter.hpp

@@ -1,13 +1,13 @@
 #ifndef SASS_EMITTER_H
 #define SASS_EMITTER_H
 
-#include <string>
+#include "sass.hpp"
 #include "source_map.hpp"
 #include "ast_fwd_decl.hpp"
 
 namespace Sass {
+
   class Context;
-  using namespace std;
 
   class Emitter {
 

src/environment.hpp

@@ -1,19 +1,17 @@
 #ifndef SASS_ENVIRONMENT_H
 #define SASS_ENVIRONMENT_H
 
-#include <string>
 #include <iostream>
 #include <map>
 
+#include "sass.hpp"
 #include "ast_fwd_decl.hpp"
 #include "ast_def_macros.hpp"
 #include "memory_manager.hpp"
 
 namespace Sass {
-  using std::string;
+
   using std::map;
-  using std::cerr;
-  using std::endl;
 
   template <typename T>
   class Environment {

src/error_handling.hpp

@@ -1,12 +1,9 @@
 #ifndef SASS_ERROR_HANDLING_H
 #define SASS_ERROR_HANDLING_H
 
-#include <string>
-
 #include "position.hpp"
 
 namespace Sass {
-  using namespace std;
 
   struct Backtrace;
 

src/eval.cpp

@@ -26,7 +26,6 @@
 #include "color_maps.hpp"
 
 namespace Sass {
-  using namespace std;
 
   inline double add(double x, double y) { return x + y; }
   inline double sub(double x, double y) { return x - y; }

src/eval.hpp

@@ -2,12 +2,12 @@
 #define SASS_EVAL_H
 
 #include <iostream>
+#include "sass.hpp"
 #include "context.hpp"
 #include "listize.hpp"
 #include "operation.hpp"
 
 namespace Sass {
-  using namespace std;
 
   class Expand;
   class Context;

src/expand.hpp

@@ -11,7 +11,6 @@
 #include "environment.hpp"
 
 namespace Sass {
-  using namespace std;
 
   class Listize;
   class Context;

src/extend.cpp

@@ -376,7 +376,7 @@ namespace Sass {
         if (comparator(x[i], y[j], pCompareOut)) {
           c[i][j] = c[i - 1][j - 1] + 1;
         } else {
-          c[i][j] = max(c[i][j - 1], c[i - 1][j]);
+          c[i][j] = std::max(c[i][j - 1], c[i - 1][j]);
         }
       }
     }
@@ -529,7 +529,7 @@ namespace Sass {
 
         for (SourcesSet::iterator sourcesSetIterator = sources.begin(), sourcesSetIteratorEnd = sources.end(); sourcesSetIterator != sourcesSetIteratorEnd; ++sourcesSetIterator) {
           const Complex_Selector* const pCurrentSelector = *sourcesSetIterator;
-          maxSpecificity = max(maxSpecificity, pCurrentSelector->specificity());
+          maxSpecificity = std::max(maxSpecificity, pCurrentSelector->specificity());
         }
 
         DEBUG_PRINTLN(TRIM, "MAX SPECIFICITY: " << maxSpecificity)

src/extend.hpp

@@ -11,7 +11,6 @@
 #include "subset_map.hpp"
 
 namespace Sass {
-  using namespace std;
 
   class Context;
   class Node;

src/file.cpp

@@ -18,6 +18,7 @@
 #include "sass2scss.h"
 
 #ifdef _WIN32
+#define NOMINMAX
 #include <windows.h>
 #endif
 
@@ -31,7 +32,8 @@
 
 namespace Sass {
   namespace File {
-    using namespace std;
+
+    using std::wstring;
 
     // return the current directory
     // always with forward slashes
@@ -84,7 +86,7 @@ namespace Sass {
         size_t pos_w = string::npos;
       #endif
       if (pos_p != string::npos && pos_w != string::npos) {
-        pos = max(pos_p, pos_w);
+        pos = std::max(pos_p, pos_w);
       }
       else if (pos_p != string::npos) {
         pos = pos_p;
@@ -188,7 +190,7 @@ namespace Sass {
       string stripped_base = "";
 
       size_t index = 0;
-      size_t minSize = min(absolute_uri.size(), absolute_base.size());
+      size_t minSize = std::min(absolute_uri.size(), absolute_base.size());
       for (size_t i = 0; i < minSize; ++i) {
         #ifdef FS_CASE_SENSITIVE
           if (absolute_uri[i] != absolute_base[i]) break;
@@ -299,6 +301,8 @@ namespace Sass {
     // will auto convert .sass files
     char* read_file(const string& path)
     {
+      using std::ios;
+      using std::ifstream;
       #ifdef _WIN32
         BYTE* pBuffer;
         DWORD dwBytes;