Merge branch 'master' into headless-block-fix

Aaron Leung · Aaron Leung · commit a28512896dd9 · 2014-05-08T15:16:20.000-07:00
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "sass2scss"]
+	path = sass2scss
+	url = https://github.com/mgreter/sass2scss.git
diff --git a/Makefile b/Makefile
@@ -31,6 +31,7 @@ SOURCES = \
 	prelexer.cpp \
 	sass.cpp \
 	sass_interface.cpp \
+	sass2scss/sass2scss.cpp \
 	source_map.cpp \
 	to_c.cpp \
 	to_string.cpp \
diff --git a/ast.hpp b/ast.hpp
@@ -409,6 +409,7 @@ namespace Sass {
     ADD_PROPERTY(Type, type);
     ADD_PROPERTY(Native_Function, native_function);
     ADD_PROPERTY(Sass_C_Function, c_function);
+    ADD_PROPERTY(void*, cookie);
     ADD_PROPERTY(bool, is_overload_stub);
     ADD_PROPERTY(Signature, signature);
   public:
@@ -425,6 +426,7 @@ namespace Sass {
       type_(t),
       native_function_(0),
       c_function_(0),
+      cookie_(0),
       is_overload_stub_(false),
       signature_(0)
     { }
@@ -442,6 +444,7 @@ namespace Sass {
       type_(FUNCTION),
       native_function_(func_ptr),
       c_function_(0),
+      cookie_(0),
       is_overload_stub_(overload_stub),
       signature_(sig)
     { }
@@ -451,6 +454,7 @@ namespace Sass {
                string n,
                Parameters* params,
                Sass_C_Function func_ptr,
+               void* cookie,
                bool whatever,
                bool whatever2)
     : Has_Block(path, position, 0),
@@ -460,6 +464,7 @@ namespace Sass {
       type_(FUNCTION),
       native_function_(0),
       c_function_(func_ptr),
+      cookie_(cookie),
       is_overload_stub_(false),
       signature_(sig)
     { }
@@ -597,9 +602,13 @@ namespace Sass {
   class Function_Call : public Expression {
     ADD_PROPERTY(string, name);
     ADD_PROPERTY(Arguments*, arguments);
+    ADD_PROPERTY(void*, cookie);
   public:
+    Function_Call(string path, Position position, string n, Arguments* args, void* cookie)
+    : Expression(path, position), name_(n), arguments_(args), cookie_(cookie)
+    { concrete_type(STRING); }
     Function_Call(string path, Position position, string n, Arguments* args)
-    : Expression(path, position), name_(n), arguments_(args)
+    : Expression(path, position), name_(n), arguments_(args), cookie_(0)
     { concrete_type(STRING); }
     ATTACH_OPERATIONS();
   };
diff --git a/constants.cpp b/constants.cpp
@@ -66,6 +66,7 @@ namespace Sass {
     extern const char even_kwd[]       = "even";
     extern const char odd_kwd[]        = "odd";
     extern const char progid_kwd[]     = "progid";
+    extern const char expression_kwd[] = "expression";
     extern const char calc_kwd[]       = "calc(";
 
     // css attribute-matching operators
diff --git a/constants.hpp b/constants.hpp
@@ -66,6 +66,7 @@ namespace Sass {
     extern const char even_kwd[];
     extern const char odd_kwd[];
     extern const char progid_kwd[];
+    extern const char expression_kwd[];
     extern const char calc_kwd[];
 
     // css attribute-matching operators
diff --git a/context.cpp b/context.cpp
@@ -45,6 +45,7 @@ namespace Sass {
   : mem(Memory_Manager<AST_Node>()),
     source_c_str    (initializers.source_c_str()),
     sources         (vector<const char*>()),
+    c_functions     (vector<Sass_C_Function_Descriptor>()),
     include_paths   (initializers.include_paths()),
     queue           (vector<pair<string, const char*> >()),
     style_sheets    (map<string, Block*>()),
@@ -212,6 +213,9 @@ namespace Sass {
     Env tge;
     Backtrace backtrace(0, "", Position(), "");
     register_built_in_functions(*this, &tge);
+    for (size_t i = 0, S = c_functions.size(); i < S; ++i) {
+    	register_c_function(*this, &tge, c_functions[i]);
+    }
     Eval eval(*this, &tge, &backtrace);
     Contextualize contextualize(*this, &eval, &tge, &backtrace);
     Expand expand(*this, &eval, &contextualize, &tge, &backtrace);
@@ -281,6 +285,9 @@ namespace Sass {
     char wd[wd_len];
     string cwd = getcwd(wd, wd_len);
     if (cwd[cwd.length() - 1] != '/') cwd += '/';
+#ifdef _WIN32
+    replace(cwd.begin(), cwd.end(), '\\', '/');    //convert Windows backslashes to URL forward slashes
+#endif
     return cwd;
   }
 
@@ -317,7 +324,7 @@ namespace Sass {
   {
     using namespace Functions;
     // RGB Functions
-    register_function(ctx, rgb_sig,  rgb, env);
+    register_function(ctx, rgb_sig, rgb, env);
     register_overload_stub(ctx, "rgba", env);
     register_function(ctx, rgba_4_sig, rgba_4, 4, env);
     register_function(ctx, rgba_2_sig, rgba_2, 2, env);
@@ -391,7 +398,7 @@ namespace Sass {
   }
   void register_c_function(Context& ctx, Env* env, Sass_C_Function_Descriptor descr)
   {
-    Definition* def = make_c_function(descr.signature, descr.function, ctx);
+    Definition* def = make_c_function(descr.signature, descr.function, descr.cookie, ctx);
     def->environment(env);
     (*env)[def->name() + "[f]"] = def;
   }
diff --git a/context.hpp b/context.hpp
@@ -21,6 +21,8 @@
 #include "subset_map.hpp"
 #endif
 
+struct Sass_C_Function_Descriptor;
+
 namespace Sass {
   using namespace std;
   class AST_Node;
@@ -44,6 +46,7 @@ namespace Sass {
     vector<pair<string, const char*> > queue; // queue of files to be parsed
     map<string, Block*> style_sheets; // map of paths to ASTs
     SourceMap source_map;
+    vector<Sass_C_Function_Descriptor> c_functions;
 
     string       image_path; // for the image-url Sass function
     bool         source_comments;
diff --git a/eval.cpp b/eval.cpp
@@ -340,7 +340,7 @@ namespace Sass {
       backtrace = &here;
 
       To_C to_c;
-      Sass_Value c_val = c_func(args->perform(&to_c));
+      Sass_Value c_val = c_func(args->perform(&to_c), def->cookie());
       if (c_val.unknown.tag == SASS_ERROR) {
         error("error in C function " + c->name() + ": " + c_val.error.message, c->path(), c->position(), backtrace);
       }
diff --git a/file.cpp b/file.cpp
@@ -9,6 +9,7 @@
 #include <sys/stat.h>
 #include "file.hpp"
 #include "context.hpp"
+#include "sass2scss/sass2scss.h"
 
 namespace Sass {
   namespace File {
@@ -134,13 +135,32 @@ namespace Sass {
           real_path = dir + _base_scss;
           // if the file isn't found with '_' + filename + ".scss" ...
           if (!(contents = read_file(real_path))) {
-            string base_scss(base + ".scss");
-            // try filename + ".scss" as the last resort
-            real_path = dir + base_scss;
-            contents = read_file(real_path);
+            string _base_sass(_base + ".sass");
+            real_path = dir + _base_sass;
+            // if the file isn't found with '_' + filename + ".sass" ...
+            if (!(contents = read_file(real_path))) {
+              string base_scss(base + ".scss");
+              real_path = dir + base_scss;
+              // if the file isn't found with filename + ".scss" ...
+              if (!(contents = read_file(real_path))) {
+                string base_sass(base + ".sass");
+                real_path = dir + base_sass;
+                // if the file isn't found with filename + ".sass" ...
+                if (!(contents = read_file(real_path))) {
+                  // default back to scss version
+                  real_path = dir + base_scss;
+                }
+              }
+            }
           }
         }
       }
+      string extension;
+      if (real_path.length() > 5) {
+        extension = real_path.substr(real_path.length() - 5, 5);
+      }
+      for(size_t i=0; i<extension.size();++i)
+        extension[i] = tolower(extension[i]);
       return contents;
     }
 
@@ -149,6 +169,10 @@ namespace Sass {
       struct stat st;
       if (stat(path.c_str(), &st) == -1 || S_ISDIR(st.st_mode)) return 0;
       ifstream file(path.c_str(), ios::in | ios::binary | ios::ate);
+      string extension;
+      if (path.length() > 5) {
+        extension = path.substr(path.length() - 5, 5);
+      }
       char* contents = 0;
       if (file.is_open()) {
         size_t size = file.tellg();
@@ -158,7 +182,15 @@ namespace Sass {
         contents[size] = '\0';
         file.close();
       }
-      return contents;
+      for(size_t i=0; i<extension.size();++i)
+        extension[i] = tolower(extension[i]);
+      if (extension == ".sass" && contents != 0) {
+        char * converted = sass2scss(contents, SASS2SCSS_PRETTIFY_1);
+        delete[] contents; // free the indented contents
+        return converted; // should be freed by caller
+      } else {
+        return contents;
+      }
     }
 
   }
diff --git a/functions.cpp b/functions.cpp
@@ -36,7 +36,7 @@ namespace Sass {
                                     false);
   }
 
-  Definition* make_c_function(Signature sig, Sass_C_Function f, Context& ctx)
+  Definition* make_c_function(Signature sig, Sass_C_Function f, void* cookie, Context& ctx)
   {
     Parser sig_parser = Parser::from_c_str(sig, ctx, "[c function]");
     sig_parser.lex<Prelexer::identifier>();
@@ -48,6 +48,7 @@ namespace Sass {
                                     name,
                                     params,
                                     f,
+                                    cookie,
                                     false, true);
   }
 
diff --git a/functions.hpp b/functions.hpp
@@ -28,7 +28,7 @@ namespace Sass {
   typedef Expression* (*Native_Function)(Env&, Context&, Signature, const string&, Position, Backtrace*);
 
   Definition* make_native_function(Signature, Native_Function, Context&);
-  Definition* make_c_function(Signature sig, Sass_C_Function f, Context& ctx);
+  Definition* make_c_function(Signature sig, Sass_C_Function f, void* cookie, Context& ctx);
 
   namespace Functions {
 
diff --git a/prelexer.cpp b/prelexer.cpp
@@ -426,13 +426,16 @@ namespace Sass {
       return exactly<lte>(src);
     }
 
-    // match the IE syntax
-    const char* progid(const char* src) {
-      return exactly<progid_kwd>(src);
+    // match specific IE syntax
+    const char* ie_progid(const char* src) {
+      return sequence < exactly<progid_kwd>, exactly<':'>, alternatives< identifier_schema, identifier >, one_plus< sequence< exactly<'.'>, alternatives< identifier_schema, identifier > > > >(src);
     }
-
+    const char* ie_expression(const char* src) {
+      return exactly<expression_kwd>(src);
+    }
+    // match any IE syntax
     const char* ie_stuff(const char* src) {
-      return sequence< progid, exactly<':'>, alternatives< identifier_schema, identifier >, one_plus< sequence< exactly<'.'>, alternatives< identifier_schema, identifier > > >, delimited_by<'(', ';', true> >(src);
+      return sequence< alternatives < ie_expression, ie_progid >, delimited_by<'(', ';', true> >(src);
     }
 
     // const char* ie_args(const char* src) {
diff --git a/sass.h b/sass.h
@@ -119,11 +119,12 @@ union Sass_Value make_sass_list    (size_t len, enum Sass_Separator sep);
 union Sass_Value make_sass_null    ();
 union Sass_Value make_sass_error   (const char* msg);
 
-typedef union Sass_Value(*Sass_C_Function)(union Sass_Value);
+typedef union Sass_Value(*Sass_C_Function)(union Sass_Value, void *cookie);
 
 struct Sass_C_Function_Descriptor {
   const char*     signature;
   Sass_C_Function function;
+  void *cookie;
 };
 
 #ifdef __cplusplus
diff --git a/sass2scss b/sass2scss
@@ -0,0 +1 @@
+Subproject commit 443a0cefee0b633f11ba219c0c79510288de7790
diff --git a/sass_interface.cpp b/sass_interface.cpp
@@ -38,6 +38,7 @@ extern "C" {
   void sass_free_context(sass_context* ctx)
   {
     if (ctx->output_string) free(ctx->output_string);
+    if (ctx->source_map_string) free(ctx->source_map_string);
     if (ctx->error_message) free(ctx->error_message);
 
     free_string_array(ctx->included_files, ctx->num_included_files);
@@ -86,19 +87,40 @@ extern "C" {
   {
     using namespace Sass;
     try {
+      bool source_maps = false;
+      string source_map_file = "";
+      if (c_ctx->source_map_file && (c_ctx->options.source_comments == SASS_SOURCE_COMMENTS_MAP)) {
+        source_maps = true;
+        source_map_file = c_ctx->source_map_file;
+      }
+      string output_path = c_ctx->output_path ? c_ctx->output_path : "";
       Context cpp_ctx(
         Context::Data().source_c_str(c_ctx->source_string)
-                       .entry_point("")
+                       .entry_point(c_ctx->input_path ?
+                                    c_ctx->input_path :
+                                    "")
+                       .output_path(output_path)
                        .output_style((Output_Style) c_ctx->options.output_style)
                        .source_comments(c_ctx->options.source_comments == SASS_SOURCE_COMMENTS_DEFAULT)
-                       .source_maps(false) // Only supported for files.
-                       .image_path(c_ctx->options.image_path)
+                       .source_maps(source_maps)
+                       .source_map_file(source_map_file)
+                       .image_path(c_ctx->options.image_path ?
+                                   c_ctx->options.image_path :
+                                   "")
                        .include_paths_c_str(c_ctx->options.include_paths)
                        .include_paths_array(0)
                        .include_paths(vector<string>())
                        .precision(c_ctx->options.precision ? c_ctx->options.precision : 5)
       );
+      if (c_ctx->c_functions) {
+        struct Sass_C_Function_Descriptor* this_func_data = c_ctx->c_functions;
+        while (this_func_data->signature && this_func_data->function) {
+          cpp_ctx.c_functions.push_back(*this_func_data);
+          ++this_func_data;
+        }
+      }
       c_ctx->output_string = cpp_ctx.compile_string();
+      c_ctx->source_map_string = cpp_ctx.generate_source_map();
       c_ctx->error_message = 0;
       c_ctx->error_status = 0;
 
@@ -110,13 +132,15 @@ extern "C" {
       c_ctx->error_message = strdup(msg_stream.str().c_str());
       c_ctx->error_status = 1;
       c_ctx->output_string = 0;
+      c_ctx->source_map_string = 0;
     }
     catch(bad_alloc& ba) {
       stringstream msg_stream;
       msg_stream << "Unable to allocate memory: " << ba.what() << endl;
       c_ctx->error_message = strdup(msg_stream.str().c_str());
       c_ctx->error_status = 1;
       c_ctx->output_string = 0;
+      c_ctx->source_map_string = 0;
     }
     // TO DO: CATCH EVERYTHING ELSE
     return 0;
@@ -134,18 +158,29 @@ extern "C" {
       }
       string output_path = c_ctx->output_path ? c_ctx->output_path : "";
       Context cpp_ctx(
-        Context::Data().entry_point(c_ctx->input_path)
-	               .output_path(output_path)
+        Context::Data().entry_point(c_ctx->input_path ?
+                                    c_ctx->input_path :
+                                    "")
+                       .output_path(output_path)
                        .output_style((Output_Style) c_ctx->options.output_style)
                        .source_comments(c_ctx->options.source_comments == SASS_SOURCE_COMMENTS_DEFAULT)
                        .source_maps(source_maps)
                        .source_map_file(source_map_file)
-                       .image_path(c_ctx->options.image_path)
+                       .image_path(c_ctx->options.image_path ?
+                                   c_ctx->options.image_path :
+                                   "")
                        .include_paths_c_str(c_ctx->options.include_paths)
                        .include_paths_array(0)
                        .include_paths(vector<string>())
                        .precision(c_ctx->options.precision ? c_ctx->options.precision : 5)
       );
+      if (c_ctx->c_functions) {
+        struct Sass_C_Function_Descriptor* this_func_data = c_ctx->c_functions;
+        while (this_func_data->signature && this_func_data->function) {
+          cpp_ctx.c_functions.push_back(*this_func_data);
+          ++this_func_data;
+        }
+      }
       c_ctx->output_string = cpp_ctx.compile_file();
       c_ctx->source_map_string = cpp_ctx.generate_source_map();
       c_ctx->error_message = 0;
diff --git a/sass_interface.h b/sass_interface.h

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[submodule "sass2scss"]`
	`2`	`+ path = sass2scss`
	`3`	`+ url = https://github.com/mgreter/sass2scss.git`
Original file line number	Diff line number	Diff line change
`@@ -340,7 +340,7 @@ namespace Sass {`
`340`	`340`	`backtrace = &here;`
`341`	`341`
`342`	`342`	`To_C to_c;`
`343`		`- Sass_Value c_val = c_func(args->perform(&to_c));`
	`343`	`+ Sass_Value c_val = c_func(args->perform(&to_c), def->cookie());`
`344`	`344`	`if (c_val.unknown.tag == SASS_ERROR) {`
`345`	`345`	`error("error in C function " + c->name() + ": " + c_val.error.message, c->path(), c->position(), backtrace);`
`346`	`346`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ namespace Sass {`
`36`	`36`	`false);`
`37`	`37`	`}`
`38`	`38`
`39`		`- Definition* make_c_function(Signature sig, Sass_C_Function f, Context& ctx)`
	`39`	`+ Definition* make_c_function(Signature sig, Sass_C_Function f, void* cookie, Context& ctx)`
`40`	`40`	`{`
`41`	`41`	`Parser sig_parser = Parser::from_c_str(sig, ctx, "[c function]");`
`42`	`42`	`sig_parser.lex<Prelexer::identifier>();`
`@@ -48,6 +48,7 @@ namespace Sass {`
`48`	`48`	`name,`
`49`	`49`	`params,`
`50`	`50`	`f,`
	`51`	`+ cookie,`
`51`	`52`	`false, true);`
`52`	`53`	`}`
`53`	`54`