| 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/parser.h" | 5 #include "vm/parser.h" |
| 6 | 6 |
| 7 #include "lib/invocation_mirror.h" | 7 #include "lib/invocation_mirror.h" |
| 8 #include "vm/bigint_operations.h" | 8 #include "vm/bigint_operations.h" |
| 9 #include "vm/bootstrap.h" | 9 #include "vm/bootstrap.h" |
| 10 #include "vm/class_finalizer.h" | 10 #include "vm/class_finalizer.h" |
| (...skipping 8585 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 8596 } | 8596 } |
| 8597 return true; | 8597 return true; |
| 8598 } else if (func.IsStaticFunction()) { | 8598 } else if (func.IsStaticFunction()) { |
| 8599 if (node != NULL) { | 8599 if (node != NULL) { |
| 8600 ASSERT(AbstractType::Handle(func.result_type()).IsResolved()); | 8600 ASSERT(AbstractType::Handle(func.result_type()).IsResolved()); |
| 8601 // The static getter may later be changed into a dynamically | 8601 // The static getter may later be changed into a dynamically |
| 8602 // resolved instance setter if no static setter can | 8602 // resolved instance setter if no static setter can |
| 8603 // be found. | 8603 // be found. |
| 8604 AstNode* receiver = NULL; | 8604 AstNode* receiver = NULL; |
| 8605 const bool kTestOnly = true; | 8605 const bool kTestOnly = true; |
| 8606 ASSERT(!current_function().IsInFactoryScope()); | |
| 8607 if (!current_function().is_static() && | 8606 if (!current_function().is_static() && |
| 8608 (LookupReceiver(current_block_->scope, kTestOnly) != NULL)) { | 8607 (LookupReceiver(current_block_->scope, kTestOnly) != NULL)) { |
| 8609 receiver = LoadReceiver(ident_pos); | 8608 receiver = LoadReceiver(ident_pos); |
| 8610 } | 8609 } |
| 8611 *node = new StaticGetterNode(ident_pos, | 8610 *node = new StaticGetterNode(ident_pos, |
| 8612 receiver, | 8611 receiver, |
| 8613 false, | 8612 false, |
| 8614 Class::ZoneHandle(isolate(), cls.raw()), | 8613 Class::ZoneHandle(isolate(), cls.raw()), |
| 8615 ident); | 8614 ident); |
| 8616 } | 8615 } |
| (...skipping 1680 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 10297 void Parser::SkipQualIdent() { | 10296 void Parser::SkipQualIdent() { |
| 10298 ASSERT(IsIdentifier()); | 10297 ASSERT(IsIdentifier()); |
| 10299 ConsumeToken(); | 10298 ConsumeToken(); |
| 10300 if (CurrentToken() == Token::kPERIOD) { | 10299 if (CurrentToken() == Token::kPERIOD) { |
| 10301 ConsumeToken(); // Consume the kPERIOD token. | 10300 ConsumeToken(); // Consume the kPERIOD token. |
| 10302 ExpectIdentifier("identifier expected after '.'"); | 10301 ExpectIdentifier("identifier expected after '.'"); |
| 10303 } | 10302 } |
| 10304 } | 10303 } |
| 10305 | 10304 |
| 10306 } // namespace dart | 10305 } // namespace dart |
| OLD | NEW |