W3C home > Mailing lists > Public > www-validator-cvs@w3.org > October 2012

2002/css-validator/org/w3c/css/parser/analyzer CssParser.java,1.86,1.87 CssParser.jj,1.85,1.86 CssParserConstants.java,1.22,1.23 CssParserTokenManager.java,1.46,1.47

From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
Date: Wed, 10 Oct 2012 07:51:52 +0000
To: www-validator-cvs@w3.org
Message-Id: <E1TLr56-0002A6-F1@lionel-hutz.w3.org>
Update of /sources/public/2002/css-validator/org/w3c/css/parser/analyzer
In directory hutz:/tmp/cvs-serv8284

Modified Files:
	CssParser.java CssParser.jj CssParserConstants.java 
	CssParserTokenManager.java 
Log Message:
removed unfinished alpha code for calc

Index: CssParserTokenManager.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParserTokenManager.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- CssParserTokenManager.java	10 Oct 2012 07:47:31 -0000	1.46
+++ CssParserTokenManager.java	10 Oct 2012 07:51:50 -0000	1.47
@@ -94,9 +94,6 @@
       case 42:
          jjmatchedKind = 48;
          return jjMoveStringLiteralDfa1_0(0x20000000000L, 0x0L);
-      case 43:
-         jjmatchedKind = 101;
-         return jjMoveNfa_0(7, 0);
       case 45:
          jjmatchedKind = 43;
          return jjMoveStringLiteralDfa1_0(0x800000L, 0x0L);
@@ -129,15 +126,12 @@
          return jjMoveStringLiteralDfa1_0(0x8000000000L, 0x0L);
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa1_0(0x80000000L, 0x100000000L);
-      case 67:
-      case 99:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x80000000L);
+         return jjMoveStringLiteralDfa1_0(0x80000000L, 0x0L);
       case 76:
       case 108:
          return jjMoveStringLiteralDfa1_0(0x0L, 0x20000000L);
       case 124:
-         jjmatchedKind = 100;
+         jjmatchedKind = 98;
          return jjMoveStringLiteralDfa1_0(0x2000000L, 0x0L);
       case 125:
          jjmatchedKind = 38;
@@ -189,7 +183,7 @@
          break;
       case 65:
       case 97:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0xa0000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x20000000L);
       case 66:
       case 98:
          return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x2000L);
@@ -222,7 +216,7 @@
          return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x1000L);
       case 84:
       case 116:
-         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x100000800L);
+         return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x800L);
       default :
          break;
    }
@@ -267,9 +261,6 @@
       case 73:
       case 105:
          return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x1000L);
-      case 76:
-      case 108:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x80000000L);
       case 77:
       case 109:
          return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x8L);
@@ -282,9 +273,6 @@
       case 82:
       case 114:
          return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x200L);
-      case 84:
-      case 116:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x100000000L);
       default :
          break;
    }
@@ -310,9 +298,6 @@
       case 65:
       case 97:
          return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x4L);
-      case 67:
-      case 99:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x80000000L);
       case 68:
       case 100:
          return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x20L);
@@ -345,9 +330,6 @@
             jjmatchedPos = 3;
          }
          return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x8L);
-      case 82:
-      case 114:
-         return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x100000000L);
       case 84:
       case 116:
          return jjMoveStringLiteralDfa4_0(active0, 0L, active1, 0x40002000L);
@@ -383,16 +365,6 @@
             jjmatchedKind = 94;
             jjmatchedPos = 4;
          }
-         else if ((active1 & 0x80000000L) != 0L)
-         {
-            jjmatchedKind = 95;
-            jjmatchedPos = 4;
-         }
-         else if ((active1 & 0x100000000L) != 0L)
-         {
-            jjmatchedKind = 96;
-            jjmatchedPos = 4;
-         }
          break;
       case 69:
       case 101:
@@ -1245,8 +1217,8 @@
                      jjstateSet[jjnewStateCnt++] = 91;
                   break;
                case 99:
-                  if (curChar == 62 && kind > 98)
-                     kind = 98;
+                  if (curChar == 62 && kind > 96)
+                     kind = 96;
                   break;
                case 101:
                   if ((0xfc00ffffffffcbffL & l) != 0L)
