[css2] Issues 129 and 139 from http://wiki.csswg.org/spec/css2.1

bert-github · bert-github · commit c11153cfed32 · 2010-09-29T15:50:10.000Z
--HG--
extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%403030
diff --git a/css2/grammar.src b/css2/grammar.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html lang="en">
-<!-- $Id: grammar.src,v 2.62 2009-09-03 14:18:13 bbos Exp $ -->
+<!-- $Id: grammar.src,v 2.63 2010-09-29 15:50:10 bbos Exp $ -->
 <HEAD>
 <TITLE>Grammar of CSS&nbsp;2.1</TITLE>
 </HEAD>
@@ -153,15 +153,21 @@ nmstart		[_a-z]|{nonascii}|{escape}
 nmchar		[_a-z0-9-]|{nonascii}|{escape}
 string1		\"([^\n\r\f\\"]|\\{nl}|{escape})*\"
 string2		\'([^\n\r\f\\']|\\{nl}|{escape})*\'
-invalid1	\"([^\n\r\f\\"]|\\{nl}|{escape})*
-invalid2	\'([^\n\r\f\\']|\\{nl}|{escape})*
-
+badstring1      \"([^\n\r\f\\"]|\\{nl}|{escape})*\\?
+badstring2      \'([^\n\r\f\\']|\\{nl}|{escape})*\\?
+badcomment1     \/\*[^*]*\*+([^/*][^*]*\*+)*
+badcomment2     \/\*[^*]*(\*+[^/*][^*]*)*
+baduri1         url\({w}([!#$%&*-\[\]-~]|{nonascii}|{escape})*{w}
+baduri2         url\({w}{string}{w}
+baduri3         url\({w}{badstring}
 comment		\/\*[^*]*\*+([^/*][^*]*\*+)*\/
 ident		-?{nmstart}{nmchar}*
 name		{nmchar}+
 num		[0-9]+|[0-9]*"."[0-9]+
 string		{string1}|{string2}
-invalid		{invalid1}|{invalid2}
+badstring       {badstring1}|{badstring2}
+badcomment      {badcomment1}|{badcomment2}
+baduri          {baduri1}|{baduri2}|{baduri3}
 url		([!#$%&amp;*-~]|{nonascii}|{escape})*
 s		[ \t\r\n\f]+
 w		{s}?
@@ -192,14 +198,15 @@ Z		z|\\0{0,4}(5a|7a)(\r\n|[ \t\r\n\f])?|\\z
 {s}			{return S;}
 
 \/\*[^*]*\*+([^/*][^*]*\*+)*\/		/* ignore comments */
+{badcomment}                         /* unclosed comment at EOF */
 
 "&lt;!--"		{return CDO;}
 "-->"			{return CDC;}
 "~="			{return INCLUDES;}
 "|="			{return DASHMATCH;}
 
 {string}		{return STRING;}
-{invalid}		{return INVALID; /* unclosed string */}
+{badstring}             {return BAD_STRING);}
 
 {ident}			{return IDENT;}
 
@@ -234,6 +241,7 @@ Z		z|\\0{0,4}(5a|7a)(\r\n|[ \t\r\n\f])?|\\z
 
 {U}{R}{L}"("{w}{string}{w}")"	{return URI;}
 {U}{R}{L}"("{w}{url}{w}")"	{return URI;}
+{baduri}                        {return BAD_URI);}
 
 {ident}"("		{return FUNCTION;}
 
@@ -285,6 +293,36 @@ make ".55ft" a valid class, CSS2 requires the first digit to be
 escaped (".\35 5ft")
 </ul>
 
+<h2>Implementation note</h2>
+
+<p>This section is non-normative.
+
+<p>The lexical scanner for the CSS core syntax in <a
+href="syndata.html#tokenization">section&nbsp;4.1.1</a> can be
+implemented as a scanner without back-up. In Lex notation, that
+requires the addition of the following patterns (which do not change
+the returned tokens, only the efficiency of the scanner):
+
+<pre>
+{ident}/\\          return IDENT;
+#{name}/\\          return HASH;
+@{ident}/\\         return ATKEYWORD;
+#/\\                return DELIM;
+@/\\                return DELIM;
+@/-                 return DELIM;
+@/-\\               return DELIM;
+-/\\                return DELIM;
+-/-                 return DELIM;
+\</!                return DELIM;
+\</!-               return DELIM;
+{num}{ident}/\\     return DIMENSION;
+{num}/\\            return NUMBER;
+{num}/-             return NUMBER;
+{num}/-\\           return NUMBER;
+[0-9]+/\.           return NUMBER;
+u/\+                return IDENT;
+u\+[0-9a-f?]{1,6}/- return UNICODE_RANGE;
+</pre>
 
 </body>
 </html>
