diff options
author | 2016-11-20 14:53:35 +0000 | |
---|---|---|
committer | 2016-11-20 14:53:48 +0000 | |
commit | 792d0f13d6cb58ddf27b45e6835ba54c1d8ade77 (patch) | |
tree | 929ba3d4638561e480bb070da4d01eec2cce21ab /src/sksl/SkSLToken.h | |
parent | 7a5b48a75b6f5819c196d158eefa70677783554f (diff) |
Revert "switched skslc from std::string to SkString"
This reverts commit d8df21a1e08b5b3380261f4b90acfbdc538ef93c.
Reason for revert: Breaking Roll
Original change's description:
> switched skslc from std::string to SkString
>
> BUG=skia:
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4977
>
> Change-Id: I15e24963b09b719a2c07da67745114f5ac66cee8
> Reviewed-on: https://skia-review.googlesource.com/4977
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
>
TBR=bsalomon@google.com,benjaminwagner@google.com,ethannicholas@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I84d5311beb9d5e607b7a4a3c138332f0c8f19648
Reviewed-on: https://skia-review.googlesource.com/5077
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src/sksl/SkSLToken.h')
-rw-r--r-- | src/sksl/SkSLToken.h | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/src/sksl/SkSLToken.h b/src/sksl/SkSLToken.h index 6fe130fe4a..76a1df7f66 100644 --- a/src/sksl/SkSLToken.h +++ b/src/sksl/SkSLToken.h @@ -103,45 +103,45 @@ struct Token { INVALID_TOKEN }; - static SkString OperatorName(Kind kind) { + static std::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 "+"; + case Token::MINUS: return "-"; + case Token::STAR: return "*"; + case Token::SLASH: return "/"; + case Token::PERCENT: return "%"; + case Token::SHL: return "<<"; + case Token::SHR: return ">>"; + case Token::LOGICALNOT: return "!"; + case Token::LOGICALAND: return "&&"; + case Token::LOGICALOR: return "||"; + case Token::LOGICALXOR: return "^^"; + case Token::BITWISENOT: return "~"; + case Token::BITWISEAND: return "&"; + case Token::BITWISEOR: return "|"; + case Token::BITWISEXOR: return "^"; + case Token::EQ: return "="; + case Token::EQEQ: return "=="; + case Token::NEQ: return "!="; + case Token::LT: return "<"; + case Token::GT: return ">"; + case Token::LTEQ: return "<="; + case Token::GTEQ: return ">="; + case Token::PLUSEQ: return "+="; + case Token::MINUSEQ: return "-="; + case Token::STAREQ: return "*="; + case Token::SLASHEQ: return "/="; + case Token::PERCENTEQ: return "%="; + case Token::SHLEQ: return "<<="; + case Token::SHREQ: return ">>="; + case Token::LOGICALANDEQ: return "&&="; + case Token::LOGICALOREQ: return "||="; + case Token::LOGICALXOREQ: return "^^="; + case Token::BITWISEANDEQ: return "&="; + case Token::BITWISEOREQ: return "|="; + case Token::BITWISEXOREQ: return "^="; + case Token::PLUSPLUS: return "++"; + case Token::MINUSMINUS: return "--"; default: ABORT("unsupported operator: %d\n", kind); } @@ -150,7 +150,7 @@ struct Token { Token() { } - Token(Position position, Kind kind, SkString text) + Token(Position position, Kind kind, std::string text) : fPosition(position) , fKind(kind) , fText(std::move(text)) {} @@ -159,7 +159,7 @@ struct Token { Kind fKind; // will be the empty string unless the token has variable text content (identifiers, numeric // literals, and directives) - SkString fText; + std::string fText; }; } // namespace |