@@ -1642,8 +1614,8 @@
                      jjstateSet[jjnewStateCnt++] = 203;
                   break;
                case 211:
-                  if (curChar == 62 && kind > 99)
-                     kind = 99;
+                  if (curChar == 62 && kind > 97)
+                     kind = 97;
                   break;
                case 213:
                   if ((0xfc00ffffffffcbffL & l) != 0L)
@@ -2351,8 +2323,8 @@
                      jjCheckNAddStates(1086, 1088);
                   break;
                case 376:
-                  if (curChar == 40 && kind > 97)
-                     kind = 97;
+                  if (curChar == 40 && kind > 95)
+                     kind = 95;
                   break;
                case 378:
                   if ((0xfc00ffffffffcbffL & l) != 0L)
@@ -6240,15 +6212,14 @@
 "\135", "\52", "\56", "\51", "\50", "\72", null, null, null, null, null, null, null, 
 null, null, null, null, null, "\72\72", null, null, null, null, null, null, null, 
 null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
-null, null, null, null, null, null, null, null, null, null, null, null, null, 
-"\174", "\53", };
+null, null, null, null, null, null, null, null, null, null, null, "\174", };
 
 /** Lexer state names. */
 public static final String[] lexStateNames = {
    "DEFAULT",
 };
 static final long[] jjtoToken = {
-   0xffffffffffe00001L, 0x3ff803ffffL, 
+   0xffffffffffe00001L, 0x7f803ffffL, 
 };
 static final long[] jjtoSkip = {
    0x2L, 0x0L, 

Index: CssParser.jj
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParser.jj,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- CssParser.jj	10 Oct 2012 07:47:31 -0000	1.85
+++ CssParser.jj	10 Oct 2012 07:51:50 -0000	1.86
@@ -642,13 +642,17 @@
 <DEFAULT>
 TOKEN [IGNORE_CASE] :
 {
-    < FUNCTIONLANG  : "lang(" >
-    | <FUNCTIONNOT  : ":not(" >
-    | <FUNCTIONCALC : "calc(" >
-    | <FUNCTIONATTR : "attr(" >
+    < FUNCTIONLANG : "lang(" >
 }
 
 <DEFAULT>
+TOKEN [IGNORE_CASE] :
+{
+    < FUNCTIONNOT : ":not(" >
+}
+
+
+<DEFAULT>
     TOKEN :
 {
     < FUNCTION : <IDENT> "(" >
@@ -2410,91 +2414,6 @@
 				UNICODERANGE); }
     ) ( <S> )* )
 }
