Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(449)

Side by Side Diff: pkg/analyzer/lib/src/generated/incremental_resolver.dart

Issue 757193002: Fix for resolving super.method() invocations. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 library engine.incremental_resolver; 5 library engine.incremental_resolver;
6 6
7 import 'dart:collection'; 7 import 'dart:collection';
8 import 'dart:math' as math; 8 import 'dart:math' as math;
9 9
10 import 'package:analyzer/src/generated/error_verifier.dart'; 10 import 'package:analyzer/src/generated/error_verifier.dart';
(...skipping 767 matching lines...) Expand 10 before | Expand all | Expand 10 after
778 node.accept(visitor); 778 node.accept(visitor);
779 } 779 }
780 // resolve references 780 // resolve references
781 { 781 {
782 ResolverVisitor visitor = new ResolverVisitor.con3( 782 ResolverVisitor visitor = new ResolverVisitor.con3(
783 _definingLibrary, 783 _definingLibrary,
784 _source, 784 _source,
785 _typeProvider, 785 _typeProvider,
786 _resolutionContext.scope, 786 _resolutionContext.scope,
787 errorListener); 787 errorListener);
788 visitor.enclosingClass = _resolutionContext.enclosingClass; 788 if (_resolutionContext.enclosingClassDeclaration != null) {
789 visitor.visitClassDeclarationIncrementally(
790 _resolutionContext.enclosingClassDeclaration);
791 }
789 node.accept(visitor); 792 node.accept(visitor);
790 } 793 }
791 // remember errors 794 // remember errors
792 _resolveErrors = errorListener.getErrorsForSource(_source); 795 _resolveErrors = errorListener.getErrorsForSource(_source);
793 } 796 }
794 797
795 void _updateElements(AstNode node) { 798 void _updateElements(AstNode node) {
796 // build elements in node 799 // build elements in node
797 ElementHolder holder; 800 ElementHolder holder;
798 _ElementsRestorer elementsRestorer = new _ElementsRestorer(node); 801 _ElementsRestorer elementsRestorer = new _ElementsRestorer(node);
(...skipping 21 matching lines...) Expand all
820 823
821 void _verify(AstNode node) { 824 void _verify(AstNode node) {
822 RecordingErrorListener errorListener = new RecordingErrorListener(); 825 RecordingErrorListener errorListener = new RecordingErrorListener();
823 ErrorReporter errorReporter = new ErrorReporter(errorListener, _source); 826 ErrorReporter errorReporter = new ErrorReporter(errorListener, _source);
824 ErrorVerifier errorVerifier = new ErrorVerifier( 827 ErrorVerifier errorVerifier = new ErrorVerifier(
825 errorReporter, 828 errorReporter,
826 _definingLibrary, 829 _definingLibrary,
827 _typeProvider, 830 _typeProvider,
828 new InheritanceManager(_definingLibrary)); 831 new InheritanceManager(_definingLibrary));
829 if (_resolutionContext.enclosingClassDeclaration != null) { 832 if (_resolutionContext.enclosingClassDeclaration != null) {
830 errorVerifier.initClassDeclaration( 833 errorVerifier.visitClassDeclarationIncrementally(
831 _resolutionContext.enclosingClassDeclaration); 834 _resolutionContext.enclosingClassDeclaration);
832 } 835 }
833 node.accept(errorVerifier); 836 node.accept(errorVerifier);
834 _verifyErrors = errorListener.getErrorsForSource(_source); 837 _verifyErrors = errorListener.getErrorsForSource(_source);
835 } 838 }
836 } 839 }
837 840
838 841
839 class PoorMansIncrementalResolver { 842 class PoorMansIncrementalResolver {
840 final TypeProvider _typeProvider; 843 final TypeProvider _typeProvider;
(...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after
1375 _elements[node] = node.staticElement; 1378 _elements[node] = node.staticElement;
1376 } 1379 }
1377 } 1380 }
1378 1381
1379 1382
1380 class _TokenPair { 1383 class _TokenPair {
1381 final Token oldToken; 1384 final Token oldToken;
1382 final Token newToken; 1385 final Token newToken;
1383 _TokenPair(this.oldToken, this.newToken); 1386 _TokenPair(this.oldToken, this.newToken);
1384 } 1387 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698