| 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 #include "vm/class_finalizer.h" | 5 #include "vm/class_finalizer.h" |
| 6 | 6 |
| 7 #include "vm/flags.h" | 7 #include "vm/flags.h" |
| 8 #include "vm/heap.h" | 8 #include "vm/heap.h" |
| 9 #include "vm/isolate.h" | 9 #include "vm/isolate.h" |
| 10 #include "vm/longjump.h" | 10 #include "vm/longjump.h" |
| (...skipping 957 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 968 | 968 |
| 969 | 969 |
| 970 static RawClass* FindSuperOwnerOfFunction(const Class& cls, | 970 static RawClass* FindSuperOwnerOfFunction(const Class& cls, |
| 971 const String& name) { | 971 const String& name) { |
| 972 Class& super_class = Class::Handle(); | 972 Class& super_class = Class::Handle(); |
| 973 Function& function = Function::Handle(); | 973 Function& function = Function::Handle(); |
| 974 super_class = cls.SuperClass(); | 974 super_class = cls.SuperClass(); |
| 975 while (!super_class.IsNull()) { | 975 while (!super_class.IsNull()) { |
| 976 // Check if a function of same name exists in any super class. | 976 // Check if a function of same name exists in any super class. |
| 977 function = super_class.LookupFunction(name); | 977 function = super_class.LookupFunction(name); |
| 978 if (!function.IsNull()) { | 978 if (!function.IsNull() && !function.is_static()) { |
| 979 return super_class.raw(); | 979 return super_class.raw(); |
| 980 } | 980 } |
| 981 super_class = super_class.SuperClass(); | 981 super_class = super_class.SuperClass(); |
| 982 } | 982 } |
| 983 return Class::null(); | 983 return Class::null(); |
| 984 } | 984 } |
| 985 | 985 |
| 986 | 986 |
| 987 // Resolve and finalize the upper bounds of the type parameters of class cls. | 987 // Resolve and finalize the upper bounds of the type parameters of class cls. |
| 988 void ClassFinalizer::ResolveAndFinalizeUpperBounds(const Class& cls) { | 988 void ClassFinalizer::ResolveAndFinalizeUpperBounds(const Class& cls) { |
| (...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1585 void ClassFinalizer::ReportError(const char* format, ...) { | 1585 void ClassFinalizer::ReportError(const char* format, ...) { |
| 1586 va_list args; | 1586 va_list args; |
| 1587 va_start(args, format); | 1587 va_start(args, format); |
| 1588 const Error& error = Error::Handle( | 1588 const Error& error = Error::Handle( |
| 1589 Parser::FormatError(Script::Handle(), -1, "Error", format, args)); | 1589 Parser::FormatError(Script::Handle(), -1, "Error", format, args)); |
| 1590 va_end(args); | 1590 va_end(args); |
| 1591 ReportError(error); | 1591 ReportError(error); |
| 1592 } | 1592 } |
| 1593 | 1593 |
| 1594 } // namespace dart | 1594 } // namespace dart |
| OLD | NEW |