-
-CssCheckableValue mathcalc() :
-{
-CssCheckableValue v;
-}
-{
-  ( <FUNCTIONCALC>  ( <S> )* v=mathsum() ( <S> )* ")" ) {
-    return v;
-  }
-}
-
-CssCheckableValue mathsum() :
-{ Token n,o;
-  CssCheckableValue v1 = null;
-  CssCheckableValue v2 = null;
-}
-{   // product [ S+ [ "+" | "-" ] S+ product ]*;
-   ( v1=mathproduct() ( LOOKAHEAD(1) ( <S> )+ ( o="+" | o="-" ) ( <S> )+ v2=mathproduct() {
-                      // TODO add stuff, type checking etc...
-                     }
-                    )*
- ) { return v1; }
-}
-
-
-CssCheckableValue mathproduct() :
-{ Token n,o;
-  CssCheckableValue v1 = null;
-  CssCheckableValue v2 = null;
-}
-{
-
- ( v1=mathunit()  ( LOOKAHEAD(1) ( <S> )* (  ( o="*" ( <S> )* v2=mathunit() )
-                             | ( o="/" ( <S> )* n=<NUMBER> { v2 = new CssNumber(); v2.set(n.image, ac); } )
-                          ) { /* TODO check */
-                              if ("/".equals(o.image)) {
-                                  BigDecimal p = (BigDecimal) v1.get();
-                                  BigDecimal d = (BigDecimal) v2.get();
-                                  if (BigDecimal.ZERO.equals(d)) {
-                                  // TODO throw divided by zero error
-                                  }
-                                  p.divide(d);
-                                  v1.setValue(p);
-                              } else {
-                                  if ((v1.getType() != CssTypes.CSS_NUMBER) &&
-                                      (v2.getType() != CssTypes.CSS_NUMBER)) {
-                                  // TODO one operand must be a number
-                                  }
-                                  BigDecimal p = (BigDecimal) v1.get();
-                                  BigDecimal d = (BigDecimal) v2.get();
-                                  p.multiply(d);
-                                  if (v1.getType() == CssTypes.CSS_NUMBER) {
-                                     v2.setValue(p);
-                                     v1 = v2;
-                                  } else {
-                                     v1.setValue(p);
-                                  }
-                              }
-                          }
-                  )*
- ) { return v1; }
-}
-
-CssCheckableValue mathunit() :
-{ Token n;
-CssCheckableValue v = null;
-}
-{
-( n=<NUMBER> { v = new CssNumber(); v.set(n.image, ac); }
- | n=<PERCENTAGE> { v = new CssPercentage(); v.set(n.image, ac); }
-     | n=<RELFONTLENGTH> { v = new CssLength(); v.set(n.image, ac); }
-     | n=<RELVIEWLENGTH> { v = new CssLength(); v.set(n.image, ac); }
-     | n=<ABSOLUTLENGTH> { v = new CssLength(); v.set(n.image, ac); }
-     | n=<ANGLE> { v = new CssAngle(); v.set(n.image, ac); }
-     | n=<TIME> { v = new CssTime(); v.set(n.image, ac); }
-     | n=<FREQ> { v= new CssFrequency(); v.set(n.image, ac); }
-     | ( "(" ( <S> )* v=mathsum() ( <S> )* ")" )
-     | v=mathcalc()
-   // | v=attr()
-     ) {
-     return v;
-     }
-}
-
-
 /**
  * @exception ParseException exception during the parse
  */

Index: CssParser.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParser.java,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- CssParser.java	10 Oct 2012 07:47:30 -0000	1.86
+++ CssParser.java	10 Oct 2012 07:51:49 -0000	1.87
@@ -642,7 +642,7 @@
       case PSEUDOELEMENT_SYM:
       case CLASS:
       case FUNCTIONNOT:
-      case 100:
+      case 98:
         ruleSet();
         break;
       case MEDIA_SYM:
@@ -994,7 +994,7 @@
         case PSEUDOELEMENT_SYM:
         case CLASS:
         case FUNCTIONNOT:
-        case 100:
+        case 98:
           ;
           break;
         default:
@@ -2531,7 +2531,7 @@
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case IDENT:
     case ANY:
-    case 100:
+    case 98:
       element_name(selector);
       label_80:
       while (true) {
@@ -2828,7 +2828,7 @@
         jj_la1[108] = jj_gen;
         ;
       }
-      p = jj_consume_token(100);
+      p = jj_consume_token(98);
     } else {
       ;
     }
@@ -3084,7 +3084,7 @@
     switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
     case IDENT:
     case ANY:
-    case 100:
+    case 98:
       element_name(ns);
       break;
     case HASHIDENT:
@@ -4022,271 +4022,6 @@
     }
   }
 
