Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(676)

Unified Diff: frog/frog_leg.dart

Issue 10081004: Remove frog dependencies from lib/compiler. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Add TODO. Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « frog/frog.dart ('k') | frog/frogc.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: frog/frog_leg.dart
diff --git a/lib/compiler/implementation/frog_leg.dart b/frog/frog_leg.dart
similarity index 90%
rename from lib/compiler/implementation/frog_leg.dart
rename to frog/frog_leg.dart
index 0bebf49e22bbae0577b0a05c94861137e6daecb6..c9c8994131f9aa8c43c5605e28a25be78e7f758e 100644
--- a/lib/compiler/implementation/frog_leg.dart
+++ b/frog/frog_leg.dart
@@ -5,11 +5,10 @@
#library('frog_leg');
#import('dart:io');
+#import('dart:uri');
-#import('../../uri/uri.dart');
-#import('source_file.dart');
-#import('../../../frog/lang.dart', prefix: 'frog');
-#import('../compiler.dart', prefix: 'compiler');
+#import('lang.dart', prefix: 'frog');
+#import('../lib/compiler/compiler.dart', prefix: 'compiler');
String relativize(Uri base, Uri uri) {
if (base.scheme == 'file' &&
@@ -51,7 +50,7 @@ bool compile(frog.World world) {
if (!frogLibDir.endsWith("/")) frogLibDir = "$frogLibDir/";
Uri frogLib = new Uri(scheme: 'file', path: frogLibDir);
Uri libraryRoot = frogLib.resolve('../../');
- Map<String, SourceFile> sourceFiles = <SourceFile>{};
+ Map<String, frog.SourceFile> sourceFiles = <frog.SourceFile>{};
Future<String> provider(Uri uri) {
if (uri.scheme != 'file') {
@@ -60,7 +59,7 @@ bool compile(frog.World world) {
String source = world.files.readAll(uri.path);
world.dartBytesRead += source.length;
sourceFiles[uri.toString()] =
- new SourceFile(relativize(cwd, uri), source);
+ new frog.SourceFile(relativize(cwd, uri), source);
Completer<String> completer = new Completer<String>();
completer.complete(source);
return completer.future;
@@ -75,7 +74,7 @@ bool compile(frog.World world) {
assert(fatal);
print(message);
} else if (fatal || showWarnings) {
- SourceFile file = sourceFiles[uri.toString()];
+ frog.SourceFile file = sourceFiles[uri.toString()];
print(file.getLocationMessage(message, begin, end, true));
}
if (fatal && throwOnError) throw new AbortLeg(message);
« no previous file with comments | « frog/frog.dart ('k') | frog/frogc.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698