compiler/java/com/google/dart/compiler/resolver/ResolutionContext.java - Issue 10542094: Issue 3477. Report error when built-in identifier used as type name

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/resolver/ResolutionContext.java

Issue 10542094: Issue 3477. Report error when built-in identifier used as type name (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

« compiler/java/com/google/dart/compiler/parser/ParserErrorCode.java ('K') | « compiler/java/com/google/dart/compiler/parser/ParserErrorCode.java ('k') | compiler/javatests/com/google/dart/compiler/parser/NegativeParserTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: compiler/java/com/google/dart/compiler/resolver/ResolutionContext.java

diff --git a/compiler/java/com/google/dart/compiler/resolver/ResolutionContext.java b/compiler/java/com/google/dart/compiler/resolver/ResolutionContext.java

index 9efd3dacc772808896c28a43a95102632fe9459b..1c933dd22ada292a50cc0b624da5ecac52491361 100644

--- a/compiler/java/com/google/dart/compiler/resolver/ResolutionContext.java

+++ b/compiler/java/com/google/dart/compiler/resolver/ResolutionContext.java

@@ -219,7 +219,7 @@ public class ResolutionContext implements ResolutionErrorListener {

// Built-in identifier can not be used as a type annotation.

if (identifier instanceof DartIdentifier) {

String name = ((DartIdentifier) identifier).getName();

- if (DartParser.PSEUDO_KEYWORDS_SET.contains(name)) {

+ if (DartParser.PSEUDO_KEYWORDS_SET.contains(name) && !"Dynamic".equals(name)) {

onError(identifier, ResolverErrorCode.BUILT_IN_IDENTIFIER_AS_TYPE, name);

return Types.newDynamicType();

}