-  final public CssCheckableValue mathcalc() throws ParseException {
-CssCheckableValue v;
-    jj_consume_token(FUNCTIONCALC);
-    label_102:
-    while (true) {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case S:
-        ;
-        break;
-      default:
-        jj_la1[152] = jj_gen;
-        break label_102;
-      }
-      jj_consume_token(S);
-    }
-    v = mathsum();
-    label_103:
-    while (true) {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case S:
-        ;
-        break;
-      default:
-        jj_la1[153] = jj_gen;
-        break label_103;
-      }
-      jj_consume_token(S);
-    }
-    jj_consume_token(LPARAN);
-    {if (true) return v;}
-    throw new Error("Missing return statement in function");
-  }
-
-  final public CssCheckableValue mathsum() throws ParseException {
-  Token n,o;
-  CssCheckableValue v1 = null;
-  CssCheckableValue v2 = null;
-    v1 = mathproduct();
-    label_104:
-    while (true) {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case S:
-        ;
-        break;
-      default:
-        jj_la1[154] = jj_gen;
-        break label_104;
-      }
-      label_105:
-      while (true) {
-        jj_consume_token(S);
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-        case S:
-          ;
-          break;
-        default:
-          jj_la1[155] = jj_gen;
-          break label_105;
-        }
-      }
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case 101:
-        o = jj_consume_token(101);
-        break;
-      case MINUS:
-        o = jj_consume_token(MINUS);
-        break;
-      default:
-        jj_la1[156] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
-      }
-      label_106:
-      while (true) {
-        jj_consume_token(S);
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-        case S:
-          ;
-          break;
-        default:
-          jj_la1[157] = jj_gen;
-          break label_106;
-        }
-      }
-      v2 = mathproduct();
-
-    }
-     {if (true) return v1;}
-    throw new Error("Missing return statement in function");
-  }
-
-  final public CssCheckableValue mathproduct() throws ParseException {
-  Token n,o;
-  CssCheckableValue v1 = null;
-  CssCheckableValue v2 = null;
-    v1 = mathunit();
-    label_107:
-    while (true) {
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case S:
-      case DIV:
-      case ANY:
-        ;
-        break;
-      default:
-        jj_la1[158] = jj_gen;
-        break label_107;
-      }
-      label_108:
-      while (true) {
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-        case S:
-          ;
-          break;
-        default:
-          jj_la1[159] = jj_gen;
-          break label_108;
-        }
-        jj_consume_token(S);
-      }
-      switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-      case ANY:
-        o = jj_consume_token(ANY);
-        label_109:
-        while (true) {
-          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-          case S:
-            ;
-            break;
-          default:
-            jj_la1[160] = jj_gen;
-            break label_109;
-          }
-          jj_consume_token(S);
-        }
-        v2 = mathunit();
-        break;
-      case DIV:
-        o = jj_consume_token(DIV);
-        label_110:
-        while (true) {
-          switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-          case S:
-            ;
-            break;
-          default:
-            jj_la1[161] = jj_gen;
-            break label_110;
-          }
-          jj_consume_token(S);
-        }
-        n = jj_consume_token(NUMBER);
-                                                             v2 = new CssNumber(); v2.set(n.image, ac);
-        break;
-      default:
-        jj_la1[162] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
-      }
-                              /* TODO check */
-                              if ("/".equals(o.image)) {
-                                  BigDecimal p = (BigDecimal) v1.get();
-                                  BigDecimal d = (BigDecimal) v2.get();
-                                  if (BigDecimal.ZERO.equals(d)) {
-                                  // TODO throw divided by zero error
-                                  }
-                                  p.divide(d);
-                                  v1.setValue(p);
-                              } else {
-                                  if ((v1.getType() != CssTypes.CSS_NUMBER) &&
-                                      (v2.getType() != CssTypes.CSS_NUMBER)) {
-                                  // TODO one operand must be a number
-                                  }
-                                  BigDecimal p = (BigDecimal) v1.get();
-                                  BigDecimal d = (BigDecimal) v2.get();
-                                  p.multiply(d);
-                                  if (v1.getType() == CssTypes.CSS_NUMBER) {
-                                     v2.setValue(p);
-                                     v1 = v2;
-                                  } else {
-                                     v1.setValue(p);
-                                  }
-                              }
-    }
-     {if (true) return v1;}
-    throw new Error("Missing return statement in function");
-  }
-
-  final public CssCheckableValue mathunit() throws ParseException {
-  Token n;
-CssCheckableValue v = null;
-    switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-    case NUMBER:
-      n = jj_consume_token(NUMBER);
-               v = new CssNumber(); v.set(n.image, ac);
-      break;
-    case PERCENTAGE:
-      n = jj_consume_token(PERCENTAGE);
-                    v = new CssPercentage(); v.set(n.image, ac);
-      break;
-    case RELFONTLENGTH:
-      n = jj_consume_token(RELFONTLENGTH);
-                           v = new CssLength(); v.set(n.image, ac);
-      break;
-    case RELVIEWLENGTH:
-      n = jj_consume_token(RELVIEWLENGTH);
-                           v = new CssLength(); v.set(n.image, ac);
-      break;
-    case ABSOLUTLENGTH:
-      n = jj_consume_token(ABSOLUTLENGTH);
-                           v = new CssLength(); v.set(n.image, ac);
-      break;
-    case ANGLE:
-      n = jj_consume_token(ANGLE);
-                   v = new CssAngle(); v.set(n.image, ac);
-      break;
-    case TIME:
-      n = jj_consume_token(TIME);
-                  v = new CssTime(); v.set(n.image, ac);
-      break;
-    case FREQ:
-      n = jj_consume_token(FREQ);
-                  v= new CssFrequency(); v.set(n.image, ac);
-      break;
-    case RPARAN:
-      jj_consume_token(RPARAN);
-      label_111:
-      while (true) {
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-        case S:
-          ;
-          break;
-        default:
-          jj_la1[163] = jj_gen;
-          break label_111;
-        }
-        jj_consume_token(S);
-      }
-      v = mathsum();
-      label_112:
-      while (true) {
-        switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
-        case S:
-          ;
-          break;
-        default:
-          jj_la1[164] = jj_gen;
-          break label_112;
-        }
-        jj_consume_token(S);
-      }
-      jj_consume_token(LPARAN);
-      break;
-    case FUNCTIONCALC:
-      v = mathcalc();
-      break;
-    default:
-      jj_la1[165] = jj_gen;
-      jj_consume_token(-1);
-      throw new ParseException();
-    }
-     {if (true) return v;}
-    throw new Error("Missing return statement in function");
-  }
-
 /**
  * @exception ParseException exception during the parse
  */
