Changeset 150682 in webkit

Timestamp:

May 25, 2013 1:29:42 AM (11 years ago)

Author:

sergio@webkit.org

Message:

Reducing CSS code duplication in declaration list error recovery
​https://bugs.webkit.org/show_bug.cgi?id=115157

Reviewed by Andreas Kling.

From Blink r148974 by <​serya@chromium.org>

Refactor "invalid_block_list error | /* empty */" in a new
decl_list_recovery rule that allows to remove 4 redundant rules.

No new test required as we're just refactoring code, no new behaviour.

• css/CSSGrammar.y.in:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSGrammar.y.in (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-25  Sergio Villar Senin  <svillar@igalia.com>
+
+        Reducing CSS code duplication in declaration list error recovery
+        https://bugs.webkit.org/show_bug.cgi?id=115157
+
+        Reviewed by Andreas Kling.
+
+        From Blink r148974 by <serya@chromium.org>
+
+        Refactor "invalid_block_list error | /* empty */" in a new
+        decl_list_recovery rule that allows to remove 4 redundant rules.
+
+        No new test required as we're just refactoring code, no new behaviour.
+
+        * css/CSSGrammar.y.in:
+
 2013-05-24  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/css/CSSGrammar.y.in

@@ -1533 +1533 @@
         $$ = $1;
     }
-    | errors invalid_block_list error {
+    | errors decl_list_recovery {
         parser->syntaxError($1, CSSParser::PropertyDeclarationError);
         $$ = false;
     }
-    | errors {
-        parser->syntaxError($1, CSSParser::PropertyDeclarationError);
-        $$ = false;
-    }
-    | decl_list errors {
-        parser->syntaxError($2, CSSParser::PropertyDeclarationError);
-        $$ = $1;
-    }
-    | decl_list errors invalid_block_list error {
+    | decl_list errors decl_list_recovery {
         parser->syntaxError($2, CSSParser::PropertyDeclarationError);
         $$ = $1;
@@ -1564 +1556 @@
         $$ = false;
     }
-    | errors ';' maybe_space {
+    | errors decl_list_recovery ';' maybe_space {
         parser->syntaxError($1, CSSParser::PropertyDeclarationError);
         parser->markPropertyStart();
         $$ = false;
     }
-    | errors invalid_block_list error ';' maybe_space {
-        parser->syntaxError($1, CSSParser::PropertyDeclarationError);
-        $$ = false;
-    }
     | decl_list declaration ';' maybe_space {
         parser->markPropertyStart();
@@ -1579 +1567 @@
             $$ = $2;
     }
-    | decl_list errors ';' maybe_space {
+    | decl_list errors decl_list_recovery ';' maybe_space {
         parser->syntaxError($2, CSSParser::PropertyDeclarationError);
         parser->markPropertyStart();
         $$ = $1;
     }
-    | decl_list errors invalid_block_list error ';' maybe_space {
-        parser->syntaxError($2, CSSParser::PropertyDeclarationError);
-        parser->markPropertyStart();
-        $$ = $1;
-    }
+    ;
+
+decl_list_recovery:
+    invalid_block_list error
+    | /* empty */
     ;