| 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 'dart:uri'; | 7 import 'dart:uri'; |
| 8 import 'dart:collection' show LinkedHashMap; | 8 import 'dart:collection' show LinkedHashMap; |
| 9 | 9 |
| 10 import 'elements.dart'; | 10 import 'elements.dart'; |
| (...skipping 997 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1008 if (getter != null) { | 1008 if (getter != null) { |
| 1009 return new Modifiers.withFlags( | 1009 return new Modifiers.withFlags( |
| 1010 getter.modifiers.nodes, | 1010 getter.modifiers.nodes, |
| 1011 getter.modifiers.flags | Modifiers.FLAG_ABSTRACT); | 1011 getter.modifiers.flags | Modifiers.FLAG_ABSTRACT); |
| 1012 } else { | 1012 } else { |
| 1013 return new Modifiers.withFlags( | 1013 return new Modifiers.withFlags( |
| 1014 setter.modifiers.nodes, | 1014 setter.modifiers.nodes, |
| 1015 setter.modifiers.flags | Modifiers.FLAG_ABSTRACT); | 1015 setter.modifiers.flags | Modifiers.FLAG_ABSTRACT); |
| 1016 } | 1016 } |
| 1017 } | 1017 } |
| 1018 |
| 1019 bool isInstanceMember() { |
| 1020 return isMember() && !modifiers.isStatic(); |
| 1021 } |
| 1018 } | 1022 } |
| 1019 | 1023 |
| 1020 // TODO(johnniwinther): [FunctionSignature] should be merged with | 1024 // TODO(johnniwinther): [FunctionSignature] should be merged with |
| 1021 // [FunctionType]. | 1025 // [FunctionType]. |
| 1022 class FunctionSignatureX implements FunctionSignature { | 1026 class FunctionSignatureX implements FunctionSignature { |
| 1023 final Link<Element> requiredParameters; | 1027 final Link<Element> requiredParameters; |
| 1024 final Link<Element> optionalParameters; | 1028 final Link<Element> optionalParameters; |
| 1025 final DartType returnType; | 1029 final DartType returnType; |
| 1026 final int requiredParameterCount; | 1030 final int requiredParameterCount; |
| 1027 final int optionalParameterCount; | 1031 final int optionalParameterCount; |
| (...skipping 960 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1988 | 1992 |
| 1989 MetadataAnnotation ensureResolved(Compiler compiler) { | 1993 MetadataAnnotation ensureResolved(Compiler compiler) { |
| 1990 if (resolutionState == STATE_NOT_STARTED) { | 1994 if (resolutionState == STATE_NOT_STARTED) { |
| 1991 compiler.resolver.resolveMetadataAnnotation(this); | 1995 compiler.resolver.resolveMetadataAnnotation(this); |
| 1992 } | 1996 } |
| 1993 return this; | 1997 return this; |
| 1994 } | 1998 } |
| 1995 | 1999 |
| 1996 String toString() => 'MetadataAnnotation($value, $resolutionState)'; | 2000 String toString() => 'MetadataAnnotation($value, $resolutionState)'; |
| 1997 } | 2001 } |
| OLD | NEW |