[kernel] Position on switch expression

pkg/front_end/lib/src/fasta/parser/parser.dart

 // Copyright (c) 2012, 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.
 
 library fasta.parser.parser;
 
 import '../fasta_codes.dart' show Code, Message, Template;
 
 import '../fasta_codes.dart' as fasta;
 
@@ skipping 3868 matching lines @@
     }
     listener.endTryStatement(catchCount, tryKeyword, finallyKeyword);
     return token;
   }
 
   Token parseSwitchStatement(Token token) {
     assert(optional('switch', token));
     Token switchKeyword = token;
     listener.beginSwitchStatement(switchKeyword);
     token = parseParenthesizedExpression(token.next);
-    token = parseSwitchBlock(token);
+    token = parseSwitchBlock(token, switchKeyword);
     listener.endSwitchStatement(switchKeyword, token);
     return token.next;
   }
 
-  Token parseSwitchBlock(Token token) {
+  Token parseSwitchBlock(Token token, Token switchKeyword) {

[ahe, 2017/08/25 10:04:31]

This token is already passed to endSwitchStatement.

     Token begin = token;
     listener.beginSwitchBlock(begin);
     token = expect('{', token);
     int caseCount = 0;
     while (!identical(token.kind, EOF_TOKEN)) {
       if (optional('}', token)) {
         break;
       }
       token = parseSwitchCase(token);
       ++caseCount;
     }
-    listener.endSwitchBlock(caseCount, begin, token);
+    listener.endSwitchBlock(caseCount, begin, token, switchKeyword);
     expect('}', token);
     return token;
   }
 
   /// Peek after the following labels (if any). The following token
   /// is used to determine if the labels belong to a statement or a
   /// switch case.
   Token peekPastLabels(Token token) {
     while (token.isIdentifier && optional(':', token.next)) {
       token = token.next.next;
@@ skipping 220 matching lines @@
   }
 
   Token reportUnexpectedToken(Token token) {
     return reportUnrecoverableErrorWithToken(
         token, fasta.templateUnexpectedToken);
   }
 }
 
 // TODO(ahe): Remove when analyzer supports generalized function syntax.
 typedef _MessageWithArgument<T> = Message Function(T);