| 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; |
| (...skipping 1643 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1654 bool get isLocal => true; | 1654 bool get isLocal => true; |
| 1655 | 1655 |
| 1656 accept(ElementVisitor visitor, arg) { | 1656 accept(ElementVisitor visitor, arg) { |
| 1657 return visitor.visitLocalVariableElement(this, arg); | 1657 return visitor.visitLocalVariableElement(this, arg); |
| 1658 } | 1658 } |
| 1659 } | 1659 } |
| 1660 | 1660 |
| 1661 class FieldElementX extends VariableElementX | 1661 class FieldElementX extends VariableElementX |
| 1662 with AnalyzableElementX | 1662 with AnalyzableElementX |
| 1663 implements FieldElement { | 1663 implements FieldElement { |
| 1664 List<FunctionElement> nestedClosures = new List<FunctionElement>(); | 1664 List<MethodElement> nestedClosures = new List<MethodElement>(); |
| 1665 | 1665 |
| 1666 FieldElementX( | 1666 FieldElementX( |
| 1667 Identifier name, Element enclosingElement, VariableList variables) | 1667 Identifier name, Element enclosingElement, VariableList variables) |
| 1668 : super(name.source, ElementKind.FIELD, enclosingElement, variables, | 1668 : super(name.source, ElementKind.FIELD, enclosingElement, variables, |
| 1669 name.token); | 1669 name.token); |
| 1670 | 1670 |
| 1671 accept(ElementVisitor visitor, arg) { | 1671 accept(ElementVisitor visitor, arg) { |
| 1672 return visitor.visitFieldElement(this, arg); | 1672 return visitor.visitFieldElement(this, arg); |
| 1673 } | 1673 } |
| 1674 | 1674 |
| (...skipping 372 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2047 : optionalParameters = optionalParameters, | 2047 : optionalParameters = optionalParameters, |
| 2048 hasOptionalParameters = !optionalParameters.isEmpty; | 2048 hasOptionalParameters = !optionalParameters.isEmpty; |
| 2049 } | 2049 } |
| 2050 | 2050 |
| 2051 abstract class BaseFunctionElementX extends ElementX | 2051 abstract class BaseFunctionElementX extends ElementX |
| 2052 with PatchMixin<FunctionElement>, AstElementMixin | 2052 with PatchMixin<FunctionElement>, AstElementMixin |
| 2053 implements FunctionElement { | 2053 implements FunctionElement { |
| 2054 ResolutionDartType typeCache; | 2054 ResolutionDartType typeCache; |
| 2055 final Modifiers modifiers; | 2055 final Modifiers modifiers; |
| 2056 | 2056 |
| 2057 List<FunctionElement> nestedClosures = new List<FunctionElement>(); | 2057 List<MethodElement> nestedClosures = new List<MethodElement>(); |
| 2058 | 2058 |
| 2059 FunctionSignature _functionSignatureCache; | 2059 FunctionSignature _functionSignatureCache; |
| 2060 | 2060 |
| 2061 AsyncMarker _asyncMarker = AsyncMarker.SYNC; | 2061 AsyncMarker _asyncMarker = AsyncMarker.SYNC; |
| 2062 | 2062 |
| 2063 BaseFunctionElementX(String name, ElementKind kind, Modifiers this.modifiers, | 2063 BaseFunctionElementX(String name, ElementKind kind, Modifiers this.modifiers, |
| 2064 Element enclosing) | 2064 Element enclosing) |
| 2065 : super(name, kind, enclosing) { | 2065 : super(name, kind, enclosing) { |
| 2066 assert(modifiers != null); | 2066 assert(modifiers != null); |
| 2067 } | 2067 } |
| (...skipping 1541 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3609 body = node.asFunctionExpression().body; | 3609 body = node.asFunctionExpression().body; |
| 3610 } | 3610 } |
| 3611 return new ParsedResolvedAst( | 3611 return new ParsedResolvedAst( |
| 3612 declaration, | 3612 declaration, |
| 3613 node, | 3613 node, |
| 3614 body, | 3614 body, |
| 3615 definingElement.treeElements, | 3615 definingElement.treeElements, |
| 3616 definingElement.compilationUnit.script.resourceUri); | 3616 definingElement.compilationUnit.script.resourceUri); |
| 3617 } | 3617 } |
| 3618 } | 3618 } |
| OLD | NEW |