W3C home > Mailing lists > Public > www-validator-cvs@w3.org > February 2009

2002/css-validator/org/w3c/css/parser/analyzer CssParser.java,1.46,1.47 CssParser.jj,1.45,1.46 CssParserConstants.java,1.12,1.13 CssParserTokenManager.java,1.27,1.28

From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
Date: Tue, 10 Feb 2009 14:09:29 +0000
To: www-validator-cvs@w3.org
Message-Id: <E1LWtIn-00044o-8w@lionel-hutz.w3.org>

Update of /sources/public/2002/css-validator/org/w3c/css/parser/analyzer
In directory hutz:/tmp/cvs-serv15626

Modified Files:
	CssParser.java CssParser.jj CssParserConstants.java 
	CssParserTokenManager.java 
Log Message:
changed the order of the HASHIDENT and HASH definition to get the match in the right order, catchall for # readdded

Index: CssParserTokenManager.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParserTokenManager.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- CssParserTokenManager.java	6 Feb 2009 10:23:23 -0000	1.27
+++ CssParserTokenManager.java	10 Feb 2009 14:09:26 -0000	1.28
@@ -68,56 +68,56 @@
    switch(curChar)
    {
       case 36:
-         return jjMoveStringLiteralDfa1_0(0x4000000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x8000000000L, 0x0L);
       case 40:
-         jjmatchedKind = 49;
+         jjmatchedKind = 50;
          return jjMoveNfa_0(7, 0);
       case 41:
-         jjmatchedKind = 48;
[...8147 lines suppressed...]
@@ -5704,8 +5946,8 @@
    0x2L, 0x0L, 
 };
 protected SimpleCharStream input_stream;
-private final int[] jjrounds = new int[694];
-private final int[] jjstateSet = new int[1388];
+private final int[] jjrounds = new int[716];
+private final int[] jjstateSet = new int[1432];
 protected char curChar;
 public CssParserTokenManager(SimpleCharStream stream){
    if (SimpleCharStream.staticFlag)
@@ -5727,7 +5969,7 @@
 {
    int i;
    jjround = 0x80000001;
-   for (i = 694; i-- > 0;)
+   for (i = 716; 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.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- CssParser.java	6 Feb 2009 10:23:23 -0000	1.46
+++ CssParser.java	10 Feb 2009 14:09:26 -0000	1.47
@@ -501,11 +501,19 @@
       ;
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case IDENT:
+      case HASHIDENT:
       case HASH:
       case LBRACKET:
       case ANY:
-      case DOT:
       case COLON:
+      case LENGTH:
+      case EMS:
+      case EXS:
+      case ANGLE:
+      case TIME:
+      case FREQ:
+      case RESOLUTION:
+      case DIMEN:
       case PSEUDOCLASS_SYM:
       case CLASS:
         ruleSet();
@@ -857,11 +865,19 @@
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
         case IDENT:
+        case HASHIDENT:
         case HASH:
         case LBRACKET:
         case ANY:
-        case DOT:
         case COLON:
+        case LENGTH:
+        case EMS:
+        case EXS:
+        case ANGLE:
+        case TIME:
+        case FREQ:
+        case RESOLUTION:
+        case DIMEN:
         case PSEUDOCLASS_SYM:
         case CLASS:
           ;
@@ -1915,10 +1931,18 @@
       label_58:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case HASHIDENT:
         case HASH:
         case LBRACKET:
-        case DOT:
         case COLON:
+        case LENGTH:
+        case EMS:
+        case EXS:
+        case ANGLE:
+        case TIME:
+        case FREQ:
+        case RESOLUTION:
+        case DIMEN:
         case PSEUDOCLASS_SYM:
         case CLASS:
           ;
@@ -1928,10 +1952,18 @@
           break label_58;
         }
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case HASHIDENT:
         case HASH:
           hash(selector);
           break;
-        case DOT:
+        case LENGTH:
+        case EMS:
+        case EXS:
+        case ANGLE:
+        case TIME:
+        case FREQ:
+        case RESOLUTION:
+        case DIMEN:
         case CLASS:
           _class(selector);
           break;
@@ -1950,19 +1982,35 @@
       }
             {if (true) return selector;}
       break;
+    case HASHIDENT:
     case HASH:
     case LBRACKET:
-    case DOT:
     case COLON:
+    case LENGTH:
+    case EMS:
+    case EXS:
+    case ANGLE:
+    case TIME:
+    case FREQ:
+    case RESOLUTION:
+    case DIMEN:
     case PSEUDOCLASS_SYM:
     case CLASS:
       label_59:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case HASHIDENT:
         case HASH:
           hash(selector);
           break;
-        case DOT:
+        case LENGTH:
+        case EMS:
+        case EXS:
+        case ANGLE:
+        case TIME:
+        case FREQ:
+        case RESOLUTION:
+        case DIMEN:
         case CLASS:
           _class(selector);
           break;
@@ -1979,10 +2027,18 @@
           throw new ParseException();
         }
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+        case HASHIDENT:
         case HASH:
         case LBRACKET:
