Fixes 2 tests and a crash

frog/tree.g.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.
 // Generated by scripts/tree_gen.py.
 
 class DirectiveDefinition extends Definition {
   Identifier name;
   List<ArgumentNode> arguments;
 
   DirectiveDefinition(this.name, this.arguments, SourceSpan span): super(span) {}
@@ skipping 257 matching lines @@
   Identifier name;
   List<ArgumentNode> arguments;
 
   NewExpression(this.isConst, this.type, this.name, this.arguments, SourceSpan span): super(span) {}
 
   visit(TreeVisitor visitor) => visitor.visitNewExpression(this);
 }
 
 class ListExpression extends Expression {
   bool isConst;
-  TypeReference type;
+  TypeReference itemType;
   List<Expression> values;
 
-  ListExpression(this.isConst, this.type, this.values, SourceSpan span): super(span) {}
+  ListExpression(this.isConst, this.itemType, this.values, SourceSpan span): super(span) {}
 
   visit(TreeVisitor visitor) => visitor.visitListExpression(this);
 }
 
 class MapExpression extends Expression {
   bool isConst;
-  TypeReference type;
+  TypeReference keyType;
+  TypeReference valueType;
   List<Expression> items;
 
-  MapExpression(this.isConst, this.type, this.items, SourceSpan span): super(span) {}
+  MapExpression(this.isConst, this.keyType, this.valueType, this.items, SourceSpan span): super(span) {}
 
   visit(TreeVisitor visitor) => visitor.visitMapExpression(this);
 }
 
 class ConditionalExpression extends Expression {
   Expression test;
   Expression trueBranch;
   Expression falseBranch;
 
   ConditionalExpression(this.test, this.trueBranch, this.falseBranch, SourceSpan span): super(span) {}
@@ skipping 470 matching lines @@
     output.heading('NewExpression', node.span);
     output.writeValue('isConst', node.isConst);
     output.writeNode('type', node.type);
     output.writeNode('name', node.name);
     output.writeNodeList('arguments', node.arguments);
   }
 
   void visitListExpression(ListExpression node) {
     output.heading('ListExpression', node.span);
     output.writeValue('isConst', node.isConst);
-    output.writeNode('type', node.type);
+    output.writeNode('itemType', node.itemType);
     output.writeNodeList('values', node.values);
   }
 
   void visitMapExpression(MapExpression node) {
     output.heading('MapExpression', node.span);
     output.writeValue('isConst', node.isConst);
-    output.writeNode('type', node.type);
+    output.writeNode('keyType', node.keyType);
+    output.writeNode('valueType', node.valueType);
     output.writeNodeList('items', node.items);
   }
 
   void visitConditionalExpression(ConditionalExpression node) {
     output.heading('ConditionalExpression', node.span);
     output.writeNode('test', node.test);
     output.writeNode('trueBranch', node.trueBranch);
     output.writeNode('falseBranch', node.falseBranch);
   }
 
@@ skipping 111 matching lines @@
     output.heading('DeclaredIdentifier', node.span);
     output.writeNode('type', node.type);
     output.writeNode('name', node.name);
   }
 
   void visitTypeReference(TypeReference node) {
     output.heading('TypeReference(' + output.toValue(node.type) + ")", node.span);
   }
 
 }