handle layer definition in @​import

Author: ylafon

org/w3c/css/atrules/css/AtRuleImport.java

@@ -21,6 +21,7 @@ public class AtRuleImport extends AtRule {
 
     boolean is_url = false;
     String linkname = null;
+    AtRuleLayer layer = null;
     AtRuleMedia media = null;
 
     public String keyword() {
@@ -64,6 +65,10 @@ public String toString() {
             ret.append(linkname);
             ret.append('\"');
         }
+        if (layer != null) {
+            ret.append(' ');
+            ret.append(layer.getNameString());
+        }
         if (media != null && !media.isEmpty()) {
             ret.append(' ');
             ret.append(media.getValueString());
@@ -72,10 +77,12 @@ public String toString() {
         return ret.toString();
     }
 
-    public AtRuleImport(String linkname, boolean is_url, AtRuleMedia media) {
-        this.media = media;
+    public AtRuleImport(String linkname, boolean is_url,
+                        AtRuleLayer layer, AtRuleMedia media) {
         this.linkname = linkname;
         this.is_url = is_url;
+        this.layer = layer;
+        this.media = media;
     }
 
 	public String getLinkname() {

org/w3c/css/atrules/css/AtRuleLayer.java

@@ -72,6 +72,16 @@ public String toString() {
         return ret.toString();
     }
 
+    public String getNameString() {
+        StringBuilder ret = new StringBuilder();
+        if (name != null) {
+            return "layer";
+        } else {
+            ret.append("layer(").append(name).append(")");
+            return ret.toString();
+        }
+    }
+
     public String lookupPrefix() {
         return "";
     }

org/w3c/css/parser/CssFouffa.java

@@ -11,6 +11,7 @@
 package org.w3c.css.parser;
 
 import org.w3c.css.atrules.css.AtRuleImport;
+import org.w3c.css.atrules.css.AtRuleLayer;
 import org.w3c.css.atrules.css.AtRuleMedia;
 import org.w3c.css.atrules.css.AtRuleNamespace;
 import org.w3c.css.atrules.css.media.MediaFeature;
@@ -422,9 +423,9 @@ public void handleNamespaceDeclaration(URL url, String prefix,
      * @param file the file name in the import statement
      */
     public void handleImport(URL url, String file, boolean is_url,
-                             AtRuleMedia media) {
+                             AtRuleLayer layer, AtRuleMedia media) {
         // CssError cssError = null;
-        AtRuleImport importrule = new AtRuleImport(file, is_url, media);
+        AtRuleImport importrule = new AtRuleImport(file, is_url, layer, media);
         newAtRule(importrule);
         endOfAtRule();
 

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

@@ -236,8 +236,8 @@ public abstract class CssParser {
      * @param url  The style sheet where this import statement appears.
      * @param file the file name in the import
      */  
-    public abstract void handleImport(URL url, String file, 
-				      boolean is_url, AtRuleMedia media);
+    public abstract void handleImport(URL url, String file, boolean is_url,
+				      AtRuleLayer layer, AtRuleMedia media);
 
     /**
      * Call by the namespace declaration statement.
@@ -791,6 +791,7 @@ TOKEN [IGNORE_CASE] :
     | <FUNCTIONATTR          : "attr("             >
     | <FUNCTIONVAR           : "var("              >
     | <FUNCTIONENV           : "env("              >
+    | <FUNCTIONLAYER         : "layer("            >
 }
 
 <DEFAULT>
@@ -1029,9 +1030,12 @@ void namespaceDeclaration() :
 void importDeclaration() :
 {Token n;
     AtRuleMedia media = AtRuleMedia.getInstance(ac.getCssVersion());
+    AtRuleLayer layer = null;
     CssValue val; 
     String importFile;
     boolean is_url = false;
+    String layername = "";
+    CssVersion version = ac.getCssVersion();
 }
 {
     try {
@@ -1052,10 +1056,31 @@ void importDeclaration() :
 	    } 
 	    )
 	    ( <S> )*
+            ( (  "layer" {
+			     if (version.compareTo(CssVersion.CSS3) < 0) {
+                                 addError(new InvalidParamException("noatruleyet", "", ac),
+                                 skipStatement());
+                             }
+                             layer = new AtRuleLayer();
+                         }
+                         | ( <FUNCTIONLAYER> ( <S> )* n=<IDENT> {
+                                                                    if (version.compareTo(CssVersion.CSS3) < 0) {
+                                                                        addError(new InvalidParamException("noatruleyet", "", ac),
+                                                                        skipStatement());
+                                                                    }
+								    layer = new AtRuleLayer();
+								    layername = convertIdent(n.image);
+                                                                }
+                             ( <DOT> n=<IDENT> {
+						   layername = layername + "." + convertIdent(n.image);
+                                               } )*
+                             ( <S> )* <RPAREN> {
+						   layer.setName(convertIdent(n.image));
+                                               } ) ) ( <S> )* )?
 	    ( mediaquerylist(media) )? <SEMICOLON>
 	    ( <S> )*
 	    { 
-		handleImport(getURL(), importFile, is_url, media);
+		handleImport(getURL(), importFile, is_url, layer, media);
 	    } 
     } catch (ParseException e) {
 	addError(e, skipStatement());