Extend support for Microsoft filter expressions in SASS (#10597)

Now, also string parameters and multiple parameters are accepted by the
parser.

Change-Id: I3b1a707e4d0531c4d6117c8f0b2b140fdf6ac741

4 files changed, 360 insertions, 328 deletions

diff --git a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java
index 83e46c34c9..ea2f261475 100644
--- a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java
@@ -1434,7 +1434,8 @@ char connector = ' ';
   Token n;
   String name = "";
   String value = "";
-    n = jj_consume_token(MICROSOFT_RULE);
+    // This is not really taking the syntax of filter rules into account
+      n = jj_consume_token(MICROSOFT_RULE);
     label_36:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -1460,6 +1461,14 @@ char connector = ' ';
         n = jj_consume_token(NUMBER);
                             value += n.image;
         break;
+      case STRING:
+        n = jj_consume_token(STRING);
+                            value += n.image;
+        break;
+      case COMMA:
+        n = jj_consume_token(COMMA);
+                           value += n.image;
+        break;
       case INTERPOLATION:
         n = jj_consume_token(INTERPOLATION);
                                    value += n.image;
@@ -1497,10 +1506,12 @@ char connector = ' ';
       switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
       case S:
       case EQ:
+      case COMMA:
       case DOT:
       case RPARAN:
       case COLON:
       case INTERPOLATION:
+      case STRING:
       case IDENT:
       case NUMBER:
       case FUNCTION:
@@ -5746,18 +5757,13 @@ LexicalUnitImpl result = null;
     finally { jj_save(11, xla); }
   }
 
-  private boolean jj_3R_231() {
-    if (jj_3R_253()) return true;
-    return false;
-  }
-
   private boolean jj_3_1() {
     if (jj_3R_158()) return true;
     return false;
   }
 
-  private boolean jj_3R_230() {
-    if (jj_3R_252()) return true;
+  private boolean jj_3R_232() {
+    if (jj_3R_254()) return true;
     return false;
   }
 
@@ -5772,30 +5778,30 @@ LexicalUnitImpl result = null;
     return false;
   }
 
