From 7d975fc200bbbea991ec4c04c08f3a5ea7b847af Mon Sep 17 00:00:00 2001 From: Ethan Nicholas Date: Thu, 23 Feb 2017 16:18:54 +0000 Subject: 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 > Reviewed-by: Ben Wagner > 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 Commit-Queue: Ethan Nicholas --- src/sksl/ir/SkSLStatement.h | 1 - src/sksl/ir/SkSLSwitchCase.h | 47 --------------------------------------- src/sksl/ir/SkSLSwitchStatement.h | 43 ----------------------------------- 3 files changed, 91 deletions(-) delete mode 100644 src/sksl/ir/SkSLSwitchCase.h delete mode 100644 src/sksl/ir/SkSLSwitchStatement.h (limited to 'src/sksl/ir') diff --git a/src/sksl/ir/SkSLStatement.h b/src/sksl/ir/SkSLStatement.h index c3a6f9539e..012311fdd3 100644 --- a/src/sksl/ir/SkSLStatement.h +++ b/src/sksl/ir/SkSLStatement.h @@ -27,7 +27,6 @@ struct Statement : public IRNode { kFor_Kind, kIf_Kind, kReturn_Kind, - kSwitch_Kind, kVarDeclarations_Kind, kWhile_Kind }; diff --git a/src/sksl/ir/SkSLSwitchCase.h b/src/sksl/ir/SkSLSwitchCase.h deleted file mode 100644 index 3f1c3acbd3..0000000000 --- a/src/sksl/ir/SkSLSwitchCase.h +++ /dev/null @@ -1,47 +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_SWITCHCASE -#define SKSL_SWITCHCASE - -#include "SkSLStatement.h" - -namespace SkSL { - -/** - * A single case of a 'switch' statement. - */ -struct SwitchCase : public Statement { - SwitchCase(Position position, std::unique_ptr value, - std::vector> 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 - std::unique_ptr fValue; - std::vector> fStatements; - - typedef Statement INHERITED; -}; - -} // namespace - -#endif diff --git a/src/sksl/ir/SkSLSwitchStatement.h b/src/sksl/ir/SkSLSwitchStatement.h deleted file mode 100644 index 31765c4e04..0000000000 --- a/src/sksl/ir/SkSLSwitchStatement.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_SWITCHSTATEMENT -#define SKSL_SWITCHSTATEMENT - -#include "SkSLStatement.h" -#include "SkSLSwitchCase.h" - -namespace SkSL { - -/** - * A 'switch' statement. - */ -struct SwitchStatement : public Statement { - SwitchStatement(Position position, std::unique_ptr value, - std::vector> 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; - } - - std::unique_ptr fValue; - std::vector> fCases; - - typedef Statement INHERITED; -}; - -} // namespace - -#endif -- cgit v1.2.3