compiler/java/com/google/dart/compiler/parser/DartParser.java - Issue 10919133: Support for new 'export' directive in resolver

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 10919133: Support for new 'export' directive in resolver (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Tweak for parsing import/export directives Created 8 years, 3 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 | « compiler/java/com/google/dart/compiler/ast/LibraryUnit.java ('k') | compiler/java/com/google/dart/compiler/resolver/TopLevelElementBuilder.java » ('j') | no next file with comments »
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 f1aa95d87faaf1cf2363907d6ad9ab3b8d03e8b8..4ab04444d471b5bff2418972441d7dddf9c81541 100644

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

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

@@ -436,17 +436,24 @@ public class DartParser extends CompletionHooksParserBase {

DartLibraryDirective libraryDirective = parseLibraryDirective();

libUnit.setName(libraryDirective.getLibraryName());

}

- while (peekPseudoKeyword(0, IMPORT_KEYWORD)) {

- DartImportDirective importDirective = parseImportDirective();

- LibraryNode importPath;

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

- importPath =

- new LibraryNode(importDirective);

- } else {

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

+ while (peekPseudoKeyword(0, IMPORT_KEYWORD) || peekPseudoKeyword(0, EXPORT_KEYWORD)) {

+ if (peekPseudoKeyword(0, IMPORT_KEYWORD)) {

+ DartImportDirective importDirective = parseImportDirective();

+ LibraryNode importPath;

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

+ importPath = new LibraryNode(importDirective);

+ } else {

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

+ }

+ importPath.setSourceInfo(importDirective.getSourceInfo());

+ libUnit.addImportPath(importPath);

+ }

+ if (peekPseudoKeyword(0, EXPORT_KEYWORD)) {

+ DartExportDirective exportDirective = parseExportDirective();

+ LibraryNode importPath = new LibraryNode(exportDirective);

+ importPath.setSourceInfo(exportDirective.getSourceInfo());

+ libUnit.addExportPath(importPath);

}

- importPath.setSourceInfo(importDirective.getSourceInfo());

- libUnit.addImportPath(importPath);

}

while (peekPseudoKeyword(0, PART_KEYWORD)) {

if (peekPseudoKeyword(1, OF_KEYWORD)) {