getting attribute selectors with interpolated strings to work

Author: Aaron Leung

ast.hpp

@@ -1155,9 +1155,9 @@ namespace Sass {
   class Attribute_Selector : public Simple_Selector {
     ADD_PROPERTY(string, name);
     ADD_PROPERTY(string, matcher);
-    ADD_PROPERTY(string, value);
+    ADD_PROPERTY(String*, value); // might be interpolated
   public:
-    Attribute_Selector(string path, Position position, string n, string m, string v)
+    Attribute_Selector(string path, Position position, string n, string m, String* v)
     : Simple_Selector(path, position), name_(n), matcher_(m), value_(v)
     { }
     ATTACH_OPERATIONS();

contextualize.cpp

@@ -116,7 +116,16 @@ namespace Sass {
   { return s; }
 
   Selector* Contextualize::operator()(Attribute_Selector* s)
-  { return s; }
+  { 
+    // the value might be interpolated; evaluate it
+    String* v = s->value();
+    if (v) {
+      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; }

inspect.cpp

@@ -525,7 +525,10 @@ namespace Sass {
     append_to_buffer(s->name());
     if (!s->matcher().empty()) {
       append_to_buffer(s->matcher());
-      append_to_buffer(s->value());
+      if (s->value()) {
+        s->value()->perform(this);
+      }
+      // append_to_buffer(s->value());
     }
     append_to_buffer("]");
   }

parser.cpp

@@ -539,14 +539,24 @@ namespace Sass {
     Position p = source_position;
     if (!lex< attribute_name >()) error("invalid attribute name in attribute selector");
     string name(lexed);
-    if (lex< exactly<']'> >()) return new (ctx.mem) Attribute_Selector(path, p, name, "", "");
+    if (lex< exactly<']'> >()) return new (ctx.mem) Attribute_Selector(path, p, name, "", 0);
     if (!lex< alternatives< exact_match, class_match, dash_match,
                             prefix_match, suffix_match, substring_match > >()) {
       error("invalid operator in attribute selector for " + name);
     }
     string matcher(lexed);
-    if (!lex< string_constant >() && !lex< identifier >()) error("expected a string constant or identifier in attribute selector for " + name);
-    string value(lexed);
+
+    String* value = 0;
+    if (lex< identifier >()) {
+      value = new (ctx.mem) String_Constant(path, p, lexed, true);
+    }
+    else if (lex< string_constant >()) {
+      value = parse_interpolated_chunk(lexed);
+    }
+    else {
+      error("expected a string constant or identifier in attribute selector for " + name);
+    }
+
     if (!lex< exactly<']'> >()) error("unterminated attribute selector for " + name);
     return new (ctx.mem) Attribute_Selector(path, p, name, matcher, value);
   }