| OLD | NEW |
| 1 // Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2011, 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 class LibraryImport { | 5 class LibraryImport { |
| 6 String prefix; | 6 String prefix; |
| 7 Library library; | 7 Library library; |
| 8 LibraryImport(this.library, [this.prefix = null]); | 8 LibraryImport(this.library, [this.prefix = null]); |
| 9 } | 9 } |
| 10 | 10 |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 91 var mset = _privateMembers[member.name]; | 91 var mset = _privateMembers[member.name]; |
| 92 if (mset == null) { | 92 if (mset == null) { |
| 93 // TODO(jimhug): Make this lazier! | 93 // TODO(jimhug): Make this lazier! |
| 94 for (var lib in world.libraries.getValues()) { | 94 for (var lib in world.libraries.getValues()) { |
| 95 if (lib._privateMembers.containsKey(member.jsname)) { | 95 if (lib._privateMembers.containsKey(member.jsname)) { |
| 96 member._jsname = '_$jsname${member.jsname}'; | 96 member._jsname = '_$jsname${member.jsname}'; |
| 97 break; | 97 break; |
| 98 } | 98 } |
| 99 } | 99 } |
| 100 | 100 |
| 101 mset = new MemberSet(member); | 101 mset = new MemberSet(member, isVar:true); |
| 102 _privateMembers[member.name] = mset; | 102 _privateMembers[member.name] = mset; |
| 103 } else { | 103 } else { |
| 104 mset.members.add(member); | 104 mset.members.add(member); |
| 105 } | 105 } |
| 106 } else { | 106 } else { |
| 107 world._addMember(member); | 107 world._addMember(member); |
| 108 } | 108 } |
| 109 } | 109 } |
| 110 | 110 |
| 111 // TODO(jimhug): Cache and share the types as interfaces! | 111 // TODO(jimhug): Cache and share the types as interfaces! |
| (...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 480 | 480 |
| 481 void visitFunctionDefinition(FunctionDefinition node) { | 481 void visitFunctionDefinition(FunctionDefinition node) { |
| 482 currentType.addMethod(node.name.name, node); | 482 currentType.addMethod(node.name.name, node); |
| 483 } | 483 } |
| 484 | 484 |
| 485 void visitFunctionTypeDefinition(FunctionTypeDefinition node) { | 485 void visitFunctionTypeDefinition(FunctionTypeDefinition node) { |
| 486 var type = library.addType(node.func.name.name, node, false); | 486 var type = library.addType(node.func.name.name, node, false); |
| 487 type.addMethod(':call', node.func); | 487 type.addMethod(':call', node.func); |
| 488 } | 488 } |
| 489 } | 489 } |
| OLD | NEW |