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 250 matching lines @@
 
 %type <mediaList> media_list
 %type <mediaList> maybe_media_list
 %type <mediaList> mq_list
 %type <mediaQuery> media_query
 %type <mediaQuery> valid_media_query
 %type <mediaQueryRestrictor> maybe_media_restrictor
 %type <valueList> maybe_media_value
 %type <mediaQueryExp> media_query_exp
 %type <mediaQueryExpList> media_query_exp_list
+%type <mediaQueryExpList> media_query_exp_list_space
+%type <mediaQueryExpList> media_query_exp_list_no_space
 %type <mediaQueryExpList> maybe_and_media_query_exp_list
 
 %type <boolean> supports_condition
 %type <boolean> supports_condition_in_parens
 %type <boolean> supports_negation
 %type <boolean> supports_conjunction
 %type <boolean> supports_disjunction
 %type <boolean> supports_declaration_condition
 
 %type <string> keyframe_name
@@ skipping 109 matching lines @@
             parser->m_selectorListForParseSelector->adoptSelectorVector(*$3);
     }
 ;
 
 internal_supports_condition:
     INTERNAL_SUPPORTS_CONDITION_SYM maybe_space supports_condition TOKEN_EOF {
         parser->m_supportsCondition = $3;
     }
 ;
 
+spaces:

[SeRya, 2013/09/23 09:12:43]

It should be 'space' for consistency with 'maybe_space'.

I see only way to get 2 or more sequential whitespaces is putting comments
between them. This grammar uses the token WHITESPACE several times. I guess that
places won't accept comments.

[rune, 2013/10/01 12:04:48]

Done.
The required WHITESPACE after @region and @filter are clearly mistakes. I've
replaced them with maybe_space like other @-rules use.

The use of WHITESPACE in descendant selectors works, so I haven't changed that.

The WHITESPACE in calc-expressions didn't allow comments with spaces on both
sides which the spec allows, AFAICT. Also, Gecko supports comments there, so
I've replaced WHITESPACE with "space".

+    WHITESPACE
+  | spaces WHITESPACE
+  ;
+
 maybe_space:
     /* empty */ %prec UNIMPORTANT_TOK
   | maybe_space WHITESPACE
   ;
 
 maybe_sgml:
     /* empty */
   | maybe_sgml SGML_CD
   | maybe_sgml WHITESPACE
   ;
@@ skipping 181 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_list_no_space:
     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 spaces media_query_exp {
         $$ = $1;
         $$->append(parser->sinkFloatingMediaQueryExp($4));
     }
     ;
 
+media_query_exp_list_space:

[SeRya, 2013/09/23 09:12:43]

Can "media_query_exp_list_space" be replaced by "media_query_exp_list_no_space
spaces" and "media_query_exp_list" by "media_query_exp_list_no_space
maybe_space"?

If so only one entity of 3 is really needed.

[rune, 2013/10/01 12:04:48]

Done. I've removed the _no_space part since there's now only one non-terminal
left.

+    media_query_exp_list_no_space spaces
+    ;
+
+media_query_exp_list:
+    media_query_exp_list_no_space
+    | media_query_exp_list_space
+    ;
+
 maybe_and_media_query_exp_list:
     /*empty*/ {
         $$ = parser->createFloatingMediaQueryExpList();
     }
-    | MEDIA_AND maybe_space media_query_exp_list {
-        $$ = $3;
+    | spaces {

[SeRya, 2013/09/23 09:12:43]

maybe_space {
    ....
}

To avoid conflicts redefine maybe_space through space:

maybe_space: /* empty */ | space.

[rune, 2013/10/01 12:04:48]

Done.

+        $$ = parser->createFloatingMediaQueryExpList();
+    }
+    | spaces MEDIA_AND spaces media_query_exp_list {
+        $$ = $4;
     }
     ;
 
 maybe_media_restrictor:
     /*empty*/ {
         $$ = MediaQuery::None;
     }
-    | MEDIA_ONLY maybe_space {
+    | MEDIA_ONLY spaces {
         $$ = MediaQuery::Only;
     }
-    | MEDIA_NOT maybe_space {
+    | MEDIA_NOT spaces {
         $$ = MediaQuery::Not;
     }
     ;
 
 valid_media_query:
     media_query_exp_list {
         $$ = parser->createFloatingMediaQuery(parser->sinkFloatingMediaQueryExpList($1));
     }
     | maybe_media_restrictor medium maybe_and_media_query_exp_list {
         parser->tokenToLowerCase($2);
@@ skipping 75 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 1176 matching lines @@
 
 rule_error_recovery:
     /* empty */
   | rule_error_recovery error
   | rule_error_recovery invalid_square_brackets_block
   | rule_error_recovery invalid_parentheses_block
     ;
 
 %%