[css2] Changed the tokens for '{', '+', ',' and '>' to include initial

bert-github · bert-github · commit c845873fe589 · 2003-07-14T15:27:12.000Z
whitespace. This means that a space followed by a '+' in a selector is
now seen as a single PLUS token, removing the ambiguity of spaces and
keeping the grammar LL(1).

--HG--
extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402113
diff --git a/css2/grammar.src b/css2/grammar.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<!-- $Id: grammar.src,v 2.30 2003-07-01 15:42:14 bbos Exp $ -->
+<!-- $Id: grammar.src,v 2.31 2003-07-14 15:27:12 bbos Exp $ -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <TITLE>Appendix: grammar of CSS&nbsp;2.1</TITLE>
@@ -28,7 +28,7 @@ find anything in the spec that corresponded. -->
 title="LL(1)">LL(1)</span> (but note that most UA's should not use it
 directly, since it doesn't express the <a
 href="syndata.html#parsing-errors">parsing conventions</a>, only the
-CSS&nbsp;2.1 syntax).  The format of the productions is optimized for human
+CSS&nbsp;2.1 syntax). The format of the productions is optimized for human
 consumption and some shorthand notation beyond Yacc (see [[YACC]]) is
 used:</P>
 
@@ -50,42 +50,45 @@ stylesheet
   ;
 import
   : IMPORT_SYM S*
-    [STRING|URI] S* [ medium [ ',' S* medium]* ]? ';' S*
+    [STRING|URI] S* [ medium [ COMMA S* medium]* ]? ';' S*
   ;
 media
-  : MEDIA_SYM S* medium [ ',' S* medium ]* '{' S* ruleset* '}' S*
+  : MEDIA_SYM S* medium [ COMMA S* medium ]* LBRACE S* ruleset* '}' S*
   ;
 medium
   : IDENT S*
   ;
 page
   : PAGE_SYM S* pseudo_page? S*
-    '{' S* declaration [ ';' S* declaration ]* '}' S*
+    LBRACE S* declaration [ ';' S* declaration ]* '}' S*
   ;
 pseudo_page
   : ':' IDENT
   ;
 operator
-  : '/' S* | ',' S* | /* empty */
+  : '/' S* | COMMA S* | /* empty */
   ;
 combinator
-  : '+' S* | '>' S* | /* empty */
+  : PLUS S*
+  | GREATER S*
+  | S+
   ;
 unary_operator
-  : '-' | '+'
+  : '-' | PLUS
   ;
 property
   : IDENT S*
   ;
 ruleset
-  : selector [ ',' S* selector ]*
-    '{' S* declaration [ ';' S* declaration ]* '}' S*
+  : selector [ COMMA S* selector ]*
+    LBRACE S* declaration [ ';' S* declaration ]* '}' S*
   ;
 <span class="index-inst" title="selector">selector</span>
   : simple_selector [ combinator simple_selector ]*
   ;
 simple_selector
-  : element_name? [ HASH | class | attrib | pseudo ]* S*
+  : element_name [ HASH | class | attrib | pseudo ]*
+  | [ HASH | class | attrib | pseudo ]+
   ;
 class
   : '.' IDENT
@@ -160,21 +163,27 @@ name		{nmchar}+
 num		[0-9]+|[0-9]*"."[0-9]+
 string		{string1}|{string2}
 url		([!#$%&amp;*-~]|{nonascii}|{escape})*
-w		[ \t\r\n\f]*
+s		[ \t\r\n\f]
+w		{s}*
 nl		\n|\r\n|\r|\f
 range		\?{1,6}|{h}(\?{0,5}|{h}(\?{0,4}|{h}(\?{0,3}|{h}(\?{0,2}|{h}(\??|{h})))))
 
 %%
 
-[ \t\r\n\f]+		{return S;}
+{s}+			{return S;}
 
 \/\*[^*]*\*+([^/*][^*]*\*+)*\/	/* ignore comments */
 
-"&lt;!--"			{return CDO;}
+"&lt;!--"		{return CDO;}
 "-->"			{return CDC;}
 "~="			{return INCLUDES;}
 "|="			{return DASHMATCH;}
 
+{w}"{"			{return LBRACE;}
+{w}"+"			{return PLUS;}
+{w}">"			{return GREATER;}
+{w}","			{return COMMA;}
+
 {string}		{return STRING;}
 
 {ident}			{return IDENT;}
