diff options
| author | Henri Sara <hesara@vaadin.com> | 2012-12-20 17:18:28 +0200 |
|---|---|---|
| committer | Henri Sara <hesara@vaadin.com> | 2013-01-02 16:03:43 +0200 |
| commit | 21b8e3652e816dd499338d74ec8a9f7f903b8913 (patch) | |
| tree | f877d78f41156df3ffdf48d3e64c7f80a55aad10 /theme-compiler/src/com/vaadin | |
| parent | c7806b0f6086aaa8a48af2a174527243b8fe793a (diff) | |
| download | vaadin-framework-21b8e3652e816dd499338d74ec8a9f7f903b8913.tar.gz vaadin-framework-21b8e3652e816dd499338d74ec8a9f7f903b8913.zip | |
Minor fix to SASS else-if condition parsing.
Change-Id: I2b6214bbc79f2f133c079667f1b3a61b2fa41ca7
Diffstat (limited to 'theme-compiler/src/com/vaadin')
| -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(); } |