-  private boolean jj_3R_257() {
+  private boolean jj_3R_259() {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_11()) {
     jj_scanpos = xsp;
-    if (jj_3R_272()) {
+    if (jj_3R_274()) {
     jj_scanpos = xsp;
-    if (jj_3R_273()) {
+    if (jj_3R_275()) {
     jj_scanpos = xsp;
-    if (jj_3R_274()) return true;
+    if (jj_3R_276()) return true;
     }
     }
     }
     return false;
   }
 
-  private boolean jj_3R_228() {
+  private boolean jj_3R_230() {
     if (jj_scan_token(COMMA)) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
       if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
     }
-    if (jj_3R_227()) return true;
+    if (jj_3R_229()) return true;
     return false;
   }
 
@@ -5804,7 +5810,7 @@ LexicalUnitImpl result = null;
     return false;
   }
 
-  private boolean jj_3R_227() {
+  private boolean jj_3R_229() {
     if (jj_3R_161()) return true;
     Token xsp;
     while (true) {
@@ -5818,12 +5824,12 @@ LexicalUnitImpl result = null;
     return false;
   }
 
-  private boolean jj_3R_262() {
-    if (jj_3R_271()) return true;
+  private boolean jj_3R_264() {
+    if (jj_3R_273()) return true;
     return false;
   }
 
-  private boolean jj_3R_246() {
+  private boolean jj_3R_248() {
     if (jj_scan_token(FUNCTION)) return true;
     Token xsp;
     while (true) {
@@ -5831,23 +5837,23 @@ LexicalUnitImpl result = null;
       if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
     }
     xsp = jj_scanpos;
-    if (jj_3R_262()) jj_scanpos = xsp;
+    if (jj_3R_264()) jj_scanpos = xsp;
     if (jj_scan_token(RPARAN)) return true;
     return false;
   }
 
   private boolean jj_3R_182() {
-    if (jj_3R_227()) return true;
+    if (jj_3R_229()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_228()) { jj_scanpos = xsp; break; }
+      if (jj_3R_230()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  private boolean jj_3R_226() {
-    if (jj_3R_250()) return true;
+  private boolean jj_3R_228() {
+    if (jj_3R_252()) return true;
     return false;
   }
 
@@ -5856,17 +5862,17 @@ LexicalUnitImpl result = null;
     return false;
   }
 
-  private boolean jj_3R_225() {
-    if (jj_3R_249()) return true;
+  private boolean jj_3R_227() {
+    if (jj_3R_251()) return true;
     return false;
   }
 
-  private boolean jj_3R_224() {
-    if (jj_3R_248()) return true;
+  private boolean jj_3R_226() {
+    if (jj_3R_250()) return true;
     return false;
   }
 
-  private boolean jj_3R_255() {
+  private boolean jj_3R_257() {
     if (jj_scan_token(EACH_SYM)) return true;
     Token xsp;
     while (true) {
@@ -5882,7 +5888,7 @@ LexicalUnitImpl result = null;
     return false;
   }
 
-  private boolean jj_3R_270() {
+  private boolean jj_3R_272() {
     if (jj_scan_token(SEMICOLON)) return true;
     return false;
   }
@@ -5890,23 +5896,23 @@ LexicalUnitImpl result = null;
   private boolean jj_3R_183() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_229()) {
+    if (jj_3R_231()) {
     jj_scanpos = xsp;
     if (jj_3_2()) {
     jj_scanpos = xsp;
-    if (jj_3R_230()) {
-    jj_scanpos = xsp;
-    if (jj_3R_231()) {
-    jj_scanpos = xsp;
     if (jj_3R_232()) {
     jj_scanpos = xsp;
     if (jj_3R_233()) {
     jj_scanpos = xsp;
     if (jj_3R_234()) {
     jj_scanpos = xsp;
+    if (jj_3R_235()) {
+    jj_scanpos = xsp;
+    if (jj_3R_236()) {
+    jj_scanpos = xsp;
     if (jj_3_3()) {
     jj_scanpos = xsp;
-    if (jj_3R_235()) return true;
+    if (jj_3R_237()) return true;
     }
     }
     }
@@ -5918,12 +5924,12 @@ LexicalUnitImpl result = null;
     return false;
   }
 
-  private boolean jj_3R_229() {
-    if (jj_3R_251()) return true;
+  private boolean jj_3R_231() {
+    if (jj_3R_253()) return true;
     return false;
   }
 
-  private boolean jj_3R_254() {
+  private boolean jj_3R_256() {
     if (jj_scan_token(EXTEND_SYM)) return true;
     Token xsp;
     while (true) {
@@ -5931,10 +5937,10 @@ LexicalUnitImpl result = null;
       if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
     }
     if (jj_3R_182()) return true;
-    if (jj_3R_270()) return true;
+    if (jj_3R_272()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_270()) { jj_scanpos = xsp; break; }
+      if (jj_3R_272()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
@@ -5959,20 +5965,20 @@ LexicalUnitImpl result = null;
     return false;
   }
 
-  private boolean jj_3R_247() {
+  private boolean jj_3R_249() {
     if (jj_scan_token(DOT)) return true;
     return false;
   }
 
-  private boolean jj_3R_223() {
+  private boolean jj_3R_225() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_247()) jj_scanpos = xsp;
+    if (jj_3R_249()) jj_scanpos = xsp;
     if (jj_scan_token(IDENT)) return true;
     return false;
   }
 
-  private boolean jj_3R_282() {
+  private boolean jj_3R_284() {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(75)) {
@@ -6027,7 +6033,7 @@ LexicalUnitImpl result = null;
     return false;
   }
 
-  private boolean jj_3R_285() {
+  private boolean jj_3R_287() {
     if (jj_scan_token(FUNCTION)) return true;
     Token xsp;
     while (true) {
@@ -6037,7 +6043,7 @@ LexicalUnitImpl result = null;
     return false;
   }
 
-  private boolean jj_3R_283() {
+  private boolean jj_3R_285() {
     if (jj_scan_token(IDENT)) return true;
     Token xsp;
     while (true) {
@@ -6047,12 +6053,12 @@ LexicalUnitImpl result = null;
     return false;
   }
 
-  private boolean jj_3R_222() {
+  private boolean jj_3R_224() {
     if (jj_scan_token(STRING)) return true;
     return false;
   }
 
-  private boolean jj_3R_258() {
+  private boolean jj_3R_260() {
     if (jj_scan_token(VARIABLE)) return true;
     Token xsp;
     while (true) {
@@ -6062,23 +6068,23 @@ LexicalUnitImpl result = null;
     return false;
   }
 
-  private boolean jj_3R_221() {
-    if (jj_3R_246()) return true;
+  private boolean jj_3R_223() {
+    if (jj_3R_248()) return true;
     return false;
   }
 
   private boolean jj_3R_181() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_222()) {
-    jj_scanpos = xsp;
-    if (jj_3R_223()) {
-    jj_scanpos = xsp;
     if (jj_3R_224()) {
     jj_scanpos = xsp;
     if (jj_3R_225()) {
     jj_scanpos = xsp;
-    if (jj_3R_226()) return true;
+    if (jj_3R_226()) {
+    jj_scanpos = xsp;
+    if (jj_3R_227()) {
+    jj_scanpos = xsp;
+    if (jj_3R_228()) return true;
     }
     }
     }
@@ -6086,52 +6092,52 @@ LexicalUnitImpl result = null;
     return false;
   }
 
-  private boolean jj_3R_220() {
+  private boolean jj_3R_222() {
     if (jj_scan_token(DIMEN)) return true;
     return false;
   }
 
-  private boolean jj_3R_195() {
+  private boolean jj_3R_197() {
     if (jj_scan_token(S)) return true;
     return false;
   }
 
-  private boolean jj_3R_219() {
+  private boolean jj_3R_221() {
     if (jj_scan_token(KHZ)) return true;
     return false;
   }
 
-  private boolean jj_3R_194() {
+  private boolean jj_3R_196() {
     if (jj_scan_token(DOT)) return true;
     return false;
   }
 
-  private boolean jj_3R_193() {
+  private boolean jj_3R_195() {
     if (jj_scan_token(EQ)) return true;
     return false;
   }
 
-  private boolean jj_3R_192() {
+  private boolean jj_3R_194() {
     if (jj_scan_token(RPARAN)) return true;
     return false;
   }
 
-  private boolean jj_3R_218() {
+  private boolean jj_3R_220() {
     if (jj_scan_token(HZ)) return true;
     return false;
   }
 
-  private boolean jj_3R_191() {
+  private boolean jj_3R_193() {
     if (jj_scan_token(FUNCTION)) return true;
     return false;
   }
 
-  private boolean jj_3R_190() {
+  private boolean jj_3R_192() {
     if (jj_scan_token(COLON)) return true;
     return false;
   }
 
-  private boolean jj_3R_290() {
+  private boolean jj_3R_292() {
     if (jj_scan_token(WARN_SYM)) return true;
     Token xsp;
     while (true) {
@@ -6141,23 +6147,50 @@ LexicalUnitImpl result = null;
     return false;
   }
 
-  private boolean jj_3R_189() {
+  private boolean jj_3R_191() {
     if (jj_scan_token(INTERPOLATION)) return true;
     return false;
   }
 
-  private boolean jj_3R_217() {
+  private boolean jj_3R_219() {
     if (jj_scan_token(MS)) return true;
     return false;
   }
 
+  private boolean jj_3R_190() {
+    if (jj_scan_token(COMMA)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_265() {
+    if (jj_3R_284()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_189() {
+    if (jj_scan_token(STRING)) return true;
+    return false;
+  }
+
   private boolean jj_3R_188() {
     if (jj_scan_token(NUMBER)) return true;
     return false;
   }
 
-  private boolean jj_3R_263() {
-    if (jj_3R_282()) return true;
+  private boolean jj_3R_218() {
+    if (jj_scan_token(SECOND)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_253() {
+    if (jj_scan_token(IF_SYM)) return true;
+    Token xsp;
+    if (jj_3R_265()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_265()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(LBRACE)) return true;
     return false;
   }
 
@@ -6185,7 +6218,12 @@ LexicalUnitImpl result = null;
     jj_scanpos = xsp;
     if (jj_3R_194()) {
     jj_scanpos = xsp;
-    if (jj_3R_195()) return true;
+    if (jj_3R_195()) {
+    jj_scanpos = xsp;
+    if (jj_3R_196()) {
+    jj_scanpos = xsp;
+    if (jj_3R_197()) return true;
+    }
     }
     }
     }
@@ -6194,37 +6232,21 @@ LexicalUnitImpl result = null;
     }
     }
     }
-    return false;
-  }
-
-  private boolean jj_3R_216() {
-    if (jj_scan_token(SECOND)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_251() {
-    if (jj_scan_token(IF_SYM)) return true;
-    Token xsp;
-    if (jj_3R_263()) return true;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_263()) { jj_scanpos = xsp; break; }
     }
-    if (jj_scan_token(LBRACE)) return true;
     return false;
   }
 
-  private boolean jj_3R_215() {
+  private boolean jj_3R_217() {
     if (jj_scan_token(GRAD)) return true;
     return false;
   }
 
-  private boolean jj_3R_214() {
+  private boolean jj_3R_216() {
     if (jj_scan_token(RAD)) return true;
     return false;
   }
 
-  private boolean jj_3R_289() {
+  private boolean jj_3R_291() {
     if (jj_scan_token(DEBUG_SYM)) return true;
     Token xsp;
     while (true) {
@@ -6234,6 +6256,11 @@ LexicalUnitImpl result = null;
     return false;
   }
 
+  private boolean jj_3R_215() {
+    if (jj_scan_token(DEG)) return true;
+    return false;
+  }
+
   private boolean jj_3R_159() {
     if (jj_scan_token(MICROSOFT_RULE)) return true;
     Token xsp;
@@ -6250,44 +6277,44 @@ LexicalUnitImpl result = null;
     return false;
   }
 
-  private boolean jj_3R_213() {
-    if (jj_scan_token(DEG)) return true;
+  private boolean jj_3R_214() {
+    if (jj_scan_token(EXS)) return true;
     return false;
   }
 
-  private boolean jj_3R_241() {
+  private boolean jj_3R_243() {
     if (jj_scan_token(SIBLING)) return true;
     return false;
   }
 
-  private boolean jj_3R_240() {
+  private boolean jj_3R_242() {
     if (jj_scan_token(PRECEDES)) return true;
     return false;
   }
 
-  private boolean jj_3R_212() {
-    if (jj_scan_token(EXS)) return true;
+  private boolean jj_3R_213() {
+    if (jj_scan_token(EMS)) return true;
     return false;
   }
 
-  private boolean jj_3R_239() {
+  private boolean jj_3R_241() {
     if (jj_scan_token(PLUS)) return true;
     return false;
   }
 
-  private boolean jj_3R_211() {
-    if (jj_scan_token(EMS)) return true;
+  private boolean jj_3R_212() {
+    if (jj_scan_token(PX)) return true;
     return false;
   }
 
-  private boolean jj_3R_196() {
+  private boolean jj_3R_198() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_239()) {
+    if (jj_3R_241()) {
     jj_scanpos = xsp;
-    if (jj_3R_240()) {
+    if (jj_3R_242()) {
     jj_scanpos = xsp;
-    if (jj_3R_241()) return true;
+    if (jj_3R_243()) return true;
     }
     }
     while (true) {
@@ -6297,8 +6324,8 @@ LexicalUnitImpl result = null;
     return false;
   }
 
-  private boolean jj_3R_210() {
-    if (jj_scan_token(PX)) return true;
+  private boolean jj_3R_211() {
+    if (jj_scan_token(IN)) return true;
     return false;
   }
 
@@ -6322,8 +6349,8 @@ LexicalUnitImpl result = null;
     return false;
   }
 
-  private boolean jj_3R_209() {
-    if (jj_scan_token(IN)) return true;
+  private boolean jj_3R_210() {
+    if (jj_scan_token(PC)) return true;
     return false;
   }
 
@@ -6331,7 +6358,7 @@ LexicalUnitImpl result = null;
     if (jj_scan_token(S)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_196()) jj_scanpos = xsp;
+    if (jj_3R_198()) jj_scanpos = xsp;
     return false;
   }
 
@@ -6361,67 +6388,58 @@ LexicalUnitImpl result = null;
     return false;
   }
 
-  private boolean jj_3R_208() {
-    if (jj_scan_token(PC)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_207() {
+  private boolean jj_3R_209() {
     if (jj_scan_token(MM)) return true;
     return false;
   }
 
-  private boolean jj_3R_206() {
+  private boolean jj_3R_208() {
     if (jj_scan_token(CM)) return true;
     return false;
   }
 
-  private boolean jj_3R_205() {
+  private boolean jj_3R_207() {
     if (jj_scan_token(PT)) return true;
     return false;
   }
 
-  private boolean jj_3R_256() {
-    if (jj_3R_258()) return true;
+  private boolean jj_3R_258() {
+    if (jj_3R_260()) return true;
     if (jj_scan_token(COLON)) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
       if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
     }
-    if (jj_3R_271()) return true;
+    if (jj_3R_273()) return true;
     return false;
   }
 
-  private boolean jj_3R_204() {
+  private boolean jj_3R_206() {
     if (jj_scan_token(PERCENTAGE)) return true;
     return false;
   }
 
   private boolean jj_3R_186() {
-    if (jj_3R_238()) return true;
+    if (jj_3R_240()) return true;
     return false;
   }
 
-  private boolean jj_3R_203() {
+  private boolean jj_3R_205() {
     if (jj_scan_token(NUMBER)) return true;
     return false;
   }
 
-  private boolean jj_3R_202() {
-    if (jj_3R_245()) return true;
+  private boolean jj_3R_204() {
+    if (jj_3R_247()) return true;
     return false;
   }
 
   private boolean jj_3R_180() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_202()) jj_scanpos = xsp;
+    if (jj_3R_204()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_203()) {
-    jj_scanpos = xsp;
-    if (jj_3R_204()) {
-    jj_scanpos = xsp;
     if (jj_3R_205()) {
     jj_scanpos = xsp;
     if (jj_3R_206()) {
@@ -6454,7 +6472,11 @@ LexicalUnitImpl result = null;
     jj_scanpos = xsp;
     if (jj_3R_220()) {
     jj_scanpos = xsp;
-    if (jj_3R_221()) return true;
+    if (jj_3R_221()) {
+    jj_scanpos = xsp;
+    if (jj_3R_222()) {
+    jj_scanpos = xsp;
+    if (jj_3R_223()) return true;
     }
     }
     }
@@ -6490,22 +6512,22 @@ LexicalUnitImpl result = null;
     return false;
   }
 
-  private boolean jj_3R_248() {
+  private boolean jj_3R_250() {
     if (jj_scan_token(HASH)) return true;
     return false;
   }
 
-  private boolean jj_3R_238() {
-    if (jj_3R_258()) return true;
+  private boolean jj_3R_240() {
+    if (jj_3R_260()) return true;
     return false;
   }
 
-  private boolean jj_3R_198() {
+  private boolean jj_3R_200() {
     if (jj_scan_token(HASH)) return true;
     return false;
   }
 
-  private boolean jj_3R_305() {
+  private boolean jj_3R_307() {
     if (jj_scan_token(IDENT)) return true;
     return false;
   }
@@ -6515,11 +6537,6 @@ LexicalUnitImpl result = null;
     return false;
   }
 
-  private boolean jj_3R_249() {
-    if (jj_scan_token(URL)) return true;
-    return false;
-  }
-
   private boolean jj_3R_169() {
     Token xsp;
     xsp = jj_scanpos;
@@ -6530,7 +6547,12 @@ LexicalUnitImpl result = null;
     return false;
   }
 
-  private boolean jj_3R_306() {
+  private boolean jj_3R_251() {
+    if (jj_scan_token(URL)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_308() {
     if (jj_scan_token(FUNCTION)) return true;
     Token xsp;
     while (true) {
@@ -6546,22 +6568,22 @@ LexicalUnitImpl result = null;
     return false;
   }
 
-  private boolean jj_3R_261() {
+  private boolean jj_3R_263() {
     if (jj_scan_token(PLUS)) return true;
     return false;
   }
 
-  private boolean jj_3R_245() {
+  private boolean jj_3R_247() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_260()) {
+    if (jj_3R_262()) {
     jj_scanpos = xsp;
-    if (jj_3R_261()) return true;
+    if (jj_3R_263()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_260() {
+  private boolean jj_3R_262() {
     if (jj_scan_token(MINUS)) return true;
     return false;
   }
@@ -6574,7 +6596,7 @@ LexicalUnitImpl result = null;
     return false;
   }
 
-  private boolean jj_3R_271() {
+  private boolean jj_3R_273() {
     if (jj_3R_169()) return true;
     Token xsp;
     while (true) {
@@ -6584,25 +6606,25 @@ LexicalUnitImpl result = null;
     return false;
   }
 
-  private boolean jj_3R_304() {
+  private boolean jj_3R_306() {
     if (jj_scan_token(COLON)) return true;
     return false;
   }
 
-  private boolean jj_3R_250() {
+  private boolean jj_3R_252() {
     if (jj_scan_token(UNICODERANGE)) return true;
     return false;
   }
 
-  private boolean jj_3R_200() {
+  private boolean jj_3R_202() {
     if (jj_scan_token(COLON)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_304()) jj_scanpos = xsp;
+    if (jj_3R_306()) jj_scanpos = xsp;
     xsp = jj_scanpos;
-    if (jj_3R_305()) {
+    if (jj_3R_307()) {
     jj_scanpos = xsp;
-    if (jj_3R_306()) return true;
+    if (jj_3R_308()) return true;
     }
     return false;
   }
@@ -6628,7 +6650,7 @@ LexicalUnitImpl result = null;
     return false;
   }
 
-  private boolean jj_3R_237() {
+  private boolean jj_3R_239() {
     if (jj_scan_token(COMMA)) return true;
     Token xsp;
     while (true) {
@@ -6646,14 +6668,14 @@ LexicalUnitImpl result = null;
   private boolean jj_3R_184() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_236()) {
+    if (jj_3R_238()) {
     jj_scanpos = xsp;
-    if (jj_3R_237()) return true;
+    if (jj_3R_239()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_236() {
+  private boolean jj_3R_238() {
     if (jj_scan_token(DIV)) return true;
     Token xsp;
     while (true) {
@@ -6663,8 +6685,8 @@ LexicalUnitImpl result = null;
     return false;
   }
 
-  private boolean jj_3R_266() {
-    if (jj_3R_284()) return true;
+  private boolean jj_3R_268() {
+    if (jj_3R_286()) return true;
     return false;
   }
 
@@ -6694,52 +6716,52 @@ LexicalUnitImpl result = null;
     return false;
   }
 
-  private boolean jj_3R_327() {
+  private boolean jj_3R_329() {
     if (jj_scan_token(STRING)) return true;
     return false;
   }
 
-  private boolean jj_3R_325() {
+  private boolean jj_3R_327() {
     if (jj_scan_token(STARMATCH)) return true;
     return false;
   }
 
-  private boolean jj_3R_326() {
+  private boolean jj_3R_328() {
     if (jj_scan_token(IDENT)) return true;
     return false;
   }
 
-  private boolean jj_3R_324() {
+  private boolean jj_3R_326() {
     if (jj_scan_token(DOLLARMATCH)) return true;
     return false;
   }
 
-  private boolean jj_3R_268() {
+  private boolean jj_3R_270() {
     if (jj_scan_token(SEMICOLON)) return true;
     return false;
   }
 
-  private boolean jj_3R_323() {
+  private boolean jj_3R_325() {
     if (jj_scan_token(CARETMATCH)) return true;
     return false;
   }
 
-  private boolean jj_3R_322() {
+  private boolean jj_3R_324() {
     if (jj_scan_token(DASHMATCH)) return true;
     return false;
   }
 
-  private boolean jj_3R_321() {
+  private boolean jj_3R_323() {
     if (jj_scan_token(INCLUDES)) return true;
     return false;
   }
 
-  private boolean jj_3R_276() {
+  private boolean jj_3R_278() {
     if (jj_scan_token(INTERPOLATION)) return true;
     return false;
   }
 
-  private boolean jj_3R_320() {
+  private boolean jj_3R_322() {
     if (jj_scan_token(EQ)) return true;
     return false;
   }
@@ -6765,20 +6787,20 @@ LexicalUnitImpl result = null;
     return false;
   }
 
-  private boolean jj_3R_311() {
+  private boolean jj_3R_313() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_320()) {
-    jj_scanpos = xsp;
-    if (jj_3R_321()) {
-    jj_scanpos = xsp;
     if (jj_3R_322()) {
     jj_scanpos = xsp;
     if (jj_3R_323()) {
     jj_scanpos = xsp;
     if (jj_3R_324()) {
     jj_scanpos = xsp;
-    if (jj_3R_325()) return true;
+    if (jj_3R_325()) {
+    jj_scanpos = xsp;
+    if (jj_3R_326()) {
+    jj_scanpos = xsp;
+    if (jj_3R_327()) return true;
     }
     }
     }
@@ -6789,9 +6811,9 @@ LexicalUnitImpl result = null;
       if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
     }
     xsp = jj_scanpos;
-    if (jj_3R_326()) {
+    if (jj_3R_328()) {
     jj_scanpos = xsp;
-    if (jj_3R_327()) return true;
+    if (jj_3R_329()) return true;
     }
     while (true) {
       xsp = jj_scanpos;
@@ -6800,7 +6822,7 @@ LexicalUnitImpl result = null;
     return false;
   }
 
-  private boolean jj_3R_201() {
+  private boolean jj_3R_203() {
     if (jj_scan_token(LBRACKET)) return true;
     Token xsp;
     while (true) {
@@ -6813,22 +6835,27 @@ LexicalUnitImpl result = null;
       if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
     }
     xsp = jj_scanpos;
-    if (jj_3R_311()) jj_scanpos = xsp;
+    if (jj_3R_313()) jj_scanpos = xsp;
     if (jj_scan_token(RBRACKET)) return true;
     return false;
   }
 
-  private boolean jj_3R_235() {
-    if (jj_3R_257()) return true;
+  private boolean jj_3R_237() {
+    if (jj_3R_259()) return true;
     return false;
   }
 
-  private boolean jj_3R_288() {
+  private boolean jj_3R_321() {
+    if (jj_scan_token(INTERPOLATION)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_290() {
     if (jj_scan_token(COMMA)) return true;
     return false;
   }
 
-  private boolean jj_3R_287() {
+  private boolean jj_3R_289() {
     if (jj_scan_token(IDENT)) return true;
     Token xsp;
     while (true) {
@@ -6838,17 +6865,12 @@ LexicalUnitImpl result = null;
     return false;
   }
 
-  private boolean jj_3R_319() {
-    if (jj_scan_token(INTERPOLATION)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_265() {
-    if (jj_3R_258()) return true;
+  private boolean jj_3R_267() {
+    if (jj_3R_260()) return true;
     return false;
   }
 
-  private boolean jj_3R_244() {
+  private boolean jj_3R_246() {
     if (jj_scan_token(PARENT)) return true;
     return false;
   }
@@ -6871,76 +6893,76 @@ LexicalUnitImpl result = null;
     return false;
   }
 
-  private boolean jj_3R_243() {
+  private boolean jj_3R_245() {
     if (jj_scan_token(ANY)) return true;
     return false;
   }
 
-  private boolean jj_3R_269() {
-    if (jj_3R_287()) return true;
+  private boolean jj_3R_271() {
+    if (jj_3R_289()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_288()) { jj_scanpos = xsp; break; }
+      if (jj_3R_290()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  private boolean jj_3R_259() {
+  private boolean jj_3R_261() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_275()) {
+    if (jj_3R_277()) {
     jj_scanpos = xsp;
-    if (jj_3R_276()) return true;
+    if (jj_3R_278()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_275() {
+  private boolean jj_3R_277() {
     if (jj_scan_token(IDENT)) return true;
     return false;
   }
 
-  private boolean jj_3R_284() {
+  private boolean jj_3R_286() {
     if (jj_scan_token(INTERPOLATION)) return true;
     return false;
   }
 
-  private boolean jj_3R_197() {
+  private boolean jj_3R_199() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_242()) {
+    if (jj_3R_244()) {
     jj_scanpos = xsp;
-    if (jj_3R_243()) {
+    if (jj_3R_245()) {
     jj_scanpos = xsp;
-    if (jj_3R_244()) return true;
+    if (jj_3R_246()) return true;
     }
     }
     return false;
   }
 
-  private boolean jj_3R_242() {
+  private boolean jj_3R_244() {
     Token xsp;
-    if (jj_3R_259()) return true;
+    if (jj_3R_261()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_259()) { jj_scanpos = xsp; break; }
+      if (jj_3R_261()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  private boolean jj_3R_267() {
-    if (jj_3R_285()) return true;
-    if (jj_3R_286()) return true;
+  private boolean jj_3R_269() {
+    if (jj_3R_287()) return true;
+    if (jj_3R_288()) return true;
     return false;
   }
 
-  private boolean jj_3R_264() {
-    if (jj_3R_283()) return true;
+  private boolean jj_3R_266() {
+    if (jj_3R_285()) return true;
     return false;
   }
 
-  private boolean jj_3R_252() {
+  private boolean jj_3R_254() {
     if (jj_scan_token(INCLUDE_SYM)) return true;
     Token xsp;
     while (true) {
@@ -6948,46 +6970,46 @@ LexicalUnitImpl result = null;
       if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
     }
     xsp = jj_scanpos;
-    if (jj_3R_264()) {
+    if (jj_3R_266()) {
     jj_scanpos = xsp;
-    if (jj_3R_265()) {
+    if (jj_3R_267()) {
     jj_scanpos = xsp;
-    if (jj_3R_266()) {
+    if (jj_3R_268()) {
     jj_scanpos = xsp;
-    if (jj_3R_267()) return true;
+    if (jj_3R_269()) return true;
     }
     }
     }
-    if (jj_3R_268()) return true;
+    if (jj_3R_270()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_268()) { jj_scanpos = xsp; break; }
+      if (jj_3R_270()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  private boolean jj_3R_315() {
-    if (jj_3R_200()) return true;
+  private boolean jj_3R_317() {
+    if (jj_3R_202()) return true;
     return false;
   }
 
-  private boolean jj_3R_318() {
+  private boolean jj_3R_320() {
     if (jj_scan_token(IDENT)) return true;
     return false;
   }
 
-  private boolean jj_3R_299() {
+  private boolean jj_3R_301() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_318()) {
+    if (jj_3R_320()) {
     jj_scanpos = xsp;
-    if (jj_3R_319()) return true;
+    if (jj_3R_321()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_313() {
-    if (jj_3R_199()) return true;
+  private boolean jj_3R_315() {
+    if (jj_3R_201()) return true;
     return false;
   }
 
@@ -6996,55 +7018,55 @@ LexicalUnitImpl result = null;
     return false;
   }
 
-  private boolean jj_3R_310() {
-    if (jj_3R_200()) return true;
+  private boolean jj_3R_312() {
+    if (jj_3R_202()) return true;
     return false;
   }
 
-  private boolean jj_3R_308() {
-    if (jj_3R_199()) return true;
+  private boolean jj_3R_310() {
+    if (jj_3R_201()) return true;
     return false;
   }
 
-  private boolean jj_3R_298() {
-    if (jj_3R_200()) return true;
+  private boolean jj_3R_300() {
+    if (jj_3R_202()) return true;
     return false;
   }
 
-  private boolean jj_3R_253() {
-    if (jj_scan_token(MEDIA_SYM)) return true;
+  private boolean jj_3R_201() {
+    if (jj_scan_token(DOT)) return true;
     Token xsp;
+    if (jj_3R_301()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
+      if (jj_3R_301()) { jj_scanpos = xsp; break; }
     }
-    if (jj_3R_269()) return true;
-    if (jj_scan_token(LBRACE)) return true;
     return false;
   }
 
-  private boolean jj_3R_199() {
-    if (jj_scan_token(DOT)) return true;
-    Token xsp;
-    if (jj_3R_299()) return true;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_299()) { jj_scanpos = xsp; break; }
-    }
+  private boolean jj_3R_305() {
+    if (jj_3R_202()) return true;
     return false;
   }
 
   private boolean jj_3R_303() {
-    if (jj_3R_200()) return true;
+    if (jj_3R_201()) return true;
     return false;
   }
 
-  private boolean jj_3R_301() {
-    if (jj_3R_199()) return true;
+  private boolean jj_3R_255() {
+    if (jj_scan_token(MEDIA_SYM)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
+    }
+    if (jj_3R_271()) return true;
+    if (jj_scan_token(LBRACE)) return true;
     return false;
   }
 
-  private boolean jj_3R_286() {
+  private boolean jj_3R_288() {
     if (jj_3R_169()) return true;
     return false;
   }
@@ -7059,65 +7081,65 @@ LexicalUnitImpl result = null;
     return false;
   }
 
-  private boolean jj_3R_234() {
-    if (jj_3R_256()) return true;
+  private boolean jj_3R_236() {
+    if (jj_3R_258()) return true;
     return false;
   }
 
-  private boolean jj_3R_314() {
-    if (jj_3R_201()) return true;
+  private boolean jj_3R_316() {
+    if (jj_3R_203()) return true;
     return false;
   }
 
-  private boolean jj_3R_312() {
-    if (jj_3R_198()) return true;
+  private boolean jj_3R_314() {
+    if (jj_3R_200()) return true;
     return false;
   }
 
-  private boolean jj_3R_281() {
+  private boolean jj_3R_283() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_312()) {
+    if (jj_3R_314()) {
     jj_scanpos = xsp;
-    if (jj_3R_313()) {
+    if (jj_3R_315()) {
     jj_scanpos = xsp;
-    if (jj_3R_314()) {
+    if (jj_3R_316()) {
     jj_scanpos = xsp;
-    if (jj_3R_315()) return true;
+    if (jj_3R_317()) return true;
     }
     }
     }
     return false;
   }
 
-  private boolean jj_3R_274() {
-    if (jj_3R_291()) return true;
+  private boolean jj_3R_276() {
+    if (jj_3R_293()) return true;
     return false;
   }
 
-  private boolean jj_3R_307() {
-    if (jj_3R_198()) return true;
+  private boolean jj_3R_309() {
+    if (jj_3R_200()) return true;
     return false;
   }
 
-  private boolean jj_3R_280() {
+  private boolean jj_3R_282() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_307()) {
+    if (jj_3R_309()) {
     jj_scanpos = xsp;
-    if (jj_3R_308()) {
+    if (jj_3R_310()) {
     jj_scanpos = xsp;
-    if (jj_3R_309()) {
+    if (jj_3R_311()) {
     jj_scanpos = xsp;
-    if (jj_3R_310()) return true;
+    if (jj_3R_312()) return true;
     }
     }
     }
     return false;
   }
 
-  private boolean jj_3R_295() {
-    if (jj_3R_200()) return true;
+  private boolean jj_3R_297() {
+    if (jj_3R_202()) return true;
     return false;
   }
 
@@ -7129,145 +7151,145 @@ LexicalUnitImpl result = null;
     return false;
   }
 
-  private boolean jj_3R_309() {
-    if (jj_3R_201()) return true;
+  private boolean jj_3R_311() {
+    if (jj_3R_203()) return true;
     return false;
   }
 
-  private boolean jj_3R_300() {
-    if (jj_3R_198()) return true;
+  private boolean jj_3R_302() {
+    if (jj_3R_200()) return true;
     return false;
   }
 
-  private boolean jj_3R_279() {
+  private boolean jj_3R_281() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_300()) {
+    if (jj_3R_302()) {
     jj_scanpos = xsp;
-    if (jj_3R_301()) {
+    if (jj_3R_303()) {
     jj_scanpos = xsp;
-    if (jj_3R_302()) {
+    if (jj_3R_304()) {
     jj_scanpos = xsp;
-    if (jj_3R_303()) return true;
+    if (jj_3R_305()) return true;
     }
     }
     }
     return false;
   }
 
-  private boolean jj_3R_297() {
-    if (jj_3R_201()) return true;
+  private boolean jj_3R_299() {
+    if (jj_3R_203()) return true;
     return false;
   }
 
-  private boolean jj_3R_302() {
-    if (jj_3R_201()) return true;
+  private boolean jj_3R_304() {
+    if (jj_3R_203()) return true;
     return false;
   }
 
-  private boolean jj_3R_317() {
+  private boolean jj_3R_319() {
     if (jj_scan_token(LBRACE)) return true;
     return false;
   }
 
-  private boolean jj_3R_296() {
-    if (jj_3R_199()) return true;
+  private boolean jj_3R_298() {
+    if (jj_3R_201()) return true;
     return false;
   }
 
-  private boolean jj_3R_293() {
-    if (jj_3R_199()) return true;
+  private boolean jj_3R_295() {
+    if (jj_3R_201()) return true;
     return false;
   }
 
-  private boolean jj_3R_278() {
+  private boolean jj_3R_280() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_296()) {
+    if (jj_3R_298()) {
     jj_scanpos = xsp;
-    if (jj_3R_297()) {
+    if (jj_3R_299()) {
     jj_scanpos = xsp;
-    if (jj_3R_298()) return true;
+    if (jj_3R_300()) return true;
     }
     }
     return false;
   }
 
-  private boolean jj_3R_233() {
-    if (jj_3R_255()) return true;
+  private boolean jj_3R_235() {
+    if (jj_3R_257()) return true;
     return false;
   }
 
-  private boolean jj_3R_273() {
-    if (jj_3R_290()) return true;
+  private boolean jj_3R_275() {
+    if (jj_3R_292()) return true;
     return false;
   }
 
   private boolean jj_3R_179() {
-    if (jj_3R_201()) return true;
+    if (jj_3R_203()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_281()) { jj_scanpos = xsp; break; }
+      if (jj_3R_283()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
   private boolean jj_3R_178() {
-    if (jj_3R_200()) return true;
+    if (jj_3R_202()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_280()) { jj_scanpos = xsp; break; }
+      if (jj_3R_282()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  private boolean jj_3R_316() {
-    if (jj_3R_271()) return true;
+  private boolean jj_3R_318() {
+    if (jj_3R_273()) return true;
     return false;
   }
 
-  private boolean jj_3R_294() {
-    if (jj_3R_201()) return true;
+  private boolean jj_3R_296() {
+    if (jj_3R_203()) return true;
     return false;
   }
 
   private boolean jj_3R_177() {
-    if (jj_3R_199()) return true;
+    if (jj_3R_201()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_279()) { jj_scanpos = xsp; break; }
+      if (jj_3R_281()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  private boolean jj_3R_292() {
-    if (jj_3R_198()) return true;
+  private boolean jj_3R_294() {
+    if (jj_3R_200()) return true;
     return false;
   }
 
   private boolean jj_3R_176() {
-    if (jj_3R_198()) return true;
+    if (jj_3R_200()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_278()) { jj_scanpos = xsp; break; }
+      if (jj_3R_280()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  private boolean jj_3R_277() {
+  private boolean jj_3R_279() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_292()) {
+    if (jj_3R_294()) {
     jj_scanpos = xsp;
-    if (jj_3R_293()) {
+    if (jj_3R_295()) {
     jj_scanpos = xsp;
-    if (jj_3R_294()) {
+    if (jj_3R_296()) {
     jj_scanpos = xsp;
-    if (jj_3R_295()) return true;
+    if (jj_3R_297()) return true;
     }
     }
     }
@@ -7280,17 +7302,17 @@ LexicalUnitImpl result = null;
   }
 
   private boolean jj_3R_175() {
-    if (jj_3R_197()) return true;
+    if (jj_3R_199()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_277()) { jj_scanpos = xsp; break; }
+      if (jj_3R_279()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  private boolean jj_3R_291() {
-    if (jj_3R_283()) return true;
+  private boolean jj_3R_293() {
+    if (jj_3R_285()) return true;
     if (jj_scan_token(COLON)) return true;
     Token xsp;
     while (true) {
@@ -7298,9 +7320,9 @@ LexicalUnitImpl result = null;
       if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
     }
     xsp = jj_scanpos;
-    if (jj_3R_316()) {
+    if (jj_3R_318()) {
     jj_scanpos = xsp;
-    if (jj_3R_317()) return true;
+    if (jj_3R_319()) return true;
     }
     return false;
   }
@@ -7324,13 +7346,18 @@ LexicalUnitImpl result = null;
     return false;
   }
 
-  private boolean jj_3R_232() {
-    if (jj_3R_254()) return true;
+  private boolean jj_3R_234() {
+    if (jj_3R_256()) return true;
     return false;
   }
 
-  private boolean jj_3R_272() {
-    if (jj_3R_289()) return true;
+  private boolean jj_3R_274() {
+    if (jj_3R_291()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_233() {
+    if (jj_3R_255()) return true;
     return false;
   }
 
@@ -7356,13 +7383,13 @@ LexicalUnitImpl result = null;
       jj_la1_init_3();
    }
    private static void jj_la1_init_0() {
-      jj_la1_0 = new int[] {0x0,0xc02,0xc02,0x0,0xc00,0x2,0x2,0x2,0x0,0xd0000000,0xc00,0x2,0xc00,0x2,0x0,0x2,0x0,0x2,0x2,0x2,0xd3f45400,0xd3f45400,0x2,0x400000,0x2,0x2,0x2,0x2,0x0,0x0,0x2,0x0,0x800000,0x2,0x0,0x2,0x2,0x2,0x2,0x0,0x800000,0x2,0x0,0x2,0x3f45400,0x2,0x2,0x2,0x3100000,0x2,0x3100000,0x3100002,0x2,0x80002,0x80002,0x2,0x2,0x2,0x2,0x2,0xd0000000,0x0,0x0,0xd0000000,0x2,0x400000,0x2,0x2,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0xd0000000,0x0,0x0,0x0,0x0,0xc0000000,0x2,0x2,0xfc000,0x2,0x0,0x2,0xfc000,0x0,0x2,0x0,0x2,0x0,0x2,0x800000,0x4d380002,0x2,0xd0000000,0xd0000000,0x2,0x0,0x2,0x4d380002,0x0,0x2,0xd0000000,0xd0000000,0x2,0x4d380002,0x2,0x2,0x2,0x0,0x2,0xd0000000,0x0,0xd0000000,0x2,0x2,0x400000,0x2,0x2,0x2,0x2,0x0,0x2,0xd0000000,0x0,0xd0000000,0x2,0x400000,0x2,0x2,0x2,0x400000,0x0,0x0,0x300000,0x2,0x0,0x400000,0x2,0x300000,0x2,0x0,0x2,0x0,0x2,0x800000,0x2,0x2,0x2,0x0,0x2,0x2,0x2,0x400000,0x2,0x2,0x2,0x2,0x2,0x0,0x2,0x2,0x2,0x400000,0x2,0x2,0x2,0x2,0x2,0x0,0x2,0x2,0x2,0x400000,0x2,0x2,0x2,0x2,0x0,0x2,0x2,0x2,0x800000,0x2,0x2,0x0,0x800000,0x2,0x0,0x2,0x0,0x2,0x0,0x2,0x0,0x800000,0x2,0x0,0x2,0x301000,0x2,0x0,0x2,0x2,0x2,0x2,0x8400000,0x8400000,0x300000,0x300000,0x300000,0x0,0x0,0x0,0x300000,0x2,0x2,0x300000,0x2,0xd0000000,0x2,0x2,0x2,0x0,0x800000,0x2,0x0,0x2,};
+      jj_la1_0 = new int[] {0x0,0xc02,0xc02,0x0,0xc00,0x2,0x2,0x2,0x0,0xd0000000,0xc00,0x2,0xc00,0x2,0x0,0x2,0x0,0x2,0x2,0x2,0xd3f45400,0xd3f45400,0x2,0x400000,0x2,0x2,0x2,0x2,0x0,0x0,0x2,0x0,0x800000,0x2,0x0,0x2,0x2,0x2,0x2,0x0,0x800000,0x2,0x0,0x2,0x3f45400,0x2,0x2,0x2,0x3100000,0x2,0x3100000,0x3100002,0x2,0x480002,0x480002,0x2,0x2,0x2,0x2,0x2,0xd0000000,0x0,0x0,0xd0000000,0x2,0x400000,0x2,0x2,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0x10000000,0xd0000000,0x0,0x0,0x0,0x0,0xc0000000,0x2,0x2,0xfc000,0x2,0x0,0x2,0xfc000,0x0,0x2,0x0,0x2,0x0,0x2,0x800000,0x4d380002,0x2,0xd0000000,0xd0000000,0x2,0x0,0x2,0x4d380002,0x0,0x2,0xd0000000,0xd0000000,0x2,0x4d380002,0x2,0x2,0x2,0x0,0x2,0xd0000000,0x0,0xd0000000,0x2,0x2,0x400000,0x2,0x2,0x2,0x2,0x0,0x2,0xd0000000,0x0,0xd0000000,0x2,0x400000,0x2,0x2,0x2,0x400000,0x0,0x0,0x300000,0x2,0x0,0x400000,0x2,0x300000,0x2,0x0,0x2,0x0,0x2,0x800000,0x2,0x2,0x2,0x0,0x2,0x2,0x2,0x400000,0x2,0x2,0x2,0x2,0x2,0x0,0x2,0x2,0x2,0x400000,0x2,0x2,0x2,0x2,0x2,0x0,0x2,0x2,0x2,0x400000,0x2,0x2,0x2,0x2,0x0,0x2,0x2,0x2,0x800000,0x2,0x2,0x0,0x800000,0x2,0x0,0x2,0x0,0x2,0x0,0x2,0x0,0x800000,0x2,0x0,0x2,0x301000,0x2,0x0,0x2,0x2,0x2,0x2,0x8400000,0x8400000,0x300000,0x300000,0x300000,0x0,0x0,0x0,0x300000,0x2,0x2,0x300000,0x2,0xd0000000,0x2,0x2,0x2,0x0,0x800000,0x2,0x0,0x2,};
    }
    private static void jj_la1_init_1() {
       jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x56600181,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6000381,0x6000381,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x185,0x185,0x0,0x0,0x0,0x0,0x0,0x56400181,0x40000000,0x10400000,0x6000181,0x0,0x0,0x0,0x0,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x81,0x181,0x100,0x100,0x100,0x100,0x100,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x0,0x0,0x7e,0x0,0x6400181,0x6400181,0x0,0x80000000,0x0,0x7e,0x0,0x0,0x6400181,0x6400181,0x0,0x7e,0x0,0x0,0x0,0x0,0x0,0x6400181,0x400000,0x6000181,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x56400181,0x400000,0x56000181,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x80,0x81,0x0,0x80,0x0,0x0,0x81,0x0,0x80,0x0,0x100,0x0,0x0,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x6000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x1,0x1,0x1,0x0,0x0,0x1,0x0,0x6000181,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
    }
    private static void jj_la1_init_2() {
-      jj_la1_2 = new int[] {0x0,0x0,0x0,0x40000000,0x0,0x0,0x0,0x0,0x800,0xa0000880,0x0,0x0,0x0,0x0,0x440,0x0,0x80,0x0,0x0,0x0,0xe00015c0,0xe00015c0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x80,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x80,0x0,0xc0001540,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x180,0x180,0x0,0x0,0x0,0x0,0x0,0xa0000889,0x0,0x80000801,0x20000080,0x0,0x0,0x0,0x0,0x20000000,0x20000000,0x0,0x0,0x20000000,0x20000000,0x20000000,0x20000000,0x20000000,0x20000000,0x20000080,0x80,0x80,0x80,0x80,0x80,0x0,0x0,0x0,0x0,0xc0,0x0,0x0,0x0,0x0,0x80,0x0,0x20,0x0,0x0,0x980,0x0,0xa0000881,0xa0000881,0x0,0x0,0x0,0x980,0x10,0x0,0xa0000881,0xa0000881,0x0,0x980,0x0,0x0,0x0,0x880,0x0,0xa0000881,0x0,0xa0000881,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0xa0000881,0x80000000,0x20000881,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x800,0x3ffffdc0,0x0,0x0,0x0,0x0,0x3ffffdc0,0x0,0x0,0x0,0x880,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x80,0x0,0x80,0x0,0x0,0x0,0x80,0x0,0x0,0x80,0x0,0x3ffffdc0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3ffffdc0,0x0,0x1ffff100,0x0,0x200004c0,0x3ffff5c0,0x0,0x0,0x3ffffdc0,0x0,0xe0000080,0x0,0x0,0x0,0x80,0x0,0x0,0x80,0x0,};
+      jj_la1_2 = new int[] {0x0,0x0,0x0,0x40000000,0x0,0x0,0x0,0x0,0x800,0xa0000880,0x0,0x0,0x0,0x0,0x440,0x0,0x80,0x0,0x0,0x0,0xe00015c0,0xe00015c0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x80,0x0,0x0,0x80,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x80,0x0,0xc0001540,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1c0,0x1c0,0x0,0x0,0x0,0x0,0x0,0xa0000889,0x0,0x80000801,0x20000080,0x0,0x0,0x0,0x0,0x20000000,0x20000000,0x0,0x0,0x20000000,0x20000000,0x20000000,0x20000000,0x20000000,0x20000000,0x20000080,0x80,0x80,0x80,0x80,0x80,0x0,0x0,0x0,0x0,0xc0,0x0,0x0,0x0,0x0,0x80,0x0,0x20,0x0,0x0,0x980,0x0,0xa0000881,0xa0000881,0x0,0x0,0x0,0x980,0x10,0x0,0xa0000881,0xa0000881,0x0,0x980,0x0,0x0,0x0,0x880,0x0,0xa0000881,0x0,0xa0000881,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0xa0000881,0x80000000,0x20000881,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x800,0x3ffffdc0,0x0,0x0,0x0,0x0,0x3ffffdc0,0x0,0x0,0x0,0x880,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x80,0x0,0x0,0x80,0x0,0x80,0x0,0x0,0x0,0x80,0x0,0x0,0x80,0x0,0x3ffffdc0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3ffffdc0,0x0,0x1ffff100,0x0,0x200004c0,0x3ffff5c0,0x0,0x0,0x3ffffdc0,0x0,0xe0000080,0x0,0x0,0x0,0x80,0x0,0x0,0x80,0x0,};
    }
    private static void jj_la1_init_3() {
       jj_la1_3 = new int[] {0x1,0x8,0x8,0x0,0x8,0x0,0x0,0x0,0x0,0x6,0x8,0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc401f,0xc401f,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc401f,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40000,0x0,0x6,0x0,0x6,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x44000,0x0,0x0,0x0,0x0,0x44000,0x0,0x0,0x0,0x40000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x44000,0x0,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x44000,0x0,0x40000,0x0,0x4000,0x44000,0x0,0x0,0x44000,0x0,0x6,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
diff --git a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj
index efd1ce2857..81a7b10531 100644
--- a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj
+++ b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj
@@ -1007,10 +1007,13 @@ void microsoftExtension() :
 }
 
 {
+  // This is not really taking the syntax of filter rules into account
   n = < MICROSOFT_RULE > (< S >)* { name = n.image; }
 	< COLON >
 	((n = < IDENT > { value += n.image; })
 	| (n = < NUMBER > { value += n.image; }) 
+	| (n = < STRING > { value += n.image; })
+	| (n = < COMMA > { value += n.image; })
 	| (n = < INTERPOLATION > { value += n.image; })
 	| (n = < COLON > { value += n.image; })
 	| (n = < FUNCTION > { value += n.image; })
diff --git a/theme-compiler/tests/resources/automatic/css/microsoft-extensions.css b/theme-compiler/tests/resources/automatic/css/microsoft-extensions.css
index 18bc34ca6c..af614316c9 100644
--- a/theme-compiler/tests/resources/automatic/css/microsoft-extensions.css
+++ b/theme-compiler/tests/resources/automatic/css/microsoft-extensions.css
@@ -1,6 +1,7 @@
 .v-ie6 .v-shadow-window {
 	background: #000000;
 	filter: progid:DXImageTransform.Microsoft.Blur(pixelRadius=5 ) alpha(opacity = 20);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#dfdfdf', endColorstr='#ededed');
 	margin-top: 2px;
 	margin-left: 2px;
 }
\ No newline at end of file
diff --git a/theme-compiler/tests/resources/automatic/scss/microsoft-extensions.scss b/theme-compiler/tests/resources/automatic/scss/microsoft-extensions.scss
index 69670969de..e08f3f07a3 100644
--- a/theme-compiler/tests/resources/automatic/scss/microsoft-extensions.scss
+++ b/theme-compiler/tests/resources/automatic/scss/microsoft-extensions.scss
@@ -1,6 +1,7 @@
 .v-ie6 .v-shadow-window {
 	background: #000000;
 	filter: progid:DXImageTransform.Microsoft.Blur(pixelRadius=5 ) alpha(opacity = 20);
+	filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#dfdfdf', endColorstr='#ededed');
 	margin-top: 2px;
 	margin-left: 2px;
 }