Partial fix for issue 1934

pkg/analyzer/lib/src/generated/parser.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 // This code was auto-generated, is not intended to be edited, and is subject to
 // significant change. Please see the README file for more information.
 
 library engine.parser;
 
 import "dart:math" as math;
@@ skipping 6354 matching lines @@
       Token awaitKeyword = null;
       if (_matchesString(_AWAIT)) {
         awaitKeyword = andAdvance;
       }
       Token forKeyword = _expectKeyword(Keyword.FOR);
       Token leftParenthesis = _expect(TokenType.OPEN_PAREN);
       VariableDeclarationList variableList = null;
       Expression initialization = null;
       if (!_matches(TokenType.SEMICOLON)) {
         CommentAndMetadata commentAndMetadata = _parseCommentAndMetadata();
-        if (_matchesIdentifier() && _tokenMatchesKeyword(_peek(), Keyword.IN)) {
+        if (_matchesIdentifier() && (_tokenMatchesKeyword(_peek(), Keyword.IN) || _tokenMatches(_peek(), TokenType.COLON))) {
           List<VariableDeclaration> variables = new List<VariableDeclaration>();
           SimpleIdentifier variableName = parseSimpleIdentifier();
           variables.add(
               new VariableDeclaration(null, null, variableName, null, null));
           variableList = new VariableDeclarationList(
               commentAndMetadata.comment,
               commentAndMetadata.metadata,
               null,
               null,
               variables);
         } else if (_isInitializedVariableDeclaration()) {
           variableList =
               _parseVariableDeclarationListAfterMetadata(commentAndMetadata);
         } else {
           initialization = parseExpression2();
         }
-        if (_matchesKeyword(Keyword.IN)) {
+        if (_matchesKeyword(Keyword.IN) || _matches(TokenType.COLON)) {
+          if (_matches(TokenType.COLON)) {
+            _reportErrorForCurrentToken(ParserErrorCode.COLON_IN_PLACE_OF_IN);
+          }
           DeclaredIdentifier loopVariable = null;
           SimpleIdentifier identifier = null;
           if (variableList == null) {
             // We found: <expression> 'in'
             _reportErrorForCurrentToken(
                 ParserErrorCode.MISSING_VARIABLE_IN_FOR_EACH);
           } else {
             NodeList<VariableDeclaration> variables = variableList.variables;
             if (variables.length > 1) {
               _reportErrorForCurrentToken(
@@ skipping 16 matching lines @@
                   variable.name);
             } else {
               if (!commentAndMetadata.metadata.isEmpty) {
                 // TODO(jwren) metadata isn't allowed before the identifier in
                 // "identifier in expression", add warning if commentAndMetadata
                 // has content
               }
               identifier = variable.name;
             }
           }
-          Token inKeyword = _expectKeyword(Keyword.IN);
+          Token inKeyword = andAdvance;
           Expression iterator = parseExpression2();
           Token rightParenthesis = _expect(TokenType.CLOSE_PAREN);
           Statement body = parseStatement2();
           if (loopVariable == null) {
             return new ForEachStatement.con2(
                 awaitKeyword,
                 forKeyword,
                 leftParenthesis,
                 identifier,
                 inKeyword,
@@ skipping 3638 matching lines @@
 
   static const ParserErrorCode ASSERT_DOES_NOT_TAKE_RETHROW =
       const ParserErrorCode(
           'ASSERT_DOES_NOT_TAKE_RETHROW',
           "Assert cannot be called on rethrows");
 
   static const ParserErrorCode BREAK_OUTSIDE_OF_LOOP = const ParserErrorCode(
       'BREAK_OUTSIDE_OF_LOOP',
       "A break statement cannot be used outside of a loop or switch statement");
 
+  static const ParserErrorCode COLON_IN_PLACE_OF_IN = const ParserErrorCode(
+      'COLON_IN_PLACE_OF_IN',
+      "For-in loops use 'in' rather than a colon");
+
   static const ParserErrorCode CONST_AND_FINAL = const ParserErrorCode(
       'CONST_AND_FINAL',
       "Members cannot be declared to be both 'const' and 'final'");
 
   static const ParserErrorCode CONST_AND_VAR = const ParserErrorCode(
       'CONST_AND_VAR',
       "Members cannot be declared to be both 'const' and 'var'");
 
   static const ParserErrorCode CONST_CLASS = const ParserErrorCode(
       'CONST_CLASS',
@@ skipping 2029 matching lines @@
    * Copy resolution data from one node to another.
    *
    * @param fromNode the node from which resolution information will be copied
    * @param toNode the node to which resolution information will be copied
    */
   static void copyResolutionData(AstNode fromNode, AstNode toNode) {
     ResolutionCopier copier = new ResolutionCopier();
     copier._isEqualNodes(fromNode, toNode);
   }
 }