@@ -4295,15 +4030,15 @@
  CssExpression exp;
  org.w3c.css.values.CssColor color = new org.w3c.css.values.CssColor();
     n = jj_consume_token(FUNCTION);
-    label_113:
+    label_102:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case S:
         ;
         break;
       default:
-        jj_la1[166] = jj_gen;
-        break label_113;
+        jj_la1[152] = jj_gen;
+        break label_102;
       }
       jj_consume_token(S);
     }
@@ -4346,7 +4081,7 @@
       n = jj_consume_token(HASH);
       break;
     default:
-      jj_la1[167] = jj_gen;
+      jj_la1[153] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -4625,7 +4360,15 @@
     finally { jj_save(1, xla); }
   }
 
-  private boolean jj_3R_114() {
+  private boolean jj_3_1() {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_103()) jj_scanpos = xsp;
+    if (jj_scan_token(98)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_103() {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(35)) {
@@ -4646,14 +4389,6 @@
     return false;
   }
 
-  private boolean jj_3_1() {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_114()) jj_scanpos = xsp;
-    if (jj_scan_token(100)) return true;
-    return false;
-  }
-
   /** Generated Token Manager. */
   public CssParserTokenManager token_source;
   SimpleCharStream jj_input_stream;
@@ -4665,7 +4400,7 @@
   private Token jj_scanpos, jj_lastpos;
   private int jj_la;
   private int jj_gen;
-  final private int[] jj_la1 = new int[168];
+  final private int[] jj_la1 = new int[154];
   static private int[] jj_la1_0;
   static private int[] jj_la1_1;
   static private int[] jj_la1_2;
@@ -4677,16 +4412,16 @@
       jj_la1_init_3();
    }
    private static void jj_la1_init_0() {
-      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,0x0,0x200000,0x200000,0x200000,0x200000,0x0,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,0x20000,0x0,0x200000,0x8000000,0x200000,0x8000000,0x28000000,0x28000000,0x8000000,0x0,0x200000,0x0,0x200000,0x8000000,0x8000000,0x0,0x0,0x200000,0x0,0x200000,0x8000000,0x200000,0x200000,0x200000,0x200000,0x0,0x200000,0x200000,0x200000,0x200000,0x200000,0x0,0x200000,0x200000,0x0,0x200000,0x0,};
+      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,0x0,0x200000,0x200000,0x200000,0x200000,0x0,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,0x20000,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,0x40000008,0x0,0x0,0x0,0x0,0x40000008,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,0xa000080a,0x0,0xa000080a,0xffe0283a,0xffe0083a,0x800,0xffc00000,0x0,0x20203a,0x0,0xffe0283a,0x800,0x80000000,0xffc00000,0x0,0x20003a,0x0,0xffe0083a,0x0,0x0,0x0,0x0,0x800,0x0,0x12000,0x0,0x0,0x0,0x12000,0x0,0x0,0xcfc80000,0x0,0x30,};
+      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,0x40000008,0x0,0x0,0x0,0x0,0x40000008,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,0xa000080a,0x0,0xa000080a,0xffe0283a,0xffe0083a,0x800,0xffc00000,0x0,0x20203a,0x0,0xffe0283a,0x800,0x80000000,0xffc00000,0x0,0x20003a,0x0,0xffe0083a,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,0x50000002,0x50000002,0x50000002,0x50000002,0x50000002,0x10000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000002,0x0,0x0,0x0,0x0,0x0,0x20000000,0x20000000,0x2,0x0,0x0,0x1,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x8000000,0x8000000,0x0,0x0,0x0,0x8000000,0x0,0x8000000,0x0,0x0,0x0,0x0,0x8000000,0x0,0x8000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80000000,0x0,0x0,};
+      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,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,};
    }
    private static void jj_la1_init_3() {
-      jj_la1_3 = new int[] {0xc,0xc,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x0,0x0,0x2,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x2,0x0,0x2,0x0,0x0,0x0,0x2,0x0,0x0,0x2,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x0,0x20,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,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,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,};
    }
   final private JJCalls[] jj_2_rtns = new JJCalls[2];
   private boolean jj_rescan = false;
