% unifiy

Author: rbri

src/main/javacc/CSS3Parser.jj

@@ -1652,39 +1652,28 @@ Selector negation_arg() :
     Object o;
 }
 {
-        (
-          simpleSel = elementName()
-        |
-          c = hash(null, false)
-        |
-          c = _class(null, false)
-        |
-          c = attrib(null, false)
-        |
-          (
+    (
+      simpleSel = elementName() { return simpleSel; }
+      |
+      (
+        { simpleSel = new ElementSelector(null, createLocator(token)); }
+        c = hash(null, false)
+        | c = _class(null, false)
+        | c = attrib(null, false)
+        | (
             o = pseudo(null, false)
             {  if (o instanceof Condition)
                {   c = (Condition) o;
                } else {
-                   pseudoElementSel = (SimpleSelector) o;
-                   negationArg = new DescendantSelector(null, pseudoElementSel);
+                   return new DescendantSelector(null, (SimpleSelector) o);
                }
             }
           )
-        )
-
-        {
-            if (negationArg != null) {
-                return negationArg;
-            }
-
-            if (simpleSel != null) {
-                return simpleSel;
-            }
-
-            simpleSel = new ConditionalSelector(simpleSel, c);
-            return simpleSel;
-        }
+      )
+    )
+    {
+        return new ConditionalSelector(simpleSel, c);
+    }
 }
 
 //

src/test/java/com/gargoylesoftware/css/parser/CSS3ParserTest.java

@@ -2421,7 +2421,7 @@ public void not() throws Exception {
 
         // hash
         selectors = createSelectors("input:not(#test)");
-        Assert.assertEquals("input:not(#test)", selectors.item(0).toString());
+        Assert.assertEquals("input:not(*#test)", selectors.item(0).toString());
 
         // class
         selectors = createSelectors("input:not(.home)");
@@ -2515,7 +2515,7 @@ public void not_universal() throws Exception {
     @Test
     public void not_hash() throws Exception {
         final SelectorList selectors = createSelectors("p:not( #test)");
-        Assert.assertEquals("p:not(#test)", selectors.item(0).toString());
+        Assert.assertEquals("p:not(*#test)", selectors.item(0).toString());
 
         Assert.assertEquals(1, selectors.getLength());
         final Selector selector = selectors.item(0);
@@ -2528,7 +2528,7 @@ public void not_hash() throws Exception {
         Assert.assertEquals(ConditionType.PSEUDO_CLASS_CONDITION, condition.getConditionType());
 
         final PseudoClassCondition pseudo = (PseudoClassCondition) condition;
-        Assert.assertEquals("not(#test)", pseudo.getValue());
+        Assert.assertEquals("not(*#test)", pseudo.getValue());
     }
 
     /**
@@ -2632,13 +2632,13 @@ public void twoPseudo() throws Exception {
         Assert.assertEquals("input:foo(test):before", selectors.item(0).toString());
 
         selectors = createSelectors("input:not(#test):not(#rest)");
-        Assert.assertEquals("input:not(#test):not(#rest)", selectors.item(0).toString());
+        Assert.assertEquals("input:not(*#test):not(*#rest)", selectors.item(0).toString());
 
         selectors = createSelectors("input:not(#test):nth-child(even)");
-        Assert.assertEquals("input:not(#test):nth-child(even)", selectors.item(0).toString());
+        Assert.assertEquals("input:not(*#test):nth-child(even)", selectors.item(0).toString());
 
         selectors = createSelectors("input:not(#test):before");
-        Assert.assertEquals("input:not(#test):before", selectors.item(0).toString());
+        Assert.assertEquals("input:not(*#test):before", selectors.item(0).toString());
     }
 
     /**
@@ -2662,7 +2662,7 @@ public void pseudoElementsErrors() throws Exception {
 
         // pseudo element not at end
         checkErrorSelector("input:before:not(#test)",
-                "Duplicate pseudo class \":not(#test)\" or pseudo class \":not(#test)\" not at end.");
+                "Duplicate pseudo class \":not(*#test)\" or pseudo class \":not(*#test)\" not at end.");
         checkErrorSelector("input:before[type='file']",
                 "Error in attribute selector. (Invalid token \"type\". Was expecting: <S>.)");
         checkErrorSelector("input:before.styleClass", "Error in class selector. (Invalid token \"\". "