Merge branch 'master' of git://github.com/hcatlin/libsass into python

Author: dahlia

backtrace.hpp

@@ -0,0 +1,46 @@
+#define SASS_BACKTRACE
+
+#include <sstream>
+
+namespace Sass {
+
+  using namespace std;
+
+  struct Backtrace {
+
+    Backtrace* parent;
+    string     path;
+    size_t     line;
+    string     caller;
+
+    Backtrace(Backtrace* prn, string pth, size_t ln, string c)
+    : parent(prn),
+      path(pth),
+      line(ln),
+      caller(c)
+    { }
+
+    string to_string(bool warning = false)
+    {
+      stringstream ss;
+      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->line
+           << this_point->parent->caller;
+        this_point = this_point->parent;
+      }
+
+      return ss.str();
+    }
+
+  };
+
+}

constants.cpp

@@ -12,6 +12,7 @@ namespace Sass {
     extern const char function_kwd[]      = "@function";
     extern const char return_kwd[]        = "@return";
     extern const char include_kwd[]       = "@include";
+    extern const char content_kwd[]       = "@content";
     extern const char extend_kwd[]        = "@extend";
     extern const char if_kwd[]            = "@if";
     extern const char else_kwd[]          = "@else";
@@ -43,6 +44,7 @@ namespace Sass {
     extern const char kHz_kwd[]  = "kHz";
 
     // css functions and keywords
+    extern const char charset_kwd[]    = "@charset";
     extern const char media_kwd[]      = "@media";
     extern const char only_kwd[]       = "only";
     extern const char rgb_kwd[]        = "rgb(";
@@ -83,6 +85,7 @@ namespace Sass {
     extern const char rbrace[]      = "}";
     extern const char rparen[]      = ")";
     extern const char sign_chars[]  = "-+";
+    extern const char hyphen[]      = "-";
 
     // type names
     extern const char numeric_name[]    = "numeric value";

constants.hpp

@@ -12,6 +12,7 @@ namespace Sass {
     extern const char function_kwd[];
     extern const char return_kwd[];
     extern const char include_kwd[];
+    extern const char content_kwd[];
     extern const char extend_kwd[];
     extern const char if_kwd[];
     extern const char else_kwd[];
@@ -43,6 +44,7 @@ namespace Sass {
     extern const char kHz_kwd[];
 
     // css functions and keywords
+    extern const char charset_kwd[];
     extern const char media_kwd[];
     extern const char only_kwd[];
     extern const char rgb_kwd[];
@@ -83,6 +85,7 @@ namespace Sass {
     extern const char rbrace[];
     extern const char rparen[];
     extern const char sign_chars[];
+    extern const char hyphen[];
 
     // type names
     extern const char numeric_name[];

context.cpp

@@ -1,8 +1,10 @@
 #ifdef _WIN32
 #include <direct.h>
 #define getcwd _getcwd
+#define PATH_SEP ';'
 #else
 #include <unistd.h>
+#define PATH_SEP ':'
 #endif
 
 #include <cstring>
@@ -27,7 +29,7 @@ namespace Sass {
 
     if (paths_str) {
       const char* beg = paths_str;
-      const char* end = Prelexer::find_first<':'>(beg);
+      const char* end = Prelexer::find_first<PATH_SEP>(beg);
 
       while (end) {
         string path(beg, end - beg);
@@ -36,7 +38,7 @@ namespace Sass {
           include_paths.push_back(path);
         }
         beg = end + 1;
-        end = Prelexer::find_first<':'>(beg);
+        end = Prelexer::find_first<PATH_SEP>(beg);
       }
 
       string path(beg);
@@ -51,7 +53,7 @@ namespace Sass {
     // }
   }
 
-  Context::Context(const char* paths_str, const char* img_path_str)
+  Context::Context(const char* paths_str, const char* img_path_str, bool sc)
   : global_env(Environment()),
     function_env(map<string, Function>()),
     extensions(multimap<Node, Node>()),
@@ -63,7 +65,8 @@ namespace Sass {
     new_Node(Node_Factory()),
     image_path(0),
     ref_count(0),
-    has_extensions(false)
+    has_extensions(false),
+    source_comments(sc)
   {
     register_functions();
     collect_include_paths(paths_str);
@@ -143,7 +146,8 @@ namespace Sass {
     // Other Color Functions
     register_function(adjust_color_sig, adjust_color);
     register_function(scale_color_sig, scale_color);
-    register_function(change_color_sig, change_color);    
+    register_function(change_color_sig, change_color);   
+    register_function(ie_hex_str_sig, ie_hex_str); 
     // String Functions
     register_function(unquote_sig, unquote);
     register_function(quote_sig, quote);

context.hpp

@@ -33,9 +33,10 @@ namespace Sass {
     // string sass_path;
     // string css_path;
     bool has_extensions;
+    bool source_comments;
 
     void collect_include_paths(const char* paths_str);
-    Context(const char* paths_str = 0, const char* img_path_str = 0);
+    Context(const char* paths_str = 0, const char* img_path_str = 0, bool sc = false);
     ~Context();
 
     void register_function(Signature sig, Primitive ip);

document.cpp

@@ -38,23 +38,39 @@ namespace Sass {
     const char* path_str = path.c_str();
     struct stat st;
     string tmp;
+
+    // Resolution order for ambiguous imports:
+    // (1) filename as given
+    // (2) underscore + given
+    // (3) underscore + given + extension
+    // (4) given + extension
+
+    // if the file as given isn't found ...
     if (stat(path_str, &st) == -1 || S_ISDIR(st.st_mode)) {
-        tmp = path + ".scss";
+      // then try "_" + given
+      const char *full_path_str = path.c_str();
+      const char *file_name_str = Prelexer::folders(full_path_str);
+      string folder(Token::make(full_path_str, file_name_str).to_string());
+      string partial_filename("_" + string(file_name_str));
+      tmp = folder + partial_filename;
+      path_str = tmp.c_str();
+      // if "_" + given isn't found ...
+      if (stat(path_str, &st) == -1 || S_ISDIR(st.st_mode)) {
+        // then try "_" + given + ".scss"
+        tmp += ".scss";
         path_str = tmp.c_str();
+        // if "_" + given + ".scss" isn't found ...
         if (stat(path_str, &st) == -1 || S_ISDIR(st.st_mode)) {
-            const char *full_path_str = path.c_str();
-            const char *file_name_str = Prelexer::folders(full_path_str);
-            tmp = Token::make(full_path_str, file_name_str).to_string() +
-                  "_" +
-                  string(file_name_str);
-            path_str = tmp.c_str();
-            if (stat(path_str, &st) == -1 || S_ISDIR(st.st_mode)) {
-                tmp = tmp + ".scss";
-                path_str = tmp.c_str();
-                if (stat(path_str, &st) == -1 || S_ISDIR(st.st_mode))
-                    throw path;
-            }
+          // then try given + ".scss"
+          string non_partial_filename(string(file_name_str) + ".scss");
+          tmp = folder + non_partial_filename;
+          path_str = tmp.c_str();
+          // if we still can't find the file, then throw an error
+          if (stat(path_str, &st) == -1 || S_ISDIR(st.st_mode)) {
+            throw path;
+          }
         }
+      }
     }
     f = std::fopen(path_str, "rb");
     size_t len = st.st_size;
@@ -71,7 +87,7 @@ namespace Sass {
     string include_path(path_str, file_name_str - path_str);
 
     Document doc(ctx);
-    doc.path        = path;
+    doc.path        = path_str;
     doc.line        = 1;
     doc.root        = ctx.new_Node(Node::root, path, 1, 0);
     doc.lexed       = Token::make();
@@ -80,9 +96,6 @@ namespace Sass {
     doc.end         = end;
     doc.position    = source;
     doc.context.source_refs.push_back(source);
-    if (!include_path.empty()) {
-      doc.context.include_paths.push_back(include_path);
-    }
 
     return doc;
   }
@@ -135,11 +148,14 @@ namespace Sass {
       root.echo(output);
       break;
     case nested:
-      root.emit_nested_css(output, 0, true);
+      root.emit_nested_css(output, 0, true, false, context.source_comments);
       break;
     case expanded:
       root.emit_expanded_css(output, "");
       break;
+    case compressed:
+      root.emit_compressed_css(output);
+      break;
     default:
       break;
     }

document.hpp

@@ -133,7 +133,7 @@ namespace Sass {
     Node parse_function_definition();
     Node parse_parameters();
     Node parse_parameter(Node::Type);
-    Node parse_mixin_call();
+    Node parse_mixin_call(Node::Type inside_of = Node::none);
     Node parse_arguments();
     Node parse_argument(Node::Type);
     Node parse_assignment();