diff options
author | Ethan Nicholas <ethannicholas@google.com> | 2017-02-23 16:18:54 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-23 16:20:10 +0000 |
commit | 7d975fc200bbbea991ec4c04c08f3a5ea7b847af (patch) | |
tree | 813ff12f25afc903a65880be187ef88162fad866 /src/sksl/ast | |
parent | d196cbe9c270799a6edb6e110ab647c5a4a850a2 (diff) |
Revert "skslc switch support"
This reverts commit 2b1e468dabd2ac7bea7ec17740275f4f4aad30c3.
Reason for revert: bot breakage
Original change's description:
> skslc switch support
>
> BUG=skia:
>
> Change-Id: Ida7f9e80139aa1e4f43804cafbcac640e47fab25
> Reviewed-on: https://skia-review.googlesource.com/8771
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
> Reviewed-by: Ben Wagner <benjaminwagner@google.com>
>
TBR=benjaminwagner@google.com,ethannicholas@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Change-Id: Iaaa35d10a15704279c6883d4d68f6d4ad5078320
Reviewed-on: https://skia-review.googlesource.com/8792
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/sksl/ast')
-rw-r--r-- | src/sksl/ast/SkSLASTStatement.h | 1 | ||||
-rw-r--r-- | src/sksl/ast/SkSLASTSwitchCase.h | 48 | ||||
-rw-r--r-- | src/sksl/ast/SkSLASTSwitchStatement.h | 43 |
3 files changed, 0 insertions, 92 deletions
diff --git a/src/sksl/ast/SkSLASTStatement.h b/src/sksl/ast/SkSLASTStatement.h index 6ce320e343..9ddde063ea 100644 --- a/src/sksl/ast/SkSLASTStatement.h +++ b/src/sksl/ast/SkSLASTStatement.h @@ -26,7 +26,6 @@ struct ASTStatement : public ASTPositionNode { kFor_Kind, kWhile_Kind, kDo_Kind, - kSwitch_Kind, kReturn_Kind, kBreak_Kind, kContinue_Kind, diff --git a/src/sksl/ast/SkSLASTSwitchCase.h b/src/sksl/ast/SkSLASTSwitchCase.h deleted file mode 100644 index 2c0a01c7fa..0000000000 --- a/src/sksl/ast/SkSLASTSwitchCase.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2017 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#ifndef SKSL_ASTSWITCHCASE -#define SKSL_ASTSWITCHCASE - -#include "SkSLASTStatement.h" - -namespace SkSL { - -/** - * A single case of a 'switch' statement. - */ -struct ASTSwitchCase : public ASTStatement { - // a null value means "default:" - ASTSwitchCase(Position position, std::unique_ptr<ASTExpression> value, - std::vector<std::unique_ptr<ASTStatement>> statements) - : INHERITED(position, kSwitch_Kind) - , fValue(std::move(value)) - , fStatements(std::move(statements)) {} - - SkString description() const override { - SkString result; - if (fValue) { - result.appendf("case %s:\n", fValue->description().c_str()); - } else { - result += "default:\n"; - } - for (const auto& s : fStatements) { - result += s->description() + "\n"; - } - return result; - } - - // null value implies "default" case - const std::unique_ptr<ASTExpression> fValue; - const std::vector<std::unique_ptr<ASTStatement>> fStatements; - - typedef ASTStatement INHERITED; -}; - -} // namespace - -#endif diff --git a/src/sksl/ast/SkSLASTSwitchStatement.h b/src/sksl/ast/SkSLASTSwitchStatement.h deleted file mode 100644 index 3031a7d2b1..0000000000 --- a/src/sksl/ast/SkSLASTSwitchStatement.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2017 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#ifndef SKSL_ASTSWITCHSTATEMENT -#define SKSL_ASTSWITCHSTATEMENT - -#include "SkSLASTStatement.h" -#include "SkSLASTSwitchCase.h" - -namespace SkSL { - -/** - * A 'switch' statement. - */ -struct ASTSwitchStatement : public ASTStatement { - ASTSwitchStatement(Position position, std::unique_ptr<ASTExpression> value, - std::vector<std::unique_ptr<ASTSwitchCase>> cases) - : INHERITED(position, kSwitch_Kind) - , fValue(std::move(value)) - , fCases(std::move(cases)) {} - - SkString description() const override { - SkString result = SkStringPrintf("switch (%s) {\n", + fValue->description().c_str()); - for (const auto& c : fCases) { - result += c->description(); - } - result += "}"; - return result; - } - - const std::unique_ptr<ASTExpression> fValue; - const std::vector<std::unique_ptr<ASTSwitchCase>> fCases; - - typedef ASTStatement INHERITED; -}; - -} // namespace - -#endif |