W3C home > Mailing lists > Public > www-validator-cvs@w3.org > January 2013

CVS 2002/css-validator/org/w3c/css/parser/analyzer

From: CVS User ylafon <cvsmail@w3.org>
Date: Thu, 03 Jan 2013 13:21:00 +0000
Message-Id: <E1TqkjE-0007Ue-MZ@roscoe.w3.org>
To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/parser/analyzer
In directory roscoe:/tmp/cvs-serv28771/d/d

Modified Files:
	CssParser.jj CssParser.java CssParserConstants.java 
	CssParserTokenManager.java 
Log Message:
added db

--- /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParser.jj	2012/11/08 16:14:03	1.91
+++ /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParser.jj	2013/01/03 13:21:00	1.92
@@ -3,7 +3,7 @@
  * (c) COPYRIGHT MIT and INRIA, 1997.
  * Please first read the full copyright statement in file COPYRIGHT.html
  *
- * $Id: CssParser.jj,v 1.91 2012/11/08 16:14:03 ylafon Exp $
+ * $Id: CssParser.jj,v 1.92 2013/01/03 13:21:00 ylafon Exp $
  *
  */
 
@@ -49,6 +49,7 @@
 import org.w3c.css.values.CssResolution;
 import org.w3c.css.values.CssRatio;
 import org.w3c.css.values.CssTypes;
+import org.w3c.css.values.CssVolume;
 import org.w3c.css.properties.css.CssProperty;
 import org.w3c.css.parser.Frame;
 import org.w3c.css.parser.CssError;
@@ -93,7 +94,7 @@
  * A CSS3 parser  
  *
  * @author Philippe Le Hegaret and Sijtsche Smeman
- * @version $Revision: 1.91 $
+ * @version $Revision: 1.92 $
  */
 public abstract class CssParser {
 
@@ -570,9 +571,10 @@
                    | <NUM> "pc"
                    | <NUM> "px" >
   | < ANGLE      : <NUM> ( "deg" | "grad" | "rad" | "turn" ) >
+  | < SPL        : <NUM> "db" >
   | < TIME       : <NUM> ( "ms" | "s" ) >
-  | < FREQ       : <NUM> "Hz" | <NUM> "kHz" >
-  | < RESOLUTION : <NUM> "dpi" | <NUM> "dpcm" | <NUM> "ddpx" >
+  | < FREQ       : <NUM> ( "Hz" | "kHz" ) >
+  | < RESOLUTION : <NUM> ( "dpi" | "dpcm" | "ddpx" ) >
   | < DIMEN      : <NUM> <NMSTART> ( <NMCHAR> )* >
   | < PERCENTAGE : <NUM> "%" >
   | < NUMBER     : <NUM> >
@@ -2327,6 +2329,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=<SPL> { setValue(new CssVolume(), exp, operator, n, SPL); }
     | n=<DIMEN> {
 	  addError(new ParseException(ac.getMsg().getString("parser.unknown-dimension")), n.image); }    
     | func=function() { setValue(func, exp, operator, null, FUNCTION); }
--- /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParser.java	2012/11/08 16:14:20	1.92
+++ /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParser.java	2013/01/03 13:21:00	1.93
@@ -29,6 +29,7 @@
 import org.w3c.css.values.CssResolution;
 import org.w3c.css.values.CssRatio;
 import org.w3c.css.values.CssTypes;
+import org.w3c.css.values.CssVolume;
 import org.w3c.css.properties.css.CssProperty;
 import org.w3c.css.parser.Frame;
 import org.w3c.css.parser.CssError;
@@ -73,7 +74,7 @@
  * A CSS3 parser  
  *
  * @author Philippe Le Hegaret and Sijtsche Smeman
- * @version $Revision: 1.92 $
+ * @version $Revision: 1.93 $
  */
 public abstract class CssParser implements CssParserConstants {
 
@@ -643,7 +644,7 @@
       case PSEUDOELEMENT_SYM:
       case CLASS:
       case FUNCTIONNOT:
-      case 98:
+      case 99:
         ruleSet();
         break;
       case MEDIA_SYM:
@@ -995,7 +996,7 @@
         case PSEUDOELEMENT_SYM:
         case CLASS:
         case FUNCTIONNOT:
-        case 98:
+        case 99:
           ;
           break;
         default:
@@ -2569,7 +2570,7 @@
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case IDENT:
     case ANY:
-    case 98:
+    case 99:
       element_name(selector);
       label_80:
       while (true) {
@@ -2866,7 +2867,7 @@
         jj_la1[110] = jj_gen;
         ;
       }
-      p = jj_consume_token(98);
+      p = jj_consume_token(99);
     } else {
       ;
     }
@@ -3122,7 +3123,7 @@
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case IDENT:
     case ANY:
-    case 98:
+    case 99:
       element_name(ns);
       break;
     case HASHIDENT:
@@ -3647,6 +3648,7 @@
       case RELVIEWLENGTH:
       case ABSOLUTLENGTH:
       case ANGLE:
+      case SPL:
       case TIME:
       case FREQ:
       case RESOLUTION:
@@ -3724,6 +3726,7 @@
     case RELVIEWLENGTH:
     case ABSOLUTLENGTH:
     case ANGLE:
+    case SPL:
     case TIME:
     case FREQ:
     case RESOLUTION:
@@ -3778,6 +3781,10 @@
         n = jj_consume_token(RESOLUTION);
                        setValue(new CssResolution(), exp, operator, n, RESOLUTION);
         break;
+      case SPL:
+        n = jj_consume_token(SPL);
+                setValue(new CssVolume(), exp, operator, n, SPL);
+        break;
       case DIMEN:
         n = jj_consume_token(DIMEN);
           addError(new ParseException(ac.getMsg().getString("parser.unknown-dimension")), n.image);
@@ -4457,7 +4464,7 @@
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3R_103()) jj_scanpos = xsp;
-    if (jj_scan_token(98)) return true;
+    if (jj_scan_token(99)) return true;
     return false;
   }
 
