microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-17 21:06:50 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Remove checking in declareSymbol

Browse Source
This commit is contained in:
Arthur Ozga
2015-06-02 12:20:36 -07:00
parent edc4611341
commit a50ab3ebb0
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/compiler/binder.ts
View File

@@ -135,14 +135,14 @@ module ts {
return node.name ? declarationNameToString(node.name) : getDeclarationName(node);
}
/**
* Checks if the symbol contains a class declaration that is non-ambient.
*/
function hasNonAmbientClass(symbol: Symbol): boolean {
return symbol && forEach(symbol.declarations, (element: Declaration) => {
return element.kind === SyntaxKind.ClassDeclaration && !(element.flags & NodeFlags.Ambient);
});
}
// /**
// * Checks if the symbol contains a class declaration that is non-ambient.
// */
// function hasNonAmbientClass(symbol: Symbol): boolean {
// return symbol && forEach(symbol.declarations, (element: Declaration) => {
// return element.kind === SyntaxKind.ClassDeclaration && !(element.flags & NodeFlags.Ambient);
// });
// }
/**
* Declares a Symbol for the Node and add it to symbols. Reports errors for conflicting identifier names.
@@ -164,7 +164,7 @@ module ts {
// Check for declarations 'node' cannot be merged with.
// Interfaces declarations cannot be merged with non-ambient class declarations, which isn't encoded in SymbolFlags.
if (symbol.flags & excludes || (node.kind === SyntaxKind.InterfaceDeclaration && hasNonAmbientClass(symbol))) {
if (symbol.flags & excludes) {
if (node.name) {
node.name.parent = node;
}
@@ -536,7 +536,7 @@ module ts {
bindCatchVariableDeclaration(<CatchClause>node);
break;
case SyntaxKind.ClassDeclaration:
bindBlockScopedDeclaration(<Declaration>node, SymbolFlags.Class, isAmbientContext(node) ? SymbolFlags.AmbientClassExcludes : SymbolFlags.ClassExcludes);
bindBlockScopedDeclaration(<Declaration>node, SymbolFlags.Class, SymbolFlags.ClassExcludes);
break;
case SyntaxKind.InterfaceDeclaration:
bindBlockScopedDeclaration(<Declaration>node, SymbolFlags.Interface, SymbolFlags.InterfaceExcludes);

3
src/compiler/types.ts
View File

@@ -1472,8 +1472,7 @@ module ts {
PropertyExcludes = Value,
EnumMemberExcludes = Value,
FunctionExcludes = Value & ~(Function | ValueModule),
ClassExcludes = (Value | Type) & ~ValueModule,
AmbientClassExcludes = (Value | Type) & ~(ValueModule | Interface),
ClassExcludes = (Value | Type) & ~(ValueModule | Interface), // class-interface mergability done in checker.ts
InterfaceExcludes = Type & ~(Interface | Class),
RegularEnumExcludes = (Value | Type) & ~(RegularEnum | ValueModule), // regular enums merge only with regular enums and modules
ConstEnumExcludes = (Value | Type) & ~ConstEnum, // const enums merge only with const enums