@@ -4703,7 +4438,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 168; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 154; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4718,7 +4453,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 168; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 154; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4729,7 +4464,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 168; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 154; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4740,7 +4475,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 168; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 154; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4750,7 +4485,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 168; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 154; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4760,7 +4495,7 @@
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 168; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 154; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4872,12 +4607,12 @@
   /** Generate ParseException. */
   public ParseException generateParseException() {
     jj_expentries.clear();
-    boolean[] la1tokens = new boolean[102];
+    boolean[] la1tokens = new boolean[99];
     if (jj_kind >= 0) {
       la1tokens[jj_kind] = true;
       jj_kind = -1;
     }
-    for (int i = 0; i < 168; i++) {
+    for (int i = 0; i < 154; i++) {
       if (jj_la1[i] == jj_gen) {
         for (int j = 0; j < 32; j++) {
           if ((jj_la1_0[i] & (1<<j)) != 0) {
@@ -4895,7 +4630,7 @@
         }
       }
     }
-    for (int i = 0; i < 102; i++) {
+    for (int i = 0; i < 99; 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.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- CssParserConstants.java	10 Oct 2012 07:47:31 -0000	1.22
+++ CssParserConstants.java	10 Oct 2012 07:51:50 -0000	1.23
@@ -199,15 +199,11 @@
   /** RegularExpression Id. */
   int FUNCTIONNOT = 94;
   /** RegularExpression Id. */
-  int FUNCTIONCALC = 95;
-  /** RegularExpression Id. */
-  int FUNCTIONATTR = 96;
-  /** RegularExpression Id. */
-  int FUNCTION = 97;
+  int FUNCTION = 95;
   /** RegularExpression Id. */
-  int HTMLSTARTTAG = 98;
+  int HTMLSTARTTAG = 96;
   /** RegularExpression Id. */
-  int HTMLENDTAG = 99;
+  int HTMLENDTAG = 97;
 
   /** Lexical state. */
   int DEFAULT = 0;
@@ -309,13 +305,10 @@
     "<CLASS>",
     "\"lang(\"",
     "\":not(\"",
-    "\"calc(\"",
-    "\"attr(\"",
     "<FUNCTION>",
     "<HTMLSTARTTAG>",
     "<HTMLENDTAG>",
     "\"|\"",
-    "\"+\"",
   };
 
 }
Received on Wednesday, 10 October 2012 07:51:54 UTC

This archive was generated by hypermail 2.3.1 : Wednesday, 7 January 2015 15:17:52 UTC