diff options
author | Ethan Nicholas <ethannicholas@google.com> | 2017-03-30 13:45:54 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-30 18:28:47 +0000 |
commit | 7833466da45bfa1e078427c4a6db94d41c5c1535 (patch) | |
tree | d3bb49ba327f0bc3cb5cafe52d992702828031b2 /src/sksl/SkSLToken.h | |
parent | cdc651d29d88e87ef84d5a586879db2c16ff4579 (diff) |
skslc can now be compiled with no Skia dependencies, in preparation for
its eventual role in Skia's build process.
Bug: skia:
Change-Id: Iaa9933f4fc4a64bec60aa897c509a3513f457a78
Reviewed-on: https://skia-review.googlesource.com/10282
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Diffstat (limited to 'src/sksl/SkSLToken.h')
-rw-r--r-- | src/sksl/SkSLToken.h | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/src/sksl/SkSLToken.h b/src/sksl/SkSLToken.h index 6bacb9015f..8732e80c60 100644 --- a/src/sksl/SkSLToken.h +++ b/src/sksl/SkSLToken.h @@ -4,13 +4,13 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ - + #ifndef SKSL_TOKEN #define SKSL_TOKEN #include "SkSLPosition.h" #include "SkSLUtil.h" - + namespace SkSL { #undef IN @@ -131,54 +131,54 @@ struct Token { INVALID_TOKEN }; - static SkString OperatorName(Kind kind) { + static String OperatorName(Kind kind) { switch (kind) { - case Token::PLUS: return SkString("+"); - case Token::MINUS: return SkString("-"); - case Token::STAR: return SkString("*"); - case Token::SLASH: return SkString("/"); - case Token::PERCENT: return SkString("%"); - case Token::SHL: return SkString("<<"); - case Token::SHR: return SkString(">>"); - case Token::LOGICALNOT: return SkString("!"); - case Token::LOGICALAND: return SkString("&&"); - case Token::LOGICALOR: return SkString("||"); - case Token::LOGICALXOR: return SkString("^^"); - case Token::BITWISENOT: return SkString("~"); - case Token::BITWISEAND: return SkString("&"); - case Token::BITWISEOR: return SkString("|"); - case Token::BITWISEXOR: return SkString("^"); - case Token::EQ: return SkString("="); - case Token::EQEQ: return SkString("=="); - case Token::NEQ: return SkString("!="); - case Token::LT: return SkString("<"); - case Token::GT: return SkString(">"); - case Token::LTEQ: return SkString("<="); - case Token::GTEQ: return SkString(">="); - case Token::PLUSEQ: return SkString("+="); - case Token::MINUSEQ: return SkString("-="); - case Token::STAREQ: return SkString("*="); - case Token::SLASHEQ: return SkString("/="); - case Token::PERCENTEQ: return SkString("%="); - case Token::SHLEQ: return SkString("<<="); - case Token::SHREQ: return SkString(">>="); - case Token::LOGICALANDEQ: return SkString("&&="); - case Token::LOGICALOREQ: return SkString("||="); - case Token::LOGICALXOREQ: return SkString("^^="); - case Token::BITWISEANDEQ: return SkString("&="); - case Token::BITWISEOREQ: return SkString("|="); - case Token::BITWISEXOREQ: return SkString("^="); - case Token::PLUSPLUS: return SkString("++"); - case Token::MINUSMINUS: return SkString("--"); + case Token::PLUS: return String("+"); + case Token::MINUS: return String("-"); + case Token::STAR: return String("*"); + case Token::SLASH: return String("/"); + case Token::PERCENT: return String("%"); + case Token::SHL: return String("<<"); + case Token::SHR: return String(">>"); + case Token::LOGICALNOT: return String("!"); + case Token::LOGICALAND: return String("&&"); + case Token::LOGICALOR: return String("||"); + case Token::LOGICALXOR: return String("^^"); + case Token::BITWISENOT: return String("~"); + case Token::BITWISEAND: return String("&"); + case Token::BITWISEOR: return String("|"); + case Token::BITWISEXOR: return String("^"); + case Token::EQ: return String("="); + case Token::EQEQ: return String("=="); + case Token::NEQ: return String("!="); + case Token::LT: return String("<"); + case Token::GT: return String(">"); + case Token::LTEQ: return String("<="); + case Token::GTEQ: return String(">="); + case Token::PLUSEQ: return String("+="); + case Token::MINUSEQ: return String("-="); + case Token::STAREQ: return String("*="); + case Token::SLASHEQ: return String("/="); + case Token::PERCENTEQ: return String("%="); + case Token::SHLEQ: return String("<<="); + case Token::SHREQ: return String(">>="); + case Token::LOGICALANDEQ: return String("&&="); + case Token::LOGICALOREQ: return String("||="); + case Token::LOGICALXOREQ: return String("^^="); + case Token::BITWISEANDEQ: return String("&="); + case Token::BITWISEOREQ: return String("|="); + case Token::BITWISEXOREQ: return String("^="); + case Token::PLUSPLUS: return String("++"); + case Token::MINUSMINUS: return String("--"); default: - ABORT("unsupported operator: %d\n", kind); - } + ABORT("unsupported operator: %d\n", kind); + } } Token() { } - Token(Position position, Kind kind, SkString text) + Token(Position position, Kind kind, String text) : fPosition(position) , fKind(kind) , fText(std::move(text)) {} @@ -209,7 +209,7 @@ struct Token { Kind fKind; // will be the empty string unless the token has variable text content (identifiers, numeric // literals, and directives) - SkString fText; + String fText; }; } // namespace |