Handling class/id selectors, as well as simple selector sequences consisting of such.

classes_and_ids.scss

+a + b, .class {
+  blah: blah;
+  bleh: bleh;
+  d #id, f ~ g.other + h, > i#grar {
+    bloo: bloo;
+    blee: blee;
+  }
+}
\ No newline at end of file

document.hpp

@@ -32,7 +32,10 @@ namespace Sass {
         after_whitespace =
           zero_plus< alternatives<spaces, line_comment> >(start);
       }
-      else if (mx == spaces || mx == ancestor_of) {
+      else if (mx == ancestor_of || mx == no_spaces) {
+        after_whitespace = position;
+      }
+      else if (mx == spaces) {
         after_whitespace = spaces(start);
         if (after_whitespace) {
           return after_whitespace;
@@ -64,7 +67,7 @@ namespace Sass {
         after_whitespace =
           zero_plus< alternatives<spaces, line_comment> >(position);
       }
-      else if (mx == ancestor_of) {
+      else if (mx == ancestor_of || mx == no_spaces) {
         after_whitespace = position;
       }
       else if (mx == spaces) {
@@ -101,6 +104,7 @@ namespace Sass {
     Node parse_selector_group();
     Node parse_selector();
     Node parse_simple_selector_sequence();
+    Node parse_simple_selector();
     Node parse_block();
     Node parse_rule();
     Node parse_values();

document_parser.cpp

@@ -36,7 +36,7 @@ namespace Sass {
     ruleset << parse_block();
     return ruleset;
   }
-  
+
   Node Document::parse_selector_group()
   {
     Node group(line_number, Node::selector_group, 1);
@@ -63,11 +63,32 @@ namespace Sass {
     }
     return selector;
   }
-  
+
   Node Document::parse_simple_selector_sequence()
   {
-    lex<identifier>();
-    return Node(line_number, Node::simple_selector_sequence, lexed);
+    Node sequence(line_number, Node::simple_selector_sequence, 1);
+    if (lex< alternatives < type_selector, universal > >()) {
+      sequence << Node(line_number, Node::simple_selector, lexed);
+    }
+    else {
+      sequence << parse_simple_selector();
+    }
+    while (!peek< spaces >(position) &&
+           !(peek < exactly<'+'> >(position) ||
+             peek < exactly<'~'> >(position) ||
+             peek < exactly<'>'> >(position) ||
+             peek < exactly<','> >(position) ||
+             peek < exactly<'{'> >(position))) {
+      sequence << parse_simple_selector();
+    }
+    return sequence; 
+  }
+  
+  Node Document::parse_simple_selector()
+  {
+    lex< id_name >() || lex< class_name >() /*|| lex< attribute >() ||
+    lex< pseudo >()  || lex< negation >()*/ ;
+    return Node(line_number, Node::simple_selector, lexed);
   }
 
   Node Document::parse_block()
@@ -103,7 +124,7 @@ namespace Sass {
     }
     return block;
   }
-  
+
   Node Document::parse_rule() {
     Node rule(line_number, Node::rule, 2);
     lex< identifier >();
@@ -132,7 +153,7 @@ namespace Sass {
     }
     return values;
   }
-  
+
   char* Document::look_for_rule(char* start)
   {
     char* p = start ? start : position;
@@ -142,7 +163,7 @@ namespace Sass {
     (p = peek< alternatives< exactly<';'>, exactly<'}'> > >(p));
     return p;
   }
-  
+
   char* Document::look_for_values(char* start)
   {
     char* p = start ? start : position;

node.cpp

@@ -41,6 +41,11 @@ namespace Sass {
       else buf << ' ' << string(token) << ' ';
       break;
     case simple_selector_sequence:
+      for (int i = 0; i < children->size(); ++i) {
+        buf << string(children->at(i));
+      }
+      break;
+    case simple_selector:
       buf << string(token);
       break;
     case block:
@@ -80,7 +85,6 @@ namespace Sass {
       if (prefixes.empty()) {
         new_prefixes.reserve(sel_group.children->size());
         for (int i = 0; i < sel_group.children->size(); ++i) {
-          // new_prefixes.push_back(string(sel_group.children->at(i).token));
           new_prefixes.push_back(string(sel_group.children->at(i)));
         }
       }

node.hpp

@@ -17,6 +17,7 @@ namespace Sass {
       selector,
       selector_combinator,
       simple_selector_sequence,
+      simple_selector,
       type_selector,
       class_selector,
       id_selector,
@@ -112,7 +113,6 @@ namespace Sass {
       return *this;
     }
       
-    // Node& operator+=(const Node& node);
     Node& operator<<(const Node& n)
     {
       children->push_back(n);
@@ -137,9 +137,13 @@ namespace Sass {
         if (std::isspace(token.begin[0])) return string(" ");
         else return string(" ") += string(token) += string(" ");
       }
-      // else if (type == simple_selector_sequence) {
-      //   return string(" ") += string(token);
-      // }
+      else if (type == simple_selector_sequence) {
+        string result;
+        for (int i = 0; i < children->size(); ++i) {
+          result += string(children->at(i));
+        }
+        return result;
+      }
       else {
         return string(token);
       }

prelexer.cpp

@@ -64,6 +64,9 @@ namespace Sass {
     char* spaces_and_comments(char* src) {
       return zero_plus< alternatives<spaces, comment> >(src);
     }
+    char* no_spaces(char *src) {
+      return negate< spaces >(src);
+    }
     
     // Match CSS identifiers.
     char* identifier(char* src) {
@@ -82,6 +85,17 @@ namespace Sass {
                                      exactly<'-'>,
                                      exactly<'_'> > >(src);
     }
+    // Match CSS type selectors
+    char* namespace_prefix(char* src) {
+      return sequence< optional< alternatives< identifier, exactly<'*'> > >,
+                       exactly<'|'> >(src);
+    }
+    char* type_selector(char* src) {
+      return sequence< optional<namespace_prefix>, identifier>(src);
+    }
+    char* universal(char* src) {
+      return sequence< optional<namespace_prefix>, exactly<'*'> >(src);
+    }
     // Match CSS id names.
     char* id_name(char* src) {
       return sequence<exactly<'#'>, name>(src);

prelexer.hpp

@@ -214,11 +214,16 @@ namespace Sass {
     char* optional_spaces(char* src);
     char* optional_comment(char* src);
     char* spaces_and_comments(char* src);
+    char* no_spaces(char *src);
 
     // Match a CSS identifier.
     char* identifier(char* src);
     // Match CSS '@' keywords.
     char* at_keyword(char* src);
+    // Match CSS type selectors
+    char* namespace_prefix(char* src);
+    char* type_selector(char* src);
+    char* universal(char* src);
     // Match CSS id names.
     char* id_name(char* src);
     // Match CSS class names.

spec/basic/10_classes_and_ids/input.scss

+a + b, .class {
+  blah: blah;
+  bleh: bleh;
+  d #id, f ~ g.other + h, > i#grar {
+    bloo: bloo;
+    blee: blee;
+  }
+}
\ No newline at end of file

spec/basic/10_classes_and_ids/output.css

+a + b, .class {
+  blah: blah;
+  bleh: bleh; }
+  a + b d #id, a + b f ~ g.other + h, a + b > i#grar, .class d #id, .class f ~ g.other + h, .class > i#grar {
+    bloo: bloo;
+    blee: blee; }