sassc 0.0.10 → 0.0.11

data/ext/libsass/context.hpp

@@ -18,7 +18,7 @@
 #include "plugins.hpp"
 #include "sass_functions.h"
 
-struct Sass_C_Function_Descriptor;
+struct Sass_Function;
 
 namespace Sass {
   using namespace std;
@@ -32,8 +32,11 @@ namespace Sass {
 
   class Context {
   public:
+    size_t head_imports;
     Memory_Manager<AST_Node> mem;
 
+    struct Sass_Options* c_options;
+    struct Sass_Compiler* c_compiler;
     const char* source_c_str;
 
     // c-strs containing Sass file contents
@@ -51,7 +54,14 @@ namespace Sass {
     map<string, Block*> style_sheets; // map of paths to ASTs
     // SourceMap source_map;
     Output emitter;
-    vector<Sass_C_Function_Callback> c_functions;
+
+    vector<Sass_Importer_Entry> c_headers;
+    vector<Sass_Importer_Entry> c_importers;
+    vector<Sass_Function_Entry> c_functions;
+
+    void add_c_header(Sass_Importer_Entry header);
+    void add_c_importer(Sass_Importer_Entry importer);
+    void add_c_function(Sass_Function_Entry function);
 
     string       indent; // String to be used for indentation
     string       linefeed; // String to be used for line feeds
@@ -67,8 +77,7 @@ namespace Sass {
     bool         is_indented_syntax_src; // treat source string as sass
 
     // overload import calls
-    Sass_C_Import_Callback importer;
-    vector<struct Sass_Import*> import_stack;
+    vector<Sass_Import_Entry> import_stack;
 
     map<string, Color*> names_to_colors;
     map<int, string>    colors_to_names;
@@ -76,6 +85,8 @@ namespace Sass {
     size_t precision; // precision for outputting fractional numbers
 
     KWD_ARG_SET(Data) {
+      KWD_ARG(Data, struct Sass_Options*, c_options);
+      KWD_ARG(Data, struct Sass_Compiler*, c_compiler);
       KWD_ARG(Data, const char*,     source_c_str);
       KWD_ARG(Data, string,          entry_point);
       KWD_ARG(Data, string,          input_path);
@@ -84,8 +95,8 @@ namespace Sass {
       KWD_ARG(Data, string,          linefeed);
       KWD_ARG(Data, const char*,     include_paths_c_str);
       KWD_ARG(Data, const char*,     plugin_paths_c_str);
-      KWD_ARG(Data, const char**,    include_paths_array);
-      KWD_ARG(Data, const char**,    plugin_paths_array);
+      // KWD_ARG(Data, const char**,    include_paths_array);
+      // KWD_ARG(Data, const char**,    plugin_paths_array);
       KWD_ARG(Data, vector<string>,  include_paths);
       KWD_ARG(Data, vector<string>,  plugin_paths);
       KWD_ARG(Data, bool,            source_comments);
@@ -97,18 +108,21 @@ namespace Sass {
       KWD_ARG(Data, size_t,          precision);
       KWD_ARG(Data, bool,            source_map_embed);
       KWD_ARG(Data, bool,            source_map_contents);
-      KWD_ARG(Data, Sass_C_Import_Callback, importer);
     };
 
     Context(Data);
     ~Context();
     static string get_cwd();
     void setup_color_map();
-    string add_file(string);
+
     Block* parse_file();
-    string add_file(string, string);
     Block* parse_string();
     void add_source(string, string, const char*);
+
+    string add_file(const string& file);
+    string add_file(const string& base, const string& file);
+
+
     // allow to optionally overwrite the input path
     // default argument for input_path is string("stdin")
     // usefull to influence the source-map generating etc.

data/ext/libsass/contextualize.cpp

@@ -7,8 +7,8 @@
 
 namespace Sass {
 
-  Contextualize::Contextualize(Context& ctx, Eval* eval, Env* env, Backtrace* bt, Selector* placeholder, Selector* extender)
-  : ctx(ctx), eval(eval), env(env), parent(0), backtrace(bt), placeholder(placeholder), extender(extender)
+  Contextualize::Contextualize(Context& ctx, Env* env, Backtrace* bt, Selector* placeholder, Selector* extender)
+  : ctx(ctx), env(env), backtrace(bt), parent(0), placeholder(placeholder), extender(extender)
   { }
 
   Contextualize::~Contextualize() { }
@@ -26,18 +26,6 @@ namespace Sass {
     return this;
   }
 
-  Selector* Contextualize::operator()(Selector_Schema* s)
-  {
-    To_String to_string(&ctx);
-    string result_str(s->contents()->perform(eval->with(env, backtrace))->perform(&to_string));
-    result_str += '{'; // the parser looks for a brace to end the selector
-    Parser p = Parser::from_c_str(result_str.c_str(), ctx, s->pstate());
-    p.block_stack.push_back(s->last_block());
-    p.last_media_block = s->media_block();
-    Selector* result_sel = p.parse_selector_group();
-    return result_sel->perform(this);
-  }
-
   Selector* Contextualize::operator()(Selector_List* s)
   {
     Selector_List* p = static_cast<Selector_List*>(parent);
@@ -126,18 +114,6 @@ namespace Sass {
   Selector* Contextualize::operator()(Pseudo_Selector* s)
   { return s; }
 
-  Selector* Contextualize::operator()(Attribute_Selector* s)
-  {
-    // the value might be interpolated; evaluate it
-    String* v = s->value();
-    if (v && eval) {
-      v = static_cast<String*>(v->perform(eval->with(env, backtrace)));
-    }
-    Attribute_Selector* ss = new (ctx.mem) Attribute_Selector(*s);
-    ss->value(v);
-    return ss;
-  }
-
   Selector* Contextualize::operator()(Selector_Qualifier* s)
   { return s; }
 
@@ -162,6 +138,4 @@ namespace Sass {
     ss->selector(parent);
     return ss;
   }
-
-
 }

data/ext/libsass/contextualize.hpp

@@ -1,7 +1,6 @@
 #ifndef SASS_CONTEXTUALIZE_H
 #define SASS_CONTEXTUALIZE_H
 
-#include "eval.hpp"
 #include "context.hpp"
 #include "operation.hpp"
 #include "environment.hpp"
@@ -14,29 +13,26 @@ namespace Sass {
 
   class Contextualize : public Operation_CRTP<Selector*, Contextualize> {
 
+
+  public:
     Context&   ctx;
-    Eval*      eval;
     Env*       env;
-    Selector*  parent;
     Backtrace* backtrace;
-
-    Selector* fallback_impl(AST_Node* n);
-
-  public:
+    Selector*  parent;
     Selector* placeholder;
     Selector* extender;
-    Contextualize(Context&, Eval*, Env*, Backtrace*, Selector* placeholder = 0, Selector* extender = 0);
+
+    Selector* fallback_impl(AST_Node* n);
+    Contextualize(Context&, Env*, Backtrace*, Selector* placeholder = 0, Selector* extender = 0);
     virtual ~Contextualize();
     Contextualize* with(Selector*, Env*, Backtrace*, Selector* placeholder = 0, Selector* extender = 0);
     using Operation<Selector*>::operator();
 
-    Selector* operator()(Selector_Schema*);
     Selector* operator()(Selector_List*);
     Selector* operator()(Complex_Selector*);
     Selector* operator()(Compound_Selector*);
     Selector* operator()(Wrapped_Selector*);
     Selector* operator()(Pseudo_Selector*);
-    Selector* operator()(Attribute_Selector*);
     Selector* operator()(Selector_Qualifier*);
     Selector* operator()(Type_Selector*);
     Selector* operator()(Selector_Placeholder*);

data/ext/libsass/contextualize_eval.cpp

@@ -0,0 +1,93 @@
+#include "contextualize_eval.hpp"
+#include "ast.hpp"
+#include "eval.hpp"
+#include "backtrace.hpp"
+#include "to_string.hpp"
+#include "parser.hpp"
+
+namespace Sass {
+
+  Contextualize_Eval::Contextualize_Eval(Context& ctx, Eval* eval, Env* env, Backtrace* bt)
+  : Contextualize(ctx, env, bt), eval(eval)
+  { }
+
+  Contextualize_Eval::~Contextualize_Eval() { }
+
+  Selector* Contextualize_Eval::fallback_impl(AST_Node* n)
+  {
+    return Contextualize::fallback_impl(n);
+  }
+
+  Contextualize_Eval* Contextualize_Eval::with(Selector* s, Env* e, Backtrace* bt, Selector* p, Selector* ex)
+  {
+    Contextualize::with(s, e, bt, p, ex);
+    eval = eval->with(s, e, bt, p, ex);
+    return this;
+  }
+
+  Selector* Contextualize_Eval::operator()(Selector_Schema* s)
+  {
+    To_String to_string;
+    string result_str(s->contents()->perform(eval)->perform(&to_string));
+    result_str += '{'; // the parser looks for a brace to end the selector
+    Selector* result_sel = Parser::from_c_str(result_str.c_str(), ctx, s->pstate()).parse_selector_group();
+    return result_sel->perform(this);
+  }
+
+  Selector* Contextualize_Eval::operator()(Selector_List* s)
+  {
+    return Contextualize::operator ()(s);
+  }
+
+  Selector* Contextualize_Eval::operator()(Complex_Selector* s)
+  {
+    return Contextualize::operator ()(s);
+  }
+
+  Selector* Contextualize_Eval::operator()(Compound_Selector* s)
+  {
+    return Contextualize::operator ()(s);
+  }
+
+  Selector* Contextualize_Eval::operator()(Wrapped_Selector* s)
+  {
+    return Contextualize::operator ()(s);
+  }
+
+  Selector* Contextualize_Eval::operator()(Pseudo_Selector* s)
+  {
+    return Contextualize::operator ()(s);
+  }
+
+  Selector* Contextualize_Eval::operator()(Attribute_Selector* s)
+  {
+    // the value might be interpolated; evaluate it
+    String* v = s->value();
+    if (v && eval) {
+     Eval* eval_with = eval->with(env, backtrace);
+     v = static_cast<String*>(v->perform(eval_with));
+    }
+    To_String toString;
+    Attribute_Selector* ss = new (ctx.mem) Attribute_Selector(*s);
+    ss->value(v);
+    return ss;
+  }
+
+  Selector* Contextualize_Eval::operator()(Selector_Qualifier* s)
+  {     return Contextualize::operator ()(s);
+ }
+
+  Selector* Contextualize_Eval::operator()(Type_Selector* s)
+  {     return Contextualize::operator ()(s);
+ }
+
+  Selector* Contextualize_Eval::operator()(Selector_Placeholder* p)
+  {
+    return Contextualize::operator ()(p);
+  }
+
+  Selector* Contextualize_Eval::operator()(Selector_Reference* s)
+  {
+    return Contextualize::operator ()(s);
+  }
+}

data/ext/libsass/contextualize_eval.hpp

@@ -0,0 +1,44 @@
+#ifndef SASS_CONTEXTUALIZE_EVAL_H
+#define SASS_CONTEXTUALIZE_EVAL_H
+
+#include "eval.hpp"
+#include "context.hpp"
+#include "operation.hpp"
+#include "environment.hpp"
+#include "ast_fwd_decl.hpp"
+
+namespace Sass {
+  struct Backtrace;
+
+  typedef Environment<AST_Node*> Env;
+
+  class Contextualize_Eval : public Contextualize {
+
+    Eval*      eval;
+
+    Selector* fallback_impl(AST_Node* n);
+
+  public:
+    Contextualize_Eval(Context&, Eval*, Env*, Backtrace*);
+    virtual ~Contextualize_Eval();
+    Contextualize_Eval* with(Selector*, Env*, Backtrace*, Selector* placeholder = 0, Selector* extender = 0);
+    using Operation<Selector*>::operator();
+
+    Selector* operator()(Selector_Schema*);
+    Selector* operator()(Selector_List*);
+    Selector* operator()(Complex_Selector*);
+    Selector* operator()(Compound_Selector*);
+    Selector* operator()(Wrapped_Selector*);
+    Selector* operator()(Pseudo_Selector*);
+    Selector* operator()(Attribute_Selector*);
+    Selector* operator()(Selector_Qualifier*);
+    Selector* operator()(Type_Selector*);
+    Selector* operator()(Selector_Placeholder*);
+    Selector* operator()(Selector_Reference*);
+
+    template <typename U>
+    Selector* fallback(U x) { return fallback_impl(x); }
+  };
+}
+
+#endif

data/ext/libsass/contrib/plugin.cpp

@@ -0,0 +1,57 @@
+#include <cstring>
+#include <iostream>
+#include <stdint.h>
+#include "sass_values.h"
+
+// gcc: g++ -shared plugin.cpp -o plugin.so -fPIC -Llib -lsass
+// mingw: g++ -shared plugin.cpp -o plugin.dll -Llib -lsass
+
+extern "C" const char* ADDCALL libsass_get_version() {
+  return libsass_version();
+}
+
+union Sass_Value* custom_function(const union Sass_Value* s_args, Sass_Function_Entry cb, struct Sass_Options* opts)
+{
+  // get the cookie from function descriptor
+  void* cookie = sass_function_get_cookie(cb);
+  // we actually abuse the void* to store an "int"
+  return sass_make_number((intptr_t)cookie, "px");
+}
+
+extern "C" Sass_Function_List ADDCALL libsass_load_functions()
+{
+  // allocate a custom function caller
+  Sass_Function_Entry c_func =
+    sass_make_function("foo()", custom_function, (void*)42);
+  // create list of all custom functions
+  Sass_Function_List fn_list = sass_make_function_list(1);
+  // put the only function in this plugin to the list
+  sass_function_set_list_entry(fn_list, 0, c_func);
+  // return the list
+  return fn_list;
+}
+
+Sass_Import_List custom_importer(const char* cur_path, Sass_Importer_Entry cb, struct Sass_Compiler* comp)
+{
+  // get the cookie from importer descriptor
+  void* cookie = sass_importer_get_cookie(cb);
+  // create a list to hold our import entries
+  Sass_Import_List incs = sass_make_import_list(1);
+  // create our only import entry (route path back)
+  incs[0] = sass_make_import_entry(cur_path, 0, 0);
+  // return imports
+  return incs;
+}
+
+extern "C" Sass_Importer_List ADDCALL libsass_load_importers()
+{
+  // allocate a custom function caller
+  Sass_Importer_Entry c_imp =
+    sass_make_importer(custom_importer, - 99, (void*)42);
+  // create list of all custom functions
+  Sass_Importer_List imp_list = sass_make_importer_list(1);
+  // put the only function in this plugin to the list
+  sass_importer_set_list_entry(imp_list, 0, c_imp);
+  // return the list
+  return imp_list;
+}

data/ext/libsass/cssize.cpp

@@ -87,7 +87,7 @@ namespace Sass {
 
     Keyframe_Rule* rr = new (ctx.mem) Keyframe_Rule(r->pstate(),
                                                     r->block()->perform(this)->block());
-    if (r->rules()) rr->rules(r->rules());
+    if (r->selector()) rr->selector(r->selector());
 
     return debubble(rr->block(), rr)->block();
   }
@@ -268,6 +268,8 @@ namespace Sass {
                                                     m->feature_queries(),
                                                     wrapper_block);
 
+    mm->tabs(m->tabs());
+
     Bubble* bubble = new (ctx.mem) Bubble(mm->pstate(), mm);
     return bubble;
   }

data/ext/libsass/debugger.hpp

@@ -2,6 +2,7 @@
 #define SASS_DEBUGGER_H
 
 #include <string>
+#include <sstream>
 #include "ast_fwd_decl.hpp"
 
 using namespace std;
@@ -25,28 +26,51 @@ inline string prettyprint(const string& str) {
   return clean;
 }
 
-inline void debug_ast(AST_Node* node, string ind = "", Env* env = 0)
+inline string longToHex(long long t) {
+  std::stringstream is;
+  is << std::hex << t;
+  return is.str();
+}
+
+inline string pstate_source_position(AST_Node* node)
 {
+  stringstream str;
+  Position start(node->pstate());
+  Position end(start + node->pstate().offset);
+  str << (start.file == string::npos ? -1 : start.file)
+    << "@[" << start.line << ":" << start.column << "]"
+    << "-[" << end.line << ":" << end.column << "]";
+  return str.str();
+}
 
+inline void debug_ast(AST_Node* node, string ind = "", Env* env = 0)
+{
+  if (node == 0) return;
   if (ind == "") cerr << "####################################################################\n";
   if (dynamic_cast<Bubble*>(node)) {
     Bubble* bubble = dynamic_cast<Bubble*>(node);
-    cerr << ind << "Bubble " << bubble << " " << bubble->tabs() << endl;
+    cerr << ind << "Bubble " << bubble;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " " << bubble->tabs();
+    cerr << endl;
   } else if (dynamic_cast<At_Root_Block*>(node)) {
     At_Root_Block* root_block = dynamic_cast<At_Root_Block*>(node);
-    cerr << ind << "At_Root_Block " << root_block << " " << root_block->tabs() << endl;
+    cerr << ind << "At_Root_Block " << root_block;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " " << root_block->tabs();
+    cerr << endl;
     if (root_block->block()) for(auto i : root_block->block()->elements()) { debug_ast(i, ind + " ", env); }
   } else if (dynamic_cast<Selector_List*>(node)) {
     Selector_List* selector = dynamic_cast<Selector_List*>(node);
-
-    cerr << ind << "Selector_List " << selector
-      << " [block:" << selector->last_block() << "]"
-      << (selector->last_block() && selector->last_block()->is_root() ? " [root]" : "")
-      << " [@media:" << selector->media_block() << "]"
-      << (selector->is_optional() ? " [is_optional]": " -")
-      << (selector->has_line_break() ? " [line-break]": " -")
-      << (selector->has_line_feed() ? " [line-feed]": " -")
-    << endl;
+    cerr << ind << "Selector_List " << selector;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " [block:" << selector->last_block() << "]";
+    cerr << (selector->last_block() && selector->last_block()->is_root() ? " [root]" : "");
+    cerr << " [@media:" << selector->media_block() << "]";
+    cerr << (selector->is_optional() ? " [is_optional]": " -");
+    cerr << (selector->has_line_break() ? " [line-break]": " -");
+    cerr << (selector->has_line_feed() ? " [line-feed]": " -");
+    cerr << endl;
 
     for(auto i : selector->elements()) { debug_ast(i, ind + " ", env); }
 
@@ -54,10 +78,19 @@ inline void debug_ast(AST_Node* node, string ind = "", Env* env = 0)
 //    Expression* expression = dynamic_cast<Expression*>(node);
 //    cerr << ind << "Expression " << expression << " " << expression->concrete_type() << endl;
 
+  } else if (dynamic_cast<Parent_Selector*>(node)) {
+    Parent_Selector* selector = dynamic_cast<Parent_Selector*>(node);
+    cerr << ind << "Parent_Selector " << selector;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " <" << prettyprint(selector->pstate().token.ws_before()) << ">" << endl;
+    debug_ast(selector->selector(), ind + "->", env);
+
   } else if (dynamic_cast<Complex_Selector*>(node)) {
     Complex_Selector* selector = dynamic_cast<Complex_Selector*>(node);
     cerr << ind << "Complex_Selector " << selector
+      << " (" << pstate_source_position(node) << ")"
       << " [block:" << selector->last_block() << "]"
+      << " [weight:" << longToHex(selector->specificity()) << "]"
       << (selector->last_block() && selector->last_block()->is_root() ? " [root]" : "")
       << " [@media:" << selector->media_block() << "]"
       << (selector->is_optional() ? " [is_optional]": " -")
@@ -69,43 +102,57 @@ inline void debug_ast(AST_Node* node, string ind = "", Env* env = 0)
         case Complex_Selector::ADJACENT_TO: cerr << "{+}"; break;
         case Complex_Selector::ANCESTOR_OF: cerr << "{ }"; break;
       }
-    cerr << " <" << prettyprint(selector->pstate().token.ws_before()) << "> X <" << prettyprint(selector->pstate().token.ws_after()) << ">" << endl;
+    cerr << " <" << prettyprint(selector->pstate().token.ws_before()) << ">" << endl;
     debug_ast(selector->head(), ind + " ", env);
     debug_ast(selector->tail(), ind + "-", env);
   } else if (dynamic_cast<Compound_Selector*>(node)) {
     Compound_Selector* selector = dynamic_cast<Compound_Selector*>(node);
-    cerr << ind << "Compound_Selector " << selector
-      << " [block:" << selector->last_block() << "]"
-      << (selector->last_block() && selector->last_block()->is_root() ? " [root]" : "")
-      << " [@media:" << selector->media_block() << "]"
-      << (selector->is_optional() ? " [is_optional]": " -")
-      << (selector->has_line_break() ? " [line-break]": " -")
-      << (selector->has_line_feed() ? " [line-feed]": " -") <<
-      " <" << prettyprint(selector->pstate().token.ws_before()) << "> X <" << prettyprint(selector->pstate().token.ws_after()) << ">" << endl;
+    cerr << ind << "Compound_Selector " << selector;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " [block:" << selector->last_block() << "]";
+    cerr << " [weight:" << longToHex(selector->specificity()) << "]";
+    // cerr << (selector->last_block() && selector->last_block()->is_root() ? " [root]" : "");
+    cerr << " [@media:" << selector->media_block() << "]";
+    cerr << (selector->is_optional() ? " [is_optional]": " -");
+    cerr << (selector->has_line_break() ? " [line-break]": " -");
+    cerr << (selector->has_line_feed() ? " [line-feed]": " -");
+    cerr << " <" << prettyprint(selector->pstate().token.ws_before()) << ">" << endl;
     for(auto i : selector->elements()) { debug_ast(i, ind + " ", env); }
   } else if (dynamic_cast<Propset*>(node)) {
     Propset* selector = dynamic_cast<Propset*>(node);
-    cerr << ind << "Propset " << selector << " " << selector->tabs() << endl;
+    cerr << ind << "Propset " << selector;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " " << selector->tabs() << endl;
     if (selector->block()) for(auto i : selector->block()->elements()) { debug_ast(i, ind + " ", env); }
   } else if (dynamic_cast<Wrapped_Selector*>(node)) {
     Wrapped_Selector* selector = dynamic_cast<Wrapped_Selector*>(node);
-    cerr << ind << "Wrapped_Selector " << selector << " <<" << selector->name() << ">>" << (selector->has_line_break() ? " [line-break]": " -") << (selector->has_line_feed() ? " [line-feed]": " -") << endl;
+    cerr << ind << "Wrapped_Selector " << selector;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " <<" << selector->name() << ">>" << (selector->has_line_break() ? " [line-break]": " -") << (selector->has_line_feed() ? " [line-feed]": " -") << endl;
     debug_ast(selector->selector(), ind + " () ", env);
   } else if (dynamic_cast<Pseudo_Selector*>(node)) {
     Pseudo_Selector* selector = dynamic_cast<Pseudo_Selector*>(node);
-    cerr << ind << "Pseudo_Selector " << selector << " <<" << selector->name() << ">>" << (selector->has_line_break() ? " [line-break]": " -") << (selector->has_line_feed() ? " [line-feed]": " -") << endl;
+    cerr << ind << "Pseudo_Selector " << selector;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " <<" << selector->name() << ">>" << (selector->has_line_break() ? " [line-break]": " -") << (selector->has_line_feed() ? " [line-feed]": " -") << endl;
     debug_ast(selector->expression(), ind + " <= ", env);
   } else if (dynamic_cast<Attribute_Selector*>(node)) {
     Attribute_Selector* selector = dynamic_cast<Attribute_Selector*>(node);
-    cerr << ind << "Attribute_Selector " << selector << " <<" << selector->name() << ">>" << (selector->has_line_break() ? " [line-break]": " -") << (selector->has_line_feed() ? " [line-feed]": " -") << endl;
+    cerr << ind << "Attribute_Selector " << selector;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " <<" << selector->name() << ">>" << (selector->has_line_break() ? " [line-break]": " -") << (selector->has_line_feed() ? " [line-feed]": " -") << endl;
     debug_ast(selector->value(), ind + "[" + selector->matcher() + "] ", env);
   } else if (dynamic_cast<Selector_Qualifier*>(node)) {
     Selector_Qualifier* selector = dynamic_cast<Selector_Qualifier*>(node);
-    cerr << ind << "Selector_Qualifier " << selector << " <<" << selector->name() << ">>" << (selector->has_line_break() ? " [line-break]": " -") << (selector->has_line_feed() ? " [line-feed]": " -") << endl;
+    cerr << ind << "Selector_Qualifier " << selector;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " <<" << selector->name() << ">>" << (selector->has_line_break() ? " [line-break]": " -") << (selector->has_line_feed() ? " [line-feed]": " -") << endl;
   } else if (dynamic_cast<Type_Selector*>(node)) {
     Type_Selector* selector = dynamic_cast<Type_Selector*>(node);
-    cerr << ind << "Type_Selector " << selector << " <<" << selector->name() << ">>" << (selector->has_line_break() ? " [line-break]": " -") <<
-      " <" << prettyprint(selector->pstate().token.ws_before()) << "> X <" << prettyprint(selector->pstate().token.ws_after()) << ">" << endl;
+    cerr << ind << "Type_Selector " << selector;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " <<" << selector->name() << ">>" << (selector->has_line_break() ? " [line-break]": " -") <<
+      " <" << prettyprint(selector->pstate().token.ws_before()) << ">" << endl;
   } else if (dynamic_cast<Selector_Placeholder*>(node)) {
 
     Selector_Placeholder* selector = dynamic_cast<Selector_Placeholder*>(node);
@@ -119,15 +166,20 @@ inline void debug_ast(AST_Node* node, string ind = "", Env* env = 0)
 
   } else if (dynamic_cast<Selector_Reference*>(node)) {
     Selector_Reference* selector = dynamic_cast<Selector_Reference*>(node);
-    cerr << ind << "Selector_Reference " << selector << " @ref " << selector->selector() << endl;
+    cerr << ind << "Selector_Reference " << selector;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " @ref " << selector->selector() << endl;
   } else if (dynamic_cast<Simple_Selector*>(node)) {
     Simple_Selector* selector = dynamic_cast<Simple_Selector*>(node);
-    cerr << ind << "Simple_Selector " << selector << (selector->has_line_break() ? " [line-break]": " -") << (selector->has_line_feed() ? " [line-feed]": " -") << endl;
+    cerr << ind << "Simple_Selector " << selector;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << (selector->has_line_break() ? " [line-break]": " -") << (selector->has_line_feed() ? " [line-feed]": " -") << endl;
 
   } else if (dynamic_cast<Selector_Schema*>(node)) {
     Selector_Schema* selector = dynamic_cast<Selector_Schema*>(node);
-    cerr << ind << "Selector_Schema " << selector
-      << " [block:" << selector->last_block() << "]"
+    cerr << ind << "Selector_Schema " << selector;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " [block:" << selector->last_block() << "]"
       << (selector->last_block() && selector->last_block()->is_root() ? " [root]" : "")
       << " [@media:" << selector->media_block() << "]"
       << (selector->has_line_break() ? " [line-break]": " -")
@@ -139,23 +191,26 @@ inline void debug_ast(AST_Node* node, string ind = "", Env* env = 0)
 
   } else if (dynamic_cast<Selector*>(node)) {
     Selector* selector = dynamic_cast<Selector*>(node);
-    cerr << ind << "Selector " << selector
-      << (selector->has_line_break() ? " [line-break]": " -")
+    cerr << ind << "Selector " << selector;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << (selector->has_line_break() ? " [line-break]": " -")
       << (selector->has_line_feed() ? " [line-feed]": " -")
     << endl;
 
   } else if (dynamic_cast<Media_Query_Expression*>(node)) {
     Media_Query_Expression* block = dynamic_cast<Media_Query_Expression*>(node);
-    cerr << ind << "Media_Query_Expression " << block
-      << (block->is_interpolated() ? " [is_interpolated]": " -")
+    cerr << ind << "Media_Query_Expression " << block;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << (block->is_interpolated() ? " [is_interpolated]": " -")
     << endl;
     debug_ast(block->feature(), ind + " f) ");
     debug_ast(block->value(), ind + " v) ");
 
   } else if (dynamic_cast<Media_Query*>(node)) {
     Media_Query* block = dynamic_cast<Media_Query*>(node);
-    cerr << ind << "Media_Query " << block
-      << (block->is_negated() ? " [is_negated]": " -")
+    cerr << ind << "Media_Query " << block;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << (block->is_negated() ? " [is_negated]": " -")
       << (block->is_restricted() ? " [is_restricted]": " -")
     << endl;
     debug_ast(block->media_type(), ind + " ");
@@ -163,83 +218,131 @@ inline void debug_ast(AST_Node* node, string ind = "", Env* env = 0)
 
   } else if (dynamic_cast<Media_Block*>(node)) {
     Media_Block* block = dynamic_cast<Media_Block*>(node);
-    cerr << ind << "Media_Block " << block << " " << block->tabs() << endl;
+    cerr << ind << "Media_Block " << block;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " " << block->tabs() << endl;
     debug_ast(block->media_queries(), ind + " =@ ");
     debug_ast(block->selector(), ind + " -@ ");
     if (block->block()) for(auto i : block->block()->elements()) { debug_ast(i, ind + " ", env); }
   } else if (dynamic_cast<Feature_Block*>(node)) {
     Feature_Block* block = dynamic_cast<Feature_Block*>(node);
-    cerr << ind << "Feature_Block " << block << " " << block->tabs() << endl;
+    cerr << ind << "Feature_Block " << block;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " " << block->tabs() << endl;
     if (block->block()) for(auto i : block->block()->elements()) { debug_ast(i, ind + " ", env); }
   } else if (dynamic_cast<Block*>(node)) {
     Block* root_block = dynamic_cast<Block*>(node);
-    cerr << ind << "Block " << root_block << " " << root_block->tabs() << endl;
+    cerr << ind << "Block " << root_block;
+    cerr << " (" << pstate_source_position(node) << ")";
+    if (root_block->is_root()) cerr << " [root]";
+    cerr << " " << root_block->tabs() << endl;
     if (root_block->block()) for(auto i : root_block->block()->elements()) { debug_ast(i, ind + " ", env); }
   } else if (dynamic_cast<Warning*>(node)) {
     Warning* block = dynamic_cast<Warning*>(node);
-    cerr << ind << "Warning " << block << " " << block->tabs() << endl;
+    cerr << ind << "Warning " << block;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " " << block->tabs() << endl;
   } else if (dynamic_cast<Error*>(node)) {
     Error* block = dynamic_cast<Error*>(node);
-    cerr << ind << "Error " << block << " " << block->tabs() << endl;
+    cerr << ind << "Error " << block;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " " << block->tabs() << endl;
   } else if (dynamic_cast<Debug*>(node)) {
     Debug* block = dynamic_cast<Debug*>(node);
-    cerr << ind << "Debug " << block << " " << block->tabs() << endl;
+    cerr << ind << "Debug " << block;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " " << block->tabs() << endl;
   } else if (dynamic_cast<Comment*>(node)) {
     Comment* block = dynamic_cast<Comment*>(node);
-    cerr << ind << "Comment " << block << " " << block->tabs() <<
-      " <" << prettyprint(block->pstate().token.ws_before()) << "> X <" << prettyprint(block->pstate().token.ws_after()) << ">" << endl;
+    cerr << ind << "Comment " << block;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " " << block->tabs() <<
+      " <" << prettyprint(block->pstate().token.ws_before()) << ">" << endl;
     debug_ast(block->text(), ind + "// ", env);
   } else if (dynamic_cast<If*>(node)) {
     If* block = dynamic_cast<If*>(node);
-    cerr << ind << "If " << block << " " << block->tabs() << endl;
+    cerr << ind << "If " << block;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " " << block->tabs() << endl;
   } else if (dynamic_cast<Return*>(node)) {
     Return* block = dynamic_cast<Return*>(node);
-    cerr << ind << "Return " << block << " " << block->tabs() << endl;
+    cerr << ind << "Return " << block;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " " << block->tabs() << endl;
   } else if (dynamic_cast<Extension*>(node)) {
     Extension* block = dynamic_cast<Extension*>(node);
-    cerr << ind << "Extension " << block << " " << block->tabs() << endl;
+    cerr << ind << "Extension " << block;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " " << block->tabs() << endl;
     debug_ast(block->selector(), ind + "-> ", env);
   } else if (dynamic_cast<Content*>(node)) {
     Content* block = dynamic_cast<Content*>(node);
-    cerr << ind << "Content " << block << " " << block->tabs() << endl;
+    cerr << ind << "Content " << block;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " " << block->tabs() << endl;
   } else if (dynamic_cast<Import_Stub*>(node)) {
     Import_Stub* block = dynamic_cast<Import_Stub*>(node);
-    cerr << ind << "Import_Stub " << block << " " << block->tabs() << endl;
+    cerr << ind << "Import_Stub " << block;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " " << block->tabs() << endl;
   } else if (dynamic_cast<Import*>(node)) {
     Import* block = dynamic_cast<Import*>(node);
-    cerr << ind << "Import " << block << " " << block->tabs() << endl;
+    cerr << ind << "Import " << block;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " " << block->tabs() << endl;
     // vector<string>         files_;
     for (auto imp : block->urls()) debug_ast(imp, "@ ", env);
   } else if (dynamic_cast<Assignment*>(node)) {
     Assignment* block = dynamic_cast<Assignment*>(node);
-    cerr << ind << "Assignment " << block << " <<" << block->variable() << ">> " << block->tabs() << endl;
+    cerr << ind << "Assignment " << block;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " <<" << block->variable() << ">> " << block->tabs() << endl;
     debug_ast(block->value(), ind + "=", env);
   } else if (dynamic_cast<Declaration*>(node)) {
     Declaration* block = dynamic_cast<Declaration*>(node);
-    cerr << ind << "Declaration " << block << " " << block->tabs() << endl;
+    cerr << ind << "Declaration " << block;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " " << block->tabs() << endl;
     debug_ast(block->property(), ind + " prop: ", env);
     debug_ast(block->value(), ind + " value: ", env);
+  } else if (dynamic_cast<Keyframe_Rule*>(node)) {
+    Keyframe_Rule* has_block = dynamic_cast<Keyframe_Rule*>(node);
+    cerr << ind << "Keyframe_Rule " << has_block;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " " << has_block->tabs() << endl;
+    if (has_block->selector()) debug_ast(has_block->selector(), ind + "@");
+    if (has_block->block()) for(auto i : has_block->block()->elements()) { debug_ast(i, ind + " ", env); }
   } else if (dynamic_cast<At_Rule*>(node)) {
     At_Rule* block = dynamic_cast<At_Rule*>(node);
-    cerr << ind << "At_Rule " << block << " [" << block->keyword() << "] " << block->tabs() << endl;
+    cerr << ind << "At_Rule " << block;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " [" << block->keyword() << "] " << block->tabs() << endl;
     debug_ast(block->value(), ind + "+", env);
     debug_ast(block->selector(), ind + "~", env);
     if (block->block()) for(auto i : block->block()->elements()) { debug_ast(i, ind + " ", env); }
   } else if (dynamic_cast<Each*>(node)) {
     Each* block = dynamic_cast<Each*>(node);
-    cerr << ind << "Each " << block << " " << block->tabs() << endl;
+    cerr << ind << "Each " << block;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " " << block->tabs() << endl;
     if (block->block()) for(auto i : block->block()->elements()) { debug_ast(i, ind + " ", env); }
   } else if (dynamic_cast<For*>(node)) {
     For* block = dynamic_cast<For*>(node);
-    cerr << ind << "For " << block << " " << block->tabs() << endl;
+    cerr << ind << "For " << block;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " " << block->tabs() << endl;
     if (block->block()) for(auto i : block->block()->elements()) { debug_ast(i, ind + " ", env); }
   } else if (dynamic_cast<While*>(node)) {
     While* block = dynamic_cast<While*>(node);
-    cerr << ind << "While " << block << " " << block->tabs() << endl;
+    cerr << ind << "While " << block;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " " << block->tabs() << endl;
     if (block->block()) for(auto i : block->block()->elements()) { debug_ast(i, ind + " ", env); }
   } else if (dynamic_cast<Definition*>(node)) {
     Definition* block = dynamic_cast<Definition*>(node);
-    cerr << ind << "Definition " << block << " " << block->tabs() << endl;
+    cerr << ind << "Definition " << block;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " " << block->tabs() << endl;
     if (block->block()) for(auto i : block->block()->elements()) { debug_ast(i, ind + " ", env); }
   } else if (dynamic_cast<Mixin_Call*>(node)) {
     Mixin_Call* block = dynamic_cast<Mixin_Call*>(node);
@@ -247,12 +350,16 @@ inline void debug_ast(AST_Node* node, string ind = "", Env* env = 0)
     if (block->block()) for(auto i : block->block()->elements()) { debug_ast(i, ind + " ", env); }
   } else if (dynamic_cast<Ruleset*>(node)) {
     Ruleset* ruleset = dynamic_cast<Ruleset*>(node);
-    cerr << ind << "Ruleset " << ruleset << " " << ruleset->tabs() << endl;
+    cerr << ind << "Ruleset " << ruleset;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " " << ruleset->tabs() << endl;
     debug_ast(ruleset->selector(), ind + " ");
     if (ruleset->block()) for(auto i : ruleset->block()->elements()) { debug_ast(i, ind + " ", env); }
   } else if (dynamic_cast<Block*>(node)) {
     Block* block = dynamic_cast<Block*>(node);
-    cerr << ind << "Block " << block << " " << block->tabs() << endl;
+    cerr << ind << "Block " << block;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " " << block->tabs() << endl;
     for(auto i : block->elements()) { debug_ast(i, ind + " ", env); }
   } else if (dynamic_cast<Textual*>(node)) {
     Textual* expression = dynamic_cast<Textual*>(node);
@@ -264,41 +371,59 @@ inline void debug_ast(AST_Node* node, string ind = "", Env* env = 0)
     cerr << expression << " [" << expression->value() << "]" << endl;
   } else if (dynamic_cast<Variable*>(node)) {
     Variable* expression = dynamic_cast<Variable*>(node);
-    cerr << ind << "Variable " << expression << " [" << expression->name() << "]" << endl;
+    cerr << ind << "Variable " << expression;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " [" << expression->name() << "]" << endl;
     string name(expression->name());
     if (env && env->has(name)) debug_ast(static_cast<Expression*>((*env)[name]), ind + " -> ", env);
   } else if (dynamic_cast<Function_Call_Schema*>(node)) {
     Function_Call_Schema* expression = dynamic_cast<Function_Call_Schema*>(node);
-    cerr << ind << "Function_Call_Schema " << expression << "]" << endl;
+    cerr << ind << "Function_Call_Schema " << expression;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << "" << endl;
     debug_ast(expression->name(), ind + "name: ", env);
     debug_ast(expression->arguments(), ind + " args: ", env);
   } else if (dynamic_cast<Function_Call*>(node)) {
     Function_Call* expression = dynamic_cast<Function_Call*>(node);
-    cerr << ind << "Function_Call " << expression << " [" << expression->name() << "]" << endl;
+    cerr << ind << "Function_Call " << expression;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " [" << expression->name() << "]" << endl;
     debug_ast(expression->arguments(), ind + " args: ", env);
   } else if (dynamic_cast<Arguments*>(node)) {
     Arguments* expression = dynamic_cast<Arguments*>(node);
-    cerr << ind << "Arguments " << expression << "]" << endl;
+    cerr << ind << "Arguments " << expression;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << endl;
     for(auto i : expression->elements()) { debug_ast(i, ind + " ", env); }
   } else if (dynamic_cast<Argument*>(node)) {
     Argument* expression = dynamic_cast<Argument*>(node);
-    cerr << ind << "Argument " << expression << " [" << expression->value() << "]" << endl;
+    cerr << ind << "Argument " << expression;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " [" << expression->value() << "]" << endl;
     debug_ast(expression->value(), ind + " value: ", env);
   } else if (dynamic_cast<Unary_Expression*>(node)) {
     Unary_Expression* expression = dynamic_cast<Unary_Expression*>(node);
-    cerr << ind << "Unary_Expression " << expression << " [" << expression->type() << "]" << endl;
+    cerr << ind << "Unary_Expression " << expression;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " [" << expression->type() << "]" << endl;
     debug_ast(expression->operand(), ind + " operand: ", env);
   } else if (dynamic_cast<Binary_Expression*>(node)) {
     Binary_Expression* expression = dynamic_cast<Binary_Expression*>(node);
-    cerr << ind << "Binary_Expression " << expression << " [" << expression->type() << "]" << endl;
+    cerr << ind << "Binary_Expression " << expression;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " [" << expression->type() << "]" << endl;
     debug_ast(expression->left(), ind + " left:  ", env);
     debug_ast(expression->right(), ind + " right: ", env);
   } else if (dynamic_cast<Map*>(node)) {
     Map* expression = dynamic_cast<Map*>(node);
-    cerr << ind << "Map " << expression << " [Hashed]" << endl;
+    cerr << ind << "Map " << expression;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " [Hashed]" << endl;
   } else if (dynamic_cast<List*>(node)) {
     List* expression = dynamic_cast<List*>(node);
-    cerr << ind << "List " << expression <<
+    cerr << ind << "List " << expression;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " (" << expression->length() << ") " <<
       (expression->separator() == Sass::List::Separator::COMMA ? "Comma " : "Space ") <<
       " [delayed: " << expression->is_delayed() << "] " <<
       " [interpolant: " << expression->is_interpolant() << "] " <<
@@ -306,50 +431,84 @@ inline void debug_ast(AST_Node* node, string ind = "", Env* env = 0)
     for(auto i : expression->elements()) { debug_ast(i, ind + " ", env); }
   } else if (dynamic_cast<Content*>(node)) {
     Content* expression = dynamic_cast<Content*>(node);
-    cerr << ind << "Content " << expression << " [Statement]" << endl;
+    cerr << ind << "Content " << expression;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " [Statement]" << endl;
   } else if (dynamic_cast<Boolean*>(node)) {
     Boolean* expression = dynamic_cast<Boolean*>(node);
-    cerr << ind << "Boolean " << expression << " [" << expression->value() << "]" << endl;
+    cerr << ind << "Boolean " << expression;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " [" << expression->value() << "]" << endl;
   } else if (dynamic_cast<Color*>(node)) {
     Color* expression = dynamic_cast<Color*>(node);
-    cerr << ind << "Color " << expression << " [" << expression->r() << ":"  << expression->g() << ":" << expression->b() << "@" << expression->a() << "]" << endl;
+    cerr << ind << "Color " << expression;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " [" << expression->r() << ":"  << expression->g() << ":" << expression->b() << "@" << expression->a() << "]" << endl;
   } else if (dynamic_cast<Number*>(node)) {
     Number* expression = dynamic_cast<Number*>(node);
-    cerr << ind << "Number " << expression << " [" << expression->value() << expression->unit() << "]" << endl;
+    cerr << ind << "Number " << expression;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " [" << expression->value() << expression->unit() << "]" << endl;
   } else if (dynamic_cast<String_Quoted*>(node)) {
     String_Quoted* expression = dynamic_cast<String_Quoted*>(node);
-    cerr << ind << "String_Quoted : " << expression << " [" << prettyprint(expression->value()) << "]" <<
+    cerr << ind << "String_Quoted : " << expression;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " [" << prettyprint(expression->value()) << "]" <<
       (expression->is_delayed() ? " {delayed}" : "") <<
       (expression->sass_fix_1291() ? " {sass_fix_1291}" : "") <<
       (expression->quote_mark() != 0 ? " {qm:" + string(1, expression->quote_mark()) + "}" : "") <<
-      " <" << prettyprint(expression->pstate().token.ws_before()) << "> X <" << prettyprint(expression->pstate().token.ws_after()) << ">" << endl;
+      " <" << prettyprint(expression->pstate().token.ws_before()) << ">" << endl;
   } else if (dynamic_cast<String_Constant*>(node)) {
     String_Constant* expression = dynamic_cast<String_Constant*>(node);
-    cerr << ind << "String_Constant : " << expression << " [" << prettyprint(expression->value()) << "]" <<
+    cerr << ind << "String_Constant : " << expression;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " [" << prettyprint(expression->value()) << "]" <<
       (expression->is_delayed() ? " {delayed}" : "") <<
       (expression->sass_fix_1291() ? " {sass_fix_1291}" : "") <<
-      " <" << prettyprint(expression->pstate().token.ws_before()) << "> X <" << prettyprint(expression->pstate().token.ws_after()) << ">" << endl;
+      " <" << prettyprint(expression->pstate().token.ws_before()) << ">" << endl;
   } else if (dynamic_cast<String_Schema*>(node)) {
     String_Schema* expression = dynamic_cast<String_Schema*>(node);
-    cerr << ind << "String_Schema " << expression << " " << expression->concrete_type() <<
+    cerr << ind << "String_Schema " << expression;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " " << expression->concrete_type() <<
       (expression->has_interpolants() ? " {has_interpolants}" : "") <<
       endl;
     for(auto i : expression->elements()) { debug_ast(i, ind + " ", env); }
   } else if (dynamic_cast<String*>(node)) {
     String* expression = dynamic_cast<String*>(node);
-    cerr << ind << "String " << expression << expression->concrete_type() <<
+    cerr << ind << "String " << expression;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << expression->concrete_type() <<
       " " << (expression->sass_fix_1291() ? "{sass_fix_1291}" : "") <<
       endl;
   } else if (dynamic_cast<Expression*>(node)) {
     Expression* expression = dynamic_cast<Expression*>(node);
-    cerr << ind << "Expression " << expression << " " << expression->concrete_type() << endl;
+    cerr << ind << "Expression " << expression;
+    cerr << " (" << pstate_source_position(node) << ")";
+    switch (expression->concrete_type()) {
+      case Expression::Concrete_Type::NONE: cerr << " [NONE]"; break;
+      case Expression::Concrete_Type::BOOLEAN: cerr << " [BOOLEAN]"; break;
+      case Expression::Concrete_Type::NUMBER: cerr << " [NUMBER]"; break;
+      case Expression::Concrete_Type::COLOR: cerr << " [COLOR]"; break;
+      case Expression::Concrete_Type::STRING: cerr << " [STRING]"; break;
+      case Expression::Concrete_Type::LIST: cerr << " [LIST]"; break;
+      case Expression::Concrete_Type::MAP: cerr << " [MAP]"; break;
+      case Expression::Concrete_Type::SELECTOR: cerr << " [SELECTOR]"; break;
+      case Expression::Concrete_Type::NULL_VAL: cerr << " [NULL_VAL]"; break;
+      case Expression::Concrete_Type::NUM_TYPES: cerr << " [NUM_TYPES]"; break;
+    }
+    cerr << endl;
   } else if (dynamic_cast<Has_Block*>(node)) {
     Has_Block* has_block = dynamic_cast<Has_Block*>(node);
-    cerr << ind << "Has_Block " << has_block << " " << has_block->tabs() << endl;
+    cerr << ind << "Has_Block " << has_block;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " " << has_block->tabs() << endl;
     if (has_block->block()) for(auto i : has_block->block()->elements()) { debug_ast(i, ind + " ", env); }
   } else if (dynamic_cast<Statement*>(node)) {
     Statement* statement = dynamic_cast<Statement*>(node);
-    cerr << ind << "Statement " << statement << " " << statement->tabs() << endl;
+    cerr << ind << "Statement " << statement;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " " << statement->tabs() << endl;
   }
 
   if (ind == "") cerr << "####################################################################\n";