Minor fixes to AstBuilder.

pkg/front_end/lib/src/fasta/analyzer/ast_builder.dart

 // Copyright (c) 2016, 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.analyzer.ast_builder;
 
 import 'package:analyzer/analyzer.dart';
 import 'package:analyzer/dart/ast/ast_factory.dart' show AstFactory;
 import 'package:analyzer/dart/ast/standard_ast_factory.dart' as standard;
 import 'package:analyzer/dart/ast/token.dart' as analyzer show Token;
@@ skipping 426 matching lines @@
       components[i] = identifier.token;
     }
     push(ast.symbolLiteral(toAnalyzerToken(hashToken), components));
   }
 
   void endType(Token beginToken, Token endToken) {
     debugEvent("Type");
     TypeArgumentList arguments = pop();
     Identifier name = pop();
     // TODO(paulberry,ahe): what if the type doesn't resolve to a class
-    // element?
+    // element?  Try to share code with BodyBuilder.builderToFirstExpression.
     KernelClassElement cls = name.staticElement;
     if (cls == null) {
       // TODO(paulberry): This is a kludge.  Ideally we should already have
       // set the static element at the time that handleIdentifier was called.
       Builder builder = scope.lookup(name.name, beginToken.charOffset, uri);
       if (builder == null) {
         internalError("Undefined name: $name");
       }
       cls = elementStore[builder];
       assert(cls != null);
@@ skipping 452 matching lines @@
   @override
   void handleQualified(Token period) {
     SimpleIdentifier identifier = pop();
     if (accumulateIdentifierComponents) {
       List<SimpleIdentifier> list = pop();
       list.add(identifier);
       push(list);
     } else {
       var prefix = pop();
       if (prefix is SimpleIdentifier) {
-        // TODO(paulberry): resolve [identifier].
+        // TODO(paulberry): resolve [identifier].  Note that BodyBuilder handles
+        // this situation using SendAccessor.
         push(ast.prefixedIdentifier(
             prefix, toAnalyzerToken(period), identifier));
       } else {
         // TODO(paulberry): implement.
         logEvent('Qualified with >1 dot');
       }
     }
   }
 
   @override
@@ skipping 96 matching lines @@
   }
 
   @override
   void endMethod(Token getOrSet, Token beginToken, Token endToken) {
     debugEvent("Method");
     FunctionBody body = _endFunctionBody();
     ConstructorName redirectedConstructor = null; // TODO(paulberry)
     List<ConstructorInitializer> initializers = null; // TODO(paulberry)
     Token separator = null; // TODO(paulberry)
     FormalParameterList parameters = pop();
-    TypeParameterList typeParameters = pop();
+    /* TypeParameterList typeParameters = */ pop(); // TODO(paulberry)
     var name = pop();
-    analyzer.Token propertyKeyword = toAnalyzerToken(getOrSet);
-    TypeAnnotation returnType = pop();
+    // TODO(paulberry)
+    // analyzer.Token propertyKeyword = toAnalyzerToken(getOrSet);
+    /* TypeAnnotation returnType = */ pop(); // TODO(paulberry)
 
     Token externalKeyword = null;
     Token constKeyword = null;
     Token factoryKeyword = null;
     List<Token> modifiers = pop();
     for (Token modifier in modifiers) {
       String value = modifier.stringValue;
       if (identical('external', value)) {
         // TODO(scheglov): Check the order and uniqueness.
         externalKeyword = modifier;
       } else if (identical('const', value)) {
         // TODO(scheglov): Check the order and uniqueness.
         constKeyword = modifier;
       } else if (identical('factory', value)) {
         // TODO(scheglov): Check the order and uniqueness.
         factoryKeyword = modifier;
       } else {
         // TODO(scheglov): Report error.
         internalError("Invalid modifier. Report an error.");
       }
     }
 
     List<Annotation> metadata = pop();
     // TODO(paulberry): capture doc comments.  See dartbug.com/28851.
     Comment comment = null;
     SimpleIdentifier returnType2;
     Token period;
     SimpleIdentifier name2;
     if (name is SimpleIdentifier) {
-      SimpleIdentifier returnType2 = name;
+      returnType2 = name;
     }
     push(ast.constructorDeclaration(
         comment,
         metadata,
         toAnalyzerToken(externalKeyword),
         toAnalyzerToken(constKeyword),
         toAnalyzerToken(factoryKeyword),
         returnType2,
         toAnalyzerToken(period),
         name2,
@@ skipping 82 matching lines @@
 /// [ClassDeclaration] or [ClassTypeAlias] object.
 class _MixinApplication {
   final TypeName supertype;
 
   final Token withKeyword;
 
   final List<TypeName> mixinTypes;
 
   _MixinApplication(this.supertype, this.withKeyword, this.mixinTypes);
 }