support for env(), see #328, waiting on spec link

Author: ylafon

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

@@ -67,6 +67,7 @@ import org.w3c.css.values.CssCalc;
 import org.w3c.css.values.CssCheckableValue;
 import org.w3c.css.values.CssColor;
 import org.w3c.css.values.CssComparator;
+import org.w3c.css.values.CssEnv;
 import org.w3c.css.values.CssExpression;
 import org.w3c.css.values.CssFlexibleLength;
 import org.w3c.css.values.CssFrequency;
@@ -429,6 +430,10 @@ public abstract class CssParser {
             if (v.getType() == CssTypes.CSS_VARIABLE) {
                 expr.markCssVariable();
             }
+	} else if ( token == FUNCTIONENV ) {
+            if (v.getType() == CssTypes.CSS_ENV) {
+                expr.markCssVariable();
+            }
         } else if ( token == FUNCTIONCALC ) {
                CssCalc c = (CssCalc) v;
                if (c.hasCssVariable()) {
@@ -781,6 +786,7 @@ TOKEN [IGNORE_CASE] :
     | <FUNCTIONCLAMP         : "clamp("            >
     | <FUNCTIONATTR          : "attr("             >
     | <FUNCTIONVAR           : "var("              >
+    | <FUNCTIONENV           : "env("              >
 }
 
 <DEFAULT>
@@ -3191,6 +3197,7 @@ void term(CssExpression exp) :
         | func=mathclamp() { setValue(func, exp, operator, null, FUNCTION); } 
         | func=attr() { setValue(func, exp, operator, null, FUNCTION); }
         | func=functionvar() { setValue(func, exp, operator, null, FUNCTIONVAR); }
+        | func=functionenv() { setValue(func, exp, operator, null, FUNCTIONENV); }
         | func=function() { setValue(func, exp, operator, null, FUNCTION); }
         | n=<STRING> { setValue(new CssString(), exp, operator, n, STRING); }
         | n=<DIV>  { setValue(new CssSwitch(), exp, operator, n, DIV); }
@@ -3646,6 +3653,38 @@ CssExpression exp = null;
   }
 }
 
+CssCheckableValue functionenv() :
+{ Token n;
+ CssExpression exp = null;
+ CssExpression e;
+ CssEnv env = null;
+ String skipped = null;
+}
+{
+  <FUNCTIONENV> ( <S> )* n=<IDENT> ( <S> )* {
+     env = new CssEnv(ac, convertIdent(n.image));
+     e = new CssExpression();
+  }
+  (  term(e) )*
+  ( <COMMA> ( <S> )* try {
+                         exp = expr()
+                      } catch (ParseException pe) {
+                         skipped = skip_to_matching_paren();
+                         // FIXME do something meaningful with that string
+                         exp = null;
+                      }
+   )? <RPAREN>
+   {
+       env.setNumberExp(e);
+       if (exp != null) {
+	   env.setDeclaration(exp);
+       } else if (skipped != null) {
+	// do something fancy here
+       }
+       return env;
+   }
+}
+
 CssCheckableValue functionvar() :
 { Token n;
  CssExpression exp = null;
@@ -3946,6 +3985,7 @@ String skip_to_matching_paren() {
             case FUNCTIONROUND:
             case FUNCTIONATTR:
             case FUNCTIONVAR:
+	    case FUNCTIONENV:
                 s.append(tok.image);
                 nesting++;
                 getNextToken();