2002/css-validator/org/w3c/css/parser/analyzer CssParser.jj,1.23,1.24 CssParser.java,1.26,1.27

• From: Julien Grand-Mourcel via cvs-syncmail <cvsmail@w3.org>
• Date: Wed, 26 Sep 2007 11:15:00 +0000
• To: www-validator-cvs@w3.org
• Message-Id: <E1IaUr6-0004lT-Bl@lionel-hutz.w3.org>

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

Modified Files:
	CssParser.jj CssParser.java 
Log Message:
change the tests to show warning for CSS level (notversion message)...

Index: CssParser.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParser.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- CssParser.java	24 Sep 2007 15:45:26 -0000	1.26
+++ CssParser.java	26 Sep 2007 11:14:57 -0000	1.27
@@ -2381,17 +2381,17 @@
       break;
     case ANY:
       jj_consume_token(ANY);
-                if (!ac.getCssVersion().equals("css1") && !"none".equals(ac.getProfile())) {
-            if (ac.getCssVersion().equals("css1") && "none".equals(ac.getProfile())) {
+        if (!ac.getCssVersion().equals("css1")) {
+//          s.setElement(null);
+            s.addUniversal(new UniversalSelector());
+        } else {
+            if ("none".equals(ac.getProfile())) {
                 ac.getFrame().addWarning("notversion");
             } else {
-//              s.setElement(null);
-                s.addUniversal(new UniversalSelector());
+                ac.getFrame().addError(new CssError(new InvalidParamException("notversion",
+                "*", ac.getCssVersion(), ac)));
             }
-                } else {
-                    ac.getFrame().addError(new CssError(new InvalidParamException("notversion",
-                        "*", ac.getCssVersion(), ac)));
-                }
+        }
       break;
     default:
       jj_la1[92] = jj_gen;

Index: CssParser.jj
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/parser/analyzer/CssParser.jj,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- CssParser.jj	24 Sep 2007 15:45:26 -0000	1.23
+++ CssParser.jj	26 Sep 2007 11:14:57 -0000	1.24
@@ -1414,18 +1414,18 @@
   n=<IDENT> { //              s.setElement(convertIdent(n.image), ac);
       s.addType(new TypeSelector(convertIdent(n.image)));}
   | "*" { 
-		if (!ac.getCssVersion().equals("css1") && !"none".equals(ac.getProfile())) {
-            if (ac.getCssVersion().equals("css1") && "none".equals(ac.getProfile())) {
+        if (!ac.getCssVersion().equals("css1")) {
+//          s.setElement(null);
+            s.addUniversal(new UniversalSelector());
+        } else {
+            if ("none".equals(ac.getProfile())) {
                 ac.getFrame().addWarning("notversion");
             } else {
-//              s.setElement(null);
-                s.addUniversal(new UniversalSelector());
+                ac.getFrame().addError(new CssError(new InvalidParamException("notversion",
+                "*", ac.getCssVersion(), ac)));
             }
-		} else {
-		    ac.getFrame().addError(new CssError(new InvalidParamException("notversion",
-			"*", ac.getCssVersion(), ac)));
-		}
-	}
+        }
+    }
 }
 
 /**

Received on Wednesday, 26 September 2007 11:15:11 UTC