W3C home > Mailing lists > Public > www-validator-cvs@w3.org > April 2012

2002/css-validator/org/w3c/css/parser/analyzer CssParser.java,1.81,1.82 CssParser.jj,1.79,1.80 CssParserConstants.java,1.18,1.19 CssParserTokenManager.java,1.41,1.42

From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
Date: Tue, 03 Apr 2012 14:20:56 +0000
To: www-validator-cvs@w3.org
Message-Id: <E1SF4bQ-0004kV-78@lionel-hutz.w3.org>
Update of /sources/public/2002/css-validator/org/w3c/css/parser/analyzer
In directory hutz:/tmp/cvs-serv18166/w3c/css/parser/analyzer

Modified Files:
	CssParser.java CssParser.jj CssParserConstants.java 
	CssParserTokenManager.java 
Log Message:
prepared to replace '/' instances from 'Operator' as in CSS2 to a 'switch' per css3. adapted some classes because of that (expect breakage on font before it's rewritten), fixed 'background' to be in sync with the http://www.w3.org/TR/2012/WD-css3-background-20120214/ spec

Index: CssParserTokenManager.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParserTokenManager.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- CssParserTokenManager.java	22 Oct 2011 13:36:23 -0000	1.41
+++ CssParserTokenManager.java	3 Apr 2012 14:20:53 -0000	1.42
@@ -17,8 +17,8 @@
 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.CssSwitch;
 import org.w3c.css.values.CssFunction;
 import org.w3c.css.values.CssUnicodeRange;
 import org.w3c.css.values.CssResolution;
@@ -100,7 +100,7 @@
          return jjMoveNfa_0(7, 0);
[...6230 lines suppressed...]
@@ -6262,8 +6189,8 @@
    0x2L, 0x0L, 
 };
 protected SimpleCharStream input_stream;
