W3C home > Mailing lists > Public > www-validator-cvs@w3.org > March 2008

2002/css-validator/org/w3c/css/parser/analyzer CssParser.java,1.30,1.31 CssParserConstants.java,1.9,1.10 CssParserTokenManager.java,1.19,1.20

From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
Date: Thu, 13 Mar 2008 14:26:01 +0000
To: www-validator-cvs@w3.org
Message-Id: <E1JZoNd-0006pB-5F@lionel-hutz.w3.org>

Update of /sources/public/2002/css-validator/org/w3c/css/parser/analyzer
In directory hutz:/tmp/cvs-serv26177

Modified Files:
	CssParser.java CssParserConstants.java 
	CssParserTokenManager.java 
Log Message:
fixing 4469, see CssParser.jj log for more details

Index: CssParserTokenManager.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParserTokenManager.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- CssParserTokenManager.java	12 Mar 2008 16:24:00 -0000	1.19
+++ CssParserTokenManager.java	13 Mar 2008 14:25:58 -0000	1.20
@@ -62,8 +62,6 @@
    switch (pos)
    {
       case 0:
-         if ((active0 & 0x80002000000L) != 0L)
-            return 127;
          if ((active1 & 0x1fff0L) != 0L)
             return 37;
          if ((active0 & 0x4000000L) != 0L)
@@ -71,26 +69,24 @@
             jjmatchedKind = 32;
             return -1;
[...5709 lines suppressed...]
@@ -4432,8 +5298,8 @@
    0xaL, 0x0L, 
 };
 protected SimpleCharStream input_stream;
-private final int[] jjrounds = new int[443];
-private final int[] jjstateSet = new int[886];
+private final int[] jjrounds = new int[574];
+private final int[] jjstateSet = new int[1148];
 protected char curChar;
 public CssParserTokenManager(SimpleCharStream stream){
    if (SimpleCharStream.staticFlag)
@@ -4455,7 +5321,7 @@
 {
    int i;
    jjround = 0x80000001;
-   for (i = 443; i-- > 0;)
+   for (i = 574; i-- > 0;)
       jjrounds[i] = 0x80000000;
 }
 public void ReInit(SimpleCharStream stream, int lexState)

Index: CssParser.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParser.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- CssParser.java	12 Mar 2008 16:24:00 -0000	1.30
+++ CssParser.java	13 Mar 2008 14:25:58 -0000	1.31
@@ -59,7 +59,7 @@
 /**
  * A CSS3 parser  
  *
- * @author Philippe Le H???garet and Sijtsche Smeman
+ * @author Philippe Le Hegaret and Sijtsche Smeman
  * @version $Revision$
  */
 public abstract class CssParser implements CssParserConstants {
@@ -334,81 +334,111 @@
  * @exception ParseException exception during the parse
  */
[...1782 lines suppressed...]
-    for (int i = 0; i < 111; i++) {
+    for (int i = 0; i < 113; i++) {
       if (jj_la1[i] == jj_gen) {
         for (int j = 0; j < 32; j++) {
           if ((jj_la1_0[i] & (1<<j)) != 0) {
@@ -3282,10 +3324,13 @@
           if ((jj_la1_2[i] & (1<<j)) != 0) {
             la1tokens[64+j] = true;
           }
+          if ((jj_la1_3[i] & (1<<j)) != 0) {
+            la1tokens[96+j] = true;
+          }
         }
       }
     }
-    for (int i = 0; i < 95; i++) {
+    for (int i = 0; i < 97; i++) {
       if (la1tokens[i]) {
         jj_expentry = new int[1];
         jj_expentry[0] = i;

Index: CssParserConstants.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParserConstants.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- CssParserConstants.java	12 Mar 2008 16:24:00 -0000	1.9
+++ CssParserConstants.java	13 Mar 2008 14:25:58 -0000	1.10
@@ -95,6 +95,8 @@
   int CLASS = 92;
   int FUNCTIONLANG = 93;
   int FUNCTION = 94;
+  int HTMLSTARTTAG = 95;
+  int HTMLENDTAG = 96;
 
   int DEFAULT = 0;
   int IN_COMMENT = 1;
@@ -195,6 +197,8 @@
     "<CLASS>",
     "\"lang(\"",
     "<FUNCTION>",
+    "<HTMLSTARTTAG>",
+    "<HTMLENDTAG>",
   };
 
 }
Received on Thursday, 13 March 2008 14:26:32 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Thursday, 26 April 2012 12:55:00 GMT