Lots of frog cleanup

frog/var_member.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.
 
 /** A dynamic member stub. */
 class VarMember {
   final String name;
   bool isGenerated = false;
 
   VarMember(this.name);
 
   abstract void generate(CodeWriter code);
 
+  String get body() => null;
+
   Type get returnType() => world.varType;
 
-  Value invoke(MethodGenerator context, Node node, Value target, Arguments args) {
+  Value invoke(CallingContext context, Node node, Value target, Arguments args) {
     return new Value(returnType,
       '${target.code}.$name(${args.getCode()})', node.span);
   }
 }
 
 /**
  * This function generates a dynamic call stub for functions. It's part of a
  * series of steps described below. Most of the code is generated by
  * gen.dart, with some helpers in core.js
  *
@@ skipping 39 matching lines @@
 class VarFunctionStub extends VarMember {
   final Arguments args;
 
   VarFunctionStub(String name, Arguments callArgs)
     : super(name), args = callArgs.toCallStubArgs() {
     // Ensure dependency is generated
     world.functionImplType.markUsed();
     world.gen.genMethod(world.functionImplType.getMember('_genStub'));
   }
 
-  Value invoke(MethodGenerator context, Node node, Value target,
+  Value invoke(CallingContext context, Node node, Value target,
       Arguments args) {
     return super.invoke(context, node, target, args);
   }
 
   void generate(CodeWriter code) {
     isGenerated = true;
     if (args.hasNames) {
       generateNamed(code);
     } else {
       generatePositional(code);
@@ skipping 124 matching lines @@
   final Type returnType;
   final Arguments args;
 
   bool invoked = false;
 
   VarMethodSet(this.baseName, String name, this.members, Arguments callArgs,
                this.returnType)
     : super(name), args = callArgs.toCallStubArgs() {
   }
 
-  Value invoke(MethodGenerator context, Node node, Value target,
+  Value invoke(CallingContext context, Node node, Value target,
       Arguments args) {
     _invokeMembers(context, node);
     return super.invoke(context, node, target, args);
   }
 
   /** Invokes members to ensure they're generated. */
-  _invokeMembers(MethodGenerator context, Node node) {
+  _invokeMembers(CallingContext context, Node node) {
     if (invoked) return;
     invoked = true;
 
     bool hasObjectType = false;
     for (var member in members) {
       // Invoke the member with the stub args (this gives us the method body),
       // then create the stub method.
       final type = member.declaringType;
       final target = new Value(type, 'this', node.span);
-      var result = member.invoke(context, node, target, args, isDynamic:true);
+      var result = member.invoke(context, node, target, args);
       var stub = new VarMethodStub(name, member, args, 'return ' + result.code);
       type.varStubs[stub.name] = stub;
       if (type.isObject) hasObjectType = true;
     }
 
     // Create a noSuchMethod fallback on Object if needed.
     // Some methods, like toString and == already have a fallback on Object.
     if (!hasObjectType) {
       final target = new Value(world.objectType, 'this', node.span);
       var result = target.invokeNoSuchMethod(context, baseName, node, args);
       var stub = new VarMethodStub(name, null, args, 'return ' + result.code);
       world.objectType.varStubs[stub.name] = stub;
     }
   }
 
   // TODO(jmesserly): get rid of this as it's unused now
   void generate(CodeWriter code) {}
 }
 
 String _getCallStubName(String name, Arguments args) {
   // TODO: This code needs global knowledge to ensure the stub name does not
   // collide with any other name.  E.g. it is unlikely but possible for the user
   // to have methods called 'foo' and 'foo$0'.
   final nameBuilder = new StringBuffer('${name}\$${args.bareCount}');
   for (int i = args.bareCount; i < args.length; i++) {
-    var name = args.getName(i);
+    var argName = args.getName(i);
     nameBuilder.add('\$');
-    if (name.contains('\$')) {
+    if (argName.contains('\$')) {
       // Disambiguate "a:b:" from "a$b:".  Using the length works well because
       // the names can't start with digits.
-      nameBuilder.add('${name.length}');
+      nameBuilder.add('${argName.length}');
     }
-    nameBuilder.add(name);
+    nameBuilder.add(argName);
   }
   return nameBuilder.toString();
 }