@@ -4487,13 +4494,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,0x200000,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,0x8000000,0x8000000,0x8000000,0x200000,0x200000,0x200000,0x200000,0x8000000,0x20000000,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,0x28000000,0x8000000,0x0,0x200000,0x0,0x200000,0x8000000,0x8000000,0x0,0x0,0x200000,0x0,0x200000,0x8000000,0x200000,0x0,};
    }
    private static void jj_la1_init_1() {
-      jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3fd14038,0x0,0x0,0x0,0x0,0x0,0x8,0x200002,0x0,0x0,0x0,0x200002,0x0,0x80009,0x0,0x0,0x0,0x3fd14038,0x0,0x0,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,0x800,0x800,0x40000808,0x0,0x0,0x0,0x0,0x40000808,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,0x3fd04030,0x3fd04030,0x3fd04030,0x3fd04030,0x3fd14038,0x3fc00000,0x3fc00000,0x10008,0x10008,0x10008,0x0,0x0,0x780,0x0,0xa,0x0,0x780,0x0,0x3fd14038,0x0,0x0,0x8000000a,0x0,0x0,0x0,0x8,0x100000,0x30,0x0,0x0,0x100000,0x0,0x0,0x0,0xe000080a,0x0,0xe000080a,0xffe0283a,0xffe0083a,0x800,0xffc00000,0x0,0x20203a,0x0,0xffe0283a,0x800,0x80000000,0xffc00000,0x0,0x20003a,0x0,0xffe0083a,0x0,0x30,};
+      jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7bd14038,0x0,0x0,0x0,0x0,0x0,0x8,0x200002,0x0,0x0,0x0,0x200002,0x0,0x80009,0x0,0x0,0x0,0x7bd14038,0x0,0x0,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,0x800,0x800,0x80000808,0x0,0x0,0x0,0x0,0x80000808,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,0x7bd04030,0x7bd04030,0x7bd04030,0x7bd04030,0x7bd14038,0x7bc00000,0x7bc00000,0x10008,0x10008,0x10008,0x0,0x0,0x780,0x0,0xa,0x0,0x780,0x0,0x7bd14038,0x0,0x0,0xa,0x0,0x0,0x0,0x8,0x100000,0x30,0x0,0x0,0x100000,0x0,0x0,0x0,0xc000080a,0x0,0xc000080a,0xffe0283a,0xfbe0083a,0x800,0xffc00000,0x0,0x20203a,0x0,0xffe0283a,0x800,0x0,0xfbc00000,0x0,0x20003a,0x0,0xfbe0083a,0x0,0x30,};
    }
    private static void jj_la1_init_2() {
-      jj_la1_2 = new int[] {0x0,0x0,0x4,0x0,0x0,0x8,0x10,0x0,0x0,0x500107e2,0x20000,0x20000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x50000002,0x0,0x0,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,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x50000002,0x50000002,0x50000002,0x50000002,0x50000002,0x10000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000002,0x0,0x0,0x0,0x0,0x0,0xa0000000,0xa0000000,0x2,0x0,0x0,0x1,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x88000000,0x88000000,0x0,0x80000000,0x0,0x8000000,0x0,0x88000000,0x0,0x0,0x80000000,0x0,0x8000000,0x0,0x88000000,0x0,0x0,};
+      jj_la1_2 = new int[] {0x0,0x0,0x8,0x0,0x0,0x10,0x20,0x0,0x0,0xa0020fc4,0x40000,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa0000004,0x0,0x0,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,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa0000004,0xa0000004,0xa0000004,0xa0000004,0xa0000004,0x20000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000004,0x0,0x0,0x1,0x0,0x0,0x40000000,0x40000000,0x4,0x0,0x0,0x2,0x0,0x0,0x2,0x0,0x1,0x0,0x1,0x10000001,0x10000001,0x0,0x1,0x0,0x10000000,0x0,0x10000001,0x0,0x1,0x1,0x0,0x10000000,0x0,0x10000001,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,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,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,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,0x1,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,0x1,0x0,0x0,0x0,0x1,0x0,0x0,};
    }
   final private JJCalls[] jj_2_rtns = new JJCalls[2];
   private boolean jj_rescan = false;
