Changeset 56414 in webkit

Timestamp:

Mar 23, 2010 1:52:50 PM (14 years ago)

Author:

hyatt@apple.com

Message:

​https://bugs.webkit.org/show_bug.cgi?id=36272, make sure nth-child can work when the portion with "n" is omitted.

Reviewed by Simon Fraser and Darin Adler.

Added fast/css/nth-child-implied-step.html

• css/CSSGrammar.y:
• css/tokenizer.flex:

Location:

trunk

Files:

• LayoutTests/fast/css/nth-child-implied-step-expected.txt (added)
• LayoutTests/fast/css/nth-child-implied-step.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/css/CSSGrammar.y (modified) (3 diffs)
• WebCore/css/tokenizer.flex (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-23  David Hyatt  <hyatt@apple.com>
+
+        Reviewed by Simon Fraser and Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36272, make sure nth-child can work when the portion with "n" is omitted.
+
+        Added fast/css/nth-child-implied-step.html
+
+        * css/CSSGrammar.y:
+        * css/tokenizer.flex:
+
 2010-03-23  Darin Adler  <darin@apple.com>
 

trunk/WebCore/css/CSSGrammar.y

@@ -247 +247 @@
 %type <integer> match
 %type <integer> unary_operator
+%type <integer> maybe_unary_operator
 %type <character> operator
 
@@ -767 +768 @@
   | '>' maybe_space { $$ = CSSSelector::Child; }
   ;
+
+maybe_unary_operator:
+    unary_operator { $$ = $1; }
+    | { $$ = 1; }
+    ;
 
 unary_operator:
@@ -1130 +1136 @@
     }
     // used by :nth-*
-    | ':' FUNCTION maybe_space INTEGER maybe_space ')' {
+    | ':' FUNCTION maybe_space maybe_unary_operator INTEGER maybe_space ')' {
         CSSParser *p = static_cast<CSSParser*>(parser);
         $$ = p->createFloatingSelector();
         $$->m_match = CSSSelector::PseudoClass;
-        $$->setArgument(String::number($4));
+        $$->setArgument(String::number($4 * $5));
         $$->m_value = $2;
         CSSSelector::PseudoType type = $$->pseudoType();

trunk/WebCore/css/tokenizer.flex

@@ -25 +25 @@
 nl              \n|\r\n|\r|\f
 range           \?{1,6}|{h}(\?{0,5}|{h}(\?{0,4}|{h}(\?{0,3}|{h}(\?{0,2}|{h}(\??|{h})))))
-nth             ([\+-]?[0-9]*n[\+-][0-9]+)|(-?[0-9]*n)
+nth             [\+-]?{intnum}*n([\+-]{intnum})?
 
 %%