editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/parser/Parser.java - Issue 18532010: Fix for parsing top-level variable named 'get' or 'set'.

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: editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/parser/Parser.java

Issue 18532010: Fix for parsing top-level variable named 'get' or 'set'. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Created 7 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 | editor/tools/plugins/com.google.dart.engine_test/src/com/google/dart/engine/parser/SimpleParserTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/parser/Parser.java

diff --git a/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/parser/Parser.java b/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/parser/Parser.java

index 43cf7b6fed25caa4ee5a0706e1396068be63b562..10eba43552c506063b3206dae25211edd724092e 100644

--- a/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/parser/Parser.java

+++ b/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/parser/Parser.java

@@ -2144,7 +2144,7 @@ public class Parser {

expect(TokenType.SEMICOLON));

}

TypeName returnType = parseReturnType();

- if (matches(Keyword.GET) || matches(Keyword.SET)) {

+ if ((matches(Keyword.GET) || matches(Keyword.SET)) && matchesIdentifier(peek())) {

validateModifiersForTopLevelFunction(modifiers);

return parseFunctionDeclaration(

commentAndMetadata,