Merge commit '915c37b569600a8d37db2a0800a30474da49e255' into master

915c37b Sass compiler now treats null-valued variables as unassigned (#12430).

Conflicts:
	theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java

Change-Id: If9789f8d0638377d27e77ec4be0fdf0f96e4b1af

diff --cc theme-compiler/src/com/vaadin/sass/internal/parser/LexicalUnitImpl.java
Simple merge

diff --cc theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java
index 0c10e09a6c8ac008409d009219e85aa9bb716621,ab0f6161d79370436fc6fabadf6a04c02d5d3744..e68b24355b6db857c4f661949c1214d18b3ec26e
--- 1/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java
--- 2/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java
@@@ -2662,10 -2751,11 +2662,11 @@@ boolean isPseudoElement = false
            ;
            break;
          default:
 -          jj_la1[109] = jj_gen;
 -          break label_70;
 +          jj_la1[103] = jj_gen;
 +          break label_67;
          }
        }
+                     exp = replaceNullValues(exp);
                      documentHandler.variable(name, exp, guarded);
      } catch (JumpException e) {
              skipAfterExpression();
@@@ -6547,8 -6628,36 +6565,36 @@@ LexicalUnitImpl result = null
      finally { jj_save(8, xla); }
    }
  
 -  private boolean jj_3R_200() {
++  private boolean jj_3R_194() {
+     if (jj_scan_token(VARIABLE)) return true;
+     Token xsp;
+     while (true) {
+       xsp = jj_scanpos;
+       if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
+     }
+     if (jj_scan_token(COLON)) return true;
+     while (true) {
+       xsp = jj_scanpos;
+       if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
+     }
+     return false;
+   }
+ 
 -  private boolean jj_3R_182() {
++  private boolean jj_3R_179() {
+     Token xsp;
+     xsp = jj_scanpos;
 -    if (jj_3R_200()) jj_scanpos = xsp;
++    if (jj_3R_194()) jj_scanpos = xsp;
+     if (jj_scan_token(CONTAINS)) return true;
+     while (true) {
+       xsp = jj_scanpos;
+       if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
+     }
+     if (true) { jj_la = 0; jj_scanpos = jj_lastpos; return false;}
+     return false;
+   }
+ 
 -  private boolean jj_3R_218() {
 -    if (jj_3R_217()) return true;
 +  private boolean jj_3R_212() {
 +    if (jj_3R_211()) return true;
      return false;
    }
  
@@@ -6569,44 -6678,8 +6615,16 @@@
      return false;
    }
  
-   private boolean jj_3R_194() {
-     if (jj_scan_token(VARIABLE)) return true;
-     Token xsp;
-     while (true) {
-       xsp = jj_scanpos;
-       if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
-     }
-     if (jj_scan_token(COLON)) return true;
-     while (true) {
-       xsp = jj_scanpos;
-       if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
-     }
-     return false;
-   }
- 
 -  private boolean jj_3R_179() {
 -    if (jj_3R_189()) return true;
 +  private boolean jj_3R_191() {
 +    if (jj_scan_token(S)) return true;
 +    Token xsp;
 +    xsp = jj_scanpos;
 +    if (jj_3R_212()) jj_scanpos = xsp;
 +    return false;
 +  }
 +
-   private boolean jj_3R_179() {
-     Token xsp;
-     xsp = jj_scanpos;
-     if (jj_3R_194()) jj_scanpos = xsp;
-     if (jj_scan_token(CONTAINS)) return true;
-     while (true) {
-       xsp = jj_scanpos;
-       if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
-     }
-     if (true) { jj_la = 0; jj_scanpos = jj_lastpos; return false;}
-     return false;
-   }
- 
 +  private boolean jj_3R_176() {
 +    if (jj_3R_186()) return true;
      if (jj_scan_token(COLON)) return true;
      Token xsp;
      while (true) {
@@@ -6644,7 -6725,12 +6662,12 @@@
      return false;
    }
  
 -    if (jj_3R_186()) return true;
+   private boolean jj_3_7() {
 -  private boolean jj_3R_290() {
++    if (jj_3R_183()) return true;
+     return false;
+   }
+ 
 +  private boolean jj_3R_279() {
      if (jj_scan_token(IDENT)) return true;
      return false;
    }
@@@ -6660,8 -6746,8 +6683,8 @@@
      return false;
    }
  
-   private boolean jj_3_7() {
-     if (jj_3R_183()) return true;
 -  private boolean jj_3R_207() {
++  private boolean jj_3R_201() {
+     if (jj_scan_token(LBRACE)) return true;
      return false;
    }
  
@@@ -6670,8 -6756,8 +6693,8 @@@
      return false;
    }
  
-   private boolean jj_3R_201() {
-     if (jj_scan_token(LBRACE)) return true;
 -  private boolean jj_3R_206() {
 -    if (jj_3R_190()) return true;
++  private boolean jj_3R_200() {
++    if (jj_3R_187()) return true;
      return false;
    }
  
@@@ -6688,13 -6774,8 +6711,8 @@@
      return false;
    }
  
-   private boolean jj_3R_200() {
-     if (jj_3R_187()) return true;
-     return false;
-   }
- 
    private boolean jj_3_6() {
 -    if (jj_3R_185()) return true;
 +    if (jj_3R_182()) return true;
      if (jj_scan_token(LBRACE)) return true;
      return false;
    }
@@@ -6720,12 -6801,7 +6738,7 @@@
      return false;
    }
  
-   private boolean jj_3R_290() {
-     if (jj_scan_token(STRING)) return true;
-     return false;
-   }
- 
 -  private boolean jj_3R_259() {
 +  private boolean jj_3R_254() {
      if (jj_scan_token(FUNCTION)) return true;
      Token xsp;
      while (true) {
@@@ -6738,7 -6814,27 +6751,27 @@@
      return false;
    }
  
 -  private boolean jj_3R_250() {
 -    if (jj_3R_263()) return true;
++  private boolean jj_3R_241() {
++    if (jj_3R_258()) return true;
+     return false;
+   }
+ 
 -  private boolean jj_3R_249() {
 -    if (jj_3R_262()) return true;
++  private boolean jj_3R_240() {
++    if (jj_3R_257()) return true;
+     return false;
+   }
+ 
 -  private boolean jj_3R_248() {
 -    if (jj_3R_261()) return true;
++  private boolean jj_3R_239() {
++    if (jj_3R_256()) return true;
+     return false;
+   }
+ 
 -  private boolean jj_3R_310() {
++  private boolean jj_3R_290() {
+     if (jj_scan_token(STRING)) return true;
+     return false;
+   }
+ 
 -  private boolean jj_3R_308() {
 +  private boolean jj_3R_288() {
      if (jj_scan_token(STARMATCH)) return true;
      return false;
    }
@@@ -6813,22 -6909,7 +6846,7 @@@
      return false;
    }
  
-   private boolean jj_3R_241() {
-     if (jj_3R_258()) return true;
-     return false;
-   }
- 
-   private boolean jj_3R_240() {
-     if (jj_3R_257()) return true;
-     return false;
-   }
- 
-   private boolean jj_3R_239() {
-     if (jj_3R_256()) return true;
-     return false;
-   }
- 
 -  private boolean jj_3R_223() {
 +  private boolean jj_3R_264() {
      if (jj_scan_token(LBRACKET)) return true;
      Token xsp;
      while (true) {
@@@ -6846,7 -6927,17 +6864,17 @@@
      return false;
    }
  
 -  private boolean jj_3R_183() {
++  private boolean jj_3R_180() {
+     if (jj_scan_token(COMMA)) return true;
+     Token xsp;
+     while (true) {
+       xsp = jj_scanpos;
+       if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
+     }
+     return false;
+   }
+ 
 -  private boolean jj_3R_302() {
 +  private boolean jj_3R_282() {
      if (jj_scan_token(INTERPOLATION)) return true;
      return false;
    }
@@@ -6861,12 -6952,43 +6889,43 @@@
      return false;
    }
  
 -  private boolean jj_3R_260() {
++  private boolean jj_3R_255() {
+     if (jj_scan_token(DOT)) return true;
+     return false;
+   }
+ 
 -  private boolean jj_3R_247() {
++  private boolean jj_3R_238() {
+     Token xsp;
+     xsp = jj_scanpos;
 -    if (jj_3R_260()) jj_scanpos = xsp;
++    if (jj_3R_255()) jj_scanpos = xsp;
+     xsp = jj_scanpos;
+     if (jj_scan_token(72)) {
+     jj_scanpos = xsp;
+     if (jj_scan_token(49)) {
+     jj_scanpos = xsp;
+     if (jj_scan_token(50)) {
+     jj_scanpos = xsp;
+     if (jj_scan_token(52)) return true;
+     }
+     }
+     }
+     return false;
+   }
+ 
+   private boolean jj_3_5() {
+     Token xsp;
+     xsp = jj_scanpos;
 -    if (jj_3R_183()) jj_scanpos = xsp;
 -    if (jj_3R_184()) return true;
++    if (jj_3R_180()) jj_scanpos = xsp;
++    if (jj_3R_181()) return true;
+     return false;
+   }
+ 
 -  private boolean jj_3R_266() {
 +  private boolean jj_3R_261() {
      Token xsp;
      xsp = jj_scanpos;
 -    if (jj_3R_270()) {
 +    if (jj_3R_269()) {
      jj_scanpos = xsp;
 -    if (jj_3R_271()) return true;
 +    if (jj_3R_270()) return true;
      }
      return false;
    }
@@@ -6876,14 -6998,19 +6935,19 @@@
      return false;
    }
  
 -  private boolean jj_3R_246() {
++  private boolean jj_3R_237() {
+     if (jj_scan_token(STRING)) return true;
+     return false;
+   }
+ 
 -  private boolean jj_3R_219() {
 +  private boolean jj_3R_213() {
      Token xsp;
      xsp = jj_scanpos;
 -    if (jj_3R_255()) {
 +    if (jj_3R_246()) {
      jj_scanpos = xsp;
 -    if (jj_3R_256()) {
 +    if (jj_3R_247()) {
      jj_scanpos = xsp;
 -    if (jj_3R_257()) return true;
 +    if (jj_3R_248()) return true;
      }
      }
      return false;
@@@ -6899,69 -7026,57 +6963,57 @@@
      return false;
    }
  
-   private boolean jj_3R_180() {
-     if (jj_scan_token(COMMA)) return true;
-     Token xsp;
-     while (true) {
-       xsp = jj_scanpos;
-       if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
-     }
 -  private boolean jj_3R_245() {
 -    if (jj_3R_259()) return true;
++  private boolean jj_3R_236() {
++    if (jj_3R_254()) return true;
      return false;
    }
  
-   private boolean jj_3R_276() {
 -  private boolean jj_3R_202() {
++  private boolean jj_3R_196() {
      Token xsp;
      xsp = jj_scanpos;
-     if (jj_3R_281()) {
 -    if (jj_3R_246()) {
++    if (jj_3R_237()) {
      jj_scanpos = xsp;
-     if (jj_3R_282()) return true;
 -    if (jj_3R_247()) {
++    if (jj_3R_238()) {
+     jj_scanpos = xsp;
 -    if (jj_3R_248()) {
++    if (jj_3R_239()) {
+     jj_scanpos = xsp;
 -    if (jj_3R_249()) {
++    if (jj_3R_240()) {
+     jj_scanpos = xsp;
 -    if (jj_3R_250()) return true;
++    if (jj_3R_241()) return true;
+     }
+     }
+     }
      }
      return false;
    }
  
-   private boolean jj_3R_281() {
-     if (jj_scan_token(IDENT)) return true;
-     return false;
-   }
- 
-   private boolean jj_3R_255() {
-     if (jj_scan_token(DOT)) return true;
 -  private boolean jj_3R_244() {
++  private boolean jj_3R_235() {
+     if (jj_scan_token(DIMEN)) return true;
      return false;
    }
  
-   private boolean jj_3R_238() {
 -  private boolean jj_3R_301() {
 -    if (jj_scan_token(IDENT)) return true;
 -    return false;
 -  }
 -
 -  private boolean jj_3R_284() {
++  private boolean jj_3R_276() {
      Token xsp;
      xsp = jj_scanpos;
-     if (jj_3R_255()) jj_scanpos = xsp;
-     xsp = jj_scanpos;
-     if (jj_scan_token(72)) {
-     jj_scanpos = xsp;
-     if (jj_scan_token(49)) {
-     jj_scanpos = xsp;
-     if (jj_scan_token(50)) {
 -    if (jj_3R_301()) {
++    if (jj_3R_281()) {
      jj_scanpos = xsp;
-     if (jj_scan_token(52)) return true;
-     }
-     }
 -    if (jj_3R_302()) return true;
++    if (jj_3R_282()) return true;
      }
      return false;
    }
  
-   private boolean jj_3_5() {
-     Token xsp;
-     xsp = jj_scanpos;
-     if (jj_3R_180()) jj_scanpos = xsp;
-     if (jj_3R_181()) return true;
 -  private boolean jj_3R_243() {
++  private boolean jj_3R_281() {
++    if (jj_scan_token(IDENT)) return true;
 +    return false;
 +  }
 +
-   private boolean jj_3R_237() {
-     if (jj_scan_token(STRING)) return true;
++  private boolean jj_3R_234() {
+     if (jj_scan_token(KHZ)) return true;
      return false;
    }
  
-   private boolean jj_3R_236() {
-     if (jj_3R_254()) return true;
 -  private boolean jj_3R_300() {
 -    if (jj_3R_222()) return true;
++  private boolean jj_3R_233() {
++    if (jj_scan_token(HZ)) return true;
      return false;
    }
  
@@@ -6976,22 -7091,18 +7028,18 @@@
      return false;
    }
  
-   private boolean jj_3R_196() {
-     Token xsp;
-     xsp = jj_scanpos;
-     if (jj_3R_237()) {
-     jj_scanpos = xsp;
-     if (jj_3R_238()) {
-     jj_scanpos = xsp;
-     if (jj_3R_239()) {
-     jj_scanpos = xsp;
-     if (jj_3R_240()) {
-     jj_scanpos = xsp;
-     if (jj_3R_241()) return true;
-     }
-     }
-     }
-     }
 -  private boolean jj_3R_242() {
 -    if (jj_scan_token(HZ)) return true;
++  private boolean jj_3R_232() {
++    if (jj_scan_token(MS)) return true;
+     return false;
+   }
+ 
 -  private boolean jj_3R_298() {
 -    if (jj_3R_221()) return true;
++  private boolean jj_3R_231() {
++    if (jj_scan_token(SECOND)) return true;
+     return false;
+   }
+ 
 -  private boolean jj_3R_241() {
 -    if (jj_scan_token(MS)) return true;
++  private boolean jj_3R_230() {
++    if (jj_scan_token(GRAD)) return true;
      return false;
    }
  
@@@ -7005,13 -7116,13 +7053,13 @@@
      return false;
    }
  
-   private boolean jj_3R_235() {
-     if (jj_scan_token(DIMEN)) return true;
 -  private boolean jj_3R_283() {
 -    if (jj_3R_222()) return true;
++  private boolean jj_3R_229() {
++    if (jj_scan_token(RAD)) return true;
      return false;
    }
  
-   private boolean jj_3R_234() {
-     if (jj_scan_token(KHZ)) return true;
 -  private boolean jj_3R_286() {
 -    if (jj_3R_221()) return true;
++  private boolean jj_3R_228() {
++    if (jj_scan_token(DEG)) return true;
      return false;
    }
  
@@@ -7020,33 -7131,33 +7068,33 @@@
      return false;
    }
  
-   private boolean jj_3R_250() {
-     if (jj_3R_263()) return true;
 -  private boolean jj_3R_240() {
 -    if (jj_scan_token(SECOND)) return true;
++  private boolean jj_3R_227() {
++    if (jj_scan_token(EXS)) return true;
      return false;
    }
  
-   private boolean jj_3R_233() {
-     if (jj_scan_token(HZ)) return true;
 -  private boolean jj_3R_239() {
 -    if (jj_scan_token(GRAD)) return true;
++  private boolean jj_3R_250() {
++    if (jj_3R_263()) return true;
      return false;
    }
  
-   private boolean jj_3R_232() {
-     if (jj_scan_token(MS)) return true;
 -  private boolean jj_3R_238() {
 -    if (jj_scan_token(RAD)) return true;
++  private boolean jj_3R_226() {
++    if (jj_scan_token(REM)) return true;
      return false;
    }
  
-   private boolean jj_3R_231() {
-     if (jj_scan_token(SECOND)) return true;
 -  private boolean jj_3R_237() {
 -    if (jj_scan_token(DEG)) return true;
++  private boolean jj_3R_225() {
++    if (jj_scan_token(LEM)) return true;
      return false;
    }
  
-   private boolean jj_3R_230() {
-     if (jj_scan_token(GRAD)) return true;
 -  private boolean jj_3R_299() {
 -    if (jj_3R_223()) return true;
++  private boolean jj_3R_224() {
++    if (jj_scan_token(EMS)) return true;
      return false;
    }
  
-   private boolean jj_3R_229() {
-     if (jj_scan_token(RAD)) return true;
 -  private boolean jj_3R_236() {
 -    if (jj_scan_token(EXS)) return true;
++  private boolean jj_3R_223() {
++    if (jj_scan_token(PX)) return true;
      return false;
    }
  
@@@ -7060,8 -7182,8 +7108,8 @@@
      return false;
    }
  
-   private boolean jj_3R_228() {
-     if (jj_scan_token(DEG)) return true;
 -  private boolean jj_3R_235() {
 -    if (jj_scan_token(REM)) return true;
++  private boolean jj_3R_222() {
++    if (jj_scan_token(IN)) return true;
      return false;
    }
  
@@@ -7086,8 -7208,8 +7134,8 @@@
      return false;
    }
  
-   private boolean jj_3R_227() {
-     if (jj_scan_token(EXS)) return true;
 -  private boolean jj_3R_280() {
 -    if (jj_3R_222()) return true;
++  private boolean jj_3R_221() {
++    if (jj_scan_token(PC)) return true;
      return false;
    }
  
@@@ -7112,8 -7239,8 +7160,8 @@@
      return false;
    }
  
-   private boolean jj_3R_226() {
-     if (jj_scan_token(REM)) return true;
 -  private boolean jj_3R_234() {
 -    if (jj_scan_token(LEM)) return true;
++  private boolean jj_3R_220() {
++    if (jj_scan_token(MM)) return true;
      return false;
    }
  
@@@ -7127,8 -7249,8 +7175,8 @@@
      return false;
    }
  
-   private boolean jj_3R_225() {
-     if (jj_scan_token(LEM)) return true;
 -  private boolean jj_3R_287() {
 -    if (jj_3R_223()) return true;
++  private boolean jj_3R_219() {
++    if (jj_scan_token(CM)) return true;
      return false;
    }
  
@@@ -7142,8 -7342,8 +7190,8 @@@
      return false;
    }
  
-   private boolean jj_3R_224() {
-     if (jj_scan_token(EMS)) return true;
 -  private boolean jj_3R_227() {
++  private boolean jj_3R_218() {
+     if (jj_scan_token(PT)) return true;
      return false;
    }
  
@@@ -7157,8 -7373,8 +7205,8 @@@
      return false;
    }
  
-   private boolean jj_3R_223() {
-     if (jj_scan_token(PX)) return true;
 -  private boolean jj_3R_277() {
 -    if (jj_3R_220()) return true;
++  private boolean jj_3R_217() {
++    if (jj_scan_token(PERCENTAGE)) return true;
      return false;
    }
  
@@@ -7168,38 -7383,8 +7216,8 @@@
      return false;
    }
  
-   private boolean jj_3R_222() {
-     if (jj_scan_token(IN)) return true;
-     return false;
-   }
- 
-   private boolean jj_3R_221() {
-     if (jj_scan_token(PC)) return true;
-     return false;
-   }
- 
-   private boolean jj_3R_220() {
-     if (jj_scan_token(MM)) return true;
-     return false;
-   }
- 
-   private boolean jj_3R_219() {
-     if (jj_scan_token(CM)) return true;
-     return false;
-   }
- 
-   private boolean jj_3R_218() {
-     if (jj_scan_token(PT)) return true;
-     return false;
-   }
- 
-   private boolean jj_3R_217() {
-     if (jj_scan_token(PERCENTAGE)) return true;
-     return false;
-   }
- 
 -  private boolean jj_3R_209() {
 -    if (jj_3R_254()) return true;
 +  private boolean jj_3R_203() {
 +    if (jj_3R_245()) return true;
      return false;
    }
  
@@@ -7301,30 -7521,8 +7319,8 @@@
      return false;
    }
  
-   private boolean jj_3_2() {
-     if (jj_3R_177()) return true;
-     if (jj_3R_178()) return true;
-     return false;
-   }
- 
-   private boolean jj_3R_198() {
-     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_197()) return true;
-     return false;
-   }
- 
-   private boolean jj_3R_242() {
-     if (jj_3R_178()) return true;
-     return false;
-   }
- 
 -  private boolean jj_3R_254() {
 -    if (jj_3R_189()) return true;
 +  private boolean jj_3R_245() {
 +    if (jj_3R_186()) return true;
      return false;
    }
  
@@@ -7333,21 -7531,8 +7329,9 @@@
      return false;
    }
  
-   private boolean jj_3R_197() {
-     Token xsp;
-     xsp = jj_scanpos;
-     if (jj_3R_242()) {
-     jj_scanpos = xsp;
-     if (jj_3R_243()) return true;
-     }
-     while (true) {
-       xsp = jj_scanpos;
-       if (jj_3_2()) { jj_scanpos = xsp; break; }
-     }
-     while (true) {
-       xsp = jj_scanpos;
-       if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
-     }
 -  private boolean jj_3R_208() {
 -    if (jj_3R_184()) return true;
++  private boolean jj_3_2() {
++    if (jj_3R_177()) return true;
++    if (jj_3R_178()) return true;
      return false;
    }
  
@@@ -7371,17 -7557,23 +7355,41 @@@
      return false;
    }
  
-   private boolean jj_3R_182() {
 -  private boolean jj_3R_204() {
++  private boolean jj_3R_198() {
+     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_203()) return true;
 +    if (jj_3R_197()) return true;
+     return false;
+   }
+ 
 -  private boolean jj_3R_251() {
 -    if (jj_3R_181()) return true;
++  private boolean jj_3R_242() {
++    if (jj_3R_178()) return true;
+     return false;
+   }
+ 
 -  private boolean jj_3R_268() {
++  private boolean jj_3R_197() {
 +    Token xsp;
++    xsp = jj_scanpos;
++    if (jj_3R_242()) {
++    jj_scanpos = xsp;
++    if (jj_3R_243()) return true;
++    }
 +    while (true) {
 +      xsp = jj_scanpos;
-       if (jj_3R_198()) { jj_scanpos = xsp; break; }
++      if (jj_3_2()) { jj_scanpos = xsp; break; }
++    }
++    while (true) {
++      xsp = jj_scanpos;
++      if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
 +    }
 +    return false;
 +  }
 +
 +  private boolean jj_3R_267() {
      if (jj_scan_token(PLUS)) return true;
      return false;
    }
@@@ -7401,12 -7593,7 +7409,7 @@@
      return false;
    }
  
-   private boolean jj_3_1() {
-     if (jj_3R_176()) return true;
-     return false;
-   }
- 
 -  private boolean jj_3R_263() {
 +  private boolean jj_3R_258() {
      if (jj_scan_token(UNICODERANGE)) return true;
      return false;
    }
@@@ -7434,7 -7639,22 +7437,22 @@@
      return false;
    }
  
 -  private boolean jj_3_1() {
 -    if (jj_3R_179()) return true;
 -    return false;
 -  }
 -
 -  private boolean jj_3R_185() {
 -    if (jj_3R_203()) return true;
++  private boolean jj_3R_182() {
++    if (jj_3R_197()) return true;
+     Token xsp;
+     while (true) {
+       xsp = jj_scanpos;
 -      if (jj_3R_204()) { jj_scanpos = xsp; break; }
++      if (jj_3R_198()) { jj_scanpos = xsp; break; }
+     }
+     return false;
+   }
+ 
 -  private boolean jj_3R_215() {
++  private boolean jj_3_1() {
++    if (jj_3R_176()) return true;
++    return false;
++  }
++
 +  private boolean jj_3R_209() {
      if (jj_scan_token(MINUS)) return true;
      Token xsp;
      if (jj_scan_token(1)) return true;
@@@ -7445,12 -7665,7 +7463,7 @@@
      return false;
    }
  
-   private boolean jj_3R_260() {
-     if (jj_scan_token(INTERPOLATION)) return true;
-     return false;
-   }
- 
 -  private boolean jj_3R_214() {
 +  private boolean jj_3R_208() {
      if (jj_scan_token(PLUS)) return true;
      Token xsp;
      if (jj_scan_token(1)) return true;
@@@ -7486,28 -7701,8 +7499,13 @@@
      return false;
    }
  
-   private boolean jj_3R_205() {
-     if (jj_scan_token(DIV)) return true;
-     Token xsp;
-     while (true) {
-       xsp = jj_scanpos;
-       if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
-     }
-     return false;
-   }
- 
-   private boolean jj_3R_186() {
-     if (jj_scan_token(VARIABLE)) return true;
-     Token xsp;
-     while (true) {
-       xsp = jj_scanpos;
-       if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
-     }
 -  private boolean jj_3R_211() {
++  private boolean jj_3R_260() {
++    if (jj_scan_token(INTERPOLATION)) return true;
 +    return false;
 +  }
 +
-   private boolean jj_3R_189() {
-     if (jj_scan_token(SEMICOLON)) return true;
++  private boolean jj_3R_205() {
+     if (jj_scan_token(DIV)) return true;
      Token xsp;
      while (true) {
        xsp = jj_scanpos;
@@@ -7548,12 -7743,47 +7546,42 @@@
      return false;
    }
  
 -  private boolean jj_3R_265() {
 -    if (jj_scan_token(INTERPOLATION)) return true;
 -    return false;
 -  }
 -
 -  private boolean jj_3R_216() {
++  private boolean jj_3R_210() {
+     if (jj_scan_token(GUARDED_SYM)) return true;
+     Token xsp;
+     while (true) {
+       xsp = jj_scanpos;
+       if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
+     }
+     return false;
+   }
+ 
 -  private boolean jj_3R_192() {
 -    if (jj_scan_token(SEMICOLON)) return true;
++  private boolean jj_3R_186() {
++    if (jj_scan_token(VARIABLE)) return true;
+     Token xsp;
+     while (true) {
+       xsp = jj_scanpos;
+       if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
+     }
+     return false;
+   }
+ 
+   private boolean jj_3R_189() {
 -    if (jj_scan_token(VARIABLE)) return true;
++    if (jj_scan_token(SEMICOLON)) return true;
+     Token xsp;
+     while (true) {
+       xsp = jj_scanpos;
+       if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
+     }
+     return false;
+   }
+ 
 -  private boolean jj_3R_253() {
 +  private boolean jj_3R_244() {
      Token xsp;
      xsp = jj_scanpos;
 -    if (jj_3R_264()) {
 +    if (jj_3R_259()) {
      jj_scanpos = xsp;
 -    if (jj_3R_265()) return true;
 +    if (jj_3R_260()) return true;
      }
      return false;
    }
@@@ -7577,18 -7807,8 +7605,8 @@@
      return false;
    }
  
-   private boolean jj_3R_210() {
-     if (jj_scan_token(GUARDED_SYM)) return true;
-     Token xsp;
-     while (true) {
-       xsp = jj_scanpos;
-       if (jj_scan_token(1)) { jj_scanpos = xsp; break; }
-     }
-     return false;
-   }
- 
 -  private boolean jj_3R_191() {
 -    if (jj_3R_216()) return true;
 +  private boolean jj_3R_188() {
 +    if (jj_3R_210()) return true;
      return false;
    }
  

diff --cc theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj
Simple merge