Minor fix to SASS else-if condition parsing.

Change-Id: I2b6214bbc79f2f133c079667f1b3a61b2fa41ca7

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 d9019aae95b412bfc57ad00fd5e3741baf4287c6..52a93389e082dddf015a4bc7fce76ec43cda8fdc 100644 (file)
--- a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java
@@ -2584,6 +2584,8 @@ boolean isPseudoElement = false;
       jj_consume_token(IF);
       label_70:
       while (true) {
+        n = booleanExpressionToken();
+                                            evaluator += n.image;
         switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
         case S:
         case EQ:
@@ -2608,8 +2610,6 @@ boolean isPseudoElement = false;
           jj_la1[103] = jj_gen;
           break label_70;
         }
-        n = booleanExpressionToken();
-                                           if(n != null) evaluator += n.image;
       }
       break;
     default:

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 245c4a0de122a383dd5c52ea9c04b096aa13a2ed..8d7cc4c32d15364486b4148ba7be1d8719b29b96 100644 (file)
--- a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj
+++ b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj
@@ -1432,7 +1432,7 @@ void elseDirective() :
 }
 {
   < ELSE_SYM >(< S >)* 
-  ( < IF > (n = booleanExpressionToken() { if(n != null) evaluator += n.image; })*)?
+  ( < IF > ( n = booleanExpressionToken() { evaluator += n.image; } )+ )?
   < LBRACE >(< S >)*
   { if(!evaluator.trim().equals("")){ documentHandler.ifDirective(evaluator); }
     else{ documentHandler.elseDirective(); }