- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 28 Mar 2008 15:05:51 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/parser/analyzer
In directory hutz:/tmp/cvs-serv32116
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.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- CssParserTokenManager.java 26 Mar 2008 20:55:17 -0000 1.25
+++ CssParserTokenManager.java 28 Mar 2008 15:05:49 -0000 1.26
@@ -68,684 +68,677 @@
switch(curChar)
{
case 36:
- return jjMoveStringLiteralDfa1_0(0x20000000000L, 0x0L);
+ return jjMoveStringLiteralDfa1_0(0x4000000000L, 0x0L);
case 40:
- jjmatchedKind = 52;
- return jjMoveNfa_0(5, 0);
+ jjmatchedKind = 49;
+ return jjMoveNfa_0(7, 0);
case 41:
[...8096 lines suppressed...]
+ boolean EOFSeen = false;
+ try { input_stream.readChar(); input_stream.backup(1); }
+ catch (java.io.IOException e1) {
+ EOFSeen = true;
+ error_after = curPos <= 1 ? "" : input_stream.GetImage();
+ if (curChar == '\n' || curChar == '\r') {
+ error_line++;
+ error_column = 0;
+ }
+ else
+ error_column++;
}
+ if (!EOFSeen) {
+ input_stream.backup(1);
+ error_after = curPos <= 1 ? "" : input_stream.GetImage();
+ }
+ throw new TokenMgrError(EOFSeen, curLexState, error_line, error_column, error_after, curChar, TokenMgrError.LEXICAL_ERROR);
}
}
Index: CssParser.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParser.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- CssParser.java 28 Mar 2008 08:02:23 -0000 1.40
+++ CssParser.java 28 Mar 2008 15:05:48 -0000 1.41
@@ -368,7 +368,6 @@
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case CHARSET_SYM:
charset();
- jj_consume_token(SEMICOLON);
break;
default:
jj_la1[2] = jj_gen;
@@ -427,42 +426,62 @@
Token charsetToken = null;
Token space1Token = null;
Token space2Token = null;
[...1264 lines suppressed...]
+ boolean[] la1tokens = new boolean[95];
+ for (int i = 0; i < 95; i++) {
la1tokens[i] = false;
}
if (jj_kind >= 0) {
@@ -3318,13 +3332,10 @@
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 < 98; i++) {
+ for (int i = 0; i < 95; 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.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- CssParserConstants.java 26 Mar 2008 20:46:43 -0000 1.11
+++ CssParserConstants.java 28 Mar 2008 15:05:49 -0000 1.12
@@ -4,109 +4,105 @@
public interface CssParserConstants {
int EOF = 0;
- 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 COMMENT = 1;
+ int H = 2;
+ int NONASCII = 3;
+ int UNICODE = 4;
+ int ESCAPE = 5;
+ int NMSTART = 6;
+ int NMCHAR = 7;
+ int STRING1 = 8;
+ int STRING2 = 9;
+ int INVALID1 = 10;
+ int INVALID2 = 11;
+ int _IDENT = 12;
+ int NAME = 13;
+ int NUM = 14;
+ int _STRING = 15;
+ int _INVALID = 16;
+ int _URL = 17;
+ int _S = 18;
+ int _W = 19;
+ int NL = 20;
+ int S = 21;
+ int CDO = 22;
+ int CDC = 23;
+ int INCLUDES = 24;
+ int DASHMATCH = 25;
+ int LBRACE = 26;
+ int PLUS = 27;
+ int GREATER = 28;
+ int COMMA = 29;
+ int TILDE = 30;
+ int AND = 31;
+ int STRING = 32;
+ int INVALID = 33;
+ int IDENT = 34;
+ int HASH = 35;
+ int RBRACE = 36;
+ int PREFIXMATCH = 37;
+ int SUFFIXMATCH = 38;
+ int SUBSTRINGMATCH = 39;
+ int EQ = 40;
+ int MINUS = 41;
+ int SEMICOLON = 42;
+ int DIV = 43;
+ int LBRACKET = 44;
+ int RBRACKET = 45;
+ int ANY = 46;
+ int DOT = 47;
+ int LPARAN = 48;
+ int RPARAN = 49;
+ int COLON = 50;
+ int MEDIARESTRICTOR = 51;
+ int URL = 52;
+ int LENGTH = 53;
+ int EMS = 54;
+ int EXS = 55;
+ int ANGLE = 56;
+ int TIME = 57;
+ int FREQ = 58;
+ int RESOLUTION = 59;
+ int DATE = 60;
+ int DIMEN = 61;
+ int PERCENTAGE = 62;
+ int NUMBER = 63;
+ int IMPORTANT_SYM = 64;
+ int PSEUDOCLASS_SYM = 65;
+ int CHARSET_SYM = 66;
+ int IMPORT_SYM = 67;
+ int MEDIA_SYM = 68;
+ int PAGE_SYM = 69;
+ int FONT_FACE_SYM = 70;
+ int PREF_SYM = 71;
+ int COLOR_PROFILE = 72;
+ int ATTOP = 73;
+ int ATRIGHT = 74;
+ int ATBOTTOM = 75;
+ int ATLEFT = 76;
+ int ATCOUNTER = 77;
+ int PHONETIC_ALPHABET_SYM = 78;
+ int ATKEYWORD = 79;
+ int RANGE0 = 80;
+ int RANGE1 = 81;
+ int RANGE2 = 82;
+ int RANGE3 = 83;
+ int RANGE4 = 84;
+ int RANGE5 = 85;
+ int RANGE6 = 86;
+ int RANGE = 87;
+ int UNI = 88;
+ int UNICODERANGE = 89;
+ int CLASS = 90;
+ int FUNCTIONLANG = 91;
+ int FUNCTION = 92;
+ int HTMLSTARTTAG = 93;
+ int HTMLENDTAG = 94;
int DEFAULT = 0;
- int IN_COMMENT = 1;
String[] tokenImage = {
"<EOF>",
- "\"/*\"",
- "\"*/\"",
- "<token of kind 3>",
"<COMMENT>",
"<H>",
"<NONASCII>",
Received on Friday, 28 March 2008 15:06:28 UTC