| OLD | NEW |
| 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2013, 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 elements.modelx; | 5 library elements.modelx; |
| 6 | 6 |
| 7 import '../common.dart'; | 7 import '../common.dart'; |
| 8 import '../common/names.dart' show Identifiers; | 8 import '../common/names.dart' show Identifiers; |
| 9 import '../common/resolution.dart' show Resolution, ParsingContext; | 9 import '../common/resolution.dart' show Resolution, ParsingContext; |
| 10 import '../compiler.dart' show Compiler; | 10 import '../compiler.dart' show Compiler; |
| 11 import '../constants/constant_constructors.dart'; | 11 import '../constants/constant_constructors.dart'; |
| 12 import '../constants/constructors.dart'; | 12 import '../constants/constructors.dart'; |
| 13 import '../constants/expressions.dart'; | 13 import '../constants/expressions.dart'; |
| 14 import '../dart_types.dart'; | 14 import '../dart_types.dart'; |
| 15 import '../diagnostics/messages.dart' show MessageTemplate; | 15 import '../diagnostics/messages.dart' show MessageTemplate; |
| 16 import '../ordered_typeset.dart' show OrderedTypeSet; | 16 import '../ordered_typeset.dart' show OrderedTypeSet; |
| 17 import '../resolution/class_members.dart' show ClassMemberMixin; | 17 import '../resolution/class_members.dart' show ClassMemberMixin; |
| 18 import '../resolution/resolution.dart' show AnalyzableElementX; |
| 18 import '../resolution/scope.dart' | 19 import '../resolution/scope.dart' |
| 19 show ClassScope, LibraryScope, Scope, TypeDeclarationScope; | 20 show ClassScope, LibraryScope, Scope, TypeDeclarationScope; |
| 20 import '../resolution/resolution.dart' show AnalyzableElementX; | |
| 21 import '../resolution/tree_elements.dart' show TreeElements; | 21 import '../resolution/tree_elements.dart' show TreeElements; |
| 22 import '../resolution/typedefs.dart' show TypedefCyclicVisitor; | 22 import '../resolution/typedefs.dart' show TypedefCyclicVisitor; |
| 23 import '../script.dart'; | 23 import '../script.dart'; |
| 24 import '../tokens/token.dart' show ErrorToken, Token; | 24 import '../tokens/token.dart' show ErrorToken, Token; |
| 25 import '../tokens/token_constants.dart' as Tokens show EOF_TOKEN; | 25 import '../tokens/token_constants.dart' as Tokens show EOF_TOKEN; |
| 26 import '../tree/tree.dart'; | 26 import '../tree/tree.dart'; |
| 27 import '../util/util.dart'; | 27 import '../util/util.dart'; |
| 28 | |
| 29 import 'common.dart'; | 28 import 'common.dart'; |
| 30 import 'elements.dart'; | 29 import 'elements.dart'; |
| 31 import 'visitor.dart' show ElementVisitor; | 30 import 'visitor.dart' show ElementVisitor; |
| 32 | 31 |
| 33 /// Object that identifies a declaration site. | 32 /// Object that identifies a declaration site. |
| 34 /// | 33 /// |
| 35 /// For most elements, this is the element itself, but for variable declarations | 34 /// For most elements, this is the element itself, but for variable declarations |
| 36 /// where multi-declarations like `var a, b, c` are allowed, the declaration | 35 /// where multi-declarations like `var a, b, c` are allowed, the declaration |
| 37 /// site is a separate object. | 36 /// site is a separate object. |
| 38 // TODO(johnniwinther): Add [beginToken] and [endToken] getters. | 37 // TODO(johnniwinther): Add [beginToken] and [endToken] getters. |
| (...skipping 3355 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3394 body = node.asFunctionExpression().body; | 3393 body = node.asFunctionExpression().body; |
| 3395 } | 3394 } |
| 3396 return new ParsedResolvedAst( | 3395 return new ParsedResolvedAst( |
| 3397 declaration, | 3396 declaration, |
| 3398 node, | 3397 node, |
| 3399 body, | 3398 body, |
| 3400 definingElement.treeElements, | 3399 definingElement.treeElements, |
| 3401 definingElement.compilationUnit.script.resourceUri); | 3400 definingElement.compilationUnit.script.resourceUri); |
| 3402 } | 3401 } |
| 3403 } | 3402 } |
| OLD | NEW |