- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Sun, 11 Oct 2009 09:19:40 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/parser/analyzer
In directory hutz:/tmp/cvs-serv5904
Modified Files:
CssParser.java CssParser.jj CssParserTokenManager.java
Log Message:
Fixed URL definition per CSS2.1 grammar (basically allowing ',' in the production)
Index: CssParserTokenManager.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParserTokenManager.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- CssParserTokenManager.java 13 Feb 2009 21:50:15 -0000 1.32
+++ CssParserTokenManager.java 11 Oct 2009 09:19:38 -0000 1.33
@@ -2786,7 +2786,7 @@
jjCheckNAddStates(1380, 1387);
break;
case 484:
- if ((0xffffec7a00000000L & l) != 0L)
+ if ((0xfffffc7a00000000L & l) != 0L)
jjCheckNAddStates(1388, 1391);
break;
case 486:
Index: CssParser.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParser.java,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- CssParser.java 1 Mar 2009 09:06:16 -0000 1.67
+++ CssParser.java 11 Oct 2009 09:19:37 -0000 1.68
@@ -3384,7 +3384,8 @@
}
exp = expr();
jj_consume_token(LPARAN);
- if (n.image.toLowerCase().equals("rgb(")) {
+ String funcname = n.image.toLowerCase();
+ if (funcname.equals("rgb(")) {
if (!getAtRule().toString().equals("@media atsc-tv")) {
color.setRGBColor(exp, ac);
{if (true) return color;}
Index: CssParser.jj
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParser.jj,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- CssParser.jj 6 Jul 2009 16:54:56 -0000 1.68
+++ CssParser.jj 11 Oct 2009 09:19:37 -0000 1.69
@@ -406,7 +406,7 @@
| < #NUM : ( ["0"-"9"] )+ | ( ["0"-"9"] )* "." ( ["0"-"9"] )+ >
| < #_STRING : <STRING1> | <STRING2> >
| < #_INVALID : <INVALID1> | <INVALID2> >
- | < #_URL : ( [ "!", "#", "$", "%", "&", "*", "+", "-"-"[", "]"-"~" ] | <NONASCII> | <ESCAPE> )* >
+ | < #_URL : ( [ "!", "#", "$", "%", "&", "*"-"[", "]"-"~" ] | <NONASCII> | <ESCAPE> )* >
| < #_S : ( [ " ", "\t" , "\n" , "\r", "\f" ] ) ( <COMMENT> | [ " ", "\t" , "\n" , "\r", "\f" ] )* >
| < #_W : ( <_S> )? >
| < #NL : ( "\n" | "\r\n" | "\r" | "\f" ) >
Received on Sunday, 11 October 2009 09:19:44 UTC