compiler/java/com/google/dart/compiler/parser/DartParser.java - Issue 10832321: Issue 4048. Support for revised library/import syntax

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: compiler/java/com/google/dart/compiler/parser/DartParser.java

Issue 10832321: Issue 4048. Support for revised library/import syntax (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: 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

« compiler/java/com/google/dart/compiler/ast/LibraryNode.java ('K') | « compiler/java/com/google/dart/compiler/ast/LibraryUnit.java ('k') | compiler/java/com/google/dart/compiler/resolver/DynamicElementImplementation.java » ('j') | compiler/java/com/google/dart/compiler/resolver/LibraryElement.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: compiler/java/com/google/dart/compiler/parser/DartParser.java

diff --git a/compiler/java/com/google/dart/compiler/parser/DartParser.java b/compiler/java/com/google/dart/compiler/parser/DartParser.java

index 017970f664520d3dc738dfb90c4e6fb8dfaa5ea5..3065b1cf2dea7d57bbadb6fe50beb480fa08036f 100644

--- a/compiler/java/com/google/dart/compiler/parser/DartParser.java

+++ b/compiler/java/com/google/dart/compiler/parser/DartParser.java

@@ -409,8 +409,7 @@ public class DartParser extends CompletionHooksParserBase {

LibraryNode importPath;

if (importDirective.getPrefix() != null) {

importPath =

- new LibraryNode(importDirective.getLibraryUri().getValue(), importDirective.getPrefix()

- .getName());

+ new LibraryNode(importDirective);

} else {

importPath = new LibraryNode(importDirective.getLibraryUri().getValue());

}

@@ -442,8 +441,7 @@ public class DartParser extends CompletionHooksParserBase {

LibraryNode importPath;

if (importDirective.getOldPrefix() != null) {

importPath =

- new LibraryNode(importDirective.getLibraryUri().getValue(), importDirective.getOldPrefix()

- .getValue());

+ new LibraryNode(importDirective);

} else {

importPath = new LibraryNode(importDirective.getLibraryUri().getValue());

}

@@ -589,7 +587,6 @@ public class DartParser extends CompletionHooksParserBase {

boolean export = false;

if (optional(Token.BIT_AND)) {

if (optionalPseudoKeyword(EXPORT_KEYWORD)) {

- next();

export = true;

} else {

reportError(position(), ParserErrorCode.EXPECTED_EXPORT);