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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: src/sksl/sksl.flex

Issue 2288033003: Turned on SkSL->GLSL compiler (Closed)
Patch Set: fixed broken test 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
« src/sksl/ir/SkSLProgram.h ('K') | « 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 67b48e9cb92f7fa2e9d1d0624bc1021cee69a0e4..30dc376de860b321c92606b867e4c858c33bce01 100644
--- a/src/sksl/sksl.flex
+++ b/src/sksl/sksl.flex
@@ -30,6 +30,8 @@ LETTER [a-zA-Z_$]
{DIGIT}+ { return SkSL::Token::INT_LITERAL; }
+"0x"[0-9a-zA-Z]+ { return SkSL::Token::INT_LITERAL; }
dogben 2016/09/30 15:00:52 Why a-z rather than a-f?
ethannicholas 2016/10/06 13:16:47 That is an excellent question.
+
true { return SkSL::Token::TRUE_LITERAL; }
false { return SkSL::Token::FALSE_LITERAL; }
@@ -122,13 +124,15 @@ precision { return SkSL::Token::PRECISION; }
"&" { 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; }
« src/sksl/ir/SkSLProgram.h ('K') | « 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