-        case DOT:
         case COLON:
+        case LENGTH:
+        case EMS:
+        case EXS:
+        case ANGLE:
+        case TIME:
+        case FREQ:
+        case RESOLUTION:
+        case DIMEN:
         case PSEUDOCLASS_SYM:
         case CLASS:
           ;
@@ -2020,8 +2076,14 @@
             ac.getFrame().addError(new CssError(e));
         }
       break;
-    case DOT:
-      jj_consume_token(DOT);
+    case LENGTH:
+    case EMS:
+    case EXS:
+    case ANGLE:
+    case TIME:
+    case FREQ:
+    case RESOLUTION:
+    case DIMEN:
       n = deprecated_class();
         if (n.image.charAt(0) == '.') {
             n.image = n.image.substring(1);
@@ -2452,7 +2514,9 @@
  */
   final public void hash(CssSelectors s) throws ParseException {
  Token n;
-    n = jj_consume_token(HASH);
+    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
+    case HASHIDENT:
+      n = jj_consume_token(HASHIDENT);
       n.image = n.image.substring(1);
       if(Character.isDigit(n.image.charAt(0))) {
           String profile = ac.getProfile();
@@ -2511,6 +2575,16 @@
               removeThisRule();
           }
       }
+      break;
+    case HASH:
+      n = jj_consume_token(HASH);
+      {if (true) throw new ParseException("Unrecognized ");}
+      break;
+    default:
+      jj_la1[97] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
   }
 
 /**
@@ -2533,7 +2607,7 @@
             ;
             break;
           default:
-            jj_la1[97] = jj_gen;
+            jj_la1[98] = jj_gen;
             break label_67;
           }
           jj_consume_token(S);
@@ -2544,12 +2618,12 @@
           important = prio();
           break;
         default:
-          jj_la1[98] = jj_gen;
+          jj_la1[99] = jj_gen;
           ;
         }
         break;
       default:
-        jj_la1[99] = jj_gen;
+        jj_la1[100] = jj_gen;
         ;
       }
         try {
@@ -2601,7 +2675,7 @@
           ;
           break;
         default:
-          jj_la1[100] = jj_gen;
+          jj_la1[101] = jj_gen;
           break label_68;
         }
         jj_consume_token(S);
@@ -2612,7 +2686,7 @@
         important = prio();
         break;
       default:
-        jj_la1[101] = jj_gen;
+        jj_la1[102] = jj_gen;
         ;
       }
         try {
@@ -2670,7 +2744,7 @@
         ;
         break;
       default:
-        jj_la1[102] = jj_gen;
+        jj_la1[103] = jj_gen;
         break label_69;
       }
       jj_consume_token(S);
@@ -2712,7 +2786,7 @@
         ;
         break;
       default:
-        jj_la1[103] = jj_gen;
+        jj_la1[104] = jj_gen;
         break label_70;
       }
       operator(values);
@@ -2750,7 +2824,7 @@
         operator = unaryOperator();
         break;
       default:
-        jj_la1[104] = jj_gen;
+        jj_la1[105] = jj_gen;
         ;
       }
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -2804,7 +2878,7 @@
                         setValue(func, exp, operator, null, FUNCTION);
         break;
       default:
-        jj_la1[105] = jj_gen;
+        jj_la1[106] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -2815,7 +2889,7 @@
           ;
           break;
         default:
-          jj_la1[106] = jj_gen;
+          jj_la1[107] = jj_gen;
           break label_71;
         }
         jj_consume_token(S);
@@ -2870,7 +2944,7 @@
                                 UNICODERANGE);
         break;
       default:
-        jj_la1[107] = jj_gen;
+        jj_la1[108] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -2881,14 +2955,14 @@
           ;
           break;
         default:
-          jj_la1[108] = jj_gen;
+          jj_la1[109] = jj_gen;
           break label_72;
         }
         jj_consume_token(S);
       }
       break;
     default:
-      jj_la1[109] = jj_gen;
+      jj_la1[110] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2910,7 +2984,7 @@
         ;
         break;
       default:
-        jj_la1[110] = jj_gen;
+        jj_la1[111] = jj_gen;
         break label_73;
       }
       jj_consume_token(S);
@@ -3202,7 +3276,7 @@
   public Token token, jj_nt;
   private int jj_ntk;
   private int jj_gen;
-  final private int[] jj_la1 = new int[111];
+  final private int[] jj_la1 = new int[112];
   static private int[] jj_la1_0;
   static private int[] jj_la1_1;
   static private int[] jj_la1_2;
@@ -3212,13 +3286,13 @@
       jj_la1_2();
    }
    private static void jj_la1_0() {
-      jj_la1_0 = new int[] {0x0,0x0,0x0,0xe00000,0xe00000,0x0,0x200000,0x200000,0x0,0xc00000,0xc00000,0x200000,0x200000,0x0,0x200000,0x20000000,0x200000,0x0,0x200000,0x200000,0x200000,0x0,0x20000000,0x200000,0x80000000,0x200000,0x200000,0x200000,0x200000,0x0,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,0x200000,0x200000,0x3000000,0x200000,0x200000,0x0,0x3000000,0x200000,0x0,0x200000,0x0,0x200000,0x0,0x0,0x200000,0x0,0x0,0x200000,0x0,0x200000,0x28000000,0x8000000,0x0,0x200000,0x0,0x200000,0x8000000,0x200000,};
+      jj_la1_0 = new int[] {0x0,0x0,0x0,0xe00000,0xe00000,0x0,0x200000,0x200000,0x0,0xc00000,0xc00000,0x200000,0x200000,0x0,0x200000,0x20000000,0x200000,0x0,0x200000,0x200000,0x200000,0x0,0x20000000,0x200000,0x80000000,0x200000,0x200000,0x200000,0x200000,0x0,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,0x200000,0x200000,0x3000000,0x200000,0x200000,0x0,0x3000000,0x200000,0x0,0x200000,0x0,0x200000,0x0,0x0,0x0,0x200000,0x0,0x0,0x200000,0x0,0x200000,0x28000000,0x8000000,0x0,0x200000,0x0,0x200000,0x8000000,0x200000,};
    }
    private static void jj_la1_1() {
-      jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4d00c,0x0,0x0,0x0,0x0,0x100001,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x80000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4d00c,0x0,0x0,0x0,0x0,0x4,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x800,0x0,0x0,0x0,0x0,0x200,0x0,0x0,0x0,0x0,0x0,0x4,0x400,0x0,0x4,0x0,0x0,0x0,0x49008,0x49008,0x49008,0x49008,0x4d00c,0x8000,0x2fe00000,0x4004,0x0,0x0,0x1e0,0x0,0x0,0x5,0x1e0,0x0,0x80000005,0x0,0x0,0x0,0x4,0x40000,0x0,0x0,0x40000,0x0,0x0,0x0,0xfff00a0d,0x200,0xffe00000,0x0,0x10000d,0x0,0xfff0020d,0x0,};
+      jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x5fc8a01c,0x0,0x0,0x0,0x0,0x200001,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x100000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x5fc8a01c,0x0,0x0,0x0,0x0,0x4,0x80000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000,0x0,0x1000,0x0,0x0,0x0,0x0,0x400,0x0,0x0,0x0,0x0,0x0,0x4,0x800,0x0,0x4,0x0,0x0,0x0,0x5fc82018,0x5fc82018,0x5fc82018,0x5fc82018,0x5fc8a01c,0x5fc00000,0x5fc00000,0x8004,0x0,0x0,0x3c0,0x0,0x0,0x5,0x3c0,0x0,0x5,0x0,0x0,0x0,0x4,0x80000,0x18,0x0,0x0,0x80000,0x0,0x0,0x0,0xffe01415,0x400,0xffc00000,0x0,0x200015,0x0,0xffe00415,0x0,};
    }
    private static void jj_la1_2() {
-      jj_la1_2 = new int[] {0x60000000,0x60000000,0x4,0x0,0x0,0x8,0x0,0x0,0x40041f2,0x8000,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000002,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1e00,0x1e00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000002,0x4000002,0x4000002,0x4000002,0x4000002,0x4000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x18000000,0x0,0x18000000,0x2,0x0,0x1,0x0,0x0,0x1,0x0,0x12000000,0x0,0x10000000,0x0,0x2000000,0x0,0x12000000,0x0,};
+      jj_la1_2 = new int[] {0xc0000000,0xc0000000,0x8,0x0,0x0,0x10,0x0,0x0,0x80083e4,0x10000,0x10000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000004,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3c00,0x3c00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000004,0x8000004,0x8000004,0x8000004,0x8000004,0x8000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x30000000,0x0,0x30000000,0x4,0x0,0x0,0x2,0x0,0x0,0x2,0x0,0x24000001,0x0,0x20000001,0x0,0x4000000,0x0,0x24000001,0x0,};
    }
 
   public CssParser(java.io.InputStream stream) {
@@ -3230,7 +3304,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 111; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 112; i++) jj_la1[i] = -1;
   }
 
   public void ReInit(java.io.InputStream stream) {
@@ -3242,7 +3316,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 111; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 112; i++) jj_la1[i] = -1;
   }
 
   public CssParser(java.io.Reader stream) {
@@ -3251,7 +3325,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 111; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 112; i++) jj_la1[i] = -1;
   }
 
   public void ReInit(java.io.Reader stream) {
@@ -3260,7 +3334,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 111; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 112; i++) jj_la1[i] = -1;
   }
 
   public CssParser(CssParserTokenManager tm) {
@@ -3268,7 +3342,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 111; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 112; i++) jj_la1[i] = -1;
   }
 
   public void ReInit(CssParserTokenManager tm) {
@@ -3276,7 +3350,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 111; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 112; i++) jj_la1[i] = -1;
   }
 
   final private Token jj_consume_token(int kind) throws ParseException {
@@ -3323,15 +3397,15 @@
 
   public ParseException generateParseException() {
     jj_expentries.removeAllElements();
-    boolean[] la1tokens = new boolean[95];
-    for (int i = 0; i < 95; i++) {
+    boolean[] la1tokens = new boolean[96];
+    for (int i = 0; i < 96; i++) {
       la1tokens[i] = false;
     }
     if (jj_kind >= 0) {
       la1tokens[jj_kind] = true;
       jj_kind = -1;
     }
-    for (int i = 0; i < 111; i++) {
+    for (int i = 0; i < 112; i++) {
       if (jj_la1[i] == jj_gen) {
         for (int j = 0; j < 32; j++) {
           if ((jj_la1_0[i] & (1<<j)) != 0) {
@@ -3346,7 +3420,7 @@
         }
       }
     }
-    for (int i = 0; i < 95; i++) {
+    for (int i = 0; i < 96; 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.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- CssParserConstants.java	28 Mar 2008 15:05:49 -0000	1.12
+++ CssParserConstants.java	10 Feb 2009 14:09:26 -0000	1.13
@@ -38,66 +38,67 @@
   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 HASHIDENT = 35;
+  int HASH = 36;
+  int RBRACE = 37;
+  int PREFIXMATCH = 38;
+  int SUFFIXMATCH = 39;
+  int SUBSTRINGMATCH = 40;
+  int EQ = 41;
+  int MINUS = 42;
+  int SEMICOLON = 43;
+  int DIV = 44;
+  int LBRACKET = 45;
+  int RBRACKET = 46;
+  int ANY = 47;
+  int DOT = 48;
+  int LPARAN = 49;
+  int RPARAN = 50;
+  int COLON = 51;
+  int MEDIARESTRICTOR = 52;
+  int URL = 53;
+  int LENGTH = 54;
+  int EMS = 55;
+  int EXS = 56;
+  int ANGLE = 57;
+  int TIME = 58;
+  int FREQ = 59;
+  int RESOLUTION = 60;
+  int DATE = 61;
+  int DIMEN = 62;
+  int PERCENTAGE = 63;
+  int NUMBER = 64;
+  int IMPORTANT_SYM = 65;
+  int PSEUDOCLASS_SYM = 66;
+  int CHARSET_SYM = 67;
+  int IMPORT_SYM = 68;
+  int MEDIA_SYM = 69;
+  int PAGE_SYM = 70;
+  int FONT_FACE_SYM = 71;
+  int PREF_SYM = 72;
+  int COLOR_PROFILE = 73;
+  int ATTOP = 74;
+  int ATRIGHT = 75;
+  int ATBOTTOM = 76;
+  int ATLEFT = 77;
+  int ATCOUNTER = 78;
+  int PHONETIC_ALPHABET_SYM = 79;
+  int ATKEYWORD = 80;
+  int RANGE0 = 81;
+  int RANGE1 = 82;
+  int RANGE2 = 83;
+  int RANGE3 = 84;
+  int RANGE4 = 85;
+  int RANGE5 = 86;
+  int RANGE6 = 87;
+  int RANGE = 88;
+  int UNI = 89;
+  int UNICODERANGE = 90;
+  int CLASS = 91;
+  int FUNCTIONLANG = 92;
+  int FUNCTION = 93;
+  int HTMLSTARTTAG = 94;
+  int HTMLENDTAG = 95;
 
   int DEFAULT = 0;
 
@@ -137,6 +138,7 @@
     "<STRING>",
     "<INVALID>",
     "<IDENT>",
+    "<HASHIDENT>",
     "<HASH>",
     "\"}\"",
     "\"^=\"",

Index: CssParser.jj
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParser.jj,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- CssParser.jj	10 Feb 2009 14:00:49 -0000	1.45
+++ CssParser.jj	10 Feb 2009 14:09:26 -0000	1.46
@@ -10,7 +10,7 @@
 options {
     IGNORE_CASE  = true;
     STATIC = false;
-    /*    
+    /*
           DEBUG_TOKEN_MANAGER = true; 
 	  DEBUG_PARSER = true;      
     */
@@ -420,8 +420,8 @@
     <STRING    : <_STRING> >
   | <INVALID   : <_INVALID> >
   | <IDENT     : <_IDENT> >
-  | <HASH      : "#" <NAME> >
   | <HASHIDENT : "#" <_IDENT> >
+  | <HASH      : "#" <NAME> >
 }
 
 <DEFAULT>
@@ -1689,6 +1689,9 @@
 	  }
       }
   }
+  | n=<HASH> {
+      throw new ParseException("Unrecognized ");	 
+  }
 }
 
 /**
Received on Tuesday, 10 February 2009 14:09:38 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Thursday, 26 April 2012 12:55:08 GMT