diff --git a/es2panda/compiler/core/emitter/emitter.cpp b/es2panda/compiler/core/emitter/emitter.cpp index 4c17c862820bf9a097e191c960592822cfdc3090..c906d509bee586063afce8e179a1e75c830b79f6 100644 --- a/es2panda/compiler/core/emitter/emitter.cpp +++ b/es2panda/compiler/core/emitter/emitter.cpp @@ -414,7 +414,7 @@ void Emitter::AddSourceTextModuleRecord(ModuleRecordEmitter *module, CompilerCon prog_->literalarray_table.emplace(static_cast(moduleLiteral), std::move(literalArrayInstance)); } -void Emitter::FillTypeInfoRecord(CompilerContext *context, bool typeFlag, int64_t typeSummaryIndex, +void Emitter::FillTypeInfoRecord(const CompilerContext *context, bool typeFlag, int64_t typeSummaryIndex, const std::string &recordName) const { if (!context->IsMergeAbc()) { diff --git a/es2panda/compiler/core/emitter/emitter.h b/es2panda/compiler/core/emitter/emitter.h index c58afaf4214d599707c6cad1b3b7160d4a5a3336..32335e0bd1e1c5043df24a5f468b779b26b30bba 100644 --- a/es2panda/compiler/core/emitter/emitter.h +++ b/es2panda/compiler/core/emitter/emitter.h @@ -107,7 +107,7 @@ public: void AddFunction(FunctionEmitter *func, CompilerContext *context); void AddSourceTextModuleRecord(ModuleRecordEmitter *module, CompilerContext *context); - void FillTypeInfoRecord(CompilerContext *context, bool typeFlag, int64_t typeSummaryIndex, + void FillTypeInfoRecord(const CompilerContext *context, bool typeFlag, int64_t typeSummaryIndex, const std::string &recordName) const; void FillTypeLiteralBuffers(const extractor::TypeRecorder *recorder) const; static void GenBufferLiterals(ArenaVector>> &literalBuffers, diff --git a/es2panda/typescript/extractor/typeExtractor.cpp b/es2panda/typescript/extractor/typeExtractor.cpp index 543b4652aca8102b20a89a4db3f67a98b9701c66..400c8b17de90d0f1003c5c85a60a38ed24c2f26a 100644 --- a/es2panda/typescript/extractor/typeExtractor.cpp +++ b/es2panda/typescript/extractor/typeExtractor.cpp @@ -810,20 +810,25 @@ int64_t TypeExtractor::GetTypeIndexFromTSLiteralType(const ir::TSLiteralType *ts } int64_t TypeExtractor::GetTypeIndexFromBuiltin(const util::StringView &name, - const ir::TSTypeParameterInstantiation *node) + const ir::TSTypeParameterInstantiation *node, + bool isNewInstance) { auto typeIndexBuiltin = GetBuiltinTypeIndex(name); if (typeIndexBuiltin != PrimitiveType::ANY) { if (node == nullptr) { + if (!isNewInstance) { + return typeIndexBuiltin; + } return GetTypeIndexFromClassInst(typeIndexBuiltin); } - return GetTypeIndexFromBuiltinInst(typeIndexBuiltin, node); + return GetTypeIndexFromBuiltinInst(typeIndexBuiltin, node, isNewInstance); } return PrimitiveType::ANY; } int64_t TypeExtractor::GetTypeIndexFromBuiltinInst(int64_t typeIndexBuiltin, - const ir::TSTypeParameterInstantiation *node) + const ir::TSTypeParameterInstantiation *node, + bool isNewInstance) { std::vector allTypes = {typeIndexBuiltin}; for (const auto &t : node->Params()) { @@ -831,11 +836,17 @@ int64_t TypeExtractor::GetTypeIndexFromBuiltinInst(int64_t typeIndexBuiltin, } auto typeIndex = recorder_->GetBuiltinInst(allTypes); if (typeIndex != PrimitiveType::ANY) { - return typeIndex; + if (!isNewInstance) { + return typeIndex; + } + return GetTypeIndexFromClassInst(typeIndex); } // New instance for builtin generic type BuiltinInstType builtinInstType(this, allTypes); + if (!isNewInstance) { + return builtinInstType.GetTypeIndexShift(); + } return GetTypeIndexFromClassInst(builtinInstType.GetTypeIndexShift()); } @@ -848,7 +859,7 @@ int64_t TypeExtractor::GetTypeIndexFromGenericInst(int64_t typeIndexGeneric, } auto typeIndex = recorder_->GetGenericInst(allTypes); if (typeIndex != PrimitiveType::ANY) { - return typeIndex; + return GetTypeIndexFromClassInst(typeIndex); } // New instance for generic type diff --git a/es2panda/typescript/extractor/typeExtractor.h b/es2panda/typescript/extractor/typeExtractor.h index 524e5f0700f4b54028c91d05058fd8e21678c098..d3b404d6c9d4fef8f4de0fe2aa8cd307717634a0 100644 --- a/es2panda/typescript/extractor/typeExtractor.h +++ b/es2panda/typescript/extractor/typeExtractor.h @@ -45,6 +45,8 @@ public: int64_t GetTypeIndexFromIdentifier(const ir::Identifier *identifier); int64_t GetTypeIndexFromInitializer(const ir::Expression *initializer); int64_t GetTypeIndexFromClassInst(int64_t typeIndex); + int64_t GetTypeIndexFromBuiltin(const util::StringView &name, const ir::TSTypeParameterInstantiation *node, + bool isNewInstance = true); void SetGenericParamTypeMap(const ArenaMap *genericParamTypeMap) { @@ -99,8 +101,8 @@ private: int64_t GetTypeIndexFromTSLiteralType(const ir::TSLiteralType *tsLiteralType); // Builtin and Generic Helpers - int64_t GetTypeIndexFromBuiltin(const util::StringView &name, const ir::TSTypeParameterInstantiation *node); - int64_t GetTypeIndexFromBuiltinInst(int64_t typeIndexBuiltin, const ir::TSTypeParameterInstantiation *node); + int64_t GetTypeIndexFromBuiltinInst(int64_t typeIndexBuiltin, const ir::TSTypeParameterInstantiation *node, + bool isNewInstance); int64_t GetTypeIndexFromGenericInst(int64_t typeIndexGeneric, const ir::TSTypeParameterInstantiation *node); // Other Helpers diff --git a/es2panda/typescript/extractor/typeSystem.h b/es2panda/typescript/extractor/typeSystem.h index d3c1dfda5372e36f95c6b4edd62a0e52bfb0838c..4746e69554305b4c3f606aea3a602cba2ded1c54 100644 --- a/es2panda/typescript/extractor/typeSystem.h +++ b/es2panda/typescript/extractor/typeSystem.h @@ -668,7 +668,15 @@ private: { auto super = classDef->Super(); if (super != nullptr) { - extendsHeritage_ = extractor_->GetTypeIndexFromInitializer(super); + if (super->IsIdentifier()) { + extendsHeritage_ = extractor_->GetTypeIndexFromBuiltin(super->AsIdentifier()->Name(), + classDef->SuperTypeParams(), false); + } + if (extendsHeritage_ == PrimitiveType::ANY) { + extendsHeritage_ = extractor_->GetTypeIndexFromInitializer(super); + } + } else { + extendsHeritage_ = -1; // -1 means it's a base class } for (const auto &t : classDef->Implements()) { @@ -838,7 +846,11 @@ private: { buffer_->Add(recorder_->Allocator()->New(UserType::CLASS)); buffer_->Add(recorder_->Allocator()->New(modifierAB_)); - FillTypeIndexLiteralBuffer(extendsHeritage_); + if (extendsHeritage_ == -1) { // -1 means it's a base class + buffer_->Add(recorder_->Allocator()->New(extendsHeritage_)); + } else { + FillTypeIndexLiteralBuffer(extendsHeritage_); + } buffer_->Add(recorder_->Allocator()->New(implementsHeritages_.size())); std::for_each(implementsHeritages_.begin(), implementsHeritages_.end(), [this](const auto &t) { FillTypeIndexLiteralBuffer(t); diff --git a/testTs/expect/classes/classDeclarations/classAbstractKeyword/classAbstractAsIdentifier.txt b/testTs/expect/classes/classDeclarations/classAbstractKeyword/classAbstractAsIdentifier.txt index 6485f38a41e519db941ff3f30e05f13b1e5fd5e9..6a21de3c5ccfb6a76f38396829062ee3ebfd1b46 100644 --- a/testTs/expect/classes/classDeclarations/classAbstractKeyword/classAbstractAsIdentifier.txt +++ b/testTs/expect/classes/classDeclarations/classAbstractKeyword/classAbstractAsIdentifier.txt @@ -1,3 +1,3 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} diff --git a/testTs/expect/classes/classDeclarations/classInsideBlock.txt b/testTs/expect/classes/classDeclarations/classInsideBlock.txt index 9ed12c73706e35bb4fd0e21e6c0ce132df33c4d9..024050fada266d3e0b5eee0af6bea30958d5fd4f 100644 --- a/testTs/expect/classes/classDeclarations/classInsideBlock.txt +++ b/testTs/expect/classes/classDeclarations/classInsideBlock.txt @@ -1,3 +1,3 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_3'} diff --git a/testTs/expect/classes/classDeclarations/classWithSemicolonClassElement1.txt b/testTs/expect/classes/classDeclarations/classWithSemicolonClassElement1.txt index 2f2d6dc5c479a3f5123ab81497ccaac05843ad40..bdb58c8ffeb6c063e7e7861723ca4a8c0165c714 100644 --- a/testTs/expect/classes/classDeclarations/classWithSemicolonClassElement1.txt +++ b/testTs/expect/classes/classDeclarations/classWithSemicolonClassElement1.txt @@ -1,2 +1,2 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} diff --git a/testTs/expect/classes/classDeclarations/classWithSemicolonClassElement2.txt b/testTs/expect/classes/classDeclarations/classWithSemicolonClassElement2.txt index 2f2d6dc5c479a3f5123ab81497ccaac05843ad40..bdb58c8ffeb6c063e7e7861723ca4a8c0165c714 100644 --- a/testTs/expect/classes/classDeclarations/classWithSemicolonClassElement2.txt +++ b/testTs/expect/classes/classDeclarations/classWithSemicolonClassElement2.txt @@ -1,2 +1,2 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} diff --git a/testTs/expect/classes/classExpressions/classExpression1.txt b/testTs/expect/classes/classExpressions/classExpression1.txt index c3f3a54c625f22dcd929a11f23988b9a167d314e..04d93508116ebbc0a0025aa87b048f32198fa091 100644 --- a/testTs/expect/classes/classExpressions/classExpression1.txt +++ b/testTs/expect/classes/classExpressions/classExpression1.txt @@ -1 +1 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} diff --git a/testTs/expect/classes/classExpressions/classExpression2.txt b/testTs/expect/classes/classExpressions/classExpression2.txt index 44b0fc942ef4f0b46ab9749dd9d3721407cbe226..5bb927a5fc0b6317100b8bca161abf8812bee613 100644 --- a/testTs/expect/classes/classExpressions/classExpression2.txt +++ b/testTs/expect/classes/classExpressions/classExpression2.txt @@ -1,3 +1,3 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} diff --git a/testTs/expect/classes/classExpressions/classExpression3.txt b/testTs/expect/classes/classExpressions/classExpression3.txt index 7e712dd6a49e58355a7a5dd8c164896152b7ff5d..126aec14e6d318a31756ce5a06de222f6e81077d 100644 --- a/testTs/expect/classes/classExpressions/classExpression3.txt +++ b/testTs/expect/classes/classExpressions/classExpression3.txt @@ -1,6 +1,6 @@ {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'b'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'a'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'a'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_6'} diff --git a/testTs/expect/classes/classExpressions/classExpression4.txt b/testTs/expect/classes/classExpressions/classExpression4.txt index 6485f38a41e519db941ff3f30e05f13b1e5fd5e9..6a21de3c5ccfb6a76f38396829062ee3ebfd1b46 100644 --- a/testTs/expect/classes/classExpressions/classExpression4.txt +++ b/testTs/expect/classes/classExpressions/classExpression4.txt @@ -1,3 +1,3 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} diff --git a/testTs/expect/classes/classExpressions/modifierOnClassExpressionMemberInFunction.txt b/testTs/expect/classes/classExpressions/modifierOnClassExpressionMemberInFunction.txt index 7da8286419126f61ef3f32ecda6a8f0f501ffeff..f4a060c8d16ec80fc4daad86e69375a5bea68277 100644 --- a/testTs/expect/classes/classExpressions/modifierOnClassExpressionMemberInFunction.txt +++ b/testTs/expect/classes/classExpressions/modifierOnClassExpressionMemberInFunction.txt @@ -1,4 +1,4 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'g'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prop1'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prop2'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prop1'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prop2'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_4'} diff --git a/testTs/expect/classes/constructorDeclarations/constructorParameters/declarationEmitReadonly.txt b/testTs/expect/classes/constructorDeclarations/constructorParameters/declarationEmitReadonly.txt index 470cd39b98def141ada4b9a432f2924a8fb92766..f2fafd824fd7a2687e426a9b95dc4aa67d711a24 100644 --- a/testTs/expect/classes/constructorDeclarations/constructorParameters/declarationEmitReadonly.txt +++ b/testTs/expect/classes/constructorDeclarations/constructorParameters/declarationEmitReadonly.txt @@ -1,3 +1,3 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} diff --git a/testTs/expect/classes/constructorDeclarations/quotedConstructors.txt b/testTs/expect/classes/constructorDeclarations/quotedConstructors.txt index f8a8087fe8a6b31ad00879de7c0d44b08e9e6e49..cfef23fdac8bc916c90cb90129a6e71230344a04 100644 --- a/testTs/expect/classes/constructorDeclarations/quotedConstructors.txt +++ b/testTs/expect/classes/constructorDeclarations/quotedConstructors.txt @@ -1,12 +1,12 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_10'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_10'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_11'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_10'}], 'k': '_12'} diff --git a/testTs/expect/classes/members/inheritanceAndOverriding/derivedClassOverridesIndexersWithAssignmentCompatibility.txt b/testTs/expect/classes/members/inheritanceAndOverriding/derivedClassOverridesIndexersWithAssignmentCompatibility.txt index a44306abf2e4a7be855f828a29219723313a886e..e39347e8d54823eb98ce13c2af5c38d4fc1d5d75 100644 --- a/testTs/expect/classes/members/inheritanceAndOverriding/derivedClassOverridesIndexersWithAssignmentCompatibility.txt +++ b/testTs/expect/classes/members/inheritanceAndOverriding/derivedClassOverridesIndexersWithAssignmentCompatibility.txt @@ -1,6 +1,6 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} diff --git a/testTs/expect/classes/members/instanceAndStaticMembers/typeOfThisInStaticMembers.txt b/testTs/expect/classes/members/instanceAndStaticMembers/typeOfThisInStaticMembers.txt index a189b29b07c88f7fb7ee778ee135fbee2972e03e..a99e68a9918c407b9cba4357faaecb242af8469b 100644 --- a/testTs/expect/classes/members/instanceAndStaticMembers/typeOfThisInStaticMembers.txt +++ b/testTs/expect/classes/members/instanceAndStaticMembers/typeOfThisInStaticMembers.txt @@ -1,8 +1,8 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 24, 'v': '_3'}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 24, 'v': '_3'}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_4'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_6'}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'test'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 24, 'v': '_7'}], 'k': '_5'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_6'}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'test'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 24, 'v': '_7'}], 'k': '_5'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_6'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_5'}], 'k': '_8'} diff --git a/testTs/expect/classes/propertyMemberDeclarations/memberFunctionDeclarations/staticFactory1.txt b/testTs/expect/classes/propertyMemberDeclarations/memberFunctionDeclarations/staticFactory1.txt index 08ca134069bbab69913b519cc712de3652969b9d..65664c2e016f825395739388ce69a9d5443df99b 100644 --- a/testTs/expect/classes/propertyMemberDeclarations/memberFunctionDeclarations/staticFactory1.txt +++ b/testTs/expect/classes/propertyMemberDeclarations/memberFunctionDeclarations/staticFactory1.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'create'}, {'t': 24, 'v': '_3'}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'create'}, {'t': 24, 'v': '_3'}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'create'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_4'} diff --git a/testTs/expect/classes/propertyMemberDeclarations/staticAndNonStaticPropertiesSameName.txt b/testTs/expect/classes/propertyMemberDeclarations/staticAndNonStaticPropertiesSameName.txt index 12b036d92e193edcad46c278c41a55c964383316..795e0a2cb72bf0958f2589847384339b06499508 100644 --- a/testTs/expect/classes/propertyMemberDeclarations/staticAndNonStaticPropertiesSameName.txt +++ b/testTs/expect/classes/propertyMemberDeclarations/staticAndNonStaticPropertiesSameName.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_3'}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_3'}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_4'} diff --git a/testTs/expect/classes/propertyMemberDeclarations/staticPropertyAndFunctionWithSameName.txt b/testTs/expect/classes/propertyMemberDeclarations/staticPropertyAndFunctionWithSameName.txt index e525cc4ed09899b0a139660210560a84e113342c..efaeb4e0bee38921ae0ccfe381fe97d7abddbd1e 100644 --- a/testTs/expect/classes/propertyMemberDeclarations/staticPropertyAndFunctionWithSameName.txt +++ b/testTs/expect/classes/propertyMemberDeclarations/staticPropertyAndFunctionWithSameName.txt @@ -1,5 +1,5 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_5'} diff --git a/testTs/expect/classes/propertyMemberDeclarations/staticPropertyNameConflictsInAmbientContext.txt b/testTs/expect/classes/propertyMemberDeclarations/staticPropertyNameConflictsInAmbientContext.txt index 5515d14560ca6b992deeeadbfaf5161a32f7b384..cb8f2d5f97e80038a0ff7dc8c9219168bcce07c8 100644 --- a/testTs/expect/classes/propertyMemberDeclarations/staticPropertyNameConflictsInAmbientContext.txt +++ b/testTs/expect/classes/propertyMemberDeclarations/staticPropertyNameConflictsInAmbientContext.txt @@ -1,29 +1,29 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'name'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'name'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'name'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'name'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'name'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'name'}, {'t': 24, 'v': '_4'}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'name'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'name'}, {'t': 24, 'v': '_4'}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'name'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'name'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'length'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'length'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'length'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'length'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_8'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'length'}, {'t': 24, 'v': '_11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'length'}, {'t': 24, 'v': '_10'}], 'k': '_9'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'length'}, {'t': 24, 'v': '_11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'length'}, {'t': 24, 'v': '_10'}], 'k': '_9'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'length'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 1}], 'k': '_10'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'length'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 1}], 'k': '_11'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_9'}], 'k': '_12'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prototype'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prototype'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_13'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prototype'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prototype'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_13'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_13'}], 'k': '_14'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prototype'}, {'t': 24, 'v': '_16'}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prototype'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_15'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prototype'}, {'t': 24, 'v': '_16'}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prototype'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_15'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'prototype'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_16'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_15'}], 'k': '_17'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'caller'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'caller'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_18'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'caller'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'caller'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_18'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_18'}], 'k': '_19'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'caller'}, {'t': 24, 'v': '_22'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'caller'}, {'t': 24, 'v': '_21'}], 'k': '_20'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'caller'}, {'t': 24, 'v': '_22'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'caller'}, {'t': 24, 'v': '_21'}], 'k': '_20'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'caller'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_21'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'caller'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_22'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_20'}], 'k': '_23'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'arguments'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'arguments'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_24'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'arguments'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'arguments'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_24'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_24'}], 'k': '_25'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'arguments'}, {'t': 24, 'v': '_28'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'arguments'}, {'t': 24, 'v': '_27'}], 'k': '_26'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'arguments'}, {'t': 24, 'v': '_28'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'arguments'}, {'t': 24, 'v': '_27'}], 'k': '_26'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'arguments'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_27'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'arguments'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_28'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_26'}], 'k': '_29'} diff --git a/testTs/expect/controlFlow/controlFlowSuperPropertyAccess.txt b/testTs/expect/controlFlow/controlFlowSuperPropertyAccess.txt index 31670798f9e165594e28f304ff25d4d9eadcc37e..8d892722109dcbb7f67f881d6da199d01672cf7d 100644 --- a/testTs/expect/controlFlow/controlFlowSuperPropertyAccess.txt +++ b/testTs/expect/controlFlow/controlFlowSuperPropertyAccess.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'm'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'm'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'm'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 3}], 'k': '_2'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'body'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'body'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'} diff --git a/testTs/expect/controlFlow/typeGuardsTypeParameters.txt b/testTs/expect/controlFlow/typeGuardsTypeParameters.txt index 2732833cb259b9c533c377e58252cad6fa7a7d6f..0eedfd8191c0a22af6f70c27ca08e66888c6e95a 100644 --- a/testTs/expect/controlFlow/typeGuardsTypeParameters.txt +++ b/testTs/expect/controlFlow/typeGuardsTypeParameters.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prop'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prop'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'} diff --git a/testTs/expect/declarationEmit/declarationEmitWorkWithInlineComments.txt b/testTs/expect/declarationEmit/declarationEmitWorkWithInlineComments.txt index bc56ad9cf79561249486e446ef6a238a64b893e6..dba09731752c4069613111421f0da0654f477dd1 100644 --- a/testTs/expect/declarationEmit/declarationEmitWorkWithInlineComments.txt +++ b/testTs/expect/declarationEmit/declarationEmitWorkWithInlineComments.txt @@ -1,9 +1,9 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 10}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} diff --git a/testTs/expect/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithInvalidStaticToString.txt b/testTs/expect/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithInvalidStaticToString.txt index 92ed3c53fb9df4d42efa677715da671425861a7c..c47eb770668c65073563114dd2a1f7f2b0a6031e 100644 --- a/testTs/expect/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithInvalidStaticToString.txt +++ b/testTs/expect/expressions/binaryOperators/instanceofOperator/instanceofOperatorWithInvalidStaticToString.txt @@ -1,12 +1,12 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_4'}, {'t': 25, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'toString'}, {'t': 24, 'v': '_3'}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'toString'}, {'t': 24, 'v': '_3'}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'toString'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 3}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_8'}, {'t': 25, 'v': 0}], 'k': '_5'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'toNumber'}, {'t': 24, 'v': '_7'}], 'k': '_6'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'toNumber'}, {'t': 24, 'v': '_7'}], 'k': '_6'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'toNumber'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 3}], 'k': '_7'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_6'}], 'k': '_8'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'baz'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_12'}, {'t': 25, 'v': 0}], 'k': '_9'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'toString'}, {'t': 24, 'v': '_11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_10'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'toString'}, {'t': 24, 'v': '_11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_10'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'toString'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 3}], 'k': '_11'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_10'}], 'k': '_12'} diff --git a/testTs/expect/expressions/typeGuards/TypeGuardWithArrayUnion.txt b/testTs/expect/expressions/typeGuards/TypeGuardWithArrayUnion.txt index 54e637662910299cdec52aba45094ffb4fba9ac5..0b2501fc44a0a4dafc1a5889dcb9d38a5bbda8ae 100644 --- a/testTs/expect/expressions/typeGuards/TypeGuardWithArrayUnion.txt +++ b/testTs/expect/expressions/typeGuards/TypeGuardWithArrayUnion.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'value'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'value'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'saySize'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_3'}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 4}, {'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}, {'t': 24, 'v': '_5'}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_4'} diff --git a/testTs/expect/externalModules/typeOnly/importDefaultNamedType/importDefaultNamedType.txt b/testTs/expect/externalModules/typeOnly/importDefaultNamedType/importDefaultNamedType.txt index e8110382eaf5164bf847213bc0e3a56f4c1a2dca..dbe7d8ae18424bf2812ba2bf9f9a0a6217546cc3 100644 --- a/testTs/expect/externalModules/typeOnly/importDefaultNamedType/importDefaultNamedType.txt +++ b/testTs/expect/externalModules/typeOnly/importDefaultNamedType/importDefaultNamedType.txt @@ -1,2 +1,2 @@ {'lb': [{'t': 2, 'v': 7}, {'t': 5, 'v': '#type#./a'}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} diff --git a/testTs/expect/jsdoc/constructorTagOnClassConstructor.txt b/testTs/expect/jsdoc/constructorTagOnClassConstructor.txt index cf8038ff6635cc74b85843e708172f0a8c19efba..570d4554c11122886aa2bbe8ed9227f368b1b177 100644 --- a/testTs/expect/jsdoc/constructorTagOnClassConstructor.txt +++ b/testTs/expect/jsdoc/constructorTagOnClassConstructor.txt @@ -1,5 +1,5 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_5'} diff --git a/testTs/expect/jsdoc/declarations/jsDeclarationsThisTypes.txt b/testTs/expect/jsdoc/declarations/jsDeclarationsThisTypes.txt index bef0783bfe7eebc1ed94d603d92d5cf8852bc8d2..ddc11fa4f654ff49fbc47ecdd7d1ea28d0662c3f 100644 --- a/testTs/expect/jsdoc/declarations/jsDeclarationsThisTypes.txt +++ b/testTs/expect/jsdoc/declarations/jsDeclarationsThisTypes.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'method'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'method'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'method'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'verify'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} diff --git a/testTs/expect/jsdoc/jsdocImplements_namespacedInterface.txt b/testTs/expect/jsdoc/jsdocImplements_namespacedInterface.txt index d1c9e27e4ce702449736eb61a905b08870cf5bf4..965b58f50f0c39a23580280d85e5c77a0b48619d 100644 --- a/testTs/expect/jsdoc/jsdocImplements_namespacedInterface.txt +++ b/testTs/expect/jsdoc/jsdocImplements_namespacedInterface.txt @@ -1,6 +1,6 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'mNumber'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'mNumber'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'mNumber'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'gen'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'gen'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'gen'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} diff --git a/testTs/expect/jsdoc/jsdocTypeReferenceUseBeforeDef.txt b/testTs/expect/jsdoc/jsdocTypeReferenceUseBeforeDef.txt index 2f2d6dc5c479a3f5123ab81497ccaac05843ad40..bdb58c8ffeb6c063e7e7861723ca4a8c0165c714 100644 --- a/testTs/expect/jsdoc/jsdocTypeReferenceUseBeforeDef.txt +++ b/testTs/expect/jsdoc/jsdocTypeReferenceUseBeforeDef.txt @@ -1,2 +1,2 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} diff --git a/testTs/expect/parser/ecmascript5/ClassDeclarations/parserClassDeclaration23.txt b/testTs/expect/parser/ecmascript5/ClassDeclarations/parserClassDeclaration23.txt index 2f2d6dc5c479a3f5123ab81497ccaac05843ad40..bdb58c8ffeb6c063e7e7861723ca4a8c0165c714 100644 --- a/testTs/expect/parser/ecmascript5/ClassDeclarations/parserClassDeclaration23.txt +++ b/testTs/expect/parser/ecmascript5/ClassDeclarations/parserClassDeclaration23.txt @@ -1,2 +1,2 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} diff --git a/testTs/expect/parser/ecmascript5/ClassDeclarations/parserClassDeclarationIndexSignature1.txt b/testTs/expect/parser/ecmascript5/ClassDeclarations/parserClassDeclarationIndexSignature1.txt index 2f2d6dc5c479a3f5123ab81497ccaac05843ad40..bdb58c8ffeb6c063e7e7861723ca4a8c0165c714 100644 --- a/testTs/expect/parser/ecmascript5/ClassDeclarations/parserClassDeclarationIndexSignature1.txt +++ b/testTs/expect/parser/ecmascript5/ClassDeclarations/parserClassDeclarationIndexSignature1.txt @@ -1,2 +1,2 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} diff --git a/testTs/expect/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration1.txt b/testTs/expect/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration1.txt index bb92f2a92afc9eb3e76d0924d30e5ccb81974887..82776f3c30457112bd18736c9a330d4aa0eddcf7 100644 --- a/testTs/expect/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration1.txt +++ b/testTs/expect/parser/ecmascript5/ConstructorDeclarations/parserConstructorDeclaration1.txt @@ -1,3 +1,3 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} diff --git a/testTs/expect/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic11.txt b/testTs/expect/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic11.txt index 5bdaed1bbdcc82186653fec90a89e425d2821d23..feb682ba7bcaa289581073c9490ada0298e1631d 100644 --- a/testTs/expect/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic11.txt +++ b/testTs/expect/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic11.txt @@ -1,3 +1,3 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'public'}, {'t': 24, 'v': '_2'}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'public'}, {'t': 24, 'v': '_2'}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'public'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} diff --git a/testTs/expect/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic14.txt b/testTs/expect/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic14.txt index 5bdaed1bbdcc82186653fec90a89e425d2821d23..feb682ba7bcaa289581073c9490ada0298e1631d 100644 --- a/testTs/expect/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic14.txt +++ b/testTs/expect/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic14.txt @@ -1,3 +1,3 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'public'}, {'t': 24, 'v': '_2'}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'public'}, {'t': 24, 'v': '_2'}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'public'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} diff --git a/testTs/expect/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic4.txt b/testTs/expect/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic4.txt index 889d1de80b311ed202aadab704e93357593f8dec..974080df21825005b7445c511b6eb4fc45a135cc 100644 --- a/testTs/expect/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic4.txt +++ b/testTs/expect/parser/ecmascript5/ErrorRecovery/AccessibilityAfterStatic/parserAccessibilityAfterStatic4.txt @@ -1,2 +1,2 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'public'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'public'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} diff --git a/testTs/expect/parser/ecmascript5/Generics/parserGenericClass1.txt b/testTs/expect/parser/ecmascript5/Generics/parserGenericClass1.txt index 2f2d6dc5c479a3f5123ab81497ccaac05843ad40..bdb58c8ffeb6c063e7e7861723ca4a8c0165c714 100644 --- a/testTs/expect/parser/ecmascript5/Generics/parserGenericClass1.txt +++ b/testTs/expect/parser/ecmascript5/Generics/parserGenericClass1.txt @@ -1,2 +1,2 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} diff --git a/testTs/expect/parser/ecmascript5/Generics/parserGenericClass2.txt b/testTs/expect/parser/ecmascript5/Generics/parserGenericClass2.txt index 2f2d6dc5c479a3f5123ab81497ccaac05843ad40..bdb58c8ffeb6c063e7e7861723ca4a8c0165c714 100644 --- a/testTs/expect/parser/ecmascript5/Generics/parserGenericClass2.txt +++ b/testTs/expect/parser/ecmascript5/Generics/parserGenericClass2.txt @@ -1,2 +1,2 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} diff --git a/testTs/expect/parser/ecmascript5/Generics/parserGenericConstraint1.txt b/testTs/expect/parser/ecmascript5/Generics/parserGenericConstraint1.txt index 2f2d6dc5c479a3f5123ab81497ccaac05843ad40..bdb58c8ffeb6c063e7e7861723ca4a8c0165c714 100644 --- a/testTs/expect/parser/ecmascript5/Generics/parserGenericConstraint1.txt +++ b/testTs/expect/parser/ecmascript5/Generics/parserGenericConstraint1.txt @@ -1,2 +1,2 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} diff --git a/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration1.txt b/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration1.txt index 2f2d6dc5c479a3f5123ab81497ccaac05843ad40..bdb58c8ffeb6c063e7e7861723ca4a8c0165c714 100644 --- a/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration1.txt +++ b/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration1.txt @@ -1,2 +1,2 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} diff --git a/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration2.txt b/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration2.txt index dff14d69795eef57e8e8fa38a7b68a7840d064cb..21aa19a67366cde3fafda8fb2d9f6aecfe2f3379 100644 --- a/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration2.txt +++ b/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration2.txt @@ -1,2 +1,2 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'v'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'v'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} diff --git a/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration3.txt b/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration3.txt index dff14d69795eef57e8e8fa38a7b68a7840d064cb..21aa19a67366cde3fafda8fb2d9f6aecfe2f3379 100644 --- a/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration3.txt +++ b/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration3.txt @@ -1,2 +1,2 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'v'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'v'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} diff --git a/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration4.txt b/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration4.txt index dff14d69795eef57e8e8fa38a7b68a7840d064cb..21aa19a67366cde3fafda8fb2d9f6aecfe2f3379 100644 --- a/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration4.txt +++ b/testTs/expect/parser/ecmascript5/IndexMemberDeclarations/parserIndexMemberDeclaration4.txt @@ -1,2 +1,2 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'v'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'v'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} diff --git a/testTs/expect/parser/ecmascript5/Protected/Protected5.txt b/testTs/expect/parser/ecmascript5/Protected/Protected5.txt index 235bd1e07e370961246417498c17a42e29d41582..4e7b4c878b6977a9db12e58eb87673958df195c6 100644 --- a/testTs/expect/parser/ecmascript5/Protected/Protected5.txt +++ b/testTs/expect/parser/ecmascript5/Protected/Protected5.txt @@ -1,3 +1,3 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'm'}, {'t': 24, 'v': '_2'}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'm'}, {'t': 24, 'v': '_2'}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 6}, {'t': 5, 'v': 'm'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} diff --git a/testTs/expect/parser/ecmascript5/parserUnicode3.txt b/testTs/expect/parser/ecmascript5/parserUnicode3.txt index 2f2d6dc5c479a3f5123ab81497ccaac05843ad40..bdb58c8ffeb6c063e7e7861723ca4a8c0165c714 100644 --- a/testTs/expect/parser/ecmascript5/parserUnicode3.txt +++ b/testTs/expect/parser/ecmascript5/parserUnicode3.txt @@ -1,2 +1,2 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} diff --git a/testTs/expect/types/any/assignEveryTypeToAny.txt b/testTs/expect/types/any/assignEveryTypeToAny.txt old mode 100644 new mode 100755 index b2f0d383557df4833999f5dccb7a6ae622ecf89d..88f971decb27014716639efe2f1147489d60588a --- a/testTs/expect/types/any/assignEveryTypeToAny.txt +++ b/testTs/expect/types/any/assignEveryTypeToAny.txt @@ -1,5 +1,5 @@ {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_3'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 4}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'j'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} diff --git a/testTs/expect/types/conditional/variance.txt b/testTs/expect/types/conditional/variance.txt index c06fa540995387f62d300bcada9254b712f5aec3..c4e38bfecd1109d309be4cfc54c5811269346a42 100644 --- a/testTs/expect/types/conditional/variance.txt +++ b/testTs/expect/types/conditional/variance.txt @@ -1,5 +1,5 @@ {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'prop'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'cast'}, {'t': 24, 'v': '_5'}, {'t': 5, 'v': 'pushThis'}, {'t': 24, 'v': '_6'}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'instance'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'cast'}, {'t': 24, 'v': '_5'}, {'t': 5, 'v': 'pushThis'}, {'t': 24, 'v': '_6'}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'instance'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_3'} {'lb': [{'t': 2, 'v': 5}, {'t': 24, 'v': '_3'}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'cast'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} diff --git a/testTs/expect/types/import/importTypeAmbient.txt b/testTs/expect/types/import/importTypeAmbient.txt index d8857161a7a11e0bbb50956e0a0395c5ba32c690..5051922b285621c1131103a30af271176677b314 100644 --- a/testTs/expect/types/import/importTypeAmbient.txt +++ b/testTs/expect/types/import/importTypeAmbient.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'item'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'item'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 3}, {'t': 5, 'v': 'a'}, {'t': 25, 'v': 4}, {'t': 5, 'v': 'b'}, {'t': 25, 'v': 1}, {'t': 5, 'v': 'c'}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_4'} diff --git a/testTs/expect/types/keyof/keyofAndIndexedAccess.txt b/testTs/expect/types/keyof/keyofAndIndexedAccess.txt index c825b995261a52447b57684d0741b87ce5f077d9..1d705f60f9b8097da67140b364ad2c26ea532e41 100644 --- a/testTs/expect/types/keyof/keyofAndIndexedAccess.txt +++ b/testTs/expect/types/keyof/keyofAndIndexedAccess.txt @@ -1,7 +1,7 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'name'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'width'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'height'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'visible'}, {'t': 25, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'name'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'width'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'height'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'visible'}, {'t': 25, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'tag'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'name'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'price'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'visible'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'name'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'price'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'visible'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 4}, {'t': 2, 'v': 2}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}], 'k': '_5'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'getProperty'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_6'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'setProperty'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_7'} @@ -11,7 +11,7 @@ {'lb': [{'t': 2, 'v': 5}, {'t': 24, 'v': '_9'}], 'k': '_11'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f12'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_12'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f13'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_13'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'props'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'getProperty'}, {'t': 24, 'v': '_15'}, {'t': 5, 'v': 'setProperty'}, {'t': 24, 'v': '_16'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_14'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'props'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'getProperty'}, {'t': 24, 'v': '_15'}, {'t': 5, 'v': 'setProperty'}, {'t': 24, 'v': '_16'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_14'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'getProperty'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_15'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'setProperty'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_16'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_14'}], 'k': '_17'} @@ -24,7 +24,7 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f33'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_24'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f34'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_26'}, {'t': 25, 'v': 0}], 'k': '_25'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_26'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'y'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'z'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_27'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'y'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'z'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_27'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f40'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_29'}, {'t': 25, 'v': 0}], 'k': '_28'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_27'}], 'k': '_29'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f50'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_30'} @@ -46,7 +46,7 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f82'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_46'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f83'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_47'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f84'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_48'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 5, 'v': 'get'}, {'t': 24, 'v': '_50'}, {'t': 5, 'v': 'set'}, {'t': 24, 'v': '_51'}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_52'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_49'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 5, 'v': 'get'}, {'t': 24, 'v': '_50'}, {'t': 5, 'v': 'set'}, {'t': 24, 'v': '_51'}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_52'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_49'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'get'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_50'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'set'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_51'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_52'} @@ -57,7 +57,7 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f92'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_57'} {'lb': [{'t': 2, 'v': 4}, {'t': 2, 'v': 3}, {'t': 24, 'v': '_59'}, {'t': 25, 'v': 6}, {'t': 25, 'v': 7}], 'k': '_58'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 0}], 'k': '_59'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'get'}, {'t': 24, 'v': '_61'}, {'t': 5, 'v': 'set'}, {'t': 24, 'v': '_62'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_60'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'get'}, {'t': 24, 'v': '_61'}, {'t': 5, 'v': 'set'}, {'t': 24, 'v': '_62'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_60'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'get'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_61'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'set'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_62'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_60'}], 'k': '_63'} @@ -65,7 +65,7 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_65'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'getParts'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_66'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_64'}], 'k': '_67'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'parts'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_69'}, {'t': 5, 'v': 'getParts'}, {'t': 24, 'v': '_70'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_68'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'parts'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_69'}, {'t': 5, 'v': 'getParts'}, {'t': 24, 'v': '_70'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_68'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_69'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'getParts'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_70'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_68'}], 'k': '_71'} @@ -73,7 +73,7 @@ {'lb': [{'t': 2, 'v': 4}, {'t': 2, 'v': 2}, {'t': 25, 'v': 4}, {'t': 25, 'v': 1}], 'k': '_73'} {'lb': [{'t': 2, 'v': 5}, {'t': 24, 'v': '_73'}], 'k': '_74'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_75'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_77'}, {'t': 5, 'v': 'get'}, {'t': 24, 'v': '_79'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_76'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_77'}, {'t': 5, 'v': 'get'}, {'t': 24, 'v': '_79'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_76'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_78'}, {'t': 25, 'v': 0}], 'k': '_77'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'data'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'computed'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_78'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'get'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_79'} @@ -85,14 +85,14 @@ {'lb': [{'t': 2, 'v': 4}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 7}], 'k': '_85'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'updateIds2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 24, 'v': '_87'}, {'t': 25, 'v': 0}], 'k': '_86'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 4}], 'k': '_87'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'props'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_88'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'props'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_88'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_88'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_90'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_89'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_90'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_89'}], 'k': '_91'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'childFormFactories'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'set'}, {'t': 24, 'v': '_93'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_92'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'childFormFactories'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'set'}, {'t': 24, 'v': '_93'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_92'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'set'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_93'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_92'}], 'k': '_94'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'props'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_96'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_95'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'props'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_96'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_95'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_96'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_95'}], 'k': '_97'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_98'} @@ -106,14 +106,14 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'fn'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_106'} {'lb': [{'t': 2, 'v': 4}, {'t': 2, 'v': 3}, {'t': 24, 'v': '_108'}, {'t': 25, 'v': 7}, {'t': 25, 'v': 6}], 'k': '_107'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 0}], 'k': '_108'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_110'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_109'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_110'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_109'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_110'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_109'}], 'k': '_111'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'ff1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 1}], 'k': '_112'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'ff2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 1}], 'k': '_113'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_114'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_115'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_117'}, {'t': 5, 'v': 'get'}, {'t': 24, 'v': '_119'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_116'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_117'}, {'t': 5, 'v': 'get'}, {'t': 24, 'v': '_119'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_116'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_118'}, {'t': 25, 'v': 0}], 'k': '_117'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'data'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'computed'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_118'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'get'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_119'} diff --git a/testTs/expect/types/literal/literalTypes2.txt b/testTs/expect/types/literal/literalTypes2.txt index c3f1903f21ecdaf6664f45e37f1ae6b0c89d1a12..e06419f45a46ef0ee83bf9434565f09bd1c86b78 100644 --- a/testTs/expect/types/literal/literalTypes2.txt +++ b/testTs/expect/types/literal/literalTypes2.txt @@ -2,7 +2,7 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 4}, {'t': 25, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 2}, {'t': 25, 'v': 76}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'kind'}, {'t': 25, 'v': 1}], 'k': '_4'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 16}, {'t': 5, 'v': 'x1'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'x2'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'x3'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'x4'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'x5'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'x6'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'x7'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'x8'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'c1'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c2'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c3'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c4'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c5'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c6'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c7'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c8'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_5'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 16}, {'t': 5, 'v': 'x1'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'x2'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'x3'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'x4'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'x5'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'x6'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'x7'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'x8'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'c1'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c2'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c3'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c4'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c5'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c6'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c7'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c8'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_5'}], 'k': '_6'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'a'}, {'t': 24, 'v': '_9'}, {'t': 5, 'v': 'b'}, {'t': 24, 'v': '_10'}], 'k': '_8'} @@ -16,7 +16,7 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f10'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_16'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_17'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f12'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_18'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_20'}, {'t': 5, 'v': 'bar'}, {'t': 24, 'v': '_21'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_19'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_20'}, {'t': 5, 'v': 'bar'}, {'t': 24, 'v': '_21'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_19'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_20'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_21'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_19'}], 'k': '_22'} diff --git a/testTs/expect/types/localTypes/localTypes2.txt b/testTs/expect/types/localTypes/localTypes2.txt index 2166411e4907bd2b1d772e7a662e06591356fe2f..763fc1ca6b7715d16d51b0ade69d104b93bbcddc 100644 --- a/testTs/expect/types/localTypes/localTypes2.txt +++ b/testTs/expect/types/localTypes/localTypes2.txt @@ -1,14 +1,14 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_5'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_6'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_7'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_8'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_9'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_8'}], 'k': '_10'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_11'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_12'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'y'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_13'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'y'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_13'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_13'}], 'k': '_14'} diff --git a/testTs/expect/types/localTypes/localTypes3.txt b/testTs/expect/types/localTypes/localTypes3.txt index 6d4b4ea3a7e2d0a96e8cd24bd6738ef5c25c1633..7600a38f5a031d3437839bf1b7fe9974f16ca9dc 100644 --- a/testTs/expect/types/localTypes/localTypes3.txt +++ b/testTs/expect/types/localTypes/localTypes3.txt @@ -1,14 +1,14 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_5'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_6'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_7'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_8'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_9'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_8'}], 'k': '_10'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_11'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_12'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'y'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_13'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'y'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_13'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_13'}], 'k': '_14'} diff --git a/testTs/expect/types/localTypes/localTypes5.txt b/testTs/expect/types/localTypes/localTypes5.txt index 076efee61661c4aa99f43391008dc2d175bd8639..9b0a4d50f4985964df70ba3b48f75fac4194f5df 100644 --- a/testTs/expect/types/localTypes/localTypes5.txt +++ b/testTs/expect/types/localTypes/localTypes5.txt @@ -1,5 +1,5 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'm'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'm'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'm'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_5'} diff --git a/testTs/expect/types/mapped/mappedTypes3.txt b/testTs/expect/types/mapped/mappedTypes3.txt index 15c9fd2769c6d1ca5fbc12864d40be6bc7b29aa0..eee11f5678a90c16de4a054cedbc5de417535099 100644 --- a/testTs/expect/types/mapped/mappedTypes3.txt +++ b/testTs/expect/types/mapped/mappedTypes3.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'value'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'value'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_3'}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'isPerfect'}, {'t': 25, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'weight'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'} diff --git a/testTs/expect/types/mapped/mappedTypesAndObjects.txt b/testTs/expect/types/mapped/mappedTypesAndObjects.txt index 11115d3e4d62f1ec5116cc0e5631e0eb7c8077fc..57c470e7192229caf2d7e3a44b35670bdb781c5e 100644 --- a/testTs/expect/types/mapped/mappedTypesAndObjects.txt +++ b/testTs/expect/types/mapped/mappedTypesAndObjects.txt @@ -3,5 +3,5 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'values'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'values'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_6'}], 'k': '_7'} diff --git a/testTs/expect/types/members/classWithProtectedProperty.txt b/testTs/expect/types/members/classWithProtectedProperty.txt index 106d4ad5251ecefcf8c96a27e82217ea003d6c00..1ccab9827844e9353da84a0c649ff382968e3f41 100644 --- a/testTs/expect/types/members/classWithProtectedProperty.txt +++ b/testTs/expect/types/members/classWithProtectedProperty.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'a'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'b'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'd'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'e'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'g'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_3'}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'a'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'b'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'd'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'e'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'g'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_3'}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'c'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 6}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_4'} diff --git a/testTs/expect/types/members/classWithPublicProperty.txt b/testTs/expect/types/members/classWithPublicProperty.txt index 231510909ebee7d4611c6f01b176dc6ed51f9ab8..7a4aead33042db401b3faa9fe99ce7af27f6dadf 100644 --- a/testTs/expect/types/members/classWithPublicProperty.txt +++ b/testTs/expect/types/members/classWithPublicProperty.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'a'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'b'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'd'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'e'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'g'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_3'}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'a'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'b'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'd'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'c'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'e'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'g'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_3'}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'c'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_4'} diff --git a/testTs/expect/types/members/typesWithSpecializedCallSignatures.txt b/testTs/expect/types/members/typesWithSpecializedCallSignatures.txt index ff4736ee4a070c34e8bfb53e2b68ea158f4c7212..87a15279c1965027e3e6412ad42aa52d6d70db84 100644 --- a/testTs/expect/types/members/typesWithSpecializedCallSignatures.txt +++ b/testTs/expect/types/members/typesWithSpecializedCallSignatures.txt @@ -1,7 +1,7 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'baz'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 24, 'v': '_6'}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_6'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 24, 'v': '_8'}], 'k': '_7'} diff --git a/testTs/expect/types/members/typesWithSpecializedConstructSignatures.txt b/testTs/expect/types/members/typesWithSpecializedConstructSignatures.txt index 6f428a15f76bf601e3828be2b93b71a2e6b67c27..78b022e7a89b131356b99e0f38c5c7ed68bca2f0 100644 --- a/testTs/expect/types/members/typesWithSpecializedConstructSignatures.txt +++ b/testTs/expect/types/members/typesWithSpecializedConstructSignatures.txt @@ -1,7 +1,7 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'baz'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_6'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_7'} diff --git a/testTs/expect/types/namedTypes/classWithOptionalParameter.txt b/testTs/expect/types/namedTypes/classWithOptionalParameter.txt index c4915193c701c6b97fd7d51355c71bf73a5ca198..0b9d803bd8bdd31a0f1276135a9a5f0b7968161a 100644 --- a/testTs/expect/types/namedTypes/classWithOptionalParameter.txt +++ b/testTs/expect/types/namedTypes/classWithOptionalParameter.txt @@ -1,6 +1,6 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} diff --git a/testTs/expect/types/namedTypes/optionalMethods.txt b/testTs/expect/types/namedTypes/optionalMethods.txt index c0b4a6b6ba8da0cb91a7c3f12d1bda61f17be2c6..b80dbd9c2ec27b8cebff4f61863c05f8aebff52a 100644 --- a/testTs/expect/types/namedTypes/optionalMethods.txt +++ b/testTs/expect/types/namedTypes/optionalMethods.txt @@ -2,14 +2,14 @@ {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'a'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'b'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}, {'t': 24, 'v': '_4'}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 1}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'g'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 1}], 'k': '_4'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 5, 'v': 'a'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'b'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'c'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_6'}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_7'}, {'t': 5, 'v': 'g'}, {'t': 24, 'v': '_8'}, {'t': 5, 'v': 'h'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_5'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 5, 'v': 'a'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'b'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'c'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_6'}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_7'}, {'t': 5, 'v': 'g'}, {'t': 24, 'v': '_8'}, {'t': 5, 'v': 'h'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_6'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'g'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 1}], 'k': '_8'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'h'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_9'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_5'}], 'k': '_10'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'test2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_10'}, {'t': 25, 'v': 0}], 'k': '_11'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'a'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_13'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_12'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'a'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_13'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_12'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 1}], 'k': '_13'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_12'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'a'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_15'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_14'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 1}], 'k': '_15'} diff --git a/testTs/expect/types/never/neverType.txt b/testTs/expect/types/never/neverType.txt index fe7c720cc889135d21f34e47a09abdad2847ab4d..78dbee6fb7ce660a50c0c9bc378ed4a60d13a853 100644 --- a/testTs/expect/types/never/neverType.txt +++ b/testTs/expect/types/never/neverType.txt @@ -9,7 +9,7 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'move2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_8'}, {'t': 25, 'v': 0}], 'k': '_9'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'check'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_11'}, {'t': 25, 'v': 0}], 'k': '_10'} {'lb': [{'t': 2, 'v': 4}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 7}], 'k': '_11'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'void1'}, {'t': 24, 'v': '_13'}, {'t': 5, 'v': 'void2'}, {'t': 24, 'v': '_14'}, {'t': 5, 'v': 'never1'}, {'t': 24, 'v': '_15'}, {'t': 5, 'v': 'never2'}, {'t': 24, 'v': '_16'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_12'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'void1'}, {'t': 24, 'v': '_13'}, {'t': 5, 'v': 'void2'}, {'t': 24, 'v': '_14'}, {'t': 5, 'v': 'never1'}, {'t': 24, 'v': '_15'}, {'t': 5, 'v': 'never2'}, {'t': 24, 'v': '_16'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_12'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'void1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_13'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'void2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_14'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'never1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_15'} diff --git a/testTs/expect/types/objectTypeLiteral/callSignatures/parametersWithNoAnnotationAreAny.txt b/testTs/expect/types/objectTypeLiteral/callSignatures/parametersWithNoAnnotationAreAny.txt index 63f8574305d43744b3f716807e2081e0a72061cb..11fb9d822f293135ecb22db621c2984a55208670 100644 --- a/testTs/expect/types/objectTypeLiteral/callSignatures/parametersWithNoAnnotationAreAny.txt +++ b/testTs/expect/types/objectTypeLiteral/callSignatures/parametersWithNoAnnotationAreAny.txt @@ -1,5 +1,5 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_4'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}], 'k': '_5'} diff --git a/testTs/expect/types/objectTypeLiteral/callSignatures/specializedSignatureIsSubtypeOfNonSpecializedSignature.txt b/testTs/expect/types/objectTypeLiteral/callSignatures/specializedSignatureIsSubtypeOfNonSpecializedSignature.txt index dc8fc4c76e26ef33cc7d1562499db42bb018893f..26ee41a2d37dfd1f3a176fe309bdd9a8b32da90c 100644 --- a/testTs/expect/types/objectTypeLiteral/callSignatures/specializedSignatureIsSubtypeOfNonSpecializedSignature.txt +++ b/testTs/expect/types/objectTypeLiteral/callSignatures/specializedSignatureIsSubtypeOfNonSpecializedSignature.txt @@ -1,16 +1,16 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_9'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_10'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_11'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_12'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_17'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_13'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_17'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_13'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_14'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_15'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_16'} diff --git a/testTs/expect/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.txt b/testTs/expect/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.txt index 8de5ed821a2fbb93e6d50542954ec7749db9f84c..274ede603a1fecaa6bb35e9f3baf8133a3a0dd7d 100644 --- a/testTs/expect/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.txt +++ b/testTs/expect/types/objectTypeLiteral/callSignatures/stringLiteralTypesInImplementationSignatures.txt @@ -1,5 +1,5 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_4'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 2}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}], 'k': '_5'} diff --git a/testTs/expect/types/objectTypeLiteral/callSignatures/typeParameterAsTypeArgument.txt b/testTs/expect/types/objectTypeLiteral/callSignatures/typeParameterAsTypeArgument.txt index f7f9a70836b006d9fd0471a85c30bc30f6aca265..c88a55d859d7676619db6e46e24f983e00d75d9e 100644 --- a/testTs/expect/types/objectTypeLiteral/callSignatures/typeParameterAsTypeArgument.txt +++ b/testTs/expect/types/objectTypeLiteral/callSignatures/typeParameterAsTypeArgument.txt @@ -1,3 +1,3 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_3'} diff --git a/testTs/expect/types/objectTypeLiteral/constructSignatures/constructSignaturesWithIdenticalOverloads.txt b/testTs/expect/types/objectTypeLiteral/constructSignatures/constructSignaturesWithIdenticalOverloads.txt index 220190028b0ac604d59344957ab8e5f94caa84d8..ec8f598eed88a1fc57e1258fd0b5d20705c33650 100644 --- a/testTs/expect/types/objectTypeLiteral/constructSignatures/constructSignaturesWithIdenticalOverloads.txt +++ b/testTs/expect/types/objectTypeLiteral/constructSignatures/constructSignaturesWithIdenticalOverloads.txt @@ -1,9 +1,9 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_5'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_9'} diff --git a/testTs/expect/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloads.txt b/testTs/expect/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloads.txt index 220190028b0ac604d59344957ab8e5f94caa84d8..ec8f598eed88a1fc57e1258fd0b5d20705c33650 100644 --- a/testTs/expect/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloads.txt +++ b/testTs/expect/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloads.txt @@ -1,9 +1,9 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_5'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_9'} diff --git a/testTs/expect/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloadsThatDifferOnlyByReturnType.txt b/testTs/expect/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloadsThatDifferOnlyByReturnType.txt index f206f99a50755f00c1aaea35349d86dd07883cac..2ceb066f3b2b0353385cbe03d03f40e0773f15c5 100644 --- a/testTs/expect/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloadsThatDifferOnlyByReturnType.txt +++ b/testTs/expect/types/objectTypeLiteral/constructSignatures/constructSignaturesWithOverloadsThatDifferOnlyByReturnType.txt @@ -1,7 +1,7 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 24, 'v': '_3'}], 'k': '_7'} diff --git a/testTs/expect/types/objectTypeLiteral/indexSignatures/stringIndexingResults.txt b/testTs/expect/types/objectTypeLiteral/indexSignatures/stringIndexingResults.txt index 2c01a3bd6ff17653a087972d94e68310c1eba286..7da78cb20a7fa92f1edf6c9d43c054f045672d54 100644 --- a/testTs/expect/types/objectTypeLiteral/indexSignatures/stringIndexingResults.txt +++ b/testTs/expect/types/objectTypeLiteral/indexSignatures/stringIndexingResults.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'y'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'y'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'y'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 2}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 4}, {'t': 5, 'v': 'y'}, {'t': 25, 'v': 4}], 'k': '_4'} diff --git a/testTs/expect/types/objectTypeLiteral/propertySignatures/propertyNameWithoutTypeAnnotation.txt b/testTs/expect/types/objectTypeLiteral/propertySignatures/propertyNameWithoutTypeAnnotation.txt index 082513e2a187f9d8cede44f48d95d3c8a8ed0e14..d7900094a4946364a84df964c3e14285db14d63e 100644 --- a/testTs/expect/types/objectTypeLiteral/propertySignatures/propertyNameWithoutTypeAnnotation.txt +++ b/testTs/expect/types/objectTypeLiteral/propertySignatures/propertyNameWithoutTypeAnnotation.txt @@ -1,3 +1,3 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} diff --git a/testTs/expect/types/objectTypeLiteral/propertySignatures/propertyNamesOfReservedWords.txt b/testTs/expect/types/objectTypeLiteral/propertySignatures/propertyNamesOfReservedWords.txt index dbfa9523672a7e7127724d8932f49e9a67a91732..e6282fa3477ef10ee052bcb8e034dfc245c2564e 100644 --- a/testTs/expect/types/objectTypeLiteral/propertySignatures/propertyNamesOfReservedWords.txt +++ b/testTs/expect/types/objectTypeLiteral/propertySignatures/propertyNamesOfReservedWords.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 63}, {'t': 5, 'v': 'abstract'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'as'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'boolean'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'break'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'byte'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'case'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'catch'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'char'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'class'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'continue'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'const'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'debugger'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'default'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'delete'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'do'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'double'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'else'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'enum'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'export'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'extends'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'false'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'final'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'finally'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'float'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'for'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'function'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'goto'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'if'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'implements'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'import'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'in'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'instanceof'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'int'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'interface'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'is'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'long'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'namespace'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'native'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'new'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'null'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'package'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'private'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'protected'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'public'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'return'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'short'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'static'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'super'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'switch'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'synchronized'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'this'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'throw'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'throws'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'transient'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'true'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'try'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'typeof'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'use'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'var'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'void'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'volatile'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'while'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'with'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 63}, {'t': 5, 'v': 'abstract'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'as'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'boolean'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'break'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'byte'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'case'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'catch'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'char'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'class'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'continue'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'const'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'debugger'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'default'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'delete'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'do'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'double'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'else'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'enum'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'export'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'extends'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'false'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'final'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'finally'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'float'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'for'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'function'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'goto'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'if'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'implements'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'import'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'in'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'instanceof'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'int'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'interface'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'is'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'long'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'namespace'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'native'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'new'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'null'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'package'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'private'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'protected'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'public'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'return'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'short'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'static'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'super'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'switch'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'synchronized'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'this'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'throw'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'throws'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'transient'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'true'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'try'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'typeof'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'use'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'var'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'void'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'volatile'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'while'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'with'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 63}, {'t': 5, 'v': 'abstract'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'as'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'boolean'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'break'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'byte'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'case'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'catch'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'char'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'class'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'continue'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'const'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'debugger'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'default'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'delete'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'do'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'double'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'else'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'enum'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'export'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'extends'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'false'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'final'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'finally'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'float'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'for'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'function'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'goto'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'if'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'implements'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'import'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'in'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'instanceof'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'int'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'interface'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'is'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'long'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'namespace'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'native'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'new'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'null'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'package'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'private'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'protected'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'public'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'return'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'short'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'static'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'super'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'switch'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'synchronized'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'this'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'throw'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'throws'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'transient'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'true'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'try'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'typeof'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'use'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'var'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'void'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'volatile'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'while'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'with'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 63}, {'t': 5, 'v': 'abstract'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'as'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'boolean'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'break'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'byte'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'case'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'catch'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'char'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'class'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'continue'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'const'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'debugger'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'default'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'delete'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'do'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'double'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'else'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'enum'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'export'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'extends'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'false'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'final'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'finally'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'float'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'for'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'function'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'goto'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'if'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'implements'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'import'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'in'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'instanceof'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'int'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'interface'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'is'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'long'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'namespace'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'native'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'new'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'null'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'package'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'private'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'protected'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'public'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'return'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'short'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'static'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'super'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'switch'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'synchronized'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'this'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'throw'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'throws'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'transient'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'true'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'try'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'typeof'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'use'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'var'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'void'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'volatile'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'while'}, {'t': 25, 'v': 0}, {'t': 5, 'v': 'with'}, {'t': 25, 'v': 0}], 'k': '_4'} diff --git a/testTs/expect/types/primitives/undefined/invalidUndefinedValues.txt b/testTs/expect/types/primitives/undefined/invalidUndefinedValues.txt index 42b42337ba6565c80ae7d64d662caeb22c7ee4ca..a03d3a0bec445daeb347dcac2ddcb8e3c6fd7890 100644 --- a/testTs/expect/types/primitives/undefined/invalidUndefinedValues.txt +++ b/testTs/expect/types/primitives/undefined/invalidUndefinedValues.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'} diff --git a/testTs/expect/types/rest/objectRestParameter.txt b/testTs/expect/types/rest/objectRestParameter.txt index f1d5ac1eb96ca666702c611897bf9ef3ba554b16..350f78c2479de1da6a07882ba35b89f341af62d2 100644 --- a/testTs/expect/types/rest/objectRestParameter.txt +++ b/testTs/expect/types/rest/objectRestParameter.txt @@ -1,6 +1,6 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'cloneAgain'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_2'}, {'t': 25, 'v': 3}], 'k': '_1'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'a'}, {'t': 25, 'v': 1}, {'t': 5, 'v': 'b'}, {'t': 25, 'v': 4}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'm'}, {'t': 24, 'v': '_4'}, {'t': 5, 'v': 'p'}, {'t': 24, 'v': '_6'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'm'}, {'t': 24, 'v': '_4'}, {'t': 5, 'v': 'p'}, {'t': 24, 'v': '_6'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'm'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_5'}, {'t': 25, 'v': 3}], 'k': '_4'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'a'}, {'t': 25, 'v': 1}, {'t': 5, 'v': 'b'}, {'t': 25, 'v': 4}], 'k': '_5'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 32}, {'t': 5, 'v': 'p'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_7'}, {'t': 25, 'v': 0}], 'k': '_6'} diff --git a/testTs/expect/types/specifyingTypes/typeLiterals/functionLiteralForOverloads2.txt b/testTs/expect/types/specifyingTypes/typeLiterals/functionLiteralForOverloads2.txt index 1c9fccae4221b94897e6c2c28afda92ded917056..dfe4043e5a909670e09bb3f07e6050b37215d15e 100644 --- a/testTs/expect/types/specifyingTypes/typeLiterals/functionLiteralForOverloads2.txt +++ b/testTs/expect/types/specifyingTypes/typeLiterals/functionLiteralForOverloads2.txt @@ -1,9 +1,9 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_5'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_9'} diff --git a/testTs/expect/types/specifyingTypes/typeQueries/typeofClass2.txt b/testTs/expect/types/specifyingTypes/typeQueries/typeofClass2.txt index b1804580cd6ca6c8e6a1c375da0ad02c77299ec0..f5a9474772e174e488f322be104e301332e51b3a 100644 --- a/testTs/expect/types/specifyingTypes/typeQueries/typeofClass2.txt +++ b/testTs/expect/types/specifyingTypes/typeQueries/typeofClass2.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 5, 'v': 'bar'}, {'t': 24, 'v': '_9'}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 5, 'v': 'bar'}, {'t': 24, 'v': '_9'}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'} diff --git a/testTs/expect/types/specifyingTypes/typeQueries/typeofModuleWithoutExports.txt b/testTs/expect/types/specifyingTypes/typeQueries/typeofModuleWithoutExports.txt index ec1811aeb92583b2ef19c518e455534eb6904d10..b5e2cb5884b7cbf42ebef93e181fe73985a19897 100644 --- a/testTs/expect/types/specifyingTypes/typeQueries/typeofModuleWithoutExports.txt +++ b/testTs/expect/types/specifyingTypes/typeQueries/typeofModuleWithoutExports.txt @@ -1 +1 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} diff --git a/testTs/expect/types/thisType/thisTypeAndConstraints.txt b/testTs/expect/types/thisType/thisTypeAndConstraints.txt index d400b630f9bc10b7c4d6eb210c6f9fd08a99ab55..a2420c9b11a75534a0f8511a96b8c49716048689 100644 --- a/testTs/expect/types/thisType/thisTypeAndConstraints.txt +++ b/testTs/expect/types/thisType/thisTypeAndConstraints.txt @@ -1,9 +1,9 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'self'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'self'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'self'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'g'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_7'}, {'t': 5, 'v': 'bar'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_7'}, {'t': 5, 'v': 'bar'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_6'}], 'k': '_9'} diff --git a/testTs/expect/types/thisType/thisTypeInClasses.txt b/testTs/expect/types/thisType/thisTypeInClasses.txt index 72c1ecf23a82e080463f7bc448abda3072a052ee..81ec5458e7c4256f880ba20e27d7628871121d3f 100644 --- a/testTs/expect/types/thisType/thisTypeInClasses.txt +++ b/testTs/expect/types/thisType/thisTypeInClasses.txt @@ -1,18 +1,18 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 10}, {'t': 5, 'v': 'a'}, {'t': 24, 'v': '_6'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'b'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'c'}, {'t': 24, 'v': '_7'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'd'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'e'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'g'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'h'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'i'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'j'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_5'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 10}, {'t': 5, 'v': 'a'}, {'t': 24, 'v': '_6'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'b'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'c'}, {'t': 24, 'v': '_7'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'd'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'e'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'g'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'h'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'i'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'j'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 5}, {'t': 25, 'v': 0}], 'k': '_6'} {'lb': [{'t': 2, 'v': 4}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 24, 'v': '_8'}], 'k': '_7'} {'lb': [{'t': 2, 'v': 2}, {'t': 25, 'v': 33}], 'k': '_8'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'y'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_9'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_11'}, {'t': 5, 'v': 'bar'}, {'t': 24, 'v': '_12'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_10'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_11'}, {'t': 5, 'v': 'bar'}, {'t': 24, 'v': '_12'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_10'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_11'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_12'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_10'}], 'k': '_13'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_14'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_5'}], 'k': '_15'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_17'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_16'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_17'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_16'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_17'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_16'}], 'k': '_18'} diff --git a/testTs/expect/types/thisType/thisTypeInFunctions3.txt b/testTs/expect/types/thisType/thisTypeInFunctions3.txt index 57d12d8174b64a5a359f423a69e8ece177d5a00a..ef35ca96d815732873151cc7d40f99a4be178eb2 100644 --- a/testTs/expect/types/thisType/thisTypeInFunctions3.txt +++ b/testTs/expect/types/thisType/thisTypeInFunctions3.txt @@ -1,5 +1,5 @@ {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'm'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'check'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'check'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'check'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 2}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'm'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_5'} diff --git a/testTs/expect/types/typeAliases/circularTypeAliasForUnionWithClass.txt b/testTs/expect/types/typeAliases/circularTypeAliasForUnionWithClass.txt index 3b0d7af6f93415d0cc67abdbf52fa740fec2e6c0..51e9efffd6d56033b9e6cc4d575ae566e7ea4904 100644 --- a/testTs/expect/types/typeAliases/circularTypeAliasForUnionWithClass.txt +++ b/testTs/expect/types/typeAliases/circularTypeAliasForUnionWithClass.txt @@ -1,6 +1,6 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_6'} diff --git a/testTs/expect/types/typeAliases/typeAliases.txt b/testTs/expect/types/typeAliases/typeAliases.txt index a339e8eddd8180277a42a71cc883b82b81f58563..27f543ff8d6e6c419e36d08cf17db5d7c32c68e3 100644 --- a/testTs/expect/types/typeAliases/typeAliases.txt +++ b/testTs/expect/types/typeAliases/typeAliases.txt @@ -1,5 +1,5 @@ {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_3'} {'lb': [{'t': 2, 'v': 4}, {'t': 2, 'v': 2}, {'t': 25, 'v': 4}, {'t': 25, 'v': 2}], 'k': '_4'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 1}], 'k': '_5'} diff --git a/testTs/expect/types/typeParameters/typeArgumentLists/callGenericFunctionWithZeroTypeArguments.txt b/testTs/expect/types/typeParameters/typeArgumentLists/callGenericFunctionWithZeroTypeArguments.txt index 533469b54911418f712aaa9a90d560a37a55941d..83dcd1ae59c0c5e76842d077a6cc3253c4277b0f 100644 --- a/testTs/expect/types/typeParameters/typeArgumentLists/callGenericFunctionWithZeroTypeArguments.txt +++ b/testTs/expect/types/typeParameters/typeArgumentLists/callGenericFunctionWithZeroTypeArguments.txt @@ -1,11 +1,11 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_5'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_7'}], 'k': '_6'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_7'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_8'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_9'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_8'}], 'k': '_10'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_12'}], 'k': '_11'} diff --git a/testTs/expect/types/typeParameters/typeArgumentLists/constraintSatisfactionWithAny.txt b/testTs/expect/types/typeParameters/typeArgumentLists/constraintSatisfactionWithAny.txt index 695c8392f88e0150a98864e6441c363aa675792b..69f74de6d7a58bd3399e4c09a397148f4efa7e94 100644 --- a/testTs/expect/types/typeParameters/typeArgumentLists/constraintSatisfactionWithAny.txt +++ b/testTs/expect/types/typeParameters/typeArgumentLists/constraintSatisfactionWithAny.txt @@ -1,12 +1,12 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_10'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_10'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_11'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_10'}], 'k': '_12'} diff --git a/testTs/expect/types/typeParameters/typeArgumentLists/constraintSatisfactionWithEmptyObject.txt b/testTs/expect/types/typeParameters/typeArgumentLists/constraintSatisfactionWithEmptyObject.txt index 5fe6f2a5c59752c0447982ce1eaed72b1d1e39f5..af4068da5f4e9e6644d5ae7bdca04b25e7c11294 100644 --- a/testTs/expect/types/typeParameters/typeArgumentLists/constraintSatisfactionWithEmptyObject.txt +++ b/testTs/expect/types/typeParameters/typeArgumentLists/constraintSatisfactionWithEmptyObject.txt @@ -1,10 +1,10 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_4'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_10'} diff --git a/testTs/expect/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction.txt b/testTs/expect/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction.txt old mode 100644 new mode 100755 index 645abdd2e0b0cd9e0f3ed9189134ebf8e5ac6300..90c6b6af9fe596b81c817ff4ec9c440bccfee10a --- a/testTs/expect/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction.txt +++ b/testTs/expect/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction.txt @@ -1,15 +1,15 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 4}], 'k': '_4'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 4}], 'k': '_5'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 4}], 'k': '_6'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_8'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 0}], 'k': '_9'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 0}], 'k': '_10'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 0}], 'k': '_11'} -{'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_12'} +{'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 1}, {'t': 25, 'v': 21}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_12'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_13'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_14'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_8'}], 'k': '_15'} diff --git a/testTs/expect/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction3.txt b/testTs/expect/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction3.txt index a4fe4ced71185c7ca33bc6240223a98639c7bc31..a90060645e004204d381a3e153a2492fe3ab44e0 100644 --- a/testTs/expect/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction3.txt +++ b/testTs/expect/types/typeParameters/typeArgumentLists/functionConstraintSatisfaction3.txt @@ -1,11 +1,11 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 4}], 'k': '_4'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 4}], 'k': '_5'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 4}], 'k': '_6'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_8'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 0}], 'k': '_9'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 0}], 'k': '_10'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 0}], 'k': '_11'} diff --git a/testTs/expect/types/typeParameters/typeArgumentLists/instantiateGenericClassWithZeroTypeArguments.txt b/testTs/expect/types/typeParameters/typeArgumentLists/instantiateGenericClassWithZeroTypeArguments.txt index 156ffac0829e159611316f763760e295d86f2ba0..e726627daf7a8ae795c5fb33b468f70609f06f2a 100644 --- a/testTs/expect/types/typeParameters/typeArgumentLists/instantiateGenericClassWithZeroTypeArguments.txt +++ b/testTs/expect/types/typeParameters/typeArgumentLists/instantiateGenericClassWithZeroTypeArguments.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'y'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'y'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_4'} diff --git a/testTs/expect/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints.txt b/testTs/expect/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints.txt old mode 100644 new mode 100755 index 0feeb395cc47507568f6865655555944bbce89ee..8c3b1913032f31bab702af5c076f4b539fac0791 --- a/testTs/expect/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints.txt +++ b/testTs/expect/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints.txt @@ -1,5 +1,5 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_4'} -{'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_5'} +{'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 1}, {'t': 25, 'v': 33}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_5'} diff --git a/testTs/expect/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints2.txt b/testTs/expect/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints2.txt index e081783c52208dede66481b60fd62899a0aceae2..99eca44093a0157ede2975f9e4c39d3bfba23d30 100644 --- a/testTs/expect/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints2.txt +++ b/testTs/expect/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints2.txt @@ -1,3 +1,3 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} diff --git a/testTs/expect/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints3.txt b/testTs/expect/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints3.txt index fe7913a4e960caccbb23d605f6b5846051b77cf8..b953d663502b014e2c9184a19ccb7019298c4766 100644 --- a/testTs/expect/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints3.txt +++ b/testTs/expect/types/typeParameters/typeArgumentLists/wrappedAndRecursiveConstraints3.txt @@ -1,5 +1,5 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_3'}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_3'}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_5'} diff --git a/testTs/expect/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints3.txt b/testTs/expect/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints3.txt index 32b27b64902937fac6475e075a8742fd4102143c..9895d6008dc27120303b350300ed613b3a6d02b1 100644 --- a/testTs/expect/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints3.txt +++ b/testTs/expect/types/typeParameters/typeParameterLists/propertyAccessOnTypeParameterWithConstraints3.txt @@ -1,10 +1,10 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'bar'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_8'}, {'t': 5, 'v': 'g'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'f'}, {'t': 24, 'v': '_8'}, {'t': 5, 'v': 'g'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'g'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_9'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_10'} diff --git a/testTs/expect/types/typeParameters/typeParameterLists/typeParametersAvailableInNestedScope.txt b/testTs/expect/types/typeParameters/typeParameterLists/typeParametersAvailableInNestedScope.txt index b9456535acddec67e1cbedcd23a47b6b91112624..034a11d8b3482d7ce75d8fca131ccb51146a9701 100644 --- a/testTs/expect/types/typeParameters/typeParameterLists/typeParametersAvailableInNestedScope.txt +++ b/testTs/expect/types/typeParameters/typeParameterLists/typeParametersAvailableInNestedScope.txt @@ -1,4 +1,4 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'temp'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'data'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'data'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_4'} diff --git a/testTs/expect/types/typeRelationships/assignmentCompatibility/anyAssignableToEveryType.txt b/testTs/expect/types/typeRelationships/assignmentCompatibility/anyAssignableToEveryType.txt index 45b95bf054c803ef0aec84b89e7a103f803ca5fc..1ee3e2e8f250c96c4b19b41b4a0472b964df3d62 100644 --- a/testTs/expect/types/typeRelationships/assignmentCompatibility/anyAssignableToEveryType.txt +++ b/testTs/expect/types/typeRelationships/assignmentCompatibility/anyAssignableToEveryType.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 25, 'v': 33}], 'k': '_4'} diff --git a/testTs/expect/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers.txt b/testTs/expect/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers.txt index cc2af3fb8f7a01ad60b88c72a3948f1216f60f23..b89afe3b1b171c7a60ae16dfd54c348e52c89f9e 100644 --- a/testTs/expect/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers.txt +++ b/testTs/expect/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers.txt @@ -1,14 +1,14 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_4'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}], 'k': '_7'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}], 'k': '_8'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_10'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_9'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_10'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_9'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_9'}], 'k': '_10'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_12'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_11'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_12'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_11'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_11'}], 'k': '_12'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_13'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_13'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_14'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_14'} diff --git a/testTs/expect/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers3.txt b/testTs/expect/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers3.txt index bef6e0acfa9f9706dafef9c686750f04710b1f81..159528986530151e43fd48e26bd584311c475493 100644 --- a/testTs/expect/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers3.txt +++ b/testTs/expect/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembers3.txt @@ -1,6 +1,6 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'bar'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'baz'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_6'} diff --git a/testTs/expect/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersNumericNames.txt b/testTs/expect/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersNumericNames.txt index 6614b02b46f3f2b28647e4e023523f59c60547f9..dae6d407c5f8d6b9ef809bb8b518c38342d8a331 100644 --- a/testTs/expect/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersNumericNames.txt +++ b/testTs/expect/types/typeRelationships/assignmentCompatibility/assignmentCompatWithObjectMembersNumericNames.txt @@ -1,5 +1,5 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': '1'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': '1'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': '1'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': '1'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_4'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': '1'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'bar'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_5'} diff --git a/testTs/expect/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance2.txt b/testTs/expect/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance2.txt index 9cadd75f95df524dfd5ecdf9bfbe443a2ac8ed38..758d384ff2dd9de1c2e18fa67ccf64362483728d 100644 --- a/testTs/expect/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance2.txt +++ b/testTs/expect/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance2.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'baz'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bing'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} diff --git a/testTs/expect/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance4.txt b/testTs/expect/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance4.txt index 9cadd75f95df524dfd5ecdf9bfbe443a2ac8ed38..758d384ff2dd9de1c2e18fa67ccf64362483728d 100644 --- a/testTs/expect/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance4.txt +++ b/testTs/expect/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance4.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'baz'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bing'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} diff --git a/testTs/expect/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance5.txt b/testTs/expect/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance5.txt index 9cadd75f95df524dfd5ecdf9bfbe443a2ac8ed38..758d384ff2dd9de1c2e18fa67ccf64362483728d 100644 --- a/testTs/expect/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance5.txt +++ b/testTs/expect/types/typeRelationships/assignmentCompatibility/callSignatureAssignabilityInInheritance5.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'baz'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bing'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} diff --git a/testTs/expect/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance2.txt b/testTs/expect/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance2.txt index 9cadd75f95df524dfd5ecdf9bfbe443a2ac8ed38..758d384ff2dd9de1c2e18fa67ccf64362483728d 100644 --- a/testTs/expect/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance2.txt +++ b/testTs/expect/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance2.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'baz'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bing'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} diff --git a/testTs/expect/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance5.txt b/testTs/expect/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance5.txt index 9cadd75f95df524dfd5ecdf9bfbe443a2ac8ed38..758d384ff2dd9de1c2e18fa67ccf64362483728d 100644 --- a/testTs/expect/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance5.txt +++ b/testTs/expect/types/typeRelationships/assignmentCompatibility/constructSignatureAssignabilityInInheritance5.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'baz'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bing'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} diff --git a/testTs/expect/types/typeRelationships/assignmentCompatibility/everyTypeAssignableToAny.txt b/testTs/expect/types/typeRelationships/assignmentCompatibility/everyTypeAssignableToAny.txt index 45b95bf054c803ef0aec84b89e7a103f803ca5fc..1ee3e2e8f250c96c4b19b41b4a0472b964df3d62 100644 --- a/testTs/expect/types/typeRelationships/assignmentCompatibility/everyTypeAssignableToAny.txt +++ b/testTs/expect/types/typeRelationships/assignmentCompatibility/everyTypeAssignableToAny.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 25, 'v': 33}], 'k': '_4'} diff --git a/testTs/expect/types/typeRelationships/assignmentCompatibility/nullAssignableToEveryType.txt b/testTs/expect/types/typeRelationships/assignmentCompatibility/nullAssignableToEveryType.txt index 45b95bf054c803ef0aec84b89e7a103f803ca5fc..1ee3e2e8f250c96c4b19b41b4a0472b964df3d62 100644 --- a/testTs/expect/types/typeRelationships/assignmentCompatibility/nullAssignableToEveryType.txt +++ b/testTs/expect/types/typeRelationships/assignmentCompatibility/nullAssignableToEveryType.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 25, 'v': 33}], 'k': '_4'} diff --git a/testTs/expect/types/typeRelationships/assignmentCompatibility/undefinedAssignableToEveryType.txt b/testTs/expect/types/typeRelationships/assignmentCompatibility/undefinedAssignableToEveryType.txt old mode 100644 new mode 100755 index 45b95bf054c803ef0aec84b89e7a103f803ca5fc..1ee3e2e8f250c96c4b19b41b4a0472b964df3d62 --- a/testTs/expect/types/typeRelationships/assignmentCompatibility/undefinedAssignableToEveryType.txt +++ b/testTs/expect/types/typeRelationships/assignmentCompatibility/undefinedAssignableToEveryType.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 25, 'v': 33}], 'k': '_4'} diff --git a/testTs/expect/types/typeRelationships/instanceOf/narrowingConstrainedTypeVariable.txt b/testTs/expect/types/typeRelationships/instanceOf/narrowingConstrainedTypeVariable.txt index 1794d377801e9abe6dc61f092ebed23c39d7c320..a23c2b448eb79104fb17154bf06e31ffc4ce3928 100644 --- a/testTs/expect/types/typeRelationships/instanceOf/narrowingConstrainedTypeVariable.txt +++ b/testTs/expect/types/typeRelationships/instanceOf/narrowingConstrainedTypeVariable.txt @@ -1,10 +1,10 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_3'}, {'t': 25, 'v': 3}], 'k': '_2'} {'lb': [{'t': 2, 'v': 4}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_6'}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 4}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 4}, {'t': 2, 'v': 2}, {'t': 25, 'v': 4}, {'t': 25, 'v': 7}], 'k': '_8'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_10'}, {'t': 25, 'v': 0}], 'k': '_9'} {'lb': [{'t': 2, 'v': 4}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 24, 'v': '_11'}], 'k': '_10'} diff --git a/testTs/expect/types/typeRelationships/recursiveTypes/arrayLiteralsWithRecursiveGenerics.txt b/testTs/expect/types/typeRelationships/recursiveTypes/arrayLiteralsWithRecursiveGenerics.txt index 376c003487cbad0523c3925b0936246a38ebb5f8..7fa13d9e8cd4c99d6c764148f152b4b3b24a1c43 100644 --- a/testTs/expect/types/typeRelationships/recursiveTypes/arrayLiteralsWithRecursiveGenerics.txt +++ b/testTs/expect/types/typeRelationships/recursiveTypes/arrayLiteralsWithRecursiveGenerics.txt @@ -1,6 +1,6 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'data'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'next'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'data'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'next'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'data'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'next'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'data'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'next'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_6'} diff --git a/testTs/expect/types/typeRelationships/recursiveTypes/recursiveTypeInGenericConstraint.txt b/testTs/expect/types/typeRelationships/recursiveTypes/recursiveTypeInGenericConstraint.txt index 959de77bb5f58f0deb9602f728e700a3d9bf47a6..73e14904b4b594c3b0b7ff0427316242c6ce792e 100644 --- a/testTs/expect/types/typeRelationships/recursiveTypes/recursiveTypeInGenericConstraint.txt +++ b/testTs/expect/types/typeRelationships/recursiveTypes/recursiveTypeInGenericConstraint.txt @@ -1,6 +1,6 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} diff --git a/testTs/expect/types/typeRelationships/recursiveTypes/recursiveTypesUsedAsFunctionParameters.txt b/testTs/expect/types/typeRelationships/recursiveTypes/recursiveTypesUsedAsFunctionParameters.txt index 10416514997b011f775a829eb46686badd4d26b6..fb669636e1a73e8e288a5c3b81a01d22db5b6a7d 100644 --- a/testTs/expect/types/typeRelationships/recursiveTypes/recursiveTypesUsedAsFunctionParameters.txt +++ b/testTs/expect/types/typeRelationships/recursiveTypes/recursiveTypesUsedAsFunctionParameters.txt @@ -1,6 +1,6 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'data'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'next'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'data'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'next'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'data'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'next'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'data'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'next'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_2'}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_6'} diff --git a/testTs/expect/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures3.txt b/testTs/expect/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures3.txt index fb444c79b409323aac1205595a35edbfdda6019f..4d16e199322449abafd5942c90c316272c87eecd 100644 --- a/testTs/expect/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures3.txt +++ b/testTs/expect/types/typeRelationships/subtypesAndSuperTypes/subtypingWithCallSignatures3.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'baz'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bing'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} diff --git a/testTs/expect/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures3.txt b/testTs/expect/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures3.txt index fb444c79b409323aac1205595a35edbfdda6019f..4d16e199322449abafd5942c90c316272c87eecd 100644 --- a/testTs/expect/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures3.txt +++ b/testTs/expect/types/typeRelationships/subtypesAndSuperTypes/subtypingWithConstructSignatures3.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'baz'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bing'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} diff --git a/testTs/expect/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers4.txt b/testTs/expect/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers4.txt index df9c9151ce31140411248dc13aaa412c94feecc6..369f23159f31d9ff231b822e5e5be32919ae31cb 100644 --- a/testTs/expect/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers4.txt +++ b/testTs/expect/types/typeRelationships/subtypesAndSuperTypes/subtypingWithObjectMembers4.txt @@ -1,12 +1,12 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_4'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'fooo'}, {'t': 24, 'v': '_6'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': '1'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': '1'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_7'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': '1.1'}, {'t': 24, 'v': '_6'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_8'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': '1'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_9'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': '1'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_9'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': '1.1'}, {'t': 24, 'v': '_6'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_10'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_5'}], 'k': '_11'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_8'}], 'k': '_12'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentity.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentity.txt index 8bfb5ced6e259e57a812f191d5e0f906581a0859..026a4b6ebf75f353bf709bfb69799f9fbb273d94 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentity.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentity.txt @@ -1,6 +1,6 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo1b'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_6'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentity2.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentity2.txt index 601cb1b8081a42229e75acf65345b70dc0639029..8b798bcd62a6ec1f9286803e8657c3d1c182ad8f 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentity2.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentity2.txt @@ -1,6 +1,6 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 25, 'v': 38}], 'k': '_5'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_6'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures.txt index 1b3f25fda681d02714cf6cd74e77ad4d5f55ad5a..4e83f3354e4cf30b61d58093e3a564a27d366578 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures.txt @@ -1,10 +1,10 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}], 'k': '_10'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures2.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures2.txt index d40a8b4322b59db01b350b1aebd020dbc10c2166..381cea7062af1f0eb99ad4afcb8735324236bb5d 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures2.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignatures2.txt @@ -1,10 +1,10 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 4}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}], 'k': '_10'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesDifferingParamCounts.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesDifferingParamCounts.txt index 898ea9e0c13d6066cf143c214dd1ad1a7d861e9d..7b3d4cd97904b3afdf1b34727533b824d336d63e 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesDifferingParamCounts.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesDifferingParamCounts.txt @@ -1,10 +1,10 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}], 'k': '_10'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesWithOverloads.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesWithOverloads.txt index 6cce6d1e5a49e92c79e6a3586e30abae57cb1fad..e1464b13097f32afb72ff4152cc54d9c842e8837 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesWithOverloads.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithCallSignaturesWithOverloads.txt @@ -1,14 +1,14 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 1}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_5'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 1}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}], 'k': '_8'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_9'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_6'}], 'k': '_10'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_15'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_11'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_15'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_11'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 1}], 'k': '_12'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}], 'k': '_13'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_14'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignatures.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignatures.txt index ad3512319fef05248894df6078b274611e3e1fb0..6b3913084b1857db2b5f6802782e5c567691cfdb 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignatures.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignatures.txt @@ -1,10 +1,10 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 0}], 'k': '_10'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignatures2.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignatures2.txt index 77b5255251729837a81dc0f3ba7015d53895c7bf..ec5d925626c480735f3e2d60900879b8bccb34bb 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignatures2.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignatures2.txt @@ -1,7 +1,7 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 1}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 4}], 'k': '_7'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.txt index 8121a5db94273ea7215feafaa7c1ed407ebda234..f14446af3a454dbb9ab70fae8f83e31461b22968 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithConstructSignaturesDifferingParamCounts.txt @@ -1,7 +1,7 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 4}, {'t': 25, 'v': 4}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 4}], 'k': '_7'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignatures.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignatures.txt index ed583ed90231006494296a15d3f794eba3e5c1f2..dda545905f980769fa7fc6e41016fb28ca1a470e 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignatures.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignatures.txt @@ -1,10 +1,10 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}], 'k': '_10'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignatures2.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignatures2.txt index 61222256996654a3d13379668d32ec6440f2d3dd..26a54fdc11042463f01936d4dec8e55c7dc77a9a 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignatures2.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignatures2.txt @@ -1,10 +1,10 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}], 'k': '_10'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.txt index a14ed858de1d693866b2fe9a52fd541a18e9638f..380888e94db0a84bca69889d041ce0efe0fae91d 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints.txt @@ -1,10 +1,10 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}], 'k': '_10'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.txt index f6c4ad69817e436c966ee72ed16c155c20c78ade..ae663f6d09dc03840951278f78ebc20cd15d6a8e 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints2.txt @@ -1,13 +1,13 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_10'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_11'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_10'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_11'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_10'}], 'k': '_12'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}], 'k': '_13'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.txt index f8d9bc31fd93e064fcd0283382692b9ea97872b4..13cb22bd5ad5a037664aeb79a84c91e9fff29d6d 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByConstraints3.txt @@ -1,15 +1,15 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_5'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_7'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_7'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_7'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_6'}], 'k': '_8'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_10'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_9'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_10'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_9'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_10'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_9'}], 'k': '_11'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_13'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_12'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_13'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_12'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_13'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_12'}], 'k': '_14'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}], 'k': '_15'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.txt index 3405338bd9d0aca080f9a56efaeae9e3603ba430..e7fe4301b515959ed853ef9f5e3f9fd0fd01613a 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType.txt @@ -1,10 +1,10 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 1}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 2}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}], 'k': '_10'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.txt index 3405338bd9d0aca080f9a56efaeae9e3603ba430..e7fe4301b515959ed853ef9f5e3f9fd0fd01613a 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingByReturnType2.txt @@ -1,10 +1,10 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 4}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 1}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 2}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}], 'k': '_10'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.txt index ed583ed90231006494296a15d3f794eba3e5c1f2..dda545905f980769fa7fc6e41016fb28ca1a470e 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterCounts.txt @@ -1,10 +1,10 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}], 'k': '_10'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.txt index ed583ed90231006494296a15d3f794eba3e5c1f2..dda545905f980769fa7fc6e41016fb28ca1a470e 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesDifferingTypeParameterNames.txt @@ -1,10 +1,10 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}], 'k': '_10'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams.txt index 61222256996654a3d13379668d32ec6440f2d3dd..26a54fdc11042463f01936d4dec8e55c7dc77a9a 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams.txt @@ -1,10 +1,10 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}], 'k': '_10'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.txt index 61222256996654a3d13379668d32ec6440f2d3dd..26a54fdc11042463f01936d4dec8e55c7dc77a9a 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams2.txt @@ -1,10 +1,10 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}], 'k': '_10'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.txt index 61222256996654a3d13379668d32ec6440f2d3dd..26a54fdc11042463f01936d4dec8e55c7dc77a9a 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericCallSignaturesOptionalParams3.txt @@ -1,10 +1,10 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}], 'k': '_10'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.txt index 326f86fe0d1f0d7066ebb8670cb05fd93ad3ef34..76c5b6ae2723c19990ad67f0779787a269279e92 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints.txt @@ -1,7 +1,7 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 4}], 'k': '_7'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.txt index 941ffcddf7dd5aa6dc0b34fec37aec4a553f6c3b..9e746d5dc826c44ddbafd2da0d54e6a5023491c5 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints2.txt @@ -1,10 +1,10 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_8'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_7'}], 'k': '_9'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 4}], 'k': '_10'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.txt index 4796f4fdcc26b7e028507dbe9cd05d5698a185d3..affc9b7df4c09a07b8c4b164035477e74446c089 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByConstraints3.txt @@ -1,12 +1,12 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_5'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_7'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_7'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_6'}], 'k': '_8'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_10'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_9'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_10'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_9'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_10'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_9'}], 'k': '_11'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 4}], 'k': '_12'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.txt index 94d995c30905a8ab8712dbb7fa1bac6782e5a8bd..4222deebd6f6e294cc6166a2e86898461aa935af 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType.txt @@ -1,7 +1,7 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 0}], 'k': '_7'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.txt index dd514e0a49ce87db13ca8babdb08e58f92f95d7e..c069d80a67e27d798690d0d0ede6f673d6fa6198 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingByReturnType2.txt @@ -1,7 +1,7 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 25, 'v': 0}], 'k': '_7'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.txt index d55cff111047c9130ca87bffaf0a659b49117605..0bbb7c30f0b8fb1ae9a0f9b7bd9d343e0482b6cb 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterCounts.txt @@ -1,7 +1,7 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 24, 'v': '_6'}], 'k': '_7'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.txt index d02464f15ada66619baf371623d11bd289dd64ee..a93e5e7e4caa035aa88125b044464872d73f8ecf 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesDifferingTypeParameterNames.txt @@ -1,7 +1,7 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 24, 'v': '_3'}], 'k': '_7'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.txt index b825c0057701130a737740c72b5cdb14c1da3c2b..f9020cd643cf221bc6d5af3d990c7fcb1aeb9d38 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams.txt @@ -1,7 +1,7 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 24, 'v': '_3'}], 'k': '_7'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.txt index b825c0057701130a737740c72b5cdb14c1da3c2b..f9020cd643cf221bc6d5af3d990c7fcb1aeb9d38 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams2.txt @@ -1,7 +1,7 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 24, 'v': '_3'}], 'k': '_7'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.txt index b825c0057701130a737740c72b5cdb14c1da3c2b..f9020cd643cf221bc6d5af3d990c7fcb1aeb9d38 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithGenericConstructSignaturesOptionalParams3.txt @@ -1,7 +1,7 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_6'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': '#undefined'}, {'t': 24, 'v': '_3'}], 'k': '_7'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithOptionality.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithOptionality.txt index c6c12a52994d5e7eaa5084cabe76d18596e1dc47..5a10065078f3d2b15cde20c6cd547b051785a1f7 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithOptionality.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithOptionality.txt @@ -1,6 +1,6 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_6'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates.txt index cf776caa1641ec600e48d2d534f458bcfc720acc..817b4b94ccc37bc79215a4b8d0c0d1bddc8e1255 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates.txt @@ -1,6 +1,6 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}], 'k': '_6'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates2.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates2.txt index 6629778dddc862f9b92b654bd76c221591c9ace6..6e746a54335214cdb4359e8af2ad691cf3674d72 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates2.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPrivates2.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPublics.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPublics.txt index 8bfb5ced6e259e57a812f191d5e0f906581a0859..026a4b6ebf75f353bf709bfb69799f9fbb273d94 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPublics.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/objectTypesIdentityWithPublics.txt @@ -1,6 +1,6 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 6}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo1b'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_6'} diff --git a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/typeParametersAreIdenticalToThemselves.txt b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/typeParametersAreIdenticalToThemselves.txt index 61725259398a42901a71f6c9760df41a1c191a33..7b938f44f5c9cab805ec4fd8b6ccb76127b48e90 100644 --- a/testTs/expect/types/typeRelationships/typeAndMemberIdentity/typeParametersAreIdenticalToThemselves.txt +++ b/testTs/expect/types/typeRelationships/typeAndMemberIdentity/typeParametersAreIdenticalToThemselves.txt @@ -3,7 +3,7 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo3'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'inner'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'inner2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'foo1'}, {'t': 24, 'v': '_9'}, {'t': 5, 'v': 'foo2'}, {'t': 24, 'v': '_12'}, {'t': 5, 'v': 'foo3'}, {'t': 24, 'v': '_15'}, {'t': 5, 'v': 'foo4'}, {'t': 24, 'v': '_18'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'foo1'}, {'t': 24, 'v': '_9'}, {'t': 5, 'v': 'foo2'}, {'t': 24, 'v': '_12'}, {'t': 5, 'v': 'foo3'}, {'t': 24, 'v': '_15'}, {'t': 5, 'v': 'foo4'}, {'t': 24, 'v': '_18'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_6'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_9'} @@ -17,7 +17,7 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_17'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo4'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_18'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_6'}], 'k': '_19'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 5, 'v': 'foo1'}, {'t': 24, 'v': '_23'}, {'t': 5, 'v': 'foo2'}, {'t': 24, 'v': '_26'}, {'t': 5, 'v': 'foo3'}, {'t': 24, 'v': '_29'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_20'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 3}, {'t': 5, 'v': 'foo1'}, {'t': 24, 'v': '_23'}, {'t': 5, 'v': 'foo2'}, {'t': 24, 'v': '_26'}, {'t': 5, 'v': 'foo3'}, {'t': 24, 'v': '_29'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_20'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_21'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_22'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_23'} diff --git a/testTs/expect/types/typeRelationships/typeInference/genericCallTypeArgumentInference.txt b/testTs/expect/types/typeRelationships/typeInference/genericCallTypeArgumentInference.txt index 066a064cf7f611ffa13f04a3e2f1f208a47e909c..311892e7e92963edc38131ab00619c52a0fa1bbf 100644 --- a/testTs/expect/types/typeRelationships/typeInference/genericCallTypeArgumentInference.txt +++ b/testTs/expect/types/typeRelationships/typeInference/genericCallTypeArgumentInference.txt @@ -1,7 +1,7 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2b'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 9}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_6'}, {'t': 5, 'v': 'foo2'}, {'t': 24, 'v': '_7'}, {'t': 5, 'v': 'foo3'}, {'t': 24, 'v': '_8'}, {'t': 5, 'v': 'foo4'}, {'t': 24, 'v': '_9'}, {'t': 5, 'v': 'foo5'}, {'t': 24, 'v': '_10'}, {'t': 5, 'v': 'foo6'}, {'t': 24, 'v': '_11'}, {'t': 5, 'v': 'foo7'}, {'t': 24, 'v': '_12'}, {'t': 5, 'v': 'foo8'}, {'t': 24, 'v': '_13'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 9}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_5'}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_6'}, {'t': 5, 'v': 'foo2'}, {'t': 24, 'v': '_7'}, {'t': 5, 'v': 'foo3'}, {'t': 24, 'v': '_8'}, {'t': 5, 'v': 'foo4'}, {'t': 24, 'v': '_9'}, {'t': 5, 'v': 'foo5'}, {'t': 24, 'v': '_10'}, {'t': 5, 'v': 'foo6'}, {'t': 24, 'v': '_11'}, {'t': 5, 'v': 'foo7'}, {'t': 24, 'v': '_12'}, {'t': 5, 'v': 'foo8'}, {'t': 24, 'v': '_13'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_6'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_7'} diff --git a/testTs/expect/types/typeRelationships/typeInference/genericCallWithConstraintsTypeArgumentInference.txt b/testTs/expect/types/typeRelationships/typeInference/genericCallWithConstraintsTypeArgumentInference.txt index b78b8646308dec0f71abb0b2cf1b9e3d8a21d2d3..907aedf464ffdfe447e59c2881c12b57b1cf8620 100644 --- a/testTs/expect/types/typeRelationships/typeInference/genericCallWithConstraintsTypeArgumentInference.txt +++ b/testTs/expect/types/typeRelationships/typeInference/genericCallWithConstraintsTypeArgumentInference.txt @@ -1,4 +1,4 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_1'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'bar'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} {'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 24, 'v': '_2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'baz'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_4'} @@ -8,7 +8,7 @@ {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2b'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_9'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2c'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_10'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 9}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_12'}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_13'}, {'t': 5, 'v': 'foo2'}, {'t': 24, 'v': '_14'}, {'t': 5, 'v': 'foo3'}, {'t': 24, 'v': '_15'}, {'t': 5, 'v': 'foo4'}, {'t': 24, 'v': '_16'}, {'t': 5, 'v': 'foo5'}, {'t': 24, 'v': '_17'}, {'t': 5, 'v': 'foo6'}, {'t': 24, 'v': '_18'}, {'t': 5, 'v': 'foo7'}, {'t': 24, 'v': '_19'}, {'t': 5, 'v': 'foo8'}, {'t': 24, 'v': '_20'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_11'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 9}, {'t': 5, 'v': 'constructor'}, {'t': 24, 'v': '_12'}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_13'}, {'t': 5, 'v': 'foo2'}, {'t': 24, 'v': '_14'}, {'t': 5, 'v': 'foo3'}, {'t': 24, 'v': '_15'}, {'t': 5, 'v': 'foo4'}, {'t': 24, 'v': '_16'}, {'t': 5, 'v': 'foo5'}, {'t': 24, 'v': '_17'}, {'t': 5, 'v': 'foo6'}, {'t': 24, 'v': '_18'}, {'t': 5, 'v': 'foo7'}, {'t': 24, 'v': '_19'}, {'t': 5, 'v': 'foo8'}, {'t': 24, 'v': '_20'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_11'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'constructor'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_12'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_13'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_14'} diff --git a/testTs/expect/types/typeRelationships/typeInference/genericClassWithObjectTypeArgsAndConstraints.txt b/testTs/expect/types/typeRelationships/typeInference/genericClassWithObjectTypeArgsAndConstraints.txt index 21c16919d75e376c3c83ce864b12b4dedea752a0..f8bbe743007558e46b134704bf23669ae8f90675 100644 --- a/testTs/expect/types/typeRelationships/typeInference/genericClassWithObjectTypeArgsAndConstraints.txt +++ b/testTs/expect/types/typeRelationships/typeInference/genericClassWithObjectTypeArgsAndConstraints.txt @@ -1,11 +1,11 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'y'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'y'}, {'t': 25, 'v': 4}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_2'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'x'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_3'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo'}, {'t': 24, 'v': '_5'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 24, 'v': '_6'}, {'t': 24, 'v': '_6'}, {'t': 25, 'v': 0}], 'k': '_5'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_3'}], 'k': '_6'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_7'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo2'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_8'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'foo2'}, {'t': 24, 'v': '_9'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_8'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'foo2'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 24, 'v': '_6'}, {'t': 24, 'v': '_6'}, {'t': 25, 'v': 0}], 'k': '_9'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_8'}], 'k': '_10'} {'lb': [{'t': 2, 'v': 8}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_12'}], 'k': '_11'} diff --git a/testTs/expect/types/typeRelationships/typeInference/keyofInferenceLowerPriorityThanReturn.txt b/testTs/expect/types/typeRelationships/typeInference/keyofInferenceLowerPriorityThanReturn.txt index 3c1427f1f9be8ffdfc08ed71ad70f69a996bec9a..94b0c14e7663d453beb98a14467614924d7b94b7 100644 --- a/testTs/expect/types/typeRelationships/typeInference/keyofInferenceLowerPriorityThanReturn.txt +++ b/testTs/expect/types/typeRelationships/typeInference/keyofInferenceLowerPriorityThanReturn.txt @@ -1,12 +1,12 @@ -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'dummy'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'dummy'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_1'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_1'}], 'k': '_2'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'insertOnConflictDoNothing'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 2}, {'t': 24, 'v': '_2'}, {'t': 24, 'v': '_7'}, {'t': 25, 'v': 2}], 'k': '_3'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'dummy'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'tableColumns'}, {'t': 24, 'v': '_5'}], 'k': '_4'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'dummy'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'tableColumns'}, {'t': 24, 'v': '_5'}], 'k': '_4'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 4}, {'t': 5, 'v': 'tableColumns'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 24, 'v': '_6'}, {'t': 24, 'v': '_7'}], 'k': '_5'} {'lb': [{'t': 2, 'v': 5}, {'t': 25, 'v': 0}], 'k': '_6'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_4'}], 'k': '_7'} {'lb': [{'t': 2, 'v': 3}, {'t': 2, 'v': 0}, {'t': 5, 'v': 'f'}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}], 'k': '_8'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'dummy'}, {'t': 24, 'v': '_10'}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_9'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'dummy'}, {'t': 24, 'v': '_10'}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_9'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_9'}], 'k': '_10'} -{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'dummy'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_11'} +{'lb': [{'t': 2, 'v': 1}, {'t': 2, 'v': 0}, {'t': 25, 'v': -1}, {'t': 2, 'v': 0}, {'t': 2, 'v': 1}, {'t': 5, 'v': 'dummy'}, {'t': 25, 'v': 0}, {'t': 2, 'v': 2}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}, {'t': 2, 'v': 0}], 'k': '_11'} {'lb': [{'t': 2, 'v': 2}, {'t': 24, 'v': '_11'}], 'k': '_12'} diff --git a/ts2panda/src/base/typeSystem.ts b/ts2panda/src/base/typeSystem.ts index 18a04e51326805ea38334dfe9ec5af7fe4c5001e..2be6bb1709a119faf61e87e6d0e4e991b3ff6c39 100644 --- a/ts2panda/src/base/typeSystem.ts +++ b/ts2panda/src/base/typeSystem.ts @@ -271,7 +271,7 @@ export class TypeSummary extends BaseType { export class ClassType extends BaseType { modifier: number = ModifierAbstract.NONABSTRACT; // 0 -> unabstract, 1 -> abstract; - extendsHeritage: number = PrimitiveType.ANY; + extendsHeritage: number = -1; implementsHeritages: Array = new Array(); // fileds Array: [typeIndex] [public -> 0, private -> 1, protected -> 2] [readonly -> 1] staticFields: Map> = new Map>(); diff --git a/ts2panda/src/typeChecker.ts b/ts2panda/src/typeChecker.ts index 85764ad230978c4d07f81b6e5dc1a15d5c549cb1..5c6c2a19ec4c2840e5ab6f5847c5e69de88f7c8e 100644 --- a/ts2panda/src/typeChecker.ts +++ b/ts2panda/src/typeChecker.ts @@ -255,7 +255,7 @@ export class TypeChecker { if (BuiltinType[typeIdentifierName]) { let declNode = this.getDeclNodeForInitializer(typeIdentifier); if (declNode && (ts.isClassLike(declNode) || declNode.kind == ts.SyntaxKind.InterfaceDeclaration)) { - return this.getBuiltinTypeIndex(typeNode, typeIdentifierName); + return this.getBuiltinTypeIndex(typeNode, typeIdentifierName, true); } else { return BuiltinType[typeIdentifierName]; } @@ -265,11 +265,16 @@ export class TypeChecker { } } - isBuiltinType(expr: ts.NewExpression) { + isBuiltinType(expr: ts.NewExpression | ts.ExpressionWithTypeArguments) { let name = expr.expression.getFullText().replace(/\s/g, ""); return name in BuiltinType; } + isBuiltinIdentifier(id: ts.Identifier) { + let name = id.escapedText.toString(); + return name in BuiltinType; + } + isFromDefaultLib(node: ts.Node) { return node.getSourceFile().hasNoDefaultLib; } @@ -283,17 +288,23 @@ export class TypeChecker { return instanceType.shiftedTypeIndex; } - getOrCreateInstanceTypeForBuiltinContainer(builtinContainerSignature: object) { + getOrCreateInstanceTypeForBuiltinContainer(builtinContainerSignature: object, getTypeForInstace: boolean) { let typeRec = TypeRecorder.getInstance(); if (typeRec.hasBuiltinContainer2InstanceMap(builtinContainerSignature)) { + if (getTypeForInstace) { + return this.getOrCreateInstanceType(typeRec.getBuiltinContainer2InstanceMap(builtinContainerSignature)); + } return typeRec.getBuiltinContainer2InstanceMap(builtinContainerSignature); } let builtinContainerType = new BuiltinContainerType(builtinContainerSignature); let builtinContainerTypeIdx = builtinContainerType.shiftedTypeIndex; - return this.getOrCreateInstanceType(builtinContainerTypeIdx); + if (getTypeForInstace) { + return this.getOrCreateInstanceType(builtinContainerTypeIdx); + } + return builtinContainerTypeIdx; } - getBuiltinTypeIndex(node: ts.NewExpression | ts.TypeReferenceNode, name: string) { + getBuiltinTypeIndex(node: ts.NewExpression | ts.TypeReferenceNode | ts.ExpressionWithTypeArguments, name: string, getTypeForInstace: boolean) { let typeArguments = node.typeArguments; if (typeArguments && this.needRecordBuiltinContainer) { let typeArgIdxs = new Array(); @@ -305,15 +316,25 @@ export class TypeChecker { "typeIndex": BuiltinType[name], "typeArgIdxs": typeArgIdxs } - return this.getOrCreateInstanceTypeForBuiltinContainer(builtinContainerSignature); + return this.getOrCreateInstanceTypeForBuiltinContainer(builtinContainerSignature, getTypeForInstace); } - return this.getOrCreateInstanceType(BuiltinType[name]); + if (getTypeForInstace) { + return this.getOrCreateInstanceType(BuiltinType[name]); + } + return BuiltinType[name]; } - getBuiltinTypeIndexForExpr(expr: ts.NewExpression) { - let origExprNode = ts.getOriginalNode(expr); + getBuiltinTypeIndexForExpr(expr: ts.NewExpression | ts.ExpressionWithTypeArguments, getTypeForInstace: boolean) { + let origExprNode = ts.getOriginalNode(expr); let name = origExprNode.expression.getFullText().replace(/\s/g, ""); - return this.getBuiltinTypeIndex(origExprNode, name); + return this.getBuiltinTypeIndex(origExprNode, name, getTypeForInstace); + } + + getBuiltinTypeIndexForIdentifier(id: ts.Identifier, getTypeForInstace: boolean) { + if (getTypeForInstace) { + return this.getOrCreateInstanceType(BuiltinType[id.escapedText.toString()]); + } + return BuiltinType[id.escapedText.toString()]; } public getOrCreateRecordForDeclNode(initializer: ts.Node | undefined, variableNode?: ts.Node) { @@ -323,7 +344,11 @@ export class TypeChecker { let typeIndex = PrimitiveType.ANY; if (initializer.kind == ts.SyntaxKind.NewExpression && this.isBuiltinType(initializer)) { - typeIndex = this.getBuiltinTypeIndexForExpr(initializer); + typeIndex = this.getBuiltinTypeIndexForExpr(initializer, true); + } else if (initializer.kind == ts.SyntaxKind.ExpressionWithTypeArguments && this.isBuiltinType(initializer)) { + typeIndex = this.getBuiltinTypeIndexForExpr(initializer, false); + } else if (initializer.kind == ts.SyntaxKind.Identifier && this.isBuiltinIdentifier(initializer)) { + typeIndex = this.getBuiltinTypeIndexForIdentifier(initializer, false); } else { let declNode = this.getDeclNodeForInitializer(initializer); typeIndex = this.getTypeFromDecl(declNode, initializer.kind == ts.SyntaxKind.NewExpression);