Move frog/leg to lib/compiler/implementation.

lib/compiler/implementation/frog_leg.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.
 
 #library('frog_leg');
 
-#import('../../lib/uri/uri.dart');
+#import('../../uri/uri.dart');
 #import('source_file.dart');
-#import('../lang.dart', prefix: 'frog');
-#import('api.dart', prefix: 'api');
+#import('../../../frog/lang.dart', prefix: 'frog');
+#import('../compiler.dart', prefix: 'compiler');
 #import('io/io.dart', prefix: 'io');
 
 String relativize(Uri base, Uri uri) {
   if (base.scheme == 'file' &&
       base.scheme == uri.scheme &&
       base.userInfo == uri.userInfo &&
       base.domain == uri.domain &&
       base.port == uri.port &&
       uri.query == "" && uri.fragment == "") {
     if (uri.path.startsWith(base.path)) {
@@ skipping 16 matching lines @@
     sb.add('${uriParts.last()}');
     return sb.toString();
   }
   return uri.toString();
 }
 
 bool compile(frog.World world) {
   final throwOnError = frog.options.throwOnErrors;
   final showWarnings = frog.options.showWarnings;
   final allowMockCompilation = frog.options.allowMockCompilation;
-  // final compiler = new WorldCompiler(world, throwOnError);
   Uri cwd = new Uri(scheme: 'file', path: io.getCurrentDirectory());
   Uri uri = cwd.resolve(frog.options.dartScript);
   String frogLibDir = frog.options.libDir;
   if (!frogLibDir.endsWith("/")) frogLibDir = "$frogLibDir/";
   Uri frogLib = new Uri(scheme: 'file', path: frogLibDir);
-  Uri libraryRoot = frogLib.resolve('../leg/lib/');
+  Uri libraryRoot = frogLib.resolve('../../lib/compiler/implementation/lib/');
   Map<String, SourceFile> sourceFiles = <SourceFile>{};
 
   Future<String> provider(Uri uri) {
     if (uri.scheme != 'file') {
       throw new IllegalArgumentException(uri);
     }
     String source = world.files.readAll(uri.path);
     world.dartBytesRead += source.length;
     sourceFiles[uri.toString()] =
       new SourceFile(relativize(cwd, uri), source);
@@ skipping 15 matching lines @@
       print(file.getLocationMessage(message, begin, end, true));
     }
     if (fatal && throwOnError) throw new AbortLeg(message);
   }
 
   List<String> options = new List<String>();
   if (allowMockCompilation) options.add('--allow-mock-compilation');
 
   // TODO(ahe): We expect the future to be complete and call value
   // directly. In effect, we don't support truly asynchronous API.
-  String code = api.compile(uri, libraryRoot, provider, handler, options).value;
+  String code =
+    compiler.compile(uri, libraryRoot, provider, handler, options).value;
   if (code === null) return false;
   world.legCode = code;
   world.jsBytesWritten = code.length;
   return true;
 }
 
 class AbortLeg {
   final message;
   AbortLeg(this.message);
   toString() => 'Aborted due to --throw-on-error: $message';
 }