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

Unified Diff: pkg/compiler/lib/src/tree_ir/optimization/statement_rewriter.dart

Issue 1068243002: Overhaul tree IR visitor and rename IR classes. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 5 years, 8 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
Index: pkg/compiler/lib/src/tree_ir/optimization/statement_rewriter.dart
diff --git a/pkg/compiler/lib/src/tree_ir/optimization/statement_rewriter.dart b/pkg/compiler/lib/src/tree_ir/optimization/statement_rewriter.dart
index 6f88204ab4d6460b9e79dacd4eb370a539a6d375..88ab5d8f9a6ba3d91dc5d19a2cafee8425ab7c84 100644
--- a/pkg/compiler/lib/src/tree_ir/optimization/statement_rewriter.dart
+++ b/pkg/compiler/lib/src/tree_ir/optimization/statement_rewriter.dart
@@ -91,12 +91,17 @@ part of tree_ir.optimization;
* This may trigger a flattening of nested ifs in case the eliminated label
* separated two ifs.
*/
-class StatementRewriter extends Visitor<Statement, Expression> with PassMixin {
+class StatementRewriter extends Transformer implements Pass {
String get passName => 'Statement rewriter';
+ @override
+ void rewrite(RootNode node) {
+ node.replaceEachBody(visitStatement);
+ }
+
// The binding environment. The rightmost element of the list is the nearest
// available enclosing binding.
- List<Assign> environment;
+ List<Assign> environment = <Assign>[];
/// Binding environment for variables that are assigned to effectively
/// constant expressions (see [isEffectivelyConstant]).
@@ -128,18 +133,6 @@ class StatementRewriter extends Visitor<Statement, Expression> with PassMixin {
return newJump != null ? newJump : jump;
}
- rewriteExecutableDefinition(ExecutableDefinition definition) {
- inEmptyEnvironment(() {
- definition.body = visitStatement(definition.body);
- });
- }
-
- void rewriteConstructorDefinition(ConstructorDefinition definition) {
- if (definition.isAbstract) return;
- definition.initializers.forEach(visitExpression);
- rewriteExecutableDefinition(definition);
- }
-
void inEmptyEnvironment(void action()) {
List<Assign> oldEnvironment = environment;
environment = <Assign>[];
@@ -148,23 +141,6 @@ class StatementRewriter extends Visitor<Statement, Expression> with PassMixin {
environment = oldEnvironment;
}
- Expression visitFieldInitializer(FieldInitializer node) {
- inEmptyEnvironment(() {
- node.body = visitStatement(node.body);
- });
- return node;
- }
-
- Expression visitSuperInitializer(SuperInitializer node) {
- inEmptyEnvironment(() {
- for (int i = node.arguments.length - 1; i >= 0; --i) {
- node.arguments[i] = visitStatement(node.arguments[i]);
- assert(environment.isEmpty);
- }
- });
- return node;
- }
-
Expression visitExpression(Expression e) => e.processed ? e : e.accept(this);
@override

Powered by Google App Engine
This is Rietveld 408576698