lib/compiler/implementation/patch_parser.dart - Issue 10828411: Re-apply 'Unify dart:isolate.' with fixes for autogenerated dart2js and dartium html files.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: lib/compiler/implementation/patch_parser.dart

Issue 10828411: Re-apply 'Unify dart:isolate.' with fixes for autogenerated dart2js and dartium html files. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Rebased and fixed an error. Created 8 years, 4 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 | « lib/compiler/implementation/native_handler.dart ('k') | lib/config/import_any.config » ('j') | lib/dom/templates/html/dart2js/html_dart2js.darttemplate » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: lib/compiler/implementation/patch_parser.dart

diff --git a/lib/compiler/implementation/patch_parser.dart b/lib/compiler/implementation/patch_parser.dart

index e2a2744e5a724cc2e41d6e923c065fc511b30e54..3714faa0118c8430e5543e3cc59e5c8d457688c5 100644

--- a/lib/compiler/implementation/patch_parser.dart

+++ b/lib/compiler/implementation/patch_parser.dart

@@ -37,7 +37,18 @@ class PatchParserTask extends leg.CompilerTask {

// TODO(lrn): These imports end up in the original library and are in

// scope for the original methods too. This should be fixed.

for (tree.ScriptTag tag in imports.toLink()) {

- compiler.scanner.importLibraryFromTag(tag, compilationUnit);

+ if (tag.isSource()) {

+ library.tags = library.tags.prepend(tag);

+ StringNode argument = tag.argument;

+ Uri resolved = patchUri.resolve(argument.dartString.slowToString());

+ Script script = compiler.readScript(resolved, tag);

+ CompilationUnitElement unit =

+ new CompilationUnitElement(script, library);

+ compiler.withCurrentElement(unit, () => compiler.scanner.scan(unit));

+ } else {

+ compiler.scanner.importLibraryFromTag(tag, compilationUnit);

+ }

}