- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Wed, 26 Mar 2008 20:46:45 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/parser/analyzer
In directory hutz:/tmp/cvs-serv20829
Modified Files:
CssParser.java CssParserConstants.java
CssParserTokenManager.java
Log Message:
See CssParser.jj
Index: CssParserTokenManager.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParserTokenManager.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- CssParserTokenManager.java 17 Mar 2008 14:48:32 -0000 1.23
+++ CssParserTokenManager.java 26 Mar 2008 20:46:43 -0000 1.24
@@ -68,59 +68,59 @@
switch(curChar)
{
case 36:
- return jjMoveStringLiteralDfa1_0(0x10000000000L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x20000000000L, 0x0L);
case 40:
- jjmatchedKind = 51;
+ jjmatchedKind = 52;
return jjMoveNfa_0(5, 0);
case 41:
- jjmatchedKind = 50;
[...7727 lines suppressed...]
@@ -5008,8 +5762,8 @@
0xaL, 0x0L,
};
protected SimpleCharStream input_stream;
-private final int[] jjrounds = new int[574];
-private final int[] jjstateSet = new int[1148];
+private final int[] jjrounds = new int[685];
+private final int[] jjstateSet = new int[1370];
protected char curChar;
public CssParserTokenManager(SimpleCharStream stream){
if (SimpleCharStream.staticFlag)
@@ -5031,7 +5785,7 @@
{
int i;
jjround = 0x80000001;
- for (i = 574; i-- > 0;)
+ for (i = 685; 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.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- CssParser.java 17 Mar 2008 14:48:31 -0000 1.36
+++ CssParser.java 26 Mar 2008 20:46:43 -0000 1.37
@@ -1569,7 +1569,7 @@
*/
final public void ruleSet() throws ParseException {
CssSelectors contextual;
- Vector context_set = new Vector();
+ Vector<CssSelectors> context_set = new Vector<CssSelectors>();
Vector value_set = null;
currentContext = context_set;
try {
@@ -3124,16 +3124,16 @@
jj_la1_3();
}
private static void jj_la1_0() {
- jj_la1_0 = new int[] {0x0,0x0,0x0,0x3800000,0x3800000,0x0,0x800000,0x800000,0x0,0x3000000,0x3000000,0x800000,0x800000,0x0,0x800000,0x80000000,0x800000,0x0,0x800000,0x800000,0x800000,0x0,0x80000000,0x800000,0x0,0x800000,0x800000,0x800000,0x800000,0x0,0x800000,0x800000,0x800000,0x800000,0x0,0x0,0x800000,0x800000,0x0,0x0,0x800000,0x800000,0x800000,0x800000,0x800000,0x800000,0x800000,0x800000,0x800000,0x800000,0x800000,0x800000,0x800000,0x800000,0x800000,0x80000000,0x800000,0x80000000,0x60000000,0x800000,0x800000,0x60800000,0x20000000,0x800000,0x80000000,0x800000,0x800000,0x800000,0x0,0x0,0x800000,0x0,0x60800000,0x800000,0x800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x800000,0xc000000,0x800000,0x800000,0x0,0xc000000,0x800000,0x0,0x800000,0x0,0x800000,0x0,0x0,0x800000,0x0,0x0,0x800000,0x0,0x800000,0xa0000000,0x20000000,0x0,0x800000,0x0,0x800000,0x20000000,0x800000,};
+ jj_la1_0 = new int[] {0x0,0x0,0x0,0x7000000,0x7000000,0x0,0x1000000,0x1000000,0x0,0x6000000,0x6000000,0x1000000,0x1000000,0x0,0x1000000,0x0,0x1000000,0x0,0x1000000,0x1000000,0x1000000,0x0,0x0,0x1000000,0x0,0x1000000,0x1000000,0x1000000,0x1000000,0x0,0x1000000,0x1000000,0x1000000,0x1000000,0x0,0x0,0x1000000,0x1000000,0x0,0x0,0x1000000,0x1000000,0x1000000,0x1000000,0x1000000,0x1000000,0x1000000,0x1000000,0x1000000,0x1000000,0x1000000,0x1000000,0x1000000,0x1000000,0x1000000,0x0,0x1000000,0x0,0xc0000000,0x1000000,0x1000000,0xc1000000,0x40000000,0x1000000,0x0,0x1000000,0x1000000,0x1000000,0x0,0x0,0x1000000,0x0,0xc1000000,0x1000000,0x1000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x1000000,0x18000000,0x1000000,0x1000000,0x0,0x18000000,0x1000000,0x0,0x1000000,0x0,0x1000000,0x0,0x0,0x1000000,0x0,0x0,0x1000000,0x0,0x1000000,0x40000000,0x40000000,0x0,0x1000000,0x0,0x1000000,0x40000000,0x1000000,};
}
private static void jj_la1_1() {
- jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x134030,0x0,0x0,0x0,0x0,0x400004,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x200000,0x0,0x0,0x2,0x0,0x0,0x0,0x0,0x134030,0x0,0x0,0x0,0x0,0x10,0x100000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000,0x0,0x2000,0x1,0x0,0x0,0x1,0x800,0x0,0x0,0x0,0x0,0x0,0x10,0x1000,0x0,0x10,0x1,0x0,0x0,0x124020,0x124020,0x124020,0x124020,0x134030,0x20000,0xbf800000,0x10010,0x0,0x0,0x780,0x0,0x0,0x14,0x780,0x0,0x14,0x0,0x0,0x0,0x10,0x100000,0x0,0x0,0x100000,0x0,0x0,0x0,0xffc02834,0x800,0xff800000,0x0,0x400034,0x0,0xffc00834,0x0,};
+ jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x268060,0x0,0x0,0x0,0x0,0x800008,0x0,0x1,0x0,0x20,0x0,0x0,0x0,0x400000,0x1,0x0,0x4,0x0,0x0,0x0,0x0,0x268060,0x0,0x0,0x0,0x0,0x20,0x200000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4001,0x0,0x4001,0x2,0x0,0x0,0x2,0x1000,0x0,0x1,0x0,0x0,0x0,0x20,0x2000,0x0,0x20,0x2,0x0,0x0,0x248040,0x248040,0x248040,0x248040,0x268060,0x40000,0x7f000000,0x20020,0x0,0x0,0xf00,0x0,0x0,0x28,0xf00,0x0,0x28,0x0,0x0,0x0,0x20,0x200000,0x0,0x0,0x200000,0x0,0x0,0x0,0xff805069,0x1000,0xff000000,0x0,0x800068,0x0,0xff801068,0x0,};
}
private static void jj_la1_2() {
- jj_la1_2 = new int[] {0x80000000,0x80000000,0x10,0x0,0x0,0x20,0x0,0x0,0x100107c8,0x20000,0x20000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000008,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,0x0,0x10000008,0x10000008,0x10000008,0x10000008,0x10000008,0x10000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x60000000,0x0,0x60000000,0x8,0x0,0x4,0x0,0x0,0x4,0x0,0x48000003,0x0,0x40000003,0x0,0x8000000,0x0,0x48000003,0x0,};
+ jj_la1_2 = new int[] {0x0,0x0,0x20,0x0,0x0,0x40,0x0,0x0,0x20020f90,0x40000,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000010,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,0x20000010,0x20000010,0x20000010,0x20000010,0x20000010,0x20000000,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x0,0xc0000000,0x0,0xc0000000,0x10,0x0,0x8,0x0,0x0,0x8,0x0,0x90000007,0x0,0x80000007,0x0,0x10000000,0x0,0x90000007,0x0,};
}
private static void jj_la1_3() {
- jj_la1_3 = new int[] {0x1,0x1,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,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,};
+ jj_la1_3 = new int[] {0x3,0x3,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,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,};
}
public CssParser(java.io.InputStream stream) {
@@ -3238,8 +3238,8 @@
public ParseException generateParseException() {
jj_expentries.removeAllElements();
- boolean[] la1tokens = new boolean[97];
- for (int i = 0; i < 97; i++) {
+ boolean[] la1tokens = new boolean[98];
+ for (int i = 0; i < 98; i++) {
la1tokens[i] = false;
}
if (jj_kind >= 0) {
@@ -3264,7 +3264,7 @@
}
}
}
- for (int i = 0; i < 97; i++) {
+ for (int i = 0; i < 98; 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.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- CssParserConstants.java 13 Mar 2008 14:25:58 -0000 1.10
+++ CssParserConstants.java 26 Mar 2008 20:46:43 -0000 1.11
@@ -4,99 +4,100 @@
public interface CssParserConstants {
int EOF = 0;
- int H = 4;
- int NONASCII = 5;
- int UNICODE = 6;
- int ESCAPE = 7;
- int NMSTART = 8;
- int NMCHAR = 9;
- int STRING1 = 10;
- int STRING2 = 11;
- int INVALID1 = 12;
- int INVALID2 = 13;
- int _IDENT = 14;
- int NAME = 15;
- int NUM = 16;
- int _STRING = 17;
- int _INVALID = 18;
- int _URL = 19;
- int _S = 20;
- int _W = 21;
- int NL = 22;
- int S = 23;
- int CDO = 24;
- int CDC = 25;
- int INCLUDES = 26;
- int DASHMATCH = 27;
- int LBRACE = 28;
- int PLUS = 29;
- int GREATER = 30;
- int COMMA = 31;
- int TILDE = 32;
- int AND = 33;
- int STRING = 34;
- int INVALID = 35;
- int IDENT = 36;
- int HASH = 37;
- int RBRACE = 38;
- int PREFIXMATCH = 39;
- int SUFFIXMATCH = 40;
- int SUBSTRINGMATCH = 41;
- int EQ = 42;
- int MINUS = 43;
- int SEMICOLON = 44;
- int DIV = 45;
- int LBRACKET = 46;
- int RBRACKET = 47;
- int ANY = 48;
- int DOT = 49;
- int LPARAN = 50;
- int RPARAN = 51;
- int COLON = 52;
- int MEDIARESTRICTOR = 53;
- int URL = 54;
- int LENGTH = 55;
- int EMS = 56;
- int EXS = 57;
- int ANGLE = 58;
- int TIME = 59;
- int FREQ = 60;
- int RESOLUTION = 61;
- int DATE = 62;
- int DIMEN = 63;
- int PERCENTAGE = 64;
- int NUMBER = 65;
- int IMPORTANT_SYM = 66;
- int PSEUDOCLASS_SYM = 67;
- int CHARSET_SYM = 68;
- int IMPORT_SYM = 69;
- int MEDIA_SYM = 70;
- int PAGE_SYM = 71;
- int FONT_FACE_SYM = 72;
- int PREF_SYM = 73;
- int COLOR_PROFILE = 74;
- int ATTOP = 75;
- int ATRIGHT = 76;
- int ATBOTTOM = 77;
- int ATLEFT = 78;
- int ATCOUNTER = 79;
- int PHONETIC_ALPHABET_SYM = 80;
- int ATKEYWORD = 81;
- int RANGE0 = 82;
- int RANGE1 = 83;
- int RANGE2 = 84;
- int RANGE3 = 85;
- int RANGE4 = 86;
- int RANGE5 = 87;
- int RANGE6 = 88;
- int RANGE = 89;
- int UNI = 90;
- int UNICODERANGE = 91;
- int CLASS = 92;
- int FUNCTIONLANG = 93;
- int FUNCTION = 94;
- int HTMLSTARTTAG = 95;
- int HTMLENDTAG = 96;
+ int COMMENT = 4;
+ int H = 5;
+ int NONASCII = 6;
+ int UNICODE = 7;
+ int ESCAPE = 8;
+ int NMSTART = 9;
+ int NMCHAR = 10;
+ int STRING1 = 11;
+ int STRING2 = 12;
+ int INVALID1 = 13;
+ int INVALID2 = 14;
+ int _IDENT = 15;
+ int NAME = 16;
+ int NUM = 17;
+ int _STRING = 18;
+ int _INVALID = 19;
+ int _URL = 20;
+ int _S = 21;
+ int _W = 22;
+ int NL = 23;
+ int S = 24;
+ int CDO = 25;
+ int CDC = 26;
+ int INCLUDES = 27;
+ int DASHMATCH = 28;
+ int LBRACE = 29;
+ int PLUS = 30;
+ int GREATER = 31;
+ int COMMA = 32;
+ int TILDE = 33;
+ int AND = 34;
+ int STRING = 35;
+ int INVALID = 36;
+ int IDENT = 37;
+ int HASH = 38;
+ int RBRACE = 39;
+ int PREFIXMATCH = 40;
+ int SUFFIXMATCH = 41;
+ int SUBSTRINGMATCH = 42;
+ int EQ = 43;
+ int MINUS = 44;
+ int SEMICOLON = 45;
+ int DIV = 46;
+ int LBRACKET = 47;
+ int RBRACKET = 48;
+ int ANY = 49;
+ int DOT = 50;
+ int LPARAN = 51;
+ int RPARAN = 52;
+ int COLON = 53;
+ int MEDIARESTRICTOR = 54;
+ int URL = 55;
+ int LENGTH = 56;
+ int EMS = 57;
+ int EXS = 58;
+ int ANGLE = 59;
+ int TIME = 60;
+ int FREQ = 61;
+ int RESOLUTION = 62;
+ int DATE = 63;
+ int DIMEN = 64;
+ int PERCENTAGE = 65;
+ int NUMBER = 66;
+ int IMPORTANT_SYM = 67;
+ int PSEUDOCLASS_SYM = 68;
+ int CHARSET_SYM = 69;
+ int IMPORT_SYM = 70;
+ int MEDIA_SYM = 71;
+ int PAGE_SYM = 72;
+ int FONT_FACE_SYM = 73;
+ int PREF_SYM = 74;
+ int COLOR_PROFILE = 75;
+ int ATTOP = 76;
+ int ATRIGHT = 77;
+ int ATBOTTOM = 78;
+ int ATLEFT = 79;
+ int ATCOUNTER = 80;
+ int PHONETIC_ALPHABET_SYM = 81;
+ int ATKEYWORD = 82;
+ int RANGE0 = 83;
+ int RANGE1 = 84;
+ int RANGE2 = 85;
+ int RANGE3 = 86;
+ int RANGE4 = 87;
+ int RANGE5 = 88;
+ int RANGE6 = 89;
+ int RANGE = 90;
+ int UNI = 91;
+ int UNICODERANGE = 92;
+ int CLASS = 93;
+ int FUNCTIONLANG = 94;
+ int FUNCTION = 95;
+ int HTMLSTARTTAG = 96;
+ int HTMLENDTAG = 97;
int DEFAULT = 0;
int IN_COMMENT = 1;
@@ -106,6 +107,7 @@
"\"/*\"",
"\"*/\"",
"<token of kind 3>",
+ "<COMMENT>",
"<H>",
"<NONASCII>",
"<UNICODE>",
Received on Wednesday, 26 March 2008 20:47:24 UTC