lib/compiler/implementation/scanner/listener.dart - Issue 10689063: Revert "Revert "First step towards having patch files for generic libraries.""

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/scanner/listener.dart

Issue 10689063: Revert "Revert "First step towards having patch files for generic libraries."" (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Created 8 years, 6 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

« lib/compiler/implementation/elements/elements.dart ('K') | « lib/compiler/implementation/library_map.dart ('k') | lib/compiler/implementation/scanner/scanner_task.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: lib/compiler/implementation/scanner/listener.dart

diff --git a/lib/compiler/implementation/scanner/listener.dart b/lib/compiler/implementation/scanner/listener.dart

index 6c9c41a652bbad603197f2a299f03e75e81de961..3437160e7305ae22686b41e0ad6bece8eb1ef394 100644

--- a/lib/compiler/implementation/scanner/listener.dart

+++ b/lib/compiler/implementation/scanner/listener.dart

@@ -1486,6 +1486,10 @@ class PartialFunctionElement extends FunctionElement {

FunctionExpression parseNode(DiagnosticListener listener) {

if (cachedNode != null) return cachedNode;

+ if (patch !== null) {

+ cachedNode = patch.parseNode(listener);

+ return cachedNode;

+ }

parseFunction(Parser p) {

if (isMember() && p.optional('factory', beginToken)) {

p.parseFactoryMethod(beginToken);

@@ -1497,7 +1501,10 @@ class PartialFunctionElement extends FunctionElement {

return cachedNode;

}

- Token position() => findMyName(beginToken);

+ Token position() {

+ if (patch !== null) return patch.position();

+ return findMyName(beginToken);

+ }

}

class PartialFieldListElement extends VariableListElement {