- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Sat, 22 Oct 2011 13:36:25 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/parser/analyzer
In directory hutz:/tmp/cvs-serv31862/css/parser/analyzer
Modified Files:
CssParser.java CssParser.jj CssParserConstants.java
CssParserTokenManager.java
Log Message:
ratio is now a value, as it should
Index: CssParserTokenManager.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParserTokenManager.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- CssParserTokenManager.java 21 Oct 2011 01:49:09 -0000 1.40
+++ CssParserTokenManager.java 22 Oct 2011 13:36:23 -0000 1.41
@@ -22,6 +22,7 @@
import org.w3c.css.values.CssFunction;
import org.w3c.css.values.CssUnicodeRange;
import org.w3c.css.values.CssResolution;
+import org.w3c.css.values.CssRatio;
import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.parser.Frame;
import org.w3c.css.parser.CssError;
@@ -99,7 +100,7 @@
return jjMoveNfa_0(7, 0);
case 58:
jjmatchedKind = 52;
[...6261 lines suppressed...]
@@ -6106,8 +6262,8 @@
0x2L, 0x0L,
};
protected SimpleCharStream input_stream;
-private final int[] jjrounds = new int[732];
-private final int[] jjstateSet = new int[1464];
+private final int[] jjrounds = new int[760];
+private final int[] jjstateSet = new int[1520];
protected char curChar;
/** Constructor. */
public CssParserTokenManager(SimpleCharStream stream){
@@ -6134,7 +6290,7 @@
{
int i;
jjround = 0x80000001;
- for (i = 732; i-- > 0;)
+ for (i = 760; 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.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- CssParser.jj 21 Oct 2011 12:52:29 -0000 1.78
+++ CssParser.jj 22 Oct 2011 13:36:23 -0000 1.79
@@ -44,6 +44,7 @@
import org.w3c.css.values.CssFunction;
import org.w3c.css.values.CssUnicodeRange;
import org.w3c.css.values.CssResolution;
+import org.w3c.css.values.CssRatio;
import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.parser.Frame;
import org.w3c.css.parser.CssError;
@@ -529,7 +530,7 @@
TOKEN [IGNORE_CASE] :
{
< LENGTH : <NUM> "pt"
- | <NUM> "mm"
+ | <NUM> "mm"
| <NUM> "cm"
| <NUM> "pc"
| <NUM> "in"
@@ -541,6 +542,7 @@
| < TIME : <NUM> ( "ms" | "s" ) >
| < 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> "%" >
@@ -2139,6 +2141,7 @@
| n=<TIME> { setValue(new CssTime(), exp, operator, n, TIME); }
| 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> {
addError(new ParseException(ac.getMsg().getString("parser.unknown-dimension")), n.image); }
Index: CssParser.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParser.java,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- CssParser.java 21 Oct 2011 14:14:41 -0000 1.80
+++ CssParser.java 22 Oct 2011 13:36:22 -0000 1.81
@@ -24,6 +24,7 @@
import org.w3c.css.values.CssFunction;
import org.w3c.css.values.CssUnicodeRange;
import org.w3c.css.values.CssResolution;
+import org.w3c.css.values.CssRatio;
import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.parser.Frame;
import org.w3c.css.parser.CssError;
@@ -616,7 +617,7 @@
case PSEUDOELEMENT_SYM:
case CLASS:
case FUNCTIONNOT:
- case 98:
+ case 99:
ruleSet();
break;
case MEDIA_SYM:
@@ -965,7 +966,7 @@
case PSEUDOELEMENT_SYM:
case CLASS:
case FUNCTIONNOT:
- case 98:
+ case 99:
;
break;
default:
@@ -2242,7 +2243,7 @@
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case IDENT:
case ANY:
- case 98:
+ case 99:
element_name(selector);
label_68:
while (true) {
@@ -2539,7 +2540,7 @@
jj_la1[96] = jj_gen;
;
}
- p = jj_consume_token(98);
+ p = jj_consume_token(99);
} else {
;
}
@@ -2795,7 +2796,7 @@
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case IDENT:
case ANY:
- case 98:
+ case 99:
element_name(ns);
break;
case HASHIDENT:
@@ -3318,6 +3319,7 @@
case TIME:
case FREQ:
case RESOLUTION:
+ case RATIO:
case DATE:
case DIMEN:
case PERCENTAGE:
@@ -3354,6 +3356,7 @@
case TIME:
case FREQ:
case RESOLUTION:
+ case RATIO:
case DATE:
case DIMEN:
case PERCENTAGE:
@@ -3406,6 +3409,10 @@
n = jj_consume_token(RESOLUTION);
setValue(new CssResolution(), exp, operator, n, RESOLUTION);
break;
+ case RATIO:
+ 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);
@@ -3854,7 +3861,7 @@
Token xsp;
xsp = jj_scanpos;
if (jj_3R_88()) jj_scanpos = xsp;
- if (jj_scan_token(98)) return true;
+ if (jj_scan_token(99)) return true;
return false;
}
@@ -3884,13 +3891,13 @@
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,};
}
private static void jj_la1_init_1() {
- 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,0x2000,0x0,0x2000,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,0x20003a,0x0,0xffe0083a,0x0,0x30,};
+ 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,};
}
private static void jj_la1_init_2() {
- 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,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,};
+ 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,};
}
private static void jj_la1_init_3() {
- 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,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,};
+ 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,};
}
final private JJCalls[] jj_2_rtns = new JJCalls[1];
private boolean jj_rescan = false;
@@ -4076,7 +4083,7 @@
/** Generate ParseException. */
public ParseException generateParseException() {
jj_expentries.clear();
- boolean[] la1tokens = new boolean[99];
+ boolean[] la1tokens = new boolean[100];
if (jj_kind >= 0) {
la1tokens[jj_kind] = true;
jj_kind = -1;
@@ -4099,7 +4106,7 @@
}
}
}
- for (int i = 0; i < 99; i++) {
+ for (int i = 0; i < 100; 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.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- CssParserConstants.java 21 Oct 2011 01:49:09 -0000 1.17
+++ CssParserConstants.java 22 Oct 2011 13:36:23 -0000 1.18
@@ -131,79 +131,81 @@
/** RegularExpression Id. */
int RESOLUTION = 60;
/** RegularExpression Id. */
- int DATE = 61;
+ int RATIO = 61;
/** RegularExpression Id. */
- int DIMEN = 62;
+ int DATE = 62;
/** RegularExpression Id. */
- int PERCENTAGE = 63;
+ int DIMEN = 63;
/** RegularExpression Id. */
- int NUMBER = 64;
+ int PERCENTAGE = 64;
/** RegularExpression Id. */
- int IMPORTANT_SYM = 65;
+ int NUMBER = 65;
/** RegularExpression Id. */
- int PSEUDOELEMENT_SYM = 66;
+ int IMPORTANT_SYM = 66;
/** RegularExpression Id. */
- int CHARSET_SYM = 67;
+ int PSEUDOELEMENT_SYM = 67;
/** RegularExpression Id. */
- int IMPORT_SYM = 68;
+ int CHARSET_SYM = 68;
/** RegularExpression Id. */
- int NAMESPACE_SYM = 69;
+ int IMPORT_SYM = 69;
/** RegularExpression Id. */
- int MEDIA_SYM = 70;
+ int NAMESPACE_SYM = 70;
/** RegularExpression Id. */
- int PAGE_SYM = 71;
+ int MEDIA_SYM = 71;
/** RegularExpression Id. */
- int FONT_FACE_SYM = 72;
+ int PAGE_SYM = 72;
/** RegularExpression Id. */
- int PREF_SYM = 73;
+ int FONT_FACE_SYM = 73;
/** RegularExpression Id. */
- int COLOR_PROFILE = 74;
+ int PREF_SYM = 74;
/** RegularExpression Id. */
- int ATTOP = 75;
+ int COLOR_PROFILE = 75;
/** RegularExpression Id. */
- int ATRIGHT = 76;
+ int ATTOP = 76;
/** RegularExpression Id. */
- int ATBOTTOM = 77;
+ int ATRIGHT = 77;
/** RegularExpression Id. */
- int ATLEFT = 78;
+ int ATBOTTOM = 78;
/** RegularExpression Id. */
- int ATCOUNTER = 79;
+ int ATLEFT = 79;
/** RegularExpression Id. */
- int PHONETIC_ALPHABET_SYM = 80;
+ int ATCOUNTER = 80;
/** RegularExpression Id. */
- int ATKEYWORD = 81;
+ int PHONETIC_ALPHABET_SYM = 81;
/** RegularExpression Id. */
- int RANGE0 = 82;
+ int ATKEYWORD = 82;
/** RegularExpression Id. */
- int RANGE1 = 83;
+ int RANGE0 = 83;
/** RegularExpression Id. */
- int RANGE2 = 84;
+ int RANGE1 = 84;
/** RegularExpression Id. */
- int RANGE3 = 85;
+ int RANGE2 = 85;
/** RegularExpression Id. */
- int RANGE4 = 86;
+ int RANGE3 = 86;
/** RegularExpression Id. */
- int RANGE5 = 87;
+ int RANGE4 = 87;
/** RegularExpression Id. */
- int RANGE6 = 88;
+ int RANGE5 = 88;
/** RegularExpression Id. */
- int RANGE = 89;
+ int RANGE6 = 89;
/** RegularExpression Id. */
- int UNI = 90;
+ int RANGE = 90;
/** RegularExpression Id. */
- int UNICODERANGE = 91;
+ int UNI = 91;
/** RegularExpression Id. */
- int CLASS = 92;
+ int UNICODERANGE = 92;
/** RegularExpression Id. */
- int FUNCTIONLANG = 93;
+ int CLASS = 93;
/** RegularExpression Id. */
- int FUNCTIONNOT = 94;
+ int FUNCTIONLANG = 94;
/** RegularExpression Id. */
- int FUNCTION = 95;
+ int FUNCTIONNOT = 95;
/** RegularExpression Id. */
- int HTMLSTARTTAG = 96;
+ int FUNCTION = 96;
/** RegularExpression Id. */
- int HTMLENDTAG = 97;
+ int HTMLSTARTTAG = 97;
+ /** RegularExpression Id. */
+ int HTMLENDTAG = 98;
/** Lexical state. */
int DEFAULT = 0;
@@ -271,6 +273,7 @@
"<TIME>",
"<FREQ>",
"<RESOLUTION>",
+ "<RATIO>",
"<DATE>",
"<DIMEN>",
"<PERCENTAGE>",
Received on Saturday, 22 October 2011 13:36:27 UTC