introduce model class NotPseudoClassCondition and update the parser

Author: rbri

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.sourceforge.htmlunit</groupId>
     <artifactId>htmlunit-cssparser</artifactId>
-    <version>1.13.0</version>
+    <version>1.14.0-SNAPSHOT</version>
     <name>HtmlUnit CSS Parser</name>
     <packaging>jar</packaging>
     <description>CSS parser for HtmlUnit.</description>
@@ -71,7 +71,7 @@
                 <!-- generate parsers and lexers before compiling -->
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>javacc-maven-plugin</artifactId>
-                <version>2.6</version>
+                <version>3.0.1</version>
                 <executions>
                     <execution>
                         <id>javacc</id>
@@ -88,7 +88,6 @@
                     </dependency>
                 </dependencies>
             </plugin>
-            <!--
             <plugin>
                 <groupId>com.google.code.maven-replacer-plugin</groupId>
                 <artifactId>replacer</artifactId>
@@ -141,7 +140,6 @@
                     </replacements>
                 </configuration>
             </plugin>
-                    -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>

src/main/java/com/gargoylesoftware/css/parser/condition/Condition.java

@@ -41,6 +41,8 @@ enum ConditionType {
         PREFIX_ATTRIBUTE_CONDITION,
         /** PSEUDO_CLASS_CONDITION. */
         PSEUDO_CLASS_CONDITION,
+        /** NOT_PSEUDO_CLASS_CONDITION. */
+        NOT_PSEUDO_CLASS_CONDITION,
         /** SUBSTRING_ATTRIBUTE_CONDITION. */
         SUBSTRING_ATTRIBUTE_CONDITION,
         /** SUFFIX_ATTRIBUTE_CONDITION. */

src/main/java/com/gargoylesoftware/css/parser/condition/NotPseudoClassCondition.java

@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2019-2021 Ronald Brill.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gargoylesoftware.css.parser.condition;
+
+import java.io.Serializable;
+
+import com.gargoylesoftware.css.parser.AbstractLocatable;
+import com.gargoylesoftware.css.parser.Locator;
+import com.gargoylesoftware.css.parser.selector.SelectorList;
+
+/**
+ * Not contition.
+ *
+ * @author Ronald Brill
+ */
+public class NotPseudoClassCondition extends AbstractLocatable implements Condition, Serializable {
+
+    private final SelectorList selectors_;
+    private final boolean doubleColon_;
+
+    /**
+     * Ctor.
+     * @param selectors the selector list
+     * @param locator the locator
+     * @param doubleColon true if was prefixed by double colon
+     */
+    public NotPseudoClassCondition(final SelectorList selectors, final Locator locator, final boolean doubleColon) {
+        selectors_ = selectors;
+        setLocator(locator);
+        doubleColon_ = doubleColon;
+    }
+
+    @Override
+    public ConditionType getConditionType() {
+        return ConditionType.NOT_PSEUDO_CLASS_CONDITION;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getLocalName() {
+        return null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getValue() {
+        return selectors_.toString();
+    }
+
+    /**
+     * @return the list of selectors
+     */
+    public SelectorList getSelectors() {
+        return selectors_;
+    }
+
+    @Override
+    public String toString() {
+        return (doubleColon_ ? "::" : ":") + "not(" + getValue() + ")";
+    }
+}

src/main/java/com/gargoylesoftware/css/parser/selector/SelectorSpecificity.java

@@ -17,6 +17,7 @@
 import java.io.Serializable;
 
 import com.gargoylesoftware.css.parser.condition.Condition;
+import com.gargoylesoftware.css.parser.condition.NotPseudoClassCondition;
 
 /**
  * Calculates a selector's specificity.
@@ -30,16 +31,16 @@ public class SelectorSpecificity implements Comparable<SelectorSpecificity>, Ser
     /**
      * The specificity for declarations made in the style attributes of an element.
      */
-    public static final SelectorSpecificity FROM_STYLE_ATTRIBUTE = new SelectorSpecificity(1, 0, 0, 0);
+    public static final SelectorSpecificity FROM_STYLE_ATTRIBUTE = new SelectorSpecificity(true, 0, 0, 0);
     /**
      * The specificity for browser defaults.
      */
-    public static final SelectorSpecificity DEFAULT_STYLE_ATTRIBUTE = new SelectorSpecificity(0, 0, 0, 0);
+    public static final SelectorSpecificity DEFAULT_STYLE_ATTRIBUTE = new SelectorSpecificity(false, 0, 0, 0);
 
-    private int fieldA_;
-    private int fieldB_;
-    private int fieldC_;
-    private int fieldD_;
+    private int fromStyle_;
+    private int idCount_;
+    private int classCount_;
+    private int typeCount_;
 
     /**
      * Ctor.
@@ -49,11 +50,11 @@ public SelectorSpecificity(final Selector selector) {
         readSelectorSpecificity(selector);
     }
 
-    private SelectorSpecificity(final int a, final int b, final int c, final int d) {
-        fieldA_ = a;
-        fieldB_ = b;
-        fieldC_ = c;
-        fieldD_ = d;
+    private SelectorSpecificity(final boolean fromStyle, final int idCount, final int classCount, final int typeCount) {
+        fromStyle_ = fromStyle ? 1 : 0;
+        idCount_ = idCount;
+        classCount_ = classCount;
+        typeCount_ = typeCount;
     }
 
     private void readSelectorSpecificity(final Selector selector) {
@@ -71,7 +72,7 @@ private void readSelectorSpecificity(final Selector selector) {
             case ELEMENT_NODE_SELECTOR:
                 final ElementSelector es = (ElementSelector) selector;
                 if (es.getLocalName() != null) {
-                    fieldD_++;
+                    typeCount_++;
                 }
                 if (es.getConditions() != null) {
                     for (final Condition condition : es.getConditions()) {
@@ -83,7 +84,7 @@ private void readSelectorSpecificity(final Selector selector) {
                 final PseudoElementSelector pes = (PseudoElementSelector) selector;
                 final String pesName = pes.getLocalName();
                 if (pesName != null) {
-                    fieldD_++;
+                    typeCount_++;
                 }
                 return;
             case DIRECT_ADJACENT_SELECTOR:
@@ -105,34 +106,41 @@ private void readSelectorSpecificity(final Selector selector) {
     private void readSelectorSpecificity(final Condition condition) {
         switch (condition.getConditionType()) {
             case ID_CONDITION:
-                fieldB_++;
+                idCount_++;
                 return;
             case CLASS_CONDITION:
-                fieldC_++;
+                classCount_++;
                 return;
             case ATTRIBUTE_CONDITION:
-                fieldC_++;
+                classCount_++;
                 return;
             case SUBSTRING_ATTRIBUTE_CONDITION:
-                fieldC_++;
+                classCount_++;
                 return;
             case SUFFIX_ATTRIBUTE_CONDITION:
-                fieldC_++;
+                classCount_++;
                 return;
             case PREFIX_ATTRIBUTE_CONDITION:
-                fieldC_++;
+                classCount_++;
                 return;
             case BEGIN_HYPHEN_ATTRIBUTE_CONDITION:
-                fieldC_++;
+                classCount_++;
                 return;
             case ONE_OF_ATTRIBUTE_CONDITION:
-                fieldC_++;
+                classCount_++;
+                return;
+            case NOT_PSEUDO_CLASS_CONDITION:
+                final NotPseudoClassCondition notPseudoCondition = (NotPseudoClassCondition) condition;
+                final SelectorList selectorList = notPseudoCondition.getSelectors();
+                for (final Selector selector : selectorList) {
+                    readSelectorSpecificity(selector);
+                }
                 return;
             case PSEUDO_CLASS_CONDITION:
-                fieldC_++;
+                classCount_++;
                 return;
             case LANG_CONDITION:
-                fieldC_++;
+                classCount_++;
                 return;
             default:
                 throw new RuntimeException("Unhandled CSS condition type for specifity computation: '"
@@ -145,25 +153,26 @@ private void readSelectorSpecificity(final Condition condition) {
      */
     @Override
     public String toString() {
-        return fieldA_ + "," + fieldB_ + "," + fieldC_ + "," + fieldD_;
+        // return (fromStyle_ > 0 ? "!" : "") + idCount_ + "," + classCount_ + "," + typeCount_;
+        return fromStyle_ + "," + idCount_ + "," + classCount_ + "," + typeCount_;
     }
 
     /**
      * {@inheritDoc}
      */
     @Override
     public int compareTo(final SelectorSpecificity other) {
-        if (fieldA_ != other.fieldA_) {
-            return fieldA_ - other.fieldA_;
+        if (fromStyle_ != other.fromStyle_) {
+            return fromStyle_ - other.fromStyle_;
         }
-        else if (fieldB_ != other.fieldB_) {
-            return fieldB_ - other.fieldB_;
+        else if (idCount_ != other.idCount_) {
+            return idCount_ - other.idCount_;
         }
-        else if (fieldC_ != other.fieldC_) {
-            return fieldC_ - other.fieldC_;
+        else if (classCount_ != other.classCount_) {
+            return classCount_ - other.classCount_;
         }
-        else if (fieldD_ != other.fieldD_) {
-            return fieldD_ - other.fieldD_;
+        else if (typeCount_ != other.typeCount_) {
+            return typeCount_ - other.typeCount_;
         }
         return 0;
     }
@@ -172,10 +181,10 @@ else if (fieldD_ != other.fieldD_) {
     public int hashCode() {
         final int prime = 31;
         int result = 1;
-        result = prime * result + fieldA_;
-        result = prime * result + fieldB_;
-        result = prime * result + fieldC_;
-        result = prime * result + fieldD_;
+        result = prime * result + fromStyle_;
+        result = prime * result + idCount_;
+        result = prime * result + classCount_;
+        result = prime * result + typeCount_;
         return result;
     }
 
@@ -191,16 +200,16 @@ public boolean equals(final Object obj) {
             return false;
         }
         final SelectorSpecificity other = (SelectorSpecificity) obj;
-        if (fieldA_ != other.fieldA_) {
+        if (fromStyle_ != other.fromStyle_) {
             return false;
         }
-        if (fieldB_ != other.fieldB_) {
+        if (idCount_ != other.idCount_) {
             return false;
         }
-        if (fieldC_ != other.fieldC_) {
+        if (classCount_ != other.classCount_) {
             return false;
         }
-        if (fieldD_ != other.fieldD_) {
+        if (typeCount_ != other.typeCount_) {
             return false;
         }
         return true;

src/main/javacc/CSS3Parser.jj

@@ -50,6 +50,7 @@ import com.gargoylesoftware.css.parser.condition.ClassCondition;
 import com.gargoylesoftware.css.parser.condition.Condition;
 import com.gargoylesoftware.css.parser.condition.IdCondition;
 import com.gargoylesoftware.css.parser.condition.LangCondition;
+import com.gargoylesoftware.css.parser.condition.NotPseudoClassCondition;
 import com.gargoylesoftware.css.parser.condition.OneOfAttributeCondition;
 import com.gargoylesoftware.css.parser.condition.PrefixAttributeCondition;
 import com.gargoylesoftware.css.parser.condition.PseudoClassCondition;
@@ -1368,6 +1369,7 @@ Object pseudo(boolean pseudoElementFound) :
     String function;
     String arg;
     boolean doubleColon = false;
+    SelectorList selectorList;
     Locator locator;
 }
 {
@@ -1394,14 +1396,11 @@ Object pseudo(boolean pseudoElementFound) :
             (
                 t = <FUNCTION_NOT> { function = unescape(t.image, false); }
                 ( <S> )*
-                arg = negation_arg() {
-                    if ("".equals(arg)) { arg = "*"; }
-                }
-                ( <S> )*
+                selectorList = selectorList()
                 <RROUND>
                 {
-                    if (pseudoElementFound) { throw toCSSParseException("duplicatePseudo", new String[] { function + arg + ")" }, locator); }
-                    return new PseudoClassCondition(function + arg + ")", locator, doubleColon);
+                    if (pseudoElementFound) { throw toCSSParseException("duplicatePseudo", new String[] { function + selectorList + ")" }, locator); }
+                    return new NotPseudoClassCondition(selectorList, locator, doubleColon);
                 }
             )
             |
@@ -2082,28 +2081,6 @@ LexicalUnit hslColor(LexicalUnit prev) :
     }
 }
 
-//
-// negation_arg
-//   : type_selector | universal | HASH | class | attrib | pseudo
-//   ;
-//
-String negation_arg() :
-{
-    Condition c = null;
-    SimpleSelector simpleSel = null;
-    Object o;
-}
-{
-    simpleSel = elementName() { return simpleSel.toString(); }
-    | c = hash(false) { return c.toString(); }
-    | c = _class(false) { return c.toString(); }
-    | c = attrib(false) { return c.toString(); }
-    | o = pseudo(false)
-      {  if (o instanceof Condition) { return o.toString(); }
-         return new DescendantSelector(null, (SimpleSelector) o).toString();
-      }
-}
-
 //
 // number()
 //