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

Unified Diff: lib/compiler/implementation/ssa/builder.dart

Issue 10557003: Fix most warnings and other minor cleanups. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 6 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: lib/compiler/implementation/ssa/builder.dart
diff --git a/lib/compiler/implementation/ssa/builder.dart b/lib/compiler/implementation/ssa/builder.dart
index e568b70e10289ba4766c326f0f075de45e8e4507..868f66ac5b4301abb79a5177611dace7cacd6742 100644
--- a/lib/compiler/implementation/ssa/builder.dart
+++ b/lib/compiler/implementation/ssa/builder.dart
@@ -159,16 +159,14 @@ class SsaBuilderTask extends CompilerTask {
HInstruction.idCounter = 0;
SsaBuilder builder = new SsaBuilder(this, work);
HGraph graph;
- switch (element.kind) {
- case ElementKind.GENERATIVE_CONSTRUCTOR:
- graph = compileConstructor(builder, work);
- break;
- case ElementKind.GENERATIVE_CONSTRUCTOR_BODY:
- case ElementKind.FUNCTION:
- case ElementKind.GETTER:
- case ElementKind.SETTER:
- graph = builder.buildMethod(work.element);
- break;
+ ElementKind kind = element.kind;
+ if (kind === ElementKind.GENERATIVE_CONSTRUCTOR) {
+ graph = compileConstructor(builder, work);
+ } else if (kind === ElementKind.GENERATIVE_CONSTRUCTOR_BODY ||
karlklose 2012/06/15 12:43:46 break before ||?
+ kind === ElementKind.FUNCTION ||
+ kind === ElementKind.GETTER ||
+ kind === ElementKind.SETTER) {
+ graph = builder.buildMethod(work.element);
}
assert(graph.isValid());
bool inLoop = functionsCalledInLoop.contains(element);
@@ -913,8 +911,8 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
}
int index = 0;
- FunctionSignature parameters = constructor.computeSignature(compiler);
- parameters.forEachParameter((Element parameter) {
+ FunctionSignature params = constructor.computeSignature(compiler);
karlklose 2012/06/15 12:43:46 I would prefer the name parameters.
floitsch 2012/06/15 13:05:17 Renamed to "signature".
+ params.forEachParameter((Element parameter) {
HInstruction argument = compiledArguments[index++];
localsHandler.updateLocal(parameter, argument);
// Don't forget to update the field, if the parameter is of the
@@ -1012,8 +1010,8 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
openFunction(functionElement, function);
Map<Element, HInstruction> fieldValues = new Map<Element, HInstruction>();
- FunctionSignature parameters = functionElement.computeSignature(compiler);
- parameters.forEachParameter((Element element) {
+ FunctionSignature params = functionElement.computeSignature(compiler);
+ params.forEachParameter((Element element) {
if (element.kind == ElementKind.FIELD_PARAMETER) {
// If the [element] is a field-parameter (such as [:this.x:] then
// initialize the field element with its value.
@@ -2247,8 +2245,8 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
node: closure);
}
FunctionElement function = element;
- FunctionSignature parameters = function.computeSignature(compiler);
- if (parameters.optionalParameterCount !== 0) {
+ FunctionSignature params = function.computeSignature(compiler);
+ if (params.optionalParameterCount !== 0) {
compiler.cancel(
'JS_TO_CLOSURE does not handle closure with optional parameters',
node: closure);
@@ -2256,8 +2254,7 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
visit(closure);
List<HInstruction> inputs = <HInstruction>[pop()];
String invocationName = compiler.namer.closureInvocationName(
- new Selector(SelectorKind.INVOCATION,
- parameters.requiredParameterCount));
+ new Selector(SelectorKind.INVOCATION, params.requiredParameterCount));
push(new HForeign(new DartString.literal('#.$invocationName'),
const LiteralDartString('var'),
inputs));
@@ -3424,14 +3421,14 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
*/
class StringBuilderVisitor extends AbstractVisitor {
final SsaBuilder builder;
- final Node node;
+ final Node diagnosticNode;
/**
* The string value generated so far.
*/
HInstruction result = null;
- StringBuilderVisitor(this.builder, this.node);
+ StringBuilderVisitor(this.builder, this.diagnosticNode);
void visit(Node node) {
node.accept(this);
@@ -3465,7 +3462,7 @@ class StringBuilderVisitor extends AbstractVisitor {
}
HInstruction concat(HInstruction left, HInstruction right) {
- HInstruction instruction = new HStringConcat(left, right, node);
+ HInstruction instruction = new HStringConcat(left, right, diagnosticNode);
builder.add(instruction);
return instruction;
}

Powered by Google App Engine
This is Rietveld 408576698