Delete "image_url" function and "image_path" API

This function doesn't currently exist in the Sass spec. Fixes sassgh-489
nschonni · Oct 12, 2014 · e406c32 · e406c32
1 parent 6de03c6
commit e406c32
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 36 deletions.
diff --git a/constants.cpp b/constants.cpp
@@ -4,9 +4,6 @@ namespace Sass {
   namespace Constants {
     extern const int SPECIFICITY_BASE = 1000;
 
-    // hidden variable name for the image path (for the image-url built-in)
-    extern const char image_path_var[] = "$[image path]";
-
     // sass keywords
     extern const char import_kwd[]        = "@import";
     extern const char mixin_kwd[]         = "@mixin";
@@ -61,7 +58,6 @@ namespace Sass {
     extern const char only_kwd[]         = "only";
     extern const char rgb_kwd[]          = "rgb(";
     extern const char url_kwd[]          = "url(";
-    extern const char image_url_kwd[]    = "image-url(";
     extern const char important_kwd[]    = "important";
     extern const char pseudo_not_kwd[]   = ":not(";
     extern const char even_kwd[]         = "even";

diff --git a/constants.hpp b/constants.hpp
@@ -4,9 +4,6 @@ namespace Sass {
   namespace Constants {
     extern const int SPECIFICITY_BASE;
 
-    // hidden variable name for the image path (for the image-url built-in)
-    extern const char image_path_var[];
-
     // sass keywords
     extern const char import_kwd[];
     extern const char mixin_kwd[];

diff --git a/context.cpp b/context.cpp
@@ -53,7 +53,6 @@ namespace Sass {
     style_sheets            (map<string, Block*>()),
     source_map              (resolve_relative_path(initializers.output_path(), initializers.source_map_file(), get_cwd())),
     c_functions             (vector<Sass_C_Function_Descriptor>()),
-    image_path              (initializers.image_path()),
     output_path             (make_canonical_path(initializers.output_path())),
     source_comments         (initializers.source_comments()),
     output_style            (initializers.output_style()),
@@ -433,8 +432,6 @@ namespace Sass {
     // Boolean Functions
     register_function(ctx, not_sig, sass_not, env);
     register_function(ctx, if_sig, sass_if, env);
-    // Path Functions
-    register_function(ctx, image_url_sig, image_url, env);
   }
 
   void register_c_functions(Context& ctx, Env* env, Sass_C_Function_Descriptor* descrs)

diff --git a/context.hpp b/context.hpp
@@ -48,7 +48,6 @@ namespace Sass {
     SourceMap source_map;
     vector<Sass_C_Function_Descriptor> c_functions;
 
-    string       image_path; // for the image-url Sass function
     string       output_path; // for relative paths to the output
     bool         source_comments; // for inline debug comments in css output
     Output_Style output_style; // output style for the generated css code
@@ -65,7 +64,6 @@ namespace Sass {
       KWD_ARG(Data, const char*,     source_c_str);
       KWD_ARG(Data, string,          entry_point);
       KWD_ARG(Data, string,          output_path);
-      KWD_ARG(Data, string,          image_path);
       KWD_ARG(Data, const char*,     include_paths_c_str);
       KWD_ARG(Data, const char**,    include_paths_array);
       KWD_ARG(Data, vector<string>,  include_paths);

diff --git a/functions.cpp b/functions.cpp
@@ -1410,19 +1410,5 @@ namespace Sass {
       }
     }
 
-    ////////////////
-    // URL FUNCTIONS
-    ////////////////
-
-    Signature image_url_sig = "image-url($path, $only-path: false, $cache-buster: false)";
-    BUILT_IN(image_url)
-    {
-      String_Constant* ipath = ARG("$path", String_Constant);
-      bool only_path = !ARG("$only-path", Expression)->is_false();
-      string full_path(quote(ctx.image_path + "/" + unquote(ipath->value()), '"'));
-      if (!only_path) full_path = "url(" + full_path + ")";
-      return new (ctx.mem) String_Constant(path, position, full_path);
-    }
-
   }
 }
diff --git a/functions.hpp b/functions.hpp
@@ -96,7 +96,6 @@ namespace Sass {
     extern Signature call_sig;
     extern Signature not_sig;
     extern Signature if_sig;
-    extern Signature image_url_sig;
     extern Signature map_get_sig;
     extern Signature map_merge_sig;
     extern Signature map_remove_sig;

diff --git a/sass.cpp b/sass.cpp
@@ -48,10 +48,6 @@ extern "C" {
                          .source_map_file     (c_ctx->source_map_file)
                          .omit_source_map_url (c_ctx->omit_source_map_url)
 
-                         .image_path          (c_ctx->image_path ?
-                                               c_ctx->image_path :
-                                               "")
-
                          .output_path         (c_ctx->output_path ?
                                                c_ctx->output_path :
                                                "")

diff --git a/sass.h b/sass.h
@@ -25,7 +25,6 @@ struct Sass_Context {
   bool         source_comments;
   const char*  source_map_file;
   bool         omit_source_map_url;
-  const char*  image_path;
   const char*  output_path;
   const char*  include_paths_string;
   const char** include_paths_array;

diff --git a/sass_interface.cpp b/sass_interface.cpp
@@ -111,7 +111,6 @@ extern "C" {
                        .source_comments(c_ctx->options.source_comments)
                        .source_map_file(safe_str(c_ctx->options.source_map_file))
                        .omit_source_map_url(c_ctx->options.omit_source_map_url)
-                       .image_path(safe_str(c_ctx->options.image_path))
                        .include_paths_c_str(c_ctx->options.include_paths)
                        .include_paths_array(0)
                        .include_paths(vector<string>())
@@ -203,7 +202,6 @@ extern "C" {
                        .source_comments(c_ctx->options.source_comments)
                        .source_map_file(safe_str(c_ctx->options.source_map_file))
                        .omit_source_map_url(c_ctx->options.omit_source_map_url)
-                       .image_path(safe_str(c_ctx->options.image_path))
                        .include_paths_c_str(c_ctx->options.include_paths)
                        .include_paths_array(0)
                        .include_paths(vector<string>())

diff --git a/sass_interface.h b/sass_interface.h
@@ -32,8 +32,6 @@ struct sass_options {
   // Colon-separated list of paths
   // Semicolon-separated on Windows
   const char* include_paths;
-  // For the image-url Sass function
-  const char* image_path;
   // Precision for outputting fractional numbers
   int precision;
 };