diff options
| -rw-r--r-- | theme-compiler/src/com/vaadin/sass/internal/parser/Parser.java | 4 | ||||
| -rw-r--r-- | theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj | 2 |
2 files changed, 3 insertions, 3 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 d9019aae95..52a93389e0 100644 --- 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 245c4a0de1..8d7cc4c32d 100644 --- 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(); } |