- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Mon, 08 Aug 2005 13:18:14 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/parser/analyzer
In directory hutz:/tmp/cvs-serv27412/org/w3c/css/parser/analyzer
Modified Files:
CommentSkipperInputStream.java CssParser.java CssParser.jj
CssParserTokenManager.java
Log Message:
All those changed made by Jean-Guilhem Rouel:
Huge patch, imports fixed (automatic)
Bug fixed: 372, 920, 778, 287, 696, 764, 233
Partial bug fix for 289
Issue with "inherit" in CSS2.
The validator now checks the number of values (extraneous values were previously ignored)
Index: CssParserTokenManager.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParserTokenManager.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- CssParserTokenManager.java 30 Mar 2004 13:24:18 -0000 1.8
+++ CssParserTokenManager.java 8 Aug 2005 13:18:11 -0000 1.9
@@ -1,42 +1,5 @@
/* Generated By:JavaCC: Do not edit this line. CssParserTokenManager.java */
package org.w3c.css.parser.analyzer;
-import java.io.InputStream;
-import java.util.Vector;
-import java.util.Enumeration;
-import java.net.URL;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssString;
-import org.w3c.css.values.CssURL;
-import org.w3c.css.values.CssLength;
-import org.w3c.css.values.CssNumber;
-import org.w3c.css.values.CssColor;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssPercentage;
-import org.w3c.css.values.CssFrequency;
-import org.w3c.css.values.CssTime;
-import org.w3c.css.values.CssDate;
-import org.w3c.css.values.CssAngle;
-import org.w3c.css.values.CssFunction;
-import org.w3c.css.values.CssUnicodeRange;
-import org.w3c.css.values.CssResolution;
-import org.w3c.css.properties.CssProperty;
-import org.w3c.css.parser.Frame;
-import org.w3c.css.util.ApplContext;
-import org.w3c.css.parser.CssError;
-import org.w3c.css.parser.CssSelectors;
-import org.w3c.css.parser.CssParseException;
-import org.w3c.css.parser.AtRule;
-import org.w3c.css.parser.AtRuleMedia;
-import org.w3c.css.parser.AtRuleFontFace;
-import org.w3c.css.parser.AtRulePage;
-import org.w3c.css.parser.AtRulePreference;
-import org.w3c.css.parser.AtRulePhoneticAlphabet;
-import org.w3c.css.svgproperties.AtRuleColorProfile;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.Util;
-import org.w3c.css.util.Messages;
-import org.w3c.css.css.StyleSheetCom;
public class CssParserTokenManager implements CssParserConstants
{
Index: CssParser.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParser.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- CssParser.java 5 Apr 2004 17:02:36 -0000 1.14
+++ CssParser.java 8 Aug 2005 13:18:11 -0000 1.15
@@ -2,48 +2,44 @@
package org.w3c.css.parser.analyzer;
import java.io.InputStream;
-import java.util.Vector;
-import java.util.Enumeration;
import java.net.URL;
+import java.util.Enumeration;
+import java.util.Vector;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssString;
-import org.w3c.css.values.CssURL;
-import org.w3c.css.values.CssLength;
-import org.w3c.css.values.CssNumber;
-import org.w3c.css.values.CssColor;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssPercentage;
-import org.w3c.css.values.CssFrequency;
-import org.w3c.css.values.CssTime;
-import org.w3c.css.values.CssDate;
-import org.w3c.css.values.CssAngle;
-import org.w3c.css.values.CssFunction;
-import org.w3c.css.values.CssUnicodeRange;
-import org.w3c.css.values.CssResolution;
-import org.w3c.css.properties.CssProperty;
-import org.w3c.css.parser.Frame;
-import org.w3c.css.util.ApplContext;
-import org.w3c.css.parser.CssError;
-import org.w3c.css.parser.CssSelectors;
-import org.w3c.css.parser.CssParseException;
import org.w3c.css.parser.AtRule;
-import org.w3c.css.parser.AtRuleMedia;
import org.w3c.css.parser.AtRuleFontFace;
+import org.w3c.css.parser.AtRuleMedia;
import org.w3c.css.parser.AtRulePage;
-import org.w3c.css.parser.AtRulePreference;
import org.w3c.css.parser.AtRulePhoneticAlphabet;
+import org.w3c.css.parser.AtRulePreference;
+import org.w3c.css.parser.CssError;
+import org.w3c.css.parser.CssParseException;
+import org.w3c.css.parser.CssSelectors;
+import org.w3c.css.properties.CssProperty;
import org.w3c.css.svgproperties.AtRuleColorProfile;
+import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.Util;
-import org.w3c.css.util.Messages;
-import org.w3c.css.css.StyleSheetCom;
+import org.w3c.css.values.CssAngle;
+import org.w3c.css.values.CssDate;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssFrequency;
+import org.w3c.css.values.CssFunction;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssLength;
+import org.w3c.css.values.CssNumber;
+import org.w3c.css.values.CssPercentage;
+import org.w3c.css.values.CssResolution;
+import org.w3c.css.values.CssString;
+import org.w3c.css.values.CssTime;
+import org.w3c.css.values.CssURL;
+import org.w3c.css.values.CssUnicodeRange;
+import org.w3c.css.values.CssValue;
/**
* A CSS3 parser
*
- * @author Philippe Le Hégaret and Sijtsche Smeman
+ * @author Philippe Le H�garet and Sijtsche Smeman
* @version $Revision$
*/
public abstract class CssParser implements CssParserConstants {
@@ -251,8 +247,7 @@
if (ac.getCssVersion().equals("css1") && (n.image).equals("inherit")) {
incompatible_error = true;
- }
-
+ }
if (n.kind == CssParserConstants.IDENT) {
v.set( convertIdent(operator+n.image).trim(), ac);
} else if (n.kind == CssParserConstants.STRING) {
@@ -1379,9 +1374,11 @@
* @exception ParseException exception during the parse
*/
final public void atRuleDeclaration() throws ParseException {
- Token n;
- n = jj_consume_token(ATKEYWORD);
- ac.getFrame().addWarning("at-rule", token.toString());
+ Token n;
+ n = jj_consume_token(ATKEYWORD);
+ //ac.getFrame().addWarning("at-rule", token.toString());
+ ac.getFrame().addError(
+ new CssError(new InvalidParamException("at-rule", token, ac)));
skipStatement();
}
@@ -2652,7 +2649,7 @@
}
jj_consume_token(S);
}
- values = expr();
+ values = expr();
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case IMPORTANT_SYM:
important = prio();
@@ -2730,7 +2727,7 @@
*/
final public CssExpression expr() throws ParseException {
CssExpression values = new CssExpression();
- term(values);
+ term(values);
label_79:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -2769,7 +2766,7 @@
default:
jj_la1[112] = jj_gen;
;
- }
+ }
term(values);
}
{if (true) return values;}
@@ -2927,8 +2924,8 @@
jj_la1[116] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
- }
- label_81:
+ }
+ label_81:
while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case S:
@@ -2945,7 +2942,7 @@
jj_la1[118] = jj_gen;
jj_consume_token(-1);
throw new ParseException();
- }
+ }
}
/**
Index: CssParser.jj
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParser.jj,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- CssParser.jj 30 Mar 2004 13:24:18 -0000 1.13
+++ CssParser.jj 8 Aug 2005 13:18:11 -0000 1.14
@@ -61,7 +61,7 @@
/**
* A CSS3 parser
*
- * @author Philippe Le Hégaret and Sijtsche Smeman
+ * @author Philippe Le H�garet and Sijtsche Smeman
* @version $Revision$
*/
public abstract class CssParser {
@@ -959,7 +959,9 @@
{
n=<ATKEYWORD>
{
- ac.getFrame().addWarning("at-rule", token.toString());
+ //ac.getFrame().addWarning("at-rule", token.toString());
+ ac.getFrame().addError(
+ new CssError(new InvalidParamException("at-rule", token, ac)));
skipStatement();
}
}
Index: CommentSkipperInputStream.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CommentSkipperInputStream.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CommentSkipperInputStream.java 8 Apr 2002 21:24:03 -0000 1.2
+++ CommentSkipperInputStream.java 8 Aug 2005 13:18:11 -0000 1.3
@@ -13,8 +13,8 @@
*/
package org.w3c.css.parser.analyzer;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
/**
Received on Monday, 8 August 2005 13:20:22 UTC