Fix most warnings and other minor cleanups.

lib/compiler/implementation/ssa/tracer.dart

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #library('tracer');
 
 #import('dart:io');
 #import('ssa.dart');
 #import('../leg.dart');
 
@@ skipping 141 matching lines @@
   }
 }
 
 class HInstructionStringifier implements HVisitor<String> {
   HBasicBlock currentBlock;
 
   HInstructionStringifier(this.currentBlock);
 
   visit(HInstruction node) => node.accept(this);
 
-  visitBasicBlock(HBasicBlock node) {
-    // TODO(floitsch): Need a compiler object.
-    compiler.internalError('conditionExpression should not be called',
-                           instruction: node);
-  }
-
   String temporaryId(HInstruction instruction) {
     String prefix;
     HType type = instruction.propagatedType;
     if (!type.isPrimitive()) {
       prefix = 'U';
     } else {
-      switch (type) {
-        case HType.MUTABLE_ARRAY: prefix = 'm'; break;
-        case HType.READABLE_ARRAY: prefix = 'a'; break;
-        case HType.EXTENDABLE_ARRAY: prefix = 'e'; break;
-        case HType.BOOLEAN: prefix = 'b'; break;
-        case HType.INTEGER: prefix = 'i'; break;
-        case HType.DOUBLE: prefix = 'd'; break;
-        case HType.NUMBER: prefix = 'n'; break;
-        case HType.STRING: prefix = 's'; break;
-        case HType.UNKNOWN: prefix = 'v'; break;
-        case HType.CONFLICTING: prefix = 'c'; break;
-        case HType.INDEXABLE_PRIMITIVE: prefix = 'r'; break;
-        case HType.NULL: prefix = 'u'; break;
-        default: prefix = 'x';
+      if (type == HType.MUTABLE_ARRAY) {

[karlklose, 2012/06/15 12:43:46]

How about a map?

[floitsch, 2012/06/15 13:05:17]

literal maps must contain strings as keys.

+        prefix = 'm';
+      } else if (type == HType.READABLE_ARRAY) {
+        prefix = 'a';
+      } else if (type == HType.EXTENDABLE_ARRAY) {
+        prefix = 'e';
+      } else if (type == HType.BOOLEAN) {
+        prefix = 'b';
+      } else if (type == HType.INTEGER) {
+        prefix = 'i';
+      } else if (type == HType.DOUBLE) {
+        prefix = 'd';
+      } else if (type == HType.NUMBER) {
+        prefix = 'n';
+      } else if (type == HType.STRING) {
+        prefix = 's';
+      } else if (type == HType.UNKNOWN) {
+        prefix = 'v';
+      } else if (type == HType.CONFLICTING) {
+        prefix = 'c';
+      } else if (type == HType.INDEXABLE_PRIMITIVE) {
+        prefix = 'r';
+      } else if (type == HType.NULL) {
+        prefix = 'u';
+      } else {
+        prefix = 'x';
       }
     }
     return "$prefix${instruction.id}";
   }
 
   String visitBoolify(HBoolify node) {
     return "Boolify: ${temporaryId(node.inputs[0])}";
   }
 
   String visitAdd(HAdd node) => visitInvokeStatic(node);
@@ skipping 227 matching lines @@
     if (node.finallyBlock != null) {
       finallyBlock = 'B${node.finallyBlock.id}';
     }
 
     return "Try: $tryBlock, Catch: $catchBlock, Finally: $finallyBlock, "
         "Join: B${successors.last().id}";
   }
 
   String visitTypeGuard(HTypeGuard node) {
     String type;
-    switch (node.guardedType) {
-      case HType.MUTABLE_ARRAY: type = "mutable_array"; break;
-      case HType.READABLE_ARRAY: type = "readable_array"; break;
-      case HType.EXTENDABLE_ARRAY: type = "extendable_array"; break;
-      case HType.BOOLEAN: type = "bool"; break;
-      case HType.INTEGER: type = "integer"; break;
-      case HType.DOUBLE: type = "double"; break;
-      case HType.NUMBER: type = "number"; break;
-      case HType.STRING: type = "string"; break;
-      case HType.INDEXABLE_PRIMITIVE: type = "string_or_array"; break;
-      case HType.UNKNOWN: type = 'unknown'; break;
-      default:
-        // TODO(floitsch): Need a compiler object.
-        compiler.internalError('Unexpected type guard.',
-                               instruction: node.guardedType);
-        break;
+    HType guardedType = node.guardedType;

[karlklose, 2012/06/15 12:43:46]

Ditto.

+    if (guardedType == HType.MUTABLE_ARRAY) {
+      type = "mutable_array";
+    } else if (guardedType == HType.READABLE_ARRAY) {
+      type = "readable_array";
+    } else if (guardedType == HType.EXTENDABLE_ARRAY) {
+      type = "extendable_array";
+    } else if (guardedType == HType.BOOLEAN) {
+      type = "bool";
+    } else if (guardedType == HType.INTEGER) {
+      type = "integer";
+    } else if (guardedType == HType.DOUBLE) {
+      type = "double";
+    } else if (guardedType == HType.NUMBER) {
+      type = "number";
+    } else if (guardedType == HType.STRING) {
+      type = "string";
+    } else if (guardedType == HType.INDEXABLE_PRIMITIVE) {
+      type = "string_or_array";
+    } else if (guardedType == HType.UNKNOWN) {
+      type = 'unknown';
+    } else {
+      throw new CompilerCancelledException('Unexpected type guard: $type');
     }
     StringBuffer envBuffer = new StringBuffer();
     List<HInstruction> inputs = node.inputs;
     // The last input is the guarded expression.
     for (int i = 0; i < inputs.length - 1; i++) {
       envBuffer.add(" ${temporaryId(inputs[i])}");
     }
     String on = node.isOn ? "on" : "off";
     String id = temporaryId(node.guarded);
     return "TypeGuard($on): $id is $type env: $envBuffer";
   }
 
   String visitIs(HIs node) {
     String type = node.typeExpression.toString();
     return "TypeTest: ${temporaryId(node.expression)} is $type";
   }
 
   String visitTypeConversion(HTypeConversion node) {
     String type = node.propagatedType.toString();
     return "TypeConversion: ${temporaryId(node.inputs[0])} to $type";
   }
 }