-private final int[] jjrounds = new int[760];
-private final int[] jjstateSet = new int[1520];
+private final int[] jjrounds = new int[744];
+private final int[] jjstateSet = new int[1488];
 protected char curChar;
 /** Constructor. */
 public CssParserTokenManager(SimpleCharStream stream){
@@ -6290,7 +6217,7 @@
 {
    int i;
    jjround = 0x80000001;
-   for (i = 760; i-- > 0;)
+   for (i = 744; i-- > 0;)
       jjrounds[i] = 0x80000000;
 }
 

Index: CssParser.jj
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParser.jj,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- CssParser.jj	22 Oct 2011 13:36:23 -0000	1.79
+++ CssParser.jj	3 Apr 2012 14:20:53 -0000	1.80
@@ -39,8 +39,8 @@
 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.CssSwitch;
 import org.w3c.css.values.CssFunction;
 import org.w3c.css.values.CssUnicodeRange;
 import org.w3c.css.values.CssResolution;
@@ -543,7 +543,6 @@
   | < FREQ       : <NUM> "Hz" | <NUM> "kHz" >
   | < RESOLUTION : <NUM> "dpi" | <NUM> "dpcm" >
   | < RATIO      : <NUM> ( <_S> )* "/" ( <_S> )* <NUM> >
-  | < DATE       : <NUM> "/" <NUM> "/" <NUM> >
   | < DIMEN      : <NUM> <NMSTART> ( <NMCHAR> )* >
   | < PERCENTAGE : <NUM> "%" >
   | < NUMBER     : <NUM> >
@@ -1284,8 +1283,7 @@
 void operator(CssExpression expr) :
 {}
 {
-  ( ( <DIV> { if (expr.getCount() > 0) expr.setOperator('/'); }
-    | <COMMA> { if (expr.getCount() > 0) expr.setOperator(','); }
+  ( (  <COMMA> { if (expr.getCount() > 0) expr.setOperator(','); }
     ) ( <S> )* )?
 }
 
@@ -2142,12 +2140,12 @@
     | n=<FREQ> { setValue(new CssFrequency(), exp, operator, n, FREQ); }
     | n=<RESOLUTION> { setValue(new CssResolution(), exp, operator, n, RESOLUTION); }
     | n=<RATIO> { setValue(new CssRatio(), exp, operator, n, RATIO); }
-    | n=<DATE> { setValue(new CssDate(), exp, operator, n, DATE); }
-    | n=<DIMEN> {  
+    | n=<DIMEN> {
 	  addError(new ParseException(ac.getMsg().getString("parser.unknown-dimension")), n.image); }    
     | func=function() { setValue(func, exp, operator, null, FUNCTION); }
       ) ( <S> )* )
   | (( n=<STRING> { setValue(new CssString(), exp, operator, n, STRING); }
+  | ( n=<DIV> ) { setValue(new CssSwitch(), exp, operator, n, DIV); }
     | n=<IDENT> 
     {
 	/*

Index: CssParser.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParser.java,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- CssParser.java	22 Oct 2011 13:36:22 -0000	1.81
+++ CssParser.java	3 Apr 2012 14:20:53 -0000	1.82
@@ -19,8 +19,8 @@
 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.CssSwitch;
 import org.w3c.css.values.CssFunction;
 import org.w3c.css.values.CssUnicodeRange;
 import org.w3c.css.values.CssResolution;
@@ -617,7 +617,7 @@
       case PSEUDOELEMENT_SYM:
       case CLASS:
       case FUNCTIONNOT:
-      case 99:
+      case 98:
         ruleSet();
         break;
       case MEDIA_SYM:
@@ -966,7 +966,7 @@
         case PSEUDOELEMENT_SYM:
         case CLASS:
         case FUNCTIONNOT:
-        case 99:
+        case 98:
           ;
           break;
         default:
@@ -1779,21 +1779,8 @@
   final public void operator(CssExpression expr) throws ParseException {
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case COMMA:
-    case DIV:
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case DIV:
-        jj_consume_token(DIV);
-              if (expr.getCount() > 0) expr.setOperator('/');
-        break;
-      case COMMA:
-        jj_consume_token(COMMA);
-                if (expr.getCount() > 0) expr.setOperator(',');
-        break;
-      default:
-        jj_la1[68] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
-      }
+      jj_consume_token(COMMA);
+                 if (expr.getCount() > 0) expr.setOperator(',');
       label_55:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1801,14 +1788,14 @@
           ;
           break;
         default:
-          jj_la1[69] = jj_gen;
+          jj_la1[68] = jj_gen;
           break label_55;
         }
         jj_consume_token(S);
       }
       break;
     default:
-      jj_la1[70] = jj_gen;
+      jj_la1[69] = jj_gen;
       ;
     }
   }
@@ -1836,7 +1823,7 @@
                     connector = '~' ;
         break;
       default:
-        jj_la1[71] = jj_gen;
+        jj_la1[70] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -1847,7 +1834,7 @@
           ;
           break;
         default:
-          jj_la1[72] = jj_gen;
+          jj_la1[71] = jj_gen;
           break label_56;
         }
         jj_consume_token(S);
@@ -1862,14 +1849,14 @@
           ;
           break;
         default:
-          jj_la1[73] = jj_gen;
+          jj_la1[72] = jj_gen;
           break label_57;
         }
       }
                  connector = ' ' ;
       break;
     default:
-      jj_la1[74] = jj_gen;
+      jj_la1[73] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -1891,7 +1878,7 @@
                {if (true) return '+';}
       break;
     default:
-      jj_la1[75] = jj_gen;
+      jj_la1[74] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -1911,7 +1898,7 @@
         ;
         break;
       default:
-        jj_la1[76] = jj_gen;
+        jj_la1[75] = jj_gen;
         break label_58;
       }
       jj_consume_token(S);
@@ -1941,7 +1928,7 @@
           ;
           break;
         default:
-          jj_la1[77] = jj_gen;
+          jj_la1[76] = jj_gen;
           break label_59;
         }
         jj_consume_token(COMMA);
@@ -1952,7 +1939,7 @@
             ;
             break;
           default:
-            jj_la1[78] = jj_gen;
+            jj_la1[77] = jj_gen;
             break label_60;
           }
           jj_consume_token(S);
@@ -1971,7 +1958,7 @@
           ;
           break;
         default:
-          jj_la1[79] = jj_gen;
+          jj_la1[78] = jj_gen;
           break label_61;
         }
         jj_consume_token(S);
@@ -1985,7 +1972,7 @@
           ;
           break;
         default:
-          jj_la1[80] = jj_gen;
+          jj_la1[79] = jj_gen;
           break label_62;
         }
         jj_consume_token(S);
@@ -2051,7 +2038,7 @@
           currentProperty = null;
       break;
     default:
-      jj_la1[81] = jj_gen;
+      jj_la1[80] = jj_gen;
       ;
     }
     label_63:
@@ -2061,7 +2048,7 @@
         ;
         break;
       default:
-        jj_la1[82] = jj_gen;
+        jj_la1[81] = jj_gen;
         break label_63;
       }
       jj_consume_token(SEMICOLON);
@@ -2072,7 +2059,7 @@
           ;
           break;
         default:
-          jj_la1[83] = jj_gen;
+          jj_la1[82] = jj_gen;
           break label_64;
         }
         jj_consume_token(S);
@@ -2089,7 +2076,7 @@
                 currentProperty = null;
         break;
       default:
-        jj_la1[84] = jj_gen;
+        jj_la1[83] = jj_gen;
         ;
       }
     }
@@ -2120,7 +2107,7 @@
           ;
           break;
         default:
-          jj_la1[85] = jj_gen;
+          jj_la1[84] = jj_gen;
           break label_65;
         }
         comb = combinator();
@@ -2213,7 +2200,7 @@
         ;
         break;
       default:
-        jj_la1[86] = jj_gen;
+        jj_la1[85] = jj_gen;
         break label_66;
       }
       label_67:
@@ -2224,7 +2211,7 @@
           ;
           break;
         default:
-          jj_la1[87] = jj_gen;
+          jj_la1[86] = jj_gen;
           break label_67;
         }
       }
@@ -2243,7 +2230,7 @@
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case IDENT:
     case ANY:
-    case 99:
+    case 98:
       element_name(selector);
       label_68:
       while (true) {
@@ -2266,7 +2253,7 @@
           ;
           break;
         default:
-          jj_la1[88] = jj_gen;
+          jj_la1[87] = jj_gen;
           break label_68;
         }
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -2296,7 +2283,7 @@
           negation(selector);
           break;
         default:
-          jj_la1[89] = jj_gen;
+          jj_la1[88] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -2347,7 +2334,7 @@
           negation(selector);
           break;
         default:
-          jj_la1[90] = jj_gen;
+          jj_la1[89] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -2370,14 +2357,14 @@
           ;
           break;
         default:
-          jj_la1[91] = jj_gen;
+          jj_la1[90] = jj_gen;
           break label_69;
         }
       }
             {if (true) return selector;}
       break;
     default:
-      jj_la1[92] = jj_gen;
+      jj_la1[91] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2470,7 +2457,7 @@
         }
       break;
     default:
-      jj_la1[93] = jj_gen;
+      jj_la1[92] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2504,7 +2491,7 @@
       n = jj_consume_token(DIMEN);
       break;
     default:
-      jj_la1[94] = jj_gen;
+      jj_la1[93] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2531,16 +2518,16 @@
           n = jj_consume_token(ANY);
           break;
         default:
-          jj_la1[95] = jj_gen;
+          jj_la1[94] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
         break;
       default:
-        jj_la1[96] = jj_gen;
+        jj_la1[95] = jj_gen;
         ;
       }
-      p = jj_consume_token(99);
+      p = jj_consume_token(98);
     } else {
       ;
     }
@@ -2588,7 +2575,7 @@
         }
       break;
     default:
-      jj_la1[97] = jj_gen;
+      jj_la1[96] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2609,7 +2596,7 @@
         ;
         break;
       default:
-        jj_la1[98] = jj_gen;
+        jj_la1[97] = jj_gen;
         break label_70;
       }
       jj_consume_token(S);
@@ -2622,7 +2609,7 @@
         ;
         break;
       default:
-        jj_la1[99] = jj_gen;
+        jj_la1[98] = jj_gen;
         break label_71;
       }
       jj_consume_token(S);
@@ -2660,7 +2647,7 @@
                              selectorType = CssSelectors.ATTRIBUTE_SUBSTR;
         break;
       default:
-        jj_la1[100] = jj_gen;
+        jj_la1[99] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -2671,7 +2658,7 @@
           ;
           break;
         default:
-          jj_la1[101] = jj_gen;
+          jj_la1[100] = jj_gen;
           break label_72;
         }
         jj_consume_token(S);
@@ -2686,7 +2673,7 @@
                  val.image = convertStringIndex(val.image, 1, val.image.length() -1, false);
         break;
       default:
-        jj_la1[102] = jj_gen;
+        jj_la1[101] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -2697,14 +2684,14 @@
           ;
           break;
         default:
-          jj_la1[103] = jj_gen;
+          jj_la1[102] = jj_gen;
           break label_73;
         }
         jj_consume_token(S);
       }
       break;
     default:
-      jj_la1[104] = jj_gen;
+      jj_la1[103] = jj_gen;
       ;
     }
     jj_consume_token(RBRACKET);
@@ -2788,7 +2775,7 @@
         ;
         break;
       default:
-        jj_la1[105] = jj_gen;
+        jj_la1[104] = jj_gen;
         break label_74;
       }
       jj_consume_token(S);
@@ -2796,7 +2783,7 @@
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case IDENT:
     case ANY:
-    case 99:
+    case 98:
       element_name(ns);
       break;
     case HASHIDENT:
@@ -2822,7 +2809,7 @@
       pseudo(ns);
       break;
     default:
-      jj_la1[106] = jj_gen;
+      jj_la1[105] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2833,7 +2820,7 @@
         ;
         break;
       default:
-        jj_la1[107] = jj_gen;
+        jj_la1[106] = jj_gen;
         break label_75;
       }
       jj_consume_token(S);
@@ -2893,7 +2880,7 @@
               ;
               break;
             default:
-              jj_la1[108] = jj_gen;
+              jj_la1[107] = jj_gen;
               break label_76;
             }
             jj_consume_token(S);
@@ -2909,7 +2896,7 @@
             language = jj_consume_token(STRING);
             break;
           default:
-            jj_la1[109] = jj_gen;
+            jj_la1[108] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
@@ -2920,7 +2907,7 @@
               ;
               break;
             default:
-              jj_la1[110] = jj_gen;
+              jj_la1[109] = jj_gen;
               break label_77;
             }
             jj_consume_token(S);
@@ -2943,7 +2930,7 @@
               ;
               break;
             default:
-              jj_la1[111] = jj_gen;
+              jj_la1[110] = jj_gen;
               break label_78;
             }
             jj_consume_token(S);
@@ -2960,20 +2947,20 @@
                 }
           break;
         default:
-          jj_la1[112] = jj_gen;
+          jj_la1[111] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
         jj_consume_token(LPARAN);
         break;
       default:
-        jj_la1[113] = jj_gen;
+        jj_la1[112] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
       break;
     default:
-      jj_la1[114] = jj_gen;
+      jj_la1[113] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3049,7 +3036,7 @@
       {if (true) throw new ParseException(ac.getMsg().getString("parser.invalid_id_selector"));}
       break;
     default:
-      jj_la1[115] = jj_gen;
+      jj_la1[114] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3075,7 +3062,7 @@
             ;
             break;
           default:
-            jj_la1[116] = jj_gen;
+            jj_la1[115] = jj_gen;
             break label_79;
           }
           jj_consume_token(S);
@@ -3086,12 +3073,12 @@
           important = prio();
           break;
         default:
-          jj_la1[117] = jj_gen;
+          jj_la1[116] = jj_gen;
           ;
         }
         break;
       default:
-        jj_la1[118] = jj_gen;
+        jj_la1[117] = jj_gen;
         ;
       }
         try {
@@ -3143,7 +3130,7 @@
           ;
           break;
         default:
-          jj_la1[119] = jj_gen;
+          jj_la1[118] = jj_gen;
           break label_80;
         }
         jj_consume_token(S);
@@ -3154,7 +3141,7 @@
         important = prio();
         break;
       default:
-        jj_la1[120] = jj_gen;
+        jj_la1[119] = jj_gen;
         ;
       }
         try {
@@ -3219,7 +3206,7 @@
         ;
         break;
       default:
-        jj_la1[121] = jj_gen;
+        jj_la1[120] = jj_gen;
         break label_81;
       }
       jj_consume_token(S);
@@ -3260,7 +3247,7 @@
                       setValue(new CssIdent(), exp, operator, n, IDENT);
         break;
       default:
-        jj_la1[122] = jj_gen;
+        jj_la1[121] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -3271,7 +3258,7 @@
           ;
           break;
         default:
-          jj_la1[123] = jj_gen;
+          jj_la1[122] = jj_gen;
           break label_83;
         }
         jj_consume_token(S);
@@ -3286,7 +3273,7 @@
         ;
         break;
       default:
-        jj_la1[124] = jj_gen;
+        jj_la1[123] = jj_gen;
         break label_82;
       }
     }
@@ -3320,7 +3307,6 @@
       case FREQ:
       case RESOLUTION:
       case RATIO:
-      case DATE:
       case DIMEN:
       case PERCENTAGE:
       case NUMBER:
@@ -3329,7 +3315,7 @@
         ;
         break;
       default:
-        jj_la1[125] = jj_gen;
+        jj_la1[124] = jj_gen;
         break label_84;
       }
       operator(values);
@@ -3357,7 +3343,6 @@
     case FREQ:
     case RESOLUTION:
     case RATIO:
-    case DATE:
     case DIMEN:
     case PERCENTAGE:
     case NUMBER:
@@ -3368,7 +3353,7 @@
         operator = unaryOperator();
         break;
       default:
-        jj_la1[126] = jj_gen;
+        jj_la1[125] = jj_gen;
         ;
       }
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -3413,10 +3398,6 @@
         n = jj_consume_token(RATIO);
                   setValue(new CssRatio(), exp, operator, n, RATIO);
         break;
-      case DATE:
-        n = jj_consume_token(DATE);
-                 setValue(new CssDate(), exp, operator, n, DATE);
-        break;
       case DIMEN:
         n = jj_consume_token(DIMEN);
           addError(new ParseException(ac.getMsg().getString("parser.unknown-dimension")), n.image);
@@ -3426,7 +3407,7 @@
                         setValue(func, exp, operator, null, FUNCTION);
         break;
       default:
-        jj_la1[127] = jj_gen;
+        jj_la1[126] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -3437,7 +3418,7 @@
           ;
           break;
         default:
-          jj_la1[128] = jj_gen;
+          jj_la1[127] = jj_gen;
           break label_85;
         }
         jj_consume_token(S);
@@ -3447,6 +3428,7 @@
     case IDENT:
     case HASHIDENT:
     case HASH:
+    case DIV:
     case URL:
     case UNICODERANGE:
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -3454,6 +3436,10 @@
         n = jj_consume_token(STRING);
                     setValue(new CssString(), exp, operator, n, STRING);
         break;
+      case DIV:
+        n = jj_consume_token(DIV);
+                  setValue(new CssSwitch(), exp, operator, n, DIV);
+        break;
       case IDENT:
         n = jj_consume_token(IDENT);
         /*
@@ -3494,7 +3480,7 @@
                                 UNICODERANGE);
         break;
       default:
-        jj_la1[129] = jj_gen;
+        jj_la1[128] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -3505,14 +3491,14 @@
           ;
           break;
         default:
-          jj_la1[130] = jj_gen;
+          jj_la1[129] = jj_gen;
           break label_86;
         }
         jj_consume_token(S);
       }
       break;
     default:
-      jj_la1[131] = jj_gen;
+      jj_la1[130] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3533,7 +3519,7 @@
         ;
         break;
       default:
-        jj_la1[132] = jj_gen;
+        jj_la1[131] = jj_gen;
         break label_87;
       }
       jj_consume_token(S);
@@ -3575,7 +3561,7 @@
       n = jj_consume_token(HASH);
       break;
     default:
-      jj_la1[133] = jj_gen;
+      jj_la1[132] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3861,7 +3847,7 @@
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3R_88()) jj_scanpos = xsp;
-    if (jj_scan_token(99)) return true;
+    if (jj_scan_token(98)) return true;
     return false;
   }
 
@@ -3876,7 +3862,7 @@
   private Token jj_scanpos, jj_lastpos;
   private int jj_la;
   private int jj_gen;
-  final private int[] jj_la1 = new int[134];
+  final private int[] jj_la1 = new int[133];
   static private int[] jj_la1_0;
   static private int[] jj_la1_1;
   static private int[] jj_la1_2;
@@ -3888,16 +3874,16 @@
       jj_la1_init_3();
    }
    private static void jj_la1_init_0() {
-      jj_la1_0 = new int[] {0x0,0x0,0x0,0xe00000,0xe00000,0x0,0x0,0x200000,0x200000,0x0,0xc00000,0xc00000,0x200000,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x200000,0x0,0x200000,0x20000000,0x200000,0x200000,0x0,0x200000,0x80000000,0x200000,0x80000000,0x200000,0x0,0x200000,0x200000,0x200000,0x0,0x200000,0x200000,0x200000,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x20000000,0x200000,0x20000000,0x58000000,0x200000,0x200000,0x58200000,0x8000000,0x200000,0x20000000,0x200000,0x200000,0x200000,0x0,0x0,0x200000,0x0,0x58200000,0x200000,0x200000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200000,0x200000,0x3000000,0x200000,0x0,0x200000,0x3000000,0x200000,0x0,0x200000,0x200000,0x0,0x200000,0x200000,0x0,0x0,0x0,0x0,0x200000,0x0,0x0,0x200000,0x0,0x200000,0x8000000,0x200000,0x8000000,0x28000000,0x8000000,0x0,0x200000,0x0,0x200000,0x800000,0x200000,0x0,};
+      jj_la1_0 = new int[] {0x0,0x0,0x0,0xe00000,0xe00000,0x0,0x0,0x200000,0x200000,0x0,0xc00000,0xc00000,0x200000,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x200000,0x0,0x200000,0x20000000,0x200000,0x200000,0x0,0x200000,0x80000000,0x200000,0x80000000,0x200000,0x0,0x200000,0x200000,0x200000,0x0,0x200000,0x200000,0x200000,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x20000000,0x58000000,0x200000,0x200000,0x58200000,0x8000000,0x200000,0x20000000,0x200000,0x200000,0x200000,0x0,0x0,0x200000,0x0,0x58200000,0x200000,0x200000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200000,0x200000,0x3000000,0x200000,0x0,0x200000,0x3000000,0x200000,0x0,0x200000,0x200000,0x0,0x200000,0x200000,0x0,0x0,0x0,0x0,0x200000,0x0,0x0,0x200000,0x0,0x200000,0x8000000,0x200000,0x8000000,0x28000000,0x8000000,0x0,0x200000,0x0,0x200000,0x8000000,0x20000,0x0,};
    }
    private static void jj_la1_init_1() {
-      jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x9fd14038,0x0,0x0,0x0,0x0,0x0,0x8,0x200002,0x0,0x0,0x0,0x200002,0x0,0x80009,0x0,0x0,0x0,0x9fd14038,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x80009,0x0,0x0,0x0,0x100000,0x0,0x0,0x0,0x0,0x0,0x8,0x100000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000,0x0,0x2000,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x8,0x1000,0x0,0x8,0x0,0x0,0x0,0x9fd04030,0x9fd04030,0x9fd04030,0x9fd04030,0x9fd14038,0x9fc00000,0x9fc00000,0x10008,0x10008,0x10008,0x0,0x0,0x780,0x0,0xa,0x0,0x780,0x0,0x9fd14038,0x0,0x0,0xa,0x0,0x0,0x0,0x8,0x100000,0x30,0x0,0x0,0x100000,0x0,0x0,0x0,0x8000080a,0x0,0x8000080a,0xffe0283a,0x800,0xffc00000,0x0,0x20003a,0x0,0xffe0083a,0x0,0x30,};
+      jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x5fd14038,0x0,0x0,0x0,0x0,0x0,0x8,0x200002,0x0,0x0,0x0,0x200002,0x0,0x80009,0x0,0x0,0x0,0x5fd14038,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x80009,0x0,0x0,0x0,0x100000,0x0,0x0,0x0,0x0,0x0,0x8,0x100000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x8,0x1000,0x0,0x8,0x0,0x0,0x0,0x5fd04030,0x5fd04030,0x5fd04030,0x5fd04030,0x5fd14038,0x5fc00000,0x5fc00000,0x10008,0x10008,0x10008,0x0,0x0,0x780,0x0,0xa,0x0,0x780,0x0,0x5fd14038,0x0,0x0,0xa,0x0,0x0,0x0,0x8,0x100000,0x30,0x0,0x0,0x100000,0x0,0x0,0x0,0x4000080a,0x0,0x4000080a,0xffe0283a,0x800,0xffc00000,0x0,0x20203a,0x0,0xffe0283a,0x0,0x30,};
    }
    private static void jj_la1_init_2() {
-      jj_la1_2 = new int[] {0x0,0x0,0x10,0x0,0x0,0x20,0x40,0x0,0x0,0xa0020f88,0x40000,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa0000008,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xf000,0xf000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa0000008,0xa0000008,0xa0000008,0xa0000008,0xa0000008,0x20000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000008,0x0,0x0,0x2,0x0,0x0,0x40000000,0x40000000,0x8,0x0,0x0,0x4,0x0,0x0,0x4,0x0,0x2,0x0,0x2,0x10000003,0x0,0x3,0x0,0x10000000,0x0,0x10000003,0x0,0x0,};
+      jj_la1_2 = new int[] {0x0,0x0,0x8,0x0,0x0,0x10,0x20,0x0,0x0,0x500107c4,0x20000,0x20000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x50000004,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7800,0x7800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x50000004,0x50000004,0x50000004,0x50000004,0x50000004,0x10000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000004,0x0,0x0,0x1,0x0,0x0,0xa0000000,0xa0000000,0x4,0x0,0x0,0x2,0x0,0x0,0x2,0x0,0x1,0x0,0x1,0x88000001,0x0,0x80000001,0x0,0x8000000,0x0,0x88000001,0x0,0x0,};
    }
    private static void jj_la1_init_3() {
-      jj_la1_3 = new int[] {0x6,0x6,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,};
+      jj_la1_3 = new int[] {0x3,0x3,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
    }
   final private JJCalls[] jj_2_rtns = new JJCalls[1];
   private boolean jj_rescan = false;
@@ -3914,7 +3900,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 134; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 133; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -3929,7 +3915,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 134; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 133; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -3940,7 +3926,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 134; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 133; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -3951,7 +3937,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 134; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 133; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -3961,7 +3947,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 134; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 133; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -3971,7 +3957,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 134; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 133; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4083,12 +4069,12 @@
   /** Generate ParseException. */
   public ParseException generateParseException() {
     jj_expentries.clear();
-    boolean[] la1tokens = new boolean[100];
+    boolean[] la1tokens = new boolean[99];
     if (jj_kind >= 0) {
       la1tokens[jj_kind] = true;
       jj_kind = -1;
     }
-    for (int i = 0; i < 134; i++) {
+    for (int i = 0; i < 133; i++) {
       if (jj_la1[i] == jj_gen) {
         for (int j = 0; j < 32; j++) {
           if ((jj_la1_0[i] & (1<<j)) != 0) {
@@ -4106,7 +4092,7 @@
         }
       }
     }
-    for (int i = 0; i < 100; i++) {
+    for (int i = 0; i < 99; 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.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- CssParserConstants.java	22 Oct 2011 13:36:23 -0000	1.18
+++ CssParserConstants.java	3 Apr 2012 14:20:53 -0000	1.19
@@ -133,79 +133,77 @@
   /** RegularExpression Id. */
   int RATIO = 61;
   /** RegularExpression Id. */
-  int DATE = 62;
-  /** RegularExpression Id. */
-  int DIMEN = 63;
+  int DIMEN = 62;
   /** RegularExpression Id. */
-  int PERCENTAGE = 64;
+  int PERCENTAGE = 63;
   /** RegularExpression Id. */
-  int NUMBER = 65;
+  int NUMBER = 64;
   /** RegularExpression Id. */
-  int IMPORTANT_SYM = 66;
+  int IMPORTANT_SYM = 65;
   /** RegularExpression Id. */
-  int PSEUDOELEMENT_SYM = 67;
+  int PSEUDOELEMENT_SYM = 66;
   /** RegularExpression Id. */
-  int CHARSET_SYM = 68;
+  int CHARSET_SYM = 67;
   /** RegularExpression Id. */
-  int IMPORT_SYM = 69;
+  int IMPORT_SYM = 68;
   /** RegularExpression Id. */
-  int NAMESPACE_SYM = 70;
+  int NAMESPACE_SYM = 69;
   /** RegularExpression Id. */
-  int MEDIA_SYM = 71;
+  int MEDIA_SYM = 70;
   /** RegularExpression Id. */
-  int PAGE_SYM = 72;
+  int PAGE_SYM = 71;
   /** RegularExpression Id. */
-  int FONT_FACE_SYM = 73;
+  int FONT_FACE_SYM = 72;
   /** RegularExpression Id. */
-  int PREF_SYM = 74;
+  int PREF_SYM = 73;
   /** RegularExpression Id. */
-  int COLOR_PROFILE = 75;
+  int COLOR_PROFILE = 74;
   /** RegularExpression Id. */
-  int ATTOP = 76;
+  int ATTOP = 75;
   /** RegularExpression Id. */
-  int ATRIGHT = 77;
+  int ATRIGHT = 76;
   /** RegularExpression Id. */
-  int ATBOTTOM = 78;
+  int ATBOTTOM = 77;
   /** RegularExpression Id. */
-  int ATLEFT = 79;
+  int ATLEFT = 78;
   /** RegularExpression Id. */
-  int ATCOUNTER = 80;
+  int ATCOUNTER = 79;
   /** RegularExpression Id. */
-  int PHONETIC_ALPHABET_SYM = 81;
+  int PHONETIC_ALPHABET_SYM = 80;
   /** RegularExpression Id. */
-  int ATKEYWORD = 82;
+  int ATKEYWORD = 81;
   /** RegularExpression Id. */
-  int RANGE0 = 83;
+  int RANGE0 = 82;
   /** RegularExpression Id. */
-  int RANGE1 = 84;
+  int RANGE1 = 83;
   /** RegularExpression Id. */
-  int RANGE2 = 85;
+  int RANGE2 = 84;
   /** RegularExpression Id. */
-  int RANGE3 = 86;
+  int RANGE3 = 85;
   /** RegularExpression Id. */
-  int RANGE4 = 87;
+  int RANGE4 = 86;
   /** RegularExpression Id. */
-  int RANGE5 = 88;
+  int RANGE5 = 87;
   /** RegularExpression Id. */
-  int RANGE6 = 89;
+  int RANGE6 = 88;
   /** RegularExpression Id. */
-  int RANGE = 90;
+  int RANGE = 89;
   /** RegularExpression Id. */
-  int UNI = 91;
+  int UNI = 90;
   /** RegularExpression Id. */
-  int UNICODERANGE = 92;
+  int UNICODERANGE = 91;
   /** RegularExpression Id. */
-  int CLASS = 93;
+  int CLASS = 92;
   /** RegularExpression Id. */
-  int FUNCTIONLANG = 94;
+  int FUNCTIONLANG = 93;
   /** RegularExpression Id. */
-  int FUNCTIONNOT = 95;
+  int FUNCTIONNOT = 94;
   /** RegularExpression Id. */
-  int FUNCTION = 96;
+  int FUNCTION = 95;
   /** RegularExpression Id. */
-  int HTMLSTARTTAG = 97;
+  int HTMLSTARTTAG = 96;
   /** RegularExpression Id. */
-  int HTMLENDTAG = 98;
+  int HTMLENDTAG = 97;
 
   /** Lexical state. */
   int DEFAULT = 0;
@@ -274,7 +272,6 @@
     "<FREQ>",
     "<RESOLUTION>",
     "<RATIO>",
-    "<DATE>",
     "<DIMEN>",
     "<PERCENTAGE>",
     "<NUMBER>",
Received on Tuesday, 3 April 2012 14:21:08 UTC

This archive was generated by hypermail 2.3.1 : Wednesday, 7 January 2015 15:17:49 UTC