dart-lang/sdk
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Ignore 'dart-ext:' scheme, allow 'native' in such files

Browse Source 
R=danrubel@google.com
BUG=

Review URL: https://codereview.chromium.org//11088009

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@13371 260f80e4-7a28-3924-810f-c04153c831b5
This commit is contained in:
scheglov@google.com
2012-10-08 20:15:24 +00:00
parent bf3c4d2f68
commit 8dbff1e87c
4 changed files with 67 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/java/com/google/dart/compiler/DartCompiler.java
+4
View File
@@ -44,6 +44,7 @@ import com.google.dart.compiler.resolver.SupertypeResolver;
import com.google.dart.compiler.resolver.TopLevelElementBuilder;
import com.google.dart.compiler.type.TypeAnalyzer;
import com.google.dart.compiler.util.DefaultTextOutput;
import com.google.dart.compiler.util.apache.StringUtils;
import org.kohsuke.args4j.CmdLineException;
import org.kohsuke.args4j.CmdLineParser;
@@ -880,6 +881,9 @@ public class DartCompiler {
private void reportMissingSource(DartCompilerContext context,
LibrarySource libSrc,
LibraryNode libNode) {
if (libNode != null && StringUtils.startsWith(libNode.getText(), "dart-ext:")) {
return;
}
DartCompilationError event = new DartCompilationError(libNode,
DartCompilerErrorCode.MISSING_SOURCE,
libNode.getText());
compiler/java/com/google/dart/compiler/parser/DartParser.java
+18 -5
View File
@@ -104,6 +104,7 @@ import com.google.dart.compiler.ast.Modifiers;
import com.google.dart.compiler.metrics.CompilerMetrics;
import com.google.dart.compiler.parser.DartScanner.Location;
import com.google.dart.compiler.util.Lists;
import com.google.dart.compiler.util.apache.StringUtils;
import java.io.IOException;
import java.io.Reader;
@@ -124,7 +125,7 @@ public class DartParser extends CompletionHooksParserBase {
private final String sourceCode;
private final boolean isDietParse;
private final Set<String> prefixes;
private final boolean corelibParse;
private boolean allowNativeKeyword;
private final Set<Integer> errorHistory = new HashSet<Integer>();
private boolean isParsingInterface;
private boolean isTopLevelAbstract;
@@ -231,7 +232,7 @@ public class DartParser extends CompletionHooksParserBase {
this.sourceCode = sourceCode;
this.isDietParse = isDietParse;
this.prefixes = prefixes;
this.corelibParse = source != null && PackageLibraryManager.isDartUri(source.getUri());
this.allowNativeKeyword = source != null && PackageLibraryManager.isDartUri(source.getUri());
}
public static String read(Source source) throws IOException {
@@ -647,7 +648,12 @@ public class DartParser extends CompletionHooksParserBase {
beginLiteral();
expect(Token.STRING);
DartStringLiteral libUri = done(DartStringLiteral.get(ctx.getTokenString()));
// allow "native" if we have "dart-ext:" import
if (StringUtils.startsWith(libUri.getValue(), "dart-ext:")) {
allowNativeKeyword = true;
}
DartIdentifier prefix = null;
if (optional(Token.AS)) {
prefix = parseIdentifier();
@@ -696,9 +702,16 @@ public class DartParser extends CompletionHooksParserBase {
protected DartImportDirective parseObsoleteImportDirective() {
expect(Token.IMPORT);
expect(Token.LPAREN);
beginLiteral();
expect(Token.STRING);
DartStringLiteral libUri = done(DartStringLiteral.get(ctx.getTokenString()));
// allow "native" if we have "dart-ext:" import
if (StringUtils.startsWith(libUri.getValue(), "dart-ext:")) {
allowNativeKeyword = true;
}
DartBooleanLiteral export = null;
List<ImportCombinator> combinators = new ArrayList<ImportCombinator>();
DartStringLiteral prefix = null;
@@ -953,7 +966,7 @@ public class DartParser extends CompletionHooksParserBase {
if (isParsingInterface) {
reportError(position(), ParserErrorCode.NATIVE_ONLY_CLASS);
}
if (!corelibParse) {
if (!allowNativeKeyword) {
reportError(position(), ParserErrorCode.NATIVE_ONLY_CORE_LIB);
}
beginLiteral();
@@ -1768,7 +1781,7 @@ public class DartParser extends CompletionHooksParserBase {
if (!optionalPseudoKeyword(NATIVE_KEYWORD)) {
throw new AssertionError();
}
if (!corelibParse) {
if (!allowNativeKeyword) {
reportError(position(), ParserErrorCode.NATIVE_ONLY_CORE_LIB);
}
DartExpression body = null;