Explicit space required around NOT/ONLY/AND in CSS MQ.

Source/core/css/CSSGrammar.y.in

 /*
  *  Copyright (C) 2002-2003 Lars Knoll (knoll@kde.org)
  *  Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
  *  Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  *  Copyright (C) 2008 Eric Seidel <eric@webkit.org>
  *  Copyright (C) 2012 Intel Corporation. All rights reserved.
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
  *  License as published by the Free Software Foundation; either
@@ skipping 379 matching lines @@
             parser->m_selectorListForParseSelector->adoptSelectorVector(*$3);
     }
 ;
 
 internal_supports_condition:
     INTERNAL_SUPPORTS_CONDITION_SYM maybe_space supports_condition TOKEN_EOF {
         parser->m_supportsCondition = $3;
     }
 ;
 
+space:
+    WHITESPACE
+  | space WHITESPACE
+  ;
+
 maybe_space:
     /* empty */ %prec UNIMPORTANT_TOK
-  | maybe_space WHITESPACE
+  | space
   ;
 
 maybe_sgml:
     /* empty */
   | maybe_sgml SGML_CD
   | maybe_sgml WHITESPACE
   ;
 
 maybe_charset:
   /* empty */
@@ skipping 178 matching lines @@
 maybe_media_value:
     /*empty*/ {
         $$ = 0;
     }
     | ':' maybe_space expr {
         $$ = $3;
     }
     ;
 
 media_query_exp:
-    '(' maybe_space IDENT maybe_space maybe_media_value closing_parenthesis maybe_space {
+    '(' maybe_space IDENT maybe_space maybe_media_value closing_parenthesis {
         parser->tokenToLowerCase($3);
         $$ = parser->createFloatingMediaQueryExp($3, $5);
         if (!$$)
             YYERROR;
     }
     | '(' error error_recovery closing_parenthesis {
         YYERROR;
     }
     ;
 
 media_query_exp_list:
     media_query_exp {
         $$ = parser->createFloatingMediaQueryExpList();
         $$->append(parser->sinkFloatingMediaQueryExp($1));
     }
-    | media_query_exp_list MEDIA_AND maybe_space media_query_exp {
+    | media_query_exp_list space MEDIA_AND space media_query_exp {
         $$ = $1;
-        $$->append(parser->sinkFloatingMediaQueryExp($4));
+        $$->append(parser->sinkFloatingMediaQueryExp($5));
     }
     ;
 
 maybe_and_media_query_exp_list:
     /*empty*/ {

[SeRya, 2013/10/01 13:41:35]

"maybe_space" instead of "/*empty*/ | space".

The rest looks good.

[rune, 2013/10/01 13:59:54]

Done.

         $$ = parser->createFloatingMediaQueryExpList();
     }
-    | MEDIA_AND maybe_space media_query_exp_list {
-        $$ = $3;
+    | space {
+        $$ = parser->createFloatingMediaQueryExpList();
+    }
+    | space MEDIA_AND space media_query_exp_list maybe_space {
+        $$ = $4;
     }
     ;
 
 maybe_media_restrictor:
     /*empty*/ {
         $$ = MediaQuery::None;
     }
-    | MEDIA_ONLY maybe_space {
+    | MEDIA_ONLY space {
         $$ = MediaQuery::Only;
     }
-    | MEDIA_NOT maybe_space {
+    | MEDIA_NOT space {
         $$ = MediaQuery::Not;
     }
     ;
 
 valid_media_query:
-    media_query_exp_list {
+    media_query_exp_list maybe_space {
         $$ = parser->createFloatingMediaQuery(parser->sinkFloatingMediaQueryExpList($1));
     }
     | maybe_media_restrictor medium maybe_and_media_query_exp_list {
         parser->tokenToLowerCase($2);
         $$ = parser->createFloatingMediaQuery($1, $2, parser->sinkFloatingMediaQueryExpList($3));
     }
     ;
 
 media_query:
     valid_media_query
@@ skipping 69 matching lines @@
         $$ = 0;
         parser->endRuleBody(true);
     }
     | before_media_rule MEDIA_SYM at_rule_recovery {
         $$ = 0;
         parser->endRuleBody(true);
     }
     ;
 
 medium:
-  IDENT maybe_space
+  IDENT
   ;
 
 supports:
     before_supports_rule SUPPORTS_SYM maybe_space supports_condition at_supports_rule_header_end '{' at_rule_body_start maybe_space block_rule_body closing_brace {
         $$ = parser->createSupportsRule($4, $9);
     }
     | before_supports_rule SUPPORTS_SYM error error_location rule_error_recovery at_rule_end {
         $$ = 0;
         parser->reportError($4, CSSParser::InvalidSupportsConditionError);
         parser->endRuleBody(true);
@@ skipping 336 matching lines @@
     }
 ;
 
 before_region_rule:
     /* empty */ {
         parser->startRuleHeader(CSSRuleSourceData::REGION_RULE);
     }
     ;
 
 region:
-    before_region_rule WEBKIT_REGION_RULE_SYM WHITESPACE region_selector at_rule_header_end '{' at_rule_body_start maybe_space region_block_rule_body closing_brace {
+    before_region_rule WEBKIT_REGION_RULE_SYM maybe_space region_selector at_rule_header_end '{' at_rule_body_start maybe_space region_block_rule_body closing_brace {
         $$ = parser->createRegionRule($4, $9);
     }
   | before_region_rule WEBKIT_REGION_RULE_SYM at_rule_recovery {
         $$ = 0;
         parser->endRuleBody(true);
     }
 ;
 
 before_filter_rule:
     /* empty */ {
         parser->startRuleHeader(CSSRuleSourceData::FILTER_RULE);
         parser->m_inFilterRule = true;
     }
     ;
 
 filter:
-    before_filter_rule WEBKIT_FILTER_RULE_SYM WHITESPACE IDENT at_rule_header_end_maybe_space
+    before_filter_rule WEBKIT_FILTER_RULE_SYM maybe_space IDENT at_rule_header_end_maybe_space
     '{' at_rule_body_start maybe_space_before_declaration declaration_list closing_brace {
         parser->m_inFilterRule = false;
         $$ = parser->createFilterRule($4);
     }
   | before_filter_rule WEBKIT_FILTER_RULE_SYM at_rule_recovery {
         $$ = 0;
     }
     ;
 
 combinator:
@@ skipping 645 matching lines @@
   unary_term
   | VARFUNCTION maybe_space IDENT closing_parenthesis {
       $$.id = CSSValueInvalid;
       $$.string = $3;
       $$.unit = CSSPrimitiveValue::CSS_VARIABLE_NAME;
   }
   | unary_operator unary_term { $$ = $2; $$.fValue *= $1; }
   ;
 
 calc_func_operator:
-    WHITESPACE '+' WHITESPACE {
+    space '+' space {
         $$ = '+';
     }
-    | WHITESPACE '-' WHITESPACE {
+    | space '-' space {
         $$ = '-';
     }
     | calc_maybe_space '*' maybe_space {
         $$ = '*';
     }
     | calc_maybe_space '/' maybe_space {
         $$ = '/';
     }
   ;
 
@@ skipping 139 matching lines @@
 
 rule_error_recovery:
     /* empty */
   | rule_error_recovery error
   | rule_error_recovery invalid_square_brackets_block
   | rule_error_recovery invalid_parentheses_block
     ;
 
 %%