Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1090)

Unified Diff: src/sksl/sksl.flex

Issue 2387643003: Revert of Turned on SkSL->GLSL compiler (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/sksl/lex.sksl.c ('k') | src/sksl/sksl.include » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/sksl/sksl.flex
diff --git a/src/sksl/sksl.flex b/src/sksl/sksl.flex
index 30dc376de860b321c92606b867e4c858c33bce01..67b48e9cb92f7fa2e9d1d0624bc1021cee69a0e4 100644
--- a/src/sksl/sksl.flex
+++ b/src/sksl/sksl.flex
@@ -29,8 +29,6 @@
{DIGIT}+([eE][+-]?{DIGIT}+) { return SkSL::Token::FLOAT_LITERAL; }
{DIGIT}+ { return SkSL::Token::INT_LITERAL; }
-
-"0x"[0-9a-zA-Z]+ { return SkSL::Token::INT_LITERAL; }
true { return SkSL::Token::TRUE_LITERAL; }
@@ -124,15 +122,13 @@
"&" { return SkSL::Token::BITWISEAND; }
-"~" { return SkSL::Token::BITWISENOT; }
-
"||" { return SkSL::Token::LOGICALOR; }
"^^" { return SkSL::Token::LOGICALXOR; }
"&&" { return SkSL::Token::LOGICALAND; }
-"!" { return SkSL::Token::LOGICALNOT; }
+"!" { return SkSL::Token::NOT; }
"?" { return SkSL::Token::QUESTION; }
« no previous file with comments | « src/sksl/lex.sksl.c ('k') | src/sksl/sksl.include » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698