Improves @warn and @debug message to match ruby sass

Moved static get_cwd function to Sass::File namespace

Author: mgreter

backtrace.hpp

@@ -6,6 +6,10 @@
 #include "position.hpp"
 #endif
 
+#ifndef SASS_FILE
+#include "file.hpp"
+#endif
+
 namespace Sass {
 
   using namespace std;
@@ -26,19 +30,35 @@ namespace Sass {
 
     string to_string(bool warning = false)
     {
+      size_t i = -1;
       stringstream ss;
+      string cwd(Sass::File::get_cwd());
       Backtrace* this_point = this;
 
       if (!warning) ss << endl << "Backtrace:";
       // the first tracepoint (which is parent-less) is an empty placeholder
       while (this_point->parent) {
-        ss << endl
-           << "\t"
-           << (warning ? " " : "")
-           << this_point->path
-           << ":"
-           << this_point->position.line
-           << this_point->parent->caller;
+
+        // make path relative to the current directory
+        string rel_path(Sass::File::resolve_relative_path(this_point->path, cwd, cwd));
+
+        if (warning) {
+          ss << endl
+             << "\t"
+             << (++i == 0 ? "on" : "from")
+             << " line "
+             << this_point->position.line
+             << " of "
+             << rel_path;
+        } else {
+          ss << endl
+             << "\t"
+             << rel_path
+             << ":"
+             << this_point->position.line
+             << this_point->parent->caller;
+        }
+
         this_point = this_point->parent;
       }
 

context.cpp

@@ -1,9 +1,6 @@
 #ifdef _WIN32
-#include <direct.h>
-#define getcwd _getcwd
 #define PATH_SEP ';'
 #else
-#include <unistd.h>
 #define PATH_SEP ':'
 #endif
 
@@ -359,15 +356,7 @@ namespace Sass {
 
   string Context::get_cwd()
   {
-    const size_t wd_len = 1024;
-    char wd[wd_len];
-    string cwd = getcwd(wd, wd_len);
-#ifdef _WIN32
-    //convert backslashes to forward slashes
-    replace(cwd.begin(), cwd.end(), '\\', '/');
-#endif
-    if (cwd[cwd.length() - 1] != '/') cwd += '/';
-    return cwd;
+    return Sass::File::get_cwd();
   }
 
   void register_function(Context& ctx, Signature sig, Native_Function f, Env* env)

context.hpp

@@ -114,7 +114,7 @@ namespace Sass {
 
     Context(Data);
     ~Context();
-    string get_cwd();
+    static string get_cwd();
     void setup_color_map();
     string add_file(string);
     Block* parse_file();

eval.cpp

@@ -1,3 +1,4 @@
+#include "file.hpp"
 #include "eval.hpp"
 #include "ast.hpp"
 #include "bind.hpp"
@@ -211,10 +212,9 @@ namespace Sass {
 
     }
 
-    string prefix("WARNING: ");
     string result(unquote(message->perform(&to_string)));
-    cerr << prefix << result;
     Backtrace top(backtrace, w->path(), w->position(), "");
+    cerr << "WARNING: " << result;
     cerr << top.to_string(true);
     cerr << endl << endl;
     return 0;
@@ -243,15 +243,45 @@ namespace Sass {
 
     }
 
-    string prefix("Error: ");
     string result(unquote(message->perform(&to_string)));
-    cerr << prefix << result;
     Backtrace top(backtrace, e->path(), e->position(), "");
+    cerr << "Error: " << result;
     cerr << top.to_string(true);
     cerr << endl << endl;
     return 0;
   }
 
+  Expression* Eval::operator()(Debug* d)
+  {
+    Expression* message = d->value()->perform(this);
+    To_String to_string;
+
+    // try to use generic function
+    if (env->has("@debug[f]")) {
+
+      Definition* def = static_cast<Definition*>((*env)["@debug[f]"]);
+      // Block*          body   = def->block();
+      // Native_Function func   = def->native_function();
+      Sass_C_Function c_func = def->c_function();
+
+      To_C to_c;
+      union Sass_Value* c_args = sass_make_list(1, SASS_COMMA);
+      sass_list_set_value(c_args, 0, message->perform(&to_c));
+      Sass_Value* c_val = c_func(c_args, def->cookie());
+      sass_delete_value(c_args);
+      sass_delete_value(c_val);
+      return 0;
+
+    }
+
+    string cwd(ctx.get_cwd());
+    string result(unquote(message->perform(&to_string)));
+    string rel_path(Sass::File::resolve_relative_path(d->path(), cwd, cwd));
+    cerr << rel_path << ":" << d->position().line << ":" << " DEBUG: " << result;
+    cerr << endl;
+    return 0;
+  }
+
   Expression* Eval::operator()(List* l)
   {
     if (l->is_expanded()) return l;

file.cpp

@@ -1,5 +1,9 @@
 #ifdef _WIN32
+#include <direct.h>
+#define getcwd _getcwd
 #define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
+#else
+#include <unistd.h>
 #endif
 
 #include <iostream>
@@ -28,6 +32,19 @@ namespace Sass {
   namespace File {
     using namespace std;
 
+    string get_cwd()
+    {
+      const size_t wd_len = 1024;
+      char wd[wd_len];
+      string cwd = getcwd(wd, wd_len);
+#ifdef _WIN32
+      //convert backslashes to forward slashes
+      replace(cwd.begin(), cwd.end(), '\\', '/');
+#endif
+      if (cwd[cwd.length() - 1] != '/') cwd += '/';
+      return cwd;
+    }
+
     // no physical check on filesystem
     // only a logical cleanup of a path
     string make_canonical_path (string path)

file.hpp

@@ -4,6 +4,7 @@ namespace Sass {
   using namespace std;
   struct Context;
   namespace File {
+    string get_cwd();
     string base_name(string);
     string dir_name(string);
     string join_paths(string, string);

operation.hpp

@@ -26,7 +26,7 @@ namespace Sass {
     virtual T operator()(Import_Stub* x)            = 0;
     virtual T operator()(Warning* x)                = 0;
     virtual T operator()(Error* x)                  = 0;
-    virtual T operator()(Debug* x)                = 0;
+    virtual T operator()(Debug* x)                  = 0;
     virtual T operator()(Comment* x)                = 0;
     virtual T operator()(If* x)                     = 0;
     virtual T operator()(For* x)                    = 0;