Implemented Comma Selectors

bmavity · Sep 28, 2010 · 0a071d1 · 0a071d1
1 parent 0de0e39
commit 0a071d1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/cssSelector.ometa b/src/cssSelector.ometa
@@ -62,7 +62,8 @@ ometa CssSelector <: Parser {
   CDC = '-' '-' '>',
 
 
-  selectors_group = selector:s (COMMA S* selector)* -> { self.add(s); self },
+  selectors_group = selector:pre comma_separated_selector*:post -> { self.add(pre + post.join('')); self },
+  comma_separated_selector = COMMA S* selector:sel -> { ', ' + sel },
   selector = simple_selector_sequence:sim (combined_sequence)*:additional -> { sim + additional.join('') },
   combinator = PLUS:p S+ -> { p + ' ' }
              | PLUS:p -> { p }

diff --git a/tests/test.js b/tests/test.js
@@ -205,13 +205,13 @@ vows.describe('Namespaced Attribute Selectors').addBatch({
 }).run();
 
 
-/*
+vows.describe('Comma Selectors').addBatch({
-  def test_comma_selectors
+  'E, F': shouldParse(),
-    assert_selector_parses('E, F')
+  'E F, G H': shouldParse(),
-    assert_selector_parses('E F, G H')
+  'E > F, G > H': shouldParse()
-    assert_selector_parses('E > F, G > H')
+}).run();
-  end
 
+/*
   def test_selectors_with_newlines
     assert_selector_parses("E,\nF")
     assert_selector_parses("E\nF")