OLD | NEW |
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2012, 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 dart2js.resolution; | 5 library dart2js.resolution; |
6 | 6 |
7 import 'dart:collection' show Queue; | 7 import 'dart:collection' show Queue; |
8 | 8 |
9 import '../common.dart'; | 9 import '../common.dart'; |
10 import '../common/names.dart' show Identifiers; | 10 import '../common/names.dart' show Identifiers; |
(...skipping 961 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
972 if (element.isFactoryConstructor) { | 972 if (element.isFactoryConstructor) { |
973 FunctionExpression body = element.parseNode(parsingContext); | 973 FunctionExpression body = element.parseNode(parsingContext); |
974 if (body.isRedirectingFactory) { | 974 if (body.isRedirectingFactory) { |
975 defaultValuesError = MessageKind.REDIRECTING_FACTORY_WITH_DEFAULT; | 975 defaultValuesError = MessageKind.REDIRECTING_FACTORY_WITH_DEFAULT; |
976 } | 976 } |
977 } | 977 } |
978 return reporter.withCurrentElement(element, () { | 978 return reporter.withCurrentElement(element, () { |
979 FunctionExpression node = element.parseNode(parsingContext); | 979 FunctionExpression node = element.parseNode(parsingContext); |
980 return measure(() => SignatureResolver.analyze( | 980 return measure(() => SignatureResolver.analyze( |
981 compiler, | 981 compiler, |
| 982 element.enclosingElement.buildScope(), |
| 983 node.typeVariables, |
982 node.parameters, | 984 node.parameters, |
983 node.returnType, | 985 node.returnType, |
984 element, | 986 element, |
985 new ResolutionRegistry(compiler, _ensureTreeElements(element)), | 987 new ResolutionRegistry(compiler, _ensureTreeElements(element)), |
986 defaultValuesError: defaultValuesError, | 988 defaultValuesError: defaultValuesError, |
987 createRealParameters: true)); | 989 createRealParameters: true)); |
988 }); | 990 }); |
989 } | 991 } |
990 | 992 |
991 WorldImpact resolveTypedef(TypedefElementX element) { | 993 WorldImpact resolveTypedef(TypedefElementX element) { |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1095 TreeElements get treeElements { | 1097 TreeElements get treeElements { |
1096 assert(invariant(this, _treeElements != null, | 1098 assert(invariant(this, _treeElements != null, |
1097 message: "TreeElements have not been computed for $this.")); | 1099 message: "TreeElements have not been computed for $this.")); |
1098 return _treeElements; | 1100 return _treeElements; |
1099 } | 1101 } |
1100 | 1102 |
1101 void reuseElement() { | 1103 void reuseElement() { |
1102 _treeElements = null; | 1104 _treeElements = null; |
1103 } | 1105 } |
1104 } | 1106 } |
OLD | NEW |