complex selector parsing per https://www.w3.org/TR/2018/WD-selectors-…

…4-20181121/#grammar

org/w3c/css/parser/CssSelectors.java

@@ -71,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;
@@ -93,7 +93,7 @@ public CssSelectors(ApplContext ac) {
         this.ac = ac;
     }
 
-    private CssSelectors(Class style) {
+    private CssSelectors(Class<?> style) {
         super();
         CssSelectors.style = style;
         try {
@@ -130,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;
     }
@@ -605,7 +605,7 @@ private boolean canMatch(CssSelectors selector) {
         Util.verbose("canMatch for attributes :" + result);
 
         if ((hashElement != selector.hashElement) && hashElement != 0) {
-            if ((connector == DESCENDANT_COMBINATOR) && (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

org/w3c/css/parser/analyzer/CssParser.jj

@@ -1903,7 +1903,7 @@ String combinator() :
     String connector = " ";
 }
 {
-    ( (   <PLUS> { connector = "+" ; }
+     ( (  <PLUS> { connector = "+" ; }
         | <GREATER> { connector = ">" ; }
         | <TILDE> { connector = "~" ; }
         | <TWOPIPES> { connector = "||"; }
@@ -1966,12 +1966,12 @@ ArrayList<CssSelectors> selector_list() :
 	ArrayList<CssSelectors> context_set = new ArrayList<CssSelectors>();
 }
 {
-	selector=selector() {
+	selector=complex_selector(null) {
 		if (selector != null) {
 			context_set.add(selector);
 		}
 	}
-	( <COMMA> ( <S> )* selector=selector() {
+	( <COMMA> ( <S> )* selector=complex_selector(null) {
 		if (selector != null) {
 			context_set.add(selector);
 		}
@@ -2182,101 +2182,12 @@ CssSelectors relative_selector() :
                                 current.addDescendantCombinator();
                 }                  
 	}
-	// FIXME should be complex_selector
-	current=simple_selector(current)
+	current=complex_selector(current)
 	{
 		return current;
 	}
 
 }
-/**
- * @exception ParseException exception during the parse
- */
-CssSelectors selector() :
-{   String comb;
-    CssSelectors current; }
-{
-    try {
-	current=simple_selector(null) 
-	    (  
-	    comb=combinator() {
-		if ((ac.getCssProfile() == CssProfile.MOBILE) ||
-			getAtRule().toString().equals("@media atsc-tv") ||
-			(ac.getCssVersion() == CssVersion.CSS1)) {
-			if (comb.equals("+") || comb.equals(">")) {
-			    throw new InvalidParamException("nocomb", comb, ac);
-			}
-		} else if (ac.getCssProfile() == CssProfile.TV) {
-			if (comb.equals("+")) {
-			    throw new InvalidParamException("nocomb", comb, ac);
-		    }
-		}
-		// if version < CSS3, ~ is undefined
-		if (ac.getCssVersion().compareTo(CssVersion.CSS3) < 0) {
-		    if (comb.equals("~") || comb.equals("||")) {
-			    throw new InvalidParamException("nocomb", comb, ac);
-		    }
-		}
-		switch(comb) {
-			case "+":
-				current.addNextSiblingCombinator();
-				break;
-			case ">":
-				current.addChildCombinator();
-				break;
-			case "~":
-				current.addSubsequentSiblingCombinator();
-				break;
-			case "||":
-				current.addColumnCombinator();
-				break;
-			default:
-				current.addDescendantCombinator();
-		}                  
-		//current.setConnector(comb); 
-	    }
-	      current=simple_selector(current) 
-	      )* 
-	    { return current; }
-    }
-    catch (InvalidParamException ie) {    
-	//	skipStatement();
-	//	removeThisRule();
-	ac.getFrame()
-	   .addError(new CssError(getSourceFile(), getBeginLine(),
-	       getBeginColumn(), getEndLine(), getEndColumn(), ie));
-	Token t = getToken(1);
-	StringBuilder s = new StringBuilder();
-	s.append(getToken(0).image);
-	// eat until , { or EOF
-	while ((t.kind != COMMA) && (t.kind != LBRACE) && (t.kind != EOF)) {
-	    s.append(t.image);
-	    getNextToken();
-	    t = getToken(1);
-	}
-	return null;
-    }
-    catch (ParseException e) {
-	//	validSelector = false;
-	Token t = getToken(1);
-	StringBuilder s = new StringBuilder("[");
-	s.append(getToken(0).image);
-	// eat until , { or EOF
-	while ((t.kind != COMMA) && (t.kind != LBRACE) && (t.kind != EOF)) {
-	    s.append(t.image);
-	    getNextToken();
-	    t = getToken(1);
-	}
-	s.append(']');
-	//	if (validSelector) {
-	addError(e, s.toString());
-	    //	} else {
-	    //  addError(e,"");
-	    //	}
-	validSelector = true;
-	return null;    	
-    }
-}
 
 /**
  * I made this rule to parse a selector from a document. Combinator are avoid.
@@ -2315,6 +2226,119 @@ CssSelectors simple_selector(CssSelectors next) :
 	}
 }
 
+CssSelectors subclass_selector(CssSelectors selector) :
+{
+}
+{
+	( id_selector(selector)
+	| class_selector(selector)
+	| attribute_selector(selector)
+	| pseudo_class_selector(selector)
+	)
+	{
+		return selector;
+	}
+}
+
+CssSelectors complex_selector(CssSelectors sel) :
+{
+	String comb;
+	CssSelectors current;
+}
+{
+	try {
+		current=compound_selector(sel)
+	        ( ( comb=combinator() {
+			if ((ac.getCssProfile() == CssProfile.MOBILE) ||
+				getAtRule().toString().equals("@media atsc-tv") ||
+				(ac.getCssVersion() == CssVersion.CSS1)) {
+				if (comb.equals("+") || comb.equals(">")) {
+					throw new InvalidParamException("nocomb", comb, ac);
+				}
+			} else if (ac.getCssProfile() == CssProfile.TV) {
+				if (comb.equals("+")) {
+					throw new InvalidParamException("nocomb", comb, ac);
+				}
+			}
+			// if version < CSS3, ~ is undefined
+			if (ac.getCssVersion().compareTo(CssVersion.CSS3) < 0) {
+				if (comb.equals("~") || comb.equals("||")) {
+					throw new InvalidParamException("nocomb", comb, ac);
+				}
+			}
+			switch(comb) {
+				case "+":
+					current.addNextSiblingCombinator();
+					break;
+				case ">":
+					current.addChildCombinator();
+					break;
+				case "~":
+					current.addSubsequentSiblingCombinator();
+					break;
+				case "||":
+					current.addColumnCombinator();
+					break;
+				default:
+					current.addDescendantCombinator();
+			}
+		} )?
+		current=compound_selector(current)
+		)*
+		{
+			return current;
+		}
+	} catch (InvalidParamException ie) {
+        //      skipStatement();
+        //      removeThisRule();
+		ac.getFrame().addError(new CssError(getSourceFile(), getBeginLine(),
+							getBeginColumn(), getEndLine(), getEndColumn(), ie));
+		Token t = getToken(1);
+		StringBuilder s = new StringBuilder();
+		s.append(getToken(0).image);
+	        // eat until , { or EOF
+		while ((t.kind != COMMA) && (t.kind != LBRACE) && (t.kind != EOF)) {
+			s.append(t.image);
+			getNextToken();
+			t = getToken(1);
+		}
+		return null;
+	} catch (ParseException e) {
+	//      validSelector = false;
+		Token t = getToken(1);
+		StringBuilder s = new StringBuilder("[");
+		s.append(getToken(0).image);
+		// eat until , { or EOF
+		while ((t.kind != COMMA) && (t.kind != LBRACE) && (t.kind != EOF)) {
+			s.append(t.image);
+			getNextToken();
+			t = getToken(1);
+		}
+		s.append(']');
+        //      if (validSelector) {
+		addError(e, s.toString());
+            //  } else {
+            //  addError(e,"");
+            //  }
+		validSelector = true;
+		return null;
+	}
+
+}
+
+CssSelectors compound_selector(CssSelectors next) :
+{
+	CssSelectors selector = new CssSelectors(ac, next);
+        selector.setAtRule(getAtRule());
+}
+{
+	( LOOKAHEAD(3) ( ( ( type_selector(selector) )?  ( LOOKAHEAD(2) subclass_selector(selector) )+ ) ( LOOKAHEAD(2) pseudo_element_selector(selector) ( LOOKAHEAD(2) pseudo_class_selector(selector) )* )* )
+	| ( type_selector(selector) ( LOOKAHEAD(2) pseudo_element_selector(selector) ( LOOKAHEAD(2) pseudo_class_selector(selector) )* )* )
+	| ( ( LOOKAHEAD(2) pseudo_element_selector(selector) ( LOOKAHEAD(2) pseudo_class_selector(selector) )* )+ ) ) {
+		return selector;
+	}
+}
+
 /**
  * @exception ParseException exception during the parse
  */
@@ -2596,36 +2620,45 @@ void attribute_selector(CssSelectors s) :
     }
 }
 
+void pseudo_element_selector(CssSelectors s) :
+{
+	Token n;
+}
+{
+	<PSEUDOELEMENT_SYM> ( n=ident() ) {
+		try {
+		// should be >CSS3
+			if (ac.getCssVersion().compareTo(CssVersion.CSS3) >= 0) {
+				s.addPseudoElement(convertIdent(n.image).toLowerCase());
+			} else {
+				throw new InvalidParamException("pseudo-element",
+								"::" + convertIdent(n.image).toLowerCase(),
+								ac.getCssVersionString() ,ac);
+			}
+		} catch(InvalidParamException e) {
+			validSelector = false;
+			throw new ParseException(e.getMessage());
+		}
+	}
+}
+
+void pseudo(CssSelectors s) :
+{}
+{
+	pseudo_element_selector(s) | pseudo_class_selector(s)
+
+}
 /**
  * @exception ParseException exception during the parse
  */
-void pseudo(CssSelectors s) :
+void pseudo_class_selector(CssSelectors s) :
 {Token n;
 Token language = null;
 CssExpression param = null;
 ArrayList<CssSelectors> selector_list = null;
 String error_str = null;
 }
 {
-    <PSEUDOELEMENT_SYM> ( ( n=ident()
-	{ 
-	    try {
-	    // should be >CSS3
-		if (ac.getCssVersion().compareTo(CssVersion.CSS3) >= 0) {
-		    s.addPseudoElement(convertIdent(n.image).toLowerCase());
-		} else {
-		    throw new InvalidParamException("pseudo-element",
-						    "::" + convertIdent(n.image).toLowerCase() ,
-						    ac.getCssVersionString() ,ac);
-		}
-	    } catch(InvalidParamException e) {
-		//	removeThisRule();
-		//		ac.getFrame().addError(new CssError(e));
-		validSelector = false;
-		throw new ParseException(e.getMessage());
-	    }
-	} ) )
-	|  
 	<COLON> ( ( n=ident()
 	    { 
 		try {

org/w3c/css/selectors/SelectorsList.java

@@ -129,16 +129,10 @@ public int size() {
      * @throws InvalidParamException when trying to add a selector after a pseudo-element
      */
     public void addSelector(Selector selector) throws InvalidParamException {
-        if (selectors.size() > 0) {
-            Selector last = selectors.get(selectors.size() - 1);
-            if (last instanceof PseudoElementSelector
-                    && !(selector instanceof PseudoClassSelector
-                    && ((PseudoClassSelector) selector)
-                    .isUserAction())) {
-                throw new InvalidParamException("pseudo-element-not-last",
-                        selector, last, ac);
-            }
-        }
+        /* FIXME TODO
+           the grammar is checking the basic structure but specific rules
+           should appear here
+         */
         selectors.add(selector);
         stringrep = null;
     }