@@ -4679,7 +4686,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;
@@ -4702,7 +4709,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;
--- /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParserConstants.java	2012/10/10 07:51:50	1.23
+++ /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParserConstants.java	2013/01/03 13:21:00	1.24
@@ -125,85 +125,87 @@
   /** RegularExpression Id. */
   int ANGLE = 57;
   /** RegularExpression Id. */
-  int TIME = 58;
+  int SPL = 58;
   /** RegularExpression Id. */
-  int FREQ = 59;
+  int TIME = 59;
   /** RegularExpression Id. */
-  int RESOLUTION = 60;
+  int FREQ = 60;
   /** RegularExpression Id. */
-  int DIMEN = 61;
+  int RESOLUTION = 61;
   /** RegularExpression Id. */
-  int PERCENTAGE = 62;
+  int DIMEN = 62;
   /** RegularExpression Id. */
-  int NUMBER = 63;
+  int PERCENTAGE = 63;
   /** RegularExpression Id. */
-  int IMPORTANT_SYM = 64;
+  int NUMBER = 64;
   /** RegularExpression Id. */
-  int PSEUDOELEMENT_SYM = 65;
+  int IMPORTANT_SYM = 65;
   /** RegularExpression Id. */
-  int CHARSET_SYM = 66;
+  int PSEUDOELEMENT_SYM = 66;
   /** RegularExpression Id. */
-  int IMPORT_SYM = 67;
+  int CHARSET_SYM = 67;
   /** RegularExpression Id. */
-  int NAMESPACE_SYM = 68;
+  int IMPORT_SYM = 68;
   /** RegularExpression Id. */
-  int MEDIA_SYM = 69;
+  int NAMESPACE_SYM = 69;
   /** RegularExpression Id. */
-  int PAGE_SYM = 70;
+  int MEDIA_SYM = 70;
   /** RegularExpression Id. */
-  int FONT_FACE_SYM = 71;
+  int PAGE_SYM = 71;
   /** RegularExpression Id. */
-  int KEYFRAMES_SYM = 72;
+  int FONT_FACE_SYM = 72;
   /** RegularExpression Id. */
-  int PREF_SYM = 73;
+  int KEYFRAMES_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;
@@ -268,6 +270,7 @@
     "<RELVIEWLENGTH>",
     "<ABSOLUTLENGTH>",
     "<ANGLE>",
+    "<SPL>",
     "<TIME>",
     "<FREQ>",
     "<RESOLUTION>",
--- /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParserTokenManager.java	2012/11/07 15:49:16	1.48
+++ /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParserTokenManager.java	2013/01/03 13:21:00	1.49
@@ -27,6 +27,7 @@
 import org.w3c.css.values.CssResolution;
 import org.w3c.css.values.CssRatio;
 import org.w3c.css.values.CssTypes;
+import org.w3c.css.values.CssVolume;
 import org.w3c.css.properties.css.CssProperty;
 import org.w3c.css.parser.Frame;
 import org.w3c.css.parser.CssError;
@@ -106,7 +107,7 @@
          return jjMoveNfa_0(7, 0);
       case 58:
          jjmatchedKind = 52;
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x40000002L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x80000004L);
       case 59:
          jjmatchedKind = 44;
          return jjMoveNfa_0(7, 0);
@@ -116,7 +117,7 @@
          jjmatchedKind = 42;
          return jjMoveNfa_0(7, 0);
       case 64:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x1fffcL);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x3fff8L);
       case 91:
          jjmatchedKind = 46;
          return jjMoveNfa_0(7, 0);
@@ -130,9 +131,9 @@
          return jjMoveStringLiteralDfa1_0(0x80000000L, 0x0L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x20000000L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x40000000L);
       case 124:
-         jjmatchedKind = 98;
+         jjmatchedKind = 99;
          return jjMoveStringLiteralDfa1_0(0x2000000L, 0x0L);
       case 125:
          jjmatchedKind = 38;
@@ -154,9 +155,9 @@
       case 45:
          return jjMoveStringLiteralDfa2_0(active0, 0x800000L, active1, 0L);
       case 58:
-         if ((active1 & 0x2L) != 0L)
+         if ((active1 & 0x4L) != 0L)
          {
-            jjmatchedKind = 65;
+            jjmatchedKind = 66;
             jjmatchedPos = 1;
          }
          break;
@@ -184,40 +185,40 @@
          break;
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x20000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x40000000L);
       case 66:
       case 98:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x2000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x4000L);
       case 67:
       case 99:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x8404L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x10808L);
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x80L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x100L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x8L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x10L);
       case 75:
       case 107:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x100L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x200L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x4000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x8000L);
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x20L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x40L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa2_0(active0, 0x80000000L, active1, 0x40000010L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x80000000L, active1, 0x80000020L);
       case 80:
       case 112:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x10240L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x20480L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x1000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x2000L);
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x800L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x1000L);
       default :
          break;
    }
@@ -244,7 +245,7 @@
          break;
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x50L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0xa0L);
       case 68:
       case 100:
          if ((active0 & 0x80000000L) != 0L)
@@ -255,25 +256,25 @@
          break;
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x4120L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x8240L);
       case 72:
       case 104:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x10004L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x20008L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x1000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x2000L);
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x8L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x10L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x20000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x40000000L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x4000ac80L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x80015900L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x200L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x400L);
       default :
          break;
    }
@@ -298,48 +299,48 @@
          break;
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x4L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x8L);
       case 68:
       case 100:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x20L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x40L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x200L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x400L);
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x4000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x8000L);
       case 71:
       case 103:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x20001040L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x40002080L);
       case 76:
       case 108:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x400L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x800L);
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x10L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x20L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x80L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x100L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x10000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x20000L);
       case 80:
       case 112:
-         if ((active1 & 0x800L) != 0L)
+         if ((active1 & 0x1000L) != 0L)
          {
-            jjmatchedKind = 75;
+            jjmatchedKind = 76;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x8L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x10L);
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x40002000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x80004000L);
       case 85:
       case 117:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x8000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x10000L);
       case 89:
       case 121:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x100L);
+         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x200L);
       default :
          break;
    }
@@ -356,51 +357,51 @@
    switch(curChar)
    {
       case 40:
-         if ((active1 & 0x20000000L) != 0L)
+         if ((active1 & 0x40000000L) != 0L)
          {
-            jjmatchedKind = 93;
+            jjmatchedKind = 94;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x40000000L) != 0L)
+         else if ((active1 & 0x80000000L) != 0L)
          {
-            jjmatchedKind = 94;
+            jjmatchedKind = 95;
             jjmatchedPos = 4;
          }
          break;
       case 69:
       case 101:
-         if ((active1 & 0x40L) != 0L)
+         if ((active1 & 0x80L) != 0L)
          {
-            jjmatchedKind = 70;
+            jjmatchedKind = 71;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active1, 0x10L);
+         return jjMoveStringLiteralDfa5_0(active1, 0x20L);
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa5_0(active1, 0x300L);
+         return jjMoveStringLiteralDfa5_0(active1, 0x600L);
       case 72:
       case 104:
-         return jjMoveStringLiteralDfa5_0(active1, 0x1000L);
+         return jjMoveStringLiteralDfa5_0(active1, 0x2000L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa5_0(active1, 0x20L);
+         return jjMoveStringLiteralDfa5_0(active1, 0x40L);
       case 78:
       case 110:
-         return jjMoveStringLiteralDfa5_0(active1, 0x18000L);
+         return jjMoveStringLiteralDfa5_0(active1, 0x30000L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa5_0(active1, 0x408L);
+         return jjMoveStringLiteralDfa5_0(active1, 0x810L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa5_0(active1, 0x4L);
+         return jjMoveStringLiteralDfa5_0(active1, 0x8L);
       case 84:
       case 116:
-         if ((active1 & 0x4000L) != 0L)
+         if ((active1 & 0x8000L) != 0L)
          {
-            jjmatchedKind = 78;
+            jjmatchedKind = 79;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active1, 0x2080L);
+         return jjMoveStringLiteralDfa5_0(active1, 0x4100L);
       default :
          break;
    }
@@ -417,35 +418,35 @@
    switch(curChar)
    {
       case 45:
-         return jjMoveStringLiteralDfa6_0(active1, 0x80L);
+         return jjMoveStringLiteralDfa6_0(active1, 0x100L);
       case 65:
       case 97:
-         if ((active1 & 0x20L) != 0L)
+         if ((active1 & 0x40L) != 0L)
          {
-            jjmatchedKind = 69;
+            jjmatchedKind = 70;
             jjmatchedPos = 5;
          }
          break;
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa6_0(active1, 0x10200L);
+         return jjMoveStringLiteralDfa6_0(active1, 0x20400L);
       case 79:
       case 111:
-         return jjMoveStringLiteralDfa6_0(active1, 0x2000L);
+         return jjMoveStringLiteralDfa6_0(active1, 0x4000L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa6_0(active1, 0x508L);
+         return jjMoveStringLiteralDfa6_0(active1, 0xa10L);
       case 83:
       case 115:
-         return jjMoveStringLiteralDfa6_0(active1, 0x14L);
+         return jjMoveStringLiteralDfa6_0(active1, 0x28L);
       case 84:
       case 116:
-         if ((active1 & 0x1000L) != 0L)
+         if ((active1 & 0x2000L) != 0L)
          {
-            jjmatchedKind = 76;
+            jjmatchedKind = 77;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active1, 0x8000L);
+         return jjMoveStringLiteralDfa6_0(active1, 0x10000L);
       default :
          break;
    }
@@ -462,38 +463,38 @@
    switch(curChar)
    {
       case 45:
-         return jjMoveStringLiteralDfa7_0(active1, 0x400L);
+         return jjMoveStringLiteralDfa7_0(active1, 0x800L);
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa7_0(active1, 0x100L);
+         return jjMoveStringLiteralDfa7_0(active1, 0x200L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa7_0(active1, 0x8004L);
+         return jjMoveStringLiteralDfa7_0(active1, 0x10008L);
       case 70:
       case 102:
-         return jjMoveStringLiteralDfa7_0(active1, 0x80L);
+         return jjMoveStringLiteralDfa7_0(active1, 0x100L);
       case 77:
       case 109:
-         if ((active1 & 0x2000L) != 0L)
+         if ((active1 & 0x4000L) != 0L)
          {
-            jjmatchedKind = 77;
+            jjmatchedKind = 78;
             jjmatchedPos = 6;
          }
          break;
       case 80:
       case 112:
-         return jjMoveStringLiteralDfa7_0(active1, 0x10L);
+         return jjMoveStringLiteralDfa7_0(active1, 0x20L);
       case 82:
       case 114:
-         return jjMoveStringLiteralDfa7_0(active1, 0x200L);
+         return jjMoveStringLiteralDfa7_0(active1, 0x400L);
       case 84:
       case 116:
-         if ((active1 & 0x8L) != 0L)
+         if ((active1 & 0x10L) != 0L)
          {
-            jjmatchedKind = 67;
+            jjmatchedKind = 68;
             jjmatchedPos = 6;
          }
-         return jjMoveStringLiteralDfa7_0(active1, 0x10000L);
+         return jjMoveStringLiteralDfa7_0(active1, 0x20000L);
       default :
          break;
    }
@@ -511,32 +512,32 @@
    {
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa8_0(active1, 0x90L);
+         return jjMoveStringLiteralDfa8_0(active1, 0x120L);
       case 69:
       case 101:
-         return jjMoveStringLiteralDfa8_0(active1, 0x200L);
+         return jjMoveStringLiteralDfa8_0(active1, 0x400L);
       case 73:
       case 105:
-         return jjMoveStringLiteralDfa8_0(active1, 0x10000L);
+         return jjMoveStringLiteralDfa8_0(active1, 0x20000L);
       case 77:
       case 109:
-         return jjMoveStringLiteralDfa8_0(active1, 0x100L);
+         return jjMoveStringLiteralDfa8_0(active1, 0x200L);
       case 80:
       case 112:
-         return jjMoveStringLiteralDfa8_0(active1, 0x400L);
+         return jjMoveStringLiteralDfa8_0(active1, 0x800L);
       case 82:
       case 114:
-         if ((active1 & 0x8000L) != 0L)

[5894 lines skipped]
Received on Thursday, 3 January 2013 13:21:02 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Thursday, 3 January 2013 13:21:10 GMT