[css2] Adapted grammar to allow control characters in strings and ignore unclosed string

bert-github · bert-github · commit 26594a3d22c6 · 2005-04-12T13:11:25.000Z
--HG--
extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402289
diff --git a/css2/syndata.src b/css2/syndata.src
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
         "http://www.w3.org/TR/1998/REC-html40-19980424/loose.dtd">
 <html lang="en">
-<!-- $Id: syndata.src,v 2.109 2005-03-22 14:31:04 bbos Exp $ -->
+<!-- $Id: syndata.src,v 2.110 2005-04-12 13:11:25 bbos Exp $ -->
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Syntax and basic data types</title>
@@ -58,6 +58,7 @@ Lex, in case of multiple matches, the longest match determines the token.
 <tr><td>IDENT		</td><td><code><var>{ident}</var></code></td></tr>
 <tr><td>ATKEYWORD	</td><td><code>@<var>{ident}</var></code></td></tr>
 <tr><td>STRING		</td><td><code><var>{string}</var></code></td></tr>
+<tr><td>INVALID		</td><td><code><var>{invalid}</var></code></td></tr>
 <tr><td>HASH		</td><td><code>#<var>{name}</var></code></td></tr>
 <tr><td>NUMBER		</td><td><code><var>{num}</var></code></td></tr>
 <tr><td>PERCENTAGE	</td><td><code><var>{num}</var>%</code></td></tr>
@@ -95,12 +96,15 @@ the above rules, and neither a single nor a double quote</var>
 <tr><td>nmstart	</td><td><code>[_a-zA-Z]|<var>{nonascii}</var>|<var>{escape}</var></code></td></tr>
 <tr><td>nonascii</td><td><code>[^\0-\177]</code></td></tr>
 <tr><td>unicode	</td><td><code>\\[0-9a-f]{1,6}(\r\n|[ \n\r\t\f])?</code></td></tr>
-<tr><td>escape	</td><td><code><var>{unicode}</var>|\\[ -~\200-\4177777]</code></td></tr>
+<tr><td>escape	</td><td><code><var>{unicode}</var>|\\[^\n\r\f0-9a-f]</code></td></tr>
 <tr><td>nmchar	</td><td><code>[_a-zA-Z0-9-]|<var>{nonascii}</var>|<var>{escape}</var></code></td></tr>
 <tr><td>num	</td><td><code>[0-9]+|[0-9]*\.[0-9]+</code></td></tr>
 <tr><td>string	</td><td><code><var>{string1}</var>|<var>{string2}</var></code></td></tr>
-<tr><td>string1	</td><td><code>\"([\t !#$%&amp;(-~]|\\{nl}|\'|<var>{nonascii}</var>|<var>{escape}</var>)*\"</code></td></tr>
-<tr><td>string2	</td><td><code>\'([\t !#$%&amp;(-~]|\\{nl}|\"|<var>{nonascii}</var>|<var>{escape}</var>)*\'</code></td></tr>
+<tr><td>string1	</td><td><code>\"([^\n\r\f\\"]|\\{nl}|<var>{escape}</var>)*\"</code></td></tr>
+<tr><td>string2	</td><td><code>\'([^\n\r\f\\']|\\{nl}|<var>{escape}</var>)*\'</code></td></tr>
+<tr><td>invalid	</td><td><code><var>{invalid1}</var>|<var>{invalid2}</var></code></td></tr>
+<tr><td>invalid1</td><td><code>\"([^\n\r\f\\"]|\\{nl}|<var>{escape}</var>)*</code></td></tr>
+<tr><td>invalid2</td><td><code>\'([^\n\r\f\\']|\\{nl}|<var>{escape}</var>)*</code></td></tr>
 <tr><td>nl	</td><td><code>\n|\r\n|\r|\f</code></td></tr>
 <tr><td>w	</td><td><code>[ \t\r\n\f]*</code></td></tr>
 </table>
