Revert "cleanup resolveMember and get/set"

frog/world.dart

 // Copyright (c) 2012, 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.
 
 /** The one true [World]. */
 World world;
 
 /**
  * Experimental phase to enable await, only set when using the
  * await/awaitc.dart entrypoint.
@@ skipping 44 matching lines @@
       return 'CompilerException: $_message';
     }
   }
 }
 
 /** Counters that track statistics about the generated code. */
 class CounterLog {
   int dynamicMethodCalls = 0;
   int typeAsserts = 0;
   int objectProtoMembers = 0;
-  int invokeCalls = 0;
-  int msetN = 0;
 
   info() {
     world.info('Dynamically typed method calls: $dynamicMethodCalls');
     world.info('Generated type assertions: $typeAsserts');
     world.info('Members on Object.prototype: $objectProtoMembers');
-    world.info('Invoke calls: $invokeCalls');
-    world.info('msetN calls: $msetN');
   }
 
   // We need to push a new counter when we are abstract interpreting, so we
   // can discard it if we discard the code.
   // TODO(jmesserly): this is ugly but I'm not sure how to make it cleaner,
   // other than splitting abstract interpretation and code generation (which
   // has its own problems).
   add(CounterLog other) {
     dynamicMethodCalls += other.dynamicMethodCalls;
     typeAsserts += other.typeAsserts;
     objectProtoMembers += other.objectProtoMembers;
-    invokeCalls += other.invokeCalls;
-    msetN += other.msetN;
   }
 }
 
-
 /** Represents a Dart "world" of code. */
 class World {
   WorldGenerator gen;
   String legCode; // TODO(kasperl): Remove this temporary kludge.
   String frogCode;
 
   FileSystem files;
   final LibraryReader reader;
 
   Map<String, Library> libraries;
@@ skipping 363 matching lines @@
   resolveAll() {
     for (var lib in libraries.getValues()) {
       lib.resolve();
     }
     for (var lib in libraries.getValues()) {
       lib.postResolveChecks();
     }
   }
 
   findMainMethod(Library lib) {
-    var main = lib.lookup('main', lib.span);
-    if (main == null) {
+    var mainMembers = lib.topType.resolveMember('main');
+    var main = null;
+    if (mainMembers == null || mainMembers.members.length == 0) {
       fatal('no main method specified');
+    } else if (mainMembers.members.length > 1) {
+      for (var m in mainMembers.members) {
+        main = m;
+        error('more than one main member (using last?)', main.span);
+      }
+    } else {
+      main = mainMembers.members[0];
     }
     return main;
   }
 
   generateCode(Library lib) {
     gen = new WorldGenerator(findMainMethod(lib), new CodeWriter());
     gen.run();
     frogCode = gen.writer.text;
     jsBytesWritten = frogCode.length;
     gen = null;
@@ skipping 113 matching lines @@
 
   withTiming(String name, f()) {
     final sw = new Stopwatch();
     sw.start();
     var result = f();
     sw.stop();
     info('$name in ${sw.elapsedInMs()}msec');
     return result;
   }
 }