Trying to implement image-url as a primitive.

context.cpp

@@ -51,6 +51,7 @@ namespace Sass {
     color_names_to_values(map<string, Node>()),
     color_values_to_names(map<Node, string>()),
     new_Node(Node_Factory()),
+    image_path(""),
     ref_count(0),
     has_extensions(false)
   {

context.hpp

@@ -50,9 +50,10 @@ namespace Sass {
     map<string, Node> color_names_to_values;
     map<Node, string> color_values_to_names;
     Node_Factory new_Node;
+    string image_path;
     size_t ref_count;
-    string sass_path;
-    string css_path;
+    // string sass_path;
+    // string css_path;
     bool has_extensions;
 
     void collect_include_paths(const char* paths_str);

document_parser.cpp

@@ -821,6 +821,15 @@ namespace Sass {
       return result;
     }
 
+    if (lex< image_url_prefix >())
+    {
+      Node url(parse_value());
+      if (!lex< exactly<')'> >()) throw_syntax_error("call to image-url is missing ')'");
+      Node the_call(context.new_Node(Node::image_url, path, line, 1));
+      the_call << url;
+      return the_call;
+    }
+
     if (peek< functional >())
     { return parse_function_call(); }
 

eval_apply.cpp

@@ -288,6 +288,11 @@ namespace Sass {
         if (!env.query(expr.token())) throw_eval_error("reference to unbound variable " + expr.token().to_string(), expr.path(), expr.line());
         return env[expr.token()];
       } break;
+
+      case Node::image_url: {
+        expr[0] = eval(expr[0], prefix, env, f_env, new_Node, ctx);
+        return expr;
+      } break;
       
       case Node::function_call: {
         // TO DO: default-constructed Function should be a generic callback (maybe)

node.hpp

@@ -128,6 +128,7 @@ namespace Sass {
       value,
       identifier,
       uri,
+      image_url,
       textual_percentage,
       textual_dimension,
       textual_number,

prelexer.cpp

@@ -278,6 +278,11 @@ namespace Sass {
                        optional<spaces>,
                        exactly<')'> >(src);
     }
+    // Match SCSS image-url function
+    extern const char image_url_kwd[] = "image-url(";
+    const char* image_url_prefix(const char* src) {
+      return exactly<image_url_kwd>(src);
+    }
     // Match CSS "!important" keyword.
     extern const char important_kwd[] = "important";
     const char* important(const char* src) {

prelexer.hpp

@@ -354,6 +354,8 @@ namespace Sass {
     // Match CSS uri specifiers.
     const char* uri_prefix(const char* src);
     const char* uri(const char* src);
+    // Match SCSS image-url function.
+    const char* image_url_prefix(const char* src);
     // Match CSS "!important" keyword.
     const char* important(const char* src);
     // Match Sass "!default" keyword.