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

Unified Diff: compiler/java/com/google/dart/compiler/parser/DartParser.java

Issue 10690099: Fix a build issue w/ non-terminating builds and issues parsing dart:html. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years, 5 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: compiler/java/com/google/dart/compiler/parser/DartParser.java
===================================================================
--- compiler/java/com/google/dart/compiler/parser/DartParser.java (revision 9446)
+++ compiler/java/com/google/dart/compiler/parser/DartParser.java (working copy)
@@ -102,6 +102,7 @@
import java.io.IOException;
import java.io.Reader;
import java.math.BigInteger;
+import java.net.URI;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
@@ -218,7 +219,21 @@
this.sourceCode = sourceCode;
this.isDietParse = isDietParse;
this.prefixes = prefixes;
- this.corelibParse = source != null && SystemLibraryManager.isDartUri(source.getUri());
+
+ if (source != null) {
+ URI srcUri = source.getUri();
+
+ if (srcUri.getScheme() == null) {
+ // TODO(devoncarew): find out when dart:html is being parsed as an external compilation unit
+ // (and our source == a DartSourceString). We're getting hundreds of parser errors because
+ // of native keywords in a file we don't think is a core library.
+ corelibParse = true;
+ } else {
+ corelibParse = SystemLibraryManager.isDartUri(srcUri);
+ }
+ } else {
+ corelibParse = false;
+ }
}
public static String read(Source source) throws IOException {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698