| commit | ccb1dd8f267f9d7fe7c9d0ce222ebc81b41853b3 | [log] [tgz] |
|---|---|---|
| author | ethannicholas <ethannicholas@google.com> | Tue Oct 11 08:47:04 2016 -0700 |
| committer | Commit bot <commit-bot@chromium.org> | Tue Oct 11 08:47:06 2016 -0700 |
| tree | 8ba52d3b32da6ed9c3feefb30abd2c9ee66f4a3e | |
| parent | 568c98606fee6ad1b8a0714dd4dffbd4aa1d11d0 [diff] [blame] |
Turned on SkSL->GLSL compiler GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288033003 Committed: https://skia.googlesource.com/skia/+/9b0fe3d125f237d9884732a48414fa85fc71b4e3 Committed: https://skia.googlesource.com/skia/+/b12b3c6908c62c908b3680be01e3b5bfd30de310 Committed: https://skia.googlesource.com/skia/+/f008b0a59f45c0d4bea3e66faf3b01805009ec89 Committed: https://skia.googlesource.com/skia/+/08b2ccf398e2b81bc05d2c105837e5419899469b Committed: https://skia.googlesource.com/skia/+/dcfe6dba4a335e50e86ff68e3252065d4197432c Review-Url: https://codereview.chromium.org/2288033003
diff --git a/src/sksl/sksl.flex b/src/sksl/sksl.flex index 67b48e9..4455f50 100644 --- a/src/sksl/sksl.flex +++ b/src/sksl/sksl.flex
@@ -30,6 +30,8 @@ {DIGIT}+ { return SkSL::Token::INT_LITERAL; } +"0x"[0-9a-fA-F]+ { return SkSL::Token::INT_LITERAL; } + true { return SkSL::Token::TRUE_LITERAL; } false { return SkSL::Token::FALSE_LITERAL; } @@ -122,13 +124,15 @@ "&" { return SkSL::Token::BITWISEAND; } +"~" { return SkSL::Token::BITWISENOT; } + "||" { return SkSL::Token::LOGICALOR; } "^^" { return SkSL::Token::LOGICALXOR; } "&&" { return SkSL::Token::LOGICALAND; } -"!" { return SkSL::Token::NOT; } +"!" { return SkSL::Token::LOGICALNOT; } "?" { return SkSL::Token::QUESTION; }