Allowing namespaced properties to have interpolants.

Author: Aaron Leung

constants.cpp

@@ -84,6 +84,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

@@ -84,6 +84,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[];

document_parser.cpp

@@ -36,7 +36,7 @@ namespace Sass {
         root << parse_assignment();
         if (!lex< exactly<';'> >()) throw_syntax_error("top-level variable binding must be terminated by ';'");
       }
-      else if (peek< sequence< identifier, optional_spaces, exactly<':'>, optional_spaces, exactly<'{'> > >(position)) {
+      else if (peek< sequence< optional< exactly<'*'> >, alternatives< identifier_schema, identifier >, optional_spaces, exactly<':'>, optional_spaces, exactly<'{'> > >(position)) {
         root << parse_propset();
       }
       else if ((lookahead_result = lookahead_for_selector(position)).found) {
@@ -296,16 +296,22 @@ namespace Sass {
     if (lex< default_flag >()) assn << context.new_Node(Node::none, path, line, 0);
     return assn;
   }
-  
+
   Node Document::parse_propset()
   {
-    lex< identifier >();
-    Node property_segment(context.new_Node(Node::identifier, path, line, lexed));
+    Node property_segment;
+    if (peek< sequence< optional< exactly<'*'> >, identifier_schema > >()) {
+      property_segment = parse_identifier_schema();
+    }
+    else {
+      lex< sequence< optional< exactly<'*'> >, identifier > >();
+      property_segment = context.new_Node(Node::identifier, path, line, lexed);
+    }
     lex< exactly<':'> >();
     lex< exactly<'{'> >();
     Node block(context.new_Node(Node::block, path, line, 1));
     while (!lex< exactly<'}'> >()) {
-      if (peek< sequence< identifier, optional_spaces, exactly<':'>, optional_spaces, exactly<'{'> > >(position)) {
+      if (peek< sequence< optional< exactly<'*'> >, alternatives< identifier_schema, identifier >, optional_spaces, exactly<':'>, optional_spaces, exactly<'{'> > >(position)) {
         block << parse_propset();
       }
       else {
@@ -611,7 +617,7 @@ namespace Sass {
         block << context.new_Node(Node::mixin_content, path, line, 0); // just an expansion stub
         semicolon = true;
       }
-      else if (peek< sequence< identifier, optional_spaces, exactly<':'>, optional_spaces, exactly<'{'> > >(position)) {
+      else if (peek< sequence< optional< exactly<'*'> >, alternatives< identifier_schema, identifier >, optional_spaces, exactly<':'>, optional_spaces, exactly<'{'> > >(position)) {
         block << parse_propset();
       }
       else if ((lookahead_result = lookahead_for_selector(position)).found) {

eval_apply.cpp

@@ -65,7 +65,26 @@ namespace Sass {
 
       case Node::propset: {
         // TO DO: perform the property expansion here, rather than in the emitter (also requires the parser to allow interpolants in the property names)
+        expr[0] = eval(expr[0], prefix, env, f_env, new_Node, ctx, bt);
         expand(expr[1], prefix, env, f_env, new_Node, ctx, bt, false, content);
+
+        // Node block(expr[1]);
+        // for (size_t i = 0, S = block.size(); i < S; ++i) {
+        //   Node stm(block[i]);
+        //   switch (stm.type())
+        //   {
+        //     case Node::propset:
+        //     case Node::mixin_call:
+        //     case Node::if_directive:
+        //     case Node::for_through_directive:
+        //     case Node::for_to_directive:
+        //     case Node::each_directive:
+        //     case Node::while_directive:
+        //     case Node::warning: {
+        //       expand(stm, prefix, env, f_env, new_Node, ctx, bt, false, content);
+        //     } break;
+        //   }
+        // }
       } break;
 
       case Node::ruleset: {

node_emitters.cpp

@@ -721,11 +721,11 @@ namespace Sass {
         new_prefix += "\n";
         new_prefix += string(2*depth, ' ');
       }
-      new_prefix += at(0).token().to_string();
+      new_prefix += at(0).to_string();
     }
     else {
       new_prefix += "-";
-      new_prefix += at(0).token().to_string();
+      new_prefix += at(0).to_string();
       // has_prefix = true;
     }
     Node rules(at(1));
@@ -735,9 +735,11 @@ namespace Sass {
       }
       else {
         buf << new_prefix;
-        if (rules[i][0].token().to_string() != "") buf << '-';
+        if (rules[i][0].to_string() != "") buf << '-';
         if (!compressed) {
+          buf << "[hey]";
           rules[i][0].emit_nested_css(buf, depth);
+          buf << "[colon]";
           rules[i][1].emit_nested_css(buf, depth);
         }
         else {