Selectors 4

org/w3c/css/parser/CssSelectors.java

@@ -10,11 +10,7 @@
 import org.w3c.css.atrules.css.AtRuleFontFace;
 import org.w3c.css.atrules.css.AtRulePage;
 import org.w3c.css.properties.css.CssProperty;
-import org.w3c.css.selectors.AdjacentSiblingSelector;
 import org.w3c.css.selectors.AttributeSelector;
-import org.w3c.css.selectors.ChildSelector;
-import org.w3c.css.selectors.DescendantSelector;
-import org.w3c.css.selectors.GeneralSiblingSelector;
 import org.w3c.css.selectors.PseudoClassSelector;
 import org.w3c.css.selectors.PseudoElementSelector;
 import org.w3c.css.selectors.PseudoFactory;
@@ -57,12 +53,12 @@ public final class CssSelectors extends SelectorsList
      */
     String element;
 
-    char connector = DESCENDANT;
+    String connector = DESCENDANT_COMBINATOR;
 
     /**
      * The next context.
      */
-    protected CssSelectors next;
+    protected CssSelectors next = null;
 
     // true if the element is a block-level element
     private boolean isBlock;
@@ -75,7 +71,7 @@ public final class CssSelectors extends SelectorsList
     //private int hashGeneral;
 
     // The CssStyle to use
-    private static Class style;
+    private static Class<?> style;
 
     // see isEmpty and addProperty
     private boolean Init;
@@ -97,7 +93,7 @@ public CssSelectors(ApplContext ac) {
         this.ac = ac;
     }
 
-    private CssSelectors(Class style) {
+    private CssSelectors(Class<?> style) {
         super();
         CssSelectors.style = style;
         try {
@@ -134,7 +130,7 @@ public CssSelectors(ApplContext ac, CssSelectors next) {
      *
      * @param style0 the style
      */
-    public void setStyle(Class style0) {
+    public void setStyle(Class<?> style0) {
         Util.verbose("Style is : " + style0);
         style = style0;
     }
@@ -243,7 +239,7 @@ public void addPseudoElement(String pseudo) throws InvalidParamException {
         throw new InvalidParamException("pseudo", "::" + pseudo, ac);
     }
 
-    public void setPseudoFun(String pseudo, String param)
+    public void setPseudoFun(ApplContext ac, String pseudo, String param)
             throws InvalidParamException {
 
         CssVersion version = ac.getCssVersion();
@@ -259,33 +255,57 @@ public void setPseudoFun(String pseudo, String param)
         }
     }
 
+    public void setPseudoFun(ApplContext ac, String pseudo, ArrayList<CssSelectors> selector_list)
+            throws InvalidParamException {
+
+        CssVersion version = ac.getCssVersion();
+        String[] ps = PseudoFactory.getPseudoFunction(version);
+        if (ps != null) {
+            for (String s : ps) {
+                if (pseudo.equals(s)) {
+                    addPseudoFunction(PseudoFactory.newPseudoFunction(pseudo, selector_list, ac));
+                    return;
+                }
+            }
+            throw new InvalidParamException("pseudo", ":" + pseudo, ac);
+        }
+    }
+
+
     public void addType(TypeSelector type) throws InvalidParamException {
         super.addType(type);
         element = type.getName();
         hashElement = element.hashCode();
     }
 
-    public void addDescendant(DescendantSelector descendant)
+    public void addDescendantCombinator()
             throws InvalidParamException {
-        super.addDescendant(descendant);
-        connector = DESCENDANT;
+        super.addDescendantCombinator();
+        connector = DESCENDANT_COMBINATOR;
     }
 
-    public void addChild(ChildSelector child) throws InvalidParamException {
-        super.addChild(child);
-        connector = CHILD;
+    public void addChildCombinator()
+            throws InvalidParamException {
+        super.addChildCombinator();
+        connector = CHILD_COMBINATOR;
     }
 
-    public void addAdjacentSibling(AdjacentSiblingSelector adjacent)
+    public void addNextSiblingCombinator()
             throws InvalidParamException {
-        super.addAdjacentSibling(adjacent);
-        connector = ADJACENT_SIBLING;
+        super.addNextSiblingCombinator();
+        connector = NEXT_SIBLING_COMBINATOR;
     }
 
-    public void addGeneralSibling(GeneralSiblingSelector sibling)
+    public void addSubsequentSiblingCombinator()
             throws InvalidParamException {
-        super.addGeneralSibling(sibling);
-        connector = GENERAL_SIBLING;
+        super.addSubsequentSiblingCombinator();
+        connector = SUBSEQUENT_SIBLING_COMBINATOR;
+    }
+
+    public void addColumnCombinator()
+            throws InvalidParamException {
+        super.addColumnCombinator();
+        connector = COLUMN_COMBINATOR;
     }
 
 
@@ -381,8 +401,8 @@ marking as final (ie: no more modifications) triggers more
 		*/
 
     /*
-        * Mark as final, ie: no more modification to the structure.
-        */
+     * Mark as final, ie: no more modification to the structure.
+     */
     public void markAsFinal() {
         // if something has been changed, reset to force recomputing
         if (!isFinal) {
@@ -585,7 +605,7 @@ private boolean canMatch(CssSelectors selector) {
         Util.verbose("canMatch for attributes :" + result);
 
         if ((hashElement != selector.hashElement) && hashElement != 0) {
-            if ((connector == DESCENDANT) && (selector.next != null)) {
+            if ((connector.equals(DESCENDANT_COMBINATOR)) && (selector.next != null)) {
                 // here we are in this case :
                 // H1 and HTML BODY H1 EM
                 // H1 can't match EM but EM have next
@@ -618,4 +638,21 @@ public void findConflicts(ApplContext ac, Warnings warnings,
         CssStyle style = getStyle();
         style.findConflicts(ac, warnings, this, allSelectors);
     }
+
+    public static String toArrayString(ArrayList<CssSelectors> selectors) {
+        if (selectors == null) {
+            return "";
+        }
+        StringBuilder sb = new StringBuilder();
+        boolean first = true;
+        for (CssSelectors s : selectors) {
+            if (!first) {
+                sb.append(", ");
+            } else {
+                first = false;
+            }
+            sb.append(s);
+        }
+        return sb.toString();
+    }
 }

org/w3c/css/parser/CssSelectorsConstant.java

@@ -51,20 +51,15 @@ public interface CssSelectorsConstant {
      */
     public static final int ATTRIBUTE_LENGTH = 10;
 
-    /**
-     * descendant connector
-     */
-    public static final char DESCENDANT = ' ';
-    /**
-     * child connector
-     */
-    public static final char CHILD = '>';
-    /**
-     * adjacent sibling connector
-     */
-    public static final char ADJACENT_SIBLING = '+';
-    /**
-     * general sibling connector
-     */
-    public static final char GENERAL_SIBLING = '~';
+    // See https://www.w3.org/TR/2018/WD-selectors-4-20181121/#combinators
+
+    public static final String DESCENDANT_COMBINATOR = " ";
+
+    public static final String CHILD_COMBINATOR = ">";
+
+    public static final String NEXT_SIBLING_COMBINATOR = "+";
+
+    public static final String SUBSEQUENT_SIBLING_COMBINATOR = "~";
+
+    public static final String COLUMN_COMBINATOR = "||";
 }