diff options
| author | joheriks <joheriks@vaadin.com> | 2013-10-17 11:16:45 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2013-10-21 08:35:16 +0000 |
| commit | 6f76840f6c9be57be0b23e22df2b968a1a876f67 (patch) | |
| tree | 098f6c3cfc0b7b837b9842d018a0855696ceec06 /theme-compiler | |
| parent | dd51b7f73062650cb3d5bb8550a0b088a0ea6595 (diff) | |
| download | vaadin-framework-6f76840f6c9be57be0b23e22df2b968a1a876f67.tar.gz vaadin-framework-6f76840f6c9be57be0b23e22df2b968a1a876f67.zip | |
Sass variables can now start with underscore (#12716)
Change-Id: I1c6cb12113f2462f96e8fcfc0749d3f62fd1998c
Diffstat (limited to 'theme-compiler')
| -rw-r--r-- | theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj | 2 | ||||
| -rw-r--r-- | theme-compiler/src/com/vaadin/sass/internal/parser/ParserTokenManager.java | 40 |
2 files changed, 11 insertions, 31 deletions
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 d563b739b0..871be2c4d0 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj +++ b/theme-compiler/src/com/vaadin/sass/internal/parser/Parser.jj @@ -559,7 +559,7 @@ TOKEN : /* basic tokens */ ( <H> )? ( <H> )? ( [ " ", "\t" , "\n" , "\r", "\f" ] )? > | < #ESCAPE : <UNICODE> | ( "\\" [ " "-"~","\200"-"\377" ] ) > - | < #NMSTART : ("-")?[ "a"-"z"] | <NONASCII> | <ESCAPE> > + | < #NMSTART : ("-")?[ "a"-"z","_"] | <NONASCII> | <ESCAPE> > | < #NMCHAR : ["a"-"z", "0"-"9", "-", "_"] | <NONASCII> | <ESCAPE> > | < #STRINGCHAR : [ "\t"," ","!","#","$","%","&","("-"~" ] | "\\\n" | "\\\r\n" | "\\\r" | "\\\f" diff --git a/theme-compiler/src/com/vaadin/sass/internal/parser/ParserTokenManager.java b/theme-compiler/src/com/vaadin/sass/internal/parser/ParserTokenManager.java index bf4ebf5c06..224a8dbfc1 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/parser/ParserTokenManager.java +++ b/theme-compiler/src/com/vaadin/sass/internal/parser/ParserTokenManager.java @@ -3259,7 +3259,7 @@ public class ParserTokenManager implements ParserConstants { } break; case 162: - if ((0x7fffffe07fffffeL & l) != 0L) { + if ((0x7fffffe87fffffeL & l) != 0L) { if (kind > 103) { kind = 103; } @@ -3310,10 +3310,10 @@ public class ParserTokenManager implements ParserConstants { } break; case 38: - if ((0x7fffffe07fffffeL & l) != 0L) { + if ((0x7fffffe87fffffeL & l) != 0L) { jjCheckNAddStates(0, 3); } - if ((0x7fffffe07fffffeL & l) != 0L) { + if ((0x7fffffe87fffffeL & l) != 0L) { if (kind > 72) { kind = 72; } @@ -3339,7 +3339,7 @@ public class ParserTokenManager implements ParserConstants { } break; case 24: - if ((0x7fffffe07fffffeL & l) != 0L) { + if ((0x7fffffe87fffffeL & l) != 0L) { if (kind > 72) { kind = 72; } @@ -3390,7 +3390,7 @@ public class ParserTokenManager implements ParserConstants { } break; case 174: - if ((0x7fffffe07fffffeL & l) != 0L) { + if ((0x7fffffe87fffffeL & l) != 0L) { if (kind > 103) { kind = 103; } @@ -3408,7 +3408,7 @@ public class ParserTokenManager implements ParserConstants { } break; case 75: - if ((0x7fffffe07fffffeL & l) != 0L) { + if ((0x7fffffe87fffffeL & l) != 0L) { if (kind > 76) { kind = 76; } @@ -3438,10 +3438,6 @@ public class ParserTokenManager implements ParserConstants { } break; case 4: - if ((0x7fffffe07fffffeL & l) != 0L) { - jjCheckNAddStates(138, 140); - } - break; case 5: if ((0x7fffffe87fffffeL & l) != 0L) { jjCheckNAddStates(138, 140); @@ -3671,14 +3667,6 @@ public class ParserTokenManager implements ParserConstants { } break; case 76: - if ((0x7fffffe07fffffeL & l) == 0L) { - break; - } - if (kind > 76) { - kind = 76; - } - jjCheckNAddTwoStates(77, 78); - break; case 77: if ((0x7fffffe87fffffeL & l) == 0L) { break; @@ -3898,7 +3886,7 @@ public class ParserTokenManager implements ParserConstants { } break; case 108: - if ((0x7fffffe07fffffeL & l) == 0L) { + if ((0x7fffffe87fffffeL & l) == 0L) { break; } if (kind > 103) { @@ -4586,7 +4574,7 @@ public class ParserTokenManager implements ParserConstants { } break; case 267: - if ((0x7fffffe07fffffeL & l) == 0L) { + if ((0x7fffffe87fffffeL & l) == 0L) { break; } if (kind > 72) { @@ -4595,12 +4583,12 @@ public class ParserTokenManager implements ParserConstants { jjCheckNAddTwoStates(225, 226); break; case 268: - if ((0x7fffffe07fffffeL & l) != 0L) { + if ((0x7fffffe87fffffeL & l) != 0L) { jjCheckNAddStates(0, 3); } break; case 269: - if ((0x7fffffe07fffffeL & l) == 0L) { + if ((0x7fffffe87fffffeL & l) == 0L) { break; } if (kind > 72) { @@ -4809,14 +4797,6 @@ public class ParserTokenManager implements ParserConstants { } break; case 333: - if ((0x7fffffe07fffffeL & l) == 0L) { - break; - } - if (kind > 95) { - kind = 95; - } - jjCheckNAddTwoStates(334, 335); - break; case 334: if ((0x7fffffe87fffffeL & l) == 0L) { break; |