diff --git a/ets2panda/bindings/test/expected/getSemanticDiagnostics.json b/ets2panda/bindings/test/expected/getSemanticDiagnostics.json index d2faf74bd4f52ea42694f860a42ab494cea35faf..23cb7c2138b869ba1a223b8234a8f5309f5aafde 100644 --- a/ets2panda/bindings/test/expected/getSemanticDiagnostics.json +++ b/ets2panda/bindings/test/expected/getSemanticDiagnostics.json @@ -5,20 +5,20 @@ "2": { "diagnostics": [ { - "message": "Type '\"1\"' is not compatible with type 'Double' at index 1", + "message": "Type '\"hello\"' cannot be assigned to type 'Double'", "range": { "start": { - "line": 20, - "character": 5 + "line": 16, + "character": 19 }, "end": { - "line": 20, - "character": 8 + "line": 16, + "character": 26 } }, "tags": [], "relatedInfo": [], - "code": 2046, + "code": 2318, "data": 0, "severity": 1, "codeDescription": { @@ -47,20 +47,20 @@ } }, { - "message": "Type '\"hello\"' cannot be assigned to type 'Double'", + "message": "Type '\"1\"' is not compatible with type 'Double' at index 1", "range": { "start": { - "line": 16, - "character": 19 + "line": 20, + "character": 5 }, "end": { - "line": 16, - "character": 26 + "line": 20, + "character": 8 } }, "tags": [], "relatedInfo": [], - "code": 2318, + "code": 2046, "data": 0, "severity": 1, "codeDescription": { @@ -72,20 +72,20 @@ "3": { "diagnostics": [ { - "message": "Type '\"123\"' is not compatible with type 'Double' at index 1", + "message": "No matching call signature for push(\"123\")", "range": { "start": { "line": 19, - "character": 10 + "character": 1 }, "end": { "line": 19, - "character": 15 + "character": 4 } }, "tags": [], "relatedInfo": [], - "code": 2046, + "code": 2127, "data": 0, "severity": 1, "codeDescription": { @@ -93,20 +93,20 @@ } }, { - "message": "No matching call signature for push(\"123\")", + "message": "Type '\"123\"' is not compatible with type 'Double' at index 1", "range": { "start": { "line": 19, - "character": 1 + "character": 10 }, "end": { "line": 19, - "character": 4 + "character": 15 } }, "tags": [], "relatedInfo": [], - "code": 2127, + "code": 2046, "data": 0, "severity": 1, "codeDescription": { diff --git a/ets2panda/bindings/test/expected/getSyntacticDiagnostics.json b/ets2panda/bindings/test/expected/getSyntacticDiagnostics.json index e51e4621f762e2ffd28787bfbca1f02b5623119d..647feecc453822e604b7757f9a99a5cb47cf2f75 100644 --- a/ets2panda/bindings/test/expected/getSyntacticDiagnostics.json +++ b/ets2panda/bindings/test/expected/getSyntacticDiagnostics.json @@ -67,27 +67,6 @@ "href": "test code description" } }, - { - "message": "Unexpected token ':'.", - "range": { - "start": { - "line": 16, - "character": 14 - }, - "end": { - "line": 16, - "character": 15 - } - }, - "tags": [], - "relatedInfo": [], - "code": 1227, - "data": 0, - "severity": 1, - "codeDescription": { - "href": "test code description" - } - }, { "message": "Unexpected token 'number'.", "range": { @@ -130,27 +109,6 @@ "href": "test code description" } }, - { - "message": "Unexpected token ','.", - "range": { - "start": { - "line": 16, - "character": 22 - }, - "end": { - "line": 16, - "character": 23 - } - }, - "tags": [], - "relatedInfo": [], - "code": 1227, - "data": 0, - "severity": 1, - "codeDescription": { - "href": "test code description" - } - }, { "message": "Unexpected token 'b'.", "range": { @@ -214,27 +172,6 @@ "href": "test code description" } }, - { - "message": "Unexpected token ')'.", - "range": { - "start": { - "line": 16, - "character": 33 - }, - "end": { - "line": 16, - "character": 34 - } - }, - "tags": [], - "relatedInfo": [], - "code": 1227, - "data": 0, - "severity": 1, - "codeDescription": { - "href": "test code description" - } - }, { "message": "Unexpected token '{'.", "range": { diff --git a/ets2panda/checker/ETSAnalyzer.cpp b/ets2panda/checker/ETSAnalyzer.cpp index 12767046a35acdd47b53003fbcf729a1c70eb754..e09058445805a1ac6999f2a46c0b05a317908dd0 100644 --- a/ets2panda/checker/ETSAnalyzer.cpp +++ b/ets2panda/checker/ETSAnalyzer.cpp @@ -164,6 +164,11 @@ checker::Type *ETSAnalyzer::Check(ir::ClassStaticBlock *st) const } else { st->SetTsType(checker->BuildMethodType(func)); } + + if (!func->HasBody() || (func->IsExternal() && !func->IsExternalOverload())) { + return st->TsType(); + } + checker::ScopeContext scopeCtx(checker, func->Scope()); checker::SavedCheckerContext savedContext(checker, checker->Context().Status(), checker->Context().ContainingClass()); @@ -1280,6 +1285,8 @@ checker::Type *ETSAnalyzer::Check(ir::AssignmentExpression *const expr) const checker->ValidateUnaryOperatorOperand(expr->target_, expr); } + checker->InferLambdaInAssignmentExpression(expr); + if (auto setterType = GetSetterType(expr->target_, checker); setterType != nullptr) { leftType = setterType; expr->Left()->SetTsType(leftType); diff --git a/ets2panda/checker/ETSchecker.h b/ets2panda/checker/ETSchecker.h index 47fc4abbb2b34c4f198bbf94431b590efd7628b4..a42ab34a91a218ba1a24a059e7b8b652a1ab3103 100644 --- a/ets2panda/checker/ETSchecker.h +++ b/ets2panda/checker/ETSchecker.h @@ -651,6 +651,7 @@ public: void CheckSinglePropertyAnnotation(ir::AnnotationUsage *st, ir::AnnotationDeclaration *annoDecl); void CheckMultiplePropertiesAnnotation(ir::AnnotationUsage *st, util::StringView const &baseName, ArenaUnorderedMap &fieldMap); + void InferLambdaInAssignmentExpression(ir::AssignmentExpression *const expr); void InferAliasLambdaType(ir::TypeNode *localTypeAnnotation, ir::ArrowFunctionExpression *init); checker::Type *ApplyConditionalOperatorPromotion(checker::ETSChecker *checker, checker::Type *unboxedL, checker::Type *unboxedR); diff --git a/ets2panda/checker/ets/helpers.cpp b/ets2panda/checker/ets/helpers.cpp index d6db10920758cd918746602136706ca2a7083632..591d007667d6b2b36f4580ee20b2966ae88a23b4 100644 --- a/ets2panda/checker/ets/helpers.cpp +++ b/ets2panda/checker/ets/helpers.cpp @@ -600,6 +600,63 @@ checker::Type *ETSChecker::CheckArrayElements(ir::ArrayExpression *init) return CreateETSResizableArrayType(elementType); } +static void SetTypeforLambdaParamWithoutTypeAnnotation(ir::ETSParameterExpression *param, Type *type) +{ + auto *const lambdaParam = param->Ident(); + if (lambdaParam->TypeAnnotation() != nullptr) { + return; + } + if (lambdaParam->Variable() != nullptr) { + lambdaParam->Variable()->SetTsType(type); + } + lambdaParam->SetTsType(type); +} + +void ETSChecker::InferLambdaInAssignmentExpression(ir::AssignmentExpression *const expr) +{ + auto *left = expr->Left(); + auto *right = expr->Right(); + + if (!right->IsArrowFunctionExpression()) { + return; + } + + if (left->TsType() == nullptr || !left->TsType()->IsETSFunctionType() || + left->TsType()->AsETSFunctionType()->CallSignaturesOfMethodOrArrow().empty()) { + return; + } + + ArenaVector lambdaParams = right->AsArrowFunctionExpression()->Function()->Params(); + Signature *sig = left->TsType()->AsETSFunctionType()->CallSignaturesOfMethodOrArrow()[0]; + + size_t paramCount = sig->Params().size(); + if (sig->RestVar() != nullptr) { + paramCount++; + } + + if (paramCount != lambdaParams.size()) { + return; + } + + if (std::any_of(lambdaParams.begin(), lambdaParams.end(), + [](auto ¶m) { return !param->IsETSParameterExpression(); })) { + return; + } + + if (sig->RestVar() != nullptr) { + if (!lambdaParams.back()->AsETSParameterExpression()->IsRestParameter()) { + return; + } + SetTypeforLambdaParamWithoutTypeAnnotation(lambdaParams.back()->AsETSParameterExpression(), + sig->RestVar()->TsType()); + paramCount--; + } + for (size_t i = 0; i < paramCount; i++) { + auto *inferredType = sig->Params()[i]->TsType(); + SetTypeforLambdaParamWithoutTypeAnnotation(lambdaParams[i]->AsETSParameterExpression(), inferredType); + } +} + void ETSChecker::InferAliasLambdaType(ir::TypeNode *localTypeAnnotation, ir::ArrowFunctionExpression *init) { ES2PANDA_ASSERT(localTypeAnnotation != nullptr); diff --git a/ets2panda/compiler/core/ETSfunction.cpp b/ets2panda/compiler/core/ETSfunction.cpp index 672f29e5f6d859490a0ed258dfe6b640d5853390..2daa3e0167a08288caac9c806532fc80aa377684 100644 --- a/ets2panda/compiler/core/ETSfunction.cpp +++ b/ets2panda/compiler/core/ETSfunction.cpp @@ -111,18 +111,9 @@ void ETSFunction::CompileAsStaticBlock(ETSGen *etsg) { const auto *classDef = etsg->ContainingObjectType()->GetDeclNode()->AsClassDefinition(); - auto const checkInitializer = [](ArenaVector const &nodes) -> bool { - for (auto const *const node : nodes) { - if (node->IsMethodDefinition() && node->AsClassElement()->Key()->IsIdentifier() && - node->AsClassElement()->Id()->Name() == compiler::Signatures::INIT_METHOD) { - return false; - } - } - return true; - }; - - // Check if it is the Global class static constructor and the special '_$init$_" method exists - bool const compileInitializer = classDef->IsGlobal() ? checkInitializer(classDef->Body()) : true; + if (classDef->IsGlobal() && classDef->IsInitInCctor()) { + return; + } for (const auto *prop : classDef->Body()) { if (!prop->IsClassProperty() || !prop->IsStatic()) { @@ -131,8 +122,8 @@ void ETSFunction::CompileAsStaticBlock(ETSGen *etsg) // Don't compile variable initializers if they present in '_$init$_" method auto *const item = prop->AsClassProperty(); - if (item->Value() != nullptr && - (compileInitializer || item->IsConst() || item->Value()->IsArrowFunctionExpression())) { + + if (item->Value() != nullptr) { item->Compile(etsg); } } diff --git a/ets2panda/compiler/lowering/ets/topLevelStmts/globalClassHandler.cpp b/ets2panda/compiler/lowering/ets/topLevelStmts/globalClassHandler.cpp index 88a4c1ab28c97163a0cbfac3cb8f5ec7499b8fbe..d8c68fb76d773b4e536779daa39b3b284e468c5f 100644 --- a/ets2panda/compiler/lowering/ets/topLevelStmts/globalClassHandler.cpp +++ b/ets2panda/compiler/lowering/ets/topLevelStmts/globalClassHandler.cpp @@ -225,12 +225,7 @@ void GlobalClassHandler::SetupGlobalMethods(ArenaVector &&initS return; } - ir::MethodDefinition *initMethod = CreateGlobalMethod(compiler::Signatures::INIT_METHOD, std::move(initStatements)); - InsertInGlobal(globalClass, initMethod); - ES2PANDA_ASSERT(initMethod->Function()); - if (!initMethod->Function()->Body()->AsBlockStatement()->Statements().empty()) { - AddInitCallToStaticBlock(globalClass, initMethod); - } + AddInitStatementsToStaticBlock(globalClass, std::move(initStatements)); } void GlobalClassHandler::MergeNamespace(ArenaVector &namespaces, parser::Program *program) @@ -425,6 +420,26 @@ void GlobalClassHandler::SetupGlobalClass(const ArenaVector & SetupInitializerBlock(std::move(initializerBlockStmts), globalClass); } +static std::pair GetBoundInBody(parser::Program *program, + ir::BlockStatement *body) +{ + auto minBound = lexer::SourcePosition(program); + auto maxBound = lexer::SourcePosition(program); + if (!body->Statements().empty()) { + minBound = body->Statements().front()->Start(); + maxBound = body->Statements().front()->End(); + for (const auto &stmt : body->Statements()) { + if (stmt->Start().index < minBound.index) { + minBound = stmt->Start(); + } + if (stmt->End().index > maxBound.index) { + maxBound = stmt->End(); + } + } + } + return std::make_pair(minBound, maxBound); +} + ir::MethodDefinition *GlobalClassHandler::CreateGlobalMethod(const std::string_view name, ArenaVector &&statements) { @@ -450,24 +465,13 @@ ir::MethodDefinition *GlobalClassHandler::CreateGlobalMethod(const std::string_v identClone->AsExpression(), funcExpr, functionModifiers, allocator_, false); ES2PANDA_ASSERT(methodDef != nullptr); - auto minBound = lexer::SourcePosition(globalProgram_); - auto maxBound = lexer::SourcePosition(globalProgram_); - if (!body->Statements().empty()) { - minBound = body->Statements().front()->Start(); - maxBound = body->Statements().front()->End(); - for (const auto &stmt : body->Statements()) { - if (stmt->Start().index < minBound.index) { - minBound = stmt->Start(); - } - if (stmt->End().index > maxBound.index) { - maxBound = stmt->End(); - } - } - } + + auto [minBound, maxBound] = GetBoundInBody(globalProgram_, body); body->SetRange({minBound, maxBound}); func->SetRange({minBound, maxBound}); funcExpr->SetRange({minBound, maxBound}); methodDef->SetRange({minBound, maxBound}); + return methodDef; } @@ -511,6 +515,30 @@ void GlobalClassHandler::AddInitCallToStaticBlock(ir::ClassDefinition *globalCla blockBody->AddStatement(exprStmt); } +void GlobalClassHandler::AddInitStatementsToStaticBlock(ir::ClassDefinition *globalClass, + ArenaVector &&initStatements) +{ + auto &globalBody = globalClass->Body(); + auto maybeStaticBlock = std::find_if(globalBody.begin(), globalBody.end(), + [](ir::AstNode *node) { return node->IsClassStaticBlock(); }); + ES2PANDA_ASSERT(maybeStaticBlock != globalBody.end()); + + auto *staticBlock = (*maybeStaticBlock)->AsClassStaticBlock(); + + auto *blockBody = staticBlock->Function()->Body()->AsBlockStatement(); + for (auto &stmt : initStatements) { + blockBody->AddStatement(stmt); + } + + auto [minBound, maxBound] = GetBoundInBody(globalProgram_, blockBody); + blockBody->SetRange({minBound, maxBound}); + staticBlock->Function()->SetRange({minBound, maxBound}); + staticBlock->Value()->SetRange({minBound, maxBound}); + staticBlock->SetRange({minBound, maxBound}); + + globalClass->SetInitInCctor(); +} + ir::Identifier *GlobalClassHandler::RefIdent(const util::StringView &name) { auto *const callee = NodeAllocator::Alloc(allocator_, name, allocator_); diff --git a/ets2panda/compiler/lowering/ets/topLevelStmts/globalClassHandler.h b/ets2panda/compiler/lowering/ets/topLevelStmts/globalClassHandler.h index 7f28e2a01aaf5d96286b24f17be9c3ce810a4264..2addd00448aa1debb1aa59bba17ee33f9f4c0143 100644 --- a/ets2panda/compiler/lowering/ets/topLevelStmts/globalClassHandler.h +++ b/ets2panda/compiler/lowering/ets/topLevelStmts/globalClassHandler.h @@ -91,6 +91,8 @@ private: ir::ClassDeclaration *CreateGlobalClass(const parser::Program *globalProgram); ir::ClassStaticBlock *CreateStaticBlock(ir::ClassDefinition *classDef); ir::MethodDefinition *CreateGlobalMethod(std::string_view name, ArenaVector &&statements); + void AddInitStatementsToStaticBlock(ir::ClassDefinition *globalClass, + ArenaVector &&initStatements); void AddInitCallToStaticBlock(ir::ClassDefinition *globalClass, ir::MethodDefinition *initMethod); void AddInitializerBlockToStaticBlock(ir::ClassDefinition *globalClass, ArenaVector &&initializerBlocks); diff --git a/ets2panda/compiler/lowering/ets/topLevelStmts/globalDeclTransformer.cpp b/ets2panda/compiler/lowering/ets/topLevelStmts/globalDeclTransformer.cpp index bfcf89256103705542593fb27711f558e0a0952b..bd3f10bda82382e5cc55fd419772fbc0af23d8b5 100644 --- a/ets2panda/compiler/lowering/ets/topLevelStmts/globalDeclTransformer.cpp +++ b/ets2panda/compiler/lowering/ets/topLevelStmts/globalDeclTransformer.cpp @@ -14,6 +14,7 @@ */ #include "compiler/lowering/ets/topLevelStmts/globalDeclTransformer.h" +#include "compiler/lowering/util.h" namespace ark::es2panda::compiler { @@ -174,15 +175,9 @@ ir::Identifier *GlobalDeclTransformer::RefIdent(const util::StringView &name) return callee; } -ir::ExpressionStatement *GlobalDeclTransformer::InitTopLevelProperty(ir::ClassProperty *classProperty) +ir::ExpressionStatement *GlobalDeclTransformer::CreateAssignmentStatement(ir::ClassProperty *classProperty, + ir::Expression *initializer) { - const auto initializer = classProperty->Value(); - ES2PANDA_ASSERT(classProperty->Id() != nullptr); - if (classProperty->IsConst() || initializer == nullptr) { - classProperty->SetStart(classProperty->Id()->Start()); - return nullptr; - } - auto const ident = RefIdent(classProperty->Id()->Name()); ES2PANDA_ASSERT(ident != nullptr); ident->SetRange(classProperty->Id()->Range()); @@ -197,16 +192,30 @@ ir::ExpressionStatement *GlobalDeclTransformer::InitTopLevelProperty(ir::ClassPr auto expressionStatement = util::NodeAllocator::Alloc(allocator_, assignmentExpression); ES2PANDA_ASSERT(expressionStatement != nullptr); expressionStatement->SetRange(classProperty->Range()); + assignmentExpression->SetIgnoreConstAssign(); + + return expressionStatement; +} - classProperty->SetRange({ident->Start(), initializer->End()}); +ir::ExpressionStatement *GlobalDeclTransformer::InitTopLevelProperty(ir::ClassProperty *classProperty) +{ + ES2PANDA_ASSERT(classProperty->Id() != nullptr); + if (classProperty->Value() == nullptr) { + classProperty->SetStart(classProperty->Id()->Start()); + return nullptr; + } - if (classProperty->TypeAnnotation() != nullptr) { + ir::Expression *initializer = nullptr; + if (classProperty->TypeAnnotation() != nullptr && !classProperty->IsConst()) { + initializer = classProperty->Value(); + classProperty->SetEnd(classProperty->Value()->Start()); classProperty->SetValue(nullptr); - } else { - // Code will be ignored, but checker is going to deduce the type. - classProperty->SetValue(initializer->Clone(allocator_, classProperty)->AsExpression()); + return CreateAssignmentStatement(classProperty, initializer); } - return expressionStatement; + + // Code will be ignored, but checker is going to deduce the type. + initializer = classProperty->Value()->Clone(allocator_, classProperty)->AsExpression(); + return CreateAssignmentStatement(classProperty, initializer); } void GlobalDeclTransformer::HandleNode(ir::AstNode *node) diff --git a/ets2panda/compiler/lowering/ets/topLevelStmts/globalDeclTransformer.h b/ets2panda/compiler/lowering/ets/topLevelStmts/globalDeclTransformer.h index e8631b95a2925065875d1e988889b2affb4f497a..affa47d495b1a0a89dd4f2fc3e9715c3ab92df0f 100644 --- a/ets2panda/compiler/lowering/ets/topLevelStmts/globalDeclTransformer.h +++ b/ets2panda/compiler/lowering/ets/topLevelStmts/globalDeclTransformer.h @@ -89,6 +89,7 @@ public: ir::Identifier *RefIdent(const util::StringView &name); + ir::ExpressionStatement *CreateAssignmentStatement(ir::ClassProperty *classProperty, ir::Expression *initializer); ir::ExpressionStatement *InitTopLevelProperty(ir::ClassProperty *classProperty); [[nodiscard]] bool IsMultiInitializer() const diff --git a/ets2panda/ir/base/classDefinition.h b/ets2panda/ir/base/classDefinition.h index 869939f869b6296f3b52f8f3a93f4b4948e0a657..b1df4a83c3d87e41adca6f6a0de08a2001097695 100644 --- a/ets2panda/ir/base/classDefinition.h +++ b/ets2panda/ir/base/classDefinition.h @@ -59,6 +59,7 @@ enum class ClassDefinitionModifiers : uint32_t { FROM_STRUCT = 1U << 16U, FUNCTIONAL_REFERENCE = 1U << 17U, LAZY_IMPORT_OBJECT_CLASS = 1U << 18U, + INIT_IN_CCTOR = 1U << 19U, DECLARATION_ID_REQUIRED = DECLARATION | ID_REQUIRED, ETS_MODULE = NAMESPACE_TRANSFORMED | GLOBAL }; @@ -281,6 +282,11 @@ public: return (Modifiers() & ClassDefinitionModifiers::FROM_STRUCT) != 0; } + [[nodiscard]] bool IsInitInCctor() const noexcept + { + return (Modifiers() & ClassDefinitionModifiers::INIT_IN_CCTOR) != 0; + } + [[nodiscard]] bool IsModule() const noexcept { return IsGlobal() || IsNamespaceTransformed(); @@ -326,6 +332,11 @@ public: AddClassModifiers(ClassDefinitionModifiers::FROM_STRUCT); } + void SetInitInCctor() + { + AddClassModifiers(ClassDefinitionModifiers::INIT_IN_CCTOR); + } + [[nodiscard]] ClassDefinitionModifiers Modifiers() const noexcept { return GetHistoryNodeAs()->modifiers_; diff --git a/ets2panda/ir/statements/ifStatement.cpp b/ets2panda/ir/statements/ifStatement.cpp index fb33121bbc7eb508de10a1d66ab3ee5a869a0941..9b50804416cb282c0d6936ae812cba59b0a9ac60 100644 --- a/ets2panda/ir/statements/ifStatement.cpp +++ b/ets2panda/ir/statements/ifStatement.cpp @@ -106,7 +106,7 @@ IfStatement *IfStatement::Clone(ArenaAllocator *const allocator, AstNode *const { auto *const test = test_->Clone(allocator, nullptr)->AsExpression(); auto *const consequent = consequent_->Clone(allocator, nullptr)->AsStatement(); - auto *const alternate = alternate_ != nullptr ? consequent_->Clone(allocator, nullptr)->AsStatement() : nullptr; + auto *const alternate = alternate_ != nullptr ? alternate_->Clone(allocator, nullptr)->AsStatement() : nullptr; auto *const clone = allocator->New(test, consequent, alternate); if (parent != nullptr) { diff --git a/ets2panda/ir/statements/switchCaseStatement.cpp b/ets2panda/ir/statements/switchCaseStatement.cpp index 848a7159844cd5647a02b450dde44cd46213ae45..07d1b0d3af4807667dd2e7a6ddbb09ea57b7d4c6 100644 --- a/ets2panda/ir/statements/switchCaseStatement.cpp +++ b/ets2panda/ir/statements/switchCaseStatement.cpp @@ -148,7 +148,7 @@ SwitchCaseStatement *SwitchCaseStatement::Clone(ArenaAllocator *const allocator, { Expression *test = nullptr; if (test_ != nullptr) { - test = test_->Clone(allocator, nullptr)->AsExpression(); + test = test_ == nullptr ? nullptr : test_->Clone(allocator, nullptr)->AsExpression(); } ArenaVector consequent(allocator->Adapter()); diff --git a/ets2panda/lsp/src/api.cpp b/ets2panda/lsp/src/api.cpp index 12f2d1905acbac0031d1239aa9b32ef3572b0777..b634b92c173f6be80fd254a124988891403ecc2b 100644 --- a/ets2panda/lsp/src/api.cpp +++ b/ets2panda/lsp/src/api.cpp @@ -216,6 +216,7 @@ DiagnosticReferences GetSemanticDiagnostics(es2panda_Context *context) { DiagnosticReferences result {}; auto ctx = reinterpret_cast(context); + ctx->diagnosticEngine->CleanDuplicateLog(util::DiagnosticType::SEMANTIC); SetPhaseManager(ctx->phaseManager); const auto &diagnostics = ctx->diagnosticEngine->GetDiagnosticStorage(util::DiagnosticType::SEMANTIC); for (const auto &diagnostic : diagnostics) { @@ -228,6 +229,7 @@ DiagnosticReferences GetSyntacticDiagnostics(es2panda_Context *context) { DiagnosticReferences result {}; auto ctx = reinterpret_cast(context); + ctx->diagnosticEngine->CleanDuplicateLog(util::DiagnosticType::SYNTAX); SetPhaseManager(ctx->phaseManager); const auto &diagnostics = ctx->diagnosticEngine->GetDiagnosticStorage(util::DiagnosticType::SYNTAX); const auto &diagnosticsPluginError = diff --git a/ets2panda/lsp/src/completions.cpp b/ets2panda/lsp/src/completions.cpp index 8b1961ff2f652bc15af599ad21d3e00b04e04ef3..58d7cefe24e7b336b49474c4661d26680dc7bb8f 100644 --- a/ets2panda/lsp/src/completions.cpp +++ b/ets2panda/lsp/src/completions.cpp @@ -687,19 +687,19 @@ CompletionEntry InitEntry(const ir::AstNode *decl) } else if (IsConstVar(decl)) { kind = CompletionEntryKind::CONSTANT; } else if (IsGlobalVar(decl)) { - auto globalDefiniton = decl->Parent()->AsClassDefinition(); - auto initMethod = globalDefiniton->FindChild([](ir::AstNode *child) { - return child->IsMethodDefinition() && - child->AsMethodDefinition()->Key()->AsIdentifier()->Name() == compiler::Signatures::INIT_METHOD; + auto globalDefinition = decl->Parent()->AsClassDefinition(); + auto cctor = globalDefinition->FindChild([&globalDefinition](ir::AstNode *child) { + return child->IsClassStaticBlock() && child->Parent()->IsClassDefinition() && + child->Parent()->AsClassDefinition() == globalDefinition; }); - if (initMethod == nullptr) { + if (cctor == nullptr) { return CompletionEntry(name, CompletionEntryKind::CONSTANT, std::string(sortText)); } - auto found = initMethod->FindChild([&name](ir::AstNode *child) { + auto found = cctor->FindChild([&name](ir::AstNode *child) { return child->IsAssignmentExpression() && child->AsAssignmentExpression()->Left()->IsIdentifier() && child->AsAssignmentExpression()->Left()->AsIdentifier()->ToString() == name; }); - if (found != nullptr) { + if (found != nullptr && !decl->AsClassProperty()->IsConst()) { // let variable in global definition need to be assigned in _$init$_ method kind = CompletionEntryKind::VARIABLE; } else { diff --git a/ets2panda/parser/ETSparserExpressions.cpp b/ets2panda/parser/ETSparserExpressions.cpp index 45ea49b80258319a43e7739feb10786c9066c5ae..ae34f2a8541e612ec3a7b1580c8fa298afb3a6f2 100644 --- a/ets2panda/parser/ETSparserExpressions.cpp +++ b/ets2panda/parser/ETSparserExpressions.cpp @@ -657,7 +657,8 @@ ir::Expression *ETSParser::ParsePotentialAsExpression(ir::Expression *primaryExp auto *asExpression = AllocNode(primaryExpr, type, false); ES2PANDA_ASSERT(asExpression != nullptr); - asExpression->SetRange(primaryExpr->Range()); + asExpression->SetStart(primaryExpr->Start()); + asExpression->SetEnd(type->End()); return asExpression; } diff --git a/ets2panda/test/ast/compiler/ets/DeclareCheckAssign.ets b/ets2panda/test/ast/compiler/ets/DeclareCheckAssign.ets index 9e0ebf92e4e1820783350f9a63ae47494cff941a..fd4f2eb8a5bd57a6116a51d868dcc05a6328ea66 100644 --- a/ets2panda/test/ast/compiler/ets/DeclareCheckAssign.ets +++ b/ets2panda/test/ast/compiler/ets/DeclareCheckAssign.ets @@ -43,23 +43,25 @@ declare const x31 = 0x5 declare const x41 = 0b101 declare const x51 = "abc" -/* @@? 16:37 Error TypeError: Initializers are not allowed in ambient contexts: byte_1 */ -/* @@? 16:66 Error TypeError: Initializers are not allowed in ambient contexts: byte_2 */ -/* @@? 17:38 Error TypeError: Initializers are not allowed in ambient contexts: byte_12 */ -/* @@? 17:64 Error TypeError: Initializers are not allowed in ambient contexts: byte_22 */ -/* @@? 18:38 Error TypeError: Initializers are not allowed in ambient contexts: byte_13 */ -/* @@? 18:70 Error TypeError: Initializers are not allowed in ambient contexts: byte_23 */ -/* @@? 19:38 Error TypeError: Initializers are not allowed in ambient contexts: byte_14 */ -/* @@? 22:31 Error TypeError: A 'const' initializer in an ambient context must be a string or numeric literal: int_12 */ -/* @@? 24:36 Error TypeError: Initializers are not allowed in ambient contexts: int_16 */ -/* @@? 26:39 Error TypeError: Initializers are not allowed in ambient contexts: int_18 */ -/* @@? 27:25 Error TypeError: Initializers are not allowed in ambient contexts: x1 */ -/* @@? 28:25 Error TypeError: Initializers are not allowed in ambient contexts: x2 */ -/* @@? 29:27 Error TypeError: Initializers are not allowed in ambient contexts: y1 */ -/* @@? 30:28 Error TypeError: Initializers are not allowed in ambient contexts: y2 */ -/* @@? 31:25 Error TypeError: Initializers are not allowed in ambient contexts: x3 */ -/* @@? 32:25 Error TypeError: Initializers are not allowed in ambient contexts: x4 */ -/* @@? 33:28 Error TypeError: Initializers are not allowed in ambient contexts: x5 */ -/* @@? 34:27 Error TypeError: Initializers are not allowed in ambient contexts: x6 */ -/* @@? 35:20 Error TypeError: A 'const' initializer in an ambient context must be a string or numeric literal: x7 */ -/* @@? 36:20 Error TypeError: A 'const' initializer in an ambient context must be a string or numeric literal: x8 */ +/* @@? 16:37 Error TypeError: Initializers are not allowed in ambient contexts: byte_1 */ +/* @@? 16:66 Error TypeError: Initializers are not allowed in ambient contexts: byte_2 */ +/* @@? 17:38 Error TypeError: Initializers are not allowed in ambient contexts: byte_12 */ +/* @@? 17:38 Error TypeError: Type 'Int' cannot be assigned to type 'Byte' */ +/* @@? 17:64 Error TypeError: Initializers are not allowed in ambient contexts: byte_22 */ +/* @@? 17:64 Error TypeError: Type 'Int' cannot be assigned to type 'Byte' */ +/* @@? 18:38 Error TypeError: Initializers are not allowed in ambient contexts: byte_13 */ +/* @@? 18:70 Error TypeError: Initializers are not allowed in ambient contexts: byte_23 */ +/* @@? 19:38 Error TypeError: Initializers are not allowed in ambient contexts: byte_14 */ +/* @@? 22:31 Error TypeError: A 'const' initializer in an ambient context must be a string or numeric literal: int_12 */ +/* @@? 24:36 Error TypeError: Initializers are not allowed in ambient contexts: int_16 */ +/* @@? 26:39 Error TypeError: Initializers are not allowed in ambient contexts: int_18 */ +/* @@? 27:25 Error TypeError: Initializers are not allowed in ambient contexts: x1 */ +/* @@? 28:25 Error TypeError: Initializers are not allowed in ambient contexts: x2 */ +/* @@? 29:27 Error TypeError: Initializers are not allowed in ambient contexts: y1 */ +/* @@? 30:28 Error TypeError: Initializers are not allowed in ambient contexts: y2 */ +/* @@? 31:25 Error TypeError: Initializers are not allowed in ambient contexts: x3 */ +/* @@? 32:25 Error TypeError: Initializers are not allowed in ambient contexts: x4 */ +/* @@? 33:28 Error TypeError: Initializers are not allowed in ambient contexts: x5 */ +/* @@? 34:27 Error TypeError: Initializers are not allowed in ambient contexts: x6 */ +/* @@? 35:20 Error TypeError: A 'const' initializer in an ambient context must be a string or numeric literal: x7 */ +/* @@? 36:20 Error TypeError: A 'const' initializer in an ambient context must be a string or numeric literal: x8 */ diff --git a/ets2panda/test/ast/compiler/ets/FixedArray/unresolved_reference.ets b/ets2panda/test/ast/compiler/ets/FixedArray/unresolved_reference.ets index 3213a83ac10b83029e0ce7f1d4bfad9d552fa97a..eef306e686bcfd4523e7ecaae7ba1d023ba732c3 100644 --- a/ets2panda/test/ast/compiler/ets/FixedArray/unresolved_reference.ets +++ b/ets2panda/test/ast/compiler/ets/FixedArray/unresolved_reference.ets @@ -37,5 +37,5 @@ function main() { let a = (new A).b } -/* @@? 28:13 Error TypeError: Unresolved reference b */ +/* @@? 16:13 Error TypeError: Unresolved reference b */ /* @@? 37:21 Error TypeError: Property 'b' does not exist on type 'A' */ diff --git a/ets2panda/test/ast/compiler/ets/annotation_tests/annotationUsage_duplicate_on_extension_lambda.ets b/ets2panda/test/ast/compiler/ets/annotation_tests/annotationUsage_duplicate_on_extension_lambda.ets index 025b88d8e8e040134856aa20c860271ac76c64c1..7dcd2ce4b267fd5e268e10ea7a88f77503795c0a 100644 --- a/ets2panda/test/ast/compiler/ets/annotation_tests/annotationUsage_duplicate_on_extension_lambda.ets +++ b/ets2panda/test/ast/compiler/ets/annotation_tests/annotationUsage_duplicate_on_extension_lambda.ets @@ -21,4 +21,4 @@ let a = new A(); let show = @Anno()@/* @@ label */Anno(this: A): string => { return "Hello," + this.name; } -/* @@@ label Error TypeError: Duplicate annotations are not allowed. The annotation 'Anno' has already been applied to this element. */ +/* @@? 21:34 Error TypeError: Duplicate annotations are not allowed. The annotation 'Anno' has already been applied to this element. */ diff --git a/ets2panda/test/ast/compiler/ets/circular_variable_init.ets b/ets2panda/test/ast/compiler/ets/circular_variable_init.ets index fc6881da7f2ee8bf16964c5c552197dffa291df7..f5bf4a22488b860ba739a9905b730df19654a181 100644 --- a/ets2panda/test/ast/compiler/ets/circular_variable_init.ets +++ b/ets2panda/test/ast/compiler/ets/circular_variable_init.ets @@ -46,7 +46,7 @@ function main() { /* @@? 18:12 Error TypeError: Circular dependency detected for identifier: b */ /* @@? 23:19 Error TypeError: Circular dependency detected for identifier: b */ /* @@? 31:15 Error TypeError: Unresolved reference globalb */ -/* @@? 33:5 Error TypeError: Circular dependency detected for identifier: globalc */ +/* @@? 34:5 Error TypeError: Circular dependency detected for identifier: globald */ /* @@? 36:7 Error TypeError: Circular dependency detected for identifier: consta */ /* @@? 40:17 Error TypeError: Unresolved reference mainb */ /* @@? 42:17 Error TypeError: Variable 'maind' is accessed before it's initialization. */ diff --git a/ets2panda/test/ast/compiler/ets/class_cyclic_constructor.ets b/ets2panda/test/ast/compiler/ets/class_cyclic_constructor.ets index d495c7c9514e0254f84b57b15d5a7a724ba318b6..89afebb59c28b0d63991ab1418a38b63acca1d11 100644 --- a/ets2panda/test/ast/compiler/ets/class_cyclic_constructor.ets +++ b/ets2panda/test/ast/compiler/ets/class_cyclic_constructor.ets @@ -48,6 +48,6 @@ class A { /* @@? 26:31 Error TypeError: Property 'bar' does not exist on type 'A' */ /* @@? 27:5 Error SyntaxError: Unexpected token ')'. */ /* @@? 27:7 Error SyntaxError: Unexpected token '{'. */ -/* @@? 28:9 Error TypeError: Cannot reference 'this' in this context. */ -/* @@? 28:14 Error TypeError: Property 'x' does not exist on type 'Error' */ +/* @@? 28:9 Error TypeError: 'this' cannot be referenced from a static context */ +/* @@? 28:14 Error TypeError: Property 'x' does not exist on type 'ETSGLOBAL' */ /* @@? 30:1 Error SyntaxError: Unexpected token '}'. */ diff --git a/ets2panda/test/ast/compiler/ets/getType.ets b/ets2panda/test/ast/compiler/ets/getType.ets index aee120c32a1fefaf602b94ac1517d558c1505785..beeb87771d0ba08a2148838851a2bbb4bcd54c39 100644 --- a/ets2panda/test/ast/compiler/ets/getType.ets +++ b/ets2panda/test/ast/compiler/ets/getType.ets @@ -19,9 +19,9 @@ declare type type_tuple_union = [string, boolean, number] | (this.mnum === other /* @@? 15:66 Error SyntaxError: Unexpected token, expected ')'. */ /* @@? 15:67 Error TypeError: Unresolved reference mnum */ /* @@? 15:76 Error TypeError: Unresolved reference other */ -/* @@? 15:90 Error TypeError: Cannot reference 'this' in this context. */ -/* @@? 15:95 Error TypeError: Property 'mden' does not exist on type 'Error' */ +/* @@? 15:90 Error TypeError: 'this' cannot be referenced from a static context */ +/* @@? 15:95 Error TypeError: Property 'mden' does not exist on type 'ETSGLOBAL' */ /* @@? 16:1 Error SyntaxError: Unexpected token ')'. */ /* @@? 16:1 Error TypeError: Indexed access is not supported for such expression type. */ /* @@? 16:3 Error SyntaxError: Unexpected token ']'. */ -/* @@? 27:67 Error SyntaxError: Unexpected token, expected ']'. */ \ No newline at end of file +/* @@? 28:1 Error SyntaxError: Unexpected token, expected ']'. */ diff --git a/ets2panda/test/ast/compiler/ets/import_export/eitest_import_all_4_ne.ets b/ets2panda/test/ast/compiler/ets/import_export/eitest_import_all_4_ne.ets index 57e068b6d1bbbefc29e614a1e875dd9c75349b0c..22fc4900fc5427570af2a78e3533a0056a1839cf 100644 --- a/ets2panda/test/ast/compiler/ets/import_export/eitest_import_all_4_ne.ets +++ b/ets2panda/test/ast/compiler/ets/import_export/eitest_import_all_4_ne.ets @@ -16,4 +16,5 @@ import * as ns from "./eitest_import_all_5_ne" const t: ns.B = new ns.B() -/* @@? eitest_import_all_4_ne.ets:17:13 Error TypeError: 'B' type does not exist. */ \ No newline at end of file +/* @@? eitest_import_all_4_ne.ets:17:13 Error TypeError: 'B' type does not exist. */ +/* @@? eitest_import_all_4_ne.ets:17:24 Error TypeError: 'B' type does not exist. */ diff --git a/ets2panda/test/ast/compiler/ets/import_tests/import_distant_package/package_with_errors/import_in_package_with_error.ets b/ets2panda/test/ast/compiler/ets/import_tests/import_distant_package/package_with_errors/import_in_package_with_error.ets index d7c0b1872b7a96393b889dbfdddff465126ce207..417776eca0f51ca7b33f730512d41d0df9dfddd1 100644 --- a/ets2panda/test/ast/compiler/ets/import_tests/import_distant_package/package_with_errors/import_in_package_with_error.ets +++ b/ets2panda/test/ast/compiler/ets/import_tests/import_distant_package/package_with_errors/import_in_package_with_error.ets @@ -20,13 +20,9 @@ import { notInit, importantInfo } from "./inner_package_with_errors" function bar(x: notInit) { (=_=) } /* @@? distant_package.ets:22:22 Error SyntaxError: Variable must be initialized or it's type must be declared. */ - /* @@? package_with_errors_1.ets:19:32 Error TypeError: Cannot cast type 'String' to 'Double' */ - -/* @@? package_with_errors_2.ets:19:16 Error SyntaxError: Non-constant initializer of Package should be apply in Initializer Block. */ /* @@? package_with_errors_2.ets:19:16 Error TypeError: Unresolved reference foo */ /* @@? package_with_errors_2.ets:19:16 Error TypeError: This expression is not callable. */ - /* @@? import_in_package_with_error.ets:20:17 Error TypeError: Cannot find type 'notInit'. */ /* @@? import_in_package_with_error.ets:20:29 Error SyntaxError: Unexpected token '='. */ /* @@? import_in_package_with_error.ets:20:30 Error SyntaxError: Unexpected token, expected ')'. */ diff --git a/ets2panda/test/ast/compiler/ets/import_tests/import_distant_package/package_with_errors/package_with_errors_1.ets b/ets2panda/test/ast/compiler/ets/import_tests/import_distant_package/package_with_errors/package_with_errors_1.ets index 8ea80e1135ed035aadbbf61f772d09e686fee779..cb95afc31ae8eefb69bf155351d49e1c6f400200 100644 --- a/ets2panda/test/ast/compiler/ets/import_tests/import_distant_package/package_with_errors/package_with_errors_1.ets +++ b/ets2panda/test/ast/compiler/ets/import_tests/import_distant_package/package_with_errors/package_with_errors_1.ets @@ -22,11 +22,7 @@ export let moreImportantInfo = importantInfo as number; /* @@? import_in_package_with_error.ets:20:29 Error SyntaxError: Unexpected token '='. */ /* @@? import_in_package_with_error.ets:20:30 Error SyntaxError: Unexpected token, expected ')'. */ /* @@? import_in_package_with_error.ets:20:32 Error SyntaxError: Unexpected token ')'. */ - /* @@? distant_package.ets:22:22 Error SyntaxError: Variable must be initialized or it's type must be declared. */ - -/* @@? package_with_errors_2.ets:19:16 Error SyntaxError: Non-constant initializer of Package should be apply in Initializer Block. */ /* @@? package_with_errors_2.ets:19:16 Error TypeError: Unresolved reference foo */ /* @@? package_with_errors_2.ets:19:16 Error TypeError: This expression is not callable. */ - /* @@? package_with_errors_1.ets:19:32 Error TypeError: Cannot cast type 'String' to 'Double' */ diff --git a/ets2panda/test/ast/compiler/ets/import_tests/import_distant_package/package_with_errors/package_with_errors_2.ets b/ets2panda/test/ast/compiler/ets/import_tests/import_distant_package/package_with_errors/package_with_errors_2.ets index bd2e68d9233625dc5b18d7ac203e4c9a56c404f4..58ca5496f158e7f60cf2fed3ec0ccbd14da31485 100644 --- a/ets2panda/test/ast/compiler/ets/import_tests/import_distant_package/package_with_errors/package_with_errors_2.ets +++ b/ets2panda/test/ast/compiler/ets/import_tests/import_distant_package/package_with_errors/package_with_errors_2.ets @@ -24,11 +24,7 @@ export notInit /* @@? import_in_package_with_error.ets:20:29 Error SyntaxError: Unexpected token '='. */ /* @@? import_in_package_with_error.ets:20:30 Error SyntaxError: Unexpected token, expected ')'. */ /* @@? import_in_package_with_error.ets:20:32 Error SyntaxError: Unexpected token ')'. */ - /* @@? distant_package.ets:22:22 Error SyntaxError: Variable must be initialized or it's type must be declared. */ - /* @@? package_with_errors_1.ets:19:32 Error TypeError: Cannot cast type 'String' to 'Double' */ - -/* @@? package_with_errors_2.ets:19:16 Error SyntaxError: Non-constant initializer of Package should be apply in Initializer Block. */ /* @@? package_with_errors_2.ets:19:16 Error TypeError: Unresolved reference foo */ /* @@? package_with_errors_2.ets:19:16 Error TypeError: This expression is not callable. */ diff --git a/ets2panda/test/ast/compiler/ets/package_invalid_initializer/P3/P3.ets b/ets2panda/test/ast/compiler/ets/package_invalid_initializer/P3/P3.ets index 3609cbb822433097e51adf6a68531a869e015874..718607481dfea2a938287f5603cbfea11ea028c2 100644 --- a/ets2panda/test/ast/compiler/ets/package_invalid_initializer/P3/P3.ets +++ b/ets2panda/test/ast/compiler/ets/package_invalid_initializer/P3/P3.ets @@ -42,13 +42,10 @@ static { var_tobe_shadowed = 2; } -/* @@? P3.ets:26:25 Error SyntaxError: Non-constant initializer of Package should be apply in Initializer Block. */ -/* @@? P3.ets:27:23 Error SyntaxError: Non-constant initializer of Package should be apply in Initializer Block. */ /* @@? P3.ets:29:14 Error SyntaxError: Missing initialization for const package property */ /* @@? P3.ets:29:18 Error SyntaxError: Variable must be initialized or it's type must be declared. */ /* @@? P3.ets:30:30 Error SyntaxError: Non-constant initializer of Package should be apply in Initializer Block. */ /* @@? P3.ets:31:14 Error TypeError: Cannot reassign constant c_nn2 */ -/* @@? P3.ets:32:6 Error SyntaxError: Non-constant initializer of Package should be apply in Initializer Block. */ /* @@? P3.ets:33:1 Error SyntaxError: Invalid package toplevel statement */ /* @@? P3.ets:34:1 Error SyntaxError: Invalid package toplevel statement */ /* @@? P3.ets:39:14 Error SyntaxError: Missing initialization for const package property */ diff --git a/ets2panda/test/ast/compiler/ets/package_invalid_initializer/main_test.ets b/ets2panda/test/ast/compiler/ets/package_invalid_initializer/main_test.ets index 241151b6461a23c0f6494d44460e212e3cb73052..442220438fe10d11a0f8c504528ccee1db498f8c 100644 --- a/ets2panda/test/ast/compiler/ets/package_invalid_initializer/main_test.ets +++ b/ets2panda/test/ast/compiler/ets/package_invalid_initializer/main_test.ets @@ -15,10 +15,7 @@ import {nn, nn1, nn2} from "./P3" -/* @@? P3.ets:26:25 Error SyntaxError: Non-constant initializer of Package should be apply in Initializer Block. */ -/* @@? P3.ets:27:23 Error SyntaxError: Non-constant initializer of Package should be apply in Initializer Block. */ /* @@? P3.ets:29:18 Error SyntaxError: Variable must be initialized or it's type must be declared. */ /* @@? P3.ets:30:30 Error SyntaxError: Non-constant initializer of Package should be apply in Initializer Block. */ -/* @@? P3.ets:32:6 Error SyntaxError: Non-constant initializer of Package should be apply in Initializer Block. */ /* @@? P3.ets:33:1 Error SyntaxError: Invalid package toplevel statement */ /* @@? P3.ets:34:1 Error SyntaxError: Invalid package toplevel statement */ diff --git a/ets2panda/test/ast/compiler/ets/type_error_processing/var_without_def.ets b/ets2panda/test/ast/compiler/ets/type_error_processing/var_without_def.ets index 39be4eb79ae1de0b0bfcc5da375cd306abe800a6..799e9d1a8063e84e303b53ecf815ade00a1d014c 100644 --- a/ets2panda/test/ast/compiler/ets/type_error_processing/var_without_def.ets +++ b/ets2panda/test/ast/compiler/ets/type_error_processing/var_without_def.ets @@ -24,7 +24,7 @@ function foo() { void = [([...asyncGenerator])] } -/* @@? 16:1 Error TypeError: Unresolved reference a */ -/* @@? 20:1 Error TypeError: Unresolved reference c */ +/* @@? 21:9 Error TypeError: Unresolved reference a */ +/* @@? 21:17 Error TypeError: Unresolved reference c */ /* @@? 24:5 Error SyntaxError: Unexpected token 'void'. */ /* @@? 24:18 Error TypeError: Unresolved reference asyncGenerator */ diff --git a/ets2panda/test/ast/compiler/ets/unresolved_reference.ets b/ets2panda/test/ast/compiler/ets/unresolved_reference.ets index f2dff3a5f03ca1c9f2220cca228ded133516c56c..9478fc0e84d5c05b9fa08f7c6f6f748fe0426ea5 100644 --- a/ets2panda/test/ast/compiler/ets/unresolved_reference.ets +++ b/ets2panda/test/ast/compiler/ets/unresolved_reference.ets @@ -37,5 +37,5 @@ function main() { let a = (new A).b } -/* @@? 28:13 Error TypeError: Unresolved reference b */ +/* @@? 16:13 Error TypeError: Unresolved reference b */ /* @@? 37:21 Error TypeError: Property 'b' does not exist on type 'A' */ diff --git a/ets2panda/test/ast/parser/ets/FixedArray/MultipleParserErrors.ets b/ets2panda/test/ast/parser/ets/FixedArray/MultipleParserErrors.ets index b39957d8dcf9a387d61fa32a4b90b8c543f034e9..93e45d54543314685369023f1f128998e3034dae 100644 --- a/ets2panda/test/ast/parser/ets/FixedArray/MultipleParserErrors.ets +++ b/ets2panda/test/ast/parser/ets/FixedArray/MultipleParserErrors.ets @@ -189,7 +189,7 @@ function main(): void { /* @@? 43:11 Error SyntaxError: Invalid left-hand side in assignment expression. */ /* @@? 43:13 Error SyntaxError: Unexpected token 'byte'. */ /* @@? 45:6 Error SyntaxError: Unexpected token 'this'. */ -/* @@? 45:6 Error TypeError: Cannot reference 'this' in this context. */ +/* @@? 45:6 Error TypeError: 'this' cannot be referenced from a static context */ /* @@? 45:6 Error TypeError: Invalid left-hand side of assignment expression */ /* @@? 45:11 Error SyntaxError: Invalid left-hand side in assignment expression. */ /* @@? 47:8 Error SyntaxError: Variable must be initialized or it's type must be declared. */ @@ -261,14 +261,15 @@ function main(): void { /* @@? 123:5 Error SyntaxError: Identifier expected, got ','. */ /* @@? 123:6 Error SyntaxError: Variable must be initialized or it's type must be declared. */ /* @@? 123:6 Error SyntaxError: Unexpected token 'abc'. */ +/* @@? 123:6 Error SyntaxError: Variable must be initialized or it's type must be declared. */ /* @@? 123:6 Error TypeError: Unresolved reference abc */ /* @@? 125:1 Error TypeError: Method declaration `foo` must all ambient or non-ambient */ /* @@? 127:1 Error SyntaxError: The modifier async cannot be used in an ambient context. */ /* @@? 132:14 Error SyntaxError: Unexpected token, expected an identifier. */ -/* @@? 137:16 Error SyntaxError: Unexpected token '='. */ -/* @@? 137:16 Error SyntaxError: Expected '{', got '='. */ -/* @@? 137:16 Error SyntaxError: Expected ')', got '='. */ /* @@? 137:16 Error SyntaxError: Catch clause variable cannot have an initializer. */ +/* @@? 137:16 Error SyntaxError: Expected ')', got '='. */ +/* @@? 137:16 Error SyntaxError: Expected '{', got '='. */ +/* @@? 137:16 Error SyntaxError: Unexpected token '='. */ /* @@? 137:18 Error SyntaxError: Unexpected token '0'. */ /* @@? 137:19 Error SyntaxError: Unexpected token ')'. */ /* @@? 137:21 Error SyntaxError: Unexpected token '{'. */ @@ -281,14 +282,14 @@ function main(): void { /* @@? 151:29 Error TypeError: Cannot find type 'D0'. */ /* @@? 157:16 Error TypeError: A is abstract therefore cannot be instantiated. */ /* @@? 158:26 Error TypeError: Property 'getInner' does not exist on type 'A' */ -/* @@? 161:9 Error SyntaxError: Identifier expected, got 'let'. */ /* @@? 161:9 Error SyntaxError: Hard keyword 'let' cannot be used as identifier */ -/* @@? 162:9 Error SyntaxError: Hard keyword 'const' cannot be used as identifier */ +/* @@? 161:9 Error SyntaxError: Identifier expected, got 'let'. */ /* @@? 162:9 Error SyntaxError: Identifier expected, got 'const'. */ -/* @@? 163:9 Error SyntaxError: Hard keyword 'new' cannot be used as identifier */ +/* @@? 162:9 Error SyntaxError: Hard keyword 'const' cannot be used as identifier */ /* @@? 163:9 Error SyntaxError: Identifier expected, got 'new'. */ +/* @@? 163:9 Error SyntaxError: Hard keyword 'new' cannot be used as identifier */ /* @@? 164:5 Error TypeError: This expression is not callable. */ /* @@? 165:5 Error TypeError: This expression is not callable. */ -/* @@? 166:5 Error TypeError: Expected 1 arguments, got 0. */ /* @@? 166:5 Error TypeError: No matching call signature */ -/* @@? 295:1 Error SyntaxError: Expected '}', got 'end of stream'. */ +/* @@? 166:5 Error TypeError: Expected 1 arguments, got 0. */ +/* @@? 296:1 Error SyntaxError: Expected '}', got 'end of stream'. */ diff --git a/ets2panda/test/ast/parser/ets/MultipleParserErrors.ets b/ets2panda/test/ast/parser/ets/MultipleParserErrors.ets index f4c6092e3d34d9fca0a79dc3ada6e6adb7b6c5ab..f5ca1c97b2936862f7841f75784a26ef28dd11b3 100644 --- a/ets2panda/test/ast/parser/ets/MultipleParserErrors.ets +++ b/ets2panda/test/ast/parser/ets/MultipleParserErrors.ets @@ -189,7 +189,7 @@ function main(): void { /* @@? 43:11 Error SyntaxError: Invalid left-hand side in assignment expression. */ /* @@? 43:13 Error SyntaxError: Unexpected token 'byte'. */ /* @@? 45:6 Error SyntaxError: Unexpected token 'this'. */ -/* @@? 45:6 Error TypeError: Cannot reference 'this' in this context. */ +/* @@? 45:6 Error TypeError: 'this' cannot be referenced from a static context */ /* @@? 45:6 Error TypeError: Invalid left-hand side of assignment expression */ /* @@? 45:11 Error SyntaxError: Invalid left-hand side in assignment expression. */ /* @@? 47:8 Error SyntaxError: Variable must be initialized or it's type must be declared. */ @@ -262,10 +262,10 @@ function main(): void { /* @@? 125:1 Error TypeError: Method declaration `foo` must all ambient or non-ambient */ /* @@? 127:1 Error SyntaxError: The modifier async cannot be used in an ambient context. */ /* @@? 132:14 Error SyntaxError: Unexpected token, expected an identifier. */ -/* @@? 137:16 Error SyntaxError: Unexpected token '='. */ -/* @@? 137:16 Error SyntaxError: Expected '{', got '='. */ -/* @@? 137:16 Error SyntaxError: Expected ')', got '='. */ /* @@? 137:16 Error SyntaxError: Catch clause variable cannot have an initializer. */ +/* @@? 137:16 Error SyntaxError: Expected ')', got '='. */ +/* @@? 137:16 Error SyntaxError: Expected '{', got '='. */ +/* @@? 137:16 Error SyntaxError: Unexpected token '='. */ /* @@? 137:18 Error SyntaxError: Unexpected token '0'. */ /* @@? 137:19 Error SyntaxError: Unexpected token ')'. */ /* @@? 137:21 Error SyntaxError: Unexpected token '{'. */ @@ -280,12 +280,12 @@ function main(): void { /* @@? 158:26 Error TypeError: Property 'getInner' does not exist on type 'A' */ /* @@? 161:9 Error SyntaxError: Identifier expected, got 'let'. */ /* @@? 161:9 Error SyntaxError: Hard keyword 'let' cannot be used as identifier */ -/* @@? 162:9 Error SyntaxError: Hard keyword 'const' cannot be used as identifier */ /* @@? 162:9 Error SyntaxError: Identifier expected, got 'const'. */ -/* @@? 163:9 Error SyntaxError: Hard keyword 'new' cannot be used as identifier */ +/* @@? 162:9 Error SyntaxError: Hard keyword 'const' cannot be used as identifier */ /* @@? 163:9 Error SyntaxError: Identifier expected, got 'new'. */ +/* @@? 163:9 Error SyntaxError: Hard keyword 'new' cannot be used as identifier */ /* @@? 164:5 Error TypeError: This expression is not callable. */ /* @@? 165:5 Error TypeError: This expression is not callable. */ -/* @@? 166:5 Error TypeError: Expected 1 arguments, got 0. */ /* @@? 166:5 Error TypeError: No matching call signature */ +/* @@? 166:5 Error TypeError: Expected 1 arguments, got 0. */ /* @@? 292:1 Error SyntaxError: Expected '}', got 'end of stream'. */ diff --git a/ets2panda/test/ast/parser/ets/extension_function_tests/extension_function_error2.ets b/ets2panda/test/ast/parser/ets/extension_function_tests/extension_function_error2.ets index 752a06d4cceb6598bb28c56cf9d6fa2f6c135ed4..569109a6ae232c927b768b1b0ad0503b1a014a6a 100644 --- a/ets2panda/test/ast/parser/ets/extension_function_tests/extension_function_error2.ets +++ b/ets2panda/test/ast/parser/ets/extension_function_tests/extension_function_error2.ets @@ -17,17 +17,15 @@ let a = (this: TextAttribute, this { this.width(width); return this; } /* @@? 16:9 Error TypeError: 'this' cannot be referenced from a static context */ -/* @@? 16:9 Error TypeError: Cannot reference 'this' in this context. */ -/* @@? 16:9 Error TypeError: Type 'Error' cannot be assigned to type 'ETSGLOBAL' */ /* @@? 16:14 Error SyntaxError: Unexpected token, expected ')'. */ /* @@? 16:16 Error SyntaxError: Unexpected token 'TextAttribute'. */ /* @@? 16:16 Error TypeError: Unresolved reference TextAttribute */ /* @@? 16:29 Error SyntaxError: Unexpected token ','. */ /* @@? 16:31 Error SyntaxError: Unexpected token 'this'. */ -/* @@? 16:31 Error TypeError: Cannot reference 'this' in this context. */ +/* @@? 16:31 Error TypeError: 'this' cannot be referenced from a static context */ /* @@? 16:36 Error SyntaxError: Unexpected token '{'. */ -/* @@? 16:38 Error TypeError: Cannot reference 'this' in this context. */ -/* @@? 16:43 Error TypeError: Property 'width' does not exist on type 'Error' */ +/* @@? 16:38 Error TypeError: 'this' cannot be referenced from a static context */ +/* @@? 16:43 Error TypeError: Property 'width' does not exist on type 'ETSGLOBAL' */ /* @@? 16:57 Error SyntaxError: return keyword should be used in function body. */ -/* @@? 16:64 Error TypeError: Cannot reference 'this' in this context. */ +/* @@? 16:64 Error TypeError: 'this' cannot be referenced from a static context */ /* @@? 16:64 Error TypeError: All return statements in the function should be empty or have a value. */ diff --git a/ets2panda/test/ast/parser/ets/for_await_of_loop.ets b/ets2panda/test/ast/parser/ets/for_await_of_loop.ets index 3b41c8b661529fd31f678ee9eb1cfd5dc49e8d88..9ec9ec14aeb8d130d70cef40cceb0aa686ff19b0 100644 --- a/ets2panda/test/ast/parser/ets/for_await_of_loop.ets +++ b/ets2panda/test/ast/parser/ets/for_await_of_loop.ets @@ -17,8 +17,8 @@ for await (let k: int /* @@ label1 */= 0; /* @@ label2 */k < d.length; k++) { this.$_set_unsafe(k + 1, d[k]) } -/* @@@ label1 Error SyntaxError: for-await-of loop variable declaration may not have an initializer. */ -/* @@@ label2 Error SyntaxError: Unexpected token 'k'. */ +/* @@? 16:38 Error SyntaxError: for-await-of loop variable declaration may not have an initializer. */ +/* @@? 16:58 Error SyntaxError: Unexpected token 'k'. */ /* @@? 16:62 Error TypeError: Unresolved reference d */ -/* @@? 17:5 Error TypeError: Cannot reference 'this' in this context. */ -/* @@? 17:10 Error TypeError: Property '$_set_unsafe' does not exist on type 'Error' */ +/* @@? 17:5 Error TypeError: 'this' cannot be referenced from a static context */ +/* @@? 17:10 Error TypeError: Property '$_set_unsafe' does not exist on type 'ETSGLOBAL' */ diff --git a/ets2panda/test/ast/parser/ets/invalid_object_expression.ets b/ets2panda/test/ast/parser/ets/invalid_object_expression.ets index a7b52b85583f9176c23844e417e8b969944357cc..16850eb68271070dc0fd7ae73e2865ee262847c3 100644 --- a/ets2panda/test/ast/parser/ets/invalid_object_expression.ets +++ b/ets2panda/test/ast/parser/ets/invalid_object_expression.ets @@ -20,8 +20,8 @@ let obj: Record = { /* @@? 18:5 Error SyntaxError: Unexpected token. */ /* @@? 18:6 Error SyntaxError: Unexpected token. */ -/* @@? 18:6 Error TypeError: Cannot reference 'this' in this context. */ -/* @@? 18:11 Error TypeError: Property 'viewModel' does not exist on type 'Error' */ +/* @@? 18:6 Error TypeError: 'this' cannot be referenced from a static context */ +/* @@? 18:11 Error TypeError: Property 'viewModel' does not exist on type 'ETSGLOBAL' */ /* @@? 18:24 Error SyntaxError: Unexpected token. */ /* @@? 18:26 Error SyntaxError: Unexpected token ':'. */ /* @@? 18:28 Error SyntaxError: Unexpected token '123'. */ diff --git a/ets2panda/test/ast/parser/ets/unexpected_token_63.ets b/ets2panda/test/ast/parser/ets/unexpected_token_63.ets index 40a8346dc0839833ce2ffd16fadac6498fa6510a..2cc94b998aaf2f7ba42a98f43c6e4fc8792aa8c6 100644 --- a/ets2panda/test/ast/parser/ets/unexpected_token_63.ets +++ b/ets2panda/test/ast/parser/ets/unexpected_token_63.ets @@ -26,6 +26,7 @@ class A { } } + /* @@? 17:7 Error TypeError: Only abstract or native methods can't have body. */ /* @@? 17:23 Error SyntaxError: Parameter declaration should have an explicit type annotation. */ /* @@? 17:23 Error SyntaxError: Unexpected token, expected ',' or ')'. */ @@ -36,10 +37,10 @@ class A { /* @@? 17:39 Error SyntaxError: Unexpected token '{'. */ /* @@? 18:3 Error SyntaxError: Unexpected token 'while'. */ /* @@? 18:8 Error SyntaxError: Call signatures in object types are not supported. Use '$_invoke' method instead. */ -/* @@? 18:9 Error SyntaxError: Parameter declaration should have an explicit type annotation. */ +/* @@? 18:9 Error SyntaxError: Unexpected token, expected an identifier. */ /* @@? 18:9 Error SyntaxError: Unexpected token 'true'. */ /* @@? 18:9 Error SyntaxError: Unexpected token, expected ',' or ')'. */ -/* @@? 18:9 Error SyntaxError: Unexpected token, expected an identifier. */ +/* @@? 18:9 Error SyntaxError: Parameter declaration should have an explicit type annotation. */ /* @@? 18:13 Error SyntaxError: Unexpected token ')'. */ /* @@? 18:15 Error SyntaxError: Unexpected token '{'. */ /* @@? 19:4 Error SyntaxError: Unexpected token 'if'. */ @@ -53,10 +54,9 @@ class A { /* @@? 20:5 Error SyntaxError: Unexpected token 'break'. */ /* @@? 21:6 Error SyntaxError: Unexpected token 'else'. */ /* @@? 21:11 Error SyntaxError: Unexpected token '{'. */ -/* @@? 23:5 Error TypeError: Cannot reference 'this' in this context. */ -/* @@? 23:10 Error TypeError: Property 'func' does not exist on type 'Error' */ +/* @@? 23:5 Error TypeError: 'this' cannot be referenced from a static context */ +/* @@? 23:10 Error TypeError: Property 'func' does not exist on type 'ETSGLOBAL' */ /* @@? 23:21 Error SyntaxError: Unexpected token 'final'. */ /* @@? 25:3 Error SyntaxError: Unexpected token '}'. */ /* @@? 26:2 Error SyntaxError: Unexpected token '}'. */ /* @@? 27:1 Error SyntaxError: Unexpected token '}'. */ - diff --git a/ets2panda/test/ast/parser/ets/update_funcscope_error.ets b/ets2panda/test/ast/parser/ets/update_funcscope_error.ets index 7ca3f8b98c016452f86634a9eb2894793e19aff9..3216a64552f5fe0a0b59cbe694ccbddc1df5aa4f 100644 --- a/ets2panda/test/ast/parser/ets/update_funcscope_error.ets +++ b/ets2panda/test/ast/parser/ets/update_funcscope_error.ets @@ -34,8 +34,8 @@ export const updateIfChanged = (t: Record) => { }; }; -/* @@? 21:19 Error TypeError: Unresolved reference u */ /* @@? 21:19 Error TypeError: Indexed access is not supported for such expression type. */ +/* @@? 21:19 Error TypeError: Unresolved reference u */ /* @@? 24:7 Error TypeError: Type '(v: Record) => Boolean' is not compatible with type '(previousValue: Boolean, currentValue: Boolean, index: Double, array: FixedArray) => Boolean' at index 2 */ /* @@? 27:11 Error TypeError: Invalid record property */ /* @@? 28:11 Error SyntaxError: Unexpected token. */ @@ -46,6 +46,8 @@ export const updateIfChanged = (t: Record) => { /* @@? 28:18 Error SyntaxError: Unexpected token 'v'. */ /* @@? 29:10 Error SyntaxError: Unexpected token, expected ',' or ')'. */ /* @@? 30:16 Error TypeError: Unresolved reference update */ +/* @@? 30:16 Error TypeError: This expression is not callable. */ /* @@? 32:5 Error SyntaxError: Unexpected token ')'. */ /* @@? 33:12 Error TypeError: Unresolved reference reduceResult */ +/* @@? 33:12 Error TypeError: Unexpected return value, enclosing method return type is void. */ /* @@? 35:1 Error SyntaxError: Unexpected token '}'. */ diff --git a/ets2panda/test/compiler/ets/116100-expected.txt b/ets2panda/test/compiler/ets/116100-expected.txt index 3c49933eabc702efb3462de85c272f995e3894e7..5834754e75d59592d56855b7a8d9cea77a0976ae 100644 --- a/ets2panda/test/compiler/ets/116100-expected.txt +++ b/ets2panda/test/compiler/ets/116100-expected.txt @@ -130,227 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "fp", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "116100.ets" - }, - "end": { - "line": 16, - "column": 7, - "program": "116100.ets" - } - } - }, - "right": { - "type": "ArrowFunctionExpression", - "function": { - "type": "ScriptFunction", - "id": null, - "generator": false, - "async": false, - "expression": false, - "params": [], - "returnType": { - "type": "ETSPrimitiveType", - "loc": { - "start": { - "line": 16, - "column": 33, - "program": "116100.ets" - }, - "end": { - "line": 16, - "column": 37, - "program": "116100.ets" - } - } - }, - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 16, - "column": 41, - "program": "116100.ets" - }, - "end": { - "line": 16, - "column": 43, - "program": "116100.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 29, - "program": "116100.ets" - }, - "end": { - "line": 16, - "column": 43, - "program": "116100.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 29, - "program": "116100.ets" - }, - "end": { - "line": 16, - "column": 43, - "program": "116100.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "116100.ets" - }, - "end": { - "line": 16, - "column": 43, - "program": "116100.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "116100.ets" - }, - "end": { - "line": 16, - "column": 43, - "program": "116100.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "116100.ets" - }, - "end": { - "line": 16, - "column": 43, - "program": "116100.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "116100.ets" - }, - "end": { - "line": 16, - "column": 43, - "program": "116100.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "116100.ets" - }, - "end": { - "line": 16, - "column": 43, - "program": "116100.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "116100.ets" - }, - "end": { - "line": 16, - "column": 43, - "program": "116100.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -449,7 +228,7 @@ }, "end": { "line": 16, - "column": 43, + "column": 29, "program": "116100.ets" } } diff --git a/ets2panda/test/compiler/ets/ConditionalExpressionCallVoidNeg-expected.txt b/ets2panda/test/compiler/ets/ConditionalExpressionCallVoidNeg-expected.txt index 95df6340cd6bcfe40e37d41553ac08b869831b42..2f8d14c14ea4249d181a13d2f52f95570ca192fc 100644 --- a/ets2panda/test/compiler/ets/ConditionalExpressionCallVoidNeg-expected.txt +++ b/ets2panda/test/compiler/ets/ConditionalExpressionCallVoidNeg-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ConditionalExpressionCallVoidNeg.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ConditionalExpressionCallVoidNeg.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ConditionalExpressionCallVoidNeg.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ConditionalExpressionCallVoidNeg.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ConditionalExpressionCallVoidNeg.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ConditionalExpressionCallVoidNeg.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ConditionalExpressionCallVoidNeg.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ConditionalExpressionCallVoidNeg.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/FunctionType2-expected.txt b/ets2panda/test/compiler/ets/FunctionType2-expected.txt index 47773f7ec7aad33a6e5524ec45349def9478a460..b535f2bd1f84a6f31dba7c93da3fafc16221fea0 100644 --- a/ets2panda/test/compiler/ets/FunctionType2-expected.txt +++ b/ets2panda/test/compiler/ets/FunctionType2-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "FunctionType2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "FunctionType2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "FunctionType2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "FunctionType2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "FunctionType2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "FunctionType2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "FunctionType2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "FunctionType2.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/compiler/ets/FunctionType4-expected.txt b/ets2panda/test/compiler/ets/FunctionType4-expected.txt index e9f5618679dbff4436a3c4ba13e9a6cc16034c14..9ce6db1e636ab194290ebf802463a8d8aa98c53a 100644 --- a/ets2panda/test/compiler/ets/FunctionType4-expected.txt +++ b/ets2panda/test/compiler/ets/FunctionType4-expected.txt @@ -24,178 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "cb", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "FunctionType4.ets" - }, - "end": { - "line": 20, - "column": 7, - "program": "FunctionType4.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "bar", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 21, - "program": "FunctionType4.ets" - }, - "end": { - "line": 20, - "column": 24, - "program": "FunctionType4.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "FunctionType4.ets" - }, - "end": { - "line": 20, - "column": 24, - "program": "FunctionType4.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "FunctionType4.ets" - }, - "end": { - "line": 20, - "column": 24, - "program": "FunctionType4.ets" - } - } - } - ], - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "FunctionType4.ets" - }, - "end": { - "line": 20, - "column": 24, - "program": "FunctionType4.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "FunctionType4.ets" - }, - "end": { - "line": 20, - "column": 24, - "program": "FunctionType4.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "FunctionType4.ets" - }, - "end": { - "line": 20, - "column": 24, - "program": "FunctionType4.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "FunctionType4.ets" - }, - "end": { - "line": 20, - "column": 24, - "program": "FunctionType4.ets" - } - } - }, { "type": "MethodDefinition", "key": { @@ -432,7 +260,7 @@ }, "end": { "line": 20, - "column": 24, + "column": 21, "program": "FunctionType4.ets" } } diff --git a/ets2panda/test/compiler/ets/abstractMethodDeclaredInParentClass-expected.txt b/ets2panda/test/compiler/ets/abstractMethodDeclaredInParentClass-expected.txt index b8144feab0326ebb6b8dfceceb91c621ac247f8e..1805c53c338a781c7485a9b251da59a95f167659 100644 --- a/ets2panda/test/compiler/ets/abstractMethodDeclaredInParentClass-expected.txt +++ b/ets2panda/test/compiler/ets/abstractMethodDeclaredInParentClass-expected.txt @@ -3131,112 +3131,6 @@ "program": "abstractMethodDeclaredInParentClass.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "abstractMethodDeclaredInParentClass.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "abstractMethodDeclaredInParentClass.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "abstractMethodDeclaredInParentClass.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "abstractMethodDeclaredInParentClass.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "abstractMethodDeclaredInParentClass.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "abstractMethodDeclaredInParentClass.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "abstractMethodDeclaredInParentClass.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "abstractMethodDeclaredInParentClass.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/abstractNewClassInstanceExpression-expected.txt b/ets2panda/test/compiler/ets/abstractNewClassInstanceExpression-expected.txt index fb714c45f7c2661cac84b5c167238ab5443d86ca..4684d6270c7d695fe3ae36cb5c673559773cfd30 100644 --- a/ets2panda/test/compiler/ets/abstractNewClassInstanceExpression-expected.txt +++ b/ets2panda/test/compiler/ets/abstractNewClassInstanceExpression-expected.txt @@ -970,287 +970,6 @@ "program": "abstractNewClassInstanceExpression.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "EmptyStatement", - "loc": { - "start": { - "line": 32, - "column": 11, - "program": "abstractNewClassInstanceExpression.ets" - }, - "end": { - "line": 32, - "column": 12, - "program": "abstractNewClassInstanceExpression.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "H", - "decorators": [], - "loc": { - "start": { - "line": 32, - "column": 11, - "program": "abstractNewClassInstanceExpression.ets" - }, - "end": { - "line": 32, - "column": 12, - "program": "abstractNewClassInstanceExpression.ets" - } - } - }, - "right": { - "type": "ETSNewClassInstanceExpression", - "typeReference": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "H", - "decorators": [], - "loc": { - "start": { - "line": 32, - "column": 19, - "program": "abstractNewClassInstanceExpression.ets" - }, - "end": { - "line": 32, - "column": 20, - "program": "abstractNewClassInstanceExpression.ets" - } - } - }, - "loc": { - "start": { - "line": 32, - "column": 19, - "program": "abstractNewClassInstanceExpression.ets" - }, - "end": { - "line": 32, - "column": 20, - "program": "abstractNewClassInstanceExpression.ets" - } - } - }, - "loc": { - "start": { - "line": 32, - "column": 19, - "program": "abstractNewClassInstanceExpression.ets" - }, - "end": { - "line": 32, - "column": 20, - "program": "abstractNewClassInstanceExpression.ets" - } - } - }, - "arguments": [], - "loc": { - "start": { - "line": 32, - "column": 15, - "program": "abstractNewClassInstanceExpression.ets" - }, - "end": { - "line": 32, - "column": 24, - "program": "abstractNewClassInstanceExpression.ets" - } - } - }, - "loc": { - "start": { - "line": 32, - "column": 11, - "program": "abstractNewClassInstanceExpression.ets" - }, - "end": { - "line": 32, - "column": 24, - "program": "abstractNewClassInstanceExpression.ets" - } - } - }, - "loc": { - "start": { - "line": 32, - "column": 11, - "program": "abstractNewClassInstanceExpression.ets" - }, - "end": { - "line": 32, - "column": 24, - "program": "abstractNewClassInstanceExpression.ets" - } - } - }, - { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 32, - "column": 23, - "program": "abstractNewClassInstanceExpression.ets" - }, - "end": { - "line": 34, - "column": 6, - "program": "abstractNewClassInstanceExpression.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "Identifier", - "name": "*ERROR_LITERAL*", - "decorators": [], - "loc": { - "start": { - "line": 35, - "column": 1, - "program": "abstractNewClassInstanceExpression.ets" - }, - "end": { - "line": 35, - "column": 2, - "program": "abstractNewClassInstanceExpression.ets" - } - } - }, - "loc": { - "start": { - "line": 35, - "column": 1, - "program": "abstractNewClassInstanceExpression.ets" - }, - "end": { - "line": 35, - "column": 2, - "program": "abstractNewClassInstanceExpression.ets" - } - } - } - ], - "loc": { - "start": { - "line": 32, - "column": 11, - "program": "abstractNewClassInstanceExpression.ets" - }, - "end": { - "line": 35, - "column": 2, - "program": "abstractNewClassInstanceExpression.ets" - } - } - }, - "loc": { - "start": { - "line": 32, - "column": 11, - "program": "abstractNewClassInstanceExpression.ets" - }, - "end": { - "line": 35, - "column": 2, - "program": "abstractNewClassInstanceExpression.ets" - } - } - }, - "loc": { - "start": { - "line": 32, - "column": 11, - "program": "abstractNewClassInstanceExpression.ets" - }, - "end": { - "line": 35, - "column": 2, - "program": "abstractNewClassInstanceExpression.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 32, - "column": 11, - "program": "abstractNewClassInstanceExpression.ets" - }, - "end": { - "line": 35, - "column": 2, - "program": "abstractNewClassInstanceExpression.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/ambient_declaration-expected.txt b/ets2panda/test/compiler/ets/ambient_declaration-expected.txt index a8179e6b22d9142cc9da38ad1c5a57408728d0d2..7c98b1cb39cf23b842b6744dac97778c0b9a9ea5 100644 --- a/ets2panda/test/compiler/ets/ambient_declaration-expected.txt +++ b/ets2panda/test/compiler/ets/ambient_declaration-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ambient_declaration.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ambient_declaration.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ambient_declaration.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ambient_declaration.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ambient_declaration.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ambient_declaration.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ambient_declaration.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ambient_declaration.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/array_indexing_without_chaining_non_nullish-expected.txt b/ets2panda/test/compiler/ets/array_indexing_without_chaining_non_nullish-expected.txt index 923a421fe074625813df189a9088d8d29138362b..fca56233fd8417ddbf4e875f0ee3b3db9e94eba2 100644 --- a/ets2panda/test/compiler/ets/array_indexing_without_chaining_non_nullish-expected.txt +++ b/ets2panda/test/compiler/ets/array_indexing_without_chaining_non_nullish-expected.txt @@ -285,402 +285,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "arr", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "array_indexing_without_chaining_non_nullish.ets" - }, - "end": { - "line": 18, - "column": 8, - "program": "array_indexing_without_chaining_non_nullish.ets" - } - } - }, - "right": { - "type": "ArrayExpression", - "elements": [ - { - "type": "ETSNewClassInstanceExpression", - "typeReference": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "Object", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 27, - "program": "array_indexing_without_chaining_non_nullish.ets" - }, - "end": { - "line": 18, - "column": 33, - "program": "array_indexing_without_chaining_non_nullish.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 27, - "program": "array_indexing_without_chaining_non_nullish.ets" - }, - "end": { - "line": 18, - "column": 33, - "program": "array_indexing_without_chaining_non_nullish.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 27, - "program": "array_indexing_without_chaining_non_nullish.ets" - }, - "end": { - "line": 18, - "column": 33, - "program": "array_indexing_without_chaining_non_nullish.ets" - } - } - }, - "arguments": [], - "loc": { - "start": { - "line": 18, - "column": 23, - "program": "array_indexing_without_chaining_non_nullish.ets" - }, - "end": { - "line": 18, - "column": 36, - "program": "array_indexing_without_chaining_non_nullish.ets" - } - } - }, - { - "type": "ETSNewClassInstanceExpression", - "typeReference": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "A", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 41, - "program": "array_indexing_without_chaining_non_nullish.ets" - }, - "end": { - "line": 18, - "column": 42, - "program": "array_indexing_without_chaining_non_nullish.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 41, - "program": "array_indexing_without_chaining_non_nullish.ets" - }, - "end": { - "line": 18, - "column": 42, - "program": "array_indexing_without_chaining_non_nullish.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 41, - "program": "array_indexing_without_chaining_non_nullish.ets" - }, - "end": { - "line": 18, - "column": 42, - "program": "array_indexing_without_chaining_non_nullish.ets" - } - } - }, - "arguments": [], - "loc": { - "start": { - "line": 18, - "column": 37, - "program": "array_indexing_without_chaining_non_nullish.ets" - }, - "end": { - "line": 18, - "column": 45, - "program": "array_indexing_without_chaining_non_nullish.ets" - } - } - } - ], - "loc": { - "start": { - "line": 18, - "column": 22, - "program": "array_indexing_without_chaining_non_nullish.ets" - }, - "end": { - "line": 18, - "column": 45, - "program": "array_indexing_without_chaining_non_nullish.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "array_indexing_without_chaining_non_nullish.ets" - }, - "end": { - "line": 18, - "column": 45, - "program": "array_indexing_without_chaining_non_nullish.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "array_indexing_without_chaining_non_nullish.ets" - }, - "end": { - "line": 18, - "column": 45, - "program": "array_indexing_without_chaining_non_nullish.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "elem", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "array_indexing_without_chaining_non_nullish.ets" - }, - "end": { - "line": 19, - "column": 9, - "program": "array_indexing_without_chaining_non_nullish.ets" - } - } - }, - "right": { - "type": "MemberExpression", - "object": { - "type": "Identifier", - "name": "arr", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 21, - "program": "array_indexing_without_chaining_non_nullish.ets" - }, - "end": { - "line": 19, - "column": 24, - "program": "array_indexing_without_chaining_non_nullish.ets" - } - } - }, - "property": { - "type": "NumberLiteral", - "value": 0, - "loc": { - "start": { - "line": 19, - "column": 25, - "program": "array_indexing_without_chaining_non_nullish.ets" - }, - "end": { - "line": 19, - "column": 26, - "program": "array_indexing_without_chaining_non_nullish.ets" - } - } - }, - "computed": true, - "optional": false, - "loc": { - "start": { - "line": 19, - "column": 21, - "program": "array_indexing_without_chaining_non_nullish.ets" - }, - "end": { - "line": 19, - "column": 27, - "program": "array_indexing_without_chaining_non_nullish.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "array_indexing_without_chaining_non_nullish.ets" - }, - "end": { - "line": 19, - "column": 27, - "program": "array_indexing_without_chaining_non_nullish.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "array_indexing_without_chaining_non_nullish.ets" - }, - "end": { - "line": 19, - "column": 27, - "program": "array_indexing_without_chaining_non_nullish.ets" - } - } - } - ], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "array_indexing_without_chaining_non_nullish.ets" - }, - "end": { - "line": 19, - "column": 27, - "program": "array_indexing_without_chaining_non_nullish.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "array_indexing_without_chaining_non_nullish.ets" - }, - "end": { - "line": 19, - "column": 27, - "program": "array_indexing_without_chaining_non_nullish.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "array_indexing_without_chaining_non_nullish.ets" - }, - "end": { - "line": 19, - "column": 27, - "program": "array_indexing_without_chaining_non_nullish.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "array_indexing_without_chaining_non_nullish.ets" - }, - "end": { - "line": 19, - "column": 27, - "program": "array_indexing_without_chaining_non_nullish.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -827,7 +431,7 @@ }, "end": { "line": 18, - "column": 45, + "column": 22, "program": "array_indexing_without_chaining_non_nullish.ets" } } @@ -914,7 +518,7 @@ }, "end": { "line": 19, - "column": 27, + "column": 21, "program": "array_indexing_without_chaining_non_nullish.ets" } } diff --git a/ets2panda/test/compiler/ets/array_with_null_type-expected.txt b/ets2panda/test/compiler/ets/array_with_null_type-expected.txt index 61aea179dabc9b7851e7cede71fbf283c8810bc6..5ec20d87dd4dd913da76dda26539ba61e06e9c15 100644 --- a/ets2panda/test/compiler/ets/array_with_null_type-expected.txt +++ b/ets2panda/test/compiler/ets/array_with_null_type-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "array_with_null_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "array_with_null_type.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "array_with_null_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "array_with_null_type.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "array_with_null_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "array_with_null_type.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "array_with_null_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "array_with_null_type.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/array_with_undefined_type-expected.txt b/ets2panda/test/compiler/ets/array_with_undefined_type-expected.txt index 316fa937e77455243548aa902fb1724a1ffd5405..ec88c911fd8e4c45b1f5f652efefacc3e765ca60 100644 --- a/ets2panda/test/compiler/ets/array_with_undefined_type-expected.txt +++ b/ets2panda/test/compiler/ets/array_with_undefined_type-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "array_with_undefined_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "array_with_undefined_type.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "array_with_undefined_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "array_with_undefined_type.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "array_with_undefined_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "array_with_undefined_type.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "array_with_undefined_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "array_with_undefined_type.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/arrowFunctionCapture-expected.txt b/ets2panda/test/compiler/ets/arrowFunctionCapture-expected.txt index d1bf564e8d30e8d63e8ca69f7ab5ba063bda3096..01c1a13b826b40222bbce9471d781973eeaa1b00 100644 --- a/ets2panda/test/compiler/ets/arrowFunctionCapture-expected.txt +++ b/ets2panda/test/compiler/ets/arrowFunctionCapture-expected.txt @@ -1030,112 +1030,6 @@ "program": "arrowFunctionCapture.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "arrowFunctionCapture.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "arrowFunctionCapture.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "arrowFunctionCapture.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "arrowFunctionCapture.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "arrowFunctionCapture.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "arrowFunctionCapture.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "arrowFunctionCapture.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "arrowFunctionCapture.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/boxingConversion10-expected.txt b/ets2panda/test/compiler/ets/boxingConversion10-expected.txt index 26279f3bdd5fd152f687183858cabb44857f6dcb..2c70cb2bf830e1460b646d20b586c0a495e51371 100644 --- a/ets2panda/test/compiler/ets/boxingConversion10-expected.txt +++ b/ets2panda/test/compiler/ets/boxingConversion10-expected.txt @@ -130,242 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "f", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion10.ets" - }, - "end": { - "line": 16, - "column": 6, - "program": "boxingConversion10.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 0, - "loc": { - "start": { - "line": 16, - "column": 16, - "program": "boxingConversion10.ets" - }, - "end": { - "line": 16, - "column": 17, - "program": "boxingConversion10.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion10.ets" - }, - "end": { - "line": 16, - "column": 17, - "program": "boxingConversion10.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion10.ets" - }, - "end": { - "line": 16, - "column": 17, - "program": "boxingConversion10.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "d", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "boxingConversion10.ets" - }, - "end": { - "line": 17, - "column": 6, - "program": "boxingConversion10.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "f", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 17, - "program": "boxingConversion10.ets" - }, - "end": { - "line": 17, - "column": 18, - "program": "boxingConversion10.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "boxingConversion10.ets" - }, - "end": { - "line": 17, - "column": 18, - "program": "boxingConversion10.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "boxingConversion10.ets" - }, - "end": { - "line": 17, - "column": 18, - "program": "boxingConversion10.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion10.ets" - }, - "end": { - "line": 17, - "column": 18, - "program": "boxingConversion10.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion10.ets" - }, - "end": { - "line": 17, - "column": 18, - "program": "boxingConversion10.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion10.ets" - }, - "end": { - "line": 17, - "column": 18, - "program": "boxingConversion10.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion10.ets" - }, - "end": { - "line": 17, - "column": 18, - "program": "boxingConversion10.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -416,7 +180,7 @@ }, "end": { "line": 16, - "column": 17, + "column": 16, "program": "boxingConversion10.ets" } } @@ -503,7 +267,7 @@ }, "end": { "line": 17, - "column": 18, + "column": 17, "program": "boxingConversion10.ets" } } diff --git a/ets2panda/test/compiler/ets/boxingConversion2-expected.txt b/ets2panda/test/compiler/ets/boxingConversion2-expected.txt index 840418e9fb8db294dc73df5e1b2b280b55762de9..45f6f6225173125db81f8e47592745ed3ef40bac 100644 --- a/ets2panda/test/compiler/ets/boxingConversion2-expected.txt +++ b/ets2panda/test/compiler/ets/boxingConversion2-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "boxingConversion2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "boxingConversion2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "boxingConversion2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "boxingConversion2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "boxingConversion2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "boxingConversion2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "boxingConversion2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "boxingConversion2.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/boxingConversion3-expected.txt b/ets2panda/test/compiler/ets/boxingConversion3-expected.txt index 2bb85eafa8d6fcf0cee51006c7014d6b7768ceb0..c5992433dc1e83a55deab73a64312eecac40d1fd 100644 --- a/ets2panda/test/compiler/ets/boxingConversion3-expected.txt +++ b/ets2panda/test/compiler/ets/boxingConversion3-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "boxingConversion3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "boxingConversion3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "boxingConversion3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "boxingConversion3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "boxingConversion3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "boxingConversion3.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "boxingConversion3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "boxingConversion3.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/boxingConversion5-expected.txt b/ets2panda/test/compiler/ets/boxingConversion5-expected.txt index 7c6fbeaa70072c9c5f02afb8b5d82c53ff1181c7..411bcd5a5e4e332b593768d0d7b408f601e08b95 100644 --- a/ets2panda/test/compiler/ets/boxingConversion5-expected.txt +++ b/ets2panda/test/compiler/ets/boxingConversion5-expected.txt @@ -130,372 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion5.ets" - }, - "end": { - "line": 16, - "column": 6, - "program": "boxingConversion5.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 1, - "loc": { - "start": { - "line": 16, - "column": 14, - "program": "boxingConversion5.ets" - }, - "end": { - "line": 16, - "column": 15, - "program": "boxingConversion5.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion5.ets" - }, - "end": { - "line": 16, - "column": 15, - "program": "boxingConversion5.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion5.ets" - }, - "end": { - "line": 16, - "column": 15, - "program": "boxingConversion5.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "s", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "boxingConversion5.ets" - }, - "end": { - "line": 17, - "column": 6, - "program": "boxingConversion5.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 15, - "program": "boxingConversion5.ets" - }, - "end": { - "line": 17, - "column": 16, - "program": "boxingConversion5.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "boxingConversion5.ets" - }, - "end": { - "line": 17, - "column": 16, - "program": "boxingConversion5.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "boxingConversion5.ets" - }, - "end": { - "line": 17, - "column": 16, - "program": "boxingConversion5.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "f", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "boxingConversion5.ets" - }, - "end": { - "line": 18, - "column": 6, - "program": "boxingConversion5.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 16, - "program": "boxingConversion5.ets" - }, - "end": { - "line": 18, - "column": 17, - "program": "boxingConversion5.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "boxingConversion5.ets" - }, - "end": { - "line": 18, - "column": 17, - "program": "boxingConversion5.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "boxingConversion5.ets" - }, - "end": { - "line": 18, - "column": 17, - "program": "boxingConversion5.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "d", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "boxingConversion5.ets" - }, - "end": { - "line": 19, - "column": 6, - "program": "boxingConversion5.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 17, - "program": "boxingConversion5.ets" - }, - "end": { - "line": 19, - "column": 18, - "program": "boxingConversion5.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "boxingConversion5.ets" - }, - "end": { - "line": 19, - "column": 18, - "program": "boxingConversion5.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "boxingConversion5.ets" - }, - "end": { - "line": 19, - "column": 18, - "program": "boxingConversion5.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion5.ets" - }, - "end": { - "line": 19, - "column": 18, - "program": "boxingConversion5.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion5.ets" - }, - "end": { - "line": 19, - "column": 18, - "program": "boxingConversion5.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion5.ets" - }, - "end": { - "line": 19, - "column": 18, - "program": "boxingConversion5.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion5.ets" - }, - "end": { - "line": 19, - "column": 18, - "program": "boxingConversion5.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -546,7 +180,7 @@ }, "end": { "line": 16, - "column": 15, + "column": 14, "program": "boxingConversion5.ets" } } @@ -633,7 +267,7 @@ }, "end": { "line": 17, - "column": 16, + "column": 15, "program": "boxingConversion5.ets" } } @@ -720,7 +354,7 @@ }, "end": { "line": 18, - "column": 17, + "column": 16, "program": "boxingConversion5.ets" } } @@ -807,7 +441,7 @@ }, "end": { "line": 19, - "column": 18, + "column": 17, "program": "boxingConversion5.ets" } } diff --git a/ets2panda/test/compiler/ets/boxingConversion6-expected.txt b/ets2panda/test/compiler/ets/boxingConversion6-expected.txt index e2fabd7e73e02bf358b5fb841fed6d11dfc62b4f..a13670d9ea6262e0a7877371fe46db9b923f20b9 100644 --- a/ets2panda/test/compiler/ets/boxingConversion6-expected.txt +++ b/ets2panda/test/compiler/ets/boxingConversion6-expected.txt @@ -130,567 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion6.ets" - }, - "end": { - "line": 16, - "column": 6, - "program": "boxingConversion6.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 0, - "loc": { - "start": { - "line": 16, - "column": 15, - "program": "boxingConversion6.ets" - }, - "end": { - "line": 16, - "column": 16, - "program": "boxingConversion6.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion6.ets" - }, - "end": { - "line": 16, - "column": 16, - "program": "boxingConversion6.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion6.ets" - }, - "end": { - "line": 16, - "column": 16, - "program": "boxingConversion6.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "s", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "boxingConversion6.ets" - }, - "end": { - "line": 17, - "column": 6, - "program": "boxingConversion6.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "b", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 16, - "program": "boxingConversion6.ets" - }, - "end": { - "line": 17, - "column": 17, - "program": "boxingConversion6.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "boxingConversion6.ets" - }, - "end": { - "line": 17, - "column": 17, - "program": "boxingConversion6.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "boxingConversion6.ets" - }, - "end": { - "line": 17, - "column": 17, - "program": "boxingConversion6.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "boxingConversion6.ets" - }, - "end": { - "line": 18, - "column": 6, - "program": "boxingConversion6.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "b", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 14, - "program": "boxingConversion6.ets" - }, - "end": { - "line": 18, - "column": 15, - "program": "boxingConversion6.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "boxingConversion6.ets" - }, - "end": { - "line": 18, - "column": 15, - "program": "boxingConversion6.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "boxingConversion6.ets" - }, - "end": { - "line": 18, - "column": 15, - "program": "boxingConversion6.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "l", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "boxingConversion6.ets" - }, - "end": { - "line": 19, - "column": 6, - "program": "boxingConversion6.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "b", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 15, - "program": "boxingConversion6.ets" - }, - "end": { - "line": 19, - "column": 16, - "program": "boxingConversion6.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "boxingConversion6.ets" - }, - "end": { - "line": 19, - "column": 16, - "program": "boxingConversion6.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "boxingConversion6.ets" - }, - "end": { - "line": 19, - "column": 16, - "program": "boxingConversion6.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "f", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "boxingConversion6.ets" - }, - "end": { - "line": 20, - "column": 6, - "program": "boxingConversion6.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "b", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 16, - "program": "boxingConversion6.ets" - }, - "end": { - "line": 20, - "column": 17, - "program": "boxingConversion6.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "boxingConversion6.ets" - }, - "end": { - "line": 20, - "column": 17, - "program": "boxingConversion6.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "boxingConversion6.ets" - }, - "end": { - "line": 20, - "column": 17, - "program": "boxingConversion6.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "d", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "boxingConversion6.ets" - }, - "end": { - "line": 21, - "column": 6, - "program": "boxingConversion6.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "b", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 17, - "program": "boxingConversion6.ets" - }, - "end": { - "line": 21, - "column": 18, - "program": "boxingConversion6.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "boxingConversion6.ets" - }, - "end": { - "line": 21, - "column": 18, - "program": "boxingConversion6.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "boxingConversion6.ets" - }, - "end": { - "line": 21, - "column": 18, - "program": "boxingConversion6.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "c", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "boxingConversion6.ets" - }, - "end": { - "line": 22, - "column": 6, - "program": "boxingConversion6.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "b", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 15, - "program": "boxingConversion6.ets" - }, - "end": { - "line": 22, - "column": 16, - "program": "boxingConversion6.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "boxingConversion6.ets" - }, - "end": { - "line": 22, - "column": 16, - "program": "boxingConversion6.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "boxingConversion6.ets" - }, - "end": { - "line": 22, - "column": 16, - "program": "boxingConversion6.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion6.ets" - }, - "end": { - "line": 22, - "column": 16, - "program": "boxingConversion6.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion6.ets" - }, - "end": { - "line": 22, - "column": 16, - "program": "boxingConversion6.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion6.ets" - }, - "end": { - "line": 22, - "column": 16, - "program": "boxingConversion6.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion6.ets" - }, - "end": { - "line": 22, - "column": 16, - "program": "boxingConversion6.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -741,7 +180,7 @@ }, "end": { "line": 16, - "column": 16, + "column": 15, "program": "boxingConversion6.ets" } } @@ -828,7 +267,7 @@ }, "end": { "line": 17, - "column": 17, + "column": 16, "program": "boxingConversion6.ets" } } @@ -915,7 +354,7 @@ }, "end": { "line": 18, - "column": 15, + "column": 14, "program": "boxingConversion6.ets" } } @@ -1002,7 +441,7 @@ }, "end": { "line": 19, - "column": 16, + "column": 15, "program": "boxingConversion6.ets" } } @@ -1089,7 +528,7 @@ }, "end": { "line": 20, - "column": 17, + "column": 16, "program": "boxingConversion6.ets" } } @@ -1176,7 +615,7 @@ }, "end": { "line": 21, - "column": 18, + "column": 17, "program": "boxingConversion6.ets" } } @@ -1263,7 +702,7 @@ }, "end": { "line": 22, - "column": 16, + "column": 15, "program": "boxingConversion6.ets" } } diff --git a/ets2panda/test/compiler/ets/boxingConversion7-expected.txt b/ets2panda/test/compiler/ets/boxingConversion7-expected.txt index e15dcc9bbf105657563ff8587d237f729d7dddf3..dd61f7a3996125ca727a85d87d6684c3b3e0c811 100644 --- a/ets2panda/test/compiler/ets/boxingConversion7-expected.txt +++ b/ets2panda/test/compiler/ets/boxingConversion7-expected.txt @@ -130,437 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "c", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion7.ets" - }, - "end": { - "line": 16, - "column": 6, - "program": "boxingConversion7.ets" - } - } - }, - "right": { - "type": "CharLiteral", - "value": "a", - "loc": { - "start": { - "line": 16, - "column": 15, - "program": "boxingConversion7.ets" - }, - "end": { - "line": 16, - "column": 19, - "program": "boxingConversion7.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion7.ets" - }, - "end": { - "line": 16, - "column": 19, - "program": "boxingConversion7.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion7.ets" - }, - "end": { - "line": 16, - "column": 19, - "program": "boxingConversion7.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "boxingConversion7.ets" - }, - "end": { - "line": 17, - "column": 6, - "program": "boxingConversion7.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "c", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 14, - "program": "boxingConversion7.ets" - }, - "end": { - "line": 17, - "column": 15, - "program": "boxingConversion7.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "boxingConversion7.ets" - }, - "end": { - "line": 17, - "column": 15, - "program": "boxingConversion7.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "boxingConversion7.ets" - }, - "end": { - "line": 17, - "column": 15, - "program": "boxingConversion7.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "l", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "boxingConversion7.ets" - }, - "end": { - "line": 18, - "column": 6, - "program": "boxingConversion7.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "c", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 15, - "program": "boxingConversion7.ets" - }, - "end": { - "line": 18, - "column": 16, - "program": "boxingConversion7.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "boxingConversion7.ets" - }, - "end": { - "line": 18, - "column": 16, - "program": "boxingConversion7.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "boxingConversion7.ets" - }, - "end": { - "line": 18, - "column": 16, - "program": "boxingConversion7.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "f", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "boxingConversion7.ets" - }, - "end": { - "line": 19, - "column": 6, - "program": "boxingConversion7.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "c", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 16, - "program": "boxingConversion7.ets" - }, - "end": { - "line": 19, - "column": 17, - "program": "boxingConversion7.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "boxingConversion7.ets" - }, - "end": { - "line": 19, - "column": 17, - "program": "boxingConversion7.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "boxingConversion7.ets" - }, - "end": { - "line": 19, - "column": 17, - "program": "boxingConversion7.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "d", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "boxingConversion7.ets" - }, - "end": { - "line": 20, - "column": 6, - "program": "boxingConversion7.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "c", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 17, - "program": "boxingConversion7.ets" - }, - "end": { - "line": 20, - "column": 18, - "program": "boxingConversion7.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "boxingConversion7.ets" - }, - "end": { - "line": 20, - "column": 18, - "program": "boxingConversion7.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "boxingConversion7.ets" - }, - "end": { - "line": 20, - "column": 18, - "program": "boxingConversion7.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion7.ets" - }, - "end": { - "line": 20, - "column": 18, - "program": "boxingConversion7.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion7.ets" - }, - "end": { - "line": 20, - "column": 18, - "program": "boxingConversion7.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion7.ets" - }, - "end": { - "line": 20, - "column": 18, - "program": "boxingConversion7.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion7.ets" - }, - "end": { - "line": 20, - "column": 18, - "program": "boxingConversion7.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -611,7 +180,7 @@ }, "end": { "line": 16, - "column": 19, + "column": 15, "program": "boxingConversion7.ets" } } @@ -698,7 +267,7 @@ }, "end": { "line": 17, - "column": 15, + "column": 14, "program": "boxingConversion7.ets" } } @@ -785,7 +354,7 @@ }, "end": { "line": 18, - "column": 16, + "column": 15, "program": "boxingConversion7.ets" } } @@ -872,7 +441,7 @@ }, "end": { "line": 19, - "column": 17, + "column": 16, "program": "boxingConversion7.ets" } } @@ -959,7 +528,7 @@ }, "end": { "line": 20, - "column": 18, + "column": 17, "program": "boxingConversion7.ets" } } diff --git a/ets2panda/test/compiler/ets/boxingConversion8-expected.txt b/ets2panda/test/compiler/ets/boxingConversion8-expected.txt index f5574b41567f3c73e2ebf35e00bff314c4b1b763..4601f59853fa30b271cbdc0f9bc02d381b159a8e 100644 --- a/ets2panda/test/compiler/ets/boxingConversion8-expected.txt +++ b/ets2panda/test/compiler/ets/boxingConversion8-expected.txt @@ -130,437 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "s", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion8.ets" - }, - "end": { - "line": 16, - "column": 6, - "program": "boxingConversion8.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 2, - "loc": { - "start": { - "line": 16, - "column": 16, - "program": "boxingConversion8.ets" - }, - "end": { - "line": 16, - "column": 17, - "program": "boxingConversion8.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion8.ets" - }, - "end": { - "line": 16, - "column": 17, - "program": "boxingConversion8.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion8.ets" - }, - "end": { - "line": 16, - "column": 17, - "program": "boxingConversion8.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "boxingConversion8.ets" - }, - "end": { - "line": 17, - "column": 6, - "program": "boxingConversion8.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "s", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 14, - "program": "boxingConversion8.ets" - }, - "end": { - "line": 17, - "column": 15, - "program": "boxingConversion8.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "boxingConversion8.ets" - }, - "end": { - "line": 17, - "column": 15, - "program": "boxingConversion8.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "boxingConversion8.ets" - }, - "end": { - "line": 17, - "column": 15, - "program": "boxingConversion8.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "l", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "boxingConversion8.ets" - }, - "end": { - "line": 18, - "column": 6, - "program": "boxingConversion8.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "s", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 15, - "program": "boxingConversion8.ets" - }, - "end": { - "line": 18, - "column": 16, - "program": "boxingConversion8.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "boxingConversion8.ets" - }, - "end": { - "line": 18, - "column": 16, - "program": "boxingConversion8.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "boxingConversion8.ets" - }, - "end": { - "line": 18, - "column": 16, - "program": "boxingConversion8.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "f", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "boxingConversion8.ets" - }, - "end": { - "line": 19, - "column": 6, - "program": "boxingConversion8.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "s", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 16, - "program": "boxingConversion8.ets" - }, - "end": { - "line": 19, - "column": 17, - "program": "boxingConversion8.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "boxingConversion8.ets" - }, - "end": { - "line": 19, - "column": 17, - "program": "boxingConversion8.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "boxingConversion8.ets" - }, - "end": { - "line": 19, - "column": 17, - "program": "boxingConversion8.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "d", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "boxingConversion8.ets" - }, - "end": { - "line": 20, - "column": 6, - "program": "boxingConversion8.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "s", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 17, - "program": "boxingConversion8.ets" - }, - "end": { - "line": 20, - "column": 18, - "program": "boxingConversion8.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "boxingConversion8.ets" - }, - "end": { - "line": 20, - "column": 18, - "program": "boxingConversion8.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "boxingConversion8.ets" - }, - "end": { - "line": 20, - "column": 18, - "program": "boxingConversion8.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion8.ets" - }, - "end": { - "line": 20, - "column": 18, - "program": "boxingConversion8.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion8.ets" - }, - "end": { - "line": 20, - "column": 18, - "program": "boxingConversion8.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion8.ets" - }, - "end": { - "line": 20, - "column": 18, - "program": "boxingConversion8.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion8.ets" - }, - "end": { - "line": 20, - "column": 18, - "program": "boxingConversion8.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -611,7 +180,7 @@ }, "end": { "line": 16, - "column": 17, + "column": 16, "program": "boxingConversion8.ets" } } @@ -698,7 +267,7 @@ }, "end": { "line": 17, - "column": 15, + "column": 14, "program": "boxingConversion8.ets" } } @@ -785,7 +354,7 @@ }, "end": { "line": 18, - "column": 16, + "column": 15, "program": "boxingConversion8.ets" } } @@ -872,7 +441,7 @@ }, "end": { "line": 19, - "column": 17, + "column": 16, "program": "boxingConversion8.ets" } } @@ -959,7 +528,7 @@ }, "end": { "line": 20, - "column": 18, + "column": 17, "program": "boxingConversion8.ets" } } diff --git a/ets2panda/test/compiler/ets/boxingConversion9-expected.txt b/ets2panda/test/compiler/ets/boxingConversion9-expected.txt index 08d37f8b1506384b53ebc8901a1d4378815d488e..6bbe4b206d3b4a9bb9d41c6688fcecdd447123b5 100644 --- a/ets2panda/test/compiler/ets/boxingConversion9-expected.txt +++ b/ets2panda/test/compiler/ets/boxingConversion9-expected.txt @@ -130,307 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "l", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion9.ets" - }, - "end": { - "line": 16, - "column": 6, - "program": "boxingConversion9.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 0, - "loc": { - "start": { - "line": 16, - "column": 15, - "program": "boxingConversion9.ets" - }, - "end": { - "line": 16, - "column": 16, - "program": "boxingConversion9.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion9.ets" - }, - "end": { - "line": 16, - "column": 16, - "program": "boxingConversion9.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion9.ets" - }, - "end": { - "line": 16, - "column": 16, - "program": "boxingConversion9.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "f", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "boxingConversion9.ets" - }, - "end": { - "line": 17, - "column": 6, - "program": "boxingConversion9.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "l", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 16, - "program": "boxingConversion9.ets" - }, - "end": { - "line": 17, - "column": 17, - "program": "boxingConversion9.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "boxingConversion9.ets" - }, - "end": { - "line": 17, - "column": 17, - "program": "boxingConversion9.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "boxingConversion9.ets" - }, - "end": { - "line": 17, - "column": 17, - "program": "boxingConversion9.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "d", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "boxingConversion9.ets" - }, - "end": { - "line": 18, - "column": 6, - "program": "boxingConversion9.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "l", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 17, - "program": "boxingConversion9.ets" - }, - "end": { - "line": 18, - "column": 18, - "program": "boxingConversion9.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "boxingConversion9.ets" - }, - "end": { - "line": 18, - "column": 18, - "program": "boxingConversion9.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "boxingConversion9.ets" - }, - "end": { - "line": 18, - "column": 18, - "program": "boxingConversion9.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion9.ets" - }, - "end": { - "line": 18, - "column": 18, - "program": "boxingConversion9.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion9.ets" - }, - "end": { - "line": 18, - "column": 18, - "program": "boxingConversion9.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion9.ets" - }, - "end": { - "line": 18, - "column": 18, - "program": "boxingConversion9.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boxingConversion9.ets" - }, - "end": { - "line": 18, - "column": 18, - "program": "boxingConversion9.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -481,7 +180,7 @@ }, "end": { "line": 16, - "column": 16, + "column": 15, "program": "boxingConversion9.ets" } } @@ -568,7 +267,7 @@ }, "end": { "line": 17, - "column": 17, + "column": 16, "program": "boxingConversion9.ets" } } @@ -655,7 +354,7 @@ }, "end": { "line": 18, - "column": 18, + "column": 17, "program": "boxingConversion9.ets" } } diff --git a/ets2panda/test/compiler/ets/boxingUnboxingExpressions-expected.txt b/ets2panda/test/compiler/ets/boxingUnboxingExpressions-expected.txt index b79079f03d5e7eadc48f7787e4b2b40a01a44657..84f91020c970cc864d81d7fc7f17f89fce177393 100644 --- a/ets2panda/test/compiler/ets/boxingUnboxingExpressions-expected.txt +++ b/ets2panda/test/compiler/ets/boxingUnboxingExpressions-expected.txt @@ -8467,112 +8467,6 @@ "program": "boxingUnboxingExpressions.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "boxingUnboxingExpressions.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "boxingUnboxingExpressions.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "boxingUnboxingExpressions.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "boxingUnboxingExpressions.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "boxingUnboxingExpressions.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "boxingUnboxingExpressions.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "boxingUnboxingExpressions.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "boxingUnboxingExpressions.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/catch-soft-keyword-expected.txt b/ets2panda/test/compiler/ets/catch-soft-keyword-expected.txt index e07e3df30394b756307d46856dc465ca86f436cf..1633125ccaf81ef7340243648f6095166fad7006 100644 --- a/ets2panda/test/compiler/ets/catch-soft-keyword-expected.txt +++ b/ets2panda/test/compiler/ets/catch-soft-keyword-expected.txt @@ -561,112 +561,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "catch-soft-keyword.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "catch-soft-keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "catch-soft-keyword.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "catch-soft-keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "catch-soft-keyword.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "catch-soft-keyword.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "catch-soft-keyword.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "catch-soft-keyword.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/catchParamScope-expected.txt b/ets2panda/test/compiler/ets/catchParamScope-expected.txt index b0b2aa45d18b1cdd364e61c27287474394fa0a5b..182816169045d432a4f64c560d6eb1fe60380ddd 100644 --- a/ets2panda/test/compiler/ets/catchParamScope-expected.txt +++ b/ets2panda/test/compiler/ets/catchParamScope-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "catchParamScope.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "catchParamScope.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "catchParamScope.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "catchParamScope.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "catchParamScope.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "catchParamScope.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "catchParamScope.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "catchParamScope.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/class_def_varargs_1-expected.txt b/ets2panda/test/compiler/ets/class_def_varargs_1-expected.txt index eedfeb751156da002f2a1e26facac8179682a110..413df6e27971512363aff6c9683e13fa1cefb36b 100644 --- a/ets2panda/test/compiler/ets/class_def_varargs_1-expected.txt +++ b/ets2panda/test/compiler/ets/class_def_varargs_1-expected.txt @@ -1096,112 +1096,6 @@ "program": "class_def_varargs_1.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "class_def_varargs_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "class_def_varargs_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "class_def_varargs_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "class_def_varargs_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "class_def_varargs_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "class_def_varargs_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "class_def_varargs_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "class_def_varargs_1.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/class_def_varargs_2-expected.txt b/ets2panda/test/compiler/ets/class_def_varargs_2-expected.txt index 2b711b9f7c16137f73701be38e7260194f6bac99..c0ec7c1528a0dc5d5042b6b8cb35ee7c7642e36e 100644 --- a/ets2panda/test/compiler/ets/class_def_varargs_2-expected.txt +++ b/ets2panda/test/compiler/ets/class_def_varargs_2-expected.txt @@ -339,112 +339,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "class_def_varargs_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "class_def_varargs_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "class_def_varargs_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "class_def_varargs_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "class_def_varargs_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "class_def_varargs_2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "class_def_varargs_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "class_def_varargs_2.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/conversion-w-ASExpr-expected.txt b/ets2panda/test/compiler/ets/conversion-w-ASExpr-expected.txt index d41f4f5ba9681076bf75b42d84b61ef54b4df8c4..0acc07996435d87edcc00cd6b610f0348ae546de 100644 --- a/ets2panda/test/compiler/ets/conversion-w-ASExpr-expected.txt +++ b/ets2panda/test/compiler/ets/conversion-w-ASExpr-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "conversion-w-ASExpr.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "conversion-w-ASExpr.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "conversion-w-ASExpr.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "conversion-w-ASExpr.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "conversion-w-ASExpr.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "conversion-w-ASExpr.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "conversion-w-ASExpr.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "conversion-w-ASExpr.ets" - } - } - }, { "type": "MethodDefinition", "key": { @@ -307,7 +201,7 @@ }, "end": { "line": 17, - "column": 25, + "column": 33, "program": "conversion-w-ASExpr.ets" } } @@ -320,7 +214,7 @@ }, "end": { "line": 17, - "column": 25, + "column": 33, "program": "conversion-w-ASExpr.ets" } } @@ -450,7 +344,7 @@ }, "end": { "line": 18, - "column": 27, + "column": 36, "program": "conversion-w-ASExpr.ets" } } @@ -463,7 +357,7 @@ }, "end": { "line": 18, - "column": 27, + "column": 36, "program": "conversion-w-ASExpr.ets" } } @@ -593,7 +487,7 @@ }, "end": { "line": 19, - "column": 25, + "column": 32, "program": "conversion-w-ASExpr.ets" } } @@ -606,7 +500,7 @@ }, "end": { "line": 19, - "column": 25, + "column": 32, "program": "conversion-w-ASExpr.ets" } } @@ -736,7 +630,7 @@ }, "end": { "line": 20, - "column": 24, + "column": 32, "program": "conversion-w-ASExpr.ets" } } @@ -749,7 +643,7 @@ }, "end": { "line": 20, - "column": 24, + "column": 32, "program": "conversion-w-ASExpr.ets" } } @@ -879,7 +773,7 @@ }, "end": { "line": 21, - "column": 31, + "column": 40, "program": "conversion-w-ASExpr.ets" } } @@ -892,7 +786,7 @@ }, "end": { "line": 21, - "column": 31, + "column": 40, "program": "conversion-w-ASExpr.ets" } } @@ -1135,7 +1029,7 @@ }, "end": { "line": 23, - "column": 27, + "column": 37, "program": "conversion-w-ASExpr.ets" } } @@ -1148,7 +1042,7 @@ }, "end": { "line": 23, - "column": 27, + "column": 37, "program": "conversion-w-ASExpr.ets" } } @@ -1278,7 +1172,7 @@ }, "end": { "line": 24, - "column": 37, + "column": 47, "program": "conversion-w-ASExpr.ets" } } @@ -1291,7 +1185,7 @@ }, "end": { "line": 24, - "column": 37, + "column": 47, "program": "conversion-w-ASExpr.ets" } } @@ -1421,7 +1315,7 @@ }, "end": { "line": 25, - "column": 31, + "column": 39, "program": "conversion-w-ASExpr.ets" } } @@ -1434,7 +1328,7 @@ }, "end": { "line": 25, - "column": 31, + "column": 39, "program": "conversion-w-ASExpr.ets" } } diff --git a/ets2panda/test/compiler/ets/conversion_w_functions-expected.txt b/ets2panda/test/compiler/ets/conversion_w_functions-expected.txt index 4f48c67640da6ab4e928bce932e870f1ea0c4e43..96a0b6519c92e2d3bc4a848bcf08445ca54e1877 100644 --- a/ets2panda/test/compiler/ets/conversion_w_functions-expected.txt +++ b/ets2panda/test/compiler/ets/conversion_w_functions-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "conversion_w_functions.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "conversion_w_functions.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "conversion_w_functions.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "conversion_w_functions.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "conversion_w_functions.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "conversion_w_functions.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "conversion_w_functions.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "conversion_w_functions.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/delete-non-keyword-expected.txt b/ets2panda/test/compiler/ets/delete-non-keyword-expected.txt index 8f4336238ac814719f27b1b42b6fc0dcaaa24012..c81e277550cabc94c68500b1013290da611f20e7 100644 --- a/ets2panda/test/compiler/ets/delete-non-keyword-expected.txt +++ b/ets2panda/test/compiler/ets/delete-non-keyword-expected.txt @@ -472,112 +472,6 @@ "program": "delete-non-keyword.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "delete-non-keyword.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "delete-non-keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "delete-non-keyword.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "delete-non-keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "delete-non-keyword.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "delete-non-keyword.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "delete-non-keyword.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "delete-non-keyword.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/ensureNotNullArgNotNullable-expected.txt b/ets2panda/test/compiler/ets/ensureNotNullArgNotNullable-expected.txt index 6039423c91ff0efcebdac6b43a76b1a3872f4c8e..31ef6a5126f467371f56a42d59b3f4cc53707fb9 100644 --- a/ets2panda/test/compiler/ets/ensureNotNullArgNotNullable-expected.txt +++ b/ets2panda/test/compiler/ets/ensureNotNullArgNotNullable-expected.txt @@ -135,112 +135,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ensureNotNullArgNotNullable.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ensureNotNullArgNotNullable.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ensureNotNullArgNotNullable.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ensureNotNullArgNotNullable.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ensureNotNullArgNotNullable.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ensureNotNullArgNotNullable.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ensureNotNullArgNotNullable.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ensureNotNullArgNotNullable.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/ensureNotNullLocalNotNullable-expected.txt b/ets2panda/test/compiler/ets/ensureNotNullLocalNotNullable-expected.txt index 780a6c73b8321f7d9bd7cb323c2c2269ef7178ae..b8891fd8203f6fff3ac196e5d79f7a0140f75076 100644 --- a/ets2panda/test/compiler/ets/ensureNotNullLocalNotNullable-expected.txt +++ b/ets2panda/test/compiler/ets/ensureNotNullLocalNotNullable-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ensureNotNullLocalNotNullable.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ensureNotNullLocalNotNullable.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ensureNotNullLocalNotNullable.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ensureNotNullLocalNotNullable.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ensureNotNullLocalNotNullable.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ensureNotNullLocalNotNullable.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ensureNotNullLocalNotNullable.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ensureNotNullLocalNotNullable.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/ensureNotNullReturnNotNullable-expected.txt b/ets2panda/test/compiler/ets/ensureNotNullReturnNotNullable-expected.txt index 59db2846da251ee4a6ee427f758cf899efec66ce..a814c16e44521ae61515e890cffdd34bf43f740d 100644 --- a/ets2panda/test/compiler/ets/ensureNotNullReturnNotNullable-expected.txt +++ b/ets2panda/test/compiler/ets/ensureNotNullReturnNotNullable-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ensureNotNullReturnNotNullable.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ensureNotNullReturnNotNullable.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ensureNotNullReturnNotNullable.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ensureNotNullReturnNotNullable.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ensureNotNullReturnNotNullable.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ensureNotNullReturnNotNullable.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ensureNotNullReturnNotNullable.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ensureNotNullReturnNotNullable.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/enum_as_class_member_getValue_call-expected.txt b/ets2panda/test/compiler/ets/enum_as_class_member_getValue_call-expected.txt index 2063a36604329b1be3c4c324dc5be21787a9f31e..7ec5e1d4c56d72b6ed56b5ccd16a3504cb098e63 100644 --- a/ets2panda/test/compiler/ets/enum_as_class_member_getValue_call-expected.txt +++ b/ets2panda/test/compiler/ets/enum_as_class_member_getValue_call-expected.txt @@ -11488,112 +11488,6 @@ "program": "enum_as_class_member_getValue_call.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "enum_as_class_member_getValue_call.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "enum_as_class_member_getValue_call.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "enum_as_class_member_getValue_call.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "enum_as_class_member_getValue_call.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "enum_as_class_member_getValue_call.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "enum_as_class_member_getValue_call.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "enum_as_class_member_getValue_call.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "enum_as_class_member_getValue_call.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/export_type-expected.txt b/ets2panda/test/compiler/ets/export_type-expected.txt index 180a05d27842bcaf60e6a9138e0241d5e79b0fcd..dff1fd6902859642aefc08e262e3c521d7ea0775 100644 --- a/ets2panda/test/compiler/ets/export_type-expected.txt +++ b/ets2panda/test/compiler/ets/export_type-expected.txt @@ -643,112 +643,6 @@ "program": "export_type.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "export_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "export_type.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "export_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "export_type.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "export_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "export_type.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "export_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "export_type.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/extended_conditional_expression_not-expected.txt b/ets2panda/test/compiler/ets/extended_conditional_expression_not-expected.txt index c75e1bfea3dd1fd58f7a7acc5b58dc581c5fcce2..4e2952d171c62cd0934e7d7222c7ef9c4bb71bf6 100644 --- a/ets2panda/test/compiler/ets/extended_conditional_expression_not-expected.txt +++ b/ets2panda/test/compiler/ets/extended_conditional_expression_not-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "extended_conditional_expression_not.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "extended_conditional_expression_not.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "extended_conditional_expression_not.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "extended_conditional_expression_not.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "extended_conditional_expression_not.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "extended_conditional_expression_not.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "extended_conditional_expression_not.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "extended_conditional_expression_not.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/extended_conditional_expression_not_return_type-expected.txt b/ets2panda/test/compiler/ets/extended_conditional_expression_not_return_type-expected.txt index acf957b85862673f485127ceeaada0f1d21edaeb..60c13b421c79ddbac2e01821dccc0b3d4d6fad42 100644 --- a/ets2panda/test/compiler/ets/extended_conditional_expression_not_return_type-expected.txt +++ b/ets2panda/test/compiler/ets/extended_conditional_expression_not_return_type-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "extended_conditional_expression_not_return_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "extended_conditional_expression_not_return_type.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "extended_conditional_expression_not_return_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "extended_conditional_expression_not_return_type.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "extended_conditional_expression_not_return_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "extended_conditional_expression_not_return_type.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "extended_conditional_expression_not_return_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "extended_conditional_expression_not_return_type.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/forUpdate-expected.txt b/ets2panda/test/compiler/ets/forUpdate-expected.txt index 3152e96841268f6a8e9aedf7aee8aa9c7679833d..3011466043971348d4f23e1435e565eaafb52ab2 100644 --- a/ets2panda/test/compiler/ets/forUpdate-expected.txt +++ b/ets2panda/test/compiler/ets/forUpdate-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "forUpdate.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "forUpdate.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "forUpdate.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "forUpdate.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "forUpdate.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "forUpdate.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "forUpdate.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "forUpdate.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/forUpdateCharType-expected.txt b/ets2panda/test/compiler/ets/forUpdateCharType-expected.txt index 1fe79384e17ea45ee282a0af6fccb91c0d4f7ca9..e639d751271363524d456cb878c64f741af55f22 100644 --- a/ets2panda/test/compiler/ets/forUpdateCharType-expected.txt +++ b/ets2panda/test/compiler/ets/forUpdateCharType-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "forUpdateCharType.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "forUpdateCharType.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "forUpdateCharType.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "forUpdateCharType.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "forUpdateCharType.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "forUpdateCharType.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "forUpdateCharType.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "forUpdateCharType.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/from-soft-keyword-0-expected.txt b/ets2panda/test/compiler/ets/from-soft-keyword-0-expected.txt index 25fda0730c31d88a72498e32004885125ef07fe6..c883aac8cf2b141e3bc50e27be8b70df2d596276 100644 --- a/ets2panda/test/compiler/ets/from-soft-keyword-0-expected.txt +++ b/ets2panda/test/compiler/ets/from-soft-keyword-0-expected.txt @@ -575,112 +575,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "from-soft-keyword-0.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "from-soft-keyword-0.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "from-soft-keyword-0.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "from-soft-keyword-0.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "from-soft-keyword-0.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "from-soft-keyword-0.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "from-soft-keyword-0.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "from-soft-keyword-0.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/from-soft-keyword-1-expected.txt b/ets2panda/test/compiler/ets/from-soft-keyword-1-expected.txt index 1ac22e92289ebeaa08a0559cd16d8ded8fe603d6..60218751262efcaa630a3cba3b8bb109935bef57 100644 --- a/ets2panda/test/compiler/ets/from-soft-keyword-1-expected.txt +++ b/ets2panda/test/compiler/ets/from-soft-keyword-1-expected.txt @@ -89,112 +89,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "from-soft-keyword-1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "from-soft-keyword-1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "from-soft-keyword-1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "from-soft-keyword-1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "from-soft-keyword-1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "from-soft-keyword-1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "from-soft-keyword-1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "from-soft-keyword-1.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/from-soft-keyword-2-expected.txt b/ets2panda/test/compiler/ets/from-soft-keyword-2-expected.txt index 4fecb7830e46516d3e6b3d0235442841a7af576a..cb4577479a89d93eba0e8fbc87702fe3dea86c75 100644 --- a/ets2panda/test/compiler/ets/from-soft-keyword-2-expected.txt +++ b/ets2panda/test/compiler/ets/from-soft-keyword-2-expected.txt @@ -292,112 +292,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "from-soft-keyword-2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "from-soft-keyword-2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "from-soft-keyword-2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "from-soft-keyword-2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "from-soft-keyword-2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "from-soft-keyword-2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "from-soft-keyword-2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "from-soft-keyword-2.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/func-ref-private-expected.txt b/ets2panda/test/compiler/ets/func-ref-private-expected.txt index 58adac78d35b23fa481f978e00b543ef60ce4c2b..92101be8c228b1bb1c23cdcee988716d77b2bd4c 100644 --- a/ets2panda/test/compiler/ets/func-ref-private-expected.txt +++ b/ets2panda/test/compiler/ets/func-ref-private-expected.txt @@ -645,112 +645,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "func-ref-private.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "func-ref-private.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "func-ref-private.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "func-ref-private.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "func-ref-private.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "func-ref-private.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "func-ref-private.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "func-ref-private.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/functionPointerArray-expected.txt b/ets2panda/test/compiler/ets/functionPointerArray-expected.txt index 67d0820de086d794b436ee69b7a8384b94f606f5..945a69be6b4697fc4069abc0069737b09dcc1649 100644 --- a/ets2panda/test/compiler/ets/functionPointerArray-expected.txt +++ b/ets2panda/test/compiler/ets/functionPointerArray-expected.txt @@ -87,112 +87,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "functionPointerArray.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "functionPointerArray.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "functionPointerArray.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "functionPointerArray.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "functionPointerArray.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "functionPointerArray.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "functionPointerArray.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "functionPointerArray.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/functionTypeToObject-expected.txt b/ets2panda/test/compiler/ets/functionTypeToObject-expected.txt index b32c93e03cfdf39e3694998d1bb846edf3fcb9c9..528775eb78d47db4c3d65098e1a076ebbabecea9 100644 --- a/ets2panda/test/compiler/ets/functionTypeToObject-expected.txt +++ b/ets2panda/test/compiler/ets/functionTypeToObject-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "functionTypeToObject.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "functionTypeToObject.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "functionTypeToObject.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "functionTypeToObject.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "functionTypeToObject.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "functionTypeToObject.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "functionTypeToObject.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "functionTypeToObject.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/function_subtyping_1-expected.txt b/ets2panda/test/compiler/ets/function_subtyping_1-expected.txt index 18c4ecc8c2423b72effaa5ef56b27f63aa9bd190..f640cf52040327c02e554fd1bc086f617fd4ef98 100644 --- a/ets2panda/test/compiler/ets/function_subtyping_1-expected.txt +++ b/ets2panda/test/compiler/ets/function_subtyping_1-expected.txt @@ -380,112 +380,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "function_subtyping_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "function_subtyping_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "function_subtyping_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "function_subtyping_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "function_subtyping_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "function_subtyping_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "function_subtyping_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "function_subtyping_1.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/functions_with_ambiguous_rest_parameter-expected.txt b/ets2panda/test/compiler/ets/functions_with_ambiguous_rest_parameter-expected.txt index 062eb8492bb45228d472c070137916f911d406a3..ec8067cce8fa17fe419dbed4bc0886eb28ac981e 100644 --- a/ets2panda/test/compiler/ets/functions_with_ambiguous_rest_parameter-expected.txt +++ b/ets2panda/test/compiler/ets/functions_with_ambiguous_rest_parameter-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "functions_with_ambiguous_rest_parameter.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "functions_with_ambiguous_rest_parameter.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "functions_with_ambiguous_rest_parameter.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "functions_with_ambiguous_rest_parameter.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "functions_with_ambiguous_rest_parameter.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "functions_with_ambiguous_rest_parameter.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "functions_with_ambiguous_rest_parameter.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "functions_with_ambiguous_rest_parameter.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/generic_arrayaslist-expected.txt b/ets2panda/test/compiler/ets/generic_arrayaslist-expected.txt index 66fb2f4f432a1444be435d4405caf3ab85571789..7e0f01ff158e2359265c1276ecddc5f6bf4e9549 100644 --- a/ets2panda/test/compiler/ets/generic_arrayaslist-expected.txt +++ b/ets2panda/test/compiler/ets/generic_arrayaslist-expected.txt @@ -9252,7 +9252,7 @@ }, "end": { "line": 94, - "column": 34, + "column": 39, "program": "generic_arrayaslist.ets" } } @@ -9265,7 +9265,7 @@ }, "end": { "line": 94, - "column": 34, + "column": 39, "program": "generic_arrayaslist.ets" } } @@ -11863,7 +11863,7 @@ }, "end": { "line": 117, - "column": 39, + "column": 44, "program": "generic_arrayaslist.ets" } } @@ -12411,7 +12411,7 @@ }, "end": { "line": 125, - "column": 32, + "column": 37, "program": "generic_arrayaslist.ets" } } @@ -14017,7 +14017,7 @@ }, "end": { "line": 143, - "column": 43, + "column": 48, "program": "generic_arrayaslist.ets" } } @@ -15144,7 +15144,7 @@ }, "end": { "line": 151, - "column": 41, + "column": 46, "program": "generic_arrayaslist.ets" } } @@ -15939,7 +15939,7 @@ }, "end": { "line": 158, - "column": 35, + "column": 40, "program": "generic_arrayaslist.ets" } } @@ -15952,7 +15952,7 @@ }, "end": { "line": 158, - "column": 35, + "column": 40, "program": "generic_arrayaslist.ets" } } @@ -16358,7 +16358,7 @@ }, "end": { "line": 160, - "column": 48, + "column": 53, "program": "generic_arrayaslist.ets" } } @@ -17673,7 +17673,7 @@ }, "end": { "line": 173, - "column": 44, + "column": 49, "program": "generic_arrayaslist.ets" } } @@ -18804,7 +18804,7 @@ }, "end": { "line": 182, - "column": 52, + "column": 57, "program": "generic_arrayaslist.ets" } } @@ -25276,112 +25276,6 @@ "program": "generic_arrayaslist.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_arrayaslist.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_arrayaslist.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_arrayaslist.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_arrayaslist.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_arrayaslist.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_arrayaslist.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_arrayaslist.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_arrayaslist.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/generic_class_getter_setter-expected.txt b/ets2panda/test/compiler/ets/generic_class_getter_setter-expected.txt index e052767fdef99921285232b7ec7dedfe30833ab6..7d31183cc82d18ef05b426f0e1fa2fde3a4dbde2 100644 --- a/ets2panda/test/compiler/ets/generic_class_getter_setter-expected.txt +++ b/ets2panda/test/compiler/ets/generic_class_getter_setter-expected.txt @@ -600,112 +600,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_class_getter_setter.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_class_getter_setter.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_class_getter_setter.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_class_getter_setter.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_class_getter_setter.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_class_getter_setter.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_class_getter_setter.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_class_getter_setter.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/generic_deadlock-expected.txt b/ets2panda/test/compiler/ets/generic_deadlock-expected.txt index 37f7b8aca7a644ce8e1b96fc496f968724c751b4..4687d165973c2cd80e6aa6982539a6f7b17906de 100644 --- a/ets2panda/test/compiler/ets/generic_deadlock-expected.txt +++ b/ets2panda/test/compiler/ets/generic_deadlock-expected.txt @@ -879,112 +879,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_deadlock.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_deadlock.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_deadlock.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_deadlock.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_deadlock.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_deadlock.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_deadlock.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_deadlock.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/generic_func_rest_param_spread_infer-expected.txt b/ets2panda/test/compiler/ets/generic_func_rest_param_spread_infer-expected.txt index 7df4fb223a6d11ae15ea2ac8eab69834339d85ca..81d3c18e16d463fd7e55e7d5d309e9563caa8b5e 100644 --- a/ets2panda/test/compiler/ets/generic_func_rest_param_spread_infer-expected.txt +++ b/ets2panda/test/compiler/ets/generic_func_rest_param_spread_infer-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_func_rest_param_spread_infer.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_func_rest_param_spread_infer.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_func_rest_param_spread_infer.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_func_rest_param_spread_infer.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_func_rest_param_spread_infer.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_func_rest_param_spread_infer.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_func_rest_param_spread_infer.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_func_rest_param_spread_infer.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/generic_function_call_1-expected.txt b/ets2panda/test/compiler/ets/generic_function_call_1-expected.txt index 79b358e49a69c6d393f5e35e74384e487afe9865..befba532ae25db977abe3605671e2ec2f2847436 100644 --- a/ets2panda/test/compiler/ets/generic_function_call_1-expected.txt +++ b/ets2panda/test/compiler/ets/generic_function_call_1-expected.txt @@ -179,112 +179,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_function_call_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_function_call_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_function_call_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_function_call_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_function_call_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_function_call_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_function_call_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_function_call_1.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/generic_function_call_3-expected.txt b/ets2panda/test/compiler/ets/generic_function_call_3-expected.txt index b697832de71e0a012818b33486ea348d41b09415..1b957ad29af3ad0b242bd8a70322825617e576da 100644 --- a/ets2panda/test/compiler/ets/generic_function_call_3-expected.txt +++ b/ets2panda/test/compiler/ets/generic_function_call_3-expected.txt @@ -380,112 +380,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_function_call_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_function_call_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_function_call_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_function_call_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_function_call_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_function_call_3.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_function_call_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_function_call_3.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/generic_function_call_4-expected.txt b/ets2panda/test/compiler/ets/generic_function_call_4-expected.txt index b2387071a32329ce97e5048761cc49e357753faa..423f572f79e0ce74f85ece8b0308712cf8eea2bd 100644 --- a/ets2panda/test/compiler/ets/generic_function_call_4-expected.txt +++ b/ets2panda/test/compiler/ets/generic_function_call_4-expected.txt @@ -383,112 +383,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_function_call_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_function_call_4.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_function_call_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_function_call_4.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_function_call_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_function_call_4.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_function_call_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_function_call_4.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/generic_function_call_5-expected.txt b/ets2panda/test/compiler/ets/generic_function_call_5-expected.txt index 4aa5fa29cf7369d8cee48f6adae560f4d010f8f3..1f32732563cbeb60202cd8a2e3a5c94fd04c45a0 100644 --- a/ets2panda/test/compiler/ets/generic_function_call_5-expected.txt +++ b/ets2panda/test/compiler/ets/generic_function_call_5-expected.txt @@ -693,112 +693,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_function_call_5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_function_call_5.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_function_call_5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_function_call_5.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_function_call_5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_function_call_5.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_function_call_5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_function_call_5.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/generic_function_call_7-expected.txt b/ets2panda/test/compiler/ets/generic_function_call_7-expected.txt index 888aeba014d8e607599f40791434a1fa4d333479..98efdd5b8d3674e267b1a0933d6ec18b9a69c2f8 100644 --- a/ets2panda/test/compiler/ets/generic_function_call_7-expected.txt +++ b/ets2panda/test/compiler/ets/generic_function_call_7-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_function_call_7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_function_call_7.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_function_call_7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_function_call_7.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_function_call_7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_function_call_7.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_function_call_7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_function_call_7.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/generic_override_1-expected.txt b/ets2panda/test/compiler/ets/generic_override_1-expected.txt index e2e500647e86b816c510b5bbe78bd717186617aa..673e4ca35c8069de0bca3c3f3567f8c406b3cb7a 100644 --- a/ets2panda/test/compiler/ets/generic_override_1-expected.txt +++ b/ets2panda/test/compiler/ets/generic_override_1-expected.txt @@ -2461,112 +2461,6 @@ "program": "generic_override_1.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_override_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_override_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_override_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_override_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_override_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_override_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_override_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_override_1.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/generic_override_2-expected.txt b/ets2panda/test/compiler/ets/generic_override_2-expected.txt index 82f88f738b42c4350fbb560257702be9aa083b86..7787d1fb2e1ace3f7ac4df99db3b650b52234dac 100644 --- a/ets2panda/test/compiler/ets/generic_override_2-expected.txt +++ b/ets2panda/test/compiler/ets/generic_override_2-expected.txt @@ -3086,112 +3086,6 @@ "program": "generic_override_2.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_override_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_override_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_override_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_override_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_override_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_override_2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_override_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_override_2.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/generic_override_3-expected.txt b/ets2panda/test/compiler/ets/generic_override_3-expected.txt index abc1f04d131b2da935d5e92e1a7d08152db6c948..5c0a44847a7a1f35183c8ea2767a7780ce9dd33e 100644 --- a/ets2panda/test/compiler/ets/generic_override_3-expected.txt +++ b/ets2panda/test/compiler/ets/generic_override_3-expected.txt @@ -2370,112 +2370,6 @@ "program": "generic_override_3.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_override_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_override_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_override_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_override_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_override_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_override_3.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_override_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_override_3.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/generic_typealias_1-expected.txt b/ets2panda/test/compiler/ets/generic_typealias_1-expected.txt index 850589db695213a0b4afb2509d228be78ea46936..07b1fc8400168a19b363bf804406fd3a51a7c146 100644 --- a/ets2panda/test/compiler/ets/generic_typealias_1-expected.txt +++ b/ets2panda/test/compiler/ets/generic_typealias_1-expected.txt @@ -627,112 +627,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_typealias_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_typealias_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_typealias_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_typealias_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_typealias_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_typealias_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_typealias_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_typealias_1.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/generic_typealias_6-expected.txt b/ets2panda/test/compiler/ets/generic_typealias_6-expected.txt index d33de970894c77c5bb041ab658b5a3b02d38321f..30176aa80ae6432d5db7fb862e39e7f5d91f0463 100644 --- a/ets2panda/test/compiler/ets/generic_typealias_6-expected.txt +++ b/ets2panda/test/compiler/ets/generic_typealias_6-expected.txt @@ -531,112 +531,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_typealias_6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_typealias_6.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_typealias_6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_typealias_6.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_typealias_6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_typealias_6.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_typealias_6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_typealias_6.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/generic_typealias_7_neg-expected.txt b/ets2panda/test/compiler/ets/generic_typealias_7_neg-expected.txt index 2cb90a6edf7a0c428a1bf413cd7f90d9b9eb4e16..9e19f6a3a250463ede36f883fa555a3071c39ecd 100644 --- a/ets2panda/test/compiler/ets/generic_typealias_7_neg-expected.txt +++ b/ets2panda/test/compiler/ets/generic_typealias_7_neg-expected.txt @@ -152,112 +152,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_typealias_7_neg.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_typealias_7_neg.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_typealias_7_neg.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_typealias_7_neg.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_typealias_7_neg.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_typealias_7_neg.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_typealias_7_neg.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_typealias_7_neg.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/generic_typealias_8-expected.txt b/ets2panda/test/compiler/ets/generic_typealias_8-expected.txt index 937661efc68a2b2ffe4c95477d728b36575960d7..45bd8eefde7d4112863915f4a9915bebd3d05853 100644 --- a/ets2panda/test/compiler/ets/generic_typealias_8-expected.txt +++ b/ets2panda/test/compiler/ets/generic_typealias_8-expected.txt @@ -307,112 +307,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_typealias_8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_typealias_8.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_typealias_8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_typealias_8.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_typealias_8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_typealias_8.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_typealias_8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_typealias_8.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/generic_typealias_9-expected.txt b/ets2panda/test/compiler/ets/generic_typealias_9-expected.txt index ae00179942f1828fd98809b3bad08e6ec21c389a..3c5d95eaafc4d9ea89c00453885fbef9c42a88a1 100644 --- a/ets2panda/test/compiler/ets/generic_typealias_9-expected.txt +++ b/ets2panda/test/compiler/ets/generic_typealias_9-expected.txt @@ -216,112 +216,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_typealias_9.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_typealias_9.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_typealias_9.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_typealias_9.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_typealias_9.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_typealias_9.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_typealias_9.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_typealias_9.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/generic_variance_1-expected.txt b/ets2panda/test/compiler/ets/generic_variance_1-expected.txt index 8c085de737816c901e79f662e2ef7085c2233202..d08dd7fd40fbcf1eb799ab7025fb91e54541be4a 100644 --- a/ets2panda/test/compiler/ets/generic_variance_1-expected.txt +++ b/ets2panda/test/compiler/ets/generic_variance_1-expected.txt @@ -790,112 +790,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_variance_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_variance_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_variance_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_variance_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_variance_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_variance_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_variance_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_variance_1.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/generics_class_recursive_type_1-expected.txt b/ets2panda/test/compiler/ets/generics_class_recursive_type_1-expected.txt index 93a03e9e62763e9101f01fe22b333acc5aa2e377..bab06cc545e5e778f93f2d1498ff5266c7e653e2 100644 --- a/ets2panda/test/compiler/ets/generics_class_recursive_type_1-expected.txt +++ b/ets2panda/test/compiler/ets/generics_class_recursive_type_1-expected.txt @@ -8375,112 +8375,6 @@ "program": "generics_class_recursive_type_1.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_class_recursive_type_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_class_recursive_type_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_class_recursive_type_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_class_recursive_type_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_class_recursive_type_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_class_recursive_type_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_class_recursive_type_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_class_recursive_type_1.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/generics_implicit_lambda1-expected.txt b/ets2panda/test/compiler/ets/generics_implicit_lambda1-expected.txt index 75757cf4f90cad75334447095d4633db4cd861af..a4da8ef97e9b894d5ef8768b05b87a9e4e4ae765 100644 --- a/ets2panda/test/compiler/ets/generics_implicit_lambda1-expected.txt +++ b/ets2panda/test/compiler/ets/generics_implicit_lambda1-expected.txt @@ -1233,112 +1233,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_implicit_lambda1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_implicit_lambda1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_implicit_lambda1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_implicit_lambda1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_implicit_lambda1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_implicit_lambda1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_implicit_lambda1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_implicit_lambda1.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/generics_instantiation_1-expected.txt b/ets2panda/test/compiler/ets/generics_instantiation_1-expected.txt index 617978c42b9fb2ace12af3c46379e0508b091b88..032ef1779e1c960f8879dd5f57136cc98e95fa5f 100644 --- a/ets2panda/test/compiler/ets/generics_instantiation_1-expected.txt +++ b/ets2panda/test/compiler/ets/generics_instantiation_1-expected.txt @@ -1226,7 +1226,7 @@ }, "end": { "line": 28, - "column": 44, + "column": 57, "program": "generics_instantiation_1.ets" } } @@ -1239,7 +1239,7 @@ }, "end": { "line": 28, - "column": 44, + "column": 57, "program": "generics_instantiation_1.ets" } } @@ -1701,7 +1701,7 @@ }, "end": { "line": 31, - "column": 39, + "column": 52, "program": "generics_instantiation_1.ets" } } @@ -1714,7 +1714,7 @@ }, "end": { "line": 31, - "column": 39, + "column": 52, "program": "generics_instantiation_1.ets" } } @@ -2413,112 +2413,6 @@ "program": "generics_instantiation_1.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_instantiation_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_instantiation_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_instantiation_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_instantiation_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_instantiation_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_instantiation_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_instantiation_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_instantiation_1.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/generics_instantiation_2-expected.txt b/ets2panda/test/compiler/ets/generics_instantiation_2-expected.txt index d29f7110710a44408589133ff02751ef3d53f2ed..834924d22bfed7f29b691c24c121a3ea0b909f72 100644 --- a/ets2panda/test/compiler/ets/generics_instantiation_2-expected.txt +++ b/ets2panda/test/compiler/ets/generics_instantiation_2-expected.txt @@ -1517,112 +1517,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_instantiation_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_instantiation_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_instantiation_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_instantiation_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_instantiation_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_instantiation_2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_instantiation_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_instantiation_2.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/generics_instantiation_3-expected.txt b/ets2panda/test/compiler/ets/generics_instantiation_3-expected.txt index cd4bdaddf25b68cc991dbc68030db74e51baf4e6..2dac44aa26779f341c4b2a74b01782fb6fe05b98 100644 --- a/ets2panda/test/compiler/ets/generics_instantiation_3-expected.txt +++ b/ets2panda/test/compiler/ets/generics_instantiation_3-expected.txt @@ -879,112 +879,6 @@ "program": "generics_instantiation_3.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_instantiation_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_instantiation_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_instantiation_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_instantiation_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_instantiation_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_instantiation_3.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_instantiation_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_instantiation_3.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/generics_instantiation_4-expected.txt b/ets2panda/test/compiler/ets/generics_instantiation_4-expected.txt index f2a521486439ce5065f9c89ecf84f68c78a0d873..0397ee2aca226783d15cef7bc2989424381e5cec 100644 --- a/ets2panda/test/compiler/ets/generics_instantiation_4-expected.txt +++ b/ets2panda/test/compiler/ets/generics_instantiation_4-expected.txt @@ -2554,112 +2554,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_instantiation_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_instantiation_4.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_instantiation_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_instantiation_4.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_instantiation_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_instantiation_4.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_instantiation_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_instantiation_4.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/generics_interface_bounds_1-expected.txt b/ets2panda/test/compiler/ets/generics_interface_bounds_1-expected.txt index a91d4575484f9e2e6f474c68c366b8b0d603a414..7edde8f1406cee8032c981d1c8cc4b6397c9f882 100644 --- a/ets2panda/test/compiler/ets/generics_interface_bounds_1-expected.txt +++ b/ets2panda/test/compiler/ets/generics_interface_bounds_1-expected.txt @@ -1262,112 +1262,6 @@ "program": "generics_interface_bounds_1.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_interface_bounds_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_interface_bounds_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_interface_bounds_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_interface_bounds_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_interface_bounds_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_interface_bounds_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_interface_bounds_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_interface_bounds_1.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/generics_interface_bounds_2-expected.txt b/ets2panda/test/compiler/ets/generics_interface_bounds_2-expected.txt index 6901d8c7563fceaa1fbdbfb9ad336ca2ea9ef328..418c3312f2e1dcba338341fc1a23ef7c70f12391 100644 --- a/ets2panda/test/compiler/ets/generics_interface_bounds_2-expected.txt +++ b/ets2panda/test/compiler/ets/generics_interface_bounds_2-expected.txt @@ -434,112 +434,6 @@ "program": "generics_interface_bounds_2.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_interface_bounds_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_interface_bounds_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_interface_bounds_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_interface_bounds_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_interface_bounds_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_interface_bounds_2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_interface_bounds_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_interface_bounds_2.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/generics_primitive_type_param_1-expected.txt b/ets2panda/test/compiler/ets/generics_primitive_type_param_1-expected.txt index 1f91de0de8188bd3d99b3ec5418e91b9b6c9e5cf..d87f8fdf20facc4945578a2776e31d53e16a90fd 100644 --- a/ets2panda/test/compiler/ets/generics_primitive_type_param_1-expected.txt +++ b/ets2panda/test/compiler/ets/generics_primitive_type_param_1-expected.txt @@ -492,112 +492,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_primitive_type_param_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_primitive_type_param_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_primitive_type_param_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_primitive_type_param_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_primitive_type_param_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_primitive_type_param_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_primitive_type_param_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_primitive_type_param_1.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/identifierReference14-expected.txt b/ets2panda/test/compiler/ets/identifierReference14-expected.txt index 754ec9e3c423892fad412fdfd08962f56e35f991..68bb7e96438b0b336d41fc8811a6ee518bc992b2 100644 --- a/ets2panda/test/compiler/ets/identifierReference14-expected.txt +++ b/ets2panda/test/compiler/ets/identifierReference14-expected.txt @@ -1011,112 +1011,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "identifierReference14.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "identifierReference14.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "identifierReference14.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "identifierReference14.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "identifierReference14.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "identifierReference14.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "identifierReference14.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "identifierReference14.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/identifierReference4-expected.txt b/ets2panda/test/compiler/ets/identifierReference4-expected.txt index f51171adb7303678382d024c1149a53dfb4ae3e7..c9ba567b8c1d26c3b7c8ec17f980a432ca595e55 100644 --- a/ets2panda/test/compiler/ets/identifierReference4-expected.txt +++ b/ets2panda/test/compiler/ets/identifierReference4-expected.txt @@ -775,177 +775,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "identifierReference4.ets" - }, - "end": { - "line": 16, - "column": 6, - "program": "identifierReference4.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 1, - "loc": { - "start": { - "line": 16, - "column": 15, - "program": "identifierReference4.ets" - }, - "end": { - "line": 16, - "column": 16, - "program": "identifierReference4.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "identifierReference4.ets" - }, - "end": { - "line": 16, - "column": 16, - "program": "identifierReference4.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "identifierReference4.ets" - }, - "end": { - "line": 16, - "column": 16, - "program": "identifierReference4.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "identifierReference4.ets" - }, - "end": { - "line": 16, - "column": 16, - "program": "identifierReference4.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "identifierReference4.ets" - }, - "end": { - "line": 16, - "column": 16, - "program": "identifierReference4.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "identifierReference4.ets" - }, - "end": { - "line": 16, - "column": 16, - "program": "identifierReference4.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "identifierReference4.ets" - }, - "end": { - "line": 16, - "column": 16, - "program": "identifierReference4.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -996,7 +825,7 @@ }, "end": { "line": 16, - "column": 16, + "column": 15, "program": "identifierReference4.ets" } } diff --git a/ets2panda/test/compiler/ets/implicit-conversion-expected.txt b/ets2panda/test/compiler/ets/implicit-conversion-expected.txt index 05b5c865db8791487bad59440eeaa79fb4dc91f1..8416f7c8ac7d21565b5046443b5a1c53d72aebb8 100644 --- a/ets2panda/test/compiler/ets/implicit-conversion-expected.txt +++ b/ets2panda/test/compiler/ets/implicit-conversion-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "implicit-conversion.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "implicit-conversion.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "implicit-conversion.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "implicit-conversion.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "implicit-conversion.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "implicit-conversion.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "implicit-conversion.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "implicit-conversion.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/implicit_package_import/package_test_1/package_module_1-expected.txt b/ets2panda/test/compiler/ets/implicit_package_import/package_test_1/package_module_1-expected.txt index fe9fcbe7649c15d678e598e42bea303e5ca74d3d..9f84832338486b4bb2f15a18e7c7f6d6bd2c3819 100644 --- a/ets2panda/test/compiler/ets/implicit_package_import/package_test_1/package_module_1-expected.txt +++ b/ets2panda/test/compiler/ets/implicit_package_import/package_test_1/package_module_1-expected.txt @@ -396,307 +396,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "myvar1", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 1, - "program": "package_module_1.ets" - }, - "end": { - "line": 19, - "column": 7, - "program": "package_module_1.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "myvar3", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 10, - "program": "package_module_1.ets" - }, - "end": { - "line": 19, - "column": 16, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 1, - "program": "package_module_1.ets" - }, - "end": { - "line": 19, - "column": 16, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 1, - "program": "package_module_1.ets" - }, - "end": { - "line": 19, - "column": 17, - "program": "package_module_1.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "myvar2", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "package_module_1.ets" - }, - "end": { - "line": 20, - "column": 11, - "program": "package_module_1.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 42, - "loc": { - "start": { - "line": 20, - "column": 22, - "program": "package_module_1.ets" - }, - "end": { - "line": 20, - "column": 24, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "package_module_1.ets" - }, - "end": { - "line": 20, - "column": 24, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "package_module_1.ets" - }, - "end": { - "line": 20, - "column": 24, - "program": "package_module_1.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "myvar3", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 25, - "program": "package_module_2.ets" - }, - "end": { - "line": 20, - "column": 25, - "program": "package_module_2.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "myvar2", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 25, - "program": "package_module_2.ets" - }, - "end": { - "line": 20, - "column": 25, - "program": "package_module_2.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 25, - "program": "package_module_2.ets" - }, - "end": { - "line": 20, - "column": 25, - "program": "package_module_2.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 25, - "program": "package_module_2.ets" - }, - "end": { - "line": 20, - "column": 25, - "program": "package_module_2.ets" - } - } - } - ], - "loc": { - "start": { - "line": 19, - "column": 1, - "program": "package_module_2.ets" - }, - "end": { - "line": 20, - "column": 25, - "program": "package_module_2.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 1, - "program": "package_module_2.ets" - }, - "end": { - "line": 20, - "column": 25, - "program": "package_module_2.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 1, - "program": "package_module_2.ets" - }, - "end": { - "line": 20, - "column": 25, - "program": "package_module_2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 1, - "program": "package_module_2.ets" - }, - "end": { - "line": 20, - "column": 25, - "program": "package_module_2.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -866,7 +565,7 @@ }, "end": { "line": 20, - "column": 24, + "column": 22, "program": "package_module_1.ets" } } diff --git a/ets2panda/test/compiler/ets/implicit_package_import/package_test_1/package_module_2-expected.txt b/ets2panda/test/compiler/ets/implicit_package_import/package_test_1/package_module_2-expected.txt index d15a9fd865c3a8a8b2906c8415d5576c258f5514..a7ad8a5f720dc2ca670db9f678c208957e6eea25 100644 --- a/ets2panda/test/compiler/ets/implicit_package_import/package_test_1/package_module_2-expected.txt +++ b/ets2panda/test/compiler/ets/implicit_package_import/package_test_1/package_module_2-expected.txt @@ -396,307 +396,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "myvar3", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 1, - "program": "package_module_2.ets" - }, - "end": { - "line": 20, - "column": 7, - "program": "package_module_2.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "myvar2", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 10, - "program": "package_module_2.ets" - }, - "end": { - "line": 20, - "column": 16, - "program": "package_module_2.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 1, - "program": "package_module_2.ets" - }, - "end": { - "line": 20, - "column": 16, - "program": "package_module_2.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 1, - "program": "package_module_2.ets" - }, - "end": { - "line": 20, - "column": 17, - "program": "package_module_2.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "myvar1", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 20, - "program": "package_module_1.ets" - }, - "end": { - "line": 19, - "column": 20, - "program": "package_module_1.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "myvar3", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 20, - "program": "package_module_1.ets" - }, - "end": { - "line": 19, - "column": 20, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 20, - "program": "package_module_1.ets" - }, - "end": { - "line": 19, - "column": 20, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 20, - "program": "package_module_1.ets" - }, - "end": { - "line": 19, - "column": 20, - "program": "package_module_1.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "myvar2", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 17, - "program": "package_module_1.ets" - }, - "end": { - "line": 20, - "column": 17, - "program": "package_module_1.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 42, - "loc": { - "start": { - "line": 20, - "column": 17, - "program": "package_module_1.ets" - }, - "end": { - "line": 20, - "column": 17, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 17, - "program": "package_module_1.ets" - }, - "end": { - "line": 20, - "column": 17, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 17, - "program": "package_module_1.ets" - }, - "end": { - "line": 20, - "column": 17, - "program": "package_module_1.ets" - } - } - } - ], - "loc": { - "start": { - "line": 19, - "column": 20, - "program": "package_module_2.ets" - }, - "end": { - "line": 20, - "column": 17, - "program": "package_module_2.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 20, - "program": "package_module_2.ets" - }, - "end": { - "line": 20, - "column": 17, - "program": "package_module_2.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 20, - "program": "package_module_2.ets" - }, - "end": { - "line": 20, - "column": 17, - "program": "package_module_2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 20, - "program": "package_module_2.ets" - }, - "end": { - "line": 20, - "column": 17, - "program": "package_module_2.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/compiler/ets/implicit_package_import/package_test_1/separate_module_1-expected.txt b/ets2panda/test/compiler/ets/implicit_package_import/package_test_1/separate_module_1-expected.txt index 63ecb4ba5647644d986d805cff59dd9ba1f3f928..bffe60f94b594e2d78147f7833d2cee57bc4ecd8 100644 --- a/ets2panda/test/compiler/ets/implicit_package_import/package_test_1/separate_module_1-expected.txt +++ b/ets2panda/test/compiler/ets/implicit_package_import/package_test_1/separate_module_1-expected.txt @@ -130,177 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "myexported", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "separate_module_1.ets" - }, - "end": { - "line": 16, - "column": 22, - "program": "separate_module_1.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 8, - "loc": { - "start": { - "line": 16, - "column": 33, - "program": "separate_module_1.ets" - }, - "end": { - "line": 16, - "column": 34, - "program": "separate_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "separate_module_1.ets" - }, - "end": { - "line": 16, - "column": 34, - "program": "separate_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "separate_module_1.ets" - }, - "end": { - "line": 16, - "column": 34, - "program": "separate_module_1.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "separate_module_1.ets" - }, - "end": { - "line": 16, - "column": 34, - "program": "separate_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "separate_module_1.ets" - }, - "end": { - "line": 16, - "column": 34, - "program": "separate_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "separate_module_1.ets" - }, - "end": { - "line": 16, - "column": 34, - "program": "separate_module_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "separate_module_1.ets" - }, - "end": { - "line": 16, - "column": 34, - "program": "separate_module_1.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -383,7 +212,7 @@ }, "end": { "line": 16, - "column": 34, + "column": 33, "program": "separate_module_1.ets" } } diff --git a/ets2panda/test/compiler/ets/implicit_package_import/package_test_2/subpackage_1/package_module_1-expected.txt b/ets2panda/test/compiler/ets/implicit_package_import/package_test_2/subpackage_1/package_module_1-expected.txt index 054fe4733be5c29a7169ade4bf924652ae797d4d..92ab08d6945d6031fbd291293745040227275874 100644 --- a/ets2panda/test/compiler/ets/implicit_package_import/package_test_2/subpackage_1/package_module_1-expected.txt +++ b/ets2panda/test/compiler/ets/implicit_package_import/package_test_2/subpackage_1/package_module_1-expected.txt @@ -441,112 +441,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "package_module_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "package_module_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "package_module_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "package_module_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "package_module_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "package_module_1.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/implicit_package_import/package_test_2/subpackage_1/package_module_2-expected.txt b/ets2panda/test/compiler/ets/implicit_package_import/package_test_2/subpackage_1/package_module_2-expected.txt index 21cb115e1c9e965637632dae44bc6b55f02ba218..09778cdeb351e65b1743e5ca8af66650aeaa538a 100644 --- a/ets2panda/test/compiler/ets/implicit_package_import/package_test_2/subpackage_1/package_module_2-expected.txt +++ b/ets2panda/test/compiler/ets/implicit_package_import/package_test_2/subpackage_1/package_module_2-expected.txt @@ -441,112 +441,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "package_module_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "package_module_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "package_module_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "package_module_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "package_module_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "package_module_2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "package_module_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "package_module_2.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/compiler/ets/implicit_package_import/package_test_2/subpackage_2/separate_module_1-expected.txt b/ets2panda/test/compiler/ets/implicit_package_import/package_test_2/subpackage_2/separate_module_1-expected.txt index 19601ac067ea14cc30cde5f721af0ab0a05ff46a..6dff739e0b0cb59da918cc20cb7aa928610641a4 100644 --- a/ets2panda/test/compiler/ets/implicit_package_import/package_test_2/subpackage_2/separate_module_1-expected.txt +++ b/ets2panda/test/compiler/ets/implicit_package_import/package_test_2/subpackage_2/separate_module_1-expected.txt @@ -130,177 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "myvar", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "separate_module_1.ets" - }, - "end": { - "line": 16, - "column": 17, - "program": "separate_module_1.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 4, - "loc": { - "start": { - "line": 16, - "column": 28, - "program": "separate_module_1.ets" - }, - "end": { - "line": 16, - "column": 29, - "program": "separate_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "separate_module_1.ets" - }, - "end": { - "line": 16, - "column": 29, - "program": "separate_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "separate_module_1.ets" - }, - "end": { - "line": 16, - "column": 29, - "program": "separate_module_1.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "separate_module_1.ets" - }, - "end": { - "line": 16, - "column": 29, - "program": "separate_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "separate_module_1.ets" - }, - "end": { - "line": 16, - "column": 29, - "program": "separate_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "separate_module_1.ets" - }, - "end": { - "line": 16, - "column": 29, - "program": "separate_module_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "separate_module_1.ets" - }, - "end": { - "line": 16, - "column": 29, - "program": "separate_module_1.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -383,7 +212,7 @@ }, "end": { "line": 16, - "column": 29, + "column": 28, "program": "separate_module_1.ets" } } diff --git a/ets2panda/test/compiler/ets/import_tests/asyncfun_lambda_lib-expected.txt b/ets2panda/test/compiler/ets/import_tests/asyncfun_lambda_lib-expected.txt index 1848e77fcc9e4f2f5cb2b19d182de027fd506c75..0a7af15a3c916dfcd680b97976a39435f8e20e96 100644 --- a/ets2panda/test/compiler/ets/import_tests/asyncfun_lambda_lib-expected.txt +++ b/ets2panda/test/compiler/ets/import_tests/asyncfun_lambda_lib-expected.txt @@ -1554,112 +1554,6 @@ "program": "asyncfun_lambda_lib.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "asyncfun_lambda_lib.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "asyncfun_lambda_lib.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "asyncfun_lambda_lib.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "asyncfun_lambda_lib.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "asyncfun_lambda_lib.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "asyncfun_lambda_lib.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "asyncfun_lambda_lib.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "asyncfun_lambda_lib.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/import_tests/asyncfunc_lambda_main-expected.txt b/ets2panda/test/compiler/ets/import_tests/asyncfunc_lambda_main-expected.txt index 9ae6ae1cfbe9ba1e3f22a745204faa0639addde7..7e48b3ecc3ecdad1089f2e486a831975a2c5103f 100644 --- a/ets2panda/test/compiler/ets/import_tests/asyncfunc_lambda_main-expected.txt +++ b/ets2panda/test/compiler/ets/import_tests/asyncfunc_lambda_main-expected.txt @@ -352,112 +352,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "asyncfunc_lambda_main.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "asyncfunc_lambda_main.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "asyncfunc_lambda_main.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "asyncfunc_lambda_main.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "asyncfunc_lambda_main.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "asyncfunc_lambda_main.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "asyncfunc_lambda_main.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "asyncfunc_lambda_main.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/import_tests/enum_export-expected.txt b/ets2panda/test/compiler/ets/import_tests/enum_export-expected.txt index 187f6198c00316aa9623dad6f4e0313e3be71f98..e0e550426ceaf4ddba7217bb7cd0927d4dc4ca42 100644 --- a/ets2panda/test/compiler/ets/import_tests/enum_export-expected.txt +++ b/ets2panda/test/compiler/ets/import_tests/enum_export-expected.txt @@ -12802,112 +12802,6 @@ "program": "enum_export.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "enum_export.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "enum_export.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "enum_export.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "enum_export.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "enum_export.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "enum_export.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "enum_export.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "enum_export.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/import_tests/enum_import-expected.txt b/ets2panda/test/compiler/ets/import_tests/enum_import-expected.txt index 6c36670b03e8169dba16afd14b3383dbe371cada..15d9210d7b559b0d721d45a48a5986e94d32083b 100644 --- a/ets2panda/test/compiler/ets/import_tests/enum_import-expected.txt +++ b/ets2panda/test/compiler/ets/import_tests/enum_import-expected.txt @@ -204,112 +204,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "enum_import.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "enum_import.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "enum_import.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "enum_import.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "enum_import.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "enum_import.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "enum_import.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "enum_import.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/import_tests/export_class_with_getters_setters-expected.txt b/ets2panda/test/compiler/ets/import_tests/export_class_with_getters_setters-expected.txt index f6b1ac06ee1cba8696632f722d70dd9107a62265..7f81f8936218db3cb545f2fceadf1db0d8c7e366 100644 --- a/ets2panda/test/compiler/ets/import_tests/export_class_with_getters_setters-expected.txt +++ b/ets2panda/test/compiler/ets/import_tests/export_class_with_getters_setters-expected.txt @@ -1010,112 +1010,6 @@ "program": "export_class_with_getters_setters.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "export_class_with_getters_setters.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "export_class_with_getters_setters.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "export_class_with_getters_setters.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "export_class_with_getters_setters.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "export_class_with_getters_setters.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "export_class_with_getters_setters.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "export_class_with_getters_setters.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "export_class_with_getters_setters.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/import_tests/generic_typealias_func_type-expected.txt b/ets2panda/test/compiler/ets/import_tests/generic_typealias_func_type-expected.txt index 777a955287d4094a12e3aca13fb6433d21bd18d5..6f4d45d3b713b8e253fed9aff6440268625759c2 100644 --- a/ets2panda/test/compiler/ets/import_tests/generic_typealias_func_type-expected.txt +++ b/ets2panda/test/compiler/ets/import_tests/generic_typealias_func_type-expected.txt @@ -106,112 +106,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_typealias_func_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_typealias_func_type.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_typealias_func_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_typealias_func_type.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_typealias_func_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_typealias_func_type.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_typealias_func_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_typealias_func_type.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/import_tests/generic_typealias_func_type_lib-expected.txt b/ets2panda/test/compiler/ets/import_tests/generic_typealias_func_type_lib-expected.txt index d701d4946ba15f17a39fa8bfbd318bd682f1eb00..37b88ef9926efdd04e8ea13534259770ef18b17e 100644 --- a/ets2panda/test/compiler/ets/import_tests/generic_typealias_func_type_lib-expected.txt +++ b/ets2panda/test/compiler/ets/import_tests/generic_typealias_func_type_lib-expected.txt @@ -386,112 +386,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_typealias_func_type_lib.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_typealias_func_type_lib.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_typealias_func_type_lib.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_typealias_func_type_lib.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_typealias_func_type_lib.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_typealias_func_type_lib.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_typealias_func_type_lib.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_typealias_func_type_lib.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/import_tests/import_class_with_getters_setters-expected.txt b/ets2panda/test/compiler/ets/import_tests/import_class_with_getters_setters-expected.txt index 04ebd0a98abde79551fbd2382401fbf7838ac722..638ba5b3e696eacd6c28e772827bc94e427368f8 100644 --- a/ets2panda/test/compiler/ets/import_tests/import_class_with_getters_setters-expected.txt +++ b/ets2panda/test/compiler/ets/import_tests/import_class_with_getters_setters-expected.txt @@ -155,112 +155,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_class_with_getters_setters.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_class_with_getters_setters.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_class_with_getters_setters.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_class_with_getters_setters.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_class_with_getters_setters.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_class_with_getters_setters.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_class_with_getters_setters.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_class_with_getters_setters.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/import_tests/infer_imported_function_return_type-expected.txt b/ets2panda/test/compiler/ets/import_tests/infer_imported_function_return_type-expected.txt index 123d6ef92b92631e98147689930b4443fb329d8b..b061a6d2c8139dd7d755eee71404799e6fa08d03 100644 --- a/ets2panda/test/compiler/ets/import_tests/infer_imported_function_return_type-expected.txt +++ b/ets2panda/test/compiler/ets/import_tests/infer_imported_function_return_type-expected.txt @@ -106,112 +106,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "infer_imported_function_return_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "infer_imported_function_return_type.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "infer_imported_function_return_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "infer_imported_function_return_type.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "infer_imported_function_return_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "infer_imported_function_return_type.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "infer_imported_function_return_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "infer_imported_function_return_type.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/import_tests/infer_imported_function_return_type_lib-expected.txt b/ets2panda/test/compiler/ets/import_tests/infer_imported_function_return_type_lib-expected.txt index b12761b7bd097eb2b5fadc463428a929f8230cc0..4bbf5ee9ffda7a5e31dffaf9f0b7a675016a283e 100644 --- a/ets2panda/test/compiler/ets/import_tests/infer_imported_function_return_type_lib-expected.txt +++ b/ets2panda/test/compiler/ets/import_tests/infer_imported_function_return_type_lib-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "infer_imported_function_return_type_lib.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "infer_imported_function_return_type_lib.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "infer_imported_function_return_type_lib.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "infer_imported_function_return_type_lib.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "infer_imported_function_return_type_lib.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "infer_imported_function_return_type_lib.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "infer_imported_function_return_type_lib.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "infer_imported_function_return_type_lib.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/import_tests/re-export_with_alias/export-expected.txt b/ets2panda/test/compiler/ets/import_tests/re-export_with_alias/export-expected.txt index f057022919715ce7420de0b9c218226ac13814ee..439d217bd4859b8bb5c9fd98eaa9f7ba40a4c7a0 100644 --- a/ets2panda/test/compiler/ets/import_tests/re-export_with_alias/export-expected.txt +++ b/ets2panda/test/compiler/ets/import_tests/re-export_with_alias/export-expected.txt @@ -507,177 +507,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "test_var", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "export.ets" - }, - "end": { - "line": 16, - "column": 20, - "program": "export.ets" - } - } - }, - "right": { - "type": "StringLiteral", - "value": "Hello_world", - "loc": { - "start": { - "line": 16, - "column": 31, - "program": "export.ets" - }, - "end": { - "line": 16, - "column": 44, - "program": "export.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "export.ets" - }, - "end": { - "line": 16, - "column": 44, - "program": "export.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "export.ets" - }, - "end": { - "line": 16, - "column": 44, - "program": "export.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "export.ets" - }, - "end": { - "line": 16, - "column": 44, - "program": "export.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "export.ets" - }, - "end": { - "line": 16, - "column": 44, - "program": "export.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "export.ets" - }, - "end": { - "line": 16, - "column": 44, - "program": "export.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "export.ets" - }, - "end": { - "line": 16, - "column": 44, - "program": "export.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -760,7 +589,7 @@ }, "end": { "line": 16, - "column": 44, + "column": 31, "program": "export.ets" } } diff --git a/ets2panda/test/compiler/ets/import_tests/re-export_with_alias/import_aliased_re-export-expected.txt b/ets2panda/test/compiler/ets/import_tests/re-export_with_alias/import_aliased_re-export-expected.txt index ca23088a88f9b7a08747d92e9540c3a124da13c8..08d906f7775861cd45618dbea938eb78333cf820 100644 --- a/ets2panda/test/compiler/ets/import_tests/re-export_with_alias/import_aliased_re-export-expected.txt +++ b/ets2panda/test/compiler/ets/import_tests/re-export_with_alias/import_aliased_re-export-expected.txt @@ -237,112 +237,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_aliased_re-export.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_aliased_re-export.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_aliased_re-export.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_aliased_re-export.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_aliased_re-export.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_aliased_re-export.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_aliased_re-export.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_aliased_re-export.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/import_tests/re-export_with_alias/re-export_with_alias-expected.txt b/ets2panda/test/compiler/ets/import_tests/re-export_with_alias/re-export_with_alias-expected.txt index 5e5ce9fc22d49b54c76168e16664d4f18c94f806..5fecf1f283226c736ce6ce72ca7c237bbab5a79e 100644 --- a/ets2panda/test/compiler/ets/import_tests/re-export_with_alias/re-export_with_alias-expected.txt +++ b/ets2panda/test/compiler/ets/import_tests/re-export_with_alias/re-export_with_alias-expected.txt @@ -372,112 +372,6 @@ "program": "re-export_with_alias.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re-export_with_alias.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re-export_with_alias.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re-export_with_alias.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re-export_with_alias.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re-export_with_alias.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re-export_with_alias.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re-export_with_alias.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re-export_with_alias.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/import_tests/selective_export_tests/import_interface-expected.txt b/ets2panda/test/compiler/ets/import_tests/selective_export_tests/import_interface-expected.txt index 916c83e08dc578125217bdfe6f7769261053accb..0c7414a3ce6007d265fea2938d03e6b624014e3a 100644 --- a/ets2panda/test/compiler/ets/import_tests/selective_export_tests/import_interface-expected.txt +++ b/ets2panda/test/compiler/ets/import_tests/selective_export_tests/import_interface-expected.txt @@ -696,112 +696,6 @@ "program": "import_interface.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_interface.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_interface.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_interface.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_interface.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_interface.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_interface.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_interface.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_interface.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/import_tests/selective_export_tests/import_selective_exported-expected.txt b/ets2panda/test/compiler/ets/import_tests/selective_export_tests/import_selective_exported-expected.txt index ce1c79c1a8e67ab606d70be658e6ba35fe0f62e8..0b388f0b2d9649a158f7d96de4f3aa229e1079a1 100644 --- a/ets2panda/test/compiler/ets/import_tests/selective_export_tests/import_selective_exported-expected.txt +++ b/ets2panda/test/compiler/ets/import_tests/selective_export_tests/import_selective_exported-expected.txt @@ -171,112 +171,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_selective_exported.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_selective_exported.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_selective_exported.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_selective_exported.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_selective_exported.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_selective_exported.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_selective_exported.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_selective_exported.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_export-expected.txt b/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_export-expected.txt index c736677ef8c3750adb6cacd083a91dbe3bb3b01f..ff38ea91f2d7f2e94ef77f99251dde5f346ff1dd 100644 --- a/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_export-expected.txt +++ b/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_export-expected.txt @@ -918,241 +918,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "msg", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "selective_export.ets" - }, - "end": { - "line": 19, - "column": 8, - "program": "selective_export.ets" - } - } - }, - "right": { - "type": "StringLiteral", - "value": "hello", - "loc": { - "start": { - "line": 19, - "column": 11, - "program": "selective_export.ets" - }, - "end": { - "line": 19, - "column": 18, - "program": "selective_export.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "selective_export.ets" - }, - "end": { - "line": 19, - "column": 18, - "program": "selective_export.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "selective_export.ets" - }, - "end": { - "line": 19, - "column": 18, - "program": "selective_export.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "aliasedMsg", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "selective_export.ets" - }, - "end": { - "line": 20, - "column": 15, - "program": "selective_export.ets" - } - } - }, - "right": { - "type": "StringLiteral", - "value": "goodbye", - "loc": { - "start": { - "line": 20, - "column": 18, - "program": "selective_export.ets" - }, - "end": { - "line": 20, - "column": 27, - "program": "selective_export.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "selective_export.ets" - }, - "end": { - "line": 20, - "column": 27, - "program": "selective_export.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "selective_export.ets" - }, - "end": { - "line": 20, - "column": 27, - "program": "selective_export.ets" - } - } - } - ], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "selective_export.ets" - }, - "end": { - "line": 20, - "column": 27, - "program": "selective_export.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "selective_export.ets" - }, - "end": { - "line": 20, - "column": 27, - "program": "selective_export.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "selective_export.ets" - }, - "end": { - "line": 20, - "column": 27, - "program": "selective_export.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "selective_export.ets" - }, - "end": { - "line": 20, - "column": 27, - "program": "selective_export.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_export_function-expected.txt b/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_export_function-expected.txt index 3d742e0bd529d36c81c3616a0543cf5268945ff4..da109613169617cbf7f078efa7c7a1c2b2d524cb 100644 --- a/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_export_function-expected.txt +++ b/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_export_function-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "selective_export_function.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "selective_export_function.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "selective_export_function.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "selective_export_function.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "selective_export_function.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "selective_export_function.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "selective_export_function.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "selective_export_function.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_export_interface-expected.txt b/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_export_interface-expected.txt index ebc273ec89ffa57d0a28d82bbc51454a99530acd..e76ea24ff076c1bd1c9ba63aeeb464297eac4cfd 100644 --- a/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_export_interface-expected.txt +++ b/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_export_interface-expected.txt @@ -227,112 +227,6 @@ "program": "selective_export_interface.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "selective_export_interface.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "selective_export_interface.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "selective_export_interface.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "selective_export_interface.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "selective_export_interface.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "selective_export_interface.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "selective_export_interface.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "selective_export_interface.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_export_with_alias-expected.txt b/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_export_with_alias-expected.txt index f00f4668bcc22eb1d465a31beb79259774367182..e97fbf30575236080552e45c3b4812f1c1576a28 100644 --- a/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_export_with_alias-expected.txt +++ b/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_export_with_alias-expected.txt @@ -130,177 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "msg", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "selective_export_with_alias.ets" - }, - "end": { - "line": 18, - "column": 8, - "program": "selective_export_with_alias.ets" - } - } - }, - "right": { - "type": "StringLiteral", - "value": "hello", - "loc": { - "start": { - "line": 18, - "column": 11, - "program": "selective_export_with_alias.ets" - }, - "end": { - "line": 18, - "column": 18, - "program": "selective_export_with_alias.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "selective_export_with_alias.ets" - }, - "end": { - "line": 18, - "column": 18, - "program": "selective_export_with_alias.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "selective_export_with_alias.ets" - }, - "end": { - "line": 18, - "column": 18, - "program": "selective_export_with_alias.ets" - } - } - } - ], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "selective_export_with_alias.ets" - }, - "end": { - "line": 18, - "column": 18, - "program": "selective_export_with_alias.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "selective_export_with_alias.ets" - }, - "end": { - "line": 18, - "column": 18, - "program": "selective_export_with_alias.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "selective_export_with_alias.ets" - }, - "end": { - "line": 18, - "column": 18, - "program": "selective_export_with_alias.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "selective_export_with_alias.ets" - }, - "end": { - "line": 18, - "column": 18, - "program": "selective_export_with_alias.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_import_with_alias_1-expected.txt b/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_import_with_alias_1-expected.txt index 98d04ba6e3028cc23328ea18ad1a95a11dd2ed28..10867c9fa4702d0c284b6fbd0ed673ecc76f948c 100644 --- a/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_import_with_alias_1-expected.txt +++ b/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_import_with_alias_1-expected.txt @@ -429,112 +429,6 @@ "program": "selective_import_with_alias_1.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "selective_import_with_alias_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "selective_import_with_alias_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "selective_import_with_alias_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "selective_import_with_alias_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "selective_import_with_alias_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "selective_import_with_alias_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "selective_import_with_alias_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "selective_import_with_alias_1.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_import_with_alias_2-expected.txt b/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_import_with_alias_2-expected.txt index 14afa4bb5f3cf84166bcf627dd9386d7bebf224d..008ecceaa5df87ed2269cbe379c9d2efb80c94eb 100644 --- a/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_import_with_alias_2-expected.txt +++ b/ets2panda/test/compiler/ets/import_tests/selective_export_tests/selective_import_with_alias_2-expected.txt @@ -429,112 +429,6 @@ "program": "selective_import_with_alias_2.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "selective_import_with_alias_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "selective_import_with_alias_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "selective_import_with_alias_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "selective_import_with_alias_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "selective_import_with_alias_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "selective_import_with_alias_2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "selective_import_with_alias_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "selective_import_with_alias_2.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/import_type-expected.txt b/ets2panda/test/compiler/ets/import_type-expected.txt index e0d55b07a97af299aef8c94d8c6aee882713fa2d..cb76b9474bcc75bbc6631b07ad1d0414c1a3f734 100644 --- a/ets2panda/test/compiler/ets/import_type-expected.txt +++ b/ets2panda/test/compiler/ets/import_type-expected.txt @@ -528,446 +528,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "import_type.ets" - }, - "end": { - "line": 18, - "column": 6, - "program": "import_type.ets" - } - } - }, - "right": { - "type": "ETSNewClassInstanceExpression", - "typeReference": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "A", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 13, - "program": "import_type.ets" - }, - "end": { - "line": 18, - "column": 14, - "program": "import_type.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 13, - "program": "import_type.ets" - }, - "end": { - "line": 18, - "column": 14, - "program": "import_type.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 13, - "program": "import_type.ets" - }, - "end": { - "line": 18, - "column": 14, - "program": "import_type.ets" - } - } - }, - "arguments": [], - "loc": { - "start": { - "line": 18, - "column": 9, - "program": "import_type.ets" - }, - "end": { - "line": 18, - "column": 17, - "program": "import_type.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "import_type.ets" - }, - "end": { - "line": 18, - "column": 17, - "program": "import_type.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "import_type.ets" - }, - "end": { - "line": 18, - "column": 17, - "program": "import_type.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "c", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "import_type.ets" - }, - "end": { - "line": 20, - "column": 6, - "program": "import_type.ets" - } - } - }, - "right": { - "type": "ETSNewClassInstanceExpression", - "typeReference": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "C", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 13, - "program": "import_type.ets" - }, - "end": { - "line": 20, - "column": 14, - "program": "import_type.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 13, - "program": "import_type.ets" - }, - "end": { - "line": 20, - "column": 14, - "program": "import_type.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 13, - "program": "import_type.ets" - }, - "end": { - "line": 20, - "column": 14, - "program": "import_type.ets" - } - } - }, - "arguments": [], - "loc": { - "start": { - "line": 20, - "column": 9, - "program": "import_type.ets" - }, - "end": { - "line": 21, - "column": 4, - "program": "import_type.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "import_type.ets" - }, - "end": { - "line": 21, - "column": 4, - "program": "import_type.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "import_type.ets" - }, - "end": { - "line": 21, - "column": 4, - "program": "import_type.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "d", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "import_type.ets" - }, - "end": { - "line": 21, - "column": 6, - "program": "import_type.ets" - } - } - }, - "right": { - "type": "ETSNewClassInstanceExpression", - "typeReference": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "D", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 13, - "program": "import_type.ets" - }, - "end": { - "line": 21, - "column": 14, - "program": "import_type.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 13, - "program": "import_type.ets" - }, - "end": { - "line": 21, - "column": 14, - "program": "import_type.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 13, - "program": "import_type.ets" - }, - "end": { - "line": 21, - "column": 14, - "program": "import_type.ets" - } - } - }, - "arguments": [], - "loc": { - "start": { - "line": 21, - "column": 9, - "program": "import_type.ets" - }, - "end": { - "line": 22, - "column": 1, - "program": "import_type.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "import_type.ets" - }, - "end": { - "line": 22, - "column": 1, - "program": "import_type.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "import_type.ets" - }, - "end": { - "line": 22, - "column": 1, - "program": "import_type.ets" - } - } - } - ], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "import_type.ets" - }, - "end": { - "line": 22, - "column": 1, - "program": "import_type.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "import_type.ets" - }, - "end": { - "line": 22, - "column": 1, - "program": "import_type.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "import_type.ets" - }, - "end": { - "line": 22, - "column": 1, - "program": "import_type.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "import_type.ets" - }, - "end": { - "line": 22, - "column": 1, - "program": "import_type.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/compiler/ets/inferTypeOfArray-expected.txt b/ets2panda/test/compiler/ets/inferTypeOfArray-expected.txt index 84f87a126b659e02cc74a38b8ae2ada0ae5ecf4b..a98c1f0c4fb7c613bde5d91e61ab1f8b81a1db71 100644 --- a/ets2panda/test/compiler/ets/inferTypeOfArray-expected.txt +++ b/ets2panda/test/compiler/ets/inferTypeOfArray-expected.txt @@ -130,1016 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 16, - "column": 6, - "program": "inferTypeOfArray.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 5, - "loc": { - "start": { - "line": 16, - "column": 9, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 16, - "column": 10, - "program": "inferTypeOfArray.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 16, - "column": 10, - "program": "inferTypeOfArray.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 16, - "column": 10, - "program": "inferTypeOfArray.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 17, - "column": 6, - "program": "inferTypeOfArray.ets" - } - } - }, - "right": { - "type": "ArrayExpression", - "elements": [], - "loc": { - "start": { - "line": 17, - "column": 9, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 17, - "column": 11, - "program": "inferTypeOfArray.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 17, - "column": 11, - "program": "inferTypeOfArray.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 17, - "column": 11, - "program": "inferTypeOfArray.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "c", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 18, - "column": 6, - "program": "inferTypeOfArray.ets" - } - } - }, - "right": { - "type": "ArrayExpression", - "elements": [ - { - "type": "StringLiteral", - "value": "a", - "loc": { - "start": { - "line": 18, - "column": 10, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 18, - "column": 13, - "program": "inferTypeOfArray.ets" - } - } - } - ], - "loc": { - "start": { - "line": 18, - "column": 9, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 18, - "column": 14, - "program": "inferTypeOfArray.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 18, - "column": 14, - "program": "inferTypeOfArray.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 18, - "column": 14, - "program": "inferTypeOfArray.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "d", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 19, - "column": 6, - "program": "inferTypeOfArray.ets" - } - } - }, - "right": { - "type": "ArrayExpression", - "elements": [ - { - "type": "NumberLiteral", - "value": 1, - "loc": { - "start": { - "line": 19, - "column": 10, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 19, - "column": 11, - "program": "inferTypeOfArray.ets" - } - } - }, - { - "type": "NumberLiteral", - "value": 2, - "loc": { - "start": { - "line": 19, - "column": 13, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 19, - "column": 14, - "program": "inferTypeOfArray.ets" - } - } - }, - { - "type": "NumberLiteral", - "value": 3, - "loc": { - "start": { - "line": 19, - "column": 16, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 19, - "column": 17, - "program": "inferTypeOfArray.ets" - } - } - } - ], - "loc": { - "start": { - "line": 19, - "column": 9, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 19, - "column": 18, - "program": "inferTypeOfArray.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 19, - "column": 18, - "program": "inferTypeOfArray.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 19, - "column": 18, - "program": "inferTypeOfArray.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "e", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 20, - "column": 6, - "program": "inferTypeOfArray.ets" - } - } - }, - "right": { - "type": "ArrayExpression", - "elements": [ - { - "type": "NumberLiteral", - "value": 1, - "loc": { - "start": { - "line": 20, - "column": 10, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 20, - "column": 11, - "program": "inferTypeOfArray.ets" - } - } - }, - { - "type": "NumberLiteral", - "value": 2.8, - "loc": { - "start": { - "line": 20, - "column": 13, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 20, - "column": 16, - "program": "inferTypeOfArray.ets" - } - } - }, - { - "type": "NumberLiteral", - "value": 3, - "loc": { - "start": { - "line": 20, - "column": 18, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 20, - "column": 19, - "program": "inferTypeOfArray.ets" - } - } - }, - { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 21, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 20, - "column": 22, - "program": "inferTypeOfArray.ets" - } - } - }, - { - "type": "ETSNewClassInstanceExpression", - "typeReference": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "Int", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 28, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 20, - "column": 31, - "program": "inferTypeOfArray.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 28, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 20, - "column": 31, - "program": "inferTypeOfArray.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 28, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 20, - "column": 31, - "program": "inferTypeOfArray.ets" - } - } - }, - "arguments": [], - "loc": { - "start": { - "line": 20, - "column": 24, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 20, - "column": 34, - "program": "inferTypeOfArray.ets" - } - } - } - ], - "loc": { - "start": { - "line": 20, - "column": 9, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 20, - "column": 34, - "program": "inferTypeOfArray.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 20, - "column": 34, - "program": "inferTypeOfArray.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 20, - "column": 34, - "program": "inferTypeOfArray.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "f", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 21, - "column": 6, - "program": "inferTypeOfArray.ets" - } - } - }, - "right": { - "type": "ArrayExpression", - "elements": [], - "loc": { - "start": { - "line": 21, - "column": 9, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 21, - "column": 11, - "program": "inferTypeOfArray.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 21, - "column": 11, - "program": "inferTypeOfArray.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 21, - "column": 11, - "program": "inferTypeOfArray.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "g", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 22, - "column": 6, - "program": "inferTypeOfArray.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": "+", - "left": { - "type": "MemberExpression", - "object": { - "type": "Identifier", - "name": "d", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 9, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 22, - "column": 10, - "program": "inferTypeOfArray.ets" - } - } - }, - "property": { - "type": "NumberLiteral", - "value": 2, - "loc": { - "start": { - "line": 22, - "column": 11, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 22, - "column": 12, - "program": "inferTypeOfArray.ets" - } - } - }, - "computed": true, - "optional": false, - "loc": { - "start": { - "line": 22, - "column": 9, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 22, - "column": 13, - "program": "inferTypeOfArray.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 1.2, - "loc": { - "start": { - "line": 22, - "column": 16, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 22, - "column": 19, - "program": "inferTypeOfArray.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 9, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 22, - "column": 19, - "program": "inferTypeOfArray.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 22, - "column": 19, - "program": "inferTypeOfArray.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 22, - "column": 19, - "program": "inferTypeOfArray.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "MemberExpression", - "object": { - "type": "Identifier", - "name": "f", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 1, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 23, - "column": 2, - "program": "inferTypeOfArray.ets" - } - } - }, - "property": { - "type": "NumberLiteral", - "value": 0, - "loc": { - "start": { - "line": 23, - "column": 3, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 23, - "column": 4, - "program": "inferTypeOfArray.ets" - } - } - }, - "computed": true, - "optional": false, - "loc": { - "start": { - "line": 23, - "column": 1, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 23, - "column": 5, - "program": "inferTypeOfArray.ets" - } - } - }, - "right": { - "type": "StringLiteral", - "value": "1", - "loc": { - "start": { - "line": 23, - "column": 8, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 23, - "column": 11, - "program": "inferTypeOfArray.ets" - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 1, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 23, - "column": 11, - "program": "inferTypeOfArray.ets" - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 1, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 23, - "column": 11, - "program": "inferTypeOfArray.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "MemberExpression", - "object": { - "type": "Identifier", - "name": "f", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 1, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 24, - "column": 2, - "program": "inferTypeOfArray.ets" - } - } - }, - "property": { - "type": "NumberLiteral", - "value": 1, - "loc": { - "start": { - "line": 24, - "column": 3, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 24, - "column": 4, - "program": "inferTypeOfArray.ets" - } - } - }, - "computed": true, - "optional": false, - "loc": { - "start": { - "line": 24, - "column": 1, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 24, - "column": 5, - "program": "inferTypeOfArray.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 1, - "loc": { - "start": { - "line": 24, - "column": 8, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 24, - "column": 9, - "program": "inferTypeOfArray.ets" - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 1, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 24, - "column": 9, - "program": "inferTypeOfArray.ets" - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 1, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 24, - "column": 9, - "program": "inferTypeOfArray.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 24, - "column": 9, - "program": "inferTypeOfArray.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 24, - "column": 9, - "program": "inferTypeOfArray.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 24, - "column": 9, - "program": "inferTypeOfArray.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "inferTypeOfArray.ets" - }, - "end": { - "line": 24, - "column": 9, - "program": "inferTypeOfArray.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/compiler/ets/instanceof_object_long-expected.txt b/ets2panda/test/compiler/ets/instanceof_object_long-expected.txt index 0eb332b3dd46d8953da904f188ec275ba17314e2..71d18cc948aec53d1d82485c7cb413929e983c6d 100644 --- a/ets2panda/test/compiler/ets/instanceof_object_long-expected.txt +++ b/ets2panda/test/compiler/ets/instanceof_object_long-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "instanceof_object_long.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "instanceof_object_long.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "instanceof_object_long.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "instanceof_object_long.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "instanceof_object_long.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "instanceof_object_long.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "instanceof_object_long.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "instanceof_object_long.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/interface_noreturn_type_function-expected.txt b/ets2panda/test/compiler/ets/interface_noreturn_type_function-expected.txt index 64bf23e6ca67c677da8f07eb0a19b0a6ed0b291d..2a97f4eaae70dfc6aea30fc48abc2a81a9237b49 100644 --- a/ets2panda/test/compiler/ets/interface_noreturn_type_function-expected.txt +++ b/ets2panda/test/compiler/ets/interface_noreturn_type_function-expected.txt @@ -430,112 +430,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "interface_noreturn_type_function.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "interface_noreturn_type_function.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "interface_noreturn_type_function.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "interface_noreturn_type_function.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "interface_noreturn_type_function.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "interface_noreturn_type_function.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "interface_noreturn_type_function.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "interface_noreturn_type_function.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/invalidCallInstruction-expected.txt b/ets2panda/test/compiler/ets/invalidCallInstruction-expected.txt index c182fe13322f03774c8a61227e71be56c5d49507..91d5ba9b92afc551e856511865ee969b2cd1fb0d 100644 --- a/ets2panda/test/compiler/ets/invalidCallInstruction-expected.txt +++ b/ets2panda/test/compiler/ets/invalidCallInstruction-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "invalidCallInstruction.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "invalidCallInstruction.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "invalidCallInstruction.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "invalidCallInstruction.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "invalidCallInstruction.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "invalidCallInstruction.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "invalidCallInstruction.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "invalidCallInstruction.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/invalidInheritance3-expected.txt b/ets2panda/test/compiler/ets/invalidInheritance3-expected.txt index 9c8b9b2aed8ce9bbe4ea8688df0855fd0c03a2e6..453d2ca808ee6fbbfc6523d86078f55731d3287a 100644 --- a/ets2panda/test/compiler/ets/invalidInheritance3-expected.txt +++ b/ets2panda/test/compiler/ets/invalidInheritance3-expected.txt @@ -885,112 +885,6 @@ "program": "invalidInheritance3.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "invalidInheritance3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "invalidInheritance3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "invalidInheritance3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "invalidInheritance3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "invalidInheritance3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "invalidInheritance3.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "invalidInheritance3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "invalidInheritance3.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/lambdaFunction1-expected.txt b/ets2panda/test/compiler/ets/lambdaFunction1-expected.txt index d69b6613e44e0e37d5fbe2bc252c3c1b16c846eb..564f6ac9c1110dec4c09da9f2be32ddec4ee34e4 100644 --- a/ets2panda/test/compiler/ets/lambdaFunction1-expected.txt +++ b/ets2panda/test/compiler/ets/lambdaFunction1-expected.txt @@ -793,373 +793,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "lambdaFunction1.ets" - }, - "end": { - "line": 16, - "column": 6, - "program": "lambdaFunction1.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 1, - "loc": { - "start": { - "line": 16, - "column": 14, - "program": "lambdaFunction1.ets" - }, - "end": { - "line": 16, - "column": 15, - "program": "lambdaFunction1.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "lambdaFunction1.ets" - }, - "end": { - "line": 16, - "column": 15, - "program": "lambdaFunction1.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "lambdaFunction1.ets" - }, - "end": { - "line": 16, - "column": 15, - "program": "lambdaFunction1.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "lambda1", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "lambdaFunction1.ets" - }, - "end": { - "line": 18, - "column": 12, - "program": "lambdaFunction1.ets" - } - } - }, - "right": { - "type": "ArrowFunctionExpression", - "function": { - "type": "ScriptFunction", - "id": null, - "generator": false, - "async": false, - "expression": false, - "params": [], - "returnType": { - "type": "ETSPrimitiveType", - "loc": { - "start": { - "line": 18, - "column": 30, - "program": "lambdaFunction1.ets" - }, - "end": { - "line": 18, - "column": 33, - "program": "lambdaFunction1.ets" - } - } - }, - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "UpdateExpression", - "operator": "++", - "prefix": false, - "argument": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "lambdaFunction1.ets" - }, - "end": { - "line": 19, - "column": 6, - "program": "lambdaFunction1.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "lambdaFunction1.ets" - }, - "end": { - "line": 19, - "column": 8, - "program": "lambdaFunction1.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "lambdaFunction1.ets" - }, - "end": { - "line": 19, - "column": 9, - "program": "lambdaFunction1.ets" - } - } - }, - { - "type": "ReturnStatement", - "argument": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 12, - "program": "lambdaFunction1.ets" - }, - "end": { - "line": 20, - "column": 13, - "program": "lambdaFunction1.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "lambdaFunction1.ets" - }, - "end": { - "line": 20, - "column": 14, - "program": "lambdaFunction1.ets" - } - } - } - ], - "loc": { - "start": { - "line": 18, - "column": 37, - "program": "lambdaFunction1.ets" - }, - "end": { - "line": 21, - "column": 2, - "program": "lambdaFunction1.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 26, - "program": "lambdaFunction1.ets" - }, - "end": { - "line": 21, - "column": 2, - "program": "lambdaFunction1.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 26, - "program": "lambdaFunction1.ets" - }, - "end": { - "line": 21, - "column": 2, - "program": "lambdaFunction1.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "lambdaFunction1.ets" - }, - "end": { - "line": 21, - "column": 2, - "program": "lambdaFunction1.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "lambdaFunction1.ets" - }, - "end": { - "line": 21, - "column": 2, - "program": "lambdaFunction1.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "lambdaFunction1.ets" - }, - "end": { - "line": 21, - "column": 2, - "program": "lambdaFunction1.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "lambdaFunction1.ets" - }, - "end": { - "line": 21, - "column": 2, - "program": "lambdaFunction1.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "lambdaFunction1.ets" - }, - "end": { - "line": 21, - "column": 2, - "program": "lambdaFunction1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "lambdaFunction1.ets" - }, - "end": { - "line": 21, - "column": 2, - "program": "lambdaFunction1.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -1210,7 +843,7 @@ }, "end": { "line": 16, - "column": 15, + "column": 14, "program": "lambdaFunction1.ets" } } @@ -1280,8 +913,8 @@ "program": "lambdaFunction1.ets" }, "end": { - "line": 21, - "column": 2, + "line": 18, + "column": 26, "program": "lambdaFunction1.ets" } } diff --git a/ets2panda/test/compiler/ets/lambdaFunctionArrayDeclaration-expected.txt b/ets2panda/test/compiler/ets/lambdaFunctionArrayDeclaration-expected.txt index c9c0acc44125c3a98166b3840245c48a43fc0e4d..eaa7501d3978e43c6350774cdfac0a92528a4af4 100644 --- a/ets2panda/test/compiler/ets/lambdaFunctionArrayDeclaration-expected.txt +++ b/ets2panda/test/compiler/ets/lambdaFunctionArrayDeclaration-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambdaFunctionArrayDeclaration.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambdaFunctionArrayDeclaration.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambdaFunctionArrayDeclaration.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambdaFunctionArrayDeclaration.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambdaFunctionArrayDeclaration.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambdaFunctionArrayDeclaration.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambdaFunctionArrayDeclaration.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambdaFunctionArrayDeclaration.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/lambda_capturing-expected.txt b/ets2panda/test/compiler/ets/lambda_capturing-expected.txt index 244dd1303d727ff543805400e25526ccfd2afdab..2f18d85031adeb948d397cb476765796c5dc1a2f 100644 --- a/ets2panda/test/compiler/ets/lambda_capturing-expected.txt +++ b/ets2panda/test/compiler/ets/lambda_capturing-expected.txt @@ -241,112 +241,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_capturing.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_capturing.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_capturing.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_capturing.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_capturing.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_capturing.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_capturing.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_capturing.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_cast_infer_type_narrowing-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_cast_infer_type_narrowing-expected.txt index 65842d8dfeef41e81a7a286e119317a57ea9609b..3de158333ba346a28cbffa09e8d74e6af918a469 100644 --- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_cast_infer_type_narrowing-expected.txt +++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_cast_infer_type_narrowing-expected.txt @@ -662,7 +662,7 @@ }, "end": { "line": 22, - "column": 46, + "column": 62, "program": "lambda_cast_infer_type_narrowing.ets" } } @@ -675,7 +675,7 @@ }, "end": { "line": 22, - "column": 46, + "column": 62, "program": "lambda_cast_infer_type_narrowing.ets" } } @@ -690,7 +690,7 @@ }, "end": { "line": 22, - "column": 46, + "column": 62, "program": "lambda_cast_infer_type_narrowing.ets" } } @@ -1220,112 +1220,6 @@ "program": "lambda_cast_infer_type_narrowing.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_cast_infer_type_narrowing.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_cast_infer_type_narrowing.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_cast_infer_type_narrowing.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_cast_infer_type_narrowing.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_cast_infer_type_narrowing.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_cast_infer_type_narrowing.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_cast_infer_type_narrowing.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_cast_infer_type_narrowing.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_cast_infer_type_void-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_cast_infer_type_void-expected.txt index a8931f6bfd896efdf649cd98f75886d081e72dfe..5bb79ee4b502cd2a928a4a61fb7dbcca0e3155af 100644 --- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_cast_infer_type_void-expected.txt +++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_cast_infer_type_void-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_cast_infer_type_void.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_cast_infer_type_void.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_cast_infer_type_void.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_cast_infer_type_void.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_cast_infer_type_void.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_cast_infer_type_void.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_cast_infer_type_void.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_cast_infer_type_void.ets" - } - } - }, { "type": "MethodDefinition", "key": { @@ -296,7 +190,7 @@ }, "end": { "line": 17, - "column": 21, + "column": 34, "program": "lambda_cast_infer_type_void.ets" } } @@ -309,7 +203,7 @@ }, "end": { "line": 17, - "column": 21, + "column": 34, "program": "lambda_cast_infer_type_void.ets" } } @@ -324,7 +218,7 @@ }, "end": { "line": 17, - "column": 21, + "column": 34, "program": "lambda_cast_infer_type_void.ets" } } diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_cast_infer_type_widening-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_cast_infer_type_widening-expected.txt index cc44cc1b53310a4a643f7d6f0cd46e78369643c4..1a921cfc5ca3572c837ed0af57a18c7c46506e55 100644 --- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_cast_infer_type_widening-expected.txt +++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_cast_infer_type_widening-expected.txt @@ -662,7 +662,7 @@ }, "end": { "line": 22, - "column": 44, + "column": 60, "program": "lambda_cast_infer_type_widening.ets" } } @@ -675,7 +675,7 @@ }, "end": { "line": 22, - "column": 44, + "column": 60, "program": "lambda_cast_infer_type_widening.ets" } } @@ -690,7 +690,7 @@ }, "end": { "line": 22, - "column": 44, + "column": 60, "program": "lambda_cast_infer_type_widening.ets" } } @@ -1220,112 +1220,6 @@ "program": "lambda_cast_infer_type_widening.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_cast_infer_type_widening.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_cast_infer_type_widening.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_cast_infer_type_widening.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_cast_infer_type_widening.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_cast_infer_type_widening.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_cast_infer_type_widening.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_cast_infer_type_widening.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_cast_infer_type_widening.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_cast_type_has_pramas-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_cast_type_has_pramas-expected.txt index 8506f7bb23fd1384f13dd6cf4bb0b66d6c5af611..a8a44600d5a9050f2b2162162f922f4410b66e7f 100644 --- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_cast_type_has_pramas-expected.txt +++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_cast_type_has_pramas-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_cast_type_has_pramas.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_cast_type_has_pramas.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_cast_type_has_pramas.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_cast_type_has_pramas.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_cast_type_has_pramas.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_cast_type_has_pramas.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_cast_type_has_pramas.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_cast_type_has_pramas.ets" - } - } - }, { "type": "MethodDefinition", "key": { @@ -520,7 +414,7 @@ }, "end": { "line": 17, - "column": 38, + "column": 59, "program": "lambda_cast_type_has_pramas.ets" } } @@ -533,7 +427,7 @@ }, "end": { "line": 17, - "column": 38, + "column": 59, "program": "lambda_cast_type_has_pramas.ets" } } @@ -548,7 +442,7 @@ }, "end": { "line": 17, - "column": 38, + "column": 59, "program": "lambda_cast_type_has_pramas.ets" } } diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type-expected.txt index fc933990d6cc23abf9e780f51ce8fda3a6a0d40e..22383d5f18d5a7ce97e3a1185014407ea10c4ac6 100644 --- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type-expected.txt +++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_arrow_expression-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_arrow_expression-expected.txt index b5e0feac30deecfcd716d1d12e235ffbadd392c5..de1f177e6ae3aadf1d8af6e98f33c192c899d6a0 100644 --- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_arrow_expression-expected.txt +++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_arrow_expression-expected.txt @@ -701,112 +701,6 @@ "program": "lambda_infer_type_arrow_expression.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_arrow_expression.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_arrow_expression.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_arrow_expression.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_arrow_expression.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_arrow_expression.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_arrow_expression.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_arrow_expression.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_arrow_expression.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_arrow_expression_literal-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_arrow_expression_literal-expected.txt index 0a368f92970a58b1c001f71decd58325d2404513..c1dc755d39f07a5985826def4eb227849d880f90 100644 --- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_arrow_expression_literal-expected.txt +++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_arrow_expression_literal-expected.txt @@ -654,112 +654,6 @@ "program": "lambda_infer_type_arrow_expression_literal.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_arrow_expression_literal.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_arrow_expression_literal.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_arrow_expression_literal.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_arrow_expression_literal.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_arrow_expression_literal.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_arrow_expression_literal.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_arrow_expression_literal.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_arrow_expression_literal.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_has_return-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_has_return-expected.txt index 68328b0b6e0ca810f07444d78e7e6ebf3628c3f1..c4fcaf3f5a7a67d0e1ccdfafe1a1408812521648 100644 --- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_has_return-expected.txt +++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_has_return-expected.txt @@ -815,112 +815,6 @@ "program": "lambda_infer_type_has_return.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_has_return.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_has_return.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_has_return.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_has_return.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_has_return.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_has_return.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_has_return.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_has_return.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_param2-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_param2-expected.txt index ab66a2e99d0d6a43eecbcc747bdf16fa08707705..417e44087bc77181ba4b082e356c32967c649949 100644 --- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_param2-expected.txt +++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_param2-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_param2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_param2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_param2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_param2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_param2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_param2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_param2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_param2.ets" - } - } - }, { "type": "MethodDefinition", "key": { @@ -371,7 +265,7 @@ }, "end": { "line": 17, - "column": 50, + "column": 59, "program": "lambda_infer_type_param2.ets" } } @@ -411,7 +305,7 @@ }, "end": { "line": 17, - "column": 50, + "column": 59, "program": "lambda_infer_type_param2.ets" } } @@ -424,7 +318,7 @@ }, "end": { "line": 17, - "column": 50, + "column": 59, "program": "lambda_infer_type_param2.ets" } } @@ -437,7 +331,7 @@ }, "end": { "line": 17, - "column": 50, + "column": 59, "program": "lambda_infer_type_param2.ets" } } @@ -452,7 +346,7 @@ }, "end": { "line": 17, - "column": 50, + "column": 59, "program": "lambda_infer_type_param2.ets" } } diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_array-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_array-expected.txt index 962b451faba6d0c8a54559be31df771fce546c9d..6b644a248cdeb38894c2fb9043ee7b4726487331 100644 --- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_array-expected.txt +++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_array-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_array.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_array.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_array.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_array.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_array.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_array.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_array.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_array.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda-expected.txt index 4922fd7dd603851d933617d75d1822227f92d6c1..3965f87f74911fc1c8e333e7bd6ff2f664e591f6 100644 --- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda-expected.txt +++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_lambda.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_lambda.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_lambda.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_lambda.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_lambda.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_lambda.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_lambda.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_lambda.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda1-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda1-expected.txt index 221fc3e1d36ad899e7371c75d7302f9d8cbaadbd..f5942454a4bc9002ea07dd388d9b2a5f3e4c2705 100644 --- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda1-expected.txt +++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda1-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_lambda1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_lambda1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_lambda1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_lambda1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_lambda1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_lambda1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_lambda1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_lambda1.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda_expression-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda_expression-expected.txt index 6aab64e5724760ba08b092509c046fb0b418193e..3dc212d27d94642da2515b590a89b73a249fe591 100644 --- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda_expression-expected.txt +++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda_expression-expected.txt @@ -130,195 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "expected", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 5, - "program": "lambda_infer_type_return_lambda_expression.ets" - }, - "end": { - "line": 23, - "column": 13, - "program": "lambda_infer_type_return_lambda_expression.ets" - } - } - }, - "right": { - "type": "CallExpression", - "callee": { - "type": "Identifier", - "name": "main1", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 35, - "program": "lambda_infer_type_return_lambda_expression.ets" - }, - "end": { - "line": 23, - "column": 40, - "program": "lambda_infer_type_return_lambda_expression.ets" - } - } - }, - "arguments": [], - "optional": false, - "loc": { - "start": { - "line": 23, - "column": 35, - "program": "lambda_infer_type_return_lambda_expression.ets" - }, - "end": { - "line": 23, - "column": 43, - "program": "lambda_infer_type_return_lambda_expression.ets" - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 5, - "program": "lambda_infer_type_return_lambda_expression.ets" - }, - "end": { - "line": 23, - "column": 43, - "program": "lambda_infer_type_return_lambda_expression.ets" - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 5, - "program": "lambda_infer_type_return_lambda_expression.ets" - }, - "end": { - "line": 23, - "column": 43, - "program": "lambda_infer_type_return_lambda_expression.ets" - } - } - } - ], - "loc": { - "start": { - "line": 23, - "column": 5, - "program": "lambda_infer_type_return_lambda_expression.ets" - }, - "end": { - "line": 23, - "column": 43, - "program": "lambda_infer_type_return_lambda_expression.ets" - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 5, - "program": "lambda_infer_type_return_lambda_expression.ets" - }, - "end": { - "line": 23, - "column": 43, - "program": "lambda_infer_type_return_lambda_expression.ets" - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 5, - "program": "lambda_infer_type_return_lambda_expression.ets" - }, - "end": { - "line": 23, - "column": 43, - "program": "lambda_infer_type_return_lambda_expression.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 5, - "program": "lambda_infer_type_return_lambda_expression.ets" - }, - "end": { - "line": 23, - "column": 43, - "program": "lambda_infer_type_return_lambda_expression.ets" - } - } - }, { "type": "MethodDefinition", "key": { @@ -641,7 +452,7 @@ }, "end": { "line": 23, - "column": 43, + "column": 35, "program": "lambda_infer_type_return_lambda_expression.ets" } } diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_literal-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_literal-expected.txt index 3f706b38020be4db9a545ac25a4bd71180f0c0ca..295c206850b5fb85e6ea22aaa36e5516c2e92939 100644 --- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_literal-expected.txt +++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_literal-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_literal.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_literal.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_literal.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_literal.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_literal.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_literal.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_literal.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_literal.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_union-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_union-expected.txt index 687fd2385a9d900885cf1d6916449552b111e564..2cd79ac0b94f12edf1bc40f0e4c561114266d7ea 100644 --- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_union-expected.txt +++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_union-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_union.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_union.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_union.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_union.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_union.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_union.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_union.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_return_union.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_scope-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_scope-expected.txt index 634c55dadecd78497e87c3b0dea4b837bd9a2d05..f26025f7fa12000d2222158a8552674c7a71c1c7 100644 --- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_scope-expected.txt +++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_scope-expected.txt @@ -24,390 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "lambda_infer_type_scope.ets" - }, - "end": { - "line": 16, - "column": 6, - "program": "lambda_infer_type_scope.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 1, - "loc": { - "start": { - "line": 16, - "column": 9, - "program": "lambda_infer_type_scope.ets" - }, - "end": { - "line": 16, - "column": 10, - "program": "lambda_infer_type_scope.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "lambda_infer_type_scope.ets" - }, - "end": { - "line": 16, - "column": 10, - "program": "lambda_infer_type_scope.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "lambda_infer_type_scope.ets" - }, - "end": { - "line": 16, - "column": 10, - "program": "lambda_infer_type_scope.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "f", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "lambda_infer_type_scope.ets" - }, - "end": { - "line": 17, - "column": 6, - "program": "lambda_infer_type_scope.ets" - } - } - }, - "right": { - "type": "ArrowFunctionExpression", - "function": { - "type": "ScriptFunction", - "id": null, - "generator": false, - "async": false, - "expression": true, - "params": [ - { - "type": "ETSParameterExpression", - "name": { - "type": "Identifier", - "name": "p", - "typeAnnotation": { - "type": "ETSPrimitiveType", - "loc": { - "start": { - "line": 17, - "column": 13, - "program": "lambda_infer_type_scope.ets" - }, - "end": { - "line": 17, - "column": 19, - "program": "lambda_infer_type_scope.ets" - } - } - }, - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 10, - "program": "lambda_infer_type_scope.ets" - }, - "end": { - "line": 17, - "column": 19, - "program": "lambda_infer_type_scope.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 10, - "program": "lambda_infer_type_scope.ets" - }, - "end": { - "line": 17, - "column": 19, - "program": "lambda_infer_type_scope.ets" - } - } - } - ], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ReturnStatement", - "argument": { - "type": "BinaryExpression", - "operator": "+", - "left": { - "type": "Identifier", - "name": "b", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 24, - "program": "lambda_infer_type_scope.ets" - }, - "end": { - "line": 17, - "column": 25, - "program": "lambda_infer_type_scope.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "p", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 28, - "program": "lambda_infer_type_scope.ets" - }, - "end": { - "line": 17, - "column": 29, - "program": "lambda_infer_type_scope.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 24, - "program": "lambda_infer_type_scope.ets" - }, - "end": { - "line": 17, - "column": 29, - "program": "lambda_infer_type_scope.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - } - ], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_scope.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_infer_type_scope.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 9, - "program": "lambda_infer_type_scope.ets" - }, - "end": { - "line": 17, - "column": 29, - "program": "lambda_infer_type_scope.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 9, - "program": "lambda_infer_type_scope.ets" - }, - "end": { - "line": 17, - "column": 29, - "program": "lambda_infer_type_scope.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "lambda_infer_type_scope.ets" - }, - "end": { - "line": 17, - "column": 29, - "program": "lambda_infer_type_scope.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "lambda_infer_type_scope.ets" - }, - "end": { - "line": 17, - "column": 29, - "program": "lambda_infer_type_scope.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "lambda_infer_type_scope.ets" - }, - "end": { - "line": 17, - "column": 29, - "program": "lambda_infer_type_scope.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "lambda_infer_type_scope.ets" - }, - "end": { - "line": 17, - "column": 29, - "program": "lambda_infer_type_scope.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "lambda_infer_type_scope.ets" - }, - "end": { - "line": 17, - "column": 29, - "program": "lambda_infer_type_scope.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "lambda_infer_type_scope.ets" - }, - "end": { - "line": 17, - "column": 29, - "program": "lambda_infer_type_scope.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -624,13 +240,13 @@ }, "loc": { "start": { - "line": 1, - "column": 1, + "line": 17, + "column": 9, "program": "lambda_infer_type_scope.ets" }, "end": { - "line": 1, - "column": 1, + "line": 17, + "column": 29, "program": "lambda_infer_type_scope.ets" } } diff --git a/ets2panda/test/compiler/ets/lambda_unresolved_ref_1-expected.txt b/ets2panda/test/compiler/ets/lambda_unresolved_ref_1-expected.txt index 1edc4a6c581b99913de1d43f252cb4c019db6afd..a635638cccaeded5cf94662456c21228c36281f7 100644 --- a/ets2panda/test/compiler/ets/lambda_unresolved_ref_1-expected.txt +++ b/ets2panda/test/compiler/ets/lambda_unresolved_ref_1-expected.txt @@ -742,112 +742,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_unresolved_ref_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_unresolved_ref_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_unresolved_ref_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_unresolved_ref_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_unresolved_ref_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_unresolved_ref_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_unresolved_ref_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_unresolved_ref_1.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/launch_expression-expected.txt b/ets2panda/test/compiler/ets/launch_expression-expected.txt index 481e964e2e640f9e7e7b2974ca263d4602640b98..b3c81110d0db9f27c84f69c9fdd9cbd60ed41321 100644 --- a/ets2panda/test/compiler/ets/launch_expression-expected.txt +++ b/ets2panda/test/compiler/ets/launch_expression-expected.txt @@ -281,431 +281,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "count", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "launch_expression.ets" - }, - "end": { - "line": 18, - "column": 10, - "program": "launch_expression.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 2, - "loc": { - "start": { - "line": 18, - "column": 13, - "program": "launch_expression.ets" - }, - "end": { - "line": 18, - "column": 14, - "program": "launch_expression.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "launch_expression.ets" - }, - "end": { - "line": 18, - "column": 14, - "program": "launch_expression.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "launch_expression.ets" - }, - "end": { - "line": 18, - "column": 14, - "program": "launch_expression.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "n", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "launch_expression.ets" - }, - "end": { - "line": 19, - "column": 6, - "program": "launch_expression.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 9, - "loc": { - "start": { - "line": 19, - "column": 9, - "program": "launch_expression.ets" - }, - "end": { - "line": 19, - "column": 10, - "program": "launch_expression.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "launch_expression.ets" - }, - "end": { - "line": 19, - "column": 10, - "program": "launch_expression.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "launch_expression.ets" - }, - "end": { - "line": 19, - "column": 10, - "program": "launch_expression.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "launch_expression.ets" - }, - "end": { - "line": 20, - "column": 6, - "program": "launch_expression.ets" - } - } - }, - "right": { - "type": "ETSNewArrayInstanceExpression", - "typeReference": { - "type": "ETSPrimitiveType", - "loc": { - "start": { - "line": 20, - "column": 20, - "program": "launch_expression.ets" - }, - "end": { - "line": 20, - "column": 23, - "program": "launch_expression.ets" - } - } - }, - "dimension": { - "type": "Identifier", - "name": "count", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 24, - "program": "launch_expression.ets" - }, - "end": { - "line": 20, - "column": 29, - "program": "launch_expression.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 16, - "program": "launch_expression.ets" - }, - "end": { - "line": 20, - "column": 30, - "program": "launch_expression.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "launch_expression.ets" - }, - "end": { - "line": 20, - "column": 30, - "program": "launch_expression.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "launch_expression.ets" - }, - "end": { - "line": 20, - "column": 30, - "program": "launch_expression.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "v", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "launch_expression.ets" - }, - "end": { - "line": 21, - "column": 6, - "program": "launch_expression.ets" - } - } - }, - "right": { - "type": "ETSNewArrayInstanceExpression", - "typeReference": { - "type": "ETSPrimitiveType", - "loc": { - "start": { - "line": 21, - "column": 20, - "program": "launch_expression.ets" - }, - "end": { - "line": 21, - "column": 23, - "program": "launch_expression.ets" - } - } - }, - "dimension": { - "type": "Identifier", - "name": "count", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 24, - "program": "launch_expression.ets" - }, - "end": { - "line": 21, - "column": 29, - "program": "launch_expression.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 16, - "program": "launch_expression.ets" - }, - "end": { - "line": 21, - "column": 30, - "program": "launch_expression.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "launch_expression.ets" - }, - "end": { - "line": 21, - "column": 30, - "program": "launch_expression.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "launch_expression.ets" - }, - "end": { - "line": 21, - "column": 30, - "program": "launch_expression.ets" - } - } - } - ], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "launch_expression.ets" - }, - "end": { - "line": 21, - "column": 30, - "program": "launch_expression.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "launch_expression.ets" - }, - "end": { - "line": 21, - "column": 30, - "program": "launch_expression.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "launch_expression.ets" - }, - "end": { - "line": 21, - "column": 30, - "program": "launch_expression.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "launch_expression.ets" - }, - "end": { - "line": 21, - "column": 30, - "program": "launch_expression.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -932,7 +507,7 @@ }, "end": { "line": 20, - "column": 30, + "column": 16, "program": "launch_expression.ets" } } @@ -1051,7 +626,7 @@ }, "end": { "line": 21, - "column": 30, + "column": 16, "program": "launch_expression.ets" } } @@ -5384,7 +4959,7 @@ }, "end": { "line": 62, - "column": 24, + "column": 31, "program": "launch_expression.ets" } } diff --git a/ets2panda/test/compiler/ets/loopWithinLambda-expected.txt b/ets2panda/test/compiler/ets/loopWithinLambda-expected.txt index 503cb31471ee5e28a50b0aafaae1ad6abbddd6dc..c23817545d67ded48d995ad219932002a6f0ad86 100644 --- a/ets2panda/test/compiler/ets/loopWithinLambda-expected.txt +++ b/ets2panda/test/compiler/ets/loopWithinLambda-expected.txt @@ -468,112 +468,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "loopWithinLambda.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "loopWithinLambda.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "loopWithinLambda.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "loopWithinLambda.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "loopWithinLambda.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "loopWithinLambda.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "loopWithinLambda.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "loopWithinLambda.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/compiler/ets/lowering-interaction-expected.txt b/ets2panda/test/compiler/ets/lowering-interaction-expected.txt index 887ca3a636d708bd26fd39789e38341c3f447741..91fcc0654d31cd912b3996015c84f454e27e799a 100644 --- a/ets2panda/test/compiler/ets/lowering-interaction-expected.txt +++ b/ets2panda/test/compiler/ets/lowering-interaction-expected.txt @@ -1578,112 +1578,6 @@ "program": "lowering-interaction.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lowering-interaction.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lowering-interaction.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lowering-interaction.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lowering-interaction.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lowering-interaction.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lowering-interaction.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lowering-interaction.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lowering-interaction.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/manyLocalsParamRegUsage-expected.txt b/ets2panda/test/compiler/ets/manyLocalsParamRegUsage-expected.txt index 3323dcf6847ba01f6890e08153bf125b34502bce..ced1eb0ad4c7404bd5ffb0d1a2332538972beecd 100644 --- a/ets2panda/test/compiler/ets/manyLocalsParamRegUsage-expected.txt +++ b/ets2panda/test/compiler/ets/manyLocalsParamRegUsage-expected.txt @@ -35432,112 +35432,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "manyLocalsParamRegUsage.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "manyLocalsParamRegUsage.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "manyLocalsParamRegUsage.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "manyLocalsParamRegUsage.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "manyLocalsParamRegUsage.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "manyLocalsParamRegUsage.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "manyLocalsParamRegUsage.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "manyLocalsParamRegUsage.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/memberExprInLambda-expected.txt b/ets2panda/test/compiler/ets/memberExprInLambda-expected.txt index 1b860e11cafe97d999d2bb8937371a66c35806ef..7de133013e41d9012c0113778c7f162612a2fe2d 100644 --- a/ets2panda/test/compiler/ets/memberExprInLambda-expected.txt +++ b/ets2panda/test/compiler/ets/memberExprInLambda-expected.txt @@ -193,112 +193,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "memberExprInLambda.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "memberExprInLambda.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "memberExprInLambda.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "memberExprInLambda.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "memberExprInLambda.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "memberExprInLambda.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "memberExprInLambda.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "memberExprInLambda.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/memberExpressionFromStaticContext-expected.txt b/ets2panda/test/compiler/ets/memberExpressionFromStaticContext-expected.txt index 293198068d8886d8e65add2826870d5cf677f716..a34ee7077b96f58aaceee5bc3314e5adaa707cae 100644 --- a/ets2panda/test/compiler/ets/memberExpressionFromStaticContext-expected.txt +++ b/ets2panda/test/compiler/ets/memberExpressionFromStaticContext-expected.txt @@ -3111,112 +3111,6 @@ "program": "memberExpressionFromStaticContext.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "memberExpressionFromStaticContext.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "memberExpressionFromStaticContext.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "memberExpressionFromStaticContext.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "memberExpressionFromStaticContext.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "memberExpressionFromStaticContext.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "memberExpressionFromStaticContext.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "memberExpressionFromStaticContext.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "memberExpressionFromStaticContext.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/method-resolution-class-and-interface-in-signatures_5-expected.txt b/ets2panda/test/compiler/ets/method-resolution-class-and-interface-in-signatures_5-expected.txt index a7d0864e6dec5ef9b2b8456d3041f5884bdef6e3..4034b2b2ca4dc1295bd541e320c34a89c6c90a10 100644 --- a/ets2panda/test/compiler/ets/method-resolution-class-and-interface-in-signatures_5-expected.txt +++ b/ets2panda/test/compiler/ets/method-resolution-class-and-interface-in-signatures_5-expected.txt @@ -804,112 +804,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "method-resolution-class-and-interface-in-signatures_5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "method-resolution-class-and-interface-in-signatures_5.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "method-resolution-class-and-interface-in-signatures_5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "method-resolution-class-and-interface-in-signatures_5.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "method-resolution-class-and-interface-in-signatures_5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "method-resolution-class-and-interface-in-signatures_5.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "method-resolution-class-and-interface-in-signatures_5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "method-resolution-class-and-interface-in-signatures_5.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/methodOverrideAsyncMethod-expected.txt b/ets2panda/test/compiler/ets/methodOverrideAsyncMethod-expected.txt index 7c7074103e697bb891f8e49db351f616e355b721..48018f8840c49fbda0026b7db4cc8a8519d13aec 100644 --- a/ets2panda/test/compiler/ets/methodOverrideAsyncMethod-expected.txt +++ b/ets2panda/test/compiler/ets/methodOverrideAsyncMethod-expected.txt @@ -1356,112 +1356,6 @@ "program": "methodOverrideAsyncMethod.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "methodOverrideAsyncMethod.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "methodOverrideAsyncMethod.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "methodOverrideAsyncMethod.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "methodOverrideAsyncMethod.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "methodOverrideAsyncMethod.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "methodOverrideAsyncMethod.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "methodOverrideAsyncMethod.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "methodOverrideAsyncMethod.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/methodOverrideCovariantReturnType-expected.txt b/ets2panda/test/compiler/ets/methodOverrideCovariantReturnType-expected.txt index 588222a15e17e94f5d021113ac3aa1861ac3dca9..c9db956ae41de2585b504a18a53569f4c88624a5 100644 --- a/ets2panda/test/compiler/ets/methodOverrideCovariantReturnType-expected.txt +++ b/ets2panda/test/compiler/ets/methodOverrideCovariantReturnType-expected.txt @@ -2259,112 +2259,6 @@ "program": "methodOverrideCovariantReturnType.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "methodOverrideCovariantReturnType.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "methodOverrideCovariantReturnType.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "methodOverrideCovariantReturnType.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "methodOverrideCovariantReturnType.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "methodOverrideCovariantReturnType.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "methodOverrideCovariantReturnType.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "methodOverrideCovariantReturnType.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "methodOverrideCovariantReturnType.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/methodOverrideDifferentSignature-expected.txt b/ets2panda/test/compiler/ets/methodOverrideDifferentSignature-expected.txt index 541fb88b67bd261d7f8dfcd45db8c895a59a83bb..d5cb6815cbb8ad3721dffefde5c56c64053a7e16 100644 --- a/ets2panda/test/compiler/ets/methodOverrideDifferentSignature-expected.txt +++ b/ets2panda/test/compiler/ets/methodOverrideDifferentSignature-expected.txt @@ -1543,112 +1543,6 @@ "program": "methodOverrideDifferentSignature.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "methodOverrideDifferentSignature.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "methodOverrideDifferentSignature.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "methodOverrideDifferentSignature.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "methodOverrideDifferentSignature.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "methodOverrideDifferentSignature.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "methodOverrideDifferentSignature.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "methodOverrideDifferentSignature.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "methodOverrideDifferentSignature.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/methodOverrideWithoutModifier-expected.txt b/ets2panda/test/compiler/ets/methodOverrideWithoutModifier-expected.txt index b58d8a37be2788b4ea5b3b7d546c4dba43f422a3..ab9dbd45e8d8d746448a5c3c0a87054ecdd971d2 100644 --- a/ets2panda/test/compiler/ets/methodOverrideWithoutModifier-expected.txt +++ b/ets2panda/test/compiler/ets/methodOverrideWithoutModifier-expected.txt @@ -727,112 +727,6 @@ "program": "methodOverrideWithoutModifier.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "methodOverrideWithoutModifier.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "methodOverrideWithoutModifier.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "methodOverrideWithoutModifier.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "methodOverrideWithoutModifier.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "methodOverrideWithoutModifier.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "methodOverrideWithoutModifier.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "methodOverrideWithoutModifier.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "methodOverrideWithoutModifier.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/multipleMethodOverride-expected.txt b/ets2panda/test/compiler/ets/multipleMethodOverride-expected.txt index 031babe6190fb434fa3175b88b3aebbc80e793e0..49514626801914c51299d54d78fa4cf438377283 100644 --- a/ets2panda/test/compiler/ets/multipleMethodOverride-expected.txt +++ b/ets2panda/test/compiler/ets/multipleMethodOverride-expected.txt @@ -1250,112 +1250,6 @@ "program": "multipleMethodOverride.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "multipleMethodOverride.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "multipleMethodOverride.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "multipleMethodOverride.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "multipleMethodOverride.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "multipleMethodOverride.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "multipleMethodOverride.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "multipleMethodOverride.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "multipleMethodOverride.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/n_nullableTypeInArgNotRef-expected.txt b/ets2panda/test/compiler/ets/n_nullableTypeInArgNotRef-expected.txt index 6fe61e5e2f4c2131ad90e23beaad29c43839a0d3..bb27cf1965f4af1c0fe1a8a5cf1e4e74fd65e02b 100644 --- a/ets2panda/test/compiler/ets/n_nullableTypeInArgNotRef-expected.txt +++ b/ets2panda/test/compiler/ets/n_nullableTypeInArgNotRef-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "n_nullableTypeInArgNotRef.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "n_nullableTypeInArgNotRef.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "n_nullableTypeInArgNotRef.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "n_nullableTypeInArgNotRef.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "n_nullableTypeInArgNotRef.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "n_nullableTypeInArgNotRef.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "n_nullableTypeInArgNotRef.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "n_nullableTypeInArgNotRef.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/n_nullableTypeInReturnNotRef-expected.txt b/ets2panda/test/compiler/ets/n_nullableTypeInReturnNotRef-expected.txt index 0dfca43de8be54d0a7d8219b2cd5ff2f72643e89..9e86f6bce023772d9f16f62a72753712af37caab 100644 --- a/ets2panda/test/compiler/ets/n_nullableTypeInReturnNotRef-expected.txt +++ b/ets2panda/test/compiler/ets/n_nullableTypeInReturnNotRef-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "n_nullableTypeInReturnNotRef.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "n_nullableTypeInReturnNotRef.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "n_nullableTypeInReturnNotRef.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "n_nullableTypeInReturnNotRef.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "n_nullableTypeInReturnNotRef.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "n_nullableTypeInReturnNotRef.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "n_nullableTypeInReturnNotRef.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "n_nullableTypeInReturnNotRef.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/n_nullableTypeNotRef-expected.txt b/ets2panda/test/compiler/ets/n_nullableTypeNotRef-expected.txt index dc47fc9969c2bc9af28d89e24de0bfbbeb064ce7..0a7062e865b749164dc5156584b69e6d9b655300 100644 --- a/ets2panda/test/compiler/ets/n_nullableTypeNotRef-expected.txt +++ b/ets2panda/test/compiler/ets/n_nullableTypeNotRef-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "n_nullableTypeNotRef.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "n_nullableTypeNotRef.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "n_nullableTypeNotRef.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "n_nullableTypeNotRef.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "n_nullableTypeNotRef.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "n_nullableTypeNotRef.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "n_nullableTypeNotRef.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "n_nullableTypeNotRef.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/native_toplevel-expected.txt b/ets2panda/test/compiler/ets/native_toplevel-expected.txt index 9c847e756b69fe995607e8ff5d84cabec36801a3..b17b883330c48c6bc4e7b2d436c6a72cf573fb02 100644 --- a/ets2panda/test/compiler/ets/native_toplevel-expected.txt +++ b/ets2panda/test/compiler/ets/native_toplevel-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "native_toplevel.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "native_toplevel.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "native_toplevel.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "native_toplevel.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "native_toplevel.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "native_toplevel.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "native_toplevel.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "native_toplevel.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/non-const-lambda-with-scopes-expected.txt b/ets2panda/test/compiler/ets/non-const-lambda-with-scopes-expected.txt index 640f23ecb7c36b4968362041108366e2fc2ff911..b1582ef4bf8e69869992e0341cd7f1d5cce672f2 100644 --- a/ets2panda/test/compiler/ets/non-const-lambda-with-scopes-expected.txt +++ b/ets2panda/test/compiler/ets/non-const-lambda-with-scopes-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "non-const-lambda-with-scopes.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "non-const-lambda-with-scopes.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "non-const-lambda-with-scopes.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "non-const-lambda-with-scopes.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "non-const-lambda-with-scopes.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "non-const-lambda-with-scopes.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "non-const-lambda-with-scopes.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "non-const-lambda-with-scopes.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/null_coalescing_generic_1-expected.txt b/ets2panda/test/compiler/ets/null_coalescing_generic_1-expected.txt index a353fa605b5ebac89918d732a07a671cc87029b8..dfd59e34253a3f0620052c268b70556b51be1796 100644 --- a/ets2panda/test/compiler/ets/null_coalescing_generic_1-expected.txt +++ b/ets2panda/test/compiler/ets/null_coalescing_generic_1-expected.txt @@ -285,112 +285,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "null_coalescing_generic_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "null_coalescing_generic_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "null_coalescing_generic_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "null_coalescing_generic_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "null_coalescing_generic_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "null_coalescing_generic_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "null_coalescing_generic_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "null_coalescing_generic_1.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/nullableTuple-expected.txt b/ets2panda/test/compiler/ets/nullableTuple-expected.txt index 38ba719834b50c4fd351903397b6d5b3a977226f..869297220a00712103fe94f5975266ed1ec9ee14 100644 --- a/ets2panda/test/compiler/ets/nullableTuple-expected.txt +++ b/ets2panda/test/compiler/ets/nullableTuple-expected.txt @@ -278,112 +278,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "nullableTuple.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "nullableTuple.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "nullableTuple.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "nullableTuple.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "nullableTuple.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "nullableTuple.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "nullableTuple.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "nullableTuple.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/nullable_type_in_arithmeticdiv-expected.txt b/ets2panda/test/compiler/ets/nullable_type_in_arithmeticdiv-expected.txt index b933d7cb695ff8700287a273b317930650257841..fcad973cb99621b64693f2ed276fa1cb24cb1a13 100644 --- a/ets2panda/test/compiler/ets/nullable_type_in_arithmeticdiv-expected.txt +++ b/ets2panda/test/compiler/ets/nullable_type_in_arithmeticdiv-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "nullable_type_in_arithmeticdiv.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "nullable_type_in_arithmeticdiv.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "nullable_type_in_arithmeticdiv.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "nullable_type_in_arithmeticdiv.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "nullable_type_in_arithmeticdiv.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "nullable_type_in_arithmeticdiv.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "nullable_type_in_arithmeticdiv.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "nullable_type_in_arithmeticdiv.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/nullable_type_in_arithmeticplus-expected.txt b/ets2panda/test/compiler/ets/nullable_type_in_arithmeticplus-expected.txt index dc6a8bf4b31848a545261159f714309688428c65..f191482d074e2595287b12676203abaf9135169e 100644 --- a/ets2panda/test/compiler/ets/nullable_type_in_arithmeticplus-expected.txt +++ b/ets2panda/test/compiler/ets/nullable_type_in_arithmeticplus-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "nullable_type_in_arithmeticplus.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "nullable_type_in_arithmeticplus.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "nullable_type_in_arithmeticplus.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "nullable_type_in_arithmeticplus.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "nullable_type_in_arithmeticplus.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "nullable_type_in_arithmeticplus.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "nullable_type_in_arithmeticplus.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "nullable_type_in_arithmeticplus.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/objectLiteralInterface-expected.txt b/ets2panda/test/compiler/ets/objectLiteralInterface-expected.txt index 87538967ebb94041cc45e68021041974c841d63c..24c94d4a94f9e7d8f72f3023a50d6971188038ef 100644 --- a/ets2panda/test/compiler/ets/objectLiteralInterface-expected.txt +++ b/ets2panda/test/compiler/ets/objectLiteralInterface-expected.txt @@ -179,177 +179,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "c", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "objectLiteralInterface.ets" - }, - "end": { - "line": 18, - "column": 6, - "program": "objectLiteralInterface.ets" - } - } - }, - "right": { - "type": "ObjectExpression", - "properties": [], - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "objectLiteralInterface.ets" - }, - "end": { - "line": 18, - "column": 14, - "program": "objectLiteralInterface.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "objectLiteralInterface.ets" - }, - "end": { - "line": 18, - "column": 14, - "program": "objectLiteralInterface.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "objectLiteralInterface.ets" - }, - "end": { - "line": 18, - "column": 14, - "program": "objectLiteralInterface.ets" - } - } - } - ], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "objectLiteralInterface.ets" - }, - "end": { - "line": 18, - "column": 14, - "program": "objectLiteralInterface.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "objectLiteralInterface.ets" - }, - "end": { - "line": 18, - "column": 14, - "program": "objectLiteralInterface.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "objectLiteralInterface.ets" - }, - "end": { - "line": 18, - "column": 14, - "program": "objectLiteralInterface.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "objectLiteralInterface.ets" - }, - "end": { - "line": 18, - "column": 14, - "program": "objectLiteralInterface.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -432,7 +261,7 @@ }, "end": { "line": 18, - "column": 14, + "column": 12, "program": "objectLiteralInterface.ets" } } diff --git a/ets2panda/test/compiler/ets/objectLiteralReadonlyKey-expected.txt b/ets2panda/test/compiler/ets/objectLiteralReadonlyKey-expected.txt index 7542430a1ad19191a625e750e18de14df46b28c3..f3557172a97d82037b1650f64694da1e82a77f39 100644 --- a/ets2panda/test/compiler/ets/objectLiteralReadonlyKey-expected.txt +++ b/ets2panda/test/compiler/ets/objectLiteralReadonlyKey-expected.txt @@ -340,230 +340,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "c", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "objectLiteralReadonlyKey.ets" - }, - "end": { - "line": 20, - "column": 6, - "program": "objectLiteralReadonlyKey.ets" - } - } - }, - "right": { - "type": "ObjectExpression", - "properties": [ - { - "type": "Property", - "method": false, - "shorthand": false, - "computed": false, - "key": { - "type": "Identifier", - "name": "f", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "objectLiteralReadonlyKey.ets" - }, - "end": { - "line": 21, - "column": 6, - "program": "objectLiteralReadonlyKey.ets" - } - } - }, - "value": { - "type": "NumberLiteral", - "value": 44, - "loc": { - "start": { - "line": 21, - "column": 8, - "program": "objectLiteralReadonlyKey.ets" - }, - "end": { - "line": 21, - "column": 10, - "program": "objectLiteralReadonlyKey.ets" - } - } - }, - "kind": "init", - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "objectLiteralReadonlyKey.ets" - }, - "end": { - "line": 21, - "column": 10, - "program": "objectLiteralReadonlyKey.ets" - } - } - } - ], - "loc": { - "start": { - "line": 20, - "column": 12, - "program": "objectLiteralReadonlyKey.ets" - }, - "end": { - "line": 22, - "column": 2, - "program": "objectLiteralReadonlyKey.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "objectLiteralReadonlyKey.ets" - }, - "end": { - "line": 22, - "column": 2, - "program": "objectLiteralReadonlyKey.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "objectLiteralReadonlyKey.ets" - }, - "end": { - "line": 22, - "column": 2, - "program": "objectLiteralReadonlyKey.ets" - } - } - } - ], - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "objectLiteralReadonlyKey.ets" - }, - "end": { - "line": 22, - "column": 2, - "program": "objectLiteralReadonlyKey.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "objectLiteralReadonlyKey.ets" - }, - "end": { - "line": 22, - "column": 2, - "program": "objectLiteralReadonlyKey.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "objectLiteralReadonlyKey.ets" - }, - "end": { - "line": 22, - "column": 2, - "program": "objectLiteralReadonlyKey.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "objectLiteralReadonlyKey.ets" - }, - "end": { - "line": 22, - "column": 2, - "program": "objectLiteralReadonlyKey.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -645,8 +421,8 @@ "program": "objectLiteralReadonlyKey.ets" }, "end": { - "line": 22, - "column": 2, + "line": 20, + "column": 12, "program": "objectLiteralReadonlyKey.ets" } } diff --git a/ets2panda/test/compiler/ets/overload_with_generics-expected.txt b/ets2panda/test/compiler/ets/overload_with_generics-expected.txt index fb6b102173d6fcd93e2781f3aa755bdb7237f538..31f54b5e0e3ef242f7eb48cd2dbab46fd567a3d4 100644 --- a/ets2panda/test/compiler/ets/overload_with_generics-expected.txt +++ b/ets2panda/test/compiler/ets/overload_with_generics-expected.txt @@ -791,112 +791,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "overload_with_generics.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "overload_with_generics.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "overload_with_generics.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "overload_with_generics.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "overload_with_generics.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "overload_with_generics.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "overload_with_generics.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "overload_with_generics.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/override-expected.txt b/ets2panda/test/compiler/ets/override-expected.txt index db5b5f4cf0565c950a5d975c07e537222bc9137f..6f19554d5cf6a256b5af32aafb959e096fc475f3 100644 --- a/ets2panda/test/compiler/ets/override-expected.txt +++ b/ets2panda/test/compiler/ets/override-expected.txt @@ -1902,112 +1902,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/override10-expected.txt b/ets2panda/test/compiler/ets/override10-expected.txt index 8cc473676061a44fe85bb2905025b6f6ffc4ef78..ac7cec0c1365f03138f8b1f7c9c8afea1db36b22 100644 --- a/ets2panda/test/compiler/ets/override10-expected.txt +++ b/ets2panda/test/compiler/ets/override10-expected.txt @@ -1002,112 +1002,6 @@ "program": "override10.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override10.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override10.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override10.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override10.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override10.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override10.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override10.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override10.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/override12-expected.txt b/ets2panda/test/compiler/ets/override12-expected.txt index f141e0adc8ab8029c44df7fd770bdd7358577e47..278f7e224627cf92530c0b27d03220c9bd563e98 100644 --- a/ets2panda/test/compiler/ets/override12-expected.txt +++ b/ets2panda/test/compiler/ets/override12-expected.txt @@ -1713,112 +1713,6 @@ "program": "override12.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override12.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override12.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override12.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override12.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override12.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override12.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override12.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override12.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/override13-expected.txt b/ets2panda/test/compiler/ets/override13-expected.txt index a4559ea260185252a798c0436fd12d643c792a88..d424218fec57f347ff9733cebf9967da82c32cb4 100644 --- a/ets2panda/test/compiler/ets/override13-expected.txt +++ b/ets2panda/test/compiler/ets/override13-expected.txt @@ -1115,112 +1115,6 @@ "program": "override13.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override13.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override13.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override13.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override13.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override13.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override13.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override13.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override13.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/override16-expected.txt b/ets2panda/test/compiler/ets/override16-expected.txt index c99c2661d07ffa5890671c9cfd5ef6f53fc84e0e..60782a89a4e7cbe7301f579d41dc982ef1642676 100644 --- a/ets2panda/test/compiler/ets/override16-expected.txt +++ b/ets2panda/test/compiler/ets/override16-expected.txt @@ -860,112 +860,6 @@ "program": "override16.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override16.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override16.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override16.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override16.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override16.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override16.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override16.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override16.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/override17-expected.txt b/ets2panda/test/compiler/ets/override17-expected.txt index 68146d9252ee4080c9993a671dc086a81e9713f4..e2a83f90c330ae368c6fc92ec73c9bbb0fdeff79 100644 --- a/ets2panda/test/compiler/ets/override17-expected.txt +++ b/ets2panda/test/compiler/ets/override17-expected.txt @@ -860,112 +860,6 @@ "program": "override17.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override17.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override17.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override17.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override17.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override17.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override17.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override17.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override17.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/override2-expected.txt b/ets2panda/test/compiler/ets/override2-expected.txt index 4309080327de9b679d0c500521f1610274aaf3c8..7a47c7b04473109bbcdfeb9ffc4cca90d4e40398 100644 --- a/ets2panda/test/compiler/ets/override2-expected.txt +++ b/ets2panda/test/compiler/ets/override2-expected.txt @@ -856,112 +856,6 @@ "program": "override2.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override2.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/override4-expected.txt b/ets2panda/test/compiler/ets/override4-expected.txt index 15db789e8ef0b13d797a3a628d17295b33349092..fcc82a2c1983199aae0a515fbb6852b484ac0a47 100644 --- a/ets2panda/test/compiler/ets/override4-expected.txt +++ b/ets2panda/test/compiler/ets/override4-expected.txt @@ -904,112 +904,6 @@ "program": "override4.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override4.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override4.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override4.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override4.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/override5-expected.txt b/ets2panda/test/compiler/ets/override5-expected.txt index 5337c65e237d9fe101a3189b1e2cca9302331ea8..87baa1d4fe42362ae98d4e3308db13c1d802e69c 100644 --- a/ets2panda/test/compiler/ets/override5-expected.txt +++ b/ets2panda/test/compiler/ets/override5-expected.txt @@ -791,112 +791,6 @@ "program": "override5.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override5.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override5.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override5.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override5.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/override6-expected.txt b/ets2panda/test/compiler/ets/override6-expected.txt index 701aa38f51e41e9d16e7f83ba7bc937267bd701b..e98a80d66c11c1855405a39b5c5133e0382bf21a 100644 --- a/ets2panda/test/compiler/ets/override6-expected.txt +++ b/ets2panda/test/compiler/ets/override6-expected.txt @@ -767,112 +767,6 @@ "program": "override6.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override6.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override6.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override6.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override6.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/override8-expected.txt b/ets2panda/test/compiler/ets/override8-expected.txt index 3bf33bfedca47a1d132ec67e0ec03da2da4b4b15..f501ff65cb6d9eb88657c224f4f56bf93dc7d1b5 100644 --- a/ets2panda/test/compiler/ets/override8-expected.txt +++ b/ets2panda/test/compiler/ets/override8-expected.txt @@ -718,112 +718,6 @@ "program": "override8.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override8.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override8.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override8.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override8.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/override9-expected.txt b/ets2panda/test/compiler/ets/override9-expected.txt index b2175d8978a3d2b388f438e6a01b506b382dec3f..f84cd0ff4776420cc083f0d30bd18f12a7c48f34 100644 --- a/ets2panda/test/compiler/ets/override9-expected.txt +++ b/ets2panda/test/compiler/ets/override9-expected.txt @@ -830,112 +830,6 @@ "program": "override9.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override9.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override9.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override9.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override9.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override9.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override9.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override9.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override9.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/parenthesizedType-expected.txt b/ets2panda/test/compiler/ets/parenthesizedType-expected.txt index 4f0f58731dc94bcda331b52ab44975097964ffec..6bee5237c312c41ebeed68bdf4b0de4def1fbead 100644 --- a/ets2panda/test/compiler/ets/parenthesizedType-expected.txt +++ b/ets2panda/test/compiler/ets/parenthesizedType-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "parenthesizedType.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "parenthesizedType.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "parenthesizedType.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "parenthesizedType.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "parenthesizedType.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "parenthesizedType.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "parenthesizedType.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "parenthesizedType.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/requiredType_1-expected.txt b/ets2panda/test/compiler/ets/requiredType_1-expected.txt index d0a92fe034abda0da3b713c9907c41c6707c9bbc..001a474540d7adee80d56239b6064c060b08fef6 100644 --- a/ets2panda/test/compiler/ets/requiredType_1-expected.txt +++ b/ets2panda/test/compiler/ets/requiredType_1-expected.txt @@ -314,112 +314,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "requiredType_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "requiredType_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "requiredType_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "requiredType_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "requiredType_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "requiredType_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "requiredType_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "requiredType_1.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/requiredType_11-expected.txt b/ets2panda/test/compiler/ets/requiredType_11-expected.txt index 6fb7973f7db7080ac77e7698955335a9a7e185c6..41093aed503c0cc1b1f64ebca13071da4b3f3f99 100644 --- a/ets2panda/test/compiler/ets/requiredType_11-expected.txt +++ b/ets2panda/test/compiler/ets/requiredType_11-expected.txt @@ -653,112 +653,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "requiredType_11.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "requiredType_11.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "requiredType_11.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "requiredType_11.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "requiredType_11.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "requiredType_11.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "requiredType_11.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "requiredType_11.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/requiredType_4-expected.txt b/ets2panda/test/compiler/ets/requiredType_4-expected.txt index 23aee53c5f21832b822abe723638aa1fc82e769c..4c80cdd9ea3ff7cd3534209a1343cc707f679346 100644 --- a/ets2panda/test/compiler/ets/requiredType_4-expected.txt +++ b/ets2panda/test/compiler/ets/requiredType_4-expected.txt @@ -314,112 +314,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "requiredType_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "requiredType_4.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "requiredType_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "requiredType_4.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "requiredType_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "requiredType_4.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "requiredType_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "requiredType_4.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/requiredType_5-expected.txt b/ets2panda/test/compiler/ets/requiredType_5-expected.txt index e03749b90acd7c73a5dba429691636bf48d58983..c1c56b0c96cb03fd30813de617f88becfad31fc9 100644 --- a/ets2panda/test/compiler/ets/requiredType_5-expected.txt +++ b/ets2panda/test/compiler/ets/requiredType_5-expected.txt @@ -464,112 +464,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "requiredType_5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "requiredType_5.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "requiredType_5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "requiredType_5.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "requiredType_5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "requiredType_5.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "requiredType_5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "requiredType_5.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/requiredType_9-expected.txt b/ets2panda/test/compiler/ets/requiredType_9-expected.txt index 17fa9af04c5a9c15a104725c0e09877db3adac58..10395eac3a031acc053d44ce0fa90f11c29b4eb1 100644 --- a/ets2panda/test/compiler/ets/requiredType_9-expected.txt +++ b/ets2panda/test/compiler/ets/requiredType_9-expected.txt @@ -923,112 +923,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "requiredType_9.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "requiredType_9.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "requiredType_9.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "requiredType_9.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "requiredType_9.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "requiredType_9.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "requiredType_9.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "requiredType_9.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/returnTypeGenericArray-expected.txt b/ets2panda/test/compiler/ets/returnTypeGenericArray-expected.txt index 0462fcd792819d51be24b83e8f6f52fe872efc72..d0a95fae863efc18c13921eb9a38a553d132878a 100644 --- a/ets2panda/test/compiler/ets/returnTypeGenericArray-expected.txt +++ b/ets2panda/test/compiler/ets/returnTypeGenericArray-expected.txt @@ -1167,112 +1167,6 @@ "program": "returnTypeGenericArray.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "returnTypeGenericArray.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "returnTypeGenericArray.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "returnTypeGenericArray.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "returnTypeGenericArray.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "returnTypeGenericArray.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "returnTypeGenericArray.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "returnTypeGenericArray.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "returnTypeGenericArray.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/switchStatementBoxing-expected.txt b/ets2panda/test/compiler/ets/switchStatementBoxing-expected.txt index 7708bb42db1c24b70f731d012b6141471cc248e4..e4e499a1b7092c806f1f2791372169de2dd49541 100644 --- a/ets2panda/test/compiler/ets/switchStatementBoxing-expected.txt +++ b/ets2panda/test/compiler/ets/switchStatementBoxing-expected.txt @@ -715,112 +715,6 @@ "program": "switchStatementBoxing.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switchStatementBoxing.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switchStatementBoxing.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switchStatementBoxing.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switchStatementBoxing.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switchStatementBoxing.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switchStatementBoxing.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switchStatementBoxing.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switchStatementBoxing.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/switchStatementCorrectConversion-expected.txt b/ets2panda/test/compiler/ets/switchStatementCorrectConversion-expected.txt index e7d4780552a51b5f6aaffa8eda2f4228ac861f17..462cefe301cfb839f631cfa3e6a05c3fc57323bf 100644 --- a/ets2panda/test/compiler/ets/switchStatementCorrectConversion-expected.txt +++ b/ets2panda/test/compiler/ets/switchStatementCorrectConversion-expected.txt @@ -1092,112 +1092,6 @@ "program": "switchStatementCorrectConversion.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switchStatementCorrectConversion.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switchStatementCorrectConversion.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switchStatementCorrectConversion.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switchStatementCorrectConversion.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switchStatementCorrectConversion.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switchStatementCorrectConversion.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switchStatementCorrectConversion.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switchStatementCorrectConversion.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/this_type_valid_return_type-expected.txt b/ets2panda/test/compiler/ets/this_type_valid_return_type-expected.txt index 692685e1444307ab89f640fba678096aa7eb2567..00d473babb1e20d5a7d8ca165e0775abaa74c778 100644 --- a/ets2panda/test/compiler/ets/this_type_valid_return_type-expected.txt +++ b/ets2panda/test/compiler/ets/this_type_valid_return_type-expected.txt @@ -436,112 +436,6 @@ "program": "this_type_valid_return_type.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "this_type_valid_return_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "this_type_valid_return_type.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "this_type_valid_return_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "this_type_valid_return_type.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "this_type_valid_return_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "this_type_valid_return_type.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "this_type_valid_return_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "this_type_valid_return_type.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/throwInCatchClause3-expected.txt b/ets2panda/test/compiler/ets/throwInCatchClause3-expected.txt index 54aebbadb780e24b16619a3b6d4ffe10bd3777f4..892dd9608c44a6921870e40d48de1e3e19032daa 100644 --- a/ets2panda/test/compiler/ets/throwInCatchClause3-expected.txt +++ b/ets2panda/test/compiler/ets/throwInCatchClause3-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "throwInCatchClause3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "throwInCatchClause3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "throwInCatchClause3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "throwInCatchClause3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "throwInCatchClause3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "throwInCatchClause3.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "throwInCatchClause3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "throwInCatchClause3.ets" - } - } - }, { "type": "MethodDefinition", "key": { @@ -487,7 +381,7 @@ }, "end": { "line": 21, - "column": 20, + "column": 33, "program": "throwInCatchClause3.ets" } } diff --git a/ets2panda/test/compiler/ets/throwInFinallyBlock1-expected.txt b/ets2panda/test/compiler/ets/throwInFinallyBlock1-expected.txt index 3a281c7e24bff4578329e68116c63a72e262b362..39c6c06227a3e25d6de1fe42e857fa8e0135c042 100644 --- a/ets2panda/test/compiler/ets/throwInFinallyBlock1-expected.txt +++ b/ets2panda/test/compiler/ets/throwInFinallyBlock1-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "throwInFinallyBlock1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "throwInFinallyBlock1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "throwInFinallyBlock1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "throwInFinallyBlock1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "throwInFinallyBlock1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "throwInFinallyBlock1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "throwInFinallyBlock1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "throwInFinallyBlock1.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/throwInTryStatement-expected.txt b/ets2panda/test/compiler/ets/throwInTryStatement-expected.txt index 70fc90ffac33214b38a28dee6aad230a40e7e6c2..3228fb00116c3cc533b908168b1df889285eed2d 100644 --- a/ets2panda/test/compiler/ets/throwInTryStatement-expected.txt +++ b/ets2panda/test/compiler/ets/throwInTryStatement-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "throwInTryStatement.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "throwInTryStatement.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "throwInTryStatement.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "throwInTryStatement.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "throwInTryStatement.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "throwInTryStatement.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "throwInTryStatement.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "throwInTryStatement.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/tryCatchErrorMissingParamType-expected.txt b/ets2panda/test/compiler/ets/tryCatchErrorMissingParamType-expected.txt index 96aab42d0b0b13a9b78d64d2576dd52e0d3885db..c223829cf0d3ab376e6b82935b31422e9f949f3b 100644 --- a/ets2panda/test/compiler/ets/tryCatchErrorMissingParamType-expected.txt +++ b/ets2panda/test/compiler/ets/tryCatchErrorMissingParamType-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tryCatchErrorMissingParamType.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tryCatchErrorMissingParamType.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tryCatchErrorMissingParamType.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tryCatchErrorMissingParamType.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tryCatchErrorMissingParamType.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tryCatchErrorMissingParamType.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tryCatchErrorMissingParamType.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tryCatchErrorMissingParamType.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/tryCatchMissingParamType-expected.txt b/ets2panda/test/compiler/ets/tryCatchMissingParamType-expected.txt index ccaa3c2b2f666062dddb0e1fa5840c72fe2cf275..da09105ec1258565b22f5a0afc9e7859b416b220 100644 --- a/ets2panda/test/compiler/ets/tryCatchMissingParamType-expected.txt +++ b/ets2panda/test/compiler/ets/tryCatchMissingParamType-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tryCatchMissingParamType.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tryCatchMissingParamType.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tryCatchMissingParamType.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tryCatchMissingParamType.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tryCatchMissingParamType.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tryCatchMissingParamType.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tryCatchMissingParamType.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tryCatchMissingParamType.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/tryDefaultCatches-expected.txt b/ets2panda/test/compiler/ets/tryDefaultCatches-expected.txt index 1b346947abfee7cc0b5ab6f38d009c507d46f22b..bbdcfed6d138733e3ed533a5425a6f2be19d249b 100644 --- a/ets2panda/test/compiler/ets/tryDefaultCatches-expected.txt +++ b/ets2panda/test/compiler/ets/tryDefaultCatches-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tryDefaultCatches.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tryDefaultCatches.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tryDefaultCatches.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tryDefaultCatches.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tryDefaultCatches.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tryDefaultCatches.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tryDefaultCatches.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tryDefaultCatches.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/tuple_types_1-expected.txt b/ets2panda/test/compiler/ets/tuple_types_1-expected.txt index 78dbf2657cee84a80fd4ed0b68fe7f6eedc49b31..2975fb82e71c7461fa6cdbf2b122ed856ea016b9 100644 --- a/ets2panda/test/compiler/ets/tuple_types_1-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_1-expected.txt @@ -989,112 +989,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_1.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/tuple_types_12-expected.txt b/ets2panda/test/compiler/ets/tuple_types_12-expected.txt index 561479485e32636239df13462524ef6f00dddda2..43aae6c7fa9f35ad4381720b9e3ee19cfd84e211 100644 --- a/ets2panda/test/compiler/ets/tuple_types_12-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_12-expected.txt @@ -703,112 +703,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_12.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_12.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_12.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_12.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_12.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_12.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_12.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_12.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/tuple_types_13-expected.txt b/ets2panda/test/compiler/ets/tuple_types_13-expected.txt index bc526212dd30535e088c26f6ca5270015842672c..3f5191fc88f721d96ea845472188db8d0b5a5972 100644 --- a/ets2panda/test/compiler/ets/tuple_types_13-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_13-expected.txt @@ -320,112 +320,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_13.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_13.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_13.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_13.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_13.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_13.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_13.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_13.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/compiler/ets/tuple_types_14-expected.txt b/ets2panda/test/compiler/ets/tuple_types_14-expected.txt index 839a7b57d75fa3e96e9884c208d8f63cb3d44119..f607e17a8d6447056a9ede8929ca224f0487a6bd 100644 --- a/ets2panda/test/compiler/ets/tuple_types_14-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_14-expected.txt @@ -734,112 +734,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_14.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_14.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_14.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_14.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_14.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_14.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_14.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_14.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/tuple_types_15-expected.txt b/ets2panda/test/compiler/ets/tuple_types_15-expected.txt index f09d55ff9ae996674978b9d806407902beeefa9e..5345bef6523ee860447d6997bb1b1f18a1280fbd 100644 --- a/ets2panda/test/compiler/ets/tuple_types_15-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_15-expected.txt @@ -135,112 +135,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_15.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_15.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_15.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_15.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_15.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_15.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_15.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_15.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/tuple_types_16-expected.txt b/ets2panda/test/compiler/ets/tuple_types_16-expected.txt index cbd8e600f0c5d804717b0d4dd444d3f84f13da57..3a0b410abb6667a472a450c326ad30a577846ccd 100644 --- a/ets2panda/test/compiler/ets/tuple_types_16-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_16-expected.txt @@ -563,112 +563,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_16.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_16.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_16.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_16.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_16.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_16.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_16.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_16.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/tuple_types_17-expected.txt b/ets2panda/test/compiler/ets/tuple_types_17-expected.txt index d56516ef3a441d83c219a51ea99ae8b9b8aebf86..53885dafb546b1aa810e88a62ad489acd8859ac0 100644 --- a/ets2panda/test/compiler/ets/tuple_types_17-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_17-expected.txt @@ -199,112 +199,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_17.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_17.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_17.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_17.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_17.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_17.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_17.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_17.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/tuple_types_18-expected.txt b/ets2panda/test/compiler/ets/tuple_types_18-expected.txt index 07ddd1e6ea2297f84131b8eca2ddffbab79770c5..20a4e88e5b60ec1c704d4ed1bb4b343a6f96e7e0 100644 --- a/ets2panda/test/compiler/ets/tuple_types_18-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_18-expected.txt @@ -246,112 +246,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_18.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_18.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_18.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_18.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_18.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_18.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_18.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_18.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/tuple_types_19-expected.txt b/ets2panda/test/compiler/ets/tuple_types_19-expected.txt index 92e052e53e6cd3ff2646445eef31e68e6a98469a..2d9e625f43f41961949dab68a2a9691d8358d9c0 100644 --- a/ets2panda/test/compiler/ets/tuple_types_19-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_19-expected.txt @@ -1922,112 +1922,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_19.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_19.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_19.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_19.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_19.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_19.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_19.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_19.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/tuple_types_7-expected.txt b/ets2panda/test/compiler/ets/tuple_types_7-expected.txt index 8edfc5520f7d77ecbe4648e25bb43698af7e7a38..02b35c29a2cf6cb338d5f9dafbf7d1769d956678 100644 --- a/ets2panda/test/compiler/ets/tuple_types_7-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_7-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_7.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_7.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_7.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tuple_types_7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tuple_types_7.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/typeAlias-expected.txt b/ets2panda/test/compiler/ets/typeAlias-expected.txt index 25d6a1df61caed5a8b6e76b1b836d9e6e28c51d2..bc32a4656f1440ebe1c744ef2298b54e8b69bce9 100644 --- a/ets2panda/test/compiler/ets/typeAlias-expected.txt +++ b/ets2panda/test/compiler/ets/typeAlias-expected.txt @@ -130,246 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "typeAlias.ets" - }, - "end": { - "line": 17, - "column": 6, - "program": "typeAlias.ets" - } - } - }, - "right": { - "type": "CallExpression", - "callee": { - "type": "MemberExpression", - "object": { - "type": "Identifier", - "name": "Number", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 9, - "program": "typeAlias.ets" - }, - "end": { - "line": 17, - "column": 15, - "program": "typeAlias.ets" - } - } - }, - "property": { - "type": "Identifier", - "name": "isInteger", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 16, - "program": "typeAlias.ets" - }, - "end": { - "line": 17, - "column": 25, - "program": "typeAlias.ets" - } - } - }, - "computed": false, - "optional": false, - "loc": { - "start": { - "line": 17, - "column": 9, - "program": "typeAlias.ets" - }, - "end": { - "line": 17, - "column": 25, - "program": "typeAlias.ets" - } - } - }, - "arguments": [ - { - "type": "NumberLiteral", - "value": 1, - "loc": { - "start": { - "line": 17, - "column": 26, - "program": "typeAlias.ets" - }, - "end": { - "line": 17, - "column": 27, - "program": "typeAlias.ets" - } - } - } - ], - "optional": false, - "loc": { - "start": { - "line": 17, - "column": 9, - "program": "typeAlias.ets" - }, - "end": { - "line": 17, - "column": 28, - "program": "typeAlias.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "typeAlias.ets" - }, - "end": { - "line": 17, - "column": 28, - "program": "typeAlias.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "typeAlias.ets" - }, - "end": { - "line": 17, - "column": 28, - "program": "typeAlias.ets" - } - } - } - ], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "typeAlias.ets" - }, - "end": { - "line": 17, - "column": 28, - "program": "typeAlias.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "typeAlias.ets" - }, - "end": { - "line": 17, - "column": 28, - "program": "typeAlias.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "typeAlias.ets" - }, - "end": { - "line": 17, - "column": 28, - "program": "typeAlias.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "typeAlias.ets" - }, - "end": { - "line": 17, - "column": 28, - "program": "typeAlias.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/compiler/ets/typeVarReferenceFromStaticContext2-expected.txt b/ets2panda/test/compiler/ets/typeVarReferenceFromStaticContext2-expected.txt index f7bafdd20ce54d28941f018146e9c694b1824641..71737a4b74ecd8c1f4ac36238c6025fc6280cedf 100644 --- a/ets2panda/test/compiler/ets/typeVarReferenceFromStaticContext2-expected.txt +++ b/ets2panda/test/compiler/ets/typeVarReferenceFromStaticContext2-expected.txt @@ -742,112 +742,6 @@ "program": "typeVarReferenceFromStaticContext2.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "typeVarReferenceFromStaticContext2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "typeVarReferenceFromStaticContext2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "typeVarReferenceFromStaticContext2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "typeVarReferenceFromStaticContext2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "typeVarReferenceFromStaticContext2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "typeVarReferenceFromStaticContext2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "typeVarReferenceFromStaticContext2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "typeVarReferenceFromStaticContext2.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/compiler/ets/union_types_1-expected.txt b/ets2panda/test/compiler/ets/union_types_1-expected.txt index 1807b5c5aa1df5eef6eb3c0214e675c824f89b6e..a97cc1e0661ad1563646525401ceb64750b513c1 100644 --- a/ets2panda/test/compiler/ets/union_types_1-expected.txt +++ b/ets2panda/test/compiler/ets/union_types_1-expected.txt @@ -1035,112 +1035,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "union_types_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "union_types_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "union_types_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "union_types_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "union_types_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "union_types_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "union_types_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "union_types_1.ets" - } - } - }, { "type": "MethodDefinition", "key": { @@ -1565,7 +1459,7 @@ }, "end": { "line": 36, - "column": 19, + "column": 24, "program": "union_types_1.ets" } } @@ -1578,7 +1472,7 @@ }, "end": { "line": 36, - "column": 19, + "column": 24, "program": "union_types_1.ets" } } @@ -3611,7 +3505,7 @@ }, "end": { "line": 55, - "column": 19, + "column": 24, "program": "union_types_1.ets" } } @@ -3624,7 +3518,7 @@ }, "end": { "line": 55, - "column": 19, + "column": 24, "program": "union_types_1.ets" } } diff --git a/ets2panda/test/compiler/ets/union_types_3-expected.txt b/ets2panda/test/compiler/ets/union_types_3-expected.txt index c8e3fd1a93dc34625268817d6b906f18142a9afc..e4f94df24934ac9856bf58af3824690170079e4d 100644 --- a/ets2panda/test/compiler/ets/union_types_3-expected.txt +++ b/ets2panda/test/compiler/ets/union_types_3-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "union_types_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "union_types_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "union_types_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "union_types_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "union_types_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "union_types_3.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "union_types_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "union_types_3.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/union_types_5-expected.txt b/ets2panda/test/compiler/ets/union_types_5-expected.txt index 248895af43cf1719a46b1bd488e6e113b2f546c5..b843e1f0edc2284419839386b8fe53bf9b814b3b 100644 --- a/ets2panda/test/compiler/ets/union_types_5-expected.txt +++ b/ets2panda/test/compiler/ets/union_types_5-expected.txt @@ -993,112 +993,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "union_types_5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "union_types_5.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "union_types_5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "union_types_5.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "union_types_5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "union_types_5.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "union_types_5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "union_types_5.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/compiler/ets/union_types_merging-expected.txt b/ets2panda/test/compiler/ets/union_types_merging-expected.txt index 30bd4b0e8a20012bb1b418ee3c246b3296940bbc..cfa0a3ec20384ef3a7fdd91c5384350cf367c984 100644 --- a/ets2panda/test/compiler/ets/union_types_merging-expected.txt +++ b/ets2panda/test/compiler/ets/union_types_merging-expected.txt @@ -1942,112 +1942,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "union_types_merging.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "union_types_merging.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "union_types_merging.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "union_types_merging.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "union_types_merging.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "union_types_merging.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "union_types_merging.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "union_types_merging.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/AccessBinaryTrees-expected.txt b/ets2panda/test/parser/ets/AccessBinaryTrees-expected.txt index 59f8b0e55d5e0a3a9b32fc766148ad65d4fa8d80..8bac61fc39f82ab53d017cd21735eb0c8255b4a1 100644 --- a/ets2panda/test/parser/ets/AccessBinaryTrees-expected.txt +++ b/ets2panda/test/parser/ets/AccessBinaryTrees-expected.txt @@ -5326,112 +5326,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "AccessBinaryTrees.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "AccessBinaryTrees.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "AccessBinaryTrees.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "AccessBinaryTrees.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "AccessBinaryTrees.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "AccessBinaryTrees.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "AccessBinaryTrees.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "AccessBinaryTrees.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/AccessFannkuch-expected.txt b/ets2panda/test/parser/ets/AccessFannkuch-expected.txt index 11407795748853cf373a0c1280ce315e8e014a4b..d849b8d9d05169df7da51d969919f19f36f65c00 100644 --- a/ets2panda/test/parser/ets/AccessFannkuch-expected.txt +++ b/ets2panda/test/parser/ets/AccessFannkuch-expected.txt @@ -6143,112 +6143,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "AccessFannkuch.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "AccessFannkuch.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "AccessFannkuch.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "AccessFannkuch.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "AccessFannkuch.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "AccessFannkuch.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "AccessFannkuch.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "AccessFannkuch.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/AccessNBody-expected.txt b/ets2panda/test/parser/ets/AccessNBody-expected.txt index e2fd028d2731764650744ba8c2261f4d055cb601..91947de59768d7907782e7df60bebdeda8d74f11 100644 --- a/ets2panda/test/parser/ets/AccessNBody-expected.txt +++ b/ets2panda/test/parser/ets/AccessNBody-expected.txt @@ -16610,112 +16610,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "AccessNBody.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "AccessNBody.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "AccessNBody.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "AccessNBody.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "AccessNBody.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "AccessNBody.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "AccessNBody.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "AccessNBody.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/AccessNSieve-expected.txt b/ets2panda/test/parser/ets/AccessNSieve-expected.txt index 5347dfe2926de862a10da9969e58dedfeeba91f0..2421927e80f9e458e3b77ba85fc41b8457b6721e 100644 --- a/ets2panda/test/parser/ets/AccessNSieve-expected.txt +++ b/ets2panda/test/parser/ets/AccessNSieve-expected.txt @@ -3231,112 +3231,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "AccessNSieve.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "AccessNSieve.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "AccessNSieve.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "AccessNSieve.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "AccessNSieve.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "AccessNSieve.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "AccessNSieve.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "AccessNSieve.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/Bitops3BitBitsInByte-expected.txt b/ets2panda/test/parser/ets/Bitops3BitBitsInByte-expected.txt index fad4b8f987f171790e499cf062ec1ca417de9dd3..634d77ad693a5f8ec9c20c24e5dfdd2a6a87f120 100644 --- a/ets2panda/test/parser/ets/Bitops3BitBitsInByte-expected.txt +++ b/ets2panda/test/parser/ets/Bitops3BitBitsInByte-expected.txt @@ -2251,112 +2251,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "Bitops3BitBitsInByte.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "Bitops3BitBitsInByte.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "Bitops3BitBitsInByte.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "Bitops3BitBitsInByte.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "Bitops3BitBitsInByte.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "Bitops3BitBitsInByte.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "Bitops3BitBitsInByte.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "Bitops3BitBitsInByte.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/BitopsBitsInByte-expected.txt b/ets2panda/test/parser/ets/BitopsBitsInByte-expected.txt index 35b141918e953eecb043dbf4fcfe37156502bde1..ff2eb16679d5dd07d2c4e1457ba42a34e294e0a7 100644 --- a/ets2panda/test/parser/ets/BitopsBitsInByte-expected.txt +++ b/ets2panda/test/parser/ets/BitopsBitsInByte-expected.txt @@ -1993,112 +1993,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "BitopsBitsInByte.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "BitopsBitsInByte.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "BitopsBitsInByte.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "BitopsBitsInByte.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "BitopsBitsInByte.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "BitopsBitsInByte.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "BitopsBitsInByte.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "BitopsBitsInByte.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/BitopsBitwiseAnd-expected.txt b/ets2panda/test/parser/ets/BitopsBitwiseAnd-expected.txt index 2953e2e04d124591ef98574cbf383a657a3a6710..aa1bf42250b694596454d0c9373e0a91ee679304 100644 --- a/ets2panda/test/parser/ets/BitopsBitwiseAnd-expected.txt +++ b/ets2panda/test/parser/ets/BitopsBitwiseAnd-expected.txt @@ -984,112 +984,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "BitopsBitwiseAnd.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "BitopsBitwiseAnd.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "BitopsBitwiseAnd.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "BitopsBitwiseAnd.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "BitopsBitwiseAnd.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "BitopsBitwiseAnd.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "BitopsBitwiseAnd.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "BitopsBitwiseAnd.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/BitopsNSieveBits-expected.txt b/ets2panda/test/parser/ets/BitopsNSieveBits-expected.txt index ef700c6bb066d30500916bf23dbdc83c7fdfe218..873256608c3b2dc3e4b490c5d86ce940dd4475f5 100644 --- a/ets2panda/test/parser/ets/BitopsNSieveBits-expected.txt +++ b/ets2panda/test/parser/ets/BitopsNSieveBits-expected.txt @@ -3862,112 +3862,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "BitopsNSieveBits.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "BitopsNSieveBits.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "BitopsNSieveBits.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "BitopsNSieveBits.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "BitopsNSieveBits.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "BitopsNSieveBits.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "BitopsNSieveBits.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "BitopsNSieveBits.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/Boolean_bitwise-expected.txt b/ets2panda/test/parser/ets/Boolean_bitwise-expected.txt index 2c9b987ef66b3d2dc3e439085cf146c8cf5f16af..2a1078dba1543f9e173d6c73395562fd6ad1002f 100644 --- a/ets2panda/test/parser/ets/Boolean_bitwise-expected.txt +++ b/ets2panda/test/parser/ets/Boolean_bitwise-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "Boolean_bitwise.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "Boolean_bitwise.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "Boolean_bitwise.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "Boolean_bitwise.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "Boolean_bitwise.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "Boolean_bitwise.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "Boolean_bitwise.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "Boolean_bitwise.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/ControlFlowRecursive-expected.txt b/ets2panda/test/parser/ets/ControlFlowRecursive-expected.txt index 722aa9d5ff6ae7917fb91aec9af55d5414a67c35..6920936a6e5a2baf970d49292d47afc4ed14a4ee 100644 --- a/ets2panda/test/parser/ets/ControlFlowRecursive-expected.txt +++ b/ets2panda/test/parser/ets/ControlFlowRecursive-expected.txt @@ -3899,112 +3899,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ControlFlowRecursive.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ControlFlowRecursive.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ControlFlowRecursive.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ControlFlowRecursive.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ControlFlowRecursive.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ControlFlowRecursive.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ControlFlowRecursive.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ControlFlowRecursive.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/Dollar_dollar_1-expected.txt b/ets2panda/test/parser/ets/Dollar_dollar_1-expected.txt index 5caf5dd2777de2f0748f61cef494816a9c69d408..368087c522ea2a5fa421132622d69f001e199665 100644 --- a/ets2panda/test/parser/ets/Dollar_dollar_1-expected.txt +++ b/ets2panda/test/parser/ets/Dollar_dollar_1-expected.txt @@ -130,177 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "$$a", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "Dollar_dollar_1.ets" - }, - "end": { - "line": 16, - "column": 8, - "program": "Dollar_dollar_1.ets" - } - } - }, - "right": { - "type": "BooleanLiteral", - "value": true, - "loc": { - "start": { - "line": 16, - "column": 11, - "program": "Dollar_dollar_1.ets" - }, - "end": { - "line": 16, - "column": 15, - "program": "Dollar_dollar_1.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "Dollar_dollar_1.ets" - }, - "end": { - "line": 16, - "column": 15, - "program": "Dollar_dollar_1.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "Dollar_dollar_1.ets" - }, - "end": { - "line": 16, - "column": 15, - "program": "Dollar_dollar_1.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "Dollar_dollar_1.ets" - }, - "end": { - "line": 16, - "column": 15, - "program": "Dollar_dollar_1.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "Dollar_dollar_1.ets" - }, - "end": { - "line": 16, - "column": 15, - "program": "Dollar_dollar_1.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "Dollar_dollar_1.ets" - }, - "end": { - "line": 16, - "column": 15, - "program": "Dollar_dollar_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "Dollar_dollar_1.ets" - }, - "end": { - "line": 16, - "column": 15, - "program": "Dollar_dollar_1.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/Dollar_dollar_2-expected.txt b/ets2panda/test/parser/ets/Dollar_dollar_2-expected.txt index 76ddf4bd455d9988efbd3347160ff7f52a8f1515..34a67b67d502c48a9c78b24c545054c1e465f94a 100644 --- a/ets2panda/test/parser/ets/Dollar_dollar_2-expected.txt +++ b/ets2panda/test/parser/ets/Dollar_dollar_2-expected.txt @@ -1175,112 +1175,6 @@ "program": "Dollar_dollar_2.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "Dollar_dollar_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "Dollar_dollar_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "Dollar_dollar_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "Dollar_dollar_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "Dollar_dollar_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "Dollar_dollar_2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "Dollar_dollar_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "Dollar_dollar_2.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/Dollar_dollar_3-expected.txt b/ets2panda/test/parser/ets/Dollar_dollar_3-expected.txt index bc0661f2d5036f890a0ec65cd94238107737250e..3ccc3bf20a09defed8cbc9bcea812805729f3c77 100644 --- a/ets2panda/test/parser/ets/Dollar_dollar_3-expected.txt +++ b/ets2panda/test/parser/ets/Dollar_dollar_3-expected.txt @@ -285,289 +285,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "$$a", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "Dollar_dollar_3.ets" - }, - "end": { - "line": 17, - "column": 8, - "program": "Dollar_dollar_3.ets" - } - } - }, - "right": { - "type": "ETSNewClassInstanceExpression", - "typeReference": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "A", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 15, - "program": "Dollar_dollar_3.ets" - }, - "end": { - "line": 17, - "column": 16, - "program": "Dollar_dollar_3.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 15, - "program": "Dollar_dollar_3.ets" - }, - "end": { - "line": 17, - "column": 16, - "program": "Dollar_dollar_3.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 15, - "program": "Dollar_dollar_3.ets" - }, - "end": { - "line": 17, - "column": 16, - "program": "Dollar_dollar_3.ets" - } - } - }, - "arguments": [], - "loc": { - "start": { - "line": 17, - "column": 11, - "program": "Dollar_dollar_3.ets" - }, - "end": { - "line": 18, - "column": 4, - "program": "Dollar_dollar_3.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "Dollar_dollar_3.ets" - }, - "end": { - "line": 18, - "column": 4, - "program": "Dollar_dollar_3.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "Dollar_dollar_3.ets" - }, - "end": { - "line": 18, - "column": 4, - "program": "Dollar_dollar_3.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "Dollar_dollar_3.ets" - }, - "end": { - "line": 18, - "column": 6, - "program": "Dollar_dollar_3.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "$$a", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 9, - "program": "Dollar_dollar_3.ets" - }, - "end": { - "line": 18, - "column": 12, - "program": "Dollar_dollar_3.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "Dollar_dollar_3.ets" - }, - "end": { - "line": 18, - "column": 12, - "program": "Dollar_dollar_3.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "Dollar_dollar_3.ets" - }, - "end": { - "line": 18, - "column": 12, - "program": "Dollar_dollar_3.ets" - } - } - } - ], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "Dollar_dollar_3.ets" - }, - "end": { - "line": 18, - "column": 12, - "program": "Dollar_dollar_3.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "Dollar_dollar_3.ets" - }, - "end": { - "line": 18, - "column": 12, - "program": "Dollar_dollar_3.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "Dollar_dollar_3.ets" - }, - "end": { - "line": 18, - "column": 12, - "program": "Dollar_dollar_3.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "Dollar_dollar_3.ets" - }, - "end": { - "line": 18, - "column": 12, - "program": "Dollar_dollar_3.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/Dollar_dollar_4-expected.txt b/ets2panda/test/parser/ets/Dollar_dollar_4-expected.txt index aa23adf4d86061c1dc926380c20573f9d03a343b..484ad01f181df76c84e4387942184a3207db41fc 100644 --- a/ets2panda/test/parser/ets/Dollar_dollar_4-expected.txt +++ b/ets2panda/test/parser/ets/Dollar_dollar_4-expected.txt @@ -130,177 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "$a$aa$$", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "Dollar_dollar_4.ets" - }, - "end": { - "line": 16, - "column": 12, - "program": "Dollar_dollar_4.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 5, - "loc": { - "start": { - "line": 16, - "column": 15, - "program": "Dollar_dollar_4.ets" - }, - "end": { - "line": 16, - "column": 16, - "program": "Dollar_dollar_4.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "Dollar_dollar_4.ets" - }, - "end": { - "line": 16, - "column": 16, - "program": "Dollar_dollar_4.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "Dollar_dollar_4.ets" - }, - "end": { - "line": 16, - "column": 16, - "program": "Dollar_dollar_4.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "Dollar_dollar_4.ets" - }, - "end": { - "line": 16, - "column": 16, - "program": "Dollar_dollar_4.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "Dollar_dollar_4.ets" - }, - "end": { - "line": 16, - "column": 16, - "program": "Dollar_dollar_4.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "Dollar_dollar_4.ets" - }, - "end": { - "line": 16, - "column": 16, - "program": "Dollar_dollar_4.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "Dollar_dollar_4.ets" - }, - "end": { - "line": 16, - "column": 16, - "program": "Dollar_dollar_4.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/FunctionInSwitch-expected.txt b/ets2panda/test/parser/ets/FunctionInSwitch-expected.txt index 5d047a89035dd8685b5e96c3b4baa1ddb1d4dd24..0ad429f3e75a27e8a95a630dd7f97849f42c2628 100644 --- a/ets2panda/test/parser/ets/FunctionInSwitch-expected.txt +++ b/ets2panda/test/parser/ets/FunctionInSwitch-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "FunctionInSwitch.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "FunctionInSwitch.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "FunctionInSwitch.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "FunctionInSwitch.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "FunctionInSwitch.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "FunctionInSwitch.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "FunctionInSwitch.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "FunctionInSwitch.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/FunctionType-expected.txt b/ets2panda/test/parser/ets/FunctionType-expected.txt index b2898c74e398e331871fad59eb58b6c3637165ca..ec170595d181b8e3c31d05ef8903a4119d2e273b 100644 --- a/ets2panda/test/parser/ets/FunctionType-expected.txt +++ b/ets2panda/test/parser/ets/FunctionType-expected.txt @@ -614,112 +614,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "FunctionType.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "FunctionType.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "FunctionType.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "FunctionType.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "FunctionType.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "FunctionType.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "FunctionType.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "FunctionType.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/FunctionalTypeAsTypeArgument-expected.txt b/ets2panda/test/parser/ets/FunctionalTypeAsTypeArgument-expected.txt index 1033be506370e5deddef5f70354972fe5d64d6f5..e0bc7b94649e50234ddbc25c7b0a9ab8e2abb8c1 100644 --- a/ets2panda/test/parser/ets/FunctionalTypeAsTypeArgument-expected.txt +++ b/ets2panda/test/parser/ets/FunctionalTypeAsTypeArgument-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "FunctionalTypeAsTypeArgument.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "FunctionalTypeAsTypeArgument.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "FunctionalTypeAsTypeArgument.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "FunctionalTypeAsTypeArgument.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "FunctionalTypeAsTypeArgument.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "FunctionalTypeAsTypeArgument.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "FunctionalTypeAsTypeArgument.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "FunctionalTypeAsTypeArgument.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/InferTypeParamFromParam1-expected.txt b/ets2panda/test/parser/ets/InferTypeParamFromParam1-expected.txt index 52af532976fab615d3fbb7f481cffa7850cbb2e7..e044a94018e2c179c6cc9b273c38a6b350c9aaf2 100644 --- a/ets2panda/test/parser/ets/InferTypeParamFromParam1-expected.txt +++ b/ets2panda/test/parser/ets/InferTypeParamFromParam1-expected.txt @@ -1831,112 +1831,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "InferTypeParamFromParam1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "InferTypeParamFromParam1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "InferTypeParamFromParam1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "InferTypeParamFromParam1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "InferTypeParamFromParam1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "InferTypeParamFromParam1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "InferTypeParamFromParam1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "InferTypeParamFromParam1.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/InferTypeParamFromParam3-expected.txt b/ets2panda/test/parser/ets/InferTypeParamFromParam3-expected.txt index 5b1120da3dd6d9ef94ca8afa1d3aa6d05a4868bd..96cdd64918acacb83034e43ae634d2541c770167 100644 --- a/ets2panda/test/parser/ets/InferTypeParamFromParam3-expected.txt +++ b/ets2panda/test/parser/ets/InferTypeParamFromParam3-expected.txt @@ -2051,112 +2051,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "InferTypeParamFromParam3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "InferTypeParamFromParam3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "InferTypeParamFromParam3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "InferTypeParamFromParam3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "InferTypeParamFromParam3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "InferTypeParamFromParam3.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "InferTypeParamFromParam3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "InferTypeParamFromParam3.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/MathCordic-expected.txt b/ets2panda/test/parser/ets/MathCordic-expected.txt index 802d01d2837de29b034f2471330c7e617a986a2c..57ecff6a0d2303dca7403ae7bb5d716d0afacb2a 100644 --- a/ets2panda/test/parser/ets/MathCordic-expected.txt +++ b/ets2panda/test/parser/ets/MathCordic-expected.txt @@ -6024,112 +6024,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "MathCordic.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "MathCordic.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "MathCordic.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "MathCordic.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "MathCordic.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "MathCordic.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "MathCordic.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "MathCordic.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/MathPartialSums-expected.txt b/ets2panda/test/parser/ets/MathPartialSums-expected.txt index dc79e0b7fcdd3edc7427466a3870661ea3d43eed..41bc591b288636dc4d8ed2a76804646d2e3075ab 100644 --- a/ets2panda/test/parser/ets/MathPartialSums-expected.txt +++ b/ets2panda/test/parser/ets/MathPartialSums-expected.txt @@ -5380,112 +5380,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "MathPartialSums.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "MathPartialSums.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "MathPartialSums.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "MathPartialSums.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "MathPartialSums.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "MathPartialSums.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "MathPartialSums.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "MathPartialSums.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/MathSpectralNorm-expected.txt b/ets2panda/test/parser/ets/MathSpectralNorm-expected.txt index 7f6764fb665330b5099d376058da705778c25d8f..3f82d2c45137c9a34c2ddbfd5acd25ed859519b1 100644 --- a/ets2panda/test/parser/ets/MathSpectralNorm-expected.txt +++ b/ets2panda/test/parser/ets/MathSpectralNorm-expected.txt @@ -7135,112 +7135,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "MathSpectralNorm.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "MathSpectralNorm.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "MathSpectralNorm.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "MathSpectralNorm.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "MathSpectralNorm.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "MathSpectralNorm.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "MathSpectralNorm.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "MathSpectralNorm.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/Morph3d-expected.txt b/ets2panda/test/parser/ets/Morph3d-expected.txt index 099e63f82f8501c79c26f888003cd99df256f8d0..a67d5529e54cf6199bae646731ec7ae6a2cc9aa3 100644 --- a/ets2panda/test/parser/ets/Morph3d-expected.txt +++ b/ets2panda/test/parser/ets/Morph3d-expected.txt @@ -3788,112 +3788,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "Morph3d.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "Morph3d.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "Morph3d.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "Morph3d.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "Morph3d.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "Morph3d.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "Morph3d.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "Morph3d.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/OptionalParametersWithGenericReturnTypes-expected.txt b/ets2panda/test/parser/ets/OptionalParametersWithGenericReturnTypes-expected.txt index dbf4d1436d177956ccf328beaf2517e0e2b8af7a..77d4c2fc127242bd65765493e2b116b4eeb45ce3 100644 --- a/ets2panda/test/parser/ets/OptionalParametersWithGenericReturnTypes-expected.txt +++ b/ets2panda/test/parser/ets/OptionalParametersWithGenericReturnTypes-expected.txt @@ -1576,112 +1576,6 @@ "program": "OptionalParametersWithGenericReturnTypes.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "OptionalParametersWithGenericReturnTypes.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "OptionalParametersWithGenericReturnTypes.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "OptionalParametersWithGenericReturnTypes.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "OptionalParametersWithGenericReturnTypes.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "OptionalParametersWithGenericReturnTypes.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "OptionalParametersWithGenericReturnTypes.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "OptionalParametersWithGenericReturnTypes.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "OptionalParametersWithGenericReturnTypes.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/StaticFieldAndMethodSameName-expected.txt b/ets2panda/test/parser/ets/StaticFieldAndMethodSameName-expected.txt index 1b5b4f9833186d6c5336da5627b6a2997ca37765..6fc42809d2366a8993cd8c950953a4111f0ed2cf 100644 --- a/ets2panda/test/parser/ets/StaticFieldAndMethodSameName-expected.txt +++ b/ets2panda/test/parser/ets/StaticFieldAndMethodSameName-expected.txt @@ -403,112 +403,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "StaticFieldAndMethodSameName.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "StaticFieldAndMethodSameName.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "StaticFieldAndMethodSameName.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "StaticFieldAndMethodSameName.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "StaticFieldAndMethodSameName.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "StaticFieldAndMethodSameName.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "StaticFieldAndMethodSameName.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "StaticFieldAndMethodSameName.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/StaticFieldAndMethodSameNameInheritance-expected.txt b/ets2panda/test/parser/ets/StaticFieldAndMethodSameNameInheritance-expected.txt index 7828b2e9b26de1d04017d947e9aa8a38fa566a2a..135e4aa970d0ef0b878f94ede0346063f9f02ae7 100644 --- a/ets2panda/test/parser/ets/StaticFieldAndMethodSameNameInheritance-expected.txt +++ b/ets2panda/test/parser/ets/StaticFieldAndMethodSameNameInheritance-expected.txt @@ -604,112 +604,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "StaticFieldAndMethodSameNameInheritance.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "StaticFieldAndMethodSameNameInheritance.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "StaticFieldAndMethodSameNameInheritance.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "StaticFieldAndMethodSameNameInheritance.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "StaticFieldAndMethodSameNameInheritance.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "StaticFieldAndMethodSameNameInheritance.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "StaticFieldAndMethodSameNameInheritance.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "StaticFieldAndMethodSameNameInheritance.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/StringBase64-expected.txt b/ets2panda/test/parser/ets/StringBase64-expected.txt index e6c6ef0eb0085f99ae769aa231c1630cd3bd2fcf..94852b76a5882d36226464e45614251b6f5af09e 100644 --- a/ets2panda/test/parser/ets/StringBase64-expected.txt +++ b/ets2panda/test/parser/ets/StringBase64-expected.txt @@ -10976,112 +10976,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "StringBase64.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "StringBase64.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "StringBase64.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "StringBase64.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "StringBase64.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "StringBase64.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "StringBase64.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "StringBase64.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/access_modifier_2-expected.txt b/ets2panda/test/parser/ets/access_modifier_2-expected.txt index e7ba39ad0cd4743740a0bd115f6fff4ea305a76a..b63e72359443f896b816d329c21691cb8840e074 100644 --- a/ets2panda/test/parser/ets/access_modifier_2-expected.txt +++ b/ets2panda/test/parser/ets/access_modifier_2-expected.txt @@ -405,112 +405,6 @@ "program": "access_modifier_2.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "access_modifier_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "access_modifier_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "access_modifier_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "access_modifier_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "access_modifier_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "access_modifier_2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "access_modifier_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "access_modifier_2.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/access_modifier_3-expected.txt b/ets2panda/test/parser/ets/access_modifier_3-expected.txt index b6437f1f5e118edd4e3de5d19083c0d1ed5f895a..e2b66069e7bc2e6521cc696022e0e953e56ca5a9 100644 --- a/ets2panda/test/parser/ets/access_modifier_3-expected.txt +++ b/ets2panda/test/parser/ets/access_modifier_3-expected.txt @@ -339,112 +339,6 @@ "program": "access_modifier_3.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "access_modifier_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "access_modifier_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "access_modifier_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "access_modifier_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "access_modifier_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "access_modifier_3.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "access_modifier_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "access_modifier_3.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/ambient_call_signature-expected.txt b/ets2panda/test/parser/ets/ambient_call_signature-expected.txt index 1ac57e4dae489621ec8d28686dd9770746d1c1e9..d2bbe40f839ab23287baad5481a58e698101f2f9 100644 --- a/ets2panda/test/parser/ets/ambient_call_signature-expected.txt +++ b/ets2panda/test/parser/ets/ambient_call_signature-expected.txt @@ -397,112 +397,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ambient_call_signature.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ambient_call_signature.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ambient_call_signature.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ambient_call_signature.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ambient_call_signature.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ambient_call_signature.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ambient_call_signature.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ambient_call_signature.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/ambient_indexer_1-expected.txt b/ets2panda/test/parser/ets/ambient_indexer_1-expected.txt index 94274e8f4bbbcc9fcaf428f992cf3ed6cc218303..146931a7f5da78f23a2b17ae01de3e1650b7e1fc 100644 --- a/ets2panda/test/parser/ets/ambient_indexer_1-expected.txt +++ b/ets2panda/test/parser/ets/ambient_indexer_1-expected.txt @@ -662,112 +662,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ambient_indexer_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ambient_indexer_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ambient_indexer_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ambient_indexer_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ambient_indexer_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ambient_indexer_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ambient_indexer_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ambient_indexer_1.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/ambient_indexer_6-expected.txt b/ets2panda/test/parser/ets/ambient_indexer_6-expected.txt index c4b51ab23cd56efc09ca10065c05962278f3d64d..b9a8b91ded0579ae8edc2e8d7f58f46a7d4efcae 100644 --- a/ets2panda/test/parser/ets/ambient_indexer_6-expected.txt +++ b/ets2panda/test/parser/ets/ambient_indexer_6-expected.txt @@ -662,112 +662,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ambient_indexer_6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ambient_indexer_6.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ambient_indexer_6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ambient_indexer_6.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ambient_indexer_6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ambient_indexer_6.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ambient_indexer_6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ambient_indexer_6.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/ambient_object_iterable-expected.txt b/ets2panda/test/parser/ets/ambient_object_iterable-expected.txt index 53a33689170daa6bb0563efb9fc9c7d42c76a729..690d04f8530dd01ad048abcc55eb12344808d0a5 100644 --- a/ets2panda/test/parser/ets/ambient_object_iterable-expected.txt +++ b/ets2panda/test/parser/ets/ambient_object_iterable-expected.txt @@ -1160,112 +1160,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ambient_object_iterable.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ambient_object_iterable.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ambient_object_iterable.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ambient_object_iterable.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ambient_object_iterable.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ambient_object_iterable.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ambient_object_iterable.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ambient_object_iterable.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/array-expected.txt b/ets2panda/test/parser/ets/array-expected.txt index 0559cf8adc47a8376858f0866f9a811c19a796eb..c9d59f27ba4effa61d883a3c390d54a4c31d90b0 100644 --- a/ets2panda/test/parser/ets/array-expected.txt +++ b/ets2panda/test/parser/ets/array-expected.txt @@ -130,339 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "array.ets" - }, - "end": { - "line": 16, - "column": 6, - "program": "array.ets" - } - } - }, - "right": { - "type": "ArrayExpression", - "elements": [ - { - "type": "NumberLiteral", - "value": 1, - "loc": { - "start": { - "line": 16, - "column": 17, - "program": "array.ets" - }, - "end": { - "line": 16, - "column": 18, - "program": "array.ets" - } - } - }, - { - "type": "NumberLiteral", - "value": 2, - "loc": { - "start": { - "line": 16, - "column": 19, - "program": "array.ets" - }, - "end": { - "line": 16, - "column": 20, - "program": "array.ets" - } - } - }, - { - "type": "NumberLiteral", - "value": 3, - "loc": { - "start": { - "line": 16, - "column": 21, - "program": "array.ets" - }, - "end": { - "line": 16, - "column": 22, - "program": "array.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 16, - "program": "array.ets" - }, - "end": { - "line": 16, - "column": 23, - "program": "array.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "array.ets" - }, - "end": { - "line": 16, - "column": 23, - "program": "array.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "array.ets" - }, - "end": { - "line": 16, - "column": 23, - "program": "array.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "v", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "array.ets" - }, - "end": { - "line": 17, - "column": 6, - "program": "array.ets" - } - } - }, - "right": { - "type": "ArrayExpression", - "elements": [ - { - "type": "StringLiteral", - "value": "x", - "loc": { - "start": { - "line": 17, - "column": 20, - "program": "array.ets" - }, - "end": { - "line": 17, - "column": 23, - "program": "array.ets" - } - } - }, - { - "type": "StringLiteral", - "value": "y", - "loc": { - "start": { - "line": 17, - "column": 25, - "program": "array.ets" - }, - "end": { - "line": 17, - "column": 28, - "program": "array.ets" - } - } - }, - { - "type": "StringLiteral", - "value": "z", - "loc": { - "start": { - "line": 17, - "column": 30, - "program": "array.ets" - }, - "end": { - "line": 17, - "column": 33, - "program": "array.ets" - } - } - } - ], - "loc": { - "start": { - "line": 17, - "column": 19, - "program": "array.ets" - }, - "end": { - "line": 17, - "column": 34, - "program": "array.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "array.ets" - }, - "end": { - "line": 17, - "column": 34, - "program": "array.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "array.ets" - }, - "end": { - "line": 17, - "column": 34, - "program": "array.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "array.ets" - }, - "end": { - "line": 17, - "column": 34, - "program": "array.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "array.ets" - }, - "end": { - "line": 17, - "column": 34, - "program": "array.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "array.ets" - }, - "end": { - "line": 17, - "column": 34, - "program": "array.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "array.ets" - }, - "end": { - "line": 17, - "column": 34, - "program": "array.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -577,7 +244,7 @@ }, "end": { "line": 16, - "column": 23, + "column": 16, "program": "array.ets" } } @@ -728,7 +395,7 @@ }, "end": { "line": 17, - "column": 34, + "column": 19, "program": "array.ets" } } diff --git a/ets2panda/test/parser/ets/arrayHoldingNullValue-expected.txt b/ets2panda/test/parser/ets/arrayHoldingNullValue-expected.txt index 1b4cbae51709e6e356e4ec0e268fb396a6127215..2e57145e6fba14ab10deb5fe5d57436946fd71a7 100644 --- a/ets2panda/test/parser/ets/arrayHoldingNullValue-expected.txt +++ b/ets2panda/test/parser/ets/arrayHoldingNullValue-expected.txt @@ -24,305 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "arrayHoldingNullValue.ets" - }, - "end": { - "line": 16, - "column": 6, - "program": "arrayHoldingNullValue.ets" - } - } - }, - "right": { - "type": "NullLiteral", - "value": null, - "loc": { - "start": { - "line": 16, - "column": 23, - "program": "arrayHoldingNullValue.ets" - }, - "end": { - "line": 16, - "column": 27, - "program": "arrayHoldingNullValue.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "arrayHoldingNullValue.ets" - }, - "end": { - "line": 16, - "column": 27, - "program": "arrayHoldingNullValue.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "arrayHoldingNullValue.ets" - }, - "end": { - "line": 16, - "column": 27, - "program": "arrayHoldingNullValue.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "arrayHoldingNullValue.ets" - }, - "end": { - "line": 17, - "column": 6, - "program": "arrayHoldingNullValue.ets" - } - } - }, - "right": { - "type": "NullLiteral", - "value": null, - "loc": { - "start": { - "line": 17, - "column": 26, - "program": "arrayHoldingNullValue.ets" - }, - "end": { - "line": 17, - "column": 30, - "program": "arrayHoldingNullValue.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "arrayHoldingNullValue.ets" - }, - "end": { - "line": 17, - "column": 30, - "program": "arrayHoldingNullValue.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "arrayHoldingNullValue.ets" - }, - "end": { - "line": 17, - "column": 30, - "program": "arrayHoldingNullValue.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "k", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "arrayHoldingNullValue.ets" - }, - "end": { - "line": 18, - "column": 6, - "program": "arrayHoldingNullValue.ets" - } - } - }, - "right": { - "type": "NullLiteral", - "value": null, - "loc": { - "start": { - "line": 18, - "column": 26, - "program": "arrayHoldingNullValue.ets" - }, - "end": { - "line": 18, - "column": 30, - "program": "arrayHoldingNullValue.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "arrayHoldingNullValue.ets" - }, - "end": { - "line": 18, - "column": 30, - "program": "arrayHoldingNullValue.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "arrayHoldingNullValue.ets" - }, - "end": { - "line": 18, - "column": 30, - "program": "arrayHoldingNullValue.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "arrayHoldingNullValue.ets" - }, - "end": { - "line": 18, - "column": 30, - "program": "arrayHoldingNullValue.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "arrayHoldingNullValue.ets" - }, - "end": { - "line": 18, - "column": 30, - "program": "arrayHoldingNullValue.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "arrayHoldingNullValue.ets" - }, - "end": { - "line": 18, - "column": 30, - "program": "arrayHoldingNullValue.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "arrayHoldingNullValue.ets" - }, - "end": { - "line": 18, - "column": 30, - "program": "arrayHoldingNullValue.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -469,7 +170,7 @@ }, "end": { "line": 16, - "column": 27, + "column": 23, "program": "arrayHoldingNullValue.ets" } } @@ -620,7 +321,7 @@ }, "end": { "line": 17, - "column": 30, + "column": 26, "program": "arrayHoldingNullValue.ets" } } @@ -803,7 +504,7 @@ }, "end": { "line": 18, - "column": 30, + "column": 26, "program": "arrayHoldingNullValue.ets" } } diff --git a/ets2panda/test/parser/ets/arrayLiteralReassign-expected.txt b/ets2panda/test/parser/ets/arrayLiteralReassign-expected.txt index 1ea8384ba86c8ac4444b8eb35b100abc35a67c50..84f18237500371c422e7d2d6692472febe769abe 100644 --- a/ets2panda/test/parser/ets/arrayLiteralReassign-expected.txt +++ b/ets2panda/test/parser/ets/arrayLiteralReassign-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "arrayLiteralReassign.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "arrayLiteralReassign.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "arrayLiteralReassign.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "arrayLiteralReassign.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "arrayLiteralReassign.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "arrayLiteralReassign.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "arrayLiteralReassign.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "arrayLiteralReassign.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/array_creation_expression-expected.txt b/ets2panda/test/parser/ets/array_creation_expression-expected.txt index 233d966ca8b6cab97f5ca34a3e335b54751c885c..efc03bda11d696a6cef094b8cd10c440a767bf23 100644 --- a/ets2panda/test/parser/ets/array_creation_expression-expected.txt +++ b/ets2panda/test/parser/ets/array_creation_expression-expected.txt @@ -1116,112 +1116,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "array_creation_expression.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "array_creation_expression.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "array_creation_expression.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "array_creation_expression.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "array_creation_expression.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "array_creation_expression.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "array_creation_expression.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "array_creation_expression.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/array_expression_implicit_cast_assignment-expected.txt b/ets2panda/test/parser/ets/array_expression_implicit_cast_assignment-expected.txt index 36b29615f1c2b081a350d2b4e9516c2a47cb780d..3ee407d48945abdfde3d43710181aae940e3670b 100644 --- a/ets2panda/test/parser/ets/array_expression_implicit_cast_assignment-expected.txt +++ b/ets2panda/test/parser/ets/array_expression_implicit_cast_assignment-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "array_expression_implicit_cast_assignment.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "array_expression_implicit_cast_assignment.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "array_expression_implicit_cast_assignment.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "array_expression_implicit_cast_assignment.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "array_expression_implicit_cast_assignment.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "array_expression_implicit_cast_assignment.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "array_expression_implicit_cast_assignment.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "array_expression_implicit_cast_assignment.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/array_expression_implicit_cast_return-expected.txt b/ets2panda/test/parser/ets/array_expression_implicit_cast_return-expected.txt index eddeef6b233e3ca33b9db61b3b5105d54da3da23..2599dbb4a2bb7b40682fef7dbe7afbf919f526a5 100644 --- a/ets2panda/test/parser/ets/array_expression_implicit_cast_return-expected.txt +++ b/ets2panda/test/parser/ets/array_expression_implicit_cast_return-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "array_expression_implicit_cast_return.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "array_expression_implicit_cast_return.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "array_expression_implicit_cast_return.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "array_expression_implicit_cast_return.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "array_expression_implicit_cast_return.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "array_expression_implicit_cast_return.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "array_expression_implicit_cast_return.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "array_expression_implicit_cast_return.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/array_new-expected.txt b/ets2panda/test/parser/ets/array_new-expected.txt index 7654424bc75f6af18d95e9e193261045819a2978..7d0776852b980f9f8ef5ed52451e5388992a8901 100644 --- a/ets2panda/test/parser/ets/array_new-expected.txt +++ b/ets2panda/test/parser/ets/array_new-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "array_new.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "array_new.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "array_new.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "array_new.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "array_new.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "array_new.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "array_new.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "array_new.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/array_type_from_literal-expected.txt b/ets2panda/test/parser/ets/array_type_from_literal-expected.txt index f9f1bb2285f47dceddeef8afd52f71b916710177..d96edac837049e0db0534fc34411ddbf85529388 100644 --- a/ets2panda/test/parser/ets/array_type_from_literal-expected.txt +++ b/ets2panda/test/parser/ets/array_type_from_literal-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "array_type_from_literal.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "array_type_from_literal.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "array_type_from_literal.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "array_type_from_literal.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "array_type_from_literal.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "array_type_from_literal.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "array_type_from_literal.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "array_type_from_literal.ets" - } - } - }, { "type": "MethodDefinition", "key": { @@ -691,7 +585,7 @@ }, "end": { "line": 21, - "column": 14, + "column": 23, "program": "array_type_from_literal.ets" } } @@ -704,7 +598,7 @@ }, "end": { "line": 21, - "column": 14, + "column": 23, "program": "array_type_from_literal.ets" } } diff --git a/ets2panda/test/parser/ets/as_expression_unary_expression-expected.txt b/ets2panda/test/parser/ets/as_expression_unary_expression-expected.txt index 77c49e0732efede1aca4e4e5506c23568a6b91db..fe5985159b7291cd8f9d65316f72f209343a536c 100644 --- a/ets2panda/test/parser/ets/as_expression_unary_expression-expected.txt +++ b/ets2panda/test/parser/ets/as_expression_unary_expression-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "as_expression_unary_expression.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "as_expression_unary_expression.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "as_expression_unary_expression.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "as_expression_unary_expression.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "as_expression_unary_expression.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "as_expression_unary_expression.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "as_expression_unary_expression.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "as_expression_unary_expression.ets" - } - } - }, { "type": "MethodDefinition", "key": { @@ -275,7 +169,7 @@ }, "end": { "line": 17, - "column": 20, + "column": 28, "program": "as_expression_unary_expression.ets" } } @@ -288,7 +182,7 @@ }, "end": { "line": 17, - "column": 20, + "column": 28, "program": "as_expression_unary_expression.ets" } } @@ -303,7 +197,7 @@ }, "end": { "line": 17, - "column": 20, + "column": 28, "program": "as_expression_unary_expression.ets" } } diff --git a/ets2panda/test/parser/ets/assert-expected.txt b/ets2panda/test/parser/ets/assert-expected.txt index 669a90f286eb14a9a1503fe48f4e3f725c60879c..bc0d581067e0393699e8a98512eb476c3f9a7f35 100644 --- a/ets2panda/test/parser/ets/assert-expected.txt +++ b/ets2panda/test/parser/ets/assert-expected.txt @@ -1116,112 +1116,6 @@ "program": "assert.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "assert.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "assert.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "assert.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "assert.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "assert.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "assert.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "assert.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "assert.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/assign-expected.txt b/ets2panda/test/parser/ets/assign-expected.txt index c9fdcbfabaf53cab792b98da4d524603d34ce72e..5adcdb05f5fb98d89cebb9a4e83e29012c5bde9f 100644 --- a/ets2panda/test/parser/ets/assign-expected.txt +++ b/ets2panda/test/parser/ets/assign-expected.txt @@ -24,177 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "assign.ets" - }, - "end": { - "line": 16, - "column": 6, - "program": "assign.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 0, - "loc": { - "start": { - "line": 16, - "column": 9, - "program": "assign.ets" - }, - "end": { - "line": 16, - "column": 10, - "program": "assign.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "assign.ets" - }, - "end": { - "line": 16, - "column": 10, - "program": "assign.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "assign.ets" - }, - "end": { - "line": 16, - "column": 10, - "program": "assign.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "assign.ets" - }, - "end": { - "line": 16, - "column": 10, - "program": "assign.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "assign.ets" - }, - "end": { - "line": 16, - "column": 10, - "program": "assign.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "assign.ets" - }, - "end": { - "line": 16, - "column": 10, - "program": "assign.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "assign.ets" - }, - "end": { - "line": 16, - "column": 10, - "program": "assign.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/assign-func-expected.txt b/ets2panda/test/parser/ets/assign-func-expected.txt index 4c37006bef7e4b367a5f5b96970d98826b0d6efb..ab49aaaaddfcc6fa152f5df47ee91a0fbf507522 100644 --- a/ets2panda/test/parser/ets/assign-func-expected.txt +++ b/ets2panda/test/parser/ets/assign-func-expected.txt @@ -518,112 +518,6 @@ "program": "assign-func.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "assign-func.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "assign-func.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "assign-func.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "assign-func.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "assign-func.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "assign-func.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "assign-func.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "assign-func.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/assignNullableFromMethodToNullableParam-expected.txt b/ets2panda/test/parser/ets/assignNullableFromMethodToNullableParam-expected.txt index 3d381f859d5c2972747fff4efccd2a5f0cfd7217..26bc19eb9930d1bdff1ef3b871bd850a27780461 100644 --- a/ets2panda/test/parser/ets/assignNullableFromMethodToNullableParam-expected.txt +++ b/ets2panda/test/parser/ets/assignNullableFromMethodToNullableParam-expected.txt @@ -443,112 +443,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "assignNullableFromMethodToNullableParam.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "assignNullableFromMethodToNullableParam.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "assignNullableFromMethodToNullableParam.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "assignNullableFromMethodToNullableParam.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "assignNullableFromMethodToNullableParam.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "assignNullableFromMethodToNullableParam.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "assignNullableFromMethodToNullableParam.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "assignNullableFromMethodToNullableParam.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/assignNullableToNonNullable-expected.txt b/ets2panda/test/parser/ets/assignNullableToNonNullable-expected.txt index cee3555d6ffd9f91a98265584627305f664fa42d..768ebff639e31eef7d81908e57f60de2c43db868 100644 --- a/ets2panda/test/parser/ets/assignNullableToNonNullable-expected.txt +++ b/ets2panda/test/parser/ets/assignNullableToNonNullable-expected.txt @@ -179,112 +179,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "assignNullableToNonNullable.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "assignNullableToNonNullable.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "assignNullableToNonNullable.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "assignNullableToNonNullable.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "assignNullableToNonNullable.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "assignNullableToNonNullable.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "assignNullableToNonNullable.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "assignNullableToNonNullable.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/assignNullableToNonNullableArray-expected.txt b/ets2panda/test/parser/ets/assignNullableToNonNullableArray-expected.txt index c3d394c6e9352cba865c05e5cc30d2885f83c31f..5b7dbccd5565d1af11afc05fe5a65ca3c1b50a34 100644 --- a/ets2panda/test/parser/ets/assignNullableToNonNullableArray-expected.txt +++ b/ets2panda/test/parser/ets/assignNullableToNonNullableArray-expected.txt @@ -179,112 +179,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "assignNullableToNonNullableArray.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "assignNullableToNonNullableArray.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "assignNullableToNonNullableArray.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "assignNullableToNonNullableArray.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "assignNullableToNonNullableArray.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "assignNullableToNonNullableArray.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "assignNullableToNonNullableArray.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "assignNullableToNonNullableArray.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/assignNullableToNonNullableTypeAlias-expected.txt b/ets2panda/test/parser/ets/assignNullableToNonNullableTypeAlias-expected.txt index 12eaa2d99e14a04d67e59dde4d2d01325c7fce8e..464bdd95cb1212dbee12c0c19b7e587cdc43dcce 100644 --- a/ets2panda/test/parser/ets/assignNullableToNonNullableTypeAlias-expected.txt +++ b/ets2panda/test/parser/ets/assignNullableToNonNullableTypeAlias-expected.txt @@ -290,112 +290,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "assignNullableToNonNullableTypeAlias.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "assignNullableToNonNullableTypeAlias.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "assignNullableToNonNullableTypeAlias.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "assignNullableToNonNullableTypeAlias.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "assignNullableToNonNullableTypeAlias.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "assignNullableToNonNullableTypeAlias.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "assignNullableToNonNullableTypeAlias.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "assignNullableToNonNullableTypeAlias.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/assignments-expected.txt b/ets2panda/test/parser/ets/assignments-expected.txt index c1ff444788897958683787a6b196014cf8a9b8a4..03d1ae11926cbcfeb18ece079c84afdf4c5806e4 100644 --- a/ets2panda/test/parser/ets/assignments-expected.txt +++ b/ets2panda/test/parser/ets/assignments-expected.txt @@ -2021,112 +2021,6 @@ "program": "assignments.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "assignments.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "assignments.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "assignments.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "assignments.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "assignments.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "assignments.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "assignments.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "assignments.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/async_func_return_type-expected.txt b/ets2panda/test/parser/ets/async_func_return_type-expected.txt index 1773d4d19a1f115674b989266236c6182e4dd3be..e84216ffd77f6d8e8d936ba6c97da094c65980f7 100644 --- a/ets2panda/test/parser/ets/async_func_return_type-expected.txt +++ b/ets2panda/test/parser/ets/async_func_return_type-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "async_func_return_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "async_func_return_type.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "async_func_return_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "async_func_return_type.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "async_func_return_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "async_func_return_type.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "async_func_return_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "async_func_return_type.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/async_function-expected.txt b/ets2panda/test/parser/ets/async_function-expected.txt index 2d0baf6c44ca591da933e3587075234dd94ade00..e1a06a323edb47a756480bcce96958114a40fc5b 100644 --- a/ets2panda/test/parser/ets/async_function-expected.txt +++ b/ets2panda/test/parser/ets/async_function-expected.txt @@ -566,387 +566,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "lambda", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "async_function.ets" - }, - "end": { - "line": 22, - "column": 11, - "program": "async_function.ets" - } - } - }, - "right": { - "type": "ArrowFunctionExpression", - "function": { - "type": "ScriptFunction", - "id": null, - "generator": false, - "async": true, - "expression": false, - "params": [], - "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "Promise", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 54, - "program": "async_function.ets" - }, - "end": { - "line": 22, - "column": 61, - "program": "async_function.ets" - } - } - }, - "typeParams": { - "type": "TSTypeParameterInstantiation", - "params": [ - { - "type": "ETSUnionType", - "types": [ - { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "Object", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 62, - "program": "async_function.ets" - }, - "end": { - "line": 22, - "column": 68, - "program": "async_function.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 62, - "program": "async_function.ets" - }, - "end": { - "line": 22, - "column": 68, - "program": "async_function.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 62, - "program": "async_function.ets" - }, - "end": { - "line": 22, - "column": 68, - "program": "async_function.ets" - } - } - }, - { - "type": "ETSNullType", - "loc": { - "start": { - "line": 22, - "column": 71, - "program": "async_function.ets" - }, - "end": { - "line": 22, - "column": 75, - "program": "async_function.ets" - } - } - } - ], - "loc": { - "start": { - "line": 22, - "column": 62, - "program": "async_function.ets" - }, - "end": { - "line": 22, - "column": 75, - "program": "async_function.ets" - } - } - } - ], - "loc": { - "start": { - "line": 22, - "column": 61, - "program": "async_function.ets" - }, - "end": { - "line": 22, - "column": 76, - "program": "async_function.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 54, - "program": "async_function.ets" - }, - "end": { - "line": 22, - "column": 76, - "program": "async_function.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 54, - "program": "async_function.ets" - }, - "end": { - "line": 22, - "column": 76, - "program": "async_function.ets" - } - } - }, - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ReturnStatement", - "argument": { - "type": "NullLiteral", - "value": null, - "loc": { - "start": { - "line": 22, - "column": 89, - "program": "async_function.ets" - }, - "end": { - "line": 22, - "column": 93, - "program": "async_function.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 82, - "program": "async_function.ets" - }, - "end": { - "line": 22, - "column": 94, - "program": "async_function.ets" - } - } - } - ], - "loc": { - "start": { - "line": 22, - "column": 80, - "program": "async_function.ets" - }, - "end": { - "line": 22, - "column": 96, - "program": "async_function.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 50, - "program": "async_function.ets" - }, - "end": { - "line": 22, - "column": 96, - "program": "async_function.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 50, - "program": "async_function.ets" - }, - "end": { - "line": 22, - "column": 96, - "program": "async_function.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "async_function.ets" - }, - "end": { - "line": 22, - "column": 96, - "program": "async_function.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "async_function.ets" - }, - "end": { - "line": 22, - "column": 96, - "program": "async_function.ets" - } - } - } - ], - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "async_function.ets" - }, - "end": { - "line": 22, - "column": 96, - "program": "async_function.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "async_function.ets" - }, - "end": { - "line": 22, - "column": 96, - "program": "async_function.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "async_function.ets" - }, - "end": { - "line": 22, - "column": 96, - "program": "async_function.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "async_function.ets" - }, - "end": { - "line": 22, - "column": 96, - "program": "async_function.ets" - } - } - }, { "type": "MethodDefinition", "key": { @@ -1422,7 +1041,7 @@ }, "end": { "line": 22, - "column": 96, + "column": 50, "program": "async_function.ets" } } diff --git a/ets2panda/test/parser/ets/async_overload-expected.txt b/ets2panda/test/parser/ets/async_overload-expected.txt index a3d661f2f6808f80ba5650736dc240e1b8df3caf..03f9f82debeded4c2a91c19204b7a1425ef1f54e 100644 --- a/ets2panda/test/parser/ets/async_overload-expected.txt +++ b/ets2panda/test/parser/ets/async_overload-expected.txt @@ -917,112 +917,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "async_overload.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "async_overload.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "async_overload.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "async_overload.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "async_overload.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "async_overload.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "async_overload.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "async_overload.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/async_with_lambda-expected.txt b/ets2panda/test/parser/ets/async_with_lambda-expected.txt index a8b26e25f2c986af95a3486778f05b6061f00335..c3245d1e1c265b112b2faad97b355b90285c80ac 100644 --- a/ets2panda/test/parser/ets/async_with_lambda-expected.txt +++ b/ets2panda/test/parser/ets/async_with_lambda-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "async_with_lambda.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "async_with_lambda.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "async_with_lambda.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "async_with_lambda.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "async_with_lambda.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "async_with_lambda.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "async_with_lambda.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "async_with_lambda.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/await_complex_promise-expected.txt b/ets2panda/test/parser/ets/await_complex_promise-expected.txt index 1a81850799003b49deca4d9d8cb1896b03660969..e9f61b9357d2ce97acf33cb97e6137a8b72532d1 100644 --- a/ets2panda/test/parser/ets/await_complex_promise-expected.txt +++ b/ets2panda/test/parser/ets/await_complex_promise-expected.txt @@ -337,112 +337,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "await_complex_promise.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "await_complex_promise.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "await_complex_promise.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "await_complex_promise.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "await_complex_promise.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "await_complex_promise.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "await_complex_promise.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "await_complex_promise.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/await_keyword-expected.txt b/ets2panda/test/parser/ets/await_keyword-expected.txt index eb68f44567d8663e460289c84e7a21bb9d6a4a78..f9b5c11889f0ad98831ef928fa5dd475a213f229 100644 --- a/ets2panda/test/parser/ets/await_keyword-expected.txt +++ b/ets2panda/test/parser/ets/await_keyword-expected.txt @@ -130,2014 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "asyncLambda", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "await_keyword.ets" - }, - "end": { - "line": 22, - "column": 16, - "program": "await_keyword.ets" - } - } - }, - "right": { - "type": "ArrowFunctionExpression", - "function": { - "type": "ScriptFunction", - "id": null, - "generator": false, - "async": true, - "expression": false, - "params": [], - "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "Promise", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 59, - "program": "await_keyword.ets" - }, - "end": { - "line": 22, - "column": 66, - "program": "await_keyword.ets" - } - } - }, - "typeParams": { - "type": "TSTypeParameterInstantiation", - "params": [ - { - "type": "ETSUnionType", - "types": [ - { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "Object", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 67, - "program": "await_keyword.ets" - }, - "end": { - "line": 22, - "column": 73, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 67, - "program": "await_keyword.ets" - }, - "end": { - "line": 22, - "column": 73, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 67, - "program": "await_keyword.ets" - }, - "end": { - "line": 22, - "column": 73, - "program": "await_keyword.ets" - } - } - }, - { - "type": "ETSNullType", - "loc": { - "start": { - "line": 22, - "column": 76, - "program": "await_keyword.ets" - }, - "end": { - "line": 22, - "column": 80, - "program": "await_keyword.ets" - } - } - } - ], - "loc": { - "start": { - "line": 22, - "column": 67, - "program": "await_keyword.ets" - }, - "end": { - "line": 22, - "column": 80, - "program": "await_keyword.ets" - } - } - } - ], - "loc": { - "start": { - "line": 22, - "column": 66, - "program": "await_keyword.ets" - }, - "end": { - "line": 22, - "column": 81, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 59, - "program": "await_keyword.ets" - }, - "end": { - "line": 22, - "column": 81, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 59, - "program": "await_keyword.ets" - }, - "end": { - "line": 22, - "column": 81, - "program": "await_keyword.ets" - } - } - }, - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "VariableDeclaration", - "declarations": [ - { - "type": "VariableDeclarator", - "id": { - "type": "Identifier", - "name": "promise", - "typeAnnotation": { - "type": "ETSUnionType", - "types": [ - { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "Promise", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 18, - "program": "await_keyword.ets" - }, - "end": { - "line": 23, - "column": 25, - "program": "await_keyword.ets" - } - } - }, - "typeParams": { - "type": "TSTypeParameterInstantiation", - "params": [ - { - "type": "ETSUnionType", - "types": [ - { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "Object", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 26, - "program": "await_keyword.ets" - }, - "end": { - "line": 23, - "column": 32, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 26, - "program": "await_keyword.ets" - }, - "end": { - "line": 23, - "column": 32, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 26, - "program": "await_keyword.ets" - }, - "end": { - "line": 23, - "column": 32, - "program": "await_keyword.ets" - } - } - }, - { - "type": "ETSNullType", - "loc": { - "start": { - "line": 23, - "column": 35, - "program": "await_keyword.ets" - }, - "end": { - "line": 23, - "column": 39, - "program": "await_keyword.ets" - } - } - } - ], - "loc": { - "start": { - "line": 23, - "column": 26, - "program": "await_keyword.ets" - }, - "end": { - "line": 23, - "column": 39, - "program": "await_keyword.ets" - } - } - } - ], - "loc": { - "start": { - "line": 23, - "column": 25, - "program": "await_keyword.ets" - }, - "end": { - "line": 23, - "column": 40, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 18, - "program": "await_keyword.ets" - }, - "end": { - "line": 23, - "column": 40, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 18, - "program": "await_keyword.ets" - }, - "end": { - "line": 23, - "column": 40, - "program": "await_keyword.ets" - } - } - }, - { - "type": "ETSNullType", - "loc": { - "start": { - "line": 23, - "column": 43, - "program": "await_keyword.ets" - }, - "end": { - "line": 23, - "column": 47, - "program": "await_keyword.ets" - } - } - } - ], - "loc": { - "start": { - "line": 23, - "column": 18, - "program": "await_keyword.ets" - }, - "end": { - "line": 23, - "column": 47, - "program": "await_keyword.ets" - } - } - }, - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 9, - "program": "await_keyword.ets" - }, - "end": { - "line": 23, - "column": 16, - "program": "await_keyword.ets" - } - } - }, - "init": { - "type": "CallExpression", - "callee": { - "type": "ArrowFunctionExpression", - "function": { - "type": "ScriptFunction", - "id": null, - "generator": false, - "async": false, - "expression": false, - "params": [], - "returnType": { - "type": "ETSUnionType", - "types": [ - { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "Promise", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 54, - "program": "await_keyword.ets" - }, - "end": { - "line": 23, - "column": 61, - "program": "await_keyword.ets" - } - } - }, - "typeParams": { - "type": "TSTypeParameterInstantiation", - "params": [ - { - "type": "ETSUnionType", - "types": [ - { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "Object", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 62, - "program": "await_keyword.ets" - }, - "end": { - "line": 23, - "column": 68, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 62, - "program": "await_keyword.ets" - }, - "end": { - "line": 23, - "column": 68, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 62, - "program": "await_keyword.ets" - }, - "end": { - "line": 23, - "column": 68, - "program": "await_keyword.ets" - } - } - }, - { - "type": "ETSNullType", - "loc": { - "start": { - "line": 23, - "column": 71, - "program": "await_keyword.ets" - }, - "end": { - "line": 23, - "column": 75, - "program": "await_keyword.ets" - } - } - } - ], - "loc": { - "start": { - "line": 23, - "column": 62, - "program": "await_keyword.ets" - }, - "end": { - "line": 23, - "column": 75, - "program": "await_keyword.ets" - } - } - } - ], - "loc": { - "start": { - "line": 23, - "column": 61, - "program": "await_keyword.ets" - }, - "end": { - "line": 23, - "column": 76, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 54, - "program": "await_keyword.ets" - }, - "end": { - "line": 23, - "column": 76, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 54, - "program": "await_keyword.ets" - }, - "end": { - "line": 23, - "column": 76, - "program": "await_keyword.ets" - } - } - }, - { - "type": "ETSNullType", - "loc": { - "start": { - "line": 23, - "column": 79, - "program": "await_keyword.ets" - }, - "end": { - "line": 23, - "column": 83, - "program": "await_keyword.ets" - } - } - } - ], - "loc": { - "start": { - "line": 23, - "column": 54, - "program": "await_keyword.ets" - }, - "end": { - "line": 23, - "column": 83, - "program": "await_keyword.ets" - } - } - }, - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ReturnStatement", - "argument": { - "type": "NullLiteral", - "value": null, - "loc": { - "start": { - "line": 23, - "column": 96, - "program": "await_keyword.ets" - }, - "end": { - "line": 23, - "column": 100, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 89, - "program": "await_keyword.ets" - }, - "end": { - "line": 23, - "column": 101, - "program": "await_keyword.ets" - } - } - } - ], - "loc": { - "start": { - "line": 23, - "column": 87, - "program": "await_keyword.ets" - }, - "end": { - "line": 23, - "column": 103, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 50, - "program": "await_keyword.ets" - }, - "end": { - "line": 23, - "column": 103, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 50, - "program": "await_keyword.ets" - }, - "end": { - "line": 23, - "column": 103, - "program": "await_keyword.ets" - } - } - }, - "arguments": [], - "optional": false, - "loc": { - "start": { - "line": 23, - "column": 50, - "program": "await_keyword.ets" - }, - "end": { - "line": 23, - "column": 105, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 9, - "program": "await_keyword.ets" - }, - "end": { - "line": 23, - "column": 105, - "program": "await_keyword.ets" - } - } - } - ], - "kind": "let", - "loc": { - "start": { - "line": 23, - "column": 5, - "program": "await_keyword.ets" - }, - "end": { - "line": 23, - "column": 106, - "program": "await_keyword.ets" - } - } - }, - { - "type": "VariableDeclaration", - "declarations": [ - { - "type": "VariableDeclarator", - "id": { - "type": "Identifier", - "name": "obj", - "typeAnnotation": { - "type": "ETSUnionType", - "types": [ - { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "Object", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 14, - "program": "await_keyword.ets" - }, - "end": { - "line": 24, - "column": 20, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 14, - "program": "await_keyword.ets" - }, - "end": { - "line": 24, - "column": 20, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 14, - "program": "await_keyword.ets" - }, - "end": { - "line": 24, - "column": 20, - "program": "await_keyword.ets" - } - } - }, - { - "type": "ETSNullType", - "loc": { - "start": { - "line": 24, - "column": 23, - "program": "await_keyword.ets" - }, - "end": { - "line": 24, - "column": 27, - "program": "await_keyword.ets" - } - } - } - ], - "loc": { - "start": { - "line": 24, - "column": 14, - "program": "await_keyword.ets" - }, - "end": { - "line": 24, - "column": 27, - "program": "await_keyword.ets" - } - } - }, - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 9, - "program": "await_keyword.ets" - }, - "end": { - "line": 24, - "column": 12, - "program": "await_keyword.ets" - } - } - }, - "init": { - "type": "AwaitExpression", - "argument": { - "type": "TSNonNullExpression", - "expression": { - "type": "Identifier", - "name": "promise", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 36, - "program": "await_keyword.ets" - }, - "end": { - "line": 24, - "column": 43, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 36, - "program": "await_keyword.ets" - }, - "end": { - "line": 24, - "column": 44, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 30, - "program": "await_keyword.ets" - }, - "end": { - "line": 24, - "column": 44, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 9, - "program": "await_keyword.ets" - }, - "end": { - "line": 24, - "column": 44, - "program": "await_keyword.ets" - } - } - } - ], - "kind": "let", - "loc": { - "start": { - "line": 24, - "column": 5, - "program": "await_keyword.ets" - }, - "end": { - "line": 24, - "column": 45, - "program": "await_keyword.ets" - } - } - }, - { - "type": "ReturnStatement", - "argument": { - "type": "Identifier", - "name": "promise", - "decorators": [], - "loc": { - "start": { - "line": 25, - "column": 12, - "program": "await_keyword.ets" - }, - "end": { - "line": 25, - "column": 19, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 25, - "column": 5, - "program": "await_keyword.ets" - }, - "end": { - "line": 25, - "column": 20, - "program": "await_keyword.ets" - } - } - } - ], - "loc": { - "start": { - "line": 22, - "column": 85, - "program": "await_keyword.ets" - }, - "end": { - "line": 26, - "column": 2, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 55, - "program": "await_keyword.ets" - }, - "end": { - "line": 26, - "column": 2, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 55, - "program": "await_keyword.ets" - }, - "end": { - "line": 26, - "column": 2, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "await_keyword.ets" - }, - "end": { - "line": 26, - "column": 2, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "await_keyword.ets" - }, - "end": { - "line": 26, - "column": 2, - "program": "await_keyword.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "lambda", - "decorators": [], - "loc": { - "start": { - "line": 33, - "column": 5, - "program": "await_keyword.ets" - }, - "end": { - "line": 33, - "column": 11, - "program": "await_keyword.ets" - } - } - }, - "right": { - "type": "ArrowFunctionExpression", - "function": { - "type": "ScriptFunction", - "id": null, - "generator": false, - "async": false, - "expression": false, - "params": [], - "returnType": { - "type": "ETSPrimitiveType", - "loc": { - "start": { - "line": 33, - "column": 30, - "program": "await_keyword.ets" - }, - "end": { - "line": 33, - "column": 34, - "program": "await_keyword.ets" - } - } - }, - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "VariableDeclaration", - "declarations": [ - { - "type": "VariableDeclarator", - "id": { - "type": "Identifier", - "name": "promise", - "typeAnnotation": { - "type": "ETSUnionType", - "types": [ - { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "Promise", - "decorators": [], - "loc": { - "start": { - "line": 34, - "column": 18, - "program": "await_keyword.ets" - }, - "end": { - "line": 34, - "column": 25, - "program": "await_keyword.ets" - } - } - }, - "typeParams": { - "type": "TSTypeParameterInstantiation", - "params": [ - { - "type": "ETSUnionType", - "types": [ - { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "Object", - "decorators": [], - "loc": { - "start": { - "line": 34, - "column": 26, - "program": "await_keyword.ets" - }, - "end": { - "line": 34, - "column": 32, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 34, - "column": 26, - "program": "await_keyword.ets" - }, - "end": { - "line": 34, - "column": 32, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 34, - "column": 26, - "program": "await_keyword.ets" - }, - "end": { - "line": 34, - "column": 32, - "program": "await_keyword.ets" - } - } - }, - { - "type": "ETSNullType", - "loc": { - "start": { - "line": 34, - "column": 35, - "program": "await_keyword.ets" - }, - "end": { - "line": 34, - "column": 39, - "program": "await_keyword.ets" - } - } - } - ], - "loc": { - "start": { - "line": 34, - "column": 26, - "program": "await_keyword.ets" - }, - "end": { - "line": 34, - "column": 39, - "program": "await_keyword.ets" - } - } - } - ], - "loc": { - "start": { - "line": 34, - "column": 25, - "program": "await_keyword.ets" - }, - "end": { - "line": 34, - "column": 40, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 34, - "column": 18, - "program": "await_keyword.ets" - }, - "end": { - "line": 34, - "column": 40, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 34, - "column": 18, - "program": "await_keyword.ets" - }, - "end": { - "line": 34, - "column": 40, - "program": "await_keyword.ets" - } - } - }, - { - "type": "ETSNullType", - "loc": { - "start": { - "line": 34, - "column": 43, - "program": "await_keyword.ets" - }, - "end": { - "line": 34, - "column": 47, - "program": "await_keyword.ets" - } - } - } - ], - "loc": { - "start": { - "line": 34, - "column": 18, - "program": "await_keyword.ets" - }, - "end": { - "line": 34, - "column": 47, - "program": "await_keyword.ets" - } - } - }, - "decorators": [], - "loc": { - "start": { - "line": 34, - "column": 9, - "program": "await_keyword.ets" - }, - "end": { - "line": 34, - "column": 16, - "program": "await_keyword.ets" - } - } - }, - "init": { - "type": "CallExpression", - "callee": { - "type": "ArrowFunctionExpression", - "function": { - "type": "ScriptFunction", - "id": null, - "generator": false, - "async": false, - "expression": false, - "params": [], - "returnType": { - "type": "ETSUnionType", - "types": [ - { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "Promise", - "decorators": [], - "loc": { - "start": { - "line": 34, - "column": 54, - "program": "await_keyword.ets" - }, - "end": { - "line": 34, - "column": 61, - "program": "await_keyword.ets" - } - } - }, - "typeParams": { - "type": "TSTypeParameterInstantiation", - "params": [ - { - "type": "ETSUnionType", - "types": [ - { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "Object", - "decorators": [], - "loc": { - "start": { - "line": 34, - "column": 62, - "program": "await_keyword.ets" - }, - "end": { - "line": 34, - "column": 68, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 34, - "column": 62, - "program": "await_keyword.ets" - }, - "end": { - "line": 34, - "column": 68, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 34, - "column": 62, - "program": "await_keyword.ets" - }, - "end": { - "line": 34, - "column": 68, - "program": "await_keyword.ets" - } - } - }, - { - "type": "ETSNullType", - "loc": { - "start": { - "line": 34, - "column": 71, - "program": "await_keyword.ets" - }, - "end": { - "line": 34, - "column": 75, - "program": "await_keyword.ets" - } - } - } - ], - "loc": { - "start": { - "line": 34, - "column": 62, - "program": "await_keyword.ets" - }, - "end": { - "line": 34, - "column": 75, - "program": "await_keyword.ets" - } - } - } - ], - "loc": { - "start": { - "line": 34, - "column": 61, - "program": "await_keyword.ets" - }, - "end": { - "line": 34, - "column": 76, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 34, - "column": 54, - "program": "await_keyword.ets" - }, - "end": { - "line": 34, - "column": 76, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 34, - "column": 54, - "program": "await_keyword.ets" - }, - "end": { - "line": 34, - "column": 76, - "program": "await_keyword.ets" - } - } - }, - { - "type": "ETSNullType", - "loc": { - "start": { - "line": 34, - "column": 79, - "program": "await_keyword.ets" - }, - "end": { - "line": 34, - "column": 83, - "program": "await_keyword.ets" - } - } - } - ], - "loc": { - "start": { - "line": 34, - "column": 54, - "program": "await_keyword.ets" - }, - "end": { - "line": 34, - "column": 83, - "program": "await_keyword.ets" - } - } - }, - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ReturnStatement", - "argument": { - "type": "NullLiteral", - "value": null, - "loc": { - "start": { - "line": 34, - "column": 96, - "program": "await_keyword.ets" - }, - "end": { - "line": 34, - "column": 100, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 34, - "column": 89, - "program": "await_keyword.ets" - }, - "end": { - "line": 34, - "column": 101, - "program": "await_keyword.ets" - } - } - } - ], - "loc": { - "start": { - "line": 34, - "column": 87, - "program": "await_keyword.ets" - }, - "end": { - "line": 34, - "column": 103, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 34, - "column": 50, - "program": "await_keyword.ets" - }, - "end": { - "line": 34, - "column": 103, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 34, - "column": 50, - "program": "await_keyword.ets" - }, - "end": { - "line": 34, - "column": 103, - "program": "await_keyword.ets" - } - } - }, - "arguments": [], - "optional": false, - "loc": { - "start": { - "line": 34, - "column": 50, - "program": "await_keyword.ets" - }, - "end": { - "line": 34, - "column": 105, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 34, - "column": 9, - "program": "await_keyword.ets" - }, - "end": { - "line": 34, - "column": 105, - "program": "await_keyword.ets" - } - } - } - ], - "kind": "let", - "loc": { - "start": { - "line": 34, - "column": 5, - "program": "await_keyword.ets" - }, - "end": { - "line": 34, - "column": 106, - "program": "await_keyword.ets" - } - } - }, - { - "type": "VariableDeclaration", - "declarations": [ - { - "type": "VariableDeclarator", - "id": { - "type": "Identifier", - "name": "obj", - "typeAnnotation": { - "type": "ETSUnionType", - "types": [ - { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "Object", - "decorators": [], - "loc": { - "start": { - "line": 35, - "column": 14, - "program": "await_keyword.ets" - }, - "end": { - "line": 35, - "column": 20, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 35, - "column": 14, - "program": "await_keyword.ets" - }, - "end": { - "line": 35, - "column": 20, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 35, - "column": 14, - "program": "await_keyword.ets" - }, - "end": { - "line": 35, - "column": 20, - "program": "await_keyword.ets" - } - } - }, - { - "type": "ETSNullType", - "loc": { - "start": { - "line": 35, - "column": 23, - "program": "await_keyword.ets" - }, - "end": { - "line": 35, - "column": 27, - "program": "await_keyword.ets" - } - } - } - ], - "loc": { - "start": { - "line": 35, - "column": 14, - "program": "await_keyword.ets" - }, - "end": { - "line": 35, - "column": 27, - "program": "await_keyword.ets" - } - } - }, - "decorators": [], - "loc": { - "start": { - "line": 35, - "column": 9, - "program": "await_keyword.ets" - }, - "end": { - "line": 35, - "column": 12, - "program": "await_keyword.ets" - } - } - }, - "init": { - "type": "AwaitExpression", - "argument": { - "type": "TSNonNullExpression", - "expression": { - "type": "Identifier", - "name": "promise", - "decorators": [], - "loc": { - "start": { - "line": 35, - "column": 36, - "program": "await_keyword.ets" - }, - "end": { - "line": 35, - "column": 43, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 35, - "column": 36, - "program": "await_keyword.ets" - }, - "end": { - "line": 35, - "column": 44, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 35, - "column": 30, - "program": "await_keyword.ets" - }, - "end": { - "line": 35, - "column": 44, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 35, - "column": 9, - "program": "await_keyword.ets" - }, - "end": { - "line": 35, - "column": 44, - "program": "await_keyword.ets" - } - } - } - ], - "kind": "let", - "loc": { - "start": { - "line": 35, - "column": 5, - "program": "await_keyword.ets" - }, - "end": { - "line": 35, - "column": 45, - "program": "await_keyword.ets" - } - } - } - ], - "loc": { - "start": { - "line": 33, - "column": 38, - "program": "await_keyword.ets" - }, - "end": { - "line": 36, - "column": 2, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 33, - "column": 26, - "program": "await_keyword.ets" - }, - "end": { - "line": 36, - "column": 2, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 33, - "column": 26, - "program": "await_keyword.ets" - }, - "end": { - "line": 36, - "column": 2, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 33, - "column": 5, - "program": "await_keyword.ets" - }, - "end": { - "line": 36, - "column": 2, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 33, - "column": 5, - "program": "await_keyword.ets" - }, - "end": { - "line": 36, - "column": 2, - "program": "await_keyword.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "promise", - "decorators": [], - "loc": { - "start": { - "line": 38, - "column": 5, - "program": "await_keyword.ets" - }, - "end": { - "line": 38, - "column": 12, - "program": "await_keyword.ets" - } - } - }, - "right": { - "type": "NullLiteral", - "value": null, - "loc": { - "start": { - "line": 38, - "column": 46, - "program": "await_keyword.ets" - }, - "end": { - "line": 38, - "column": 50, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 38, - "column": 5, - "program": "await_keyword.ets" - }, - "end": { - "line": 38, - "column": 50, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 38, - "column": 5, - "program": "await_keyword.ets" - }, - "end": { - "line": 38, - "column": 50, - "program": "await_keyword.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "obj", - "decorators": [], - "loc": { - "start": { - "line": 39, - "column": 5, - "program": "await_keyword.ets" - }, - "end": { - "line": 39, - "column": 8, - "program": "await_keyword.ets" - } - } - }, - "right": { - "type": "AwaitExpression", - "argument": { - "type": "TSNonNullExpression", - "expression": { - "type": "Identifier", - "name": "promise", - "decorators": [], - "loc": { - "start": { - "line": 39, - "column": 32, - "program": "await_keyword.ets" - }, - "end": { - "line": 39, - "column": 39, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 39, - "column": 32, - "program": "await_keyword.ets" - }, - "end": { - "line": 39, - "column": 40, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 39, - "column": 26, - "program": "await_keyword.ets" - }, - "end": { - "line": 39, - "column": 40, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 39, - "column": 5, - "program": "await_keyword.ets" - }, - "end": { - "line": 39, - "column": 40, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 39, - "column": 5, - "program": "await_keyword.ets" - }, - "end": { - "line": 39, - "column": 40, - "program": "await_keyword.ets" - } - } - } - ], - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "await_keyword.ets" - }, - "end": { - "line": 39, - "column": 40, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "await_keyword.ets" - }, - "end": { - "line": 39, - "column": 40, - "program": "await_keyword.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "await_keyword.ets" - }, - "end": { - "line": 39, - "column": 40, - "program": "await_keyword.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "await_keyword.ets" - }, - "end": { - "line": 39, - "column": 40, - "program": "await_keyword.ets" - } - } - }, { "type": "MethodDefinition", "key": { @@ -3289,8 +1281,8 @@ "program": "await_keyword.ets" }, "end": { - "line": 26, - "column": 2, + "line": 22, + "column": 55, "program": "await_keyword.ets" } } @@ -4158,8 +2150,8 @@ "program": "await_keyword.ets" }, "end": { - "line": 36, - "column": 2, + "line": 33, + "column": 26, "program": "await_keyword.ets" } } @@ -4374,7 +2366,7 @@ }, "end": { "line": 38, - "column": 50, + "column": 46, "program": "await_keyword.ets" } } @@ -4493,7 +2485,7 @@ }, "end": { "line": 39, - "column": 40, + "column": 26, "program": "await_keyword.ets" } } diff --git a/ets2panda/test/parser/ets/binary_op-expected.txt b/ets2panda/test/parser/ets/binary_op-expected.txt index e6e6d1b35cea83428fa5979f377f4f915111d753..adf53b1d992922df3537d9ceb6368f778c23a50e 100644 --- a/ets2panda/test/parser/ets/binary_op-expected.txt +++ b/ets2panda/test/parser/ets/binary_op-expected.txt @@ -130,5718 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 17, - "column": 6, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 1, - "loc": { - "start": { - "line": 17, - "column": 9, - "program": "binary_op.ets" - }, - "end": { - "line": 17, - "column": 10, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 17, - "column": 10, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 17, - "column": 10, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "j", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 18, - "column": 6, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 2, - "loc": { - "start": { - "line": 18, - "column": 9, - "program": "binary_op.ets" - }, - "end": { - "line": 18, - "column": 10, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 18, - "column": 10, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 18, - "column": 10, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b1", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 19, - "column": 7, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BooleanLiteral", - "value": true, - "loc": { - "start": { - "line": 19, - "column": 10, - "program": "binary_op.ets" - }, - "end": { - "line": 19, - "column": 14, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 19, - "column": 14, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 19, - "column": 14, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b2", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 20, - "column": 7, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BooleanLiteral", - "value": false, - "loc": { - "start": { - "line": 20, - "column": 10, - "program": "binary_op.ets" - }, - "end": { - "line": 20, - "column": 15, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 20, - "column": 15, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 20, - "column": 15, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "r1", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 21, - "column": 7, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "ETSNewClassInstanceExpression", - "typeReference": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "Object", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 14, - "program": "binary_op.ets" - }, - "end": { - "line": 21, - "column": 20, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 14, - "program": "binary_op.ets" - }, - "end": { - "line": 21, - "column": 20, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 14, - "program": "binary_op.ets" - }, - "end": { - "line": 21, - "column": 20, - "program": "binary_op.ets" - } - } - }, - "arguments": [], - "loc": { - "start": { - "line": 21, - "column": 10, - "program": "binary_op.ets" - }, - "end": { - "line": 21, - "column": 23, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 21, - "column": 23, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 21, - "column": 23, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "r2", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 22, - "column": 7, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "NullLiteral", - "value": null, - "loc": { - "start": { - "line": 22, - "column": 25, - "program": "binary_op.ets" - }, - "end": { - "line": 22, - "column": 29, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 22, - "column": 29, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 22, - "column": 29, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "r3", - "decorators": [], - "loc": { - "start": { - "line": 25, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 25, - "column": 7, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "LogicalExpression", - "operator": "??", - "left": { - "type": "Identifier", - "name": "r1", - "decorators": [], - "loc": { - "start": { - "line": 25, - "column": 10, - "program": "binary_op.ets" - }, - "end": { - "line": 25, - "column": 12, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "r2", - "decorators": [], - "loc": { - "start": { - "line": 25, - "column": 16, - "program": "binary_op.ets" - }, - "end": { - "line": 25, - "column": 18, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 25, - "column": 10, - "program": "binary_op.ets" - }, - "end": { - "line": 25, - "column": 18, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 25, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 25, - "column": 18, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 25, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 25, - "column": 18, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "r4", - "decorators": [], - "loc": { - "start": { - "line": 26, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 26, - "column": 7, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "LogicalExpression", - "operator": "??", - "left": { - "type": "LogicalExpression", - "operator": "??", - "left": { - "type": "Identifier", - "name": "r1", - "decorators": [], - "loc": { - "start": { - "line": 26, - "column": 10, - "program": "binary_op.ets" - }, - "end": { - "line": 26, - "column": 12, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "r2", - "decorators": [], - "loc": { - "start": { - "line": 26, - "column": 16, - "program": "binary_op.ets" - }, - "end": { - "line": 26, - "column": 18, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 26, - "column": 10, - "program": "binary_op.ets" - }, - "end": { - "line": 26, - "column": 18, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "r3", - "decorators": [], - "loc": { - "start": { - "line": 26, - "column": 22, - "program": "binary_op.ets" - }, - "end": { - "line": 26, - "column": 24, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 26, - "column": 16, - "program": "binary_op.ets" - }, - "end": { - "line": 26, - "column": 24, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 26, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 26, - "column": 24, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 26, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 26, - "column": 24, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b01", - "decorators": [], - "loc": { - "start": { - "line": 29, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 29, - "column": 8, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "LogicalExpression", - "operator": "&&", - "left": { - "type": "Identifier", - "name": "b1", - "decorators": [], - "loc": { - "start": { - "line": 29, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 29, - "column": 13, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "b2", - "decorators": [], - "loc": { - "start": { - "line": 29, - "column": 17, - "program": "binary_op.ets" - }, - "end": { - "line": 29, - "column": 19, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 29, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 29, - "column": 19, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 29, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 29, - "column": 19, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 29, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 29, - "column": 19, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b02", - "decorators": [], - "loc": { - "start": { - "line": 30, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 30, - "column": 8, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "LogicalExpression", - "operator": "||", - "left": { - "type": "Identifier", - "name": "b1", - "decorators": [], - "loc": { - "start": { - "line": 30, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 30, - "column": 13, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "b2", - "decorators": [], - "loc": { - "start": { - "line": 30, - "column": 17, - "program": "binary_op.ets" - }, - "end": { - "line": 30, - "column": 19, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 30, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 30, - "column": 19, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 30, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 30, - "column": 19, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 30, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 30, - "column": 19, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b03", - "decorators": [], - "loc": { - "start": { - "line": 31, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 31, - "column": 8, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "LogicalExpression", - "operator": "&&", - "left": { - "type": "LogicalExpression", - "operator": "&&", - "left": { - "type": "LogicalExpression", - "operator": "&&", - "left": { - "type": "Identifier", - "name": "b1", - "decorators": [], - "loc": { - "start": { - "line": 31, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 31, - "column": 13, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "b2", - "decorators": [], - "loc": { - "start": { - "line": 31, - "column": 17, - "program": "binary_op.ets" - }, - "end": { - "line": 31, - "column": 19, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 31, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 31, - "column": 19, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "b01", - "decorators": [], - "loc": { - "start": { - "line": 31, - "column": 23, - "program": "binary_op.ets" - }, - "end": { - "line": 31, - "column": 26, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 31, - "column": 17, - "program": "binary_op.ets" - }, - "end": { - "line": 31, - "column": 26, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "b02", - "decorators": [], - "loc": { - "start": { - "line": 31, - "column": 30, - "program": "binary_op.ets" - }, - "end": { - "line": 31, - "column": 33, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 31, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 31, - "column": 33, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 31, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 31, - "column": 33, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 31, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 31, - "column": 33, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b04", - "decorators": [], - "loc": { - "start": { - "line": 32, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 32, - "column": 8, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "LogicalExpression", - "operator": "||", - "left": { - "type": "LogicalExpression", - "operator": "||", - "left": { - "type": "LogicalExpression", - "operator": "||", - "left": { - "type": "Identifier", - "name": "b1", - "decorators": [], - "loc": { - "start": { - "line": 32, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 32, - "column": 13, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "b2", - "decorators": [], - "loc": { - "start": { - "line": 32, - "column": 17, - "program": "binary_op.ets" - }, - "end": { - "line": 32, - "column": 19, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 32, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 32, - "column": 19, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "b01", - "decorators": [], - "loc": { - "start": { - "line": 32, - "column": 23, - "program": "binary_op.ets" - }, - "end": { - "line": 32, - "column": 26, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 32, - "column": 17, - "program": "binary_op.ets" - }, - "end": { - "line": 32, - "column": 26, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "b02", - "decorators": [], - "loc": { - "start": { - "line": 32, - "column": 30, - "program": "binary_op.ets" - }, - "end": { - "line": 32, - "column": 33, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 32, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 32, - "column": 33, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 32, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 32, - "column": 33, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 32, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 32, - "column": 33, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b05", - "decorators": [], - "loc": { - "start": { - "line": 33, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 33, - "column": 8, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "LogicalExpression", - "operator": "||", - "left": { - "type": "LogicalExpression", - "operator": "||", - "left": { - "type": "LogicalExpression", - "operator": "&&", - "left": { - "type": "Identifier", - "name": "b1", - "decorators": [], - "loc": { - "start": { - "line": 33, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 33, - "column": 13, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "b2", - "decorators": [], - "loc": { - "start": { - "line": 33, - "column": 17, - "program": "binary_op.ets" - }, - "end": { - "line": 33, - "column": 19, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 33, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 33, - "column": 19, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "b01", - "decorators": [], - "loc": { - "start": { - "line": 33, - "column": 23, - "program": "binary_op.ets" - }, - "end": { - "line": 33, - "column": 26, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 33, - "column": 17, - "program": "binary_op.ets" - }, - "end": { - "line": 33, - "column": 26, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "b02", - "decorators": [], - "loc": { - "start": { - "line": 33, - "column": 30, - "program": "binary_op.ets" - }, - "end": { - "line": 33, - "column": 33, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 33, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 33, - "column": 33, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 33, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 33, - "column": 33, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 33, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 33, - "column": 33, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b06", - "decorators": [], - "loc": { - "start": { - "line": 34, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 34, - "column": 8, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "LogicalExpression", - "operator": "||", - "left": { - "type": "Identifier", - "name": "b1", - "decorators": [], - "loc": { - "start": { - "line": 34, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 34, - "column": 13, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "LogicalExpression", - "operator": "&&", - "left": { - "type": "LogicalExpression", - "operator": "&&", - "left": { - "type": "Identifier", - "name": "b2", - "decorators": [], - "loc": { - "start": { - "line": 34, - "column": 17, - "program": "binary_op.ets" - }, - "end": { - "line": 34, - "column": 19, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "b01", - "decorators": [], - "loc": { - "start": { - "line": 34, - "column": 23, - "program": "binary_op.ets" - }, - "end": { - "line": 34, - "column": 26, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 34, - "column": 17, - "program": "binary_op.ets" - }, - "end": { - "line": 34, - "column": 26, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "b02", - "decorators": [], - "loc": { - "start": { - "line": 34, - "column": 30, - "program": "binary_op.ets" - }, - "end": { - "line": 34, - "column": 33, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 34, - "column": 23, - "program": "binary_op.ets" - }, - "end": { - "line": 34, - "column": 33, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 34, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 34, - "column": 33, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 34, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 34, - "column": 33, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 34, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 34, - "column": 33, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "i01", - "decorators": [], - "loc": { - "start": { - "line": 37, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 37, - "column": 8, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": "&", - "left": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 37, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 37, - "column": 12, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "j", - "decorators": [], - "loc": { - "start": { - "line": 37, - "column": 15, - "program": "binary_op.ets" - }, - "end": { - "line": 37, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 37, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 37, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 37, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 37, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 37, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 37, - "column": 16, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "i02", - "decorators": [], - "loc": { - "start": { - "line": 38, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 38, - "column": 8, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": "^", - "left": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 38, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 38, - "column": 12, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "j", - "decorators": [], - "loc": { - "start": { - "line": 38, - "column": 15, - "program": "binary_op.ets" - }, - "end": { - "line": 38, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 38, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 38, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 38, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 38, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 38, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 38, - "column": 16, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "i03", - "decorators": [], - "loc": { - "start": { - "line": 39, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 39, - "column": 8, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": "|", - "left": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 39, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 39, - "column": 12, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "j", - "decorators": [], - "loc": { - "start": { - "line": 39, - "column": 15, - "program": "binary_op.ets" - }, - "end": { - "line": 39, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 39, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 39, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 39, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 39, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 39, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 39, - "column": 16, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "i04", - "decorators": [], - "loc": { - "start": { - "line": 40, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 40, - "column": 8, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": "|", - "left": { - "type": "BinaryExpression", - "operator": "^", - "left": { - "type": "BinaryExpression", - "operator": "&", - "left": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 40, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 40, - "column": 12, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "j", - "decorators": [], - "loc": { - "start": { - "line": 40, - "column": 15, - "program": "binary_op.ets" - }, - "end": { - "line": 40, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 40, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 40, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": "&", - "left": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 40, - "column": 19, - "program": "binary_op.ets" - }, - "end": { - "line": 40, - "column": 20, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "j", - "decorators": [], - "loc": { - "start": { - "line": 40, - "column": 23, - "program": "binary_op.ets" - }, - "end": { - "line": 40, - "column": 24, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 40, - "column": 19, - "program": "binary_op.ets" - }, - "end": { - "line": 40, - "column": 24, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 40, - "column": 15, - "program": "binary_op.ets" - }, - "end": { - "line": 40, - "column": 24, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": "^", - "left": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 40, - "column": 27, - "program": "binary_op.ets" - }, - "end": { - "line": 40, - "column": 28, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "j", - "decorators": [], - "loc": { - "start": { - "line": 40, - "column": 31, - "program": "binary_op.ets" - }, - "end": { - "line": 40, - "column": 32, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 40, - "column": 27, - "program": "binary_op.ets" - }, - "end": { - "line": 40, - "column": 32, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 40, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 40, - "column": 32, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 40, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 40, - "column": 32, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 40, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 40, - "column": 32, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b07", - "decorators": [], - "loc": { - "start": { - "line": 43, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 43, - "column": 8, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": "!=", - "left": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 43, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 43, - "column": 12, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "j", - "decorators": [], - "loc": { - "start": { - "line": 43, - "column": 16, - "program": "binary_op.ets" - }, - "end": { - "line": 43, - "column": 17, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 43, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 43, - "column": 17, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 43, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 43, - "column": 17, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 43, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 43, - "column": 17, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b08", - "decorators": [], - "loc": { - "start": { - "line": 44, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 44, - "column": 8, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": "==", - "left": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 44, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 44, - "column": 12, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "j", - "decorators": [], - "loc": { - "start": { - "line": 44, - "column": 16, - "program": "binary_op.ets" - }, - "end": { - "line": 44, - "column": 17, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 44, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 44, - "column": 17, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 44, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 44, - "column": 17, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 44, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 44, - "column": 17, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b09", - "decorators": [], - "loc": { - "start": { - "line": 45, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 45, - "column": 8, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": "!==", - "left": { - "type": "Identifier", - "name": "r1", - "decorators": [], - "loc": { - "start": { - "line": 45, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 45, - "column": 13, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "r2", - "decorators": [], - "loc": { - "start": { - "line": 45, - "column": 18, - "program": "binary_op.ets" - }, - "end": { - "line": 45, - "column": 20, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 45, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 45, - "column": 20, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 45, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 45, - "column": 20, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 45, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 45, - "column": 20, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b10", - "decorators": [], - "loc": { - "start": { - "line": 46, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 46, - "column": 8, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": "===", - "left": { - "type": "Identifier", - "name": "r1", - "decorators": [], - "loc": { - "start": { - "line": 46, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 46, - "column": 13, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "r2", - "decorators": [], - "loc": { - "start": { - "line": 46, - "column": 18, - "program": "binary_op.ets" - }, - "end": { - "line": 46, - "column": 20, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 46, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 46, - "column": 20, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 46, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 46, - "column": 20, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 46, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 46, - "column": 20, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b12", - "decorators": [], - "loc": { - "start": { - "line": 49, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 49, - "column": 8, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": "<", - "left": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 49, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 49, - "column": 12, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "j", - "decorators": [], - "loc": { - "start": { - "line": 49, - "column": 15, - "program": "binary_op.ets" - }, - "end": { - "line": 49, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 49, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 49, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 49, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 49, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 49, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 49, - "column": 16, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b13", - "decorators": [], - "loc": { - "start": { - "line": 50, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 50, - "column": 8, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": ">", - "left": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 50, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 50, - "column": 12, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "j", - "decorators": [], - "loc": { - "start": { - "line": 50, - "column": 15, - "program": "binary_op.ets" - }, - "end": { - "line": 50, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 50, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 50, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 50, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 50, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 50, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 50, - "column": 16, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b14", - "decorators": [], - "loc": { - "start": { - "line": 51, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 51, - "column": 8, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": "<=", - "left": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 51, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 51, - "column": 12, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "j", - "decorators": [], - "loc": { - "start": { - "line": 51, - "column": 16, - "program": "binary_op.ets" - }, - "end": { - "line": 51, - "column": 17, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 51, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 51, - "column": 17, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 51, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 51, - "column": 17, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 51, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 51, - "column": 17, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b15", - "decorators": [], - "loc": { - "start": { - "line": 52, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 52, - "column": 8, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": ">=", - "left": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 52, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 52, - "column": 12, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "j", - "decorators": [], - "loc": { - "start": { - "line": 52, - "column": 16, - "program": "binary_op.ets" - }, - "end": { - "line": 52, - "column": 17, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 52, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 52, - "column": 17, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 52, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 52, - "column": 17, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 52, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 52, - "column": 17, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b16", - "decorators": [], - "loc": { - "start": { - "line": 53, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 53, - "column": 8, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": "instanceof", - "left": { - "type": "Identifier", - "name": "r1", - "decorators": [], - "loc": { - "start": { - "line": 53, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 53, - "column": 13, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "Object", - "decorators": [], - "loc": { - "start": { - "line": 53, - "column": 25, - "program": "binary_op.ets" - }, - "end": { - "line": 53, - "column": 31, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 53, - "column": 25, - "program": "binary_op.ets" - }, - "end": { - "line": 53, - "column": 31, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 53, - "column": 25, - "program": "binary_op.ets" - }, - "end": { - "line": 53, - "column": 31, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 53, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 53, - "column": 31, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 53, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 53, - "column": 31, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 53, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 53, - "column": 31, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b17", - "decorators": [], - "loc": { - "start": { - "line": 56, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 56, - "column": 8, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": ">>", - "left": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 56, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 56, - "column": 12, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "j", - "decorators": [], - "loc": { - "start": { - "line": 56, - "column": 16, - "program": "binary_op.ets" - }, - "end": { - "line": 56, - "column": 17, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 56, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 56, - "column": 17, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 56, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 56, - "column": 17, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 56, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 56, - "column": 17, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b18", - "decorators": [], - "loc": { - "start": { - "line": 57, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 57, - "column": 8, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": "<<", - "left": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 57, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 57, - "column": 12, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "j", - "decorators": [], - "loc": { - "start": { - "line": 57, - "column": 16, - "program": "binary_op.ets" - }, - "end": { - "line": 57, - "column": 17, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 57, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 57, - "column": 17, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 57, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 57, - "column": 17, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 57, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 57, - "column": 17, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b19", - "decorators": [], - "loc": { - "start": { - "line": 58, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 58, - "column": 8, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": ">>>", - "left": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 58, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 58, - "column": 12, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "j", - "decorators": [], - "loc": { - "start": { - "line": 58, - "column": 17, - "program": "binary_op.ets" - }, - "end": { - "line": 58, - "column": 18, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 58, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 58, - "column": 18, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 58, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 58, - "column": 18, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 58, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 58, - "column": 18, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b20", - "decorators": [], - "loc": { - "start": { - "line": 59, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 59, - "column": 8, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": ">>>", - "left": { - "type": "BinaryExpression", - "operator": "<<", - "left": { - "type": "BinaryExpression", - "operator": ">>", - "left": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 59, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 59, - "column": 12, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "j", - "decorators": [], - "loc": { - "start": { - "line": 59, - "column": 16, - "program": "binary_op.ets" - }, - "end": { - "line": 59, - "column": 17, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 59, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 59, - "column": 17, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 59, - "column": 21, - "program": "binary_op.ets" - }, - "end": { - "line": 59, - "column": 22, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 59, - "column": 16, - "program": "binary_op.ets" - }, - "end": { - "line": 59, - "column": 22, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "j", - "decorators": [], - "loc": { - "start": { - "line": 59, - "column": 27, - "program": "binary_op.ets" - }, - "end": { - "line": 59, - "column": 28, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 59, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 59, - "column": 28, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 59, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 59, - "column": 28, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 59, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 59, - "column": 28, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "i05", - "decorators": [], - "loc": { - "start": { - "line": 62, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 62, - "column": 8, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": "+", - "left": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 62, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 62, - "column": 12, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "j", - "decorators": [], - "loc": { - "start": { - "line": 62, - "column": 15, - "program": "binary_op.ets" - }, - "end": { - "line": 62, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 62, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 62, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 62, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 62, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 62, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 62, - "column": 16, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "i06", - "decorators": [], - "loc": { - "start": { - "line": 63, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 63, - "column": 8, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": "-", - "left": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 63, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 63, - "column": 12, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "j", - "decorators": [], - "loc": { - "start": { - "line": 63, - "column": 15, - "program": "binary_op.ets" - }, - "end": { - "line": 63, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 63, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 63, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 63, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 63, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 63, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 63, - "column": 16, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "i07", - "decorators": [], - "loc": { - "start": { - "line": 64, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 64, - "column": 8, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": "+", - "left": { - "type": "BinaryExpression", - "operator": "-", - "left": { - "type": "BinaryExpression", - "operator": "+", - "left": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 64, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 64, - "column": 12, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "j", - "decorators": [], - "loc": { - "start": { - "line": 64, - "column": 15, - "program": "binary_op.ets" - }, - "end": { - "line": 64, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 64, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 64, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 64, - "column": 19, - "program": "binary_op.ets" - }, - "end": { - "line": 64, - "column": 20, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 64, - "column": 15, - "program": "binary_op.ets" - }, - "end": { - "line": 64, - "column": 20, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "j", - "decorators": [], - "loc": { - "start": { - "line": 64, - "column": 23, - "program": "binary_op.ets" - }, - "end": { - "line": 64, - "column": 24, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 64, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 64, - "column": 24, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 64, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 64, - "column": 24, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 64, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 64, - "column": 24, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "i08", - "decorators": [], - "loc": { - "start": { - "line": 67, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 67, - "column": 8, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": "*", - "left": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 67, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 67, - "column": 12, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "j", - "decorators": [], - "loc": { - "start": { - "line": 67, - "column": 15, - "program": "binary_op.ets" - }, - "end": { - "line": 67, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 67, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 67, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 67, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 67, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 67, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 67, - "column": 16, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "i09", - "decorators": [], - "loc": { - "start": { - "line": 68, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 68, - "column": 8, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": "/", - "left": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 68, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 68, - "column": 12, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "j", - "decorators": [], - "loc": { - "start": { - "line": 68, - "column": 15, - "program": "binary_op.ets" - }, - "end": { - "line": 68, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 68, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 68, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 68, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 68, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 68, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 68, - "column": 16, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "i10", - "decorators": [], - "loc": { - "start": { - "line": 69, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 69, - "column": 8, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": "%", - "left": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 69, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 69, - "column": 12, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "j", - "decorators": [], - "loc": { - "start": { - "line": 69, - "column": 15, - "program": "binary_op.ets" - }, - "end": { - "line": 69, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 69, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 69, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 69, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 69, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 69, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 69, - "column": 16, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "i11", - "decorators": [], - "loc": { - "start": { - "line": 70, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 70, - "column": 8, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": "/", - "left": { - "type": "BinaryExpression", - "operator": "*", - "left": { - "type": "BinaryExpression", - "operator": "%", - "left": { - "type": "BinaryExpression", - "operator": "/", - "left": { - "type": "BinaryExpression", - "operator": "*", - "left": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 70, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 70, - "column": 12, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "j", - "decorators": [], - "loc": { - "start": { - "line": 70, - "column": 15, - "program": "binary_op.ets" - }, - "end": { - "line": 70, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 70, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 70, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 70, - "column": 19, - "program": "binary_op.ets" - }, - "end": { - "line": 70, - "column": 20, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 70, - "column": 15, - "program": "binary_op.ets" - }, - "end": { - "line": 70, - "column": 20, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "j", - "decorators": [], - "loc": { - "start": { - "line": 70, - "column": 23, - "program": "binary_op.ets" - }, - "end": { - "line": 70, - "column": 24, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 70, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 70, - "column": 24, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 70, - "column": 27, - "program": "binary_op.ets" - }, - "end": { - "line": 70, - "column": 28, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 70, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 70, - "column": 28, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "j", - "decorators": [], - "loc": { - "start": { - "line": 70, - "column": 31, - "program": "binary_op.ets" - }, - "end": { - "line": 70, - "column": 32, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 70, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 70, - "column": 32, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 70, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 70, - "column": 32, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 70, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 70, - "column": 32, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b21", - "decorators": [], - "loc": { - "start": { - "line": 73, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 73, - "column": 8, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": ">>>", - "left": { - "type": "BinaryExpression", - "operator": "*", - "left": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 73, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 73, - "column": 12, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "j", - "decorators": [], - "loc": { - "start": { - "line": 73, - "column": 15, - "program": "binary_op.ets" - }, - "end": { - "line": 73, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 73, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 73, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": "-", - "left": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 73, - "column": 21, - "program": "binary_op.ets" - }, - "end": { - "line": 73, - "column": 22, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "j", - "decorators": [], - "loc": { - "start": { - "line": 73, - "column": 25, - "program": "binary_op.ets" - }, - "end": { - "line": 73, - "column": 26, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 73, - "column": 21, - "program": "binary_op.ets" - }, - "end": { - "line": 73, - "column": 26, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 73, - "column": 15, - "program": "binary_op.ets" - }, - "end": { - "line": 73, - "column": 26, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 73, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 73, - "column": 26, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 73, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 73, - "column": 26, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b22", - "decorators": [], - "loc": { - "start": { - "line": 74, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 74, - "column": 8, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "LogicalExpression", - "operator": "||", - "left": { - "type": "LogicalExpression", - "operator": "&&", - "left": { - "type": "BinaryExpression", - "operator": ">", - "left": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 74, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 74, - "column": 12, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "j", - "decorators": [], - "loc": { - "start": { - "line": 74, - "column": 15, - "program": "binary_op.ets" - }, - "end": { - "line": 74, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 74, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 74, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "b1", - "decorators": [], - "loc": { - "start": { - "line": 74, - "column": 20, - "program": "binary_op.ets" - }, - "end": { - "line": 74, - "column": 22, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 74, - "column": 15, - "program": "binary_op.ets" - }, - "end": { - "line": 74, - "column": 22, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "b2", - "decorators": [], - "loc": { - "start": { - "line": 74, - "column": 26, - "program": "binary_op.ets" - }, - "end": { - "line": 74, - "column": 28, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 74, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 74, - "column": 28, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 74, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 74, - "column": 28, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 74, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 74, - "column": 28, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b23", - "decorators": [], - "loc": { - "start": { - "line": 75, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 75, - "column": 8, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "LogicalExpression", - "operator": "||", - "left": { - "type": "LogicalExpression", - "operator": "&&", - "left": { - "type": "BinaryExpression", - "operator": "|", - "left": { - "type": "BinaryExpression", - "operator": "^", - "left": { - "type": "BinaryExpression", - "operator": "&", - "left": { - "type": "BinaryExpression", - "operator": "!=", - "left": { - "type": "BinaryExpression", - "operator": "<", - "left": { - "type": "BinaryExpression", - "operator": ">>", - "left": { - "type": "BinaryExpression", - "operator": "+", - "left": { - "type": "BinaryExpression", - "operator": "*", - "left": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 75, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 75, - "column": 12, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "j", - "decorators": [], - "loc": { - "start": { - "line": 75, - "column": 15, - "program": "binary_op.ets" - }, - "end": { - "line": 75, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 75, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 75, - "column": 16, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 75, - "column": 19, - "program": "binary_op.ets" - }, - "end": { - "line": 75, - "column": 20, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 75, - "column": 15, - "program": "binary_op.ets" - }, - "end": { - "line": 75, - "column": 20, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "j", - "decorators": [], - "loc": { - "start": { - "line": 75, - "column": 24, - "program": "binary_op.ets" - }, - "end": { - "line": 75, - "column": 25, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 75, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 75, - "column": 25, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 75, - "column": 28, - "program": "binary_op.ets" - }, - "end": { - "line": 75, - "column": 29, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 75, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 75, - "column": 29, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "b1", - "decorators": [], - "loc": { - "start": { - "line": 75, - "column": 33, - "program": "binary_op.ets" - }, - "end": { - "line": 75, - "column": 35, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 75, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 75, - "column": 35, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "b2", - "decorators": [], - "loc": { - "start": { - "line": 75, - "column": 38, - "program": "binary_op.ets" - }, - "end": { - "line": 75, - "column": 40, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 75, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 75, - "column": 40, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "b1", - "decorators": [], - "loc": { - "start": { - "line": 75, - "column": 43, - "program": "binary_op.ets" - }, - "end": { - "line": 75, - "column": 45, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 75, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 75, - "column": 45, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "b2", - "decorators": [], - "loc": { - "start": { - "line": 75, - "column": 48, - "program": "binary_op.ets" - }, - "end": { - "line": 75, - "column": 50, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 75, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 75, - "column": 50, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "b1", - "decorators": [], - "loc": { - "start": { - "line": 75, - "column": 54, - "program": "binary_op.ets" - }, - "end": { - "line": 75, - "column": 56, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 75, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 75, - "column": 56, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "b2", - "decorators": [], - "loc": { - "start": { - "line": 75, - "column": 60, - "program": "binary_op.ets" - }, - "end": { - "line": 75, - "column": 62, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 75, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 75, - "column": 62, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 75, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 75, - "column": 62, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 75, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 75, - "column": 62, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b24", - "decorators": [], - "loc": { - "start": { - "line": 76, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 76, - "column": 8, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "LogicalExpression", - "operator": "||", - "left": { - "type": "Identifier", - "name": "b1", - "decorators": [], - "loc": { - "start": { - "line": 76, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 76, - "column": 13, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "LogicalExpression", - "operator": "&&", - "left": { - "type": "Identifier", - "name": "b2", - "decorators": [], - "loc": { - "start": { - "line": 76, - "column": 17, - "program": "binary_op.ets" - }, - "end": { - "line": 76, - "column": 19, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": "|", - "left": { - "type": "Identifier", - "name": "b1", - "decorators": [], - "loc": { - "start": { - "line": 76, - "column": 23, - "program": "binary_op.ets" - }, - "end": { - "line": 76, - "column": 25, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": "^", - "left": { - "type": "Identifier", - "name": "b2", - "decorators": [], - "loc": { - "start": { - "line": 76, - "column": 28, - "program": "binary_op.ets" - }, - "end": { - "line": 76, - "column": 30, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": "&", - "left": { - "type": "Identifier", - "name": "b1", - "decorators": [], - "loc": { - "start": { - "line": 76, - "column": 33, - "program": "binary_op.ets" - }, - "end": { - "line": 76, - "column": 35, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": "==", - "left": { - "type": "Identifier", - "name": "b2", - "decorators": [], - "loc": { - "start": { - "line": 76, - "column": 38, - "program": "binary_op.ets" - }, - "end": { - "line": 76, - "column": 40, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": ">=", - "left": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 76, - "column": 44, - "program": "binary_op.ets" - }, - "end": { - "line": 76, - "column": 45, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": "<<", - "left": { - "type": "Identifier", - "name": "j", - "decorators": [], - "loc": { - "start": { - "line": 76, - "column": 49, - "program": "binary_op.ets" - }, - "end": { - "line": 76, - "column": 50, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": "-", - "left": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 76, - "column": 54, - "program": "binary_op.ets" - }, - "end": { - "line": 76, - "column": 55, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": "%", - "left": { - "type": "Identifier", - "name": "j", - "decorators": [], - "loc": { - "start": { - "line": 76, - "column": 58, - "program": "binary_op.ets" - }, - "end": { - "line": 76, - "column": 59, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 76, - "column": 62, - "program": "binary_op.ets" - }, - "end": { - "line": 76, - "column": 63, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 76, - "column": 58, - "program": "binary_op.ets" - }, - "end": { - "line": 76, - "column": 63, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 76, - "column": 54, - "program": "binary_op.ets" - }, - "end": { - "line": 76, - "column": 63, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 76, - "column": 49, - "program": "binary_op.ets" - }, - "end": { - "line": 76, - "column": 63, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 76, - "column": 44, - "program": "binary_op.ets" - }, - "end": { - "line": 76, - "column": 63, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 76, - "column": 38, - "program": "binary_op.ets" - }, - "end": { - "line": 76, - "column": 63, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 76, - "column": 33, - "program": "binary_op.ets" - }, - "end": { - "line": 76, - "column": 63, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 76, - "column": 28, - "program": "binary_op.ets" - }, - "end": { - "line": 76, - "column": 63, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 76, - "column": 23, - "program": "binary_op.ets" - }, - "end": { - "line": 76, - "column": 63, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 76, - "column": 17, - "program": "binary_op.ets" - }, - "end": { - "line": 76, - "column": 63, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 76, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 76, - "column": 63, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 76, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 76, - "column": 63, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 76, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 76, - "column": 63, - "program": "binary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b25", - "decorators": [], - "loc": { - "start": { - "line": 77, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 77, - "column": 8, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "LogicalExpression", - "operator": "??", - "left": { - "type": "Identifier", - "name": "r1", - "decorators": [], - "loc": { - "start": { - "line": 77, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 77, - "column": 13, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": "|", - "left": { - "type": "BinaryExpression", - "operator": "!=", - "left": { - "type": "Identifier", - "name": "b1", - "decorators": [], - "loc": { - "start": { - "line": 77, - "column": 17, - "program": "binary_op.ets" - }, - "end": { - "line": 77, - "column": 19, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "b2", - "decorators": [], - "loc": { - "start": { - "line": 77, - "column": 23, - "program": "binary_op.ets" - }, - "end": { - "line": 77, - "column": 25, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 77, - "column": 17, - "program": "binary_op.ets" - }, - "end": { - "line": 77, - "column": 25, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "BinaryExpression", - "operator": "<=", - "left": { - "type": "Identifier", - "name": "i", - "decorators": [], - "loc": { - "start": { - "line": 77, - "column": 28, - "program": "binary_op.ets" - }, - "end": { - "line": 77, - "column": 29, - "program": "binary_op.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "j", - "decorators": [], - "loc": { - "start": { - "line": 77, - "column": 33, - "program": "binary_op.ets" - }, - "end": { - "line": 77, - "column": 34, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 77, - "column": 28, - "program": "binary_op.ets" - }, - "end": { - "line": 77, - "column": 34, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 77, - "column": 23, - "program": "binary_op.ets" - }, - "end": { - "line": 77, - "column": 34, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 77, - "column": 11, - "program": "binary_op.ets" - }, - "end": { - "line": 77, - "column": 34, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 77, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 77, - "column": 34, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 77, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 77, - "column": 34, - "program": "binary_op.ets" - } - } - } - ], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 77, - "column": 34, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 77, - "column": 34, - "program": "binary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 77, - "column": 34, - "program": "binary_op.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "binary_op.ets" - }, - "end": { - "line": 77, - "column": 34, - "program": "binary_op.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -6283,7 +571,7 @@ }, "end": { "line": 22, - "column": 29, + "column": 25, "program": "binary_op.ets" } } diff --git a/ets2panda/test/parser/ets/binary_operations-expected.txt b/ets2panda/test/parser/ets/binary_operations-expected.txt index e74bc20467917a3ebd6df59283db8b264283d042..c00b564851d14eebed72e251d67dee9b36343ebc 100644 --- a/ets2panda/test/parser/ets/binary_operations-expected.txt +++ b/ets2panda/test/parser/ets/binary_operations-expected.txt @@ -1988,112 +1988,6 @@ "program": "binary_operations.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "binary_operations.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "binary_operations.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "binary_operations.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "binary_operations.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "binary_operations.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "binary_operations.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "binary_operations.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "binary_operations.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/blocks-expected.txt b/ets2panda/test/parser/ets/blocks-expected.txt index 5d037504e57052ba998ca4d7bd769de6e685ea7a..868668bd9fc612fd57c6dec849a325d0fecdf1c8 100644 --- a/ets2panda/test/parser/ets/blocks-expected.txt +++ b/ets2panda/test/parser/ets/blocks-expected.txt @@ -129,295 +129,6 @@ "program": "blocks.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "BlockStatement", - "statements": [ - { - "type": "VariableDeclaration", - "declarations": [ - { - "type": "VariableDeclarator", - "id": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 7, - "program": "blocks.ets" - }, - "end": { - "line": 18, - "column": 8, - "program": "blocks.ets" - } - } - }, - "init": { - "type": "NumberLiteral", - "value": 42, - "loc": { - "start": { - "line": 18, - "column": 11, - "program": "blocks.ets" - }, - "end": { - "line": 18, - "column": 13, - "program": "blocks.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 7, - "program": "blocks.ets" - }, - "end": { - "line": 18, - "column": 13, - "program": "blocks.ets" - } - } - } - ], - "kind": "let", - "loc": { - "start": { - "line": 18, - "column": 3, - "program": "blocks.ets" - }, - "end": { - "line": 18, - "column": 14, - "program": "blocks.ets" - } - } - }, - { - "type": "BlockStatement", - "statements": [ - { - "type": "VariableDeclaration", - "declarations": [ - { - "type": "VariableDeclarator", - "id": { - "type": "Identifier", - "name": "b", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 9, - "program": "blocks.ets" - }, - "end": { - "line": 20, - "column": 10, - "program": "blocks.ets" - } - } - }, - "init": { - "type": "NumberLiteral", - "value": 43, - "loc": { - "start": { - "line": 20, - "column": 13, - "program": "blocks.ets" - }, - "end": { - "line": 20, - "column": 15, - "program": "blocks.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 9, - "program": "blocks.ets" - }, - "end": { - "line": 20, - "column": 15, - "program": "blocks.ets" - } - } - } - ], - "kind": "let", - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "blocks.ets" - }, - "end": { - "line": 20, - "column": 16, - "program": "blocks.ets" - } - } - }, - { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "blocks.ets" - }, - "end": { - "line": 21, - "column": 7, - "program": "blocks.ets" - } - } - } - ], - "loc": { - "start": { - "line": 19, - "column": 3, - "program": "blocks.ets" - }, - "end": { - "line": 22, - "column": 4, - "program": "blocks.ets" - } - } - } - ], - "loc": { - "start": { - "line": 17, - "column": 1, - "program": "blocks.ets" - }, - "end": { - "line": 23, - "column": 2, - "program": "blocks.ets" - } - } - } - ], - "loc": { - "start": { - "line": 17, - "column": 1, - "program": "blocks.ets" - }, - "end": { - "line": 23, - "column": 2, - "program": "blocks.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 1, - "program": "blocks.ets" - }, - "end": { - "line": 23, - "column": 2, - "program": "blocks.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 1, - "program": "blocks.ets" - }, - "end": { - "line": 23, - "column": 2, - "program": "blocks.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 1, - "program": "blocks.ets" - }, - "end": { - "line": 23, - "column": 2, - "program": "blocks.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/blocks_scopes-expected.txt b/ets2panda/test/parser/ets/blocks_scopes-expected.txt index 33730ccfecfd56d4b41c2efc828b115233aa470e..ca3d6884fa9d5167a45d97362d3e91065f2bcf33 100644 --- a/ets2panda/test/parser/ets/blocks_scopes-expected.txt +++ b/ets2panda/test/parser/ets/blocks_scopes-expected.txt @@ -129,444 +129,6 @@ "program": "blocks_scopes.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "BlockStatement", - "statements": [ - { - "type": "VariableDeclaration", - "declarations": [ - { - "type": "VariableDeclarator", - "id": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 7, - "program": "blocks_scopes.ets" - }, - "end": { - "line": 18, - "column": 8, - "program": "blocks_scopes.ets" - } - } - }, - "init": { - "type": "NumberLiteral", - "value": 42, - "loc": { - "start": { - "line": 18, - "column": 11, - "program": "blocks_scopes.ets" - }, - "end": { - "line": 18, - "column": 13, - "program": "blocks_scopes.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 7, - "program": "blocks_scopes.ets" - }, - "end": { - "line": 18, - "column": 13, - "program": "blocks_scopes.ets" - } - } - } - ], - "kind": "let", - "loc": { - "start": { - "line": 18, - "column": 3, - "program": "blocks_scopes.ets" - }, - "end": { - "line": 18, - "column": 14, - "program": "blocks_scopes.ets" - } - } - }, - { - "type": "BlockStatement", - "statements": [ - { - "type": "VariableDeclaration", - "declarations": [ - { - "type": "VariableDeclarator", - "id": { - "type": "Identifier", - "name": "b", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 9, - "program": "blocks_scopes.ets" - }, - "end": { - "line": 20, - "column": 10, - "program": "blocks_scopes.ets" - } - } - }, - "init": { - "type": "BinaryExpression", - "operator": "+", - "left": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 13, - "program": "blocks_scopes.ets" - }, - "end": { - "line": 20, - "column": 14, - "program": "blocks_scopes.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 43, - "loc": { - "start": { - "line": 20, - "column": 17, - "program": "blocks_scopes.ets" - }, - "end": { - "line": 20, - "column": 19, - "program": "blocks_scopes.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 13, - "program": "blocks_scopes.ets" - }, - "end": { - "line": 20, - "column": 19, - "program": "blocks_scopes.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 9, - "program": "blocks_scopes.ets" - }, - "end": { - "line": 20, - "column": 19, - "program": "blocks_scopes.ets" - } - } - } - ], - "kind": "let", - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "blocks_scopes.ets" - }, - "end": { - "line": 20, - "column": 20, - "program": "blocks_scopes.ets" - } - } - }, - { - "type": "BlockStatement", - "statements": [ - { - "type": "VariableDeclaration", - "declarations": [ - { - "type": "VariableDeclarator", - "id": { - "type": "Identifier", - "name": "c", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 13, - "program": "blocks_scopes.ets" - }, - "end": { - "line": 22, - "column": 14, - "program": "blocks_scopes.ets" - } - } - }, - "init": { - "type": "BinaryExpression", - "operator": "+", - "left": { - "type": "Identifier", - "name": "b", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 17, - "program": "blocks_scopes.ets" - }, - "end": { - "line": 22, - "column": 18, - "program": "blocks_scopes.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 10, - "loc": { - "start": { - "line": 22, - "column": 21, - "program": "blocks_scopes.ets" - }, - "end": { - "line": 22, - "column": 23, - "program": "blocks_scopes.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 17, - "program": "blocks_scopes.ets" - }, - "end": { - "line": 22, - "column": 23, - "program": "blocks_scopes.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 13, - "program": "blocks_scopes.ets" - }, - "end": { - "line": 22, - "column": 23, - "program": "blocks_scopes.ets" - } - } - } - ], - "kind": "let", - "loc": { - "start": { - "line": 22, - "column": 9, - "program": "blocks_scopes.ets" - }, - "end": { - "line": 22, - "column": 24, - "program": "blocks_scopes.ets" - } - } - }, - { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 23, - "column": 9, - "program": "blocks_scopes.ets" - }, - "end": { - "line": 23, - "column": 11, - "program": "blocks_scopes.ets" - } - } - } - ], - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "blocks_scopes.ets" - }, - "end": { - "line": 24, - "column": 6, - "program": "blocks_scopes.ets" - } - } - } - ], - "loc": { - "start": { - "line": 19, - "column": 3, - "program": "blocks_scopes.ets" - }, - "end": { - "line": 25, - "column": 4, - "program": "blocks_scopes.ets" - } - } - } - ], - "loc": { - "start": { - "line": 17, - "column": 1, - "program": "blocks_scopes.ets" - }, - "end": { - "line": 26, - "column": 2, - "program": "blocks_scopes.ets" - } - } - } - ], - "loc": { - "start": { - "line": 17, - "column": 1, - "program": "blocks_scopes.ets" - }, - "end": { - "line": 26, - "column": 2, - "program": "blocks_scopes.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 1, - "program": "blocks_scopes.ets" - }, - "end": { - "line": 26, - "column": 2, - "program": "blocks_scopes.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 1, - "program": "blocks_scopes.ets" - }, - "end": { - "line": 26, - "column": 2, - "program": "blocks_scopes.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 1, - "program": "blocks_scopes.ets" - }, - "end": { - "line": 26, - "column": 2, - "program": "blocks_scopes.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/boolean-expected.txt b/ets2panda/test/parser/ets/boolean-expected.txt index f33849578b78562c4aa1318cf64f1018d9de0179..d037aef3089d0b7e09700f5a2e04f7621f6e11c8 100644 --- a/ets2panda/test/parser/ets/boolean-expected.txt +++ b/ets2panda/test/parser/ets/boolean-expected.txt @@ -130,177 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boolean.ets" - }, - "end": { - "line": 16, - "column": 6, - "program": "boolean.ets" - } - } - }, - "right": { - "type": "BooleanLiteral", - "value": true, - "loc": { - "start": { - "line": 16, - "column": 18, - "program": "boolean.ets" - }, - "end": { - "line": 16, - "column": 22, - "program": "boolean.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boolean.ets" - }, - "end": { - "line": 16, - "column": 22, - "program": "boolean.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boolean.ets" - }, - "end": { - "line": 16, - "column": 22, - "program": "boolean.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boolean.ets" - }, - "end": { - "line": 16, - "column": 22, - "program": "boolean.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boolean.ets" - }, - "end": { - "line": 16, - "column": 22, - "program": "boolean.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boolean.ets" - }, - "end": { - "line": 16, - "column": 22, - "program": "boolean.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "boolean.ets" - }, - "end": { - "line": 16, - "column": 22, - "program": "boolean.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -351,7 +180,7 @@ }, "end": { "line": 16, - "column": 22, + "column": 18, "program": "boolean.ets" } } diff --git a/ets2panda/test/parser/ets/boolean_cond-expected.txt b/ets2panda/test/parser/ets/boolean_cond-expected.txt index 97a76c166fe900a6616e075b19ca67346089f44c..851dd9142c6ce23356e216b0da11fdb84d5cadb0 100644 --- a/ets2panda/test/parser/ets/boolean_cond-expected.txt +++ b/ets2panda/test/parser/ets/boolean_cond-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "boolean_cond.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "boolean_cond.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "boolean_cond.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "boolean_cond.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "boolean_cond.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "boolean_cond.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "boolean_cond.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "boolean_cond.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/boolean_default-expected.txt b/ets2panda/test/parser/ets/boolean_default-expected.txt index c0bfe203bc3493e70069c685fb2f260fd9138b40..fa255fe329e59a44f28bef6f1ccaa6c38b6609b1 100644 --- a/ets2panda/test/parser/ets/boolean_default-expected.txt +++ b/ets2panda/test/parser/ets/boolean_default-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "boolean_default.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "boolean_default.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "boolean_default.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "boolean_default.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "boolean_default.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "boolean_default.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "boolean_default.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "boolean_default.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/break-expected.txt b/ets2panda/test/parser/ets/break-expected.txt index f3879d3ce195b42570d1c43db004a4357b61a4fd..17478cff571cf61f5dc473151c2c7f0ffc7ac868 100644 --- a/ets2panda/test/parser/ets/break-expected.txt +++ b/ets2panda/test/parser/ets/break-expected.txt @@ -24,226 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "break.ets" - }, - "end": { - "line": 16, - "column": 6, - "program": "break.ets" - } - } - }, - "right": { - "type": "ArrayExpression", - "elements": [ - { - "type": "NumberLiteral", - "value": 1, - "loc": { - "start": { - "line": 16, - "column": 17, - "program": "break.ets" - }, - "end": { - "line": 16, - "column": 18, - "program": "break.ets" - } - } - }, - { - "type": "NumberLiteral", - "value": 2, - "loc": { - "start": { - "line": 16, - "column": 20, - "program": "break.ets" - }, - "end": { - "line": 16, - "column": 21, - "program": "break.ets" - } - } - }, - { - "type": "NumberLiteral", - "value": 3, - "loc": { - "start": { - "line": 16, - "column": 23, - "program": "break.ets" - }, - "end": { - "line": 16, - "column": 24, - "program": "break.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 16, - "program": "break.ets" - }, - "end": { - "line": 16, - "column": 25, - "program": "break.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "break.ets" - }, - "end": { - "line": 16, - "column": 25, - "program": "break.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "break.ets" - }, - "end": { - "line": 16, - "column": 25, - "program": "break.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "break.ets" - }, - "end": { - "line": 16, - "column": 25, - "program": "break.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "break.ets" - }, - "end": { - "line": 16, - "column": 25, - "program": "break.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "break.ets" - }, - "end": { - "line": 16, - "column": 25, - "program": "break.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "break.ets" - }, - "end": { - "line": 16, - "column": 25, - "program": "break.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -358,7 +138,7 @@ }, "end": { "line": 16, - "column": 25, + "column": 16, "program": "break.ets" } } diff --git a/ets2panda/test/parser/ets/callFunctionWithNullableParam-expected.txt b/ets2panda/test/parser/ets/callFunctionWithNullableParam-expected.txt index b94291f4bd11fddaaddf2687b80c53640a015f68..e66dc60bc5ab6ac5263b7b819bfbd8c2964c21f0 100644 --- a/ets2panda/test/parser/ets/callFunctionWithNullableParam-expected.txt +++ b/ets2panda/test/parser/ets/callFunctionWithNullableParam-expected.txt @@ -179,112 +179,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "callFunctionWithNullableParam.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "callFunctionWithNullableParam.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "callFunctionWithNullableParam.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "callFunctionWithNullableParam.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "callFunctionWithNullableParam.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "callFunctionWithNullableParam.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "callFunctionWithNullableParam.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "callFunctionWithNullableParam.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/callInterfaceMethodWithNullableParam-expected.txt b/ets2panda/test/parser/ets/callInterfaceMethodWithNullableParam-expected.txt index 365e73d36b268489f5a7b8f17d007f55ac3e4bfe..40f1c78abe678b04d2f26ba84d0c35f584dc8633 100644 --- a/ets2panda/test/parser/ets/callInterfaceMethodWithNullableParam-expected.txt +++ b/ets2panda/test/parser/ets/callInterfaceMethodWithNullableParam-expected.txt @@ -678,112 +678,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "callInterfaceMethodWithNullableParam.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "callInterfaceMethodWithNullableParam.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "callInterfaceMethodWithNullableParam.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "callInterfaceMethodWithNullableParam.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "callInterfaceMethodWithNullableParam.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "callInterfaceMethodWithNullableParam.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "callInterfaceMethodWithNullableParam.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "callInterfaceMethodWithNullableParam.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/callMethodWithNullableParam-expected.txt b/ets2panda/test/parser/ets/callMethodWithNullableParam-expected.txt index 7cdcaa28dc4fc8f02bf7ef6ac0cd44ba3a2102c4..7d9814fd7e1a1d5a9a3fe9a3bd0eb32de88dae11 100644 --- a/ets2panda/test/parser/ets/callMethodWithNullableParam-expected.txt +++ b/ets2panda/test/parser/ets/callMethodWithNullableParam-expected.txt @@ -380,112 +380,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "callMethodWithNullableParam.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "callMethodWithNullableParam.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "callMethodWithNullableParam.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "callMethodWithNullableParam.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "callMethodWithNullableParam.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "callMethodWithNullableParam.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "callMethodWithNullableParam.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "callMethodWithNullableParam.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/calling_superclass_methods-expected.txt b/ets2panda/test/parser/ets/calling_superclass_methods-expected.txt index 057ba765d85a726f5cccd32b69ace9436d90c2c6..bc69fd8d2044d0e8c051850a59fe47ea348e7f5e 100644 --- a/ets2panda/test/parser/ets/calling_superclass_methods-expected.txt +++ b/ets2panda/test/parser/ets/calling_superclass_methods-expected.txt @@ -794,112 +794,6 @@ "program": "calling_superclass_methods.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "calling_superclass_methods.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "calling_superclass_methods.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "calling_superclass_methods.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "calling_superclass_methods.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "calling_superclass_methods.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "calling_superclass_methods.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "calling_superclass_methods.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "calling_superclass_methods.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/cast_const_union-expected.txt b/ets2panda/test/parser/ets/cast_const_union-expected.txt index debb908bd590b52a5f333695cce4f5437823d3e6..aa31a3ba8e2e4faf096d9c2348da44c92db2c915 100644 --- a/ets2panda/test/parser/ets/cast_const_union-expected.txt +++ b/ets2panda/test/parser/ets/cast_const_union-expected.txt @@ -24,241 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "s", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "cast_const_union.ets" - }, - "end": { - "line": 16, - "column": 6, - "program": "cast_const_union.ets" - } - } - }, - "right": { - "type": "ETSNewClassInstanceExpression", - "typeReference": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "Double", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 22, - "program": "cast_const_union.ets" - }, - "end": { - "line": 16, - "column": 28, - "program": "cast_const_union.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 22, - "program": "cast_const_union.ets" - }, - "end": { - "line": 16, - "column": 28, - "program": "cast_const_union.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 22, - "program": "cast_const_union.ets" - }, - "end": { - "line": 16, - "column": 28, - "program": "cast_const_union.ets" - } - } - }, - "arguments": [ - { - "type": "NumberLiteral", - "value": -1.1e-20, - "loc": { - "start": { - "line": 16, - "column": 29, - "program": "cast_const_union.ets" - }, - "end": { - "line": 16, - "column": 37, - "program": "cast_const_union.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 18, - "program": "cast_const_union.ets" - }, - "end": { - "line": 18, - "column": 9, - "program": "cast_const_union.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "cast_const_union.ets" - }, - "end": { - "line": 18, - "column": 9, - "program": "cast_const_union.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "cast_const_union.ets" - }, - "end": { - "line": 18, - "column": 9, - "program": "cast_const_union.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "cast_const_union.ets" - }, - "end": { - "line": 18, - "column": 9, - "program": "cast_const_union.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "cast_const_union.ets" - }, - "end": { - "line": 18, - "column": 9, - "program": "cast_const_union.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "cast_const_union.ets" - }, - "end": { - "line": 18, - "column": 9, - "program": "cast_const_union.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "cast_const_union.ets" - }, - "end": { - "line": 18, - "column": 9, - "program": "cast_const_union.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -340,8 +105,8 @@ "program": "cast_const_union.ets" }, "end": { - "line": 18, - "column": 9, + "line": 16, + "column": 18, "program": "cast_const_union.ets" } } @@ -753,7 +518,7 @@ }, "end": { "line": 20, - "column": 23, + "column": 33, "program": "cast_const_union.ets" } } diff --git a/ets2panda/test/parser/ets/cast_expressions-expected.txt b/ets2panda/test/parser/ets/cast_expressions-expected.txt index a59feb0b96daef0b82c5659911e4373cea4042cf..1674f144285a5c6a4cac3d0141354ca618369410 100644 --- a/ets2panda/test/parser/ets/cast_expressions-expected.txt +++ b/ets2panda/test/parser/ets/cast_expressions-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "cast_expressions.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "cast_expressions.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "cast_expressions.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "cast_expressions.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "cast_expressions.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "cast_expressions.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "cast_expressions.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "cast_expressions.ets" - } - } - }, { "type": "MethodDefinition", "key": { @@ -544,7 +438,7 @@ }, "end": { "line": 18, - "column": 32, + "column": 40, "program": "cast_expressions.ets" } } @@ -2241,7 +2135,7 @@ }, "end": { "line": 40, - "column": 28, + "column": 36, "program": "cast_expressions.ets" } } @@ -2254,7 +2148,7 @@ }, "end": { "line": 40, - "column": 28, + "column": 36, "program": "cast_expressions.ets" } } @@ -2370,7 +2264,7 @@ }, "end": { "line": 41, - "column": 28, + "column": 36, "program": "cast_expressions.ets" } } @@ -2383,7 +2277,7 @@ }, "end": { "line": 41, - "column": 28, + "column": 36, "program": "cast_expressions.ets" } } @@ -2499,7 +2393,7 @@ }, "end": { "line": 42, - "column": 28, + "column": 38, "program": "cast_expressions.ets" } } @@ -2512,7 +2406,7 @@ }, "end": { "line": 42, - "column": 28, + "column": 38, "program": "cast_expressions.ets" } } @@ -2909,7 +2803,7 @@ }, "end": { "line": 48, - "column": 35, + "column": 44, "program": "cast_expressions.ets" } } @@ -4488,7 +4382,7 @@ }, "end": { "line": 69, - "column": 31, + "column": 40, "program": "cast_expressions.ets" } } @@ -4501,7 +4395,7 @@ }, "end": { "line": 69, - "column": 31, + "column": 40, "program": "cast_expressions.ets" } } @@ -4617,7 +4511,7 @@ }, "end": { "line": 70, - "column": 31, + "column": 40, "program": "cast_expressions.ets" } } @@ -4630,7 +4524,7 @@ }, "end": { "line": 70, - "column": 31, + "column": 40, "program": "cast_expressions.ets" } } @@ -4746,7 +4640,7 @@ }, "end": { "line": 71, - "column": 31, + "column": 41, "program": "cast_expressions.ets" } } @@ -4759,7 +4653,7 @@ }, "end": { "line": 71, - "column": 31, + "column": 41, "program": "cast_expressions.ets" } } @@ -5156,7 +5050,7 @@ }, "end": { "line": 77, - "column": 32, + "column": 40, "program": "cast_expressions.ets" } } @@ -6735,7 +6629,7 @@ }, "end": { "line": 98, - "column": 28, + "column": 36, "program": "cast_expressions.ets" } } @@ -6748,7 +6642,7 @@ }, "end": { "line": 98, - "column": 28, + "column": 36, "program": "cast_expressions.ets" } } @@ -6864,7 +6758,7 @@ }, "end": { "line": 99, - "column": 28, + "column": 36, "program": "cast_expressions.ets" } } @@ -6877,7 +6771,7 @@ }, "end": { "line": 99, - "column": 28, + "column": 36, "program": "cast_expressions.ets" } } @@ -6993,7 +6887,7 @@ }, "end": { "line": 100, - "column": 28, + "column": 38, "program": "cast_expressions.ets" } } @@ -7006,7 +6900,7 @@ }, "end": { "line": 100, - "column": 28, + "column": 38, "program": "cast_expressions.ets" } } @@ -7403,7 +7297,7 @@ }, "end": { "line": 106, - "column": 29, + "column": 36, "program": "cast_expressions.ets" } } @@ -8864,7 +8758,7 @@ }, "end": { "line": 126, - "column": 27, + "column": 34, "program": "cast_expressions.ets" } } @@ -8877,7 +8771,7 @@ }, "end": { "line": 126, - "column": 27, + "column": 34, "program": "cast_expressions.ets" } } @@ -8993,7 +8887,7 @@ }, "end": { "line": 127, - "column": 27, + "column": 34, "program": "cast_expressions.ets" } } @@ -9006,7 +8900,7 @@ }, "end": { "line": 127, - "column": 27, + "column": 34, "program": "cast_expressions.ets" } } @@ -9122,7 +9016,7 @@ }, "end": { "line": 128, - "column": 27, + "column": 37, "program": "cast_expressions.ets" } } @@ -9135,7 +9029,7 @@ }, "end": { "line": 128, - "column": 27, + "column": 37, "program": "cast_expressions.ets" } } @@ -9532,7 +9426,7 @@ }, "end": { "line": 134, - "column": 32, + "column": 40, "program": "cast_expressions.ets" } } @@ -10875,7 +10769,7 @@ }, "end": { "line": 153, - "column": 28, + "column": 36, "program": "cast_expressions.ets" } } @@ -10888,7 +10782,7 @@ }, "end": { "line": 153, - "column": 28, + "column": 36, "program": "cast_expressions.ets" } } @@ -11004,7 +10898,7 @@ }, "end": { "line": 154, - "column": 28, + "column": 36, "program": "cast_expressions.ets" } } @@ -11017,7 +10911,7 @@ }, "end": { "line": 154, - "column": 28, + "column": 36, "program": "cast_expressions.ets" } } @@ -11133,7 +11027,7 @@ }, "end": { "line": 155, - "column": 28, + "column": 38, "program": "cast_expressions.ets" } } @@ -11146,7 +11040,7 @@ }, "end": { "line": 155, - "column": 28, + "column": 38, "program": "cast_expressions.ets" } } @@ -11543,7 +11437,7 @@ }, "end": { "line": 161, - "column": 35, + "column": 44, "program": "cast_expressions.ets" } } @@ -12650,7 +12544,7 @@ }, "end": { "line": 178, - "column": 31, + "column": 40, "program": "cast_expressions.ets" } } @@ -12663,7 +12557,7 @@ }, "end": { "line": 178, - "column": 31, + "column": 40, "program": "cast_expressions.ets" } } @@ -12779,7 +12673,7 @@ }, "end": { "line": 179, - "column": 31, + "column": 40, "program": "cast_expressions.ets" } } @@ -12792,7 +12686,7 @@ }, "end": { "line": 179, - "column": 31, + "column": 40, "program": "cast_expressions.ets" } } @@ -12908,7 +12802,7 @@ }, "end": { "line": 180, - "column": 31, + "column": 41, "program": "cast_expressions.ets" } } @@ -12921,7 +12815,7 @@ }, "end": { "line": 180, - "column": 31, + "column": 41, "program": "cast_expressions.ets" } } @@ -13318,7 +13212,7 @@ }, "end": { "line": 186, - "column": 38, + "column": 48, "program": "cast_expressions.ets" } } @@ -14307,7 +14201,7 @@ }, "end": { "line": 202, - "column": 34, + "column": 44, "program": "cast_expressions.ets" } } @@ -14320,7 +14214,7 @@ }, "end": { "line": 202, - "column": 34, + "column": 44, "program": "cast_expressions.ets" } } @@ -14436,7 +14330,7 @@ }, "end": { "line": 203, - "column": 34, + "column": 44, "program": "cast_expressions.ets" } } @@ -14449,7 +14343,7 @@ }, "end": { "line": 203, - "column": 34, + "column": 44, "program": "cast_expressions.ets" } } @@ -14565,7 +14459,7 @@ }, "end": { "line": 204, - "column": 34, + "column": 44, "program": "cast_expressions.ets" } } @@ -14578,7 +14472,7 @@ }, "end": { "line": 204, - "column": 34, + "column": 44, "program": "cast_expressions.ets" } } @@ -15059,7 +14953,7 @@ }, "end": { "line": 214, - "column": 35, + "column": 46, "program": "cast_expressions.ets" } } @@ -15072,7 +14966,7 @@ }, "end": { "line": 214, - "column": 35, + "column": 46, "program": "cast_expressions.ets" } } @@ -15156,7 +15050,7 @@ }, "end": { "line": 215, - "column": 35, + "column": 46, "program": "cast_expressions.ets" } } @@ -15169,7 +15063,7 @@ }, "end": { "line": 215, - "column": 35, + "column": 46, "program": "cast_expressions.ets" } } @@ -15302,7 +15196,7 @@ }, "end": { "line": 220, - "column": 35, + "column": 46, "program": "cast_expressions.ets" } } @@ -15315,7 +15209,7 @@ }, "end": { "line": 220, - "column": 35, + "column": 46, "program": "cast_expressions.ets" } } @@ -15431,7 +15325,7 @@ }, "end": { "line": 221, - "column": 35, + "column": 46, "program": "cast_expressions.ets" } } @@ -15444,7 +15338,7 @@ }, "end": { "line": 221, - "column": 35, + "column": 46, "program": "cast_expressions.ets" } } @@ -15560,7 +15454,7 @@ }, "end": { "line": 222, - "column": 35, + "column": 45, "program": "cast_expressions.ets" } } @@ -15573,7 +15467,7 @@ }, "end": { "line": 222, - "column": 35, + "column": 45, "program": "cast_expressions.ets" } } diff --git a/ets2panda/test/parser/ets/cast_expressions3-expected.txt b/ets2panda/test/parser/ets/cast_expressions3-expected.txt index 525e4d51df9a7bfe1550a2d6a4cb8561559711c5..b29011ca1630e2cc59a2c68e9a1ce9aa46e02b9b 100644 --- a/ets2panda/test/parser/ets/cast_expressions3-expected.txt +++ b/ets2panda/test/parser/ets/cast_expressions3-expected.txt @@ -799,112 +799,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "cast_expressions3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "cast_expressions3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "cast_expressions3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "cast_expressions3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "cast_expressions3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "cast_expressions3.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "cast_expressions3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "cast_expressions3.ets" - } - } - }, { "type": "MethodDefinition", "key": { @@ -1181,7 +1075,7 @@ }, "end": { "line": 24, - "column": 15, + "column": 20, "program": "cast_expressions3.ets" } } @@ -1194,7 +1088,7 @@ }, "end": { "line": 24, - "column": 15, + "column": 20, "program": "cast_expressions3.ets" } } @@ -1310,7 +1204,7 @@ }, "end": { "line": 25, - "column": 15, + "column": 20, "program": "cast_expressions3.ets" } } @@ -1323,7 +1217,7 @@ }, "end": { "line": 25, - "column": 15, + "column": 20, "program": "cast_expressions3.ets" } } @@ -1439,7 +1333,7 @@ }, "end": { "line": 26, - "column": 15, + "column": 20, "program": "cast_expressions3.ets" } } @@ -1452,7 +1346,7 @@ }, "end": { "line": 26, - "column": 15, + "column": 20, "program": "cast_expressions3.ets" } } @@ -1568,7 +1462,7 @@ }, "end": { "line": 27, - "column": 15, + "column": 20, "program": "cast_expressions3.ets" } } @@ -1581,7 +1475,7 @@ }, "end": { "line": 27, - "column": 15, + "column": 20, "program": "cast_expressions3.ets" } } @@ -1697,7 +1591,7 @@ }, "end": { "line": 29, - "column": 16, + "column": 21, "program": "cast_expressions3.ets" } } @@ -1710,7 +1604,7 @@ }, "end": { "line": 29, - "column": 16, + "column": 21, "program": "cast_expressions3.ets" } } @@ -1826,7 +1720,7 @@ }, "end": { "line": 30, - "column": 16, + "column": 21, "program": "cast_expressions3.ets" } } @@ -1839,7 +1733,7 @@ }, "end": { "line": 30, - "column": 16, + "column": 21, "program": "cast_expressions3.ets" } } @@ -1955,7 +1849,7 @@ }, "end": { "line": 31, - "column": 16, + "column": 21, "program": "cast_expressions3.ets" } } @@ -1968,7 +1862,7 @@ }, "end": { "line": 31, - "column": 16, + "column": 21, "program": "cast_expressions3.ets" } } diff --git a/ets2panda/test/parser/ets/cast_expressions4-expected.txt b/ets2panda/test/parser/ets/cast_expressions4-expected.txt index d30c7cc90a1796c5f023fcbb601442887cc88557..baaec8a20ef93fc61a576e9824a92357048c7e92 100644 --- a/ets2panda/test/parser/ets/cast_expressions4-expected.txt +++ b/ets2panda/test/parser/ets/cast_expressions4-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "cast_expressions4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "cast_expressions4.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "cast_expressions4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "cast_expressions4.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "cast_expressions4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "cast_expressions4.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "cast_expressions4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "cast_expressions4.ets" - } - } - }, { "type": "MethodDefinition", "key": { @@ -815,7 +709,7 @@ }, "end": { "line": 18, - "column": 41, + "column": 63, "program": "cast_expressions4.ets" } } @@ -828,7 +722,7 @@ }, "end": { "line": 18, - "column": 41, + "column": 63, "program": "cast_expressions4.ets" } } @@ -1119,7 +1013,7 @@ }, "end": { "line": 19, - "column": 39, + "column": 58, "program": "cast_expressions4.ets" } } @@ -1132,7 +1026,7 @@ }, "end": { "line": 19, - "column": 39, + "column": 58, "program": "cast_expressions4.ets" } } @@ -1248,7 +1142,7 @@ }, "end": { "line": 21, - "column": 18, + "column": 28, "program": "cast_expressions4.ets" } } @@ -1261,7 +1155,7 @@ }, "end": { "line": 21, - "column": 18, + "column": 28, "program": "cast_expressions4.ets" } } diff --git a/ets2panda/test/parser/ets/cast_expressions5-expected.txt b/ets2panda/test/parser/ets/cast_expressions5-expected.txt index 4f98ac702e1f4d2e237b388d4f4f70bc17281935..75f9899bcac57e5a314f8cc28ead2d1f1a0c1373 100644 --- a/ets2panda/test/parser/ets/cast_expressions5-expected.txt +++ b/ets2panda/test/parser/ets/cast_expressions5-expected.txt @@ -798,177 +798,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "globalLong", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "cast_expressions5.ets" - }, - "end": { - "line": 16, - "column": 15, - "program": "cast_expressions5.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 0, - "loc": { - "start": { - "line": 16, - "column": 24, - "program": "cast_expressions5.ets" - }, - "end": { - "line": 16, - "column": 25, - "program": "cast_expressions5.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "cast_expressions5.ets" - }, - "end": { - "line": 16, - "column": 25, - "program": "cast_expressions5.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "cast_expressions5.ets" - }, - "end": { - "line": 16, - "column": 25, - "program": "cast_expressions5.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "cast_expressions5.ets" - }, - "end": { - "line": 16, - "column": 25, - "program": "cast_expressions5.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "cast_expressions5.ets" - }, - "end": { - "line": 16, - "column": 25, - "program": "cast_expressions5.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "cast_expressions5.ets" - }, - "end": { - "line": 16, - "column": 25, - "program": "cast_expressions5.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "cast_expressions5.ets" - }, - "end": { - "line": 16, - "column": 25, - "program": "cast_expressions5.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -1019,7 +848,7 @@ }, "end": { "line": 16, - "column": 25, + "column": 24, "program": "cast_expressions5.ets" } } diff --git a/ets2panda/test/parser/ets/class_init-expected.txt b/ets2panda/test/parser/ets/class_init-expected.txt index 5f0d248f14c004cd1cf2f0bb7729c9f34dc3676c..32e1680e0924772f0eb16a123e43197288646f47 100644 --- a/ets2panda/test/parser/ets/class_init-expected.txt +++ b/ets2panda/test/parser/ets/class_init-expected.txt @@ -520,112 +520,6 @@ "program": "class_init.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "class_init.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "class_init.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "class_init.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "class_init.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "class_init.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "class_init.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "class_init.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "class_init.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/class_instance-expected.txt b/ets2panda/test/parser/ets/class_instance-expected.txt index d67f34a88f2debceddb3af60bc90385c3906df6d..18fbfcdfeae53559ae04fee51f536b3d6f5f1db1 100644 --- a/ets2panda/test/parser/ets/class_instance-expected.txt +++ b/ets2panda/test/parser/ets/class_instance-expected.txt @@ -130,613 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "class_instance.ets" - }, - "end": { - "line": 16, - "column": 6, - "program": "class_instance.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 5, - "loc": { - "start": { - "line": 16, - "column": 9, - "program": "class_instance.ets" - }, - "end": { - "line": 16, - "column": 10, - "program": "class_instance.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "class_instance.ets" - }, - "end": { - "line": 16, - "column": 10, - "program": "class_instance.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "class_instance.ets" - }, - "end": { - "line": 16, - "column": 10, - "program": "class_instance.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "class_instance.ets" - }, - "end": { - "line": 17, - "column": 6, - "program": "class_instance.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 10, - "loc": { - "start": { - "line": 17, - "column": 9, - "program": "class_instance.ets" - }, - "end": { - "line": 17, - "column": 11, - "program": "class_instance.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "class_instance.ets" - }, - "end": { - "line": 17, - "column": 11, - "program": "class_instance.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "class_instance.ets" - }, - "end": { - "line": 17, - "column": 11, - "program": "class_instance.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "x", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "class_instance.ets" - }, - "end": { - "line": 19, - "column": 6, - "program": "class_instance.ets" - } - } - }, - "right": { - "type": "ETSNewArrayInstanceExpression", - "typeReference": { - "type": "ETSPrimitiveType", - "loc": { - "start": { - "line": 19, - "column": 13, - "program": "class_instance.ets" - }, - "end": { - "line": 19, - "column": 16, - "program": "class_instance.ets" - } - } - }, - "dimension": { - "type": "NumberLiteral", - "value": 10, - "loc": { - "start": { - "line": 19, - "column": 17, - "program": "class_instance.ets" - }, - "end": { - "line": 19, - "column": 19, - "program": "class_instance.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 9, - "program": "class_instance.ets" - }, - "end": { - "line": 19, - "column": 20, - "program": "class_instance.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "class_instance.ets" - }, - "end": { - "line": 19, - "column": 20, - "program": "class_instance.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "class_instance.ets" - }, - "end": { - "line": 19, - "column": 20, - "program": "class_instance.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "y", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "class_instance.ets" - }, - "end": { - "line": 20, - "column": 6, - "program": "class_instance.ets" - } - } - }, - "right": { - "type": "ETSNewMultiDimArrayInstanceExpression", - "typeReference": { - "type": "ETSPrimitiveType", - "loc": { - "start": { - "line": 20, - "column": 13, - "program": "class_instance.ets" - }, - "end": { - "line": 20, - "column": 16, - "program": "class_instance.ets" - } - } - }, - "dimensions": [ - { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 17, - "program": "class_instance.ets" - }, - "end": { - "line": 20, - "column": 18, - "program": "class_instance.ets" - } - } - }, - { - "type": "Identifier", - "name": "b", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 20, - "program": "class_instance.ets" - }, - "end": { - "line": 20, - "column": 21, - "program": "class_instance.ets" - } - } - } - ], - "loc": { - "start": { - "line": 20, - "column": 9, - "program": "class_instance.ets" - }, - "end": { - "line": 20, - "column": 22, - "program": "class_instance.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "class_instance.ets" - }, - "end": { - "line": 20, - "column": 22, - "program": "class_instance.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "class_instance.ets" - }, - "end": { - "line": 20, - "column": 22, - "program": "class_instance.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "z", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "class_instance.ets" - }, - "end": { - "line": 21, - "column": 6, - "program": "class_instance.ets" - } - } - }, - "right": { - "type": "ETSNewMultiDimArrayInstanceExpression", - "typeReference": { - "type": "ETSPrimitiveType", - "loc": { - "start": { - "line": 21, - "column": 13, - "program": "class_instance.ets" - }, - "end": { - "line": 21, - "column": 16, - "program": "class_instance.ets" - } - } - }, - "dimensions": [ - { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 17, - "program": "class_instance.ets" - }, - "end": { - "line": 21, - "column": 18, - "program": "class_instance.ets" - } - } - }, - { - "type": "Identifier", - "name": "b", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 20, - "program": "class_instance.ets" - }, - "end": { - "line": 21, - "column": 21, - "program": "class_instance.ets" - } - } - }, - { - "type": "BinaryExpression", - "operator": "+", - "left": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 23, - "program": "class_instance.ets" - }, - "end": { - "line": 21, - "column": 24, - "program": "class_instance.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "b", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 27, - "program": "class_instance.ets" - }, - "end": { - "line": 21, - "column": 28, - "program": "class_instance.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 23, - "program": "class_instance.ets" - }, - "end": { - "line": 21, - "column": 28, - "program": "class_instance.ets" - } - } - } - ], - "loc": { - "start": { - "line": 21, - "column": 9, - "program": "class_instance.ets" - }, - "end": { - "line": 21, - "column": 29, - "program": "class_instance.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "class_instance.ets" - }, - "end": { - "line": 21, - "column": 29, - "program": "class_instance.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "class_instance.ets" - }, - "end": { - "line": 21, - "column": 29, - "program": "class_instance.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "class_instance.ets" - }, - "end": { - "line": 21, - "column": 29, - "program": "class_instance.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "class_instance.ets" - }, - "end": { - "line": 21, - "column": 29, - "program": "class_instance.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "class_instance.ets" - }, - "end": { - "line": 21, - "column": 29, - "program": "class_instance.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "class_instance.ets" - }, - "end": { - "line": 21, - "column": 29, - "program": "class_instance.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/class_instance_creation-expected.txt b/ets2panda/test/parser/ets/class_instance_creation-expected.txt index bc4035e81e0c9d65894dd7eba24e39895342fdd8..dd65f6d76c00edb5793947797cdb769d30f1f177 100644 --- a/ets2panda/test/parser/ets/class_instance_creation-expected.txt +++ b/ets2panda/test/parser/ets/class_instance_creation-expected.txt @@ -1173,112 +1173,6 @@ "program": "class_instance_creation.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "class_instance_creation.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "class_instance_creation.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "class_instance_creation.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "class_instance_creation.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "class_instance_creation.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "class_instance_creation.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "class_instance_creation.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "class_instance_creation.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/class_instance_import_alias-expected.txt b/ets2panda/test/parser/ets/class_instance_import_alias-expected.txt index 31cfa717b7bfc02f07e13526d6c429226010be58..f7e697eeaa826c78f6fbe2e3a8e3942a82583b40 100644 --- a/ets2panda/test/parser/ets/class_instance_import_alias-expected.txt +++ b/ets2panda/test/parser/ets/class_instance_import_alias-expected.txt @@ -89,112 +89,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "class_instance_import_alias.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "class_instance_import_alias.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "class_instance_import_alias.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "class_instance_import_alias.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "class_instance_import_alias.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "class_instance_import_alias.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "class_instance_import_alias.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "class_instance_import_alias.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/class_instance_initializer-expected.txt b/ets2panda/test/parser/ets/class_instance_initializer-expected.txt index b77f2f42cd17e5c8591ac7e72bbedb20c27b40b5..2aa02a132d007278c8e7ecc70f347510f7c352b1 100644 --- a/ets2panda/test/parser/ets/class_instance_initializer-expected.txt +++ b/ets2panda/test/parser/ets/class_instance_initializer-expected.txt @@ -3537,112 +3537,6 @@ "program": "class_instance_initializer.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "class_instance_initializer.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "class_instance_initializer.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "class_instance_initializer.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "class_instance_initializer.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "class_instance_initializer.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "class_instance_initializer.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "class_instance_initializer.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "class_instance_initializer.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/class_static_initializer-expected.txt b/ets2panda/test/parser/ets/class_static_initializer-expected.txt index d9e54d92223728716addde3424a5b15aa0dd1c85..3927f7784c5defdafff9ad1a689ea9842c1f4587 100644 --- a/ets2panda/test/parser/ets/class_static_initializer-expected.txt +++ b/ets2panda/test/parser/ets/class_static_initializer-expected.txt @@ -901,112 +901,6 @@ "program": "class_static_initializer.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "class_static_initializer.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "class_static_initializer.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "class_static_initializer.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "class_static_initializer.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "class_static_initializer.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "class_static_initializer.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "class_static_initializer.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "class_static_initializer.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/classes-expected.txt b/ets2panda/test/parser/ets/classes-expected.txt index 758108e2834e0110ff9e552ad09a476de541bb73..6f666aa470c4cc251f3590534d1c56af5c4a85c0 100644 --- a/ets2panda/test/parser/ets/classes-expected.txt +++ b/ets2panda/test/parser/ets/classes-expected.txt @@ -795,112 +795,6 @@ "program": "classes.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "classes.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "classes.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "classes.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "classes.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "classes.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "classes.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "classes.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "classes.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/comment_block-expected.txt b/ets2panda/test/parser/ets/comment_block-expected.txt index e15e80b28d3970a60189a0ccaf6231261ce52a16..3d07b8cac493cc7d76686ab2787cde114c15d80b 100644 --- a/ets2panda/test/parser/ets/comment_block-expected.txt +++ b/ets2panda/test/parser/ets/comment_block-expected.txt @@ -129,112 +129,6 @@ "program": "comment_block.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "comment_block.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "comment_block.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "comment_block.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "comment_block.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "comment_block.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "comment_block.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "comment_block.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "comment_block.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/comment_line-expected.txt b/ets2panda/test/parser/ets/comment_line-expected.txt index c2729f70bf7e4362b8c1849d5e5fb2947f882240..7595a6ea17e685ada62fb74eb813f20ea35e3667 100644 --- a/ets2panda/test/parser/ets/comment_line-expected.txt +++ b/ets2panda/test/parser/ets/comment_line-expected.txt @@ -129,112 +129,6 @@ "program": "comment_line.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "comment_line.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "comment_line.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "comment_line.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "comment_line.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "comment_line.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "comment_line.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "comment_line.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "comment_line.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/conditionalExpressionType-expected.txt b/ets2panda/test/parser/ets/conditionalExpressionType-expected.txt index a571badc91310bf6d207e9468ed682469f9898bb..980d8287f03af7a9aa01d2f83be9829739a6cef0 100644 --- a/ets2panda/test/parser/ets/conditionalExpressionType-expected.txt +++ b/ets2panda/test/parser/ets/conditionalExpressionType-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "conditionalExpressionType.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "conditionalExpressionType.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "conditionalExpressionType.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "conditionalExpressionType.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "conditionalExpressionType.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "conditionalExpressionType.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "conditionalExpressionType.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "conditionalExpressionType.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/const-expected.txt b/ets2panda/test/parser/ets/const-expected.txt index 428f2f93a3c088452c516905f84f20449dad516f..3e19a1202c605824617fde4876a248bf62890d28 100644 --- a/ets2panda/test/parser/ets/const-expected.txt +++ b/ets2panda/test/parser/ets/const-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "const.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "const.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "const.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "const.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "const.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "const.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "const.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "const.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/constructor_super_call1-expected.txt b/ets2panda/test/parser/ets/constructor_super_call1-expected.txt index cd3bc7482ade0c796d3e00e6efd737bc7569da02..11826152fdcfcb7a4aa23821c65e16be90568f19 100644 --- a/ets2panda/test/parser/ets/constructor_super_call1-expected.txt +++ b/ets2panda/test/parser/ets/constructor_super_call1-expected.txt @@ -821,112 +821,6 @@ "program": "constructor_super_call1.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "constructor_super_call1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "constructor_super_call1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "constructor_super_call1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "constructor_super_call1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "constructor_super_call1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "constructor_super_call1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "constructor_super_call1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "constructor_super_call1.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/constructor_super_call3-expected.txt b/ets2panda/test/parser/ets/constructor_super_call3-expected.txt index af91ee23a2a9ae9642b626e6fd231218ef813953..5a8f92174e09b9f78f0200c6cc6d438138729838 100644 --- a/ets2panda/test/parser/ets/constructor_super_call3-expected.txt +++ b/ets2panda/test/parser/ets/constructor_super_call3-expected.txt @@ -535,112 +535,6 @@ "program": "constructor_super_call3.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "constructor_super_call3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "constructor_super_call3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "constructor_super_call3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "constructor_super_call3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "constructor_super_call3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "constructor_super_call3.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "constructor_super_call3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "constructor_super_call3.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/constructor_test-expected.txt b/ets2panda/test/parser/ets/constructor_test-expected.txt index c35976385272bc1cd231fff184154e04c1e40950..cfcb80c42e743bb7c0813af5ecab36461d7703f0 100644 --- a/ets2panda/test/parser/ets/constructor_test-expected.txt +++ b/ets2panda/test/parser/ets/constructor_test-expected.txt @@ -1273,112 +1273,6 @@ "program": "constructor_test.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "constructor_test.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "constructor_test.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "constructor_test.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "constructor_test.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "constructor_test.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "constructor_test.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "constructor_test.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "constructor_test.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/constructor_with_return_2-expected.txt b/ets2panda/test/parser/ets/constructor_with_return_2-expected.txt index e8b1a538fe0530a50326b92dd3b4e19d3ccf656e..e0f64c455060fe8a014a370e67c4dc2fa7a8c8d7 100644 --- a/ets2panda/test/parser/ets/constructor_with_return_2-expected.txt +++ b/ets2panda/test/parser/ets/constructor_with_return_2-expected.txt @@ -453,112 +453,6 @@ "program": "constructor_with_return_2.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "constructor_with_return_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "constructor_with_return_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "constructor_with_return_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "constructor_with_return_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "constructor_with_return_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "constructor_with_return_2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "constructor_with_return_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "constructor_with_return_2.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/continue-expected.txt b/ets2panda/test/parser/ets/continue-expected.txt index d28fae802d2083952ec175b51b9226f12cf9f367..6a68211d135a34d36966963aafdd402b1dcb5732 100644 --- a/ets2panda/test/parser/ets/continue-expected.txt +++ b/ets2panda/test/parser/ets/continue-expected.txt @@ -24,226 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "continue.ets" - }, - "end": { - "line": 16, - "column": 6, - "program": "continue.ets" - } - } - }, - "right": { - "type": "ArrayExpression", - "elements": [ - { - "type": "NumberLiteral", - "value": 1, - "loc": { - "start": { - "line": 16, - "column": 17, - "program": "continue.ets" - }, - "end": { - "line": 16, - "column": 18, - "program": "continue.ets" - } - } - }, - { - "type": "NumberLiteral", - "value": 2, - "loc": { - "start": { - "line": 16, - "column": 20, - "program": "continue.ets" - }, - "end": { - "line": 16, - "column": 21, - "program": "continue.ets" - } - } - }, - { - "type": "NumberLiteral", - "value": 3, - "loc": { - "start": { - "line": 16, - "column": 23, - "program": "continue.ets" - }, - "end": { - "line": 16, - "column": 24, - "program": "continue.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 16, - "program": "continue.ets" - }, - "end": { - "line": 16, - "column": 25, - "program": "continue.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "continue.ets" - }, - "end": { - "line": 16, - "column": 25, - "program": "continue.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "continue.ets" - }, - "end": { - "line": 16, - "column": 25, - "program": "continue.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "continue.ets" - }, - "end": { - "line": 16, - "column": 25, - "program": "continue.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "continue.ets" - }, - "end": { - "line": 16, - "column": 25, - "program": "continue.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "continue.ets" - }, - "end": { - "line": 16, - "column": 25, - "program": "continue.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "continue.ets" - }, - "end": { - "line": 16, - "column": 25, - "program": "continue.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -358,7 +138,7 @@ }, "end": { "line": 16, - "column": 25, + "column": 16, "program": "continue.ets" } } diff --git a/ets2panda/test/parser/ets/conversions-expected.txt b/ets2panda/test/parser/ets/conversions-expected.txt index 4108a9fc06c21c826448ff37179c9ba9dc87e404..34bcd562835e6bfff2619a32d5a7682e805a51ba 100644 --- a/ets2panda/test/parser/ets/conversions-expected.txt +++ b/ets2panda/test/parser/ets/conversions-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "conversions.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "conversions.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "conversions.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "conversions.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "conversions.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "conversions.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "conversions.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "conversions.ets" - } - } - }, { "type": "MethodDefinition", "key": { @@ -275,7 +169,7 @@ }, "end": { "line": 17, - "column": 20, + "column": 28, "program": "conversions.ets" } } @@ -288,7 +182,7 @@ }, "end": { "line": 17, - "column": 20, + "column": 28, "program": "conversions.ets" } } @@ -303,7 +197,7 @@ }, "end": { "line": 17, - "column": 20, + "column": 28, "program": "conversions.ets" } } diff --git a/ets2panda/test/parser/ets/decl_infer-expected.txt b/ets2panda/test/parser/ets/decl_infer-expected.txt index f0a6e3abfed9ba411e1e0f9bd52ebebc2c1e5edd..d71f676adc6cfe76fab9a295e1e6b10abb2cad6c 100644 --- a/ets2panda/test/parser/ets/decl_infer-expected.txt +++ b/ets2panda/test/parser/ets/decl_infer-expected.txt @@ -130,433 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "li", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "decl_infer.ets" - }, - "end": { - "line": 16, - "column": 7, - "program": "decl_infer.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 0, - "loc": { - "start": { - "line": 16, - "column": 10, - "program": "decl_infer.ets" - }, - "end": { - "line": 16, - "column": 11, - "program": "decl_infer.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "decl_infer.ets" - }, - "end": { - "line": 16, - "column": 11, - "program": "decl_infer.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "decl_infer.ets" - }, - "end": { - "line": 16, - "column": 11, - "program": "decl_infer.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "ld", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "decl_infer.ets" - }, - "end": { - "line": 17, - "column": 7, - "program": "decl_infer.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 0, - "loc": { - "start": { - "line": 17, - "column": 10, - "program": "decl_infer.ets" - }, - "end": { - "line": 17, - "column": 13, - "program": "decl_infer.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "decl_infer.ets" - }, - "end": { - "line": 17, - "column": 13, - "program": "decl_infer.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "decl_infer.ets" - }, - "end": { - "line": 17, - "column": 13, - "program": "decl_infer.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "lc", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "decl_infer.ets" - }, - "end": { - "line": 18, - "column": 7, - "program": "decl_infer.ets" - } - } - }, - "right": { - "type": "CharLiteral", - "value": "a", - "loc": { - "start": { - "line": 18, - "column": 10, - "program": "decl_infer.ets" - }, - "end": { - "line": 18, - "column": 14, - "program": "decl_infer.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "decl_infer.ets" - }, - "end": { - "line": 18, - "column": 14, - "program": "decl_infer.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "decl_infer.ets" - }, - "end": { - "line": 18, - "column": 14, - "program": "decl_infer.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "ls", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "decl_infer.ets" - }, - "end": { - "line": 19, - "column": 7, - "program": "decl_infer.ets" - } - } - }, - "right": { - "type": "StringLiteral", - "value": "11", - "loc": { - "start": { - "line": 19, - "column": 10, - "program": "decl_infer.ets" - }, - "end": { - "line": 19, - "column": 14, - "program": "decl_infer.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "decl_infer.ets" - }, - "end": { - "line": 19, - "column": 14, - "program": "decl_infer.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "decl_infer.ets" - }, - "end": { - "line": 19, - "column": 14, - "program": "decl_infer.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "lb", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "decl_infer.ets" - }, - "end": { - "line": 20, - "column": 7, - "program": "decl_infer.ets" - } - } - }, - "right": { - "type": "BooleanLiteral", - "value": false, - "loc": { - "start": { - "line": 20, - "column": 10, - "program": "decl_infer.ets" - }, - "end": { - "line": 20, - "column": 15, - "program": "decl_infer.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "decl_infer.ets" - }, - "end": { - "line": 20, - "column": 15, - "program": "decl_infer.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "decl_infer.ets" - }, - "end": { - "line": 20, - "column": 15, - "program": "decl_infer.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "decl_infer.ets" - }, - "end": { - "line": 20, - "column": 15, - "program": "decl_infer.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "decl_infer.ets" - }, - "end": { - "line": 20, - "column": 15, - "program": "decl_infer.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "decl_infer.ets" - }, - "end": { - "line": 20, - "column": 15, - "program": "decl_infer.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "decl_infer.ets" - }, - "end": { - "line": 20, - "column": 15, - "program": "decl_infer.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/declare_ambient_const_variable-expected.txt b/ets2panda/test/parser/ets/declare_ambient_const_variable-expected.txt index 862a6c244bdfd39ffe55f739138b909ef1e8bdc4..d44a3baae9caaa5835ad62bf95e397337958122a 100644 --- a/ets2panda/test/parser/ets/declare_ambient_const_variable-expected.txt +++ b/ets2panda/test/parser/ets/declare_ambient_const_variable-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "declare_ambient_const_variable.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "declare_ambient_const_variable.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "declare_ambient_const_variable.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "declare_ambient_const_variable.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "declare_ambient_const_variable.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "declare_ambient_const_variable.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "declare_ambient_const_variable.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "declare_ambient_const_variable.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/default_parameter10-expected.txt b/ets2panda/test/parser/ets/default_parameter10-expected.txt index f976642e7a23b6df15cc0290b151992a20ec462e..b6fc39b0f84106cbd998fc7e6a2877185fb62d22 100644 --- a/ets2panda/test/parser/ets/default_parameter10-expected.txt +++ b/ets2panda/test/parser/ets/default_parameter10-expected.txt @@ -563,112 +563,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "default_parameter10.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "default_parameter10.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "default_parameter10.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "default_parameter10.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "default_parameter10.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "default_parameter10.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "default_parameter10.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "default_parameter10.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/default_parameter5-expected.txt b/ets2panda/test/parser/ets/default_parameter5-expected.txt index fc7986789195676df190d14e93cab7467c78c697..fac42f021c5cbe8887a4a265238ce857c165cbf4 100644 --- a/ets2panda/test/parser/ets/default_parameter5-expected.txt +++ b/ets2panda/test/parser/ets/default_parameter5-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "default_parameter5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "default_parameter5.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "default_parameter5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "default_parameter5.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "default_parameter5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "default_parameter5.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "default_parameter5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "default_parameter5.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/default_parameter7-expected.txt b/ets2panda/test/parser/ets/default_parameter7-expected.txt index d97fda2841a6be451fb169ef7afbac4069e784e8..1fb94ea181c897814445056a303497ae0c0763ec 100644 --- a/ets2panda/test/parser/ets/default_parameter7-expected.txt +++ b/ets2panda/test/parser/ets/default_parameter7-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "default_parameter7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "default_parameter7.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "default_parameter7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "default_parameter7.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "default_parameter7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "default_parameter7.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "default_parameter7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "default_parameter7.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/default_parameter9-expected.txt b/ets2panda/test/parser/ets/default_parameter9-expected.txt index efabf1fb01fd3a96ce3d9dd3f103bc0a1d267a6c..bfdf1e36b2ef51db0bcdaa283a07eb8e1e7599c3 100644 --- a/ets2panda/test/parser/ets/default_parameter9-expected.txt +++ b/ets2panda/test/parser/ets/default_parameter9-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "default_parameter9.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "default_parameter9.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "default_parameter9.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "default_parameter9.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "default_parameter9.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "default_parameter9.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "default_parameter9.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "default_parameter9.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/default_parameter_implicitly_typed_return_void-expected.txt b/ets2panda/test/parser/ets/default_parameter_implicitly_typed_return_void-expected.txt index b5d0e3d0801d50136698c3ff03fefb5d7b4454d7..ede5acd513372e2c239b49eaefc66446196cbe19 100644 --- a/ets2panda/test/parser/ets/default_parameter_implicitly_typed_return_void-expected.txt +++ b/ets2panda/test/parser/ets/default_parameter_implicitly_typed_return_void-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "default_parameter_implicitly_typed_return_void.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "default_parameter_implicitly_typed_return_void.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "default_parameter_implicitly_typed_return_void.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "default_parameter_implicitly_typed_return_void.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "default_parameter_implicitly_typed_return_void.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "default_parameter_implicitly_typed_return_void.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "default_parameter_implicitly_typed_return_void.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "default_parameter_implicitly_typed_return_void.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/dynamic_import_tests/dynamic_optional_decl-expected.txt b/ets2panda/test/parser/ets/dynamic_import_tests/dynamic_optional_decl-expected.txt index f8bfa08e5ed2171b6987f1965952eb505f545700..0df90a82c647a47100c19d708ca6f9d46622db32 100644 --- a/ets2panda/test/parser/ets/dynamic_import_tests/dynamic_optional_decl-expected.txt +++ b/ets2panda/test/parser/ets/dynamic_import_tests/dynamic_optional_decl-expected.txt @@ -155,112 +155,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "dynamic_optional_decl.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "dynamic_optional_decl.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "dynamic_optional_decl.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "dynamic_optional_decl.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "dynamic_optional_decl.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "dynamic_optional_decl.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "dynamic_optional_decl.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "dynamic_optional_decl.ets" - } - } - }, { "type": "MethodDefinition", "key": { @@ -635,7 +529,7 @@ }, "end": { "line": 21, - "column": 39, + "column": 51, "program": "dynamic_optional_decl.ets" } } diff --git a/ets2panda/test/parser/ets/empty_class-expected.txt b/ets2panda/test/parser/ets/empty_class-expected.txt index 59f82bdf0fc3b3bb5b043e7a252383c756f88912..8cf346e6cecb247c0852e5a10299d8b25fd39c6d 100644 --- a/ets2panda/test/parser/ets/empty_class-expected.txt +++ b/ets2panda/test/parser/ets/empty_class-expected.txt @@ -284,112 +284,6 @@ "program": "empty_class.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "empty_class.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "empty_class.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "empty_class.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "empty_class.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "empty_class.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "empty_class.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "empty_class.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "empty_class.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/empty_statement-expected.txt b/ets2panda/test/parser/ets/empty_statement-expected.txt index 14654c87212b670dc622bc6a61279b3ec17c8b88..3c4c074305646e5a85021c437e1404b3d6896ef7 100644 --- a/ets2panda/test/parser/ets/empty_statement-expected.txt +++ b/ets2panda/test/parser/ets/empty_statement-expected.txt @@ -986,112 +986,6 @@ "program": "empty_statement.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "empty_statement.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "empty_statement.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "empty_statement.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "empty_statement.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "empty_statement.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "empty_statement.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "empty_statement.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "empty_statement.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/exports-expected.txt b/ets2panda/test/parser/ets/exports-expected.txt index 970424f5c0d78b797f701e233f70485cdcaebbd5..d05ac6caf3d2bc73af865e2f61e003122eda7622 100644 --- a/ets2panda/test/parser/ets/exports-expected.txt +++ b/ets2panda/test/parser/ets/exports-expected.txt @@ -381,177 +381,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "exports.ets" - }, - "end": { - "line": 16, - "column": 13, - "program": "exports.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 11, - "loc": { - "start": { - "line": 16, - "column": 16, - "program": "exports.ets" - }, - "end": { - "line": 16, - "column": 18, - "program": "exports.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "exports.ets" - }, - "end": { - "line": 16, - "column": 18, - "program": "exports.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "exports.ets" - }, - "end": { - "line": 16, - "column": 18, - "program": "exports.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "exports.ets" - }, - "end": { - "line": 16, - "column": 18, - "program": "exports.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "exports.ets" - }, - "end": { - "line": 16, - "column": 18, - "program": "exports.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "exports.ets" - }, - "end": { - "line": 16, - "column": 18, - "program": "exports.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "exports.ets" - }, - "end": { - "line": 16, - "column": 18, - "program": "exports.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/external_cyclic_constructor_check-expected.txt b/ets2panda/test/parser/ets/external_cyclic_constructor_check-expected.txt index d3d8c633b841994e9fefdc04e52f3c8e141c15ba..60b959ceb9f659b4d1c71d568a7232b5ffadfa79 100644 --- a/ets2panda/test/parser/ets/external_cyclic_constructor_check-expected.txt +++ b/ets2panda/test/parser/ets/external_cyclic_constructor_check-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "external_cyclic_constructor_check.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "external_cyclic_constructor_check.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "external_cyclic_constructor_check.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "external_cyclic_constructor_check.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "external_cyclic_constructor_check.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "external_cyclic_constructor_check.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "external_cyclic_constructor_check.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "external_cyclic_constructor_check.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/field_decl-expected.txt b/ets2panda/test/parser/ets/field_decl-expected.txt index b13048343fa82e51b6907879af1ed0ba0e577255..1a7ff14cca1aaec47c555607f311fe5d3a5ce523 100644 --- a/ets2panda/test/parser/ets/field_decl-expected.txt +++ b/ets2panda/test/parser/ets/field_decl-expected.txt @@ -859,112 +859,6 @@ "program": "field_decl.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "field_decl.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "field_decl.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "field_decl.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "field_decl.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "field_decl.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "field_decl.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "field_decl.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "field_decl.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/final_empty_class-expected.txt b/ets2panda/test/parser/ets/final_empty_class-expected.txt index cb234dfcc64c1f4736653594465f99f69fd77219..8140907a23f073713ed7fa435fafab4c8531a22b 100644 --- a/ets2panda/test/parser/ets/final_empty_class-expected.txt +++ b/ets2panda/test/parser/ets/final_empty_class-expected.txt @@ -284,112 +284,6 @@ "program": "final_empty_class.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "final_empty_class.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "final_empty_class.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "final_empty_class.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "final_empty_class.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "final_empty_class.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "final_empty_class.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "final_empty_class.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "final_empty_class.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/float_pont_format_1-expected.txt b/ets2panda/test/parser/ets/float_pont_format_1-expected.txt index 9f2fe9f579e2b6d087e390e8b2c2c35c7604715b..5b032d949903bebcf4bb4140f5838d799466ac8f 100644 --- a/ets2panda/test/parser/ets/float_pont_format_1-expected.txt +++ b/ets2panda/test/parser/ets/float_pont_format_1-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "float_pont_format_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "float_pont_format_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "float_pont_format_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "float_pont_format_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "float_pont_format_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "float_pont_format_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "float_pont_format_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "float_pont_format_1.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/float_pont_format_2-expected.txt b/ets2panda/test/parser/ets/float_pont_format_2-expected.txt index d5bb53cff2705650e73548937916e1c5f978b70a..897cb93b49869f840e13ac1299682e65b72bf823 100644 --- a/ets2panda/test/parser/ets/float_pont_format_2-expected.txt +++ b/ets2panda/test/parser/ets/float_pont_format_2-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "float_pont_format_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "float_pont_format_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "float_pont_format_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "float_pont_format_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "float_pont_format_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "float_pont_format_2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "float_pont_format_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "float_pont_format_2.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/float_pont_format_3-expected.txt b/ets2panda/test/parser/ets/float_pont_format_3-expected.txt index 308d54d6812195ea2e1dc5a9e64764e1f10efdca..268f943971e4d4658d50363db8074866b7db8cc6 100644 --- a/ets2panda/test/parser/ets/float_pont_format_3-expected.txt +++ b/ets2panda/test/parser/ets/float_pont_format_3-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "float_pont_format_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "float_pont_format_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "float_pont_format_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "float_pont_format_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "float_pont_format_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "float_pont_format_3.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "float_pont_format_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "float_pont_format_3.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/float_pont_format_4-expected.txt b/ets2panda/test/parser/ets/float_pont_format_4-expected.txt index 74f0a097569b3fe15a51970117fb1071e3473d82..0987812d1e62d301476b119ecb005f3dd0774f30 100644 --- a/ets2panda/test/parser/ets/float_pont_format_4-expected.txt +++ b/ets2panda/test/parser/ets/float_pont_format_4-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "float_pont_format_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "float_pont_format_4.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "float_pont_format_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "float_pont_format_4.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "float_pont_format_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "float_pont_format_4.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "float_pont_format_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "float_pont_format_4.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/float_pont_format_5-expected.txt b/ets2panda/test/parser/ets/float_pont_format_5-expected.txt index b5eabd70ccbfa03924454e007db137be7ca813f2..54e743a1d857f7e327d93b66011f773c5d2ea5f8 100644 --- a/ets2panda/test/parser/ets/float_pont_format_5-expected.txt +++ b/ets2panda/test/parser/ets/float_pont_format_5-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "float_pont_format_5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "float_pont_format_5.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "float_pont_format_5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "float_pont_format_5.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "float_pont_format_5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "float_pont_format_5.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "float_pont_format_5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "float_pont_format_5.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/float_pont_format_6-expected.txt b/ets2panda/test/parser/ets/float_pont_format_6-expected.txt index fc847947e0103fbdc940c9c0f02e6fcc12d4a48b..1e3167ef881dd52c5b53f75f06c81463eda30821 100644 --- a/ets2panda/test/parser/ets/float_pont_format_6-expected.txt +++ b/ets2panda/test/parser/ets/float_pont_format_6-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "float_pont_format_6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "float_pont_format_6.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "float_pont_format_6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "float_pont_format_6.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "float_pont_format_6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "float_pont_format_6.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "float_pont_format_6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "float_pont_format_6.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/float_pont_format_7-expected.txt b/ets2panda/test/parser/ets/float_pont_format_7-expected.txt index 632e2de9ed39a392508d0b8e9d166b1aa445e8db..db2b0c06a26942035bb175c49bd1997b85fbf0fd 100644 --- a/ets2panda/test/parser/ets/float_pont_format_7-expected.txt +++ b/ets2panda/test/parser/ets/float_pont_format_7-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "float_pont_format_7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "float_pont_format_7.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "float_pont_format_7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "float_pont_format_7.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "float_pont_format_7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "float_pont_format_7.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "float_pont_format_7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "float_pont_format_7.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/float_pont_format_8-expected.txt b/ets2panda/test/parser/ets/float_pont_format_8-expected.txt index a11a9162bac7f684d96234c2d191327922c302ad..d9a246070937365bdf4d5289a3fa4225431115e5 100644 --- a/ets2panda/test/parser/ets/float_pont_format_8-expected.txt +++ b/ets2panda/test/parser/ets/float_pont_format_8-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "float_pont_format_8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "float_pont_format_8.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "float_pont_format_8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "float_pont_format_8.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "float_pont_format_8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "float_pont_format_8.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "float_pont_format_8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "float_pont_format_8.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/float_separator_1-expected.txt b/ets2panda/test/parser/ets/float_separator_1-expected.txt index 81c9d0875e70b4a9c1b01c1d0b962b0c35d9fd65..ba1b66b845340ce873b3e8c42d862b835aa94716 100644 --- a/ets2panda/test/parser/ets/float_separator_1-expected.txt +++ b/ets2panda/test/parser/ets/float_separator_1-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "float_separator_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "float_separator_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "float_separator_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "float_separator_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "float_separator_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "float_separator_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "float_separator_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "float_separator_1.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/folder_import_index/index-expected.txt b/ets2panda/test/parser/ets/folder_import_index/index-expected.txt index b3fd2b5adb26dfcb388f48994f9d304a619c95d4..88a6e48ba7f2f9160eb5c85330f2b658c521e8da 100644 --- a/ets2panda/test/parser/ets/folder_import_index/index-expected.txt +++ b/ets2panda/test/parser/ets/folder_import_index/index-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "index.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "index.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "index.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "index.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "index.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "index.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "index.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "index.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/for_of-expected.txt b/ets2panda/test/parser/ets/for_of-expected.txt index 14d19e60513cd777d0cfa85a517f2e299316cdaa..47677a6225dd982846bd0cb025cacd31e7abd82c 100644 --- a/ets2panda/test/parser/ets/for_of-expected.txt +++ b/ets2panda/test/parser/ets/for_of-expected.txt @@ -24,226 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "for_of.ets" - }, - "end": { - "line": 17, - "column": 6, - "program": "for_of.ets" - } - } - }, - "right": { - "type": "ArrayExpression", - "elements": [ - { - "type": "NumberLiteral", - "value": 1, - "loc": { - "start": { - "line": 17, - "column": 17, - "program": "for_of.ets" - }, - "end": { - "line": 17, - "column": 18, - "program": "for_of.ets" - } - } - }, - { - "type": "NumberLiteral", - "value": 2, - "loc": { - "start": { - "line": 17, - "column": 20, - "program": "for_of.ets" - }, - "end": { - "line": 17, - "column": 21, - "program": "for_of.ets" - } - } - }, - { - "type": "NumberLiteral", - "value": 3, - "loc": { - "start": { - "line": 17, - "column": 23, - "program": "for_of.ets" - }, - "end": { - "line": 17, - "column": 24, - "program": "for_of.ets" - } - } - } - ], - "loc": { - "start": { - "line": 17, - "column": 16, - "program": "for_of.ets" - }, - "end": { - "line": 17, - "column": 25, - "program": "for_of.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "for_of.ets" - }, - "end": { - "line": 17, - "column": 25, - "program": "for_of.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "for_of.ets" - }, - "end": { - "line": 17, - "column": 25, - "program": "for_of.ets" - } - } - } - ], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "for_of.ets" - }, - "end": { - "line": 17, - "column": 25, - "program": "for_of.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "for_of.ets" - }, - "end": { - "line": 17, - "column": 25, - "program": "for_of.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "for_of.ets" - }, - "end": { - "line": 17, - "column": 25, - "program": "for_of.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "for_of.ets" - }, - "end": { - "line": 17, - "column": 25, - "program": "for_of.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -358,7 +138,7 @@ }, "end": { "line": 17, - "column": 25, + "column": 16, "program": "for_of.ets" } } diff --git a/ets2panda/test/parser/ets/for_with_break-expected.txt b/ets2panda/test/parser/ets/for_with_break-expected.txt index d60aa7ae34c2038dc61776642b5e2854d11774c0..b3c602e498d8ad76b047d5db49261ec8e0ddc83a 100644 --- a/ets2panda/test/parser/ets/for_with_break-expected.txt +++ b/ets2panda/test/parser/ets/for_with_break-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "for_with_break.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "for_with_break.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "for_with_break.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "for_with_break.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "for_with_break.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "for_with_break.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "for_with_break.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "for_with_break.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/forofUnboxing-expected.txt b/ets2panda/test/parser/ets/forofUnboxing-expected.txt index a03e16acba5fcb682a71f502ed49367460a163a3..6a9bf8406e423b3d7d9b9378effa94269b1aee76 100644 --- a/ets2panda/test/parser/ets/forofUnboxing-expected.txt +++ b/ets2panda/test/parser/ets/forofUnboxing-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "forofUnboxing.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "forofUnboxing.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "forofUnboxing.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "forofUnboxing.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "forofUnboxing.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "forofUnboxing.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "forofUnboxing.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "forofUnboxing.ets" - } - } - }, { "type": "MethodDefinition", "key": { @@ -490,7 +384,7 @@ }, "end": { "line": 18, - "column": 35, + "column": 43, "program": "forofUnboxing.ets" } } @@ -600,7 +494,7 @@ }, "end": { "line": 18, - "column": 57, + "column": 65, "program": "forofUnboxing.ets" } } @@ -710,7 +604,7 @@ }, "end": { "line": 18, - "column": 79, + "column": 87, "program": "forofUnboxing.ets" } } diff --git a/ets2panda/test/parser/ets/funcParamWithOptionalParam-expected.txt b/ets2panda/test/parser/ets/funcParamWithOptionalParam-expected.txt index ae3287ad2635ad953990f8686403276c7e452a11..dcea619512722ecc07b88131ab28f12253e822cf 100644 --- a/ets2panda/test/parser/ets/funcParamWithOptionalParam-expected.txt +++ b/ets2panda/test/parser/ets/funcParamWithOptionalParam-expected.txt @@ -396,112 +396,6 @@ "program": "funcParamWithOptionalParam.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "funcParamWithOptionalParam.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "funcParamWithOptionalParam.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "funcParamWithOptionalParam.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "funcParamWithOptionalParam.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "funcParamWithOptionalParam.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "funcParamWithOptionalParam.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "funcParamWithOptionalParam.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "funcParamWithOptionalParam.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/function-expected.txt b/ets2panda/test/parser/ets/function-expected.txt index 2b90f731ca247319e677d7bbcbcb8cc1d8201788..cb0676174ff740e73d138a56ae82ccc3b5a98a18 100644 --- a/ets2panda/test/parser/ets/function-expected.txt +++ b/ets2panda/test/parser/ets/function-expected.txt @@ -130,339 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "int2str", - "decorators": [], - "loc": { - "start": { - "line": 34, - "column": 5, - "program": "function.ets" - }, - "end": { - "line": 34, - "column": 12, - "program": "function.ets" - } - } - }, - "right": { - "type": "ArrowFunctionExpression", - "function": { - "type": "ScriptFunction", - "id": null, - "generator": false, - "async": false, - "expression": false, - "params": [ - { - "type": "ETSParameterExpression", - "name": { - "type": "Identifier", - "name": "i", - "typeAnnotation": { - "type": "ETSPrimitiveType", - "loc": { - "start": { - "line": 34, - "column": 39, - "program": "function.ets" - }, - "end": { - "line": 34, - "column": 42, - "program": "function.ets" - } - } - }, - "decorators": [], - "loc": { - "start": { - "line": 34, - "column": 36, - "program": "function.ets" - }, - "end": { - "line": 34, - "column": 42, - "program": "function.ets" - } - } - }, - "loc": { - "start": { - "line": 34, - "column": 36, - "program": "function.ets" - }, - "end": { - "line": 34, - "column": 42, - "program": "function.ets" - } - } - } - ], - "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "String", - "decorators": [], - "loc": { - "start": { - "line": 34, - "column": 45, - "program": "function.ets" - }, - "end": { - "line": 34, - "column": 51, - "program": "function.ets" - } - } - }, - "loc": { - "start": { - "line": 34, - "column": 45, - "program": "function.ets" - }, - "end": { - "line": 34, - "column": 51, - "program": "function.ets" - } - } - }, - "loc": { - "start": { - "line": 34, - "column": 45, - "program": "function.ets" - }, - "end": { - "line": 34, - "column": 51, - "program": "function.ets" - } - } - }, - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ReturnStatement", - "argument": { - "type": "StringLiteral", - "value": "", - "loc": { - "start": { - "line": 35, - "column": 12, - "program": "function.ets" - }, - "end": { - "line": 35, - "column": 14, - "program": "function.ets" - } - } - }, - "loc": { - "start": { - "line": 35, - "column": 5, - "program": "function.ets" - }, - "end": { - "line": 35, - "column": 15, - "program": "function.ets" - } - } - } - ], - "loc": { - "start": { - "line": 34, - "column": 55, - "program": "function.ets" - }, - "end": { - "line": 36, - "column": 2, - "program": "function.ets" - } - } - }, - "loc": { - "start": { - "line": 34, - "column": 35, - "program": "function.ets" - }, - "end": { - "line": 36, - "column": 2, - "program": "function.ets" - } - } - }, - "loc": { - "start": { - "line": 34, - "column": 35, - "program": "function.ets" - }, - "end": { - "line": 36, - "column": 2, - "program": "function.ets" - } - } - }, - "loc": { - "start": { - "line": 34, - "column": 5, - "program": "function.ets" - }, - "end": { - "line": 36, - "column": 2, - "program": "function.ets" - } - } - }, - "loc": { - "start": { - "line": 34, - "column": 5, - "program": "function.ets" - }, - "end": { - "line": 36, - "column": 2, - "program": "function.ets" - } - } - } - ], - "loc": { - "start": { - "line": 34, - "column": 5, - "program": "function.ets" - }, - "end": { - "line": 36, - "column": 2, - "program": "function.ets" - } - } - }, - "loc": { - "start": { - "line": 34, - "column": 5, - "program": "function.ets" - }, - "end": { - "line": 36, - "column": 2, - "program": "function.ets" - } - } - }, - "loc": { - "start": { - "line": 34, - "column": 5, - "program": "function.ets" - }, - "end": { - "line": 36, - "column": 2, - "program": "function.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 34, - "column": 5, - "program": "function.ets" - }, - "end": { - "line": 36, - "column": 2, - "program": "function.ets" - } - } - }, { "type": "MethodDefinition", "key": { @@ -1810,8 +1477,8 @@ "program": "function.ets" }, "end": { - "line": 36, - "column": 2, + "line": 34, + "column": 35, "program": "function.ets" } } diff --git a/ets2panda/test/parser/ets/function_implicit_return_type5-expected.txt b/ets2panda/test/parser/ets/function_implicit_return_type5-expected.txt index 85b3978a53cc52997f046f49dec1006c885a6475..d2d139a9f74c8f63343d05169ebee4374097f814 100644 --- a/ets2panda/test/parser/ets/function_implicit_return_type5-expected.txt +++ b/ets2panda/test/parser/ets/function_implicit_return_type5-expected.txt @@ -422,112 +422,6 @@ "program": "function_implicit_return_type5.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "function_implicit_return_type5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "function_implicit_return_type5.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "function_implicit_return_type5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "function_implicit_return_type5.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "function_implicit_return_type5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "function_implicit_return_type5.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "function_implicit_return_type5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "function_implicit_return_type5.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/function_implicit_return_type6-expected.txt b/ets2panda/test/parser/ets/function_implicit_return_type6-expected.txt index 03954a64fd53173f2e18b48ab1ce79e5a6a05766..87f232e9c9860687391a914a9d118f659715b15a 100644 --- a/ets2panda/test/parser/ets/function_implicit_return_type6-expected.txt +++ b/ets2panda/test/parser/ets/function_implicit_return_type6-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "function_implicit_return_type6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "function_implicit_return_type6.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "function_implicit_return_type6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "function_implicit_return_type6.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "function_implicit_return_type6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "function_implicit_return_type6.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "function_implicit_return_type6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "function_implicit_return_type6.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/function_implicit_return_type8-expected.txt b/ets2panda/test/parser/ets/function_implicit_return_type8-expected.txt index 3f4706de4a8a9246eb67b9b01cd2d0b4a8d102d4..230680d3be72604e201b35d7f0cdd0b3141e1541 100644 --- a/ets2panda/test/parser/ets/function_implicit_return_type8-expected.txt +++ b/ets2panda/test/parser/ets/function_implicit_return_type8-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "function_implicit_return_type8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "function_implicit_return_type8.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "function_implicit_return_type8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "function_implicit_return_type8.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "function_implicit_return_type8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "function_implicit_return_type8.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "function_implicit_return_type8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "function_implicit_return_type8.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/function_implicit_return_type9-expected.txt b/ets2panda/test/parser/ets/function_implicit_return_type9-expected.txt index 2030c5c88d0210c3a5635a597c6de3bab8c40207..16b234f818b0b2300816814aabec42243d6b06bb 100644 --- a/ets2panda/test/parser/ets/function_implicit_return_type9-expected.txt +++ b/ets2panda/test/parser/ets/function_implicit_return_type9-expected.txt @@ -364,112 +364,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "function_implicit_return_type9.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "function_implicit_return_type9.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "function_implicit_return_type9.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "function_implicit_return_type9.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "function_implicit_return_type9.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "function_implicit_return_type9.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "function_implicit_return_type9.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "function_implicit_return_type9.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/genericDefaultParam_1-expected.txt b/ets2panda/test/parser/ets/genericDefaultParam_1-expected.txt index 022219faa3134bfe7f6de5f80f45df53cc7dc106..93b7c8396b54ff412410f6a50ddaa33079ddcb85 100644 --- a/ets2panda/test/parser/ets/genericDefaultParam_1-expected.txt +++ b/ets2panda/test/parser/ets/genericDefaultParam_1-expected.txt @@ -1699,1229 +1699,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "CallExpression", - "callee": { - "type": "Identifier", - "name": "alma", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 1, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 20, - "column": 5, - "program": "genericDefaultParam_1.ets" - } - } - }, - "arguments": [ - { - "type": "TSAsExpression", - "expression": { - "type": "NumberLiteral", - "value": 1, - "loc": { - "start": { - "line": 20, - "column": 6, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 20, - "column": 7, - "program": "genericDefaultParam_1.ets" - } - } - }, - "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 11, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 20, - "column": 17, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 11, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 20, - "column": 17, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 11, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 20, - "column": 17, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 6, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 20, - "column": 7, - "program": "genericDefaultParam_1.ets" - } - } - } - ], - "optional": false, - "loc": { - "start": { - "line": 20, - "column": 1, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 20, - "column": 18, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 1, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 20, - "column": 18, - "program": "genericDefaultParam_1.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "CallExpression", - "callee": { - "type": "Identifier", - "name": "alma", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 1, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 21, - "column": 5, - "program": "genericDefaultParam_1.ets" - } - } - }, - "arguments": [ - { - "type": "TSAsExpression", - "expression": { - "type": "NumberLiteral", - "value": 1, - "loc": { - "start": { - "line": 21, - "column": 14, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 21, - "column": 15, - "program": "genericDefaultParam_1.ets" - } - } - }, - "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 19, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 21, - "column": 25, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 19, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 21, - "column": 25, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 19, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 21, - "column": 25, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 14, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 21, - "column": 15, - "program": "genericDefaultParam_1.ets" - } - } - } - ], - "optional": false, - "typeParameters": { - "type": "TSTypeParameterInstantiation", - "params": [ - { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 6, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 21, - "column": 12, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 6, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 21, - "column": 12, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 6, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 21, - "column": 12, - "program": "genericDefaultParam_1.ets" - } - } - } - ], - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 21, - "column": 13, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 1, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 21, - "column": 26, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 1, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 21, - "column": 26, - "program": "genericDefaultParam_1.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "CallExpression", - "callee": { - "type": "Identifier", - "name": "alma", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 1, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 22, - "column": 5, - "program": "genericDefaultParam_1.ets" - } - } - }, - "arguments": [ - { - "type": "StringLiteral", - "value": "alma", - "loc": { - "start": { - "line": 22, - "column": 14, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 22, - "column": 20, - "program": "genericDefaultParam_1.ets" - } - } - } - ], - "optional": false, - "typeParameters": { - "type": "TSTypeParameterInstantiation", - "params": [ - { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "string", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 6, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 22, - "column": 12, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 6, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 22, - "column": 12, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 6, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 22, - "column": 12, - "program": "genericDefaultParam_1.ets" - } - } - } - ], - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 22, - "column": 13, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 1, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 22, - "column": 21, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 1, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 22, - "column": 21, - "program": "genericDefaultParam_1.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "c1", - "decorators": [], - "loc": { - "start": { - "line": 31, - "column": 5, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 31, - "column": 7, - "program": "genericDefaultParam_1.ets" - } - } - }, - "right": { - "type": "ETSNewClassInstanceExpression", - "typeReference": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "C2", - "decorators": [], - "loc": { - "start": { - "line": 31, - "column": 14, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 31, - "column": 16, - "program": "genericDefaultParam_1.ets" - } - } - }, - "typeParams": { - "type": "TSTypeParameterInstantiation", - "params": [ - { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 31, - "column": 17, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 31, - "column": 23, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 31, - "column": 17, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 31, - "column": 23, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 31, - "column": 17, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 31, - "column": 23, - "program": "genericDefaultParam_1.ets" - } - } - } - ], - "loc": { - "start": { - "line": 31, - "column": 16, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 31, - "column": 24, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 31, - "column": 14, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 31, - "column": 24, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 31, - "column": 14, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 31, - "column": 24, - "program": "genericDefaultParam_1.ets" - } - } - }, - "arguments": [], - "loc": { - "start": { - "line": 31, - "column": 10, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 32, - "column": 4, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 31, - "column": 5, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 32, - "column": 4, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 31, - "column": 5, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 32, - "column": 4, - "program": "genericDefaultParam_1.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "c2", - "decorators": [], - "loc": { - "start": { - "line": 32, - "column": 5, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 32, - "column": 7, - "program": "genericDefaultParam_1.ets" - } - } - }, - "right": { - "type": "ETSNewClassInstanceExpression", - "typeReference": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "C2", - "decorators": [], - "loc": { - "start": { - "line": 32, - "column": 14, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 32, - "column": 16, - "program": "genericDefaultParam_1.ets" - } - } - }, - "typeParams": { - "type": "TSTypeParameterInstantiation", - "params": [ - { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 32, - "column": 17, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 32, - "column": 23, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 32, - "column": 17, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 32, - "column": 23, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 32, - "column": 17, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 32, - "column": 23, - "program": "genericDefaultParam_1.ets" - } - } - }, - { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "string", - "decorators": [], - "loc": { - "start": { - "line": 32, - "column": 25, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 32, - "column": 31, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 32, - "column": 25, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 32, - "column": 31, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 32, - "column": 25, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 32, - "column": 31, - "program": "genericDefaultParam_1.ets" - } - } - } - ], - "loc": { - "start": { - "line": 32, - "column": 16, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 32, - "column": 32, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 32, - "column": 14, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 32, - "column": 32, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 32, - "column": 14, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 32, - "column": 32, - "program": "genericDefaultParam_1.ets" - } - } - }, - "arguments": [], - "loc": { - "start": { - "line": 32, - "column": 10, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 33, - "column": 4, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 32, - "column": 5, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 33, - "column": 4, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 32, - "column": 5, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 33, - "column": 4, - "program": "genericDefaultParam_1.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "c3", - "decorators": [], - "loc": { - "start": { - "line": 33, - "column": 5, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 33, - "column": 7, - "program": "genericDefaultParam_1.ets" - } - } - }, - "right": { - "type": "ETSNewClassInstanceExpression", - "typeReference": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "C2", - "decorators": [], - "loc": { - "start": { - "line": 33, - "column": 14, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 33, - "column": 16, - "program": "genericDefaultParam_1.ets" - } - } - }, - "typeParams": { - "type": "TSTypeParameterInstantiation", - "params": [ - { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 33, - "column": 17, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 33, - "column": 23, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 33, - "column": 17, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 33, - "column": 23, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 33, - "column": 17, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 33, - "column": 23, - "program": "genericDefaultParam_1.ets" - } - } - }, - { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "Object", - "decorators": [], - "loc": { - "start": { - "line": 33, - "column": 25, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 33, - "column": 31, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 33, - "column": 25, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 33, - "column": 31, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 33, - "column": 25, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 33, - "column": 31, - "program": "genericDefaultParam_1.ets" - } - } - }, - { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 33, - "column": 33, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 33, - "column": 39, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 33, - "column": 33, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 33, - "column": 39, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 33, - "column": 33, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 33, - "column": 39, - "program": "genericDefaultParam_1.ets" - } - } - } - ], - "loc": { - "start": { - "line": 33, - "column": 16, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 33, - "column": 40, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 33, - "column": 14, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 33, - "column": 40, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 33, - "column": 14, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 33, - "column": 40, - "program": "genericDefaultParam_1.ets" - } - } - }, - "arguments": [], - "loc": { - "start": { - "line": 33, - "column": 10, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 34, - "column": 1, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 33, - "column": 5, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 34, - "column": 1, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 33, - "column": 5, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 34, - "column": 1, - "program": "genericDefaultParam_1.ets" - } - } - } - ], - "loc": { - "start": { - "line": 20, - "column": 1, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 34, - "column": 1, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 1, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 34, - "column": 1, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 1, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 34, - "column": 1, - "program": "genericDefaultParam_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 1, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 34, - "column": 1, - "program": "genericDefaultParam_1.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/genericDefaultParam_3-expected.txt b/ets2panda/test/parser/ets/genericDefaultParam_3-expected.txt index 9fa6b86ddb2ed55bd8548d9bd8e09b7e11fc7e91..65e7f52606480a196dfd97e646f62e315f84df67 100644 --- a/ets2panda/test/parser/ets/genericDefaultParam_3-expected.txt +++ b/ets2panda/test/parser/ets/genericDefaultParam_3-expected.txt @@ -130,179 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "CallExpression", - "callee": { - "type": "Identifier", - "name": "alma", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 1, - "program": "genericDefaultParam_3.ets" - }, - "end": { - "line": 20, - "column": 5, - "program": "genericDefaultParam_3.ets" - } - } - }, - "arguments": [ - { - "type": "StringLiteral", - "value": "alma", - "loc": { - "start": { - "line": 20, - "column": 6, - "program": "genericDefaultParam_3.ets" - }, - "end": { - "line": 20, - "column": 12, - "program": "genericDefaultParam_3.ets" - } - } - } - ], - "optional": false, - "loc": { - "start": { - "line": 20, - "column": 1, - "program": "genericDefaultParam_3.ets" - }, - "end": { - "line": 20, - "column": 13, - "program": "genericDefaultParam_3.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 1, - "program": "genericDefaultParam_3.ets" - }, - "end": { - "line": 20, - "column": 13, - "program": "genericDefaultParam_3.ets" - } - } - } - ], - "loc": { - "start": { - "line": 20, - "column": 1, - "program": "genericDefaultParam_3.ets" - }, - "end": { - "line": 20, - "column": 13, - "program": "genericDefaultParam_3.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 1, - "program": "genericDefaultParam_3.ets" - }, - "end": { - "line": 20, - "column": 13, - "program": "genericDefaultParam_3.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 1, - "program": "genericDefaultParam_3.ets" - }, - "end": { - "line": 20, - "column": 13, - "program": "genericDefaultParam_3.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 1, - "program": "genericDefaultParam_3.ets" - }, - "end": { - "line": 20, - "column": 13, - "program": "genericDefaultParam_3.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/generic_function-expected.txt b/ets2panda/test/parser/ets/generic_function-expected.txt index ccea9a3d4dc49ac66bd3c3b6d63c10928efa188c..00fe35b475bcba67435cdf759edcabefb275fdd9 100644 --- a/ets2panda/test/parser/ets/generic_function-expected.txt +++ b/ets2panda/test/parser/ets/generic_function-expected.txt @@ -397,112 +397,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_function.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_function.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_function.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_function.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_function.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_function.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_function.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_function.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/generic_resolve-expected.txt b/ets2panda/test/parser/ets/generic_resolve-expected.txt index 603c21ca6094796206278cbebc67b2dca7156d30..39a6ba31dce7072cd7e1a79a9edc0f78f5e964e5 100644 --- a/ets2panda/test/parser/ets/generic_resolve-expected.txt +++ b/ets2panda/test/parser/ets/generic_resolve-expected.txt @@ -1471,112 +1471,6 @@ "program": "generic_resolve.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_resolve.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_resolve.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_resolve.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_resolve.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_resolve.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_resolve.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generic_resolve.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generic_resolve.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/generics_2-expected.txt b/ets2panda/test/parser/ets/generics_2-expected.txt index afe9c9a8438e3f83c5ca37b4d99364bacdc26a8f..c0495b070c053aa915839b9a68cb2f1745cc9b45 100644 --- a/ets2panda/test/parser/ets/generics_2-expected.txt +++ b/ets2panda/test/parser/ets/generics_2-expected.txt @@ -1250,7 +1250,7 @@ }, "end": { "line": 26, - "column": 20, + "column": 33, "program": "generics_2.ets" } } @@ -1583,112 +1583,6 @@ "program": "generics_2.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_2.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/generics_3-expected.txt b/ets2panda/test/parser/ets/generics_3-expected.txt index b0d5cd0252fbe53c59f26b309f151d2a3eb7bc2d..dad9822135bf0b068843c9611b2d263ad65321a1 100644 --- a/ets2panda/test/parser/ets/generics_3-expected.txt +++ b/ets2panda/test/parser/ets/generics_3-expected.txt @@ -260,112 +260,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_3.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_3.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/generics_4-expected.txt b/ets2panda/test/parser/ets/generics_4-expected.txt index 9d105c2638e58112b10133908d2ce606ef5fb41c..0d67bc99500bc3cc8e43b66e6064a3446d37c9cd 100644 --- a/ets2panda/test/parser/ets/generics_4-expected.txt +++ b/ets2panda/test/parser/ets/generics_4-expected.txt @@ -292,112 +292,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_4.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_4.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_4.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_4.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/generics_5-expected.txt b/ets2panda/test/parser/ets/generics_5-expected.txt index f115af832bf85cee29888ad24851cf0fd5d7df7e..df3510ac8dbbd2dc1fcdc9577ca25c7561745609 100644 --- a/ets2panda/test/parser/ets/generics_5-expected.txt +++ b/ets2panda/test/parser/ets/generics_5-expected.txt @@ -228,112 +228,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_5.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_5.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_5.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_5.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/generics_6-expected.txt b/ets2panda/test/parser/ets/generics_6-expected.txt index dbd36d722dddd3b7c7c3023c3dbdc08bca7700ef..74b84e7220285b1c22867b53c4592b790d5588ed 100644 --- a/ets2panda/test/parser/ets/generics_6-expected.txt +++ b/ets2panda/test/parser/ets/generics_6-expected.txt @@ -464,112 +464,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_6.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_6.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_6.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_6.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/generics_7-expected.txt b/ets2panda/test/parser/ets/generics_7-expected.txt index ddb4cb95c10aa09e8b108e10d170d146cd9157dc..845151c72e8409ae40ba9ba34185fb5648714e4e 100644 --- a/ets2panda/test/parser/ets/generics_7-expected.txt +++ b/ets2panda/test/parser/ets/generics_7-expected.txt @@ -464,112 +464,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_7.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_7.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_7.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_7.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/generics_recursive-expected.txt b/ets2panda/test/parser/ets/generics_recursive-expected.txt index eac8a43f88244cad5a173987ea166a6f56aacd12..1809a6d36b990d65f95d09472161301f6d8a572a 100644 --- a/ets2panda/test/parser/ets/generics_recursive-expected.txt +++ b/ets2panda/test/parser/ets/generics_recursive-expected.txt @@ -3217,112 +3217,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_recursive.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_recursive.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_recursive.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_recursive.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_recursive.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_recursive.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_recursive.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_recursive.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/generics_type_param_constraint_1-expected.txt b/ets2panda/test/parser/ets/generics_type_param_constraint_1-expected.txt index 333f0168158d07220c572156f29439d2ce117712..9adc050208d4100a15c38e16c4a23892d7cf7ccc 100644 --- a/ets2panda/test/parser/ets/generics_type_param_constraint_1-expected.txt +++ b/ets2panda/test/parser/ets/generics_type_param_constraint_1-expected.txt @@ -339,112 +339,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_1.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/generics_type_param_constraint_10-expected.txt b/ets2panda/test/parser/ets/generics_type_param_constraint_10-expected.txt index 1b3c6d7f57a95ab817e2cad11da1d9852f6df13e..66a65b6fab28fed2a9d78bc217c10f837d640825 100644 --- a/ets2panda/test/parser/ets/generics_type_param_constraint_10-expected.txt +++ b/ets2panda/test/parser/ets/generics_type_param_constraint_10-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_10.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_10.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_10.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_10.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_10.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_10.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_10.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_10.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/generics_type_param_constraint_11-expected.txt b/ets2panda/test/parser/ets/generics_type_param_constraint_11-expected.txt index fd28ce034b425f561e83cc0b49e978562c644ef4..f9c767c4f342cfecdb6939ec59789bbd734526f3 100644 --- a/ets2panda/test/parser/ets/generics_type_param_constraint_11-expected.txt +++ b/ets2panda/test/parser/ets/generics_type_param_constraint_11-expected.txt @@ -1221,112 +1221,6 @@ "program": "generics_type_param_constraint_11.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_11.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_11.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_11.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_11.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_11.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_11.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_11.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_11.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/generics_type_param_constraint_12-expected.txt b/ets2panda/test/parser/ets/generics_type_param_constraint_12-expected.txt index e1ca32b2140f641cfe5dfe53a5e27235b9aaac97..e2adbbd71a3c3de723b3706a315f40357e2f63f9 100644 --- a/ets2panda/test/parser/ets/generics_type_param_constraint_12-expected.txt +++ b/ets2panda/test/parser/ets/generics_type_param_constraint_12-expected.txt @@ -1181,112 +1181,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_12.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_12.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_12.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_12.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_12.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_12.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_12.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_12.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/generics_type_param_constraint_2-expected.txt b/ets2panda/test/parser/ets/generics_type_param_constraint_2-expected.txt index a4c3da731f4af1a9f4168b8766a3d4f4a2cf1b68..513a83399fdcd1c60e94b5aaeac2fada590f3647 100644 --- a/ets2panda/test/parser/ets/generics_type_param_constraint_2-expected.txt +++ b/ets2panda/test/parser/ets/generics_type_param_constraint_2-expected.txt @@ -338,112 +338,6 @@ "program": "generics_type_param_constraint_2.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_2.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/generics_type_param_constraint_3-expected.txt b/ets2panda/test/parser/ets/generics_type_param_constraint_3-expected.txt index f9aed84a6006cc4e5a46005c3eb6b92f438acddb..b709954138e50c2722e201d578891becb9c2d0ed 100644 --- a/ets2panda/test/parser/ets/generics_type_param_constraint_3-expected.txt +++ b/ets2panda/test/parser/ets/generics_type_param_constraint_3-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_3.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_3.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/generics_type_param_constraint_4-expected.txt b/ets2panda/test/parser/ets/generics_type_param_constraint_4-expected.txt index 45d199d5a9e4969a3b2dc532dcae572deb2572fc..2e374c9aec23bc0ebe3b93e561cf14f2771ae3a6 100644 --- a/ets2panda/test/parser/ets/generics_type_param_constraint_4-expected.txt +++ b/ets2panda/test/parser/ets/generics_type_param_constraint_4-expected.txt @@ -728,112 +728,6 @@ "program": "generics_type_param_constraint_4.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_4.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_4.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_4.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_4.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/generics_type_param_constraint_5-expected.txt b/ets2panda/test/parser/ets/generics_type_param_constraint_5-expected.txt index cfb6c64761f9cf94b541ef7f2c16f18cb080d026..db769f8c0d1123b0df4b9e0c7a8d7c58ca4be83e 100644 --- a/ets2panda/test/parser/ets/generics_type_param_constraint_5-expected.txt +++ b/ets2panda/test/parser/ets/generics_type_param_constraint_5-expected.txt @@ -1024,112 +1024,6 @@ "program": "generics_type_param_constraint_5.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_5.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_5.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_5.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_5.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/generics_type_param_constraint_6-expected.txt b/ets2panda/test/parser/ets/generics_type_param_constraint_6-expected.txt index fefb297c1ab2754b4675d9c96f0a79f1e3f50054..b56b1567e49929065e015fc7e4b450e4a146c79f 100644 --- a/ets2panda/test/parser/ets/generics_type_param_constraint_6-expected.txt +++ b/ets2panda/test/parser/ets/generics_type_param_constraint_6-expected.txt @@ -371,112 +371,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_6.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_6.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_6.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_6.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/generics_type_param_constraint_7-expected.txt b/ets2panda/test/parser/ets/generics_type_param_constraint_7-expected.txt index d52948dcba9556a0ed18430e4ace2b1fe7bfa135..f7253255a8c5e91b52002fbcd375e0576eaf379e 100644 --- a/ets2panda/test/parser/ets/generics_type_param_constraint_7-expected.txt +++ b/ets2panda/test/parser/ets/generics_type_param_constraint_7-expected.txt @@ -339,112 +339,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_7.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_7.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_7.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_7.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/generics_type_param_constraint_9-expected.txt b/ets2panda/test/parser/ets/generics_type_param_constraint_9-expected.txt index 8fc8f90a7201edb209563b09b42188b3804903be..385d739739229cc2727182d770f822569d47663a 100644 --- a/ets2panda/test/parser/ets/generics_type_param_constraint_9-expected.txt +++ b/ets2panda/test/parser/ets/generics_type_param_constraint_9-expected.txt @@ -808,112 +808,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_9.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_9.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_9.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_9.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_9.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_9.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_9.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "generics_type_param_constraint_9.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/getterOverride-expected.txt b/ets2panda/test/parser/ets/getterOverride-expected.txt index b25e62b3f72ab14d6ee361e037970c0562a214ac..fd0e30677ea5ea1a9053b37dc45b63686e43efec 100644 --- a/ets2panda/test/parser/ets/getterOverride-expected.txt +++ b/ets2panda/test/parser/ets/getterOverride-expected.txt @@ -719,112 +719,6 @@ "program": "getterOverride.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "getterOverride.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "getterOverride.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "getterOverride.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "getterOverride.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "getterOverride.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "getterOverride.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "getterOverride.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "getterOverride.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/getter_setter_access_modifiers-expected.txt b/ets2panda/test/parser/ets/getter_setter_access_modifiers-expected.txt index 2576db551e16e6aa98db19153b3c1743d5e61028..652cb032f5a0e626100485a87ce11b56aff66752 100644 --- a/ets2panda/test/parser/ets/getter_setter_access_modifiers-expected.txt +++ b/ets2panda/test/parser/ets/getter_setter_access_modifiers-expected.txt @@ -2071,112 +2071,6 @@ "program": "getter_setter_access_modifiers.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "getter_setter_access_modifiers.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "getter_setter_access_modifiers.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "getter_setter_access_modifiers.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "getter_setter_access_modifiers.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "getter_setter_access_modifiers.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "getter_setter_access_modifiers.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "getter_setter_access_modifiers.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "getter_setter_access_modifiers.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/globalVarInLambdaInStatic-expected.txt b/ets2panda/test/parser/ets/globalVarInLambdaInStatic-expected.txt index bf3492fb0fdcfe130298539d6a760dff9a753642..202a182789f7052fc29fbfe47cd9e7f9373c818b 100644 --- a/ets2panda/test/parser/ets/globalVarInLambdaInStatic-expected.txt +++ b/ets2panda/test/parser/ets/globalVarInLambdaInStatic-expected.txt @@ -1063,112 +1063,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "globalVarInLambdaInStatic.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "globalVarInLambdaInStatic.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "globalVarInLambdaInStatic.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "globalVarInLambdaInStatic.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "globalVarInLambdaInStatic.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "globalVarInLambdaInStatic.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "globalVarInLambdaInStatic.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "globalVarInLambdaInStatic.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/global_const_vars3-expected.txt b/ets2panda/test/parser/ets/global_const_vars3-expected.txt index abb53198de72998803fa3de85e79c31d5c028a15..88255570632190c58ed668a30e156369d696839f 100644 --- a/ets2panda/test/parser/ets/global_const_vars3-expected.txt +++ b/ets2panda/test/parser/ets/global_const_vars3-expected.txt @@ -638,112 +638,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "global_const_vars3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "global_const_vars3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "global_const_vars3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "global_const_vars3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "global_const_vars3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "global_const_vars3.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "global_const_vars3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "global_const_vars3.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/identifier-expected.txt b/ets2panda/test/parser/ets/identifier-expected.txt index a6f4417feaf3bf84b559af5943d39dacf4861777..73640128af002983549ede64fa8a03ee2d7a2634 100644 --- a/ets2panda/test/parser/ets/identifier-expected.txt +++ b/ets2panda/test/parser/ets/identifier-expected.txt @@ -130,305 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "simple_ident", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "identifier.ets" - }, - "end": { - "line": 17, - "column": 17, - "program": "identifier.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 1, - "loc": { - "start": { - "line": 17, - "column": 25, - "program": "identifier.ets" - }, - "end": { - "line": 17, - "column": 26, - "program": "identifier.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "identifier.ets" - }, - "end": { - "line": 17, - "column": 26, - "program": "identifier.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "identifier.ets" - }, - "end": { - "line": 17, - "column": 26, - "program": "identifier.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "_underscore_ident", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "identifier.ets" - }, - "end": { - "line": 18, - "column": 22, - "program": "identifier.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 2, - "loc": { - "start": { - "line": 18, - "column": 30, - "program": "identifier.ets" - }, - "end": { - "line": 18, - "column": 31, - "program": "identifier.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "identifier.ets" - }, - "end": { - "line": 18, - "column": 31, - "program": "identifier.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "identifier.ets" - }, - "end": { - "line": 18, - "column": 31, - "program": "identifier.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "$dollar_ident", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "identifier.ets" - }, - "end": { - "line": 19, - "column": 18, - "program": "identifier.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 3, - "loc": { - "start": { - "line": 19, - "column": 26, - "program": "identifier.ets" - }, - "end": { - "line": 19, - "column": 27, - "program": "identifier.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "identifier.ets" - }, - "end": { - "line": 19, - "column": 27, - "program": "identifier.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "identifier.ets" - }, - "end": { - "line": 19, - "column": 27, - "program": "identifier.ets" - } - } - } - ], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "identifier.ets" - }, - "end": { - "line": 19, - "column": 27, - "program": "identifier.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "identifier.ets" - }, - "end": { - "line": 19, - "column": 27, - "program": "identifier.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "identifier.ets" - }, - "end": { - "line": 19, - "column": 27, - "program": "identifier.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "identifier.ets" - }, - "end": { - "line": 19, - "column": 27, - "program": "identifier.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -479,7 +180,7 @@ }, "end": { "line": 17, - "column": 26, + "column": 25, "program": "identifier.ets" } } @@ -534,7 +235,7 @@ }, "end": { "line": 18, - "column": 31, + "column": 30, "program": "identifier.ets" } } @@ -589,7 +290,7 @@ }, "end": { "line": 19, - "column": 27, + "column": 26, "program": "identifier.ets" } } diff --git a/ets2panda/test/parser/ets/if-expected.txt b/ets2panda/test/parser/ets/if-expected.txt index b012cb5e143ca0389d5bf7ea00286fdfe7b256b3..068174fbd91ee9d0ab4420e9c5d9fc8eeb23d2eb 100644 --- a/ets2panda/test/parser/ets/if-expected.txt +++ b/ets2panda/test/parser/ets/if-expected.txt @@ -3128,112 +3128,6 @@ "program": "if.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "if.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "if.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "if.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "if.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "if.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "if.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "if.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "if.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/ifs-expected.txt b/ets2panda/test/parser/ets/ifs-expected.txt index 58b0d3984c329486a555780f03f15513d1a3313b..810a495289bbd29211b5fcc419456782c8cbd7e9 100644 --- a/ets2panda/test/parser/ets/ifs-expected.txt +++ b/ets2panda/test/parser/ets/ifs-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ifs.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ifs.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ifs.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ifs.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ifs.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ifs.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "ifs.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "ifs.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/import_conts-expected.txt b/ets2panda/test/parser/ets/import_conts-expected.txt index baf26b45e81df4d7626e76f2dedc33697dd56e26..86a4368b7a4bc2ca09d653ec190f3f4b49ca4313 100644 --- a/ets2panda/test/parser/ets/import_conts-expected.txt +++ b/ets2panda/test/parser/ets/import_conts-expected.txt @@ -253,112 +253,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_conts.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_conts.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_conts.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_conts.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_conts.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_conts.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_conts.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_conts.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/import_folder-expected.txt b/ets2panda/test/parser/ets/import_folder-expected.txt index 2b3a2754d3f6ecf8a6caee54f521973e273693b2..2eee771e75cf049c7c7c94a764fa856d842798ef 100644 --- a/ets2panda/test/parser/ets/import_folder-expected.txt +++ b/ets2panda/test/parser/ets/import_folder-expected.txt @@ -194,196 +194,6 @@ "program": "import_folder.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "CallExpression", - "callee": { - "type": "MemberExpression", - "object": { - "type": "Identifier", - "name": "all", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 1, - "program": "import_folder.ets" - }, - "end": { - "line": 18, - "column": 4, - "program": "import_folder.ets" - } - } - }, - "property": { - "type": "Identifier", - "name": "ad", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "import_folder.ets" - }, - "end": { - "line": 18, - "column": 7, - "program": "import_folder.ets" - } - } - }, - "computed": false, - "optional": false, - "loc": { - "start": { - "line": 18, - "column": 1, - "program": "import_folder.ets" - }, - "end": { - "line": 18, - "column": 7, - "program": "import_folder.ets" - } - } - }, - "arguments": [], - "optional": false, - "loc": { - "start": { - "line": 18, - "column": 1, - "program": "import_folder.ets" - }, - "end": { - "line": 18, - "column": 9, - "program": "import_folder.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 1, - "program": "import_folder.ets" - }, - "end": { - "line": 18, - "column": 10, - "program": "import_folder.ets" - } - } - } - ], - "loc": { - "start": { - "line": 18, - "column": 1, - "program": "import_folder.ets" - }, - "end": { - "line": 18, - "column": 10, - "program": "import_folder.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 1, - "program": "import_folder.ets" - }, - "end": { - "line": 18, - "column": 10, - "program": "import_folder.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 1, - "program": "import_folder.ets" - }, - "end": { - "line": 18, - "column": 10, - "program": "import_folder.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 1, - "program": "import_folder.ets" - }, - "end": { - "line": 18, - "column": 10, - "program": "import_folder.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/import_tests/check_exported_2-expected.txt b/ets2panda/test/parser/ets/import_tests/check_exported_2-expected.txt index 904d5fb0767c9b86234f1a9a9cd11b9f99248eca..2d41441dd084070186d0d34bb31b60d0078156dc 100644 --- a/ets2panda/test/parser/ets/import_tests/check_exported_2-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/check_exported_2-expected.txt @@ -195,112 +195,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "check_exported_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "check_exported_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "check_exported_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "check_exported_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "check_exported_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "check_exported_2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "check_exported_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "check_exported_2.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/check_exported_3-expected.txt b/ets2panda/test/parser/ets/import_tests/check_exported_3-expected.txt index c1ce9f969b578478af0852d5bd9ccba41d2688bb..9b132b4048f8860c9ce5573af15eca9410918a56 100644 --- a/ets2panda/test/parser/ets/import_tests/check_exported_3-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/check_exported_3-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "check_exported_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "check_exported_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "check_exported_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "check_exported_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "check_exported_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "check_exported_3.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "check_exported_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "check_exported_3.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/check_exported_default_class-expected.txt b/ets2panda/test/parser/ets/import_tests/check_exported_default_class-expected.txt index 68c51daa2bd56901e3b7cd298277b828fa020c6d..ff42499a40198edbbebd992591096cde4f3e08c4 100644 --- a/ets2panda/test/parser/ets/import_tests/check_exported_default_class-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/check_exported_default_class-expected.txt @@ -89,112 +89,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "check_exported_default_class.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "check_exported_default_class.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "check_exported_default_class.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "check_exported_default_class.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "check_exported_default_class.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "check_exported_default_class.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "check_exported_default_class.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "check_exported_default_class.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/default_import-expected.txt b/ets2panda/test/parser/ets/import_tests/default_import-expected.txt index fe7c3e9a0c7fabb245fe2a45328c5923a80b3ab6..86f2b6877c4d7d8a003308bc3829f949725bc440 100644 --- a/ets2panda/test/parser/ets/import_tests/default_import-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/default_import-expected.txt @@ -89,112 +89,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "default_import.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "default_import.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "default_import.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "default_import.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "default_import.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "default_import.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "default_import.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "default_import.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/diamond/test1-expected.txt b/ets2panda/test/parser/ets/import_tests/diamond/test1-expected.txt index e081d86b4d00e6d0971f2b92dbe5be408a0dcfa2..72ec305a42c012b89bf4c0bcbdb576d67d6d61cc 100644 --- a/ets2panda/test/parser/ets/import_tests/diamond/test1-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/diamond/test1-expected.txt @@ -188,112 +188,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test1.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/diamond/test2-expected.txt b/ets2panda/test/parser/ets/import_tests/diamond/test2-expected.txt index c4a28c662d76eb1184fe7ff7e2c67b5773981c8e..92c971aac0746c488ea64dad7796165da53bc26a 100644 --- a/ets2panda/test/parser/ets/import_tests/diamond/test2-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/diamond/test2-expected.txt @@ -212,178 +212,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "foo", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "test2.ets" - }, - "end": { - "line": 18, - "column": 15, - "program": "test2.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "bar", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 18, - "program": "test2.ets" - }, - "end": { - "line": 18, - "column": 21, - "program": "test2.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "test2.ets" - }, - "end": { - "line": 18, - "column": 21, - "program": "test2.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "test2.ets" - }, - "end": { - "line": 18, - "column": 21, - "program": "test2.ets" - } - } - } - ], - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "test2.ets" - }, - "end": { - "line": 18, - "column": 21, - "program": "test2.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "test2.ets" - }, - "end": { - "line": 18, - "column": 21, - "program": "test2.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "test2.ets" - }, - "end": { - "line": 18, - "column": 21, - "program": "test2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "test2.ets" - }, - "end": { - "line": 18, - "column": 21, - "program": "test2.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/diamond/test3-expected.txt b/ets2panda/test/parser/ets/import_tests/diamond/test3-expected.txt index d3f7c60275f9c9dceba68af75ab7b66d14df59ed..9ced877171c55dc0149eba2447c75e208caeaa5e 100644 --- a/ets2panda/test/parser/ets/import_tests/diamond/test3-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/diamond/test3-expected.txt @@ -212,178 +212,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "goo", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "test3.ets" - }, - "end": { - "line": 18, - "column": 15, - "program": "test3.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "bar", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 18, - "program": "test3.ets" - }, - "end": { - "line": 18, - "column": 21, - "program": "test3.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "test3.ets" - }, - "end": { - "line": 18, - "column": 21, - "program": "test3.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "test3.ets" - }, - "end": { - "line": 18, - "column": 21, - "program": "test3.ets" - } - } - } - ], - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "test3.ets" - }, - "end": { - "line": 18, - "column": 21, - "program": "test3.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "test3.ets" - }, - "end": { - "line": 18, - "column": 21, - "program": "test3.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "test3.ets" - }, - "end": { - "line": 18, - "column": 21, - "program": "test3.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "test3.ets" - }, - "end": { - "line": 18, - "column": 21, - "program": "test3.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/diamond/test4-expected.txt b/ets2panda/test/parser/ets/import_tests/diamond/test4-expected.txt index 4873ef0acaa7b1a608648a486a9a12bea277d9ca..269896147112a17607bd03c242ed4c1bb057a4df 100644 --- a/ets2panda/test/parser/ets/import_tests/diamond/test4-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/diamond/test4-expected.txt @@ -130,177 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "bar", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "test4.ets" - }, - "end": { - "line": 16, - "column": 15, - "program": "test4.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 5, - "loc": { - "start": { - "line": 16, - "column": 18, - "program": "test4.ets" - }, - "end": { - "line": 16, - "column": 19, - "program": "test4.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "test4.ets" - }, - "end": { - "line": 16, - "column": 19, - "program": "test4.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "test4.ets" - }, - "end": { - "line": 16, - "column": 19, - "program": "test4.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "test4.ets" - }, - "end": { - "line": 16, - "column": 19, - "program": "test4.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "test4.ets" - }, - "end": { - "line": 16, - "column": 19, - "program": "test4.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "test4.ets" - }, - "end": { - "line": 16, - "column": 19, - "program": "test4.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "test4.ets" - }, - "end": { - "line": 16, - "column": 19, - "program": "test4.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/duplicated/classdef-expected.txt b/ets2panda/test/parser/ets/import_tests/duplicated/classdef-expected.txt index 6deca414cf36e7e33e514171fe456b4efe93e27a..df94e395c22878e29896a74b0c2f6ab84f791d03 100644 --- a/ets2panda/test/parser/ets/import_tests/duplicated/classdef-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/duplicated/classdef-expected.txt @@ -284,112 +284,6 @@ "program": "classdef.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "classdef.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "classdef.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "classdef.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "classdef.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "classdef.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "classdef.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "classdef.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "classdef.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/import_tests/duplicated/extdef-expected.txt b/ets2panda/test/parser/ets/import_tests/duplicated/extdef-expected.txt index e05af7af1d01bb2e6ee625d33dcab29557ec0995..fd6ed4d49432caa74fd05750a9de4174c2b659c6 100644 --- a/ets2panda/test/parser/ets/import_tests/duplicated/extdef-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/duplicated/extdef-expected.txt @@ -212,112 +212,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "extdef.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "extdef.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "extdef.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "extdef.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "extdef.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "extdef.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "extdef.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "extdef.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/duplicated/extusedef-expected.txt b/ets2panda/test/parser/ets/import_tests/duplicated/extusedef-expected.txt index 8dc2532cec12496b56fcc7c5ce5152dba6c2c00c..24611dbef054ac6ab0a0f04d57f85b220a53c9a8 100644 --- a/ets2panda/test/parser/ets/import_tests/duplicated/extusedef-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/duplicated/extusedef-expected.txt @@ -106,112 +106,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "extusedef.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "extusedef.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "extusedef.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "extusedef.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "extusedef.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "extusedef.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "extusedef.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "extusedef.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/export_type_alias-expected.txt b/ets2panda/test/parser/ets/import_tests/export_type_alias-expected.txt index 3f0b5d034f68060fe915cb46cc783b5d183d5008..87bffc9ccf50e4b5e6f26c44b205173086f61b89 100644 --- a/ets2panda/test/parser/ets/import_tests/export_type_alias-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/export_type_alias-expected.txt @@ -410,112 +410,6 @@ "program": "export_type_alias.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "export_type_alias.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "export_type_alias.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "export_type_alias.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "export_type_alias.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "export_type_alias.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "export_type_alias.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "export_type_alias.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "export_type_alias.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/import_tests/folderWithoutIndexOrPackage/separate_module-expected.txt b/ets2panda/test/parser/ets/import_tests/folderWithoutIndexOrPackage/separate_module-expected.txt index 55bfea0bcf35c0f231c9a640f172b4b547a020da..a230fb461443dc6a0e86318e1472424c3a42ad48 100644 --- a/ets2panda/test/parser/ets/import_tests/folderWithoutIndexOrPackage/separate_module-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/folderWithoutIndexOrPackage/separate_module-expected.txt @@ -130,177 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "separate_module.ets" - }, - "end": { - "line": 16, - "column": 13, - "program": "separate_module.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 10, - "loc": { - "start": { - "line": 16, - "column": 22, - "program": "separate_module.ets" - }, - "end": { - "line": 16, - "column": 24, - "program": "separate_module.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "separate_module.ets" - }, - "end": { - "line": 16, - "column": 24, - "program": "separate_module.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "separate_module.ets" - }, - "end": { - "line": 16, - "column": 24, - "program": "separate_module.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "separate_module.ets" - }, - "end": { - "line": 16, - "column": 24, - "program": "separate_module.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "separate_module.ets" - }, - "end": { - "line": 16, - "column": 24, - "program": "separate_module.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "separate_module.ets" - }, - "end": { - "line": 16, - "column": 24, - "program": "separate_module.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "separate_module.ets" - }, - "end": { - "line": 16, - "column": 24, - "program": "separate_module.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -351,7 +180,7 @@ }, "end": { "line": 16, - "column": 24, + "column": 22, "program": "separate_module.ets" } } diff --git a/ets2panda/test/parser/ets/import_tests/import_alias/export-expected.txt b/ets2panda/test/parser/ets/import_tests/import_alias/export-expected.txt index 0ca3ab585f4a84d73238d562a9b19c80097d8186..4f3746120eef3d4b7e558c0f4ad6b970cb1d99ff 100644 --- a/ets2panda/test/parser/ets/import_tests/import_alias/export-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_alias/export-expected.txt @@ -652,241 +652,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "goo1", - "decorators": [], - "loc": { - "start": { - "line": 28, - "column": 5, - "program": "export.ets" - }, - "end": { - "line": 28, - "column": 9, - "program": "export.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 10, - "loc": { - "start": { - "line": 28, - "column": 12, - "program": "export.ets" - }, - "end": { - "line": 28, - "column": 14, - "program": "export.ets" - } - } - }, - "loc": { - "start": { - "line": 28, - "column": 5, - "program": "export.ets" - }, - "end": { - "line": 28, - "column": 14, - "program": "export.ets" - } - } - }, - "loc": { - "start": { - "line": 28, - "column": 5, - "program": "export.ets" - }, - "end": { - "line": 28, - "column": 14, - "program": "export.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "goo2", - "decorators": [], - "loc": { - "start": { - "line": 30, - "column": 12, - "program": "export.ets" - }, - "end": { - "line": 30, - "column": 16, - "program": "export.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 10, - "loc": { - "start": { - "line": 30, - "column": 19, - "program": "export.ets" - }, - "end": { - "line": 30, - "column": 21, - "program": "export.ets" - } - } - }, - "loc": { - "start": { - "line": 30, - "column": 12, - "program": "export.ets" - }, - "end": { - "line": 30, - "column": 21, - "program": "export.ets" - } - } - }, - "loc": { - "start": { - "line": 30, - "column": 12, - "program": "export.ets" - }, - "end": { - "line": 30, - "column": 21, - "program": "export.ets" - } - } - } - ], - "loc": { - "start": { - "line": 28, - "column": 5, - "program": "export.ets" - }, - "end": { - "line": 30, - "column": 21, - "program": "export.ets" - } - } - }, - "loc": { - "start": { - "line": 28, - "column": 5, - "program": "export.ets" - }, - "end": { - "line": 30, - "column": 21, - "program": "export.ets" - } - } - }, - "loc": { - "start": { - "line": 28, - "column": 5, - "program": "export.ets" - }, - "end": { - "line": 30, - "column": 21, - "program": "export.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 28, - "column": 5, - "program": "export.ets" - }, - "end": { - "line": 30, - "column": 21, - "program": "export.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_1-expected.txt b/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_1-expected.txt index 80b3629c7c7d965636807d3b78f22c13224a9fa1..89d44f0d23b0c2a456c3b1bc415db869bd9823a3 100644 --- a/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_1-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_1-expected.txt @@ -89,112 +89,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_alias_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_alias_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_alias_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_alias_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_alias_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_alias_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_alias_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_alias_1.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_1-expected.txt b/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_1-expected.txt index 0ac5d41a7aafdb4b432533e6e6990d44e71075b0..d056f359ef0d6176b0a59b9c0ed58d4986ce5b7d 100644 --- a/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_1-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_1-expected.txt @@ -171,112 +171,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_alias_and_without_alias_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_alias_and_without_alias_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_alias_and_without_alias_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_alias_and_without_alias_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_alias_and_without_alias_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_alias_and_without_alias_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_alias_and_without_alias_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_alias_and_without_alias_1.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_2-expected.txt b/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_2-expected.txt index 30b22642eb2fc129100e17f6eac5bba1b89ade8c..9304c6f83e2abf147be88b628a4d7e65e264f41a 100644 --- a/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_2-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_2-expected.txt @@ -253,112 +253,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_alias_and_without_alias_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_alias_and_without_alias_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_alias_and_without_alias_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_alias_and_without_alias_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_alias_and_without_alias_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_alias_and_without_alias_2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_alias_and_without_alias_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_alias_and_without_alias_2.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_3-expected.txt b/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_3-expected.txt index 3327cfbf56e50c20cb4985fa3024bc0775847460..bf006ec60a7e3c5c19767ef84d289805498996fb 100644 --- a/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_3-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_3-expected.txt @@ -253,112 +253,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_alias_and_without_alias_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_alias_and_without_alias_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_alias_and_without_alias_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_alias_and_without_alias_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_alias_and_without_alias_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_alias_and_without_alias_3.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_alias_and_without_alias_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_alias_and_without_alias_3.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/import_all-expected.txt b/ets2panda/test/parser/ets/import_tests/import_all-expected.txt index 0512196c6653fc1de7055d04514064d46cd794ea..dcec61044e5a4c78b505a0d308be746d911445da 100755 --- a/ets2panda/test/parser/ets/import_tests/import_all-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_all-expected.txt @@ -260,582 +260,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "x", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_all.ets" - }, - "end": { - "line": 19, - "column": 6, - "program": "import_all.ets" - } - } - }, - "right": { - "type": "CallExpression", - "callee": { - "type": "MemberExpression", - "object": { - "type": "Identifier", - "name": "all", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 9, - "program": "import_all.ets" - }, - "end": { - "line": 19, - "column": 12, - "program": "import_all.ets" - } - } - }, - "property": { - "type": "Identifier", - "name": "foo", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 13, - "program": "import_all.ets" - }, - "end": { - "line": 19, - "column": 16, - "program": "import_all.ets" - } - } - }, - "computed": false, - "optional": false, - "loc": { - "start": { - "line": 19, - "column": 9, - "program": "import_all.ets" - }, - "end": { - "line": 19, - "column": 16, - "program": "import_all.ets" - } - } - }, - "arguments": [ - { - "type": "MemberExpression", - "object": { - "type": "Identifier", - "name": "all", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 17, - "program": "import_all.ets" - }, - "end": { - "line": 19, - "column": 20, - "program": "import_all.ets" - } - } - }, - "property": { - "type": "Identifier", - "name": "dbl", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 21, - "program": "import_all.ets" - }, - "end": { - "line": 19, - "column": 24, - "program": "import_all.ets" - } - } - }, - "computed": false, - "optional": false, - "loc": { - "start": { - "line": 19, - "column": 17, - "program": "import_all.ets" - }, - "end": { - "line": 19, - "column": 24, - "program": "import_all.ets" - } - } - } - ], - "optional": false, - "loc": { - "start": { - "line": 19, - "column": 9, - "program": "import_all.ets" - }, - "end": { - "line": 19, - "column": 54, - "program": "import_all.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_all.ets" - }, - "end": { - "line": 19, - "column": 54, - "program": "import_all.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_all.ets" - }, - "end": { - "line": 19, - "column": 54, - "program": "import_all.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "y", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "import_all.ets" - }, - "end": { - "line": 20, - "column": 6, - "program": "import_all.ets" - } - } - }, - "right": { - "type": "CallExpression", - "callee": { - "type": "MemberExpression", - "object": { - "type": "Identifier", - "name": "all", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 9, - "program": "import_all.ets" - }, - "end": { - "line": 20, - "column": 12, - "program": "import_all.ets" - } - } - }, - "property": { - "type": "Identifier", - "name": "foo", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 13, - "program": "import_all.ets" - }, - "end": { - "line": 20, - "column": 16, - "program": "import_all.ets" - } - } - }, - "computed": false, - "optional": false, - "loc": { - "start": { - "line": 20, - "column": 9, - "program": "import_all.ets" - }, - "end": { - "line": 20, - "column": 16, - "program": "import_all.ets" - } - } - }, - "arguments": [ - { - "type": "MemberExpression", - "object": { - "type": "Identifier", - "name": "all", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 17, - "program": "import_all.ets" - }, - "end": { - "line": 20, - "column": 20, - "program": "import_all.ets" - } - } - }, - "property": { - "type": "Identifier", - "name": "flt", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 21, - "program": "import_all.ets" - }, - "end": { - "line": 20, - "column": 24, - "program": "import_all.ets" - } - } - }, - "computed": false, - "optional": false, - "loc": { - "start": { - "line": 20, - "column": 17, - "program": "import_all.ets" - }, - "end": { - "line": 20, - "column": 24, - "program": "import_all.ets" - } - } - } - ], - "optional": false, - "loc": { - "start": { - "line": 20, - "column": 9, - "program": "import_all.ets" - }, - "end": { - "line": 20, - "column": 53, - "program": "import_all.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "import_all.ets" - }, - "end": { - "line": 20, - "column": 53, - "program": "import_all.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "import_all.ets" - }, - "end": { - "line": 20, - "column": 53, - "program": "import_all.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "z", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "import_all.ets" - }, - "end": { - "line": 21, - "column": 6, - "program": "import_all.ets" - } - } - }, - "right": { - "type": "CallExpression", - "callee": { - "type": "MemberExpression", - "object": { - "type": "Identifier", - "name": "sub", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 9, - "program": "import_all.ets" - }, - "end": { - "line": 21, - "column": 12, - "program": "import_all.ets" - } - } - }, - "property": { - "type": "Identifier", - "name": "foo", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 13, - "program": "import_all.ets" - }, - "end": { - "line": 21, - "column": 16, - "program": "import_all.ets" - } - } - }, - "computed": false, - "optional": false, - "loc": { - "start": { - "line": 21, - "column": 9, - "program": "import_all.ets" - }, - "end": { - "line": 21, - "column": 16, - "program": "import_all.ets" - } - } - }, - "arguments": [ - { - "type": "StringLiteral", - "value": "foo", - "loc": { - "start": { - "line": 21, - "column": 17, - "program": "import_all.ets" - }, - "end": { - "line": 21, - "column": 22, - "program": "import_all.ets" - } - } - } - ], - "optional": false, - "loc": { - "start": { - "line": 21, - "column": 9, - "program": "import_all.ets" - }, - "end": { - "line": 21, - "column": 52, - "program": "import_all.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "import_all.ets" - }, - "end": { - "line": 21, - "column": 52, - "program": "import_all.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "import_all.ets" - }, - "end": { - "line": 21, - "column": 52, - "program": "import_all.ets" - } - } - } - ], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_all.ets" - }, - "end": { - "line": 21, - "column": 52, - "program": "import_all.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_all.ets" - }, - "end": { - "line": 21, - "column": 52, - "program": "import_all.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_all.ets" - }, - "end": { - "line": 21, - "column": 52, - "program": "import_all.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_all.ets" - }, - "end": { - "line": 21, - "column": 52, - "program": "import_all.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/import_all_3-expected.txt b/ets2panda/test/parser/ets/import_tests/import_all_3-expected.txt index 494c9892e094aa21b5cdc17bebf736508366c3c7..1e46f75f3e0fb21e5809d4073e80b4cb1951902b 100644 --- a/ets2panda/test/parser/ets/import_tests/import_all_3-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_all_3-expected.txt @@ -89,112 +89,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_all_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_all_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_all_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_all_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_all_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_all_3.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_all_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_all_3.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/import_all_alias_1-expected.txt b/ets2panda/test/parser/ets/import_tests/import_all_alias_1-expected.txt index bbac32e282efda6098b2f941a4e5c264a5b42427..764f0c51b68165bee712a36b57fba2ce7205c209 100644 --- a/ets2panda/test/parser/ets/import_tests/import_all_alias_1-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_all_alias_1-expected.txt @@ -195,449 +195,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "x", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "import_all_alias_1.ets" - }, - "end": { - "line": 18, - "column": 6, - "program": "import_all_alias_1.ets" - } - } - }, - "right": { - "type": "CallExpression", - "callee": { - "type": "MemberExpression", - "object": { - "type": "Identifier", - "name": "Test", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 9, - "program": "import_all_alias_1.ets" - }, - "end": { - "line": 18, - "column": 13, - "program": "import_all_alias_1.ets" - } - } - }, - "property": { - "type": "Identifier", - "name": "foo", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 14, - "program": "import_all_alias_1.ets" - }, - "end": { - "line": 18, - "column": 17, - "program": "import_all_alias_1.ets" - } - } - }, - "computed": false, - "optional": false, - "loc": { - "start": { - "line": 18, - "column": 9, - "program": "import_all_alias_1.ets" - }, - "end": { - "line": 18, - "column": 17, - "program": "import_all_alias_1.ets" - } - } - }, - "arguments": [ - { - "type": "MemberExpression", - "object": { - "type": "Identifier", - "name": "Test", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 18, - "program": "import_all_alias_1.ets" - }, - "end": { - "line": 18, - "column": 22, - "program": "import_all_alias_1.ets" - } - } - }, - "property": { - "type": "Identifier", - "name": "dbl", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 23, - "program": "import_all_alias_1.ets" - }, - "end": { - "line": 18, - "column": 26, - "program": "import_all_alias_1.ets" - } - } - }, - "computed": false, - "optional": false, - "loc": { - "start": { - "line": 18, - "column": 18, - "program": "import_all_alias_1.ets" - }, - "end": { - "line": 18, - "column": 26, - "program": "import_all_alias_1.ets" - } - } - } - ], - "optional": false, - "loc": { - "start": { - "line": 18, - "column": 9, - "program": "import_all_alias_1.ets" - }, - "end": { - "line": 18, - "column": 56, - "program": "import_all_alias_1.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "import_all_alias_1.ets" - }, - "end": { - "line": 18, - "column": 56, - "program": "import_all_alias_1.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "import_all_alias_1.ets" - }, - "end": { - "line": 18, - "column": 56, - "program": "import_all_alias_1.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "y", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_all_alias_1.ets" - }, - "end": { - "line": 19, - "column": 6, - "program": "import_all_alias_1.ets" - } - } - }, - "right": { - "type": "CallExpression", - "callee": { - "type": "MemberExpression", - "object": { - "type": "Identifier", - "name": "Test", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 9, - "program": "import_all_alias_1.ets" - }, - "end": { - "line": 19, - "column": 13, - "program": "import_all_alias_1.ets" - } - } - }, - "property": { - "type": "Identifier", - "name": "foo", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 14, - "program": "import_all_alias_1.ets" - }, - "end": { - "line": 19, - "column": 17, - "program": "import_all_alias_1.ets" - } - } - }, - "computed": false, - "optional": false, - "loc": { - "start": { - "line": 19, - "column": 9, - "program": "import_all_alias_1.ets" - }, - "end": { - "line": 19, - "column": 17, - "program": "import_all_alias_1.ets" - } - } - }, - "arguments": [ - { - "type": "MemberExpression", - "object": { - "type": "Identifier", - "name": "Test", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 18, - "program": "import_all_alias_1.ets" - }, - "end": { - "line": 19, - "column": 22, - "program": "import_all_alias_1.ets" - } - } - }, - "property": { - "type": "Identifier", - "name": "flt", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 23, - "program": "import_all_alias_1.ets" - }, - "end": { - "line": 19, - "column": 26, - "program": "import_all_alias_1.ets" - } - } - }, - "computed": false, - "optional": false, - "loc": { - "start": { - "line": 19, - "column": 18, - "program": "import_all_alias_1.ets" - }, - "end": { - "line": 19, - "column": 26, - "program": "import_all_alias_1.ets" - } - } - } - ], - "optional": false, - "loc": { - "start": { - "line": 19, - "column": 9, - "program": "import_all_alias_1.ets" - }, - "end": { - "line": 19, - "column": 55, - "program": "import_all_alias_1.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_all_alias_1.ets" - }, - "end": { - "line": 19, - "column": 55, - "program": "import_all_alias_1.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_all_alias_1.ets" - }, - "end": { - "line": 19, - "column": 55, - "program": "import_all_alias_1.ets" - } - } - } - ], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "import_all_alias_1.ets" - }, - "end": { - "line": 19, - "column": 55, - "program": "import_all_alias_1.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "import_all_alias_1.ets" - }, - "end": { - "line": 19, - "column": 55, - "program": "import_all_alias_1.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "import_all_alias_1.ets" - }, - "end": { - "line": 19, - "column": 55, - "program": "import_all_alias_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "import_all_alias_1.ets" - }, - "end": { - "line": 19, - "column": 55, - "program": "import_all_alias_1.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/import_all_type_alias-expected.txt b/ets2panda/test/parser/ets/import_tests/import_all_type_alias-expected.txt index 24b5da6c5c9ee76b673587617546589b2dfd6a2f..7fe547cd247f116f59458108c961dfde4de1cff2 100644 --- a/ets2panda/test/parser/ets/import_tests/import_all_type_alias-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_all_type_alias-expected.txt @@ -195,256 +195,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "test_var", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "import_all_type_alias.ets" - }, - "end": { - "line": 22, - "column": 13, - "program": "import_all_type_alias.ets" - } - } - }, - "right": { - "type": "ETSNewClassInstanceExpression", - "typeReference": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "TSQualifiedName", - "left": { - "type": "Identifier", - "name": "all", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 20, - "program": "import_all_type_alias.ets" - }, - "end": { - "line": 22, - "column": 23, - "program": "import_all_type_alias.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "test_class", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 24, - "program": "import_all_type_alias.ets" - }, - "end": { - "line": 22, - "column": 34, - "program": "import_all_type_alias.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 20, - "program": "import_all_type_alias.ets" - }, - "end": { - "line": 22, - "column": 35, - "program": "import_all_type_alias.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 20, - "program": "import_all_type_alias.ets" - }, - "end": { - "line": 22, - "column": 35, - "program": "import_all_type_alias.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 20, - "program": "import_all_type_alias.ets" - }, - "end": { - "line": 22, - "column": 35, - "program": "import_all_type_alias.ets" - } - } - }, - "arguments": [], - "loc": { - "start": { - "line": 22, - "column": 16, - "program": "import_all_type_alias.ets" - }, - "end": { - "line": 22, - "column": 37, - "program": "import_all_type_alias.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "import_all_type_alias.ets" - }, - "end": { - "line": 22, - "column": 37, - "program": "import_all_type_alias.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "import_all_type_alias.ets" - }, - "end": { - "line": 22, - "column": 37, - "program": "import_all_type_alias.ets" - } - } - } - ], - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "import_all_type_alias.ets" - }, - "end": { - "line": 22, - "column": 37, - "program": "import_all_type_alias.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "import_all_type_alias.ets" - }, - "end": { - "line": 22, - "column": 37, - "program": "import_all_type_alias.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "import_all_type_alias.ets" - }, - "end": { - "line": 22, - "column": 37, - "program": "import_all_type_alias.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "import_all_type_alias.ets" - }, - "end": { - "line": 22, - "column": 37, - "program": "import_all_type_alias.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/import_diff_paths-expected.txt b/ets2panda/test/parser/ets/import_tests/import_diff_paths-expected.txt index 58efe48c2ac54a5b568f393077caceaae7028d96..ac19bf754e03b8ca4f918a173cce0c0645eb2940 100644 --- a/ets2panda/test/parser/ets/import_tests/import_diff_paths-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_diff_paths-expected.txt @@ -188,112 +188,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_diff_paths.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_diff_paths.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_diff_paths.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_diff_paths.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_diff_paths.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_diff_paths.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_diff_paths.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_diff_paths.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/import_extension/import_extension-expected.txt b/ets2panda/test/parser/ets/import_tests/import_extension/import_extension-expected.txt index a49ac592e7b83f05cfdf92b141d4c11baa2f342e..4c30518d189e4baf519c802d733e069fcae0694b 100644 --- a/ets2panda/test/parser/ets/import_tests/import_extension/import_extension-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_extension/import_extension-expected.txt @@ -188,112 +188,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_extension.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_extension.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_extension.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_extension.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_extension.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_extension.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_extension.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_extension.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/import_extension/import_extension_1-expected.txt b/ets2panda/test/parser/ets/import_tests/import_extension/import_extension_1-expected.txt index 97000141398b23745ed9279ad05142301d0b00b6..971d99db1f3dac3bde73ed10d84a1e19d714713a 100644 --- a/ets2panda/test/parser/ets/import_tests/import_extension/import_extension_1-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_extension/import_extension_1-expected.txt @@ -130,177 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "foo", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "import_extension_1.ets" - }, - "end": { - "line": 16, - "column": 15, - "program": "import_extension_1.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 123, - "loc": { - "start": { - "line": 16, - "column": 18, - "program": "import_extension_1.ets" - }, - "end": { - "line": 16, - "column": 21, - "program": "import_extension_1.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "import_extension_1.ets" - }, - "end": { - "line": 16, - "column": 21, - "program": "import_extension_1.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "import_extension_1.ets" - }, - "end": { - "line": 16, - "column": 21, - "program": "import_extension_1.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "import_extension_1.ets" - }, - "end": { - "line": 16, - "column": 21, - "program": "import_extension_1.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "import_extension_1.ets" - }, - "end": { - "line": 16, - "column": 21, - "program": "import_extension_1.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "import_extension_1.ets" - }, - "end": { - "line": 16, - "column": 21, - "program": "import_extension_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "import_extension_1.ets" - }, - "end": { - "line": 16, - "column": 21, - "program": "import_extension_1.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/import_extension/import_extension_2-expected.txt b/ets2panda/test/parser/ets/import_tests/import_extension/import_extension_2-expected.txt index 78421e2796cf3b4c5d96333c698235e7ee201e2f..99b1152c5ed2280ea9912d1421dec38d8fac0769 100644 --- a/ets2panda/test/parser/ets/import_tests/import_extension/import_extension_2-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_extension/import_extension_2-expected.txt @@ -130,177 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "goo", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "import_extension_2.ets" - }, - "end": { - "line": 16, - "column": 15, - "program": "import_extension_2.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 321, - "loc": { - "start": { - "line": 16, - "column": 18, - "program": "import_extension_2.ets" - }, - "end": { - "line": 16, - "column": 21, - "program": "import_extension_2.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "import_extension_2.ets" - }, - "end": { - "line": 16, - "column": 21, - "program": "import_extension_2.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "import_extension_2.ets" - }, - "end": { - "line": 16, - "column": 21, - "program": "import_extension_2.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "import_extension_2.ets" - }, - "end": { - "line": 16, - "column": 21, - "program": "import_extension_2.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "import_extension_2.ets" - }, - "end": { - "line": 16, - "column": 21, - "program": "import_extension_2.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "import_extension_2.ets" - }, - "end": { - "line": 16, - "column": 21, - "program": "import_extension_2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "import_extension_2.ets" - }, - "end": { - "line": 16, - "column": 21, - "program": "import_extension_2.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/import_function_overload-expected.txt b/ets2panda/test/parser/ets/import_tests/import_function_overload-expected.txt index 0cf4c3ee71834fcabb0256eaa8b959ea1ef91787..3cd6ea4481e4b4f65f5505236dc75fe8c51cc9c1 100644 --- a/ets2panda/test/parser/ets/import_tests/import_function_overload-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_function_overload-expected.txt @@ -106,112 +106,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_function_overload.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_function_overload.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_function_overload.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_function_overload.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_function_overload.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_function_overload.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_function_overload.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_function_overload.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/import_interface_test-expected.txt b/ets2panda/test/parser/ets/import_tests/import_interface_test-expected.txt index 9a3ebda8dd9e74444d86a4467325cd49377438de..9f3cc5e419f62413ed02b9975a4fb7af268ff51f 100644 --- a/ets2panda/test/parser/ets/import_tests/import_interface_test-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_interface_test-expected.txt @@ -559,112 +559,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_interface_test.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_interface_test.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_interface_test.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_interface_test.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_interface_test.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_interface_test.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_interface_test.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_interface_test.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/import_interface_test_1-expected.txt b/ets2panda/test/parser/ets/import_tests/import_interface_test_1-expected.txt index fc12b10e0b8460f0d66ba869956f647f1d5cf2b9..d2c80ac0fce9429cfc1c6edeb6154759adb595bf 100644 --- a/ets2panda/test/parser/ets/import_tests/import_interface_test_1-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_interface_test_1-expected.txt @@ -284,112 +284,6 @@ "program": "import_interface_test_1.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_interface_test_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_interface_test_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_interface_test_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_interface_test_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_interface_test_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_interface_test_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_interface_test_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_interface_test_1.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/import_tests/import_interface_test_2-expected.txt b/ets2panda/test/parser/ets/import_tests/import_interface_test_2-expected.txt index 98e3bedec26afce22f536a6531c7882e6220d9bc..45c4dedce40a92ed22a06753778df414d6dc2089 100644 --- a/ets2panda/test/parser/ets/import_tests/import_interface_test_2-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_interface_test_2-expected.txt @@ -582,112 +582,6 @@ "program": "import_interface_test_2.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_interface_test_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_interface_test_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_interface_test_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_interface_test_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_interface_test_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_interface_test_2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_interface_test_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_interface_test_2.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/import_tests/import_max_as_alias-expected.txt b/ets2panda/test/parser/ets/import_tests/import_max_as_alias-expected.txt index a5502177bd8a8ed9c1ea5c8f6083363317989fd1..e96eb43dfc651cb8c581e09e55bce11ea1e3ff9b 100644 --- a/ets2panda/test/parser/ets/import_tests/import_max_as_alias-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_max_as_alias-expected.txt @@ -106,112 +106,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_max_as_alias.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_max_as_alias.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_max_as_alias.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_max_as_alias.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_max_as_alias.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_max_as_alias.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_max_as_alias.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_max_as_alias.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/import_name_1-expected.txt b/ets2panda/test/parser/ets/import_tests/import_name_1-expected.txt index 441a88ed809a23b38f632ffc76c3691d8d8d7fc2..3096de97b95747d67c76b0bdb71f1ad7edb2fa72 100755 --- a/ets2panda/test/parser/ets/import_tests/import_name_1-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_name_1-expected.txt @@ -310,313 +310,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "x", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "import_name_1.ets" - }, - "end": { - "line": 18, - "column": 6, - "program": "import_name_1.ets" - } - } - }, - "right": { - "type": "CallExpression", - "callee": { - "type": "Identifier", - "name": "foo", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 9, - "program": "import_name_1.ets" - }, - "end": { - "line": 18, - "column": 12, - "program": "import_name_1.ets" - } - } - }, - "arguments": [ - { - "type": "Identifier", - "name": "dbl", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 13, - "program": "import_name_1.ets" - }, - "end": { - "line": 18, - "column": 16, - "program": "import_name_1.ets" - } - } - } - ], - "optional": false, - "loc": { - "start": { - "line": 18, - "column": 9, - "program": "import_name_1.ets" - }, - "end": { - "line": 18, - "column": 46, - "program": "import_name_1.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "import_name_1.ets" - }, - "end": { - "line": 18, - "column": 46, - "program": "import_name_1.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "import_name_1.ets" - }, - "end": { - "line": 18, - "column": 46, - "program": "import_name_1.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "y", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_name_1.ets" - }, - "end": { - "line": 19, - "column": 6, - "program": "import_name_1.ets" - } - } - }, - "right": { - "type": "CallExpression", - "callee": { - "type": "Identifier", - "name": "foo", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 9, - "program": "import_name_1.ets" - }, - "end": { - "line": 19, - "column": 12, - "program": "import_name_1.ets" - } - } - }, - "arguments": [ - { - "type": "Identifier", - "name": "flt", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 13, - "program": "import_name_1.ets" - }, - "end": { - "line": 19, - "column": 16, - "program": "import_name_1.ets" - } - } - } - ], - "optional": false, - "loc": { - "start": { - "line": 19, - "column": 9, - "program": "import_name_1.ets" - }, - "end": { - "line": 19, - "column": 45, - "program": "import_name_1.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_name_1.ets" - }, - "end": { - "line": 19, - "column": 45, - "program": "import_name_1.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_name_1.ets" - }, - "end": { - "line": 19, - "column": 45, - "program": "import_name_1.ets" - } - } - } - ], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "import_name_1.ets" - }, - "end": { - "line": 19, - "column": 45, - "program": "import_name_1.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "import_name_1.ets" - }, - "end": { - "line": 19, - "column": 45, - "program": "import_name_1.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "import_name_1.ets" - }, - "end": { - "line": 19, - "column": 45, - "program": "import_name_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "import_name_1.ets" - }, - "end": { - "line": 19, - "column": 45, - "program": "import_name_1.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/import_name_alias_1-expected.txt b/ets2panda/test/parser/ets/import_tests/import_name_alias_1-expected.txt index 3f0ce318a407a3d1378cf4cca0acc7856f73f0b2..96de5e271cdaee02f015a404719ae63ea0b2cddb 100755 --- a/ets2panda/test/parser/ets/import_tests/import_name_alias_1-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_name_alias_1-expected.txt @@ -310,313 +310,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "x", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "import_name_alias_1.ets" - }, - "end": { - "line": 18, - "column": 6, - "program": "import_name_alias_1.ets" - } - } - }, - "right": { - "type": "CallExpression", - "callee": { - "type": "Identifier", - "name": "Foo", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 9, - "program": "import_name_alias_1.ets" - }, - "end": { - "line": 18, - "column": 12, - "program": "import_name_alias_1.ets" - } - } - }, - "arguments": [ - { - "type": "Identifier", - "name": "dbl", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 13, - "program": "import_name_alias_1.ets" - }, - "end": { - "line": 18, - "column": 16, - "program": "import_name_alias_1.ets" - } - } - } - ], - "optional": false, - "loc": { - "start": { - "line": 18, - "column": 9, - "program": "import_name_alias_1.ets" - }, - "end": { - "line": 18, - "column": 46, - "program": "import_name_alias_1.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "import_name_alias_1.ets" - }, - "end": { - "line": 18, - "column": 46, - "program": "import_name_alias_1.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "import_name_alias_1.ets" - }, - "end": { - "line": 18, - "column": 46, - "program": "import_name_alias_1.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "y", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_name_alias_1.ets" - }, - "end": { - "line": 19, - "column": 6, - "program": "import_name_alias_1.ets" - } - } - }, - "right": { - "type": "CallExpression", - "callee": { - "type": "Identifier", - "name": "Foo", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 9, - "program": "import_name_alias_1.ets" - }, - "end": { - "line": 19, - "column": 12, - "program": "import_name_alias_1.ets" - } - } - }, - "arguments": [ - { - "type": "Identifier", - "name": "flt", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 13, - "program": "import_name_alias_1.ets" - }, - "end": { - "line": 19, - "column": 16, - "program": "import_name_alias_1.ets" - } - } - } - ], - "optional": false, - "loc": { - "start": { - "line": 19, - "column": 9, - "program": "import_name_alias_1.ets" - }, - "end": { - "line": 19, - "column": 45, - "program": "import_name_alias_1.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_name_alias_1.ets" - }, - "end": { - "line": 19, - "column": 45, - "program": "import_name_alias_1.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_name_alias_1.ets" - }, - "end": { - "line": 19, - "column": 45, - "program": "import_name_alias_1.ets" - } - } - } - ], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "import_name_alias_1.ets" - }, - "end": { - "line": 19, - "column": 45, - "program": "import_name_alias_1.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "import_name_alias_1.ets" - }, - "end": { - "line": 19, - "column": 45, - "program": "import_name_alias_1.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "import_name_alias_1.ets" - }, - "end": { - "line": 19, - "column": 45, - "program": "import_name_alias_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "import_name_alias_1.ets" - }, - "end": { - "line": 19, - "column": 45, - "program": "import_name_alias_1.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/import_name_conflicts/imported_module_1-expected.txt b/ets2panda/test/parser/ets/import_tests/import_name_conflicts/imported_module_1-expected.txt index b8c92a8154767282519beaf7a77c25957a66c79e..74fc5481f1acba4997f4a5c98d3d304a3f86730e 100644 --- a/ets2panda/test/parser/ets/import_tests/import_name_conflicts/imported_module_1-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_name_conflicts/imported_module_1-expected.txt @@ -495,177 +495,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "imported_module_1.ets" - }, - "end": { - "line": 18, - "column": 13, - "program": "imported_module_1.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 2, - "loc": { - "start": { - "line": 18, - "column": 21, - "program": "imported_module_1.ets" - }, - "end": { - "line": 18, - "column": 22, - "program": "imported_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "imported_module_1.ets" - }, - "end": { - "line": 18, - "column": 22, - "program": "imported_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "imported_module_1.ets" - }, - "end": { - "line": 18, - "column": 22, - "program": "imported_module_1.ets" - } - } - } - ], - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "imported_module_1.ets" - }, - "end": { - "line": 18, - "column": 22, - "program": "imported_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "imported_module_1.ets" - }, - "end": { - "line": 18, - "column": 22, - "program": "imported_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "imported_module_1.ets" - }, - "end": { - "line": 18, - "column": 22, - "program": "imported_module_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "imported_module_1.ets" - }, - "end": { - "line": 18, - "column": 22, - "program": "imported_module_1.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -787,7 +616,7 @@ }, "end": { "line": 18, - "column": 22, + "column": 21, "program": "imported_module_1.ets" } } diff --git a/ets2panda/test/parser/ets/import_tests/import_name_conflicts/imported_module_2-expected.txt b/ets2panda/test/parser/ets/import_tests/import_name_conflicts/imported_module_2-expected.txt index ec74e488484f2c53cd1d475730122d26ddac68de..d66e18d0d7e91049966e93041058ce009868bf5e 100644 --- a/ets2panda/test/parser/ets/import_tests/import_name_conflicts/imported_module_2-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_name_conflicts/imported_module_2-expected.txt @@ -495,177 +495,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "c", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "imported_module_2.ets" - }, - "end": { - "line": 18, - "column": 13, - "program": "imported_module_2.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 3, - "loc": { - "start": { - "line": 18, - "column": 21, - "program": "imported_module_2.ets" - }, - "end": { - "line": 18, - "column": 22, - "program": "imported_module_2.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "imported_module_2.ets" - }, - "end": { - "line": 18, - "column": 22, - "program": "imported_module_2.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "imported_module_2.ets" - }, - "end": { - "line": 18, - "column": 22, - "program": "imported_module_2.ets" - } - } - } - ], - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "imported_module_2.ets" - }, - "end": { - "line": 18, - "column": 22, - "program": "imported_module_2.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "imported_module_2.ets" - }, - "end": { - "line": 18, - "column": 22, - "program": "imported_module_2.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "imported_module_2.ets" - }, - "end": { - "line": 18, - "column": 22, - "program": "imported_module_2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "imported_module_2.ets" - }, - "end": { - "line": 18, - "column": 22, - "program": "imported_module_2.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -787,7 +616,7 @@ }, "end": { "line": 18, - "column": 22, + "column": 21, "program": "imported_module_2.ets" } } diff --git a/ets2panda/test/parser/ets/import_tests/import_relative_path-expected.txt b/ets2panda/test/parser/ets/import_tests/import_relative_path-expected.txt index 59fab91e687c631b9b500fdde5ad4119e955a361..ff37805124b83829c130308a648bc1c05ebed568 100755 --- a/ets2panda/test/parser/ets/import_tests/import_relative_path-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_relative_path-expected.txt @@ -195,449 +195,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "x", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "import_relative_path.ets" - }, - "end": { - "line": 18, - "column": 6, - "program": "import_relative_path.ets" - } - } - }, - "right": { - "type": "CallExpression", - "callee": { - "type": "MemberExpression", - "object": { - "type": "Identifier", - "name": "all", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 9, - "program": "import_relative_path.ets" - }, - "end": { - "line": 18, - "column": 12, - "program": "import_relative_path.ets" - } - } - }, - "property": { - "type": "Identifier", - "name": "foo", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 13, - "program": "import_relative_path.ets" - }, - "end": { - "line": 18, - "column": 16, - "program": "import_relative_path.ets" - } - } - }, - "computed": false, - "optional": false, - "loc": { - "start": { - "line": 18, - "column": 9, - "program": "import_relative_path.ets" - }, - "end": { - "line": 18, - "column": 16, - "program": "import_relative_path.ets" - } - } - }, - "arguments": [ - { - "type": "MemberExpression", - "object": { - "type": "Identifier", - "name": "all", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 17, - "program": "import_relative_path.ets" - }, - "end": { - "line": 18, - "column": 20, - "program": "import_relative_path.ets" - } - } - }, - "property": { - "type": "Identifier", - "name": "dbl", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 21, - "program": "import_relative_path.ets" - }, - "end": { - "line": 18, - "column": 24, - "program": "import_relative_path.ets" - } - } - }, - "computed": false, - "optional": false, - "loc": { - "start": { - "line": 18, - "column": 17, - "program": "import_relative_path.ets" - }, - "end": { - "line": 18, - "column": 24, - "program": "import_relative_path.ets" - } - } - } - ], - "optional": false, - "loc": { - "start": { - "line": 18, - "column": 9, - "program": "import_relative_path.ets" - }, - "end": { - "line": 18, - "column": 54, - "program": "import_relative_path.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "import_relative_path.ets" - }, - "end": { - "line": 18, - "column": 54, - "program": "import_relative_path.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "import_relative_path.ets" - }, - "end": { - "line": 18, - "column": 54, - "program": "import_relative_path.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "y", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_relative_path.ets" - }, - "end": { - "line": 19, - "column": 6, - "program": "import_relative_path.ets" - } - } - }, - "right": { - "type": "CallExpression", - "callee": { - "type": "MemberExpression", - "object": { - "type": "Identifier", - "name": "all", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 9, - "program": "import_relative_path.ets" - }, - "end": { - "line": 19, - "column": 12, - "program": "import_relative_path.ets" - } - } - }, - "property": { - "type": "Identifier", - "name": "foo", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 13, - "program": "import_relative_path.ets" - }, - "end": { - "line": 19, - "column": 16, - "program": "import_relative_path.ets" - } - } - }, - "computed": false, - "optional": false, - "loc": { - "start": { - "line": 19, - "column": 9, - "program": "import_relative_path.ets" - }, - "end": { - "line": 19, - "column": 16, - "program": "import_relative_path.ets" - } - } - }, - "arguments": [ - { - "type": "MemberExpression", - "object": { - "type": "Identifier", - "name": "all", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 17, - "program": "import_relative_path.ets" - }, - "end": { - "line": 19, - "column": 20, - "program": "import_relative_path.ets" - } - } - }, - "property": { - "type": "Identifier", - "name": "flt", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 21, - "program": "import_relative_path.ets" - }, - "end": { - "line": 19, - "column": 24, - "program": "import_relative_path.ets" - } - } - }, - "computed": false, - "optional": false, - "loc": { - "start": { - "line": 19, - "column": 17, - "program": "import_relative_path.ets" - }, - "end": { - "line": 19, - "column": 24, - "program": "import_relative_path.ets" - } - } - } - ], - "optional": false, - "loc": { - "start": { - "line": 19, - "column": 9, - "program": "import_relative_path.ets" - }, - "end": { - "line": 19, - "column": 53, - "program": "import_relative_path.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_relative_path.ets" - }, - "end": { - "line": 19, - "column": 53, - "program": "import_relative_path.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_relative_path.ets" - }, - "end": { - "line": 19, - "column": 53, - "program": "import_relative_path.ets" - } - } - } - ], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "import_relative_path.ets" - }, - "end": { - "line": 19, - "column": 53, - "program": "import_relative_path.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "import_relative_path.ets" - }, - "end": { - "line": 19, - "column": 53, - "program": "import_relative_path.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "import_relative_path.ets" - }, - "end": { - "line": 19, - "column": 53, - "program": "import_relative_path.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "import_relative_path.ets" - }, - "end": { - "line": 19, - "column": 53, - "program": "import_relative_path.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/import_several_1-expected.txt b/ets2panda/test/parser/ets/import_tests/import_several_1-expected.txt index 09a851a8c5c9e5ccdd50aec83247c5d24d39bf7c..dbb0145f0cfa204a49c8ee194d16a531d80c1da9 100755 --- a/ets2panda/test/parser/ets/import_tests/import_several_1-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_several_1-expected.txt @@ -376,313 +376,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "x", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "import_several_1.ets" - }, - "end": { - "line": 20, - "column": 6, - "program": "import_several_1.ets" - } - } - }, - "right": { - "type": "CallExpression", - "callee": { - "type": "Identifier", - "name": "foo", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 9, - "program": "import_several_1.ets" - }, - "end": { - "line": 20, - "column": 12, - "program": "import_several_1.ets" - } - } - }, - "arguments": [ - { - "type": "Identifier", - "name": "dbl", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 13, - "program": "import_several_1.ets" - }, - "end": { - "line": 20, - "column": 16, - "program": "import_several_1.ets" - } - } - } - ], - "optional": false, - "loc": { - "start": { - "line": 20, - "column": 9, - "program": "import_several_1.ets" - }, - "end": { - "line": 20, - "column": 46, - "program": "import_several_1.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "import_several_1.ets" - }, - "end": { - "line": 20, - "column": 46, - "program": "import_several_1.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "import_several_1.ets" - }, - "end": { - "line": 20, - "column": 46, - "program": "import_several_1.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "y", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "import_several_1.ets" - }, - "end": { - "line": 21, - "column": 6, - "program": "import_several_1.ets" - } - } - }, - "right": { - "type": "CallExpression", - "callee": { - "type": "Identifier", - "name": "foo", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 9, - "program": "import_several_1.ets" - }, - "end": { - "line": 21, - "column": 12, - "program": "import_several_1.ets" - } - } - }, - "arguments": [ - { - "type": "Identifier", - "name": "flt", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 13, - "program": "import_several_1.ets" - }, - "end": { - "line": 21, - "column": 16, - "program": "import_several_1.ets" - } - } - } - ], - "optional": false, - "loc": { - "start": { - "line": 21, - "column": 9, - "program": "import_several_1.ets" - }, - "end": { - "line": 21, - "column": 45, - "program": "import_several_1.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "import_several_1.ets" - }, - "end": { - "line": 21, - "column": 45, - "program": "import_several_1.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "import_several_1.ets" - }, - "end": { - "line": 21, - "column": 45, - "program": "import_several_1.ets" - } - } - } - ], - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "import_several_1.ets" - }, - "end": { - "line": 21, - "column": 45, - "program": "import_several_1.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "import_several_1.ets" - }, - "end": { - "line": 21, - "column": 45, - "program": "import_several_1.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "import_several_1.ets" - }, - "end": { - "line": 21, - "column": 45, - "program": "import_several_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "import_several_1.ets" - }, - "end": { - "line": 21, - "column": 45, - "program": "import_several_1.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/import_several_2-expected.txt b/ets2panda/test/parser/ets/import_tests/import_several_2-expected.txt index 2019883103987e51539caa85ced8cee8f9e0d998..34e4882f53db3b7fa7c37ba1c139233a3a90a346 100755 --- a/ets2panda/test/parser/ets/import_tests/import_several_2-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_several_2-expected.txt @@ -261,212 +261,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "x", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_several_2.ets" - }, - "end": { - "line": 19, - "column": 6, - "program": "import_several_2.ets" - } - } - }, - "right": { - "type": "CallExpression", - "callee": { - "type": "Identifier", - "name": "foo", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 9, - "program": "import_several_2.ets" - }, - "end": { - "line": 19, - "column": 12, - "program": "import_several_2.ets" - } - } - }, - "arguments": [ - { - "type": "NumberLiteral", - "value": 3.14, - "loc": { - "start": { - "line": 19, - "column": 13, - "program": "import_several_2.ets" - }, - "end": { - "line": 19, - "column": 17, - "program": "import_several_2.ets" - } - } - } - ], - "optional": false, - "loc": { - "start": { - "line": 19, - "column": 9, - "program": "import_several_2.ets" - }, - "end": { - "line": 19, - "column": 18, - "program": "import_several_2.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_several_2.ets" - }, - "end": { - "line": 19, - "column": 18, - "program": "import_several_2.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_several_2.ets" - }, - "end": { - "line": 19, - "column": 18, - "program": "import_several_2.ets" - } - } - } - ], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_several_2.ets" - }, - "end": { - "line": 19, - "column": 18, - "program": "import_several_2.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_several_2.ets" - }, - "end": { - "line": 19, - "column": 18, - "program": "import_several_2.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_several_2.ets" - }, - "end": { - "line": 19, - "column": 18, - "program": "import_several_2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_several_2.ets" - }, - "end": { - "line": 19, - "column": 18, - "program": "import_several_2.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/import_several_3-expected.txt b/ets2panda/test/parser/ets/import_tests/import_several_3-expected.txt index 2314d139200a580b50d5408a8411a428a1c54894..8c1e2375f6c9c37b4386a59e9f9bed43b6c5341f 100755 --- a/ets2panda/test/parser/ets/import_tests/import_several_3-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_several_3-expected.txt @@ -277,381 +277,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "x", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_several_3.ets" - }, - "end": { - "line": 19, - "column": 6, - "program": "import_several_3.ets" - } - } - }, - "right": { - "type": "CallExpression", - "callee": { - "type": "Identifier", - "name": "foo", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 9, - "program": "import_several_3.ets" - }, - "end": { - "line": 19, - "column": 12, - "program": "import_several_3.ets" - } - } - }, - "arguments": [ - { - "type": "MemberExpression", - "object": { - "type": "Identifier", - "name": "all", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 13, - "program": "import_several_3.ets" - }, - "end": { - "line": 19, - "column": 16, - "program": "import_several_3.ets" - } - } - }, - "property": { - "type": "Identifier", - "name": "dbl", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 17, - "program": "import_several_3.ets" - }, - "end": { - "line": 19, - "column": 20, - "program": "import_several_3.ets" - } - } - }, - "computed": false, - "optional": false, - "loc": { - "start": { - "line": 19, - "column": 13, - "program": "import_several_3.ets" - }, - "end": { - "line": 19, - "column": 20, - "program": "import_several_3.ets" - } - } - } - ], - "optional": false, - "loc": { - "start": { - "line": 19, - "column": 9, - "program": "import_several_3.ets" - }, - "end": { - "line": 19, - "column": 50, - "program": "import_several_3.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_several_3.ets" - }, - "end": { - "line": 19, - "column": 50, - "program": "import_several_3.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_several_3.ets" - }, - "end": { - "line": 19, - "column": 50, - "program": "import_several_3.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "y", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "import_several_3.ets" - }, - "end": { - "line": 20, - "column": 6, - "program": "import_several_3.ets" - } - } - }, - "right": { - "type": "CallExpression", - "callee": { - "type": "Identifier", - "name": "foo", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 9, - "program": "import_several_3.ets" - }, - "end": { - "line": 20, - "column": 12, - "program": "import_several_3.ets" - } - } - }, - "arguments": [ - { - "type": "MemberExpression", - "object": { - "type": "Identifier", - "name": "all", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 13, - "program": "import_several_3.ets" - }, - "end": { - "line": 20, - "column": 16, - "program": "import_several_3.ets" - } - } - }, - "property": { - "type": "Identifier", - "name": "flt", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 17, - "program": "import_several_3.ets" - }, - "end": { - "line": 20, - "column": 20, - "program": "import_several_3.ets" - } - } - }, - "computed": false, - "optional": false, - "loc": { - "start": { - "line": 20, - "column": 13, - "program": "import_several_3.ets" - }, - "end": { - "line": 20, - "column": 20, - "program": "import_several_3.ets" - } - } - } - ], - "optional": false, - "loc": { - "start": { - "line": 20, - "column": 9, - "program": "import_several_3.ets" - }, - "end": { - "line": 20, - "column": 49, - "program": "import_several_3.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "import_several_3.ets" - }, - "end": { - "line": 20, - "column": 49, - "program": "import_several_3.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "import_several_3.ets" - }, - "end": { - "line": 20, - "column": 49, - "program": "import_several_3.ets" - } - } - } - ], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_several_3.ets" - }, - "end": { - "line": 20, - "column": 49, - "program": "import_several_3.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_several_3.ets" - }, - "end": { - "line": 20, - "column": 49, - "program": "import_several_3.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_several_3.ets" - }, - "end": { - "line": 20, - "column": 49, - "program": "import_several_3.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_several_3.ets" - }, - "end": { - "line": 20, - "column": 49, - "program": "import_several_3.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/import_several_4-expected.txt b/ets2panda/test/parser/ets/import_tests/import_several_4-expected.txt index e85388d010496098b9f54eee47106ac3f69a4eea..1ef99fb7823570e3df1418fd06dc400d85daa8b8 100644 --- a/ets2panda/test/parser/ets/import_tests/import_several_4-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_several_4-expected.txt @@ -277,415 +277,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "x", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_several_4.ets" - }, - "end": { - "line": 19, - "column": 6, - "program": "import_several_4.ets" - } - } - }, - "right": { - "type": "CallExpression", - "callee": { - "type": "Identifier", - "name": "foo", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 9, - "program": "import_several_4.ets" - }, - "end": { - "line": 19, - "column": 12, - "program": "import_several_4.ets" - } - } - }, - "arguments": [ - { - "type": "MemberExpression", - "object": { - "type": "Identifier", - "name": "Test", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 13, - "program": "import_several_4.ets" - }, - "end": { - "line": 19, - "column": 17, - "program": "import_several_4.ets" - } - } - }, - "property": { - "type": "Identifier", - "name": "dbl", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 18, - "program": "import_several_4.ets" - }, - "end": { - "line": 19, - "column": 21, - "program": "import_several_4.ets" - } - } - }, - "computed": false, - "optional": false, - "loc": { - "start": { - "line": 19, - "column": 13, - "program": "import_several_4.ets" - }, - "end": { - "line": 19, - "column": 21, - "program": "import_several_4.ets" - } - } - } - ], - "optional": false, - "loc": { - "start": { - "line": 19, - "column": 9, - "program": "import_several_4.ets" - }, - "end": { - "line": 19, - "column": 51, - "program": "import_several_4.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_several_4.ets" - }, - "end": { - "line": 19, - "column": 51, - "program": "import_several_4.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_several_4.ets" - }, - "end": { - "line": 19, - "column": 51, - "program": "import_several_4.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "y", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "import_several_4.ets" - }, - "end": { - "line": 20, - "column": 6, - "program": "import_several_4.ets" - } - } - }, - "right": { - "type": "CallExpression", - "callee": { - "type": "MemberExpression", - "object": { - "type": "Identifier", - "name": "Test", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 9, - "program": "import_several_4.ets" - }, - "end": { - "line": 20, - "column": 13, - "program": "import_several_4.ets" - } - } - }, - "property": { - "type": "Identifier", - "name": "foo", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 14, - "program": "import_several_4.ets" - }, - "end": { - "line": 20, - "column": 17, - "program": "import_several_4.ets" - } - } - }, - "computed": false, - "optional": false, - "loc": { - "start": { - "line": 20, - "column": 9, - "program": "import_several_4.ets" - }, - "end": { - "line": 20, - "column": 17, - "program": "import_several_4.ets" - } - } - }, - "arguments": [ - { - "type": "MemberExpression", - "object": { - "type": "Identifier", - "name": "Test", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 18, - "program": "import_several_4.ets" - }, - "end": { - "line": 20, - "column": 22, - "program": "import_several_4.ets" - } - } - }, - "property": { - "type": "Identifier", - "name": "flt", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 23, - "program": "import_several_4.ets" - }, - "end": { - "line": 20, - "column": 26, - "program": "import_several_4.ets" - } - } - }, - "computed": false, - "optional": false, - "loc": { - "start": { - "line": 20, - "column": 18, - "program": "import_several_4.ets" - }, - "end": { - "line": 20, - "column": 26, - "program": "import_several_4.ets" - } - } - } - ], - "optional": false, - "loc": { - "start": { - "line": 20, - "column": 9, - "program": "import_several_4.ets" - }, - "end": { - "line": 20, - "column": 55, - "program": "import_several_4.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "import_several_4.ets" - }, - "end": { - "line": 20, - "column": 55, - "program": "import_several_4.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "import_several_4.ets" - }, - "end": { - "line": 20, - "column": 55, - "program": "import_several_4.ets" - } - } - } - ], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_several_4.ets" - }, - "end": { - "line": 20, - "column": 55, - "program": "import_several_4.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_several_4.ets" - }, - "end": { - "line": 20, - "column": 55, - "program": "import_several_4.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_several_4.ets" - }, - "end": { - "line": 20, - "column": 55, - "program": "import_several_4.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_several_4.ets" - }, - "end": { - "line": 20, - "column": 55, - "program": "import_several_4.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/import_several_5-expected.txt b/ets2panda/test/parser/ets/import_tests/import_several_5-expected.txt index 8e12cf33784a3961aaeb81513fc6c3309834a192..3bda1f005048ae713f5f96b6bed8020b04b06d19 100755 --- a/ets2panda/test/parser/ets/import_tests/import_several_5-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_several_5-expected.txt @@ -277,381 +277,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "x", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_several_5.ets" - }, - "end": { - "line": 19, - "column": 6, - "program": "import_several_5.ets" - } - } - }, - "right": { - "type": "CallExpression", - "callee": { - "type": "Identifier", - "name": "Foo", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 9, - "program": "import_several_5.ets" - }, - "end": { - "line": 19, - "column": 12, - "program": "import_several_5.ets" - } - } - }, - "arguments": [ - { - "type": "MemberExpression", - "object": { - "type": "Identifier", - "name": "all", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 13, - "program": "import_several_5.ets" - }, - "end": { - "line": 19, - "column": 16, - "program": "import_several_5.ets" - } - } - }, - "property": { - "type": "Identifier", - "name": "dbl", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 17, - "program": "import_several_5.ets" - }, - "end": { - "line": 19, - "column": 20, - "program": "import_several_5.ets" - } - } - }, - "computed": false, - "optional": false, - "loc": { - "start": { - "line": 19, - "column": 13, - "program": "import_several_5.ets" - }, - "end": { - "line": 19, - "column": 20, - "program": "import_several_5.ets" - } - } - } - ], - "optional": false, - "loc": { - "start": { - "line": 19, - "column": 9, - "program": "import_several_5.ets" - }, - "end": { - "line": 19, - "column": 50, - "program": "import_several_5.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_several_5.ets" - }, - "end": { - "line": 19, - "column": 50, - "program": "import_several_5.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_several_5.ets" - }, - "end": { - "line": 19, - "column": 50, - "program": "import_several_5.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "y", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "import_several_5.ets" - }, - "end": { - "line": 20, - "column": 6, - "program": "import_several_5.ets" - } - } - }, - "right": { - "type": "CallExpression", - "callee": { - "type": "Identifier", - "name": "Foo", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 9, - "program": "import_several_5.ets" - }, - "end": { - "line": 20, - "column": 12, - "program": "import_several_5.ets" - } - } - }, - "arguments": [ - { - "type": "MemberExpression", - "object": { - "type": "Identifier", - "name": "all", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 13, - "program": "import_several_5.ets" - }, - "end": { - "line": 20, - "column": 16, - "program": "import_several_5.ets" - } - } - }, - "property": { - "type": "Identifier", - "name": "flt", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 17, - "program": "import_several_5.ets" - }, - "end": { - "line": 20, - "column": 20, - "program": "import_several_5.ets" - } - } - }, - "computed": false, - "optional": false, - "loc": { - "start": { - "line": 20, - "column": 13, - "program": "import_several_5.ets" - }, - "end": { - "line": 20, - "column": 20, - "program": "import_several_5.ets" - } - } - } - ], - "optional": false, - "loc": { - "start": { - "line": 20, - "column": 9, - "program": "import_several_5.ets" - }, - "end": { - "line": 20, - "column": 49, - "program": "import_several_5.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "import_several_5.ets" - }, - "end": { - "line": 20, - "column": 49, - "program": "import_several_5.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "import_several_5.ets" - }, - "end": { - "line": 20, - "column": 49, - "program": "import_several_5.ets" - } - } - } - ], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_several_5.ets" - }, - "end": { - "line": 20, - "column": 49, - "program": "import_several_5.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_several_5.ets" - }, - "end": { - "line": 20, - "column": 49, - "program": "import_several_5.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_several_5.ets" - }, - "end": { - "line": 20, - "column": 49, - "program": "import_several_5.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_several_5.ets" - }, - "end": { - "line": 20, - "column": 49, - "program": "import_several_5.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/import_several_6-expected.txt b/ets2panda/test/parser/ets/import_tests/import_several_6-expected.txt index d675fc952602bde8b39fe1c7c82f45c6046e48c1..b38ab1f783d60d23fc0777fdce7f41762a79d522 100644 --- a/ets2panda/test/parser/ets/import_tests/import_several_6-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_several_6-expected.txt @@ -277,415 +277,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "x", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_several_6.ets" - }, - "end": { - "line": 19, - "column": 6, - "program": "import_several_6.ets" - } - } - }, - "right": { - "type": "CallExpression", - "callee": { - "type": "Identifier", - "name": "Foo", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 9, - "program": "import_several_6.ets" - }, - "end": { - "line": 19, - "column": 12, - "program": "import_several_6.ets" - } - } - }, - "arguments": [ - { - "type": "MemberExpression", - "object": { - "type": "Identifier", - "name": "Test", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 13, - "program": "import_several_6.ets" - }, - "end": { - "line": 19, - "column": 17, - "program": "import_several_6.ets" - } - } - }, - "property": { - "type": "Identifier", - "name": "dbl", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 18, - "program": "import_several_6.ets" - }, - "end": { - "line": 19, - "column": 21, - "program": "import_several_6.ets" - } - } - }, - "computed": false, - "optional": false, - "loc": { - "start": { - "line": 19, - "column": 13, - "program": "import_several_6.ets" - }, - "end": { - "line": 19, - "column": 21, - "program": "import_several_6.ets" - } - } - } - ], - "optional": false, - "loc": { - "start": { - "line": 19, - "column": 9, - "program": "import_several_6.ets" - }, - "end": { - "line": 19, - "column": 51, - "program": "import_several_6.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_several_6.ets" - }, - "end": { - "line": 19, - "column": 51, - "program": "import_several_6.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_several_6.ets" - }, - "end": { - "line": 19, - "column": 51, - "program": "import_several_6.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "y", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "import_several_6.ets" - }, - "end": { - "line": 20, - "column": 6, - "program": "import_several_6.ets" - } - } - }, - "right": { - "type": "CallExpression", - "callee": { - "type": "MemberExpression", - "object": { - "type": "Identifier", - "name": "Test", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 9, - "program": "import_several_6.ets" - }, - "end": { - "line": 20, - "column": 13, - "program": "import_several_6.ets" - } - } - }, - "property": { - "type": "Identifier", - "name": "foo", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 14, - "program": "import_several_6.ets" - }, - "end": { - "line": 20, - "column": 17, - "program": "import_several_6.ets" - } - } - }, - "computed": false, - "optional": false, - "loc": { - "start": { - "line": 20, - "column": 9, - "program": "import_several_6.ets" - }, - "end": { - "line": 20, - "column": 17, - "program": "import_several_6.ets" - } - } - }, - "arguments": [ - { - "type": "MemberExpression", - "object": { - "type": "Identifier", - "name": "Test", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 18, - "program": "import_several_6.ets" - }, - "end": { - "line": 20, - "column": 22, - "program": "import_several_6.ets" - } - } - }, - "property": { - "type": "Identifier", - "name": "flt", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 23, - "program": "import_several_6.ets" - }, - "end": { - "line": 20, - "column": 26, - "program": "import_several_6.ets" - } - } - }, - "computed": false, - "optional": false, - "loc": { - "start": { - "line": 20, - "column": 18, - "program": "import_several_6.ets" - }, - "end": { - "line": 20, - "column": 26, - "program": "import_several_6.ets" - } - } - } - ], - "optional": false, - "loc": { - "start": { - "line": 20, - "column": 9, - "program": "import_several_6.ets" - }, - "end": { - "line": 20, - "column": 55, - "program": "import_several_6.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "import_several_6.ets" - }, - "end": { - "line": 20, - "column": 55, - "program": "import_several_6.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "import_several_6.ets" - }, - "end": { - "line": 20, - "column": 55, - "program": "import_several_6.ets" - } - } - } - ], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_several_6.ets" - }, - "end": { - "line": 20, - "column": 55, - "program": "import_several_6.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_several_6.ets" - }, - "end": { - "line": 20, - "column": 55, - "program": "import_several_6.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_several_6.ets" - }, - "end": { - "line": 20, - "column": 55, - "program": "import_several_6.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "import_several_6.ets" - }, - "end": { - "line": 20, - "column": 55, - "program": "import_several_6.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/import_several_7-expected.txt b/ets2panda/test/parser/ets/import_tests/import_several_7-expected.txt index 473fb64084bb9d96b59f5261efa54cea30ee5dfe..814262395ac800e319bab1b5f190226daf290715 100755 --- a/ets2panda/test/parser/ets/import_tests/import_several_7-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_several_7-expected.txt @@ -359,313 +359,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "x", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "import_several_7.ets" - }, - "end": { - "line": 20, - "column": 6, - "program": "import_several_7.ets" - } - } - }, - "right": { - "type": "CallExpression", - "callee": { - "type": "Identifier", - "name": "Foo", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 9, - "program": "import_several_7.ets" - }, - "end": { - "line": 20, - "column": 12, - "program": "import_several_7.ets" - } - } - }, - "arguments": [ - { - "type": "Identifier", - "name": "dbl", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 13, - "program": "import_several_7.ets" - }, - "end": { - "line": 20, - "column": 16, - "program": "import_several_7.ets" - } - } - } - ], - "optional": false, - "loc": { - "start": { - "line": 20, - "column": 9, - "program": "import_several_7.ets" - }, - "end": { - "line": 20, - "column": 46, - "program": "import_several_7.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "import_several_7.ets" - }, - "end": { - "line": 20, - "column": 46, - "program": "import_several_7.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "import_several_7.ets" - }, - "end": { - "line": 20, - "column": 46, - "program": "import_several_7.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "y", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "import_several_7.ets" - }, - "end": { - "line": 21, - "column": 6, - "program": "import_several_7.ets" - } - } - }, - "right": { - "type": "CallExpression", - "callee": { - "type": "Identifier", - "name": "FOO", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 9, - "program": "import_several_7.ets" - }, - "end": { - "line": 21, - "column": 12, - "program": "import_several_7.ets" - } - } - }, - "arguments": [ - { - "type": "Identifier", - "name": "flt", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 13, - "program": "import_several_7.ets" - }, - "end": { - "line": 21, - "column": 16, - "program": "import_several_7.ets" - } - } - } - ], - "optional": false, - "loc": { - "start": { - "line": 21, - "column": 9, - "program": "import_several_7.ets" - }, - "end": { - "line": 21, - "column": 45, - "program": "import_several_7.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "import_several_7.ets" - }, - "end": { - "line": 21, - "column": 45, - "program": "import_several_7.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "import_several_7.ets" - }, - "end": { - "line": 21, - "column": 45, - "program": "import_several_7.ets" - } - } - } - ], - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "import_several_7.ets" - }, - "end": { - "line": 21, - "column": 45, - "program": "import_several_7.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "import_several_7.ets" - }, - "end": { - "line": 21, - "column": 45, - "program": "import_several_7.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "import_several_7.ets" - }, - "end": { - "line": 21, - "column": 45, - "program": "import_several_7.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "import_several_7.ets" - }, - "end": { - "line": 21, - "column": 45, - "program": "import_several_7.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/import_ts_file-expected.txt b/ets2panda/test/parser/ets/import_tests/import_ts_file-expected.txt index 5b900073a4e5e092f33cd43833d4bcdb93e02fa6..44f07e2a5cb6c040ae45af6b56291c2c7dbafb35 100644 --- a/ets2panda/test/parser/ets/import_tests/import_ts_file-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_ts_file-expected.txt @@ -106,112 +106,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_ts_file.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_ts_file.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_ts_file.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_ts_file.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_ts_file.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_ts_file.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_ts_file.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_ts_file.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/internals-expected.txt b/ets2panda/test/parser/ets/import_tests/internals-expected.txt index 08d8d4bd9229d2b6434de76d734bef5d1c042866..9a459ff57729bb5a9a20a6d8d63540d1895d4149 100644 --- a/ets2panda/test/parser/ets/import_tests/internals-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/internals-expected.txt @@ -645,112 +645,6 @@ "program": "internals.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "internals.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "internals.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "internals.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "internals.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "internals.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "internals.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "internals.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "internals.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/import_tests/modules/class_default_module-expected.txt b/ets2panda/test/parser/ets/import_tests/modules/class_default_module-expected.txt index b602ac88fe219d7bdf37402da55f24e6553df0c5..441bf4be5ce409eaa7c38456a0ae083895994875 100644 --- a/ets2panda/test/parser/ets/import_tests/modules/class_default_module-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/modules/class_default_module-expected.txt @@ -284,112 +284,6 @@ "program": "class_default_module.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "class_default_module.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "class_default_module.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "class_default_module.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "class_default_module.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "class_default_module.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "class_default_module.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "class_default_module.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "class_default_module.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/import_tests/modules/default_export-expected.txt b/ets2panda/test/parser/ets/import_tests/modules/default_export-expected.txt index 74fdb5881a929824833ddc019b76a9566aaa06ff..79552fca719fbbd68849e5793809672935c309b0 100644 --- a/ets2panda/test/parser/ets/import_tests/modules/default_export-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/modules/default_export-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "default_export.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "default_export.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "default_export.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "default_export.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "default_export.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "default_export.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "default_export.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "default_export.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/modules/missing_default_export-expected.txt b/ets2panda/test/parser/ets/import_tests/modules/missing_default_export-expected.txt index b9a936d13d3a5a7ceed82c913f2f0bbe2200f3e3..47a86080b25f022445a6a180a763178429f5ef28 100644 --- a/ets2panda/test/parser/ets/import_tests/modules/missing_default_export-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/modules/missing_default_export-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "missing_default_export.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "missing_default_export.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "missing_default_export.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "missing_default_export.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "missing_default_export.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "missing_default_export.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "missing_default_export.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "missing_default_export.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/modules/module1/src/re_export_file-expected.txt b/ets2panda/test/parser/ets/import_tests/modules/module1/src/re_export_file-expected.txt index 60057f22d931d320ce8a7d690053ef7a3e3dcaed..902ba1bf41a4b3151429919cd0bae9f6c2b05347 100644 --- a/ets2panda/test/parser/ets/import_tests/modules/module1/src/re_export_file-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/modules/module1/src/re_export_file-expected.txt @@ -226,112 +226,6 @@ "program": "re_export_file.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_file.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_file.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_file.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_file.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_file.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_file.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_file.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_file.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/import_tests/modules/module2/src/import_file-expected.txt b/ets2panda/test/parser/ets/import_tests/modules/module2/src/import_file-expected.txt index b421f27ae2a04f8a49c0a7a72cc285a00304cea2..35678ad76db380b9bfe361a89c036e1e20c4fbc9 100644 --- a/ets2panda/test/parser/ets/import_tests/modules/module2/src/import_file-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/modules/module2/src/import_file-expected.txt @@ -211,112 +211,6 @@ "program": "import_file.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_file.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_file.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_file.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_file.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_file.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_file.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_file.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_file.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/import_tests/modules/module2/src/re_export_file_2-expected.txt b/ets2panda/test/parser/ets/import_tests/modules/module2/src/re_export_file_2-expected.txt index 79b65f81de4bbd2b2007f95a09d9877766089f86..376668ede0ef310fdf3d2d3de5ad6e6dce83cfeb 100644 --- a/ets2panda/test/parser/ets/import_tests/modules/module2/src/re_export_file_2-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/modules/module2/src/re_export_file_2-expected.txt @@ -226,112 +226,6 @@ "program": "re_export_file_2.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_file_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_file_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_file_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_file_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_file_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_file_2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_file_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_file_2.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/import_tests/modules/test_lib1-expected.txt b/ets2panda/test/parser/ets/import_tests/modules/test_lib1-expected.txt index 607628cb22d7878633bbe0eb86b5a418e764ec61..f3df1acd4b3d044cf1bc27f8bd2b2e992add3331 100644 --- a/ets2panda/test/parser/ets/import_tests/modules/test_lib1-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/modules/test_lib1-expected.txt @@ -284,112 +284,6 @@ "program": "test_lib1.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test_lib1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test_lib1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test_lib1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test_lib1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test_lib1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test_lib1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test_lib1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test_lib1.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/import_tests/modules/test_lib2-expected.txt b/ets2panda/test/parser/ets/import_tests/modules/test_lib2-expected.txt index 97aac6ad83ea01daeac4e443385eb8b7a72de7df..e6ec5062547beaaa485b15c7acad1299c34f30b0 100644 --- a/ets2panda/test/parser/ets/import_tests/modules/test_lib2-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/modules/test_lib2-expected.txt @@ -212,112 +212,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test_lib2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test_lib2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test_lib2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test_lib2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test_lib2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test_lib2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test_lib2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test_lib2.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/packages/aliasWithoutAlias/import1/import1-expected.txt b/ets2panda/test/parser/ets/import_tests/packages/aliasWithoutAlias/import1/import1-expected.txt index 204f21af2b46e95d2845334ad7f30cce08a98ec7..48f9684e3273af17a9d3046f3a545643a85117b7 100644 --- a/ets2panda/test/parser/ets/import_tests/packages/aliasWithoutAlias/import1/import1-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/packages/aliasWithoutAlias/import1/import1-expected.txt @@ -152,112 +152,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import1.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/packages/aliasWithoutAlias/import2/import2-expected.txt b/ets2panda/test/parser/ets/import_tests/packages/aliasWithoutAlias/import2/import2-expected.txt index 2360ded76c84ad64192cbca557b9f092aedd47c5..f429b842cfc6a4fcf185c33742c8e6307651e241 100644 --- a/ets2panda/test/parser/ets/import_tests/packages/aliasWithoutAlias/import2/import2-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/packages/aliasWithoutAlias/import2/import2-expected.txt @@ -152,112 +152,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import2.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/packages/import_package_with_alias/import_package_with_alias-expected.txt b/ets2panda/test/parser/ets/import_tests/packages/import_package_with_alias/import_package_with_alias-expected.txt index 02c7f65e52b8f3a347b5f80bf8fe2714659f0621..ca092e3c944f33441e497730a54c1132b02cbdf5 100644 --- a/ets2panda/test/parser/ets/import_tests/packages/import_package_with_alias/import_package_with_alias-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/packages/import_package_with_alias/import_package_with_alias-expected.txt @@ -89,112 +89,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_package_with_alias.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_package_with_alias.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_package_with_alias.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_package_with_alias.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_package_with_alias.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_package_with_alias.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_package_with_alias.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_package_with_alias.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/packages/import_package_with_alias/package/package_module-expected.txt b/ets2panda/test/parser/ets/import_tests/packages/import_package_with_alias/package/package_module-expected.txt index 17f316a00e0263cc97cdba39017bd19f16ae0f31..526b4372e719749df80b7ce86d644c023ee970bb 100644 --- a/ets2panda/test/parser/ets/import_tests/packages/import_package_with_alias/package/package_module-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/packages/import_package_with_alias/package/package_module-expected.txt @@ -56,177 +56,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "foo", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 12, - "program": "package_module.ets" - }, - "end": { - "line": 19, - "column": 15, - "program": "package_module.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 2, - "loc": { - "start": { - "line": 19, - "column": 18, - "program": "package_module.ets" - }, - "end": { - "line": 19, - "column": 19, - "program": "package_module.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 12, - "program": "package_module.ets" - }, - "end": { - "line": 19, - "column": 19, - "program": "package_module.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 12, - "program": "package_module.ets" - }, - "end": { - "line": 19, - "column": 19, - "program": "package_module.ets" - } - } - } - ], - "loc": { - "start": { - "line": 19, - "column": 12, - "program": "package_module.ets" - }, - "end": { - "line": 19, - "column": 19, - "program": "package_module.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 12, - "program": "package_module.ets" - }, - "end": { - "line": 19, - "column": 19, - "program": "package_module.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 12, - "program": "package_module.ets" - }, - "end": { - "line": 19, - "column": 19, - "program": "package_module.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 12, - "program": "package_module.ets" - }, - "end": { - "line": 19, - "column": 19, - "program": "package_module.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/packages/package_module_1-expected.txt b/ets2panda/test/parser/ets/import_tests/packages/package_module_1-expected.txt index 8e4ded4ec92842b06dbee0da05cc2c98851f24d7..1a938e8adf3c7ac6a30e8e4bb4d1ee0f48d1b231 100755 --- a/ets2panda/test/parser/ets/import_tests/packages/package_module_1-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/packages/package_module_1-expected.txt @@ -88,112 +88,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "package_module_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "package_module_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "package_module_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "package_module_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "package_module_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "package_module_1.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/packages/package_module_2-expected.txt b/ets2panda/test/parser/ets/import_tests/packages/package_module_2-expected.txt index b9265122a087f8ceb2b398c807552ed849862512..77015b06c7bd585fc387ff1a9d214c77fb536e5d 100755 --- a/ets2panda/test/parser/ets/import_tests/packages/package_module_2-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/packages/package_module_2-expected.txt @@ -88,112 +88,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "package_module_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "package_module_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "package_module_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "package_module_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "package_module_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "package_module_2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "package_module_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "package_module_2.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/packages/subpackage-1/package_module_1-expected.txt b/ets2panda/test/parser/ets/import_tests/packages/subpackage-1/package_module_1-expected.txt index 5e0a7c449aad9118245f6030c15ccebf69e3d4b0..ff49cabbfcf34065e2eb85cd10685033d3ed56bf 100644 --- a/ets2panda/test/parser/ets/import_tests/packages/subpackage-1/package_module_1-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/packages/subpackage-1/package_module_1-expected.txt @@ -120,177 +120,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "foo", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "package_module_1.ets" - }, - "end": { - "line": 18, - "column": 15, - "program": "package_module_1.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 3, - "loc": { - "start": { - "line": 18, - "column": 18, - "program": "package_module_1.ets" - }, - "end": { - "line": 18, - "column": 19, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "package_module_1.ets" - }, - "end": { - "line": 18, - "column": 19, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "package_module_1.ets" - }, - "end": { - "line": 18, - "column": 19, - "program": "package_module_1.ets" - } - } - } - ], - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "package_module_1.ets" - }, - "end": { - "line": 18, - "column": 19, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "package_module_1.ets" - }, - "end": { - "line": 18, - "column": 19, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "package_module_1.ets" - }, - "end": { - "line": 18, - "column": 19, - "program": "package_module_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "package_module_1.ets" - }, - "end": { - "line": 18, - "column": 19, - "program": "package_module_1.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/packages/subpackage-2/package_module_1-expected.txt b/ets2panda/test/parser/ets/import_tests/packages/subpackage-2/package_module_1-expected.txt index 5b43722f627b7c9ec25f11ddfc816df1c75ce15a..377c6237a5a4656fdc48fab2755e4bb76b94710a 100644 --- a/ets2panda/test/parser/ets/import_tests/packages/subpackage-2/package_module_1-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/packages/subpackage-2/package_module_1-expected.txt @@ -120,177 +120,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "foo", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "package_module_1.ets" - }, - "end": { - "line": 18, - "column": 15, - "program": "package_module_1.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 2, - "loc": { - "start": { - "line": 18, - "column": 18, - "program": "package_module_1.ets" - }, - "end": { - "line": 18, - "column": 19, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "package_module_1.ets" - }, - "end": { - "line": 18, - "column": 19, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "package_module_1.ets" - }, - "end": { - "line": 18, - "column": 19, - "program": "package_module_1.ets" - } - } - } - ], - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "package_module_1.ets" - }, - "end": { - "line": 18, - "column": 19, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "package_module_1.ets" - }, - "end": { - "line": 18, - "column": 19, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "package_module_1.ets" - }, - "end": { - "line": 18, - "column": 19, - "program": "package_module_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "package_module_1.ets" - }, - "end": { - "line": 18, - "column": 19, - "program": "package_module_1.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/packages/subpackage/package_module_1-expected.txt b/ets2panda/test/parser/ets/import_tests/packages/subpackage/package_module_1-expected.txt index 553edfedd90d4567acb6cda578f633e316c9fcef..a8c4773782b1e4f8133739bdbc979ada8c83cedc 100644 --- a/ets2panda/test/parser/ets/import_tests/packages/subpackage/package_module_1-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/packages/subpackage/package_module_1-expected.txt @@ -120,112 +120,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "package_module_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "package_module_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "package_module_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "package_module_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "package_module_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "package_module_1.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/packages/var-duplication/subpackage_module_1-expected.txt b/ets2panda/test/parser/ets/import_tests/packages/var-duplication/subpackage_module_1-expected.txt index 84d7af505e68429c1180d589a86dacc75bd2770e..5db47975ff059fb08eef4930349e2287c5cd36ae 100755 --- a/ets2panda/test/parser/ets/import_tests/packages/var-duplication/subpackage_module_1-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/packages/var-duplication/subpackage_module_1-expected.txt @@ -120,241 +120,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 12, - "program": "subpackage_module_1.ets" - }, - "end": { - "line": 19, - "column": 13, - "program": "subpackage_module_1.ets" - } - } - }, - "right": { - "type": "StringLiteral", - "value": "SubpackageB", - "loc": { - "start": { - "line": 19, - "column": 24, - "program": "subpackage_module_1.ets" - }, - "end": { - "line": 19, - "column": 37, - "program": "subpackage_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 12, - "program": "subpackage_module_1.ets" - }, - "end": { - "line": 19, - "column": 37, - "program": "subpackage_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 12, - "program": "subpackage_module_1.ets" - }, - "end": { - "line": 19, - "column": 37, - "program": "subpackage_module_1.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 12, - "program": "subpackage_module_2.ets" - }, - "end": { - "line": 19, - "column": 13, - "program": "subpackage_module_2.ets" - } - } - }, - "right": { - "type": "StringLiteral", - "value": "SubpackageB", - "loc": { - "start": { - "line": 19, - "column": 24, - "program": "subpackage_module_2.ets" - }, - "end": { - "line": 19, - "column": 37, - "program": "subpackage_module_2.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 12, - "program": "subpackage_module_2.ets" - }, - "end": { - "line": 19, - "column": 37, - "program": "subpackage_module_2.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 12, - "program": "subpackage_module_2.ets" - }, - "end": { - "line": 19, - "column": 37, - "program": "subpackage_module_2.ets" - } - } - } - ], - "loc": { - "start": { - "line": 19, - "column": 12, - "program": "subpackage_module_1.ets" - }, - "end": { - "line": 19, - "column": 37, - "program": "subpackage_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 12, - "program": "subpackage_module_1.ets" - }, - "end": { - "line": 19, - "column": 37, - "program": "subpackage_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 12, - "program": "subpackage_module_1.ets" - }, - "end": { - "line": 19, - "column": 37, - "program": "subpackage_module_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 12, - "program": "subpackage_module_1.ets" - }, - "end": { - "line": 19, - "column": 37, - "program": "subpackage_module_1.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -437,7 +202,7 @@ }, "end": { "line": 19, - "column": 37, + "column": 24, "program": "subpackage_module_1.ets" } } @@ -524,7 +289,7 @@ }, "end": { "line": 19, - "column": 37, + "column": 24, "program": "subpackage_module_2.ets" } } diff --git a/ets2panda/test/parser/ets/import_tests/packages/var-duplication/subpackage_module_2-expected.txt b/ets2panda/test/parser/ets/import_tests/packages/var-duplication/subpackage_module_2-expected.txt index dd6e5693b36261c84eb126fe02727d52048d2638..a8ab8c85e01c091508a01219ca39394e260da10f 100755 --- a/ets2panda/test/parser/ets/import_tests/packages/var-duplication/subpackage_module_2-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/packages/var-duplication/subpackage_module_2-expected.txt @@ -120,241 +120,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 12, - "program": "subpackage_module_2.ets" - }, - "end": { - "line": 19, - "column": 13, - "program": "subpackage_module_2.ets" - } - } - }, - "right": { - "type": "StringLiteral", - "value": "SubpackageB", - "loc": { - "start": { - "line": 19, - "column": 24, - "program": "subpackage_module_2.ets" - }, - "end": { - "line": 19, - "column": 37, - "program": "subpackage_module_2.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 12, - "program": "subpackage_module_2.ets" - }, - "end": { - "line": 19, - "column": 37, - "program": "subpackage_module_2.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 12, - "program": "subpackage_module_2.ets" - }, - "end": { - "line": 19, - "column": 37, - "program": "subpackage_module_2.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 12, - "program": "subpackage_module_1.ets" - }, - "end": { - "line": 19, - "column": 13, - "program": "subpackage_module_1.ets" - } - } - }, - "right": { - "type": "StringLiteral", - "value": "SubpackageB", - "loc": { - "start": { - "line": 19, - "column": 24, - "program": "subpackage_module_1.ets" - }, - "end": { - "line": 19, - "column": 37, - "program": "subpackage_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 12, - "program": "subpackage_module_1.ets" - }, - "end": { - "line": 19, - "column": 37, - "program": "subpackage_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 12, - "program": "subpackage_module_1.ets" - }, - "end": { - "line": 19, - "column": 37, - "program": "subpackage_module_1.ets" - } - } - } - ], - "loc": { - "start": { - "line": 19, - "column": 12, - "program": "subpackage_module_2.ets" - }, - "end": { - "line": 19, - "column": 37, - "program": "subpackage_module_2.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 12, - "program": "subpackage_module_2.ets" - }, - "end": { - "line": 19, - "column": 37, - "program": "subpackage_module_2.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 12, - "program": "subpackage_module_2.ets" - }, - "end": { - "line": 19, - "column": 37, - "program": "subpackage_module_2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 12, - "program": "subpackage_module_2.ets" - }, - "end": { - "line": 19, - "column": 37, - "program": "subpackage_module_2.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -437,7 +202,7 @@ }, "end": { "line": 19, - "column": 37, + "column": 24, "program": "subpackage_module_2.ets" } } @@ -524,7 +289,7 @@ }, "end": { "line": 19, - "column": 37, + "column": 24, "program": "subpackage_module_1.ets" } } diff --git a/ets2panda/test/parser/ets/import_tests/relative_import/Line-expected.txt b/ets2panda/test/parser/ets/import_tests/relative_import/Line-expected.txt index 3d4c42c98e20b550db3848de2f794338218d5973..eda00901bf22009875c54067bd417d15719c385f 100644 --- a/ets2panda/test/parser/ets/import_tests/relative_import/Line-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/relative_import/Line-expected.txt @@ -895,112 +895,6 @@ "program": "Line.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "Line.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "Line.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "Line.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "Line.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "Line.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "Line.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "Line.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "Line.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/import_tests/relative_import/Point-expected.txt b/ets2panda/test/parser/ets/import_tests/relative_import/Point-expected.txt index 498c660f4894eda3664549fda18acbee9883b4ed..19ced72284b46a7289bc566d1aa55683f39f22d6 100644 --- a/ets2panda/test/parser/ets/import_tests/relative_import/Point-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/relative_import/Point-expected.txt @@ -1096,112 +1096,6 @@ "program": "Point.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "Point.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "Point.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "Point.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "Point.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "Point.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "Point.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "Point.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "Point.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/import_tests/relative_import/alias1-expected.txt b/ets2panda/test/parser/ets/import_tests/relative_import/alias1-expected.txt index fac134a05d48f00fe88405beb716a7e750d959b8..95d6fbe29518fa9773a9f36d32db03932050d6aa 100644 --- a/ets2panda/test/parser/ets/import_tests/relative_import/alias1-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/relative_import/alias1-expected.txt @@ -89,112 +89,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "alias1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "alias1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "alias1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "alias1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "alias1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "alias1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "alias1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "alias1.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/relative_import/alias2-expected.txt b/ets2panda/test/parser/ets/import_tests/relative_import/alias2-expected.txt index f4b19a9cc32e04b915830a8274cf2c837ed69619..ed448ce1a49c8e4fd754b5c1565eb135a0552dd6 100644 --- a/ets2panda/test/parser/ets/import_tests/relative_import/alias2-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/relative_import/alias2-expected.txt @@ -391,177 +391,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "goo", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "alias2.ets" - }, - "end": { - "line": 16, - "column": 15, - "program": "alias2.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 5, - "loc": { - "start": { - "line": 16, - "column": 18, - "program": "alias2.ets" - }, - "end": { - "line": 16, - "column": 19, - "program": "alias2.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "alias2.ets" - }, - "end": { - "line": 16, - "column": 19, - "program": "alias2.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "alias2.ets" - }, - "end": { - "line": 16, - "column": 19, - "program": "alias2.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "alias2.ets" - }, - "end": { - "line": 16, - "column": 19, - "program": "alias2.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "alias2.ets" - }, - "end": { - "line": 16, - "column": 19, - "program": "alias2.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "alias2.ets" - }, - "end": { - "line": 16, - "column": 19, - "program": "alias2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "alias2.ets" - }, - "end": { - "line": 16, - "column": 19, - "program": "alias2.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/import_tests/repeat-expected.txt b/ets2panda/test/parser/ets/import_tests/repeat-expected.txt index 93f2126e37bee34ab21a5cb812b834c1f9318a05..1622fc0524ed2ea40d3343e96abeb89497673fb0 100644 --- a/ets2panda/test/parser/ets/import_tests/repeat-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/repeat-expected.txt @@ -651,112 +651,6 @@ "program": "repeat.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "repeat.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "repeat.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "repeat.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "repeat.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "repeat.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "repeat.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "repeat.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "repeat.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/import_tests/subsequent_relative_imports/folder1/file1-expected.txt b/ets2panda/test/parser/ets/import_tests/subsequent_relative_imports/folder1/file1-expected.txt index 5e37cd77ff532a31bc3668ed8735b75c87fda038..543d053ba28c766691abf2917e5f687e4ca75a7f 100644 --- a/ets2panda/test/parser/ets/import_tests/subsequent_relative_imports/folder1/file1-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/subsequent_relative_imports/folder1/file1-expected.txt @@ -211,112 +211,6 @@ "program": "file1.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "file1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "file1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "file1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "file1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "file1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "file1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "file1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "file1.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/import_tests/subsequent_relative_imports/folder2/file2-expected.txt b/ets2panda/test/parser/ets/import_tests/subsequent_relative_imports/folder2/file2-expected.txt index f062113c00570e375ec8680b7a618aaeadc4786e..9c165186303d99d80f2f2c5b156ce872ff1bcff8 100644 --- a/ets2panda/test/parser/ets/import_tests/subsequent_relative_imports/folder2/file2-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/subsequent_relative_imports/folder2/file2-expected.txt @@ -366,112 +366,6 @@ "program": "file2.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "file2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "file2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "file2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "file2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "file2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "file2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "file2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "file2.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/import_tests/subsequent_relative_imports/folder3/file3-expected.txt b/ets2panda/test/parser/ets/import_tests/subsequent_relative_imports/folder3/file3-expected.txt index 2028cb3692a80c7dd42ee3dafcbc1bd87df4d8c7..2f67b5729d14707414f6dada8b08b551c6d7a9b5 100644 --- a/ets2panda/test/parser/ets/import_tests/subsequent_relative_imports/folder3/file3-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/subsequent_relative_imports/folder3/file3-expected.txt @@ -284,112 +284,6 @@ "program": "file3.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "file3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "file3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "file3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "file3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "file3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "file3.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "file3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "file3.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/import_tests/type/type-expected.txt b/ets2panda/test/parser/ets/import_tests/type/type-expected.txt index 0bf85f15bd30c8019f3cf3304b0554a6f7b9b0a8..b818946448ee6accd85d32d5fb778c968ddd7e16 100644 --- a/ets2panda/test/parser/ets/import_tests/type/type-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/type/type-expected.txt @@ -284,112 +284,6 @@ "program": "type.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "type.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "type.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "type.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "type.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/index_expressions-expected.txt b/ets2panda/test/parser/ets/index_expressions-expected.txt index 4fbdc5871f6e5333b3cdd89a1abf683970bfcbf8..88266ffcc866b4e961dfde206d125e20cb52f464 100644 --- a/ets2panda/test/parser/ets/index_expressions-expected.txt +++ b/ets2panda/test/parser/ets/index_expressions-expected.txt @@ -130,537 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "index_expressions.ets" - }, - "end": { - "line": 17, - "column": 6, - "program": "index_expressions.ets" - } - } - }, - "right": { - "type": "ETSNewArrayInstanceExpression", - "typeReference": { - "type": "ETSPrimitiveType", - "loc": { - "start": { - "line": 17, - "column": 13, - "program": "index_expressions.ets" - }, - "end": { - "line": 17, - "column": 16, - "program": "index_expressions.ets" - } - } - }, - "dimension": { - "type": "NumberLiteral", - "value": 5, - "loc": { - "start": { - "line": 17, - "column": 17, - "program": "index_expressions.ets" - }, - "end": { - "line": 17, - "column": 18, - "program": "index_expressions.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 9, - "program": "index_expressions.ets" - }, - "end": { - "line": 17, - "column": 19, - "program": "index_expressions.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "index_expressions.ets" - }, - "end": { - "line": 17, - "column": 19, - "program": "index_expressions.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "index_expressions.ets" - }, - "end": { - "line": 17, - "column": 19, - "program": "index_expressions.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "index_expressions.ets" - }, - "end": { - "line": 18, - "column": 6, - "program": "index_expressions.ets" - } - } - }, - "right": { - "type": "MemberExpression", - "object": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 9, - "program": "index_expressions.ets" - }, - "end": { - "line": 18, - "column": 10, - "program": "index_expressions.ets" - } - } - }, - "property": { - "type": "NumberLiteral", - "value": 0, - "loc": { - "start": { - "line": 18, - "column": 11, - "program": "index_expressions.ets" - }, - "end": { - "line": 18, - "column": 12, - "program": "index_expressions.ets" - } - } - }, - "computed": true, - "optional": false, - "loc": { - "start": { - "line": 18, - "column": 9, - "program": "index_expressions.ets" - }, - "end": { - "line": 18, - "column": 13, - "program": "index_expressions.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "index_expressions.ets" - }, - "end": { - "line": 18, - "column": 13, - "program": "index_expressions.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "index_expressions.ets" - }, - "end": { - "line": 18, - "column": 13, - "program": "index_expressions.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "c", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "index_expressions.ets" - }, - "end": { - "line": 19, - "column": 6, - "program": "index_expressions.ets" - } - } - }, - "right": { - "type": "MemberExpression", - "object": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 9, - "program": "index_expressions.ets" - }, - "end": { - "line": 19, - "column": 10, - "program": "index_expressions.ets" - } - } - }, - "property": { - "type": "Identifier", - "name": "b", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 11, - "program": "index_expressions.ets" - }, - "end": { - "line": 19, - "column": 12, - "program": "index_expressions.ets" - } - } - }, - "computed": true, - "optional": false, - "loc": { - "start": { - "line": 19, - "column": 9, - "program": "index_expressions.ets" - }, - "end": { - "line": 19, - "column": 13, - "program": "index_expressions.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "index_expressions.ets" - }, - "end": { - "line": 19, - "column": 13, - "program": "index_expressions.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "index_expressions.ets" - }, - "end": { - "line": 19, - "column": 13, - "program": "index_expressions.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "d", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "index_expressions.ets" - }, - "end": { - "line": 20, - "column": 6, - "program": "index_expressions.ets" - } - } - }, - "right": { - "type": "MemberExpression", - "object": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 9, - "program": "index_expressions.ets" - }, - "end": { - "line": 20, - "column": 10, - "program": "index_expressions.ets" - } - } - }, - "property": { - "type": "MemberExpression", - "object": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 11, - "program": "index_expressions.ets" - }, - "end": { - "line": 20, - "column": 12, - "program": "index_expressions.ets" - } - } - }, - "property": { - "type": "Identifier", - "name": "b", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 13, - "program": "index_expressions.ets" - }, - "end": { - "line": 20, - "column": 14, - "program": "index_expressions.ets" - } - } - }, - "computed": true, - "optional": false, - "loc": { - "start": { - "line": 20, - "column": 11, - "program": "index_expressions.ets" - }, - "end": { - "line": 20, - "column": 15, - "program": "index_expressions.ets" - } - } - }, - "computed": true, - "optional": false, - "loc": { - "start": { - "line": 20, - "column": 9, - "program": "index_expressions.ets" - }, - "end": { - "line": 20, - "column": 16, - "program": "index_expressions.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "index_expressions.ets" - }, - "end": { - "line": 20, - "column": 16, - "program": "index_expressions.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "index_expressions.ets" - }, - "end": { - "line": 20, - "column": 16, - "program": "index_expressions.ets" - } - } - } - ], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "index_expressions.ets" - }, - "end": { - "line": 20, - "column": 16, - "program": "index_expressions.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "index_expressions.ets" - }, - "end": { - "line": 20, - "column": 16, - "program": "index_expressions.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "index_expressions.ets" - }, - "end": { - "line": 20, - "column": 16, - "program": "index_expressions.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "index_expressions.ets" - }, - "end": { - "line": 20, - "column": 16, - "program": "index_expressions.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/infer_overriding_method_return_type-expected.txt b/ets2panda/test/parser/ets/infer_overriding_method_return_type-expected.txt index 1dcfc9592f35c2cbeb61acece700cf5480fcf1a3..c7f1802a879843ec2558cf0f91f41606ff820202 100644 --- a/ets2panda/test/parser/ets/infer_overriding_method_return_type-expected.txt +++ b/ets2panda/test/parser/ets/infer_overriding_method_return_type-expected.txt @@ -760,112 +760,6 @@ "program": "infer_overriding_method_return_type.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "infer_overriding_method_return_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "infer_overriding_method_return_type.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "infer_overriding_method_return_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "infer_overriding_method_return_type.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "infer_overriding_method_return_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "infer_overriding_method_return_type.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "infer_overriding_method_return_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "infer_overriding_method_return_type.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/inferingEntryPointReturn-expected.txt b/ets2panda/test/parser/ets/inferingEntryPointReturn-expected.txt index 96fb840b5b3618264015239d67f932738c059f26..8a57f96ea3e7a375976983386a9cde7b808a5478 100644 --- a/ets2panda/test/parser/ets/inferingEntryPointReturn-expected.txt +++ b/ets2panda/test/parser/ets/inferingEntryPointReturn-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "inferingEntryPointReturn.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "inferingEntryPointReturn.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "inferingEntryPointReturn.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "inferingEntryPointReturn.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "inferingEntryPointReturn.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "inferingEntryPointReturn.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "inferingEntryPointReturn.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "inferingEntryPointReturn.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/inheritance-expected.txt b/ets2panda/test/parser/ets/inheritance-expected.txt index 358075196807f55d2146d46a1484bf1bd72a5999..58481cb4a9531148c2dd26be3ad2e8b3507182ca 100644 --- a/ets2panda/test/parser/ets/inheritance-expected.txt +++ b/ets2panda/test/parser/ets/inheritance-expected.txt @@ -1374,112 +1374,6 @@ "program": "inheritance.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "inheritance.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "inheritance.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "inheritance.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "inheritance.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "inheritance.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "inheritance.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "inheritance.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "inheritance.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/inheritance2-expected.txt b/ets2panda/test/parser/ets/inheritance2-expected.txt index 8cac93e10ae0c45db5fdc88e81c93bb184a65d5a..810c05610431b66d81b3cc7419f78f0c12bc3dad 100644 --- a/ets2panda/test/parser/ets/inheritance2-expected.txt +++ b/ets2panda/test/parser/ets/inheritance2-expected.txt @@ -782,112 +782,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "inheritance2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "inheritance2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "inheritance2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "inheritance2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "inheritance2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "inheritance2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "inheritance2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "inheritance2.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/instanceof-expected.txt b/ets2panda/test/parser/ets/instanceof-expected.txt index c3275656e5f45653d8d418c3d4d0fab4d7c73458..152e753236935a785786060226d0a541bada6b18 100644 --- a/ets2panda/test/parser/ets/instanceof-expected.txt +++ b/ets2panda/test/parser/ets/instanceof-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "instanceof.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "instanceof.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "instanceof.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "instanceof.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "instanceof.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "instanceof.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "instanceof.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "instanceof.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/interfaceMethodWithOptional-expected.txt b/ets2panda/test/parser/ets/interfaceMethodWithOptional-expected.txt index 2231e020c87860a7ec685651c518adff73fba1c4..2a2ea64825e547ef3f295155b6108c6957ada915 100644 --- a/ets2panda/test/parser/ets/interfaceMethodWithOptional-expected.txt +++ b/ets2panda/test/parser/ets/interfaceMethodWithOptional-expected.txt @@ -517,112 +517,6 @@ "program": "interfaceMethodWithOptional.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "interfaceMethodWithOptional.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "interfaceMethodWithOptional.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "interfaceMethodWithOptional.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "interfaceMethodWithOptional.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "interfaceMethodWithOptional.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "interfaceMethodWithOptional.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "interfaceMethodWithOptional.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "interfaceMethodWithOptional.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/interface_abstract_noreturn_function-expected.txt b/ets2panda/test/parser/ets/interface_abstract_noreturn_function-expected.txt index 41d17fc97a2b59cb86c93e4d2a1a6261042b4e39..eb07410f9d7fab058245b8188755d2251a34c4a9 100644 --- a/ets2panda/test/parser/ets/interface_abstract_noreturn_function-expected.txt +++ b/ets2panda/test/parser/ets/interface_abstract_noreturn_function-expected.txt @@ -269,112 +269,6 @@ "program": "interface_abstract_noreturn_function.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "interface_abstract_noreturn_function.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "interface_abstract_noreturn_function.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "interface_abstract_noreturn_function.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "interface_abstract_noreturn_function.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "interface_abstract_noreturn_function.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "interface_abstract_noreturn_function.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "interface_abstract_noreturn_function.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "interface_abstract_noreturn_function.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/interface_method_default_body-expected.txt b/ets2panda/test/parser/ets/interface_method_default_body-expected.txt index 9ac31fdf23da5d54c91c766a0968b62b2c38cb2f..f285ea144206a3b34e600f91eebd854025098b79 100644 --- a/ets2panda/test/parser/ets/interface_method_default_body-expected.txt +++ b/ets2panda/test/parser/ets/interface_method_default_body-expected.txt @@ -857,112 +857,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "interface_method_default_body.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "interface_method_default_body.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "interface_method_default_body.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "interface_method_default_body.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "interface_method_default_body.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "interface_method_default_body.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "interface_method_default_body.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "interface_method_default_body.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/interfaces-expected.txt b/ets2panda/test/parser/ets/interfaces-expected.txt index ae8b0466926bdee06a387daabe7bd86156a3dd23..4be68e8250d547024fba45b989a2c0f815d27a46 100644 --- a/ets2panda/test/parser/ets/interfaces-expected.txt +++ b/ets2panda/test/parser/ets/interfaces-expected.txt @@ -1338,112 +1338,6 @@ "program": "interfaces.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "interfaces.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "interfaces.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "interfaces.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "interfaces.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "interfaces.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "interfaces.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "interfaces.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "interfaces.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/internalParsing-expected.txt b/ets2panda/test/parser/ets/internalParsing-expected.txt index 3eea539048620bc95274a8e9643a4ebb260cd736..0ae18583d70a3100c9153e497221de986ba2150a 100644 --- a/ets2panda/test/parser/ets/internalParsing-expected.txt +++ b/ets2panda/test/parser/ets/internalParsing-expected.txt @@ -701,112 +701,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "internalParsing.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "internalParsing.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "internalParsing.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "internalParsing.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "internalParsing.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "internalParsing.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "internalParsing.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "internalParsing.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/internalProtectedParsing-expected.txt b/ets2panda/test/parser/ets/internalProtectedParsing-expected.txt index e69d6f328620359c0ff4e59a2ca832b9850672e3..806fcc9726e0ac2298fc730a9cc1bb62750f7d79 100644 --- a/ets2panda/test/parser/ets/internalProtectedParsing-expected.txt +++ b/ets2panda/test/parser/ets/internalProtectedParsing-expected.txt @@ -938,112 +938,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "internalProtectedParsing.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "internalProtectedParsing.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "internalProtectedParsing.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "internalProtectedParsing.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "internalProtectedParsing.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "internalProtectedParsing.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "internalProtectedParsing.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "internalProtectedParsing.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/labeledDoWhileStatement-expected.txt b/ets2panda/test/parser/ets/labeledDoWhileStatement-expected.txt index b9996b3d47ef437d726a3c63d753bf2ae867d2f8..2b4b6d51a49a69ec3029b47c0f7d56df789c50df 100644 --- a/ets2panda/test/parser/ets/labeledDoWhileStatement-expected.txt +++ b/ets2panda/test/parser/ets/labeledDoWhileStatement-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "labeledDoWhileStatement.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "labeledDoWhileStatement.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "labeledDoWhileStatement.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "labeledDoWhileStatement.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "labeledDoWhileStatement.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "labeledDoWhileStatement.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "labeledDoWhileStatement.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "labeledDoWhileStatement.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/labeledForStatement-expected.txt b/ets2panda/test/parser/ets/labeledForStatement-expected.txt index efcc9ab144353bbd87bc4ca522e3896c9eab057a..3475426fa8a59ba2439b1459d3db553cd3b003a7 100644 --- a/ets2panda/test/parser/ets/labeledForStatement-expected.txt +++ b/ets2panda/test/parser/ets/labeledForStatement-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "labeledForStatement.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "labeledForStatement.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "labeledForStatement.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "labeledForStatement.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "labeledForStatement.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "labeledForStatement.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "labeledForStatement.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "labeledForStatement.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/labeledSwitchStatement-expected.txt b/ets2panda/test/parser/ets/labeledSwitchStatement-expected.txt index efb4dff00aec0ef347b3ffb0532fb993c00ff536..4dfe97c1b18b333cfb0d6f99d2c361576dceda2f 100644 --- a/ets2panda/test/parser/ets/labeledSwitchStatement-expected.txt +++ b/ets2panda/test/parser/ets/labeledSwitchStatement-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "labeledSwitchStatement.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "labeledSwitchStatement.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "labeledSwitchStatement.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "labeledSwitchStatement.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "labeledSwitchStatement.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "labeledSwitchStatement.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "labeledSwitchStatement.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "labeledSwitchStatement.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/labeledWhileStatement-expected.txt b/ets2panda/test/parser/ets/labeledWhileStatement-expected.txt index 60ace5f7efc8dce9681e9cf696fbbb308cb34a0d..6ce3b6806150ffcddc0530c6863cdffa023e1283 100644 --- a/ets2panda/test/parser/ets/labeledWhileStatement-expected.txt +++ b/ets2panda/test/parser/ets/labeledWhileStatement-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "labeledWhileStatement.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "labeledWhileStatement.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "labeledWhileStatement.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "labeledWhileStatement.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "labeledWhileStatement.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "labeledWhileStatement.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "labeledWhileStatement.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "labeledWhileStatement.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/lambda-expected.txt b/ets2panda/test/parser/ets/lambda-expected.txt index 0e78b38152756d46e83c0361ddc909d4f89e7ffa..91d0adf99d05f75f6809d7f51c99f6a838f691e0 100644 --- a/ets2panda/test/parser/ets/lambda-expected.txt +++ b/ets2panda/test/parser/ets/lambda-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/lambda-lambda-expected.txt b/ets2panda/test/parser/ets/lambda-lambda-expected.txt index d52afdced451344b4b56bba188f395537b76b8f5..6f0bbea9627a291adf467cd482f5d954513f34af 100644 --- a/ets2panda/test/parser/ets/lambda-lambda-expected.txt +++ b/ets2panda/test/parser/ets/lambda-lambda-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda-lambda.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda-lambda.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda-lambda.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda-lambda.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda-lambda.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda-lambda.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda-lambda.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda-lambda.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/lambda-type-inference-alias-expected.txt b/ets2panda/test/parser/ets/lambda-type-inference-alias-expected.txt index 7a623b9e183d76577e352fcfe61178eb8e0ee703..8dfa3701314b2e8778b6215bfc38b3494550d90a 100644 --- a/ets2panda/test/parser/ets/lambda-type-inference-alias-expected.txt +++ b/ets2panda/test/parser/ets/lambda-type-inference-alias-expected.txt @@ -214,112 +214,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-alias.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-alias.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-alias.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-alias.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-alias.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-alias.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-alias.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-alias.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/lambda-type-inference-arg-no-type-expected.txt b/ets2panda/test/parser/ets/lambda-type-inference-arg-no-type-expected.txt index 57e563c0b44fbd747d9017baec8213a2678461d0..6d5ec375fc9bb26b7df69bcd5f1c70570e21f325 100644 --- a/ets2panda/test/parser/ets/lambda-type-inference-arg-no-type-expected.txt +++ b/ets2panda/test/parser/ets/lambda-type-inference-arg-no-type-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-arg-no-type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-arg-no-type.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-arg-no-type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-arg-no-type.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-arg-no-type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-arg-no-type.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-arg-no-type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-arg-no-type.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/lambda-type-inference-expected.txt b/ets2panda/test/parser/ets/lambda-type-inference-expected.txt index 84633d12dfed4d70403e5a9ec7acc30f8aac3c99..b4087d92249f874fbb760c9537bf8b9df39900ca 100644 --- a/ets2panda/test/parser/ets/lambda-type-inference-expected.txt +++ b/ets2panda/test/parser/ets/lambda-type-inference-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda-type-inference.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda-type-inference.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda-type-inference.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda-type-inference.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda-type-inference.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda-type-inference.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda-type-inference.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda-type-inference.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/lambda-type-inference-no-ret-type-expected.txt b/ets2panda/test/parser/ets/lambda-type-inference-no-ret-type-expected.txt index cd84c0e1c0d54ace2299c08348da12b75b868c6c..814efd06d9eea97d7bd60d2d4b5160b8913e840f 100644 --- a/ets2panda/test/parser/ets/lambda-type-inference-no-ret-type-expected.txt +++ b/ets2panda/test/parser/ets/lambda-type-inference-no-ret-type-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-no-ret-type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-no-ret-type.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-no-ret-type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-no-ret-type.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-no-ret-type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-no-ret-type.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-no-ret-type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-no-ret-type.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/lambda-type-inference-overloaded-2-expected.txt b/ets2panda/test/parser/ets/lambda-type-inference-overloaded-2-expected.txt index 1aaf04ee6bea199660e493c11f993fa00967acd6..338c5b8f71b4c2caf7d854900379bc8cca969e47 100644 --- a/ets2panda/test/parser/ets/lambda-type-inference-overloaded-2-expected.txt +++ b/ets2panda/test/parser/ets/lambda-type-inference-overloaded-2-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-overloaded-2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-overloaded-2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-overloaded-2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-overloaded-2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-overloaded-2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-overloaded-2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-overloaded-2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-overloaded-2.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/lambda-type-inference-overloaded-3-expected.txt b/ets2panda/test/parser/ets/lambda-type-inference-overloaded-3-expected.txt index f67cc61f64a80da0bb1f82098af5b092e45b1946..f7a0c7d717498daeab3e22e39c11c76a3d7c87ee 100644 --- a/ets2panda/test/parser/ets/lambda-type-inference-overloaded-3-expected.txt +++ b/ets2panda/test/parser/ets/lambda-type-inference-overloaded-3-expected.txt @@ -1254,112 +1254,6 @@ "program": "lambda-type-inference-overloaded-3.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-overloaded-3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-overloaded-3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-overloaded-3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-overloaded-3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-overloaded-3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-overloaded-3.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-overloaded-3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda-type-inference-overloaded-3.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/lambdaAsFunctionParam-expected.txt b/ets2panda/test/parser/ets/lambdaAsFunctionParam-expected.txt index 180bf4785e0a4c16ff54be2ec51993db1a356fc3..78d98c18726928342db1d3d4072dae273651957c 100644 --- a/ets2panda/test/parser/ets/lambdaAsFunctionParam-expected.txt +++ b/ets2panda/test/parser/ets/lambdaAsFunctionParam-expected.txt @@ -787,112 +787,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambdaAsFunctionParam.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambdaAsFunctionParam.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambdaAsFunctionParam.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambdaAsFunctionParam.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambdaAsFunctionParam.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambdaAsFunctionParam.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambdaAsFunctionParam.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambdaAsFunctionParam.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatement-expected.txt b/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatement-expected.txt index 3e81d35081cf8151f8bb5293cd33886c2cc0651a..2b0005497395db91680ca3247c028e4d62a53986 100644 --- a/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatement-expected.txt +++ b/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatement-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambdaExpressionWithoutBlockStatement.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambdaExpressionWithoutBlockStatement.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambdaExpressionWithoutBlockStatement.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambdaExpressionWithoutBlockStatement.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambdaExpressionWithoutBlockStatement.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambdaExpressionWithoutBlockStatement.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambdaExpressionWithoutBlockStatement.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambdaExpressionWithoutBlockStatement.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementCallAVoidFunction-expected.txt b/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementCallAVoidFunction-expected.txt index a90efdab4838975d65cefc00f798c60a49128773..50b689374c6d0798d7aeb44e1a14ccaec9156431 100644 --- a/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementCallAVoidFunction-expected.txt +++ b/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementCallAVoidFunction-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambdaExpressionWithoutBlockStatementCallAVoidFunction.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambdaExpressionWithoutBlockStatementCallAVoidFunction.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambdaExpressionWithoutBlockStatementCallAVoidFunction.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambdaExpressionWithoutBlockStatementCallAVoidFunction.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambdaExpressionWithoutBlockStatementCallAVoidFunction.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambdaExpressionWithoutBlockStatementCallAVoidFunction.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambdaExpressionWithoutBlockStatementCallAVoidFunction.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambdaExpressionWithoutBlockStatementCallAVoidFunction.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementVoid-expected.txt b/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementVoid-expected.txt index 287a55a2f24fa86a8fbafa6c9d5daff46da17949..2236479653a9b150370eb82527494b273e989d7d 100644 --- a/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementVoid-expected.txt +++ b/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementVoid-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambdaExpressionWithoutBlockStatementVoid.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambdaExpressionWithoutBlockStatementVoid.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambdaExpressionWithoutBlockStatementVoid.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambdaExpressionWithoutBlockStatementVoid.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambdaExpressionWithoutBlockStatementVoid.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambdaExpressionWithoutBlockStatementVoid.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambdaExpressionWithoutBlockStatementVoid.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambdaExpressionWithoutBlockStatementVoid.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementWithFunctionParameters-expected.txt b/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementWithFunctionParameters-expected.txt index 9e1921d21836e472966c35eedcc66629c7a82c52..6be887fd9e7efd360d39653bf88e37ce33899c5b 100644 --- a/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementWithFunctionParameters-expected.txt +++ b/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementWithFunctionParameters-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambdaExpressionWithoutBlockStatementWithFunctionParameters.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambdaExpressionWithoutBlockStatementWithFunctionParameters.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambdaExpressionWithoutBlockStatementWithFunctionParameters.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambdaExpressionWithoutBlockStatementWithFunctionParameters.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambdaExpressionWithoutBlockStatementWithFunctionParameters.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambdaExpressionWithoutBlockStatementWithFunctionParameters.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambdaExpressionWithoutBlockStatementWithFunctionParameters.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambdaExpressionWithoutBlockStatementWithFunctionParameters.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/lambda_import_alias_1-2-expected.txt b/ets2panda/test/parser/ets/lambda_import_alias_1-2-expected.txt index 1b62bff898a4bc34497ed842db85224f7792a6ef..2039a31cb616b0c1243803c7a09f62495d48fd46 100644 --- a/ets2panda/test/parser/ets/lambda_import_alias_1-2-expected.txt +++ b/ets2panda/test/parser/ets/lambda_import_alias_1-2-expected.txt @@ -306,212 +306,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "createA", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "lambda_import_alias_1-2.ets" - }, - "end": { - "line": 18, - "column": 19, - "program": "lambda_import_alias_1-2.ets" - } - } - }, - "right": { - "type": "MemberExpression", - "object": { - "type": "Identifier", - "name": "lib", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 31, - "program": "lambda_import_alias_1-2.ets" - }, - "end": { - "line": 18, - "column": 34, - "program": "lambda_import_alias_1-2.ets" - } - } - }, - "property": { - "type": "Identifier", - "name": "createA", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 35, - "program": "lambda_import_alias_1-2.ets" - }, - "end": { - "line": 18, - "column": 42, - "program": "lambda_import_alias_1-2.ets" - } - } - }, - "computed": false, - "optional": false, - "loc": { - "start": { - "line": 18, - "column": 31, - "program": "lambda_import_alias_1-2.ets" - }, - "end": { - "line": 18, - "column": 42, - "program": "lambda_import_alias_1-2.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "lambda_import_alias_1-2.ets" - }, - "end": { - "line": 18, - "column": 42, - "program": "lambda_import_alias_1-2.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "lambda_import_alias_1-2.ets" - }, - "end": { - "line": 18, - "column": 42, - "program": "lambda_import_alias_1-2.ets" - } - } - } - ], - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "lambda_import_alias_1-2.ets" - }, - "end": { - "line": 18, - "column": 42, - "program": "lambda_import_alias_1-2.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "lambda_import_alias_1-2.ets" - }, - "end": { - "line": 18, - "column": 42, - "program": "lambda_import_alias_1-2.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "lambda_import_alias_1-2.ets" - }, - "end": { - "line": 18, - "column": 42, - "program": "lambda_import_alias_1-2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 12, - "program": "lambda_import_alias_1-2.ets" - }, - "end": { - "line": 18, - "column": 42, - "program": "lambda_import_alias_1-2.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -610,7 +404,7 @@ }, "end": { "line": 18, - "column": 42, + "column": 31, "program": "lambda_import_alias_1-2.ets" } } diff --git a/ets2panda/test/parser/ets/lambda_import_alias_1-3-expected.txt b/ets2panda/test/parser/ets/lambda_import_alias_1-3-expected.txt index e54f96ccfad5ad435f2dec9ee94fce8b60172a7f..7bf6c40a6c31157c7a26782df5572c7b4e9e8826 100644 --- a/ets2panda/test/parser/ets/lambda_import_alias_1-3-expected.txt +++ b/ets2panda/test/parser/ets/lambda_import_alias_1-3-expected.txt @@ -285,112 +285,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_import_alias_1-3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_import_alias_1-3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_import_alias_1-3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_import_alias_1-3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_import_alias_1-3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_import_alias_1-3.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_import_alias_1-3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_import_alias_1-3.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/lambda_import_alias_1-expected.txt b/ets2panda/test/parser/ets/lambda_import_alias_1-expected.txt index b7cd2b9060f84ca38c48e1f6b8c89063bcd14c05..4b91ecd5a11b7fe471683228c4988ea42148fdc2 100644 --- a/ets2panda/test/parser/ets/lambda_import_alias_1-expected.txt +++ b/ets2panda/test/parser/ets/lambda_import_alias_1-expected.txt @@ -194,112 +194,6 @@ "program": "lambda_import_alias_1.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_import_alias_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_import_alias_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_import_alias_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_import_alias_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_import_alias_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_import_alias_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_import_alias_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_import_alias_1.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/lambda_optional_param_1-expected.txt b/ets2panda/test/parser/ets/lambda_optional_param_1-expected.txt index 83244026aba40d059b36fcc1cc8ccb28c6a62973..0f35a8ad1179ae2c29ed25cf2e9d36be87dc7b84 100644 --- a/ets2panda/test/parser/ets/lambda_optional_param_1-expected.txt +++ b/ets2panda/test/parser/ets/lambda_optional_param_1-expected.txt @@ -539,112 +539,6 @@ "program": "lambda_optional_param_1.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_optional_param_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_optional_param_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_optional_param_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_optional_param_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_optional_param_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_optional_param_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "lambda_optional_param_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "lambda_optional_param_1.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/launch-expected.txt b/ets2panda/test/parser/ets/launch-expected.txt index 1556793616999331009d02cd4aac358de13d78ae..1299dca5ce70ef9577d3176faa3974bd96e57052 100755 --- a/ets2panda/test/parser/ets/launch-expected.txt +++ b/ets2panda/test/parser/ets/launch-expected.txt @@ -807,112 +807,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "launch.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "launch.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "launch.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "launch.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "launch.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "launch.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "launch.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "launch.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/launch_function_returning_void-expected.txt b/ets2panda/test/parser/ets/launch_function_returning_void-expected.txt index 072c424d63bb45c16ce360a608d8f6696fa489af..8a11aa64016fc2fc04678bf207887e2bc221045a 100644 --- a/ets2panda/test/parser/ets/launch_function_returning_void-expected.txt +++ b/ets2panda/test/parser/ets/launch_function_returning_void-expected.txt @@ -188,112 +188,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "launch_function_returning_void.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "launch_function_returning_void.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "launch_function_returning_void.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "launch_function_returning_void.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "launch_function_returning_void.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "launch_function_returning_void.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "launch_function_returning_void.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "launch_function_returning_void.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/launch_ret-expected.txt b/ets2panda/test/parser/ets/launch_ret-expected.txt index 95123a1f98d0b43099e78794090fe0d96edc465d..f66e159709482f30837981eccc2282954bf27a63 100644 --- a/ets2panda/test/parser/ets/launch_ret-expected.txt +++ b/ets2panda/test/parser/ets/launch_ret-expected.txt @@ -188,112 +188,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "launch_ret.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "launch_ret.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "launch_ret.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "launch_ret.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "launch_ret.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "launch_ret.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "launch_ret.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "launch_ret.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/launch_super-expected.txt b/ets2panda/test/parser/ets/launch_super-expected.txt index 80b3fc5bd2a70d48e481c65fb6cad1672609376e..41d690c0d42ab6e1e3f0dcebc3cb299ed5977046 100755 --- a/ets2panda/test/parser/ets/launch_super-expected.txt +++ b/ets2panda/test/parser/ets/launch_super-expected.txt @@ -972,112 +972,6 @@ "program": "launch_super.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "launch_super.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "launch_super.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "launch_super.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "launch_super.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "launch_super.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "launch_super.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "launch_super.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "launch_super.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/launch_this_callee-expected.txt b/ets2panda/test/parser/ets/launch_this_callee-expected.txt index 1ac3b4a08723d3c084f2a446c393bad595c8a269..d2570b17627252ca7165aad29979558a328fcb56 100755 --- a/ets2panda/test/parser/ets/launch_this_callee-expected.txt +++ b/ets2panda/test/parser/ets/launch_this_callee-expected.txt @@ -2168,112 +2168,6 @@ "program": "launch_this_callee.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "launch_this_callee.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "launch_this_callee.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "launch_this_callee.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "launch_this_callee.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "launch_this_callee.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "launch_this_callee.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "launch_this_callee.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "launch_this_callee.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/launch_with_call_expression-expected.txt b/ets2panda/test/parser/ets/launch_with_call_expression-expected.txt index 0e55c3cd27906da8a53954acc2135d2c9ec9a776..4ab5a25a85a6eee4f6e147c3afc7e65e96149966 100644 --- a/ets2panda/test/parser/ets/launch_with_call_expression-expected.txt +++ b/ets2panda/test/parser/ets/launch_with_call_expression-expected.txt @@ -391,310 +391,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "res", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "launch_with_call_expression.ets" - }, - "end": { - "line": 21, - "column": 8, - "program": "launch_with_call_expression.ets" - } - } - }, - "right": { - "type": "CallExpression", - "callee": { - "type": "Identifier", - "name": "launch", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 11, - "program": "launch_with_call_expression.ets" - }, - "end": { - "line": 21, - "column": 17, - "program": "launch_with_call_expression.ets" - } - } - }, - "arguments": [ - { - "type": "MemberExpression", - "object": { - "type": "Identifier", - "name": "C", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 36, - "program": "launch_with_call_expression.ets" - }, - "end": { - "line": 21, - "column": 37, - "program": "launch_with_call_expression.ets" - } - } - }, - "property": { - "type": "Identifier", - "name": "foo", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 38, - "program": "launch_with_call_expression.ets" - }, - "end": { - "line": 21, - "column": 41, - "program": "launch_with_call_expression.ets" - } - } - }, - "computed": false, - "optional": false, - "loc": { - "start": { - "line": 21, - "column": 36, - "program": "launch_with_call_expression.ets" - }, - "end": { - "line": 21, - "column": 41, - "program": "launch_with_call_expression.ets" - } - } - } - ], - "optional": false, - "typeParameters": { - "type": "TSTypeParameterInstantiation", - "params": [ - { - "type": "ETSPrimitiveType", - "loc": { - "start": { - "line": 21, - "column": 18, - "program": "launch_with_call_expression.ets" - }, - "end": { - "line": 21, - "column": 22, - "program": "launch_with_call_expression.ets" - } - } - }, - { - "type": "ETSFunctionType", - "params": [], - "returnType": { - "type": "ETSPrimitiveType", - "loc": { - "start": { - "line": 21, - "column": 30, - "program": "launch_with_call_expression.ets" - }, - "end": { - "line": 21, - "column": 34, - "program": "launch_with_call_expression.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 24, - "program": "launch_with_call_expression.ets" - }, - "end": { - "line": 21, - "column": 34, - "program": "launch_with_call_expression.ets" - } - } - } - ], - "loc": { - "start": { - "line": 21, - "column": 17, - "program": "launch_with_call_expression.ets" - }, - "end": { - "line": 21, - "column": 35, - "program": "launch_with_call_expression.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 11, - "program": "launch_with_call_expression.ets" - }, - "end": { - "line": 21, - "column": 42, - "program": "launch_with_call_expression.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "launch_with_call_expression.ets" - }, - "end": { - "line": 21, - "column": 42, - "program": "launch_with_call_expression.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "launch_with_call_expression.ets" - }, - "end": { - "line": 21, - "column": 42, - "program": "launch_with_call_expression.ets" - } - } - } - ], - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "launch_with_call_expression.ets" - }, - "end": { - "line": 21, - "column": 42, - "program": "launch_with_call_expression.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "launch_with_call_expression.ets" - }, - "end": { - "line": 21, - "column": 42, - "program": "launch_with_call_expression.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "launch_with_call_expression.ets" - }, - "end": { - "line": 21, - "column": 42, - "program": "launch_with_call_expression.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "launch_with_call_expression.ets" - }, - "end": { - "line": 21, - "column": 42, - "program": "launch_with_call_expression.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -825,13 +521,13 @@ }, "loc": { "start": { - "line": 1, - "column": 1, + "line": 21, + "column": 24, "program": "launch_with_call_expression.ets" }, "end": { - "line": 1, - "column": 1, + "line": 21, + "column": 34, "program": "launch_with_call_expression.ets" } } diff --git a/ets2panda/test/parser/ets/literals-expected.txt b/ets2panda/test/parser/ets/literals-expected.txt index 080be2aefb44adf85841a1d9a39a0c1b34644dd6..27a83b54c8e8e7c0a4fdd1d3072aab550e16b9c5 100644 --- a/ets2panda/test/parser/ets/literals-expected.txt +++ b/ets2panda/test/parser/ets/literals-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "literals.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "literals.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "literals.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "literals.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "literals.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "literals.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "literals.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "literals.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/main_entry_point_1-expected.txt b/ets2panda/test/parser/ets/main_entry_point_1-expected.txt index 4d5a07a4a6c6b1ba3c25e6e7979dd9fc02cf0cec..bafd675769dea57af4f2c28da859b0b4f3816e16 100644 --- a/ets2panda/test/parser/ets/main_entry_point_1-expected.txt +++ b/ets2panda/test/parser/ets/main_entry_point_1-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "main_entry_point_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "main_entry_point_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "main_entry_point_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "main_entry_point_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "main_entry_point_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "main_entry_point_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "main_entry_point_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "main_entry_point_1.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/main_entry_point_6-expected.txt b/ets2panda/test/parser/ets/main_entry_point_6-expected.txt index ae300152d7e5f37a5ccdc32ce18c89c9fa591550..6ebcd76182112e75e7462c88aed5a55b93396af0 100644 --- a/ets2panda/test/parser/ets/main_entry_point_6-expected.txt +++ b/ets2panda/test/parser/ets/main_entry_point_6-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "main_entry_point_6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "main_entry_point_6.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "main_entry_point_6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "main_entry_point_6.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "main_entry_point_6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "main_entry_point_6.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "main_entry_point_6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "main_entry_point_6.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/main_entry_point_7-expected.txt b/ets2panda/test/parser/ets/main_entry_point_7-expected.txt index b177e54e5070a928e65db22b48aadf87b750d68d..f3363fa43763a88deffb90ff3323c1ed0d6cc8f3 100644 --- a/ets2panda/test/parser/ets/main_entry_point_7-expected.txt +++ b/ets2panda/test/parser/ets/main_entry_point_7-expected.txt @@ -566,112 +566,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "main_entry_point_7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "main_entry_point_7.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "main_entry_point_7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "main_entry_point_7.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "main_entry_point_7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "main_entry_point_7.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "main_entry_point_7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "main_entry_point_7.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/main_entry_point_8-expected.txt b/ets2panda/test/parser/ets/main_entry_point_8-expected.txt index 756551d4a7b0d7437ca2abcfdeaee730b2606756..58063e2aece7a205eda2000dbaeec9af0f149603 100644 --- a/ets2panda/test/parser/ets/main_entry_point_8-expected.txt +++ b/ets2panda/test/parser/ets/main_entry_point_8-expected.txt @@ -103,112 +103,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "main_entry_point_8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "main_entry_point_8.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "main_entry_point_8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "main_entry_point_8.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "main_entry_point_8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "main_entry_point_8.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "main_entry_point_8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "main_entry_point_8.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/main_entry_point_9-expected.txt b/ets2panda/test/parser/ets/main_entry_point_9-expected.txt index c5ec3248d51647b7b14f6c8aef997a1ec5ceb42a..6400be91ce38b8442bf87a2542173639a8d77f67 100644 --- a/ets2panda/test/parser/ets/main_entry_point_9-expected.txt +++ b/ets2panda/test/parser/ets/main_entry_point_9-expected.txt @@ -167,112 +167,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "main_entry_point_9.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "main_entry_point_9.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "main_entry_point_9.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "main_entry_point_9.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "main_entry_point_9.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "main_entry_point_9.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "main_entry_point_9.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "main_entry_point_9.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/method_empty-expected.txt b/ets2panda/test/parser/ets/method_empty-expected.txt index a8eabac839a512d26f969f6997d92d7af0be09e2..c55d44d3d999ebbfa13f10f2bc9cd4a053a6f35f 100644 --- a/ets2panda/test/parser/ets/method_empty-expected.txt +++ b/ets2panda/test/parser/ets/method_empty-expected.txt @@ -744,112 +744,6 @@ "program": "method_empty.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "method_empty.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "method_empty.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "method_empty.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "method_empty.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "method_empty.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "method_empty.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "method_empty.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "method_empty.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/method_modifier_check_14-expected.txt b/ets2panda/test/parser/ets/method_modifier_check_14-expected.txt index 4c67bf4343faa200cd4ec200212fc36821e74d63..986f5a6efb94c38e0ca9a9b9fc1407a4f6e7fe16 100644 --- a/ets2panda/test/parser/ets/method_modifier_check_14-expected.txt +++ b/ets2panda/test/parser/ets/method_modifier_check_14-expected.txt @@ -389,112 +389,6 @@ "program": "method_modifier_check_14.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "method_modifier_check_14.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "method_modifier_check_14.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "method_modifier_check_14.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "method_modifier_check_14.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "method_modifier_check_14.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "method_modifier_check_14.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "method_modifier_check_14.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "method_modifier_check_14.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/method_modifier_check_8-expected.txt b/ets2panda/test/parser/ets/method_modifier_check_8-expected.txt index 89a21d70b5e213e90a3fbf11eebc15fb63eeb21f..0771bd6f83cb25b2aab028d260ffc166ca7c53c1 100644 --- a/ets2panda/test/parser/ets/method_modifier_check_8-expected.txt +++ b/ets2panda/test/parser/ets/method_modifier_check_8-expected.txt @@ -389,112 +389,6 @@ "program": "method_modifier_check_8.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "method_modifier_check_8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "method_modifier_check_8.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "method_modifier_check_8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "method_modifier_check_8.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "method_modifier_check_8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "method_modifier_check_8.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "method_modifier_check_8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "method_modifier_check_8.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/native_function_with_return_type-expected.txt b/ets2panda/test/parser/ets/native_function_with_return_type-expected.txt index d725fa573773763295b826476c29318a1018b597..1c7308b1d944849bc07cdf81e965f69b93f38c20 100644 --- a/ets2panda/test/parser/ets/native_function_with_return_type-expected.txt +++ b/ets2panda/test/parser/ets/native_function_with_return_type-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "native_function_with_return_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "native_function_with_return_type.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "native_function_with_return_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "native_function_with_return_type.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "native_function_with_return_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "native_function_with_return_type.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "native_function_with_return_type.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "native_function_with_return_type.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/new_expressions-expected.txt b/ets2panda/test/parser/ets/new_expressions-expected.txt index 3117aed4ab3d400cf2271e61b205ed3100c2817b..87194561f4513422ab8a784e65032396bb252990 100644 --- a/ets2panda/test/parser/ets/new_expressions-expected.txt +++ b/ets2panda/test/parser/ets/new_expressions-expected.txt @@ -180,112 +180,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "new_expressions.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "new_expressions.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "new_expressions.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "new_expressions.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "new_expressions.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "new_expressions.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "new_expressions.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "new_expressions.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/new_object_3-expected.txt b/ets2panda/test/parser/ets/new_object_3-expected.txt index 114a616ad301f4aacf76099f109bd83a0909c4ce..26c8d20ce6ce17c8e83d2cfb49ccc5441cd909b6 100644 --- a/ets2panda/test/parser/ets/new_object_3-expected.txt +++ b/ets2panda/test/parser/ets/new_object_3-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "new_object_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "new_object_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "new_object_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "new_object_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "new_object_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "new_object_3.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "new_object_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "new_object_3.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/null-expected.txt b/ets2panda/test/parser/ets/null-expected.txt index 6eeafa544d608c76177d84bfc0d073c9fa039845..5b72c58459800d133666030e2dab0eaa51fbc7f7 100644 --- a/ets2panda/test/parser/ets/null-expected.txt +++ b/ets2panda/test/parser/ets/null-expected.txt @@ -179,288 +179,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "null.ets" - }, - "end": { - "line": 18, - "column": 6, - "program": "null.ets" - } - } - }, - "right": { - "type": "NullLiteral", - "value": null, - "loc": { - "start": { - "line": 18, - "column": 22, - "program": "null.ets" - }, - "end": { - "line": 18, - "column": 26, - "program": "null.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "null.ets" - }, - "end": { - "line": 18, - "column": 26, - "program": "null.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "null.ets" - }, - "end": { - "line": 18, - "column": 26, - "program": "null.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "c", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "null.ets" - }, - "end": { - "line": 19, - "column": 6, - "program": "null.ets" - } - } - }, - "right": { - "type": "ETSNewClassInstanceExpression", - "typeReference": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "cls", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 19, - "program": "null.ets" - }, - "end": { - "line": 19, - "column": 22, - "program": "null.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 19, - "program": "null.ets" - }, - "end": { - "line": 19, - "column": 22, - "program": "null.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 19, - "program": "null.ets" - }, - "end": { - "line": 19, - "column": 22, - "program": "null.ets" - } - } - }, - "arguments": [], - "loc": { - "start": { - "line": 19, - "column": 15, - "program": "null.ets" - }, - "end": { - "line": 19, - "column": 25, - "program": "null.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "null.ets" - }, - "end": { - "line": 19, - "column": 25, - "program": "null.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "null.ets" - }, - "end": { - "line": 19, - "column": 25, - "program": "null.ets" - } - } - } - ], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "null.ets" - }, - "end": { - "line": 19, - "column": 25, - "program": "null.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "null.ets" - }, - "end": { - "line": 19, - "column": 25, - "program": "null.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "null.ets" - }, - "end": { - "line": 19, - "column": 25, - "program": "null.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "null.ets" - }, - "end": { - "line": 19, - "column": 25, - "program": "null.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -575,7 +293,7 @@ }, "end": { "line": 18, - "column": 26, + "column": 22, "program": "null.ets" } } @@ -662,7 +380,7 @@ }, "end": { "line": 19, - "column": 25, + "column": 15, "program": "null.ets" } } diff --git a/ets2panda/test/parser/ets/null_valid-expected.txt b/ets2panda/test/parser/ets/null_valid-expected.txt index f9093189af3ef57faa02d52f41c634a7d4a04bf1..842c136f066c2255578ac52bff7f0e2f700ade76 100644 --- a/ets2panda/test/parser/ets/null_valid-expected.txt +++ b/ets2panda/test/parser/ets/null_valid-expected.txt @@ -130,178 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "o", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "null_valid.ets" - }, - "end": { - "line": 17, - "column": 6, - "program": "null_valid.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "n", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 25, - "program": "null_valid.ets" - }, - "end": { - "line": 17, - "column": 26, - "program": "null_valid.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "null_valid.ets" - }, - "end": { - "line": 17, - "column": 26, - "program": "null_valid.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "null_valid.ets" - }, - "end": { - "line": 17, - "column": 26, - "program": "null_valid.ets" - } - } - } - ], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "null_valid.ets" - }, - "end": { - "line": 17, - "column": 26, - "program": "null_valid.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "null_valid.ets" - }, - "end": { - "line": 17, - "column": 26, - "program": "null_valid.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "null_valid.ets" - }, - "end": { - "line": 17, - "column": 26, - "program": "null_valid.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "null_valid.ets" - }, - "end": { - "line": 17, - "column": 26, - "program": "null_valid.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -472,7 +300,7 @@ }, "end": { "line": 17, - "column": 26, + "column": 25, "program": "null_valid.ets" } } diff --git a/ets2panda/test/parser/ets/nullableGenericSignature-expected.txt b/ets2panda/test/parser/ets/nullableGenericSignature-expected.txt index 3e9cf6890010be5148103951e79d56b973012011..4bd4e0d02295d486e92da620d904cad5b741ab75 100644 --- a/ets2panda/test/parser/ets/nullableGenericSignature-expected.txt +++ b/ets2panda/test/parser/ets/nullableGenericSignature-expected.txt @@ -959,112 +959,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "nullableGenericSignature.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "nullableGenericSignature.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "nullableGenericSignature.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "nullableGenericSignature.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "nullableGenericSignature.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "nullableGenericSignature.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "nullableGenericSignature.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "nullableGenericSignature.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/nullable_union_array-expected.txt b/ets2panda/test/parser/ets/nullable_union_array-expected.txt index 284320e7ef5a4547d1fdcc8127b68b1ed59c950a..6a5118592bbbe2de994889545fac0b15c7351526 100644 --- a/ets2panda/test/parser/ets/nullable_union_array-expected.txt +++ b/ets2panda/test/parser/ets/nullable_union_array-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "nullable_union_array.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "nullable_union_array.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "nullable_union_array.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "nullable_union_array.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "nullable_union_array.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "nullable_union_array.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "nullable_union_array.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "nullable_union_array.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/object-expected.txt b/ets2panda/test/parser/ets/object-expected.txt index 9b546f2a1de0b7923a42bde704f3fed6ce11196a..f8eceedfed3eeafa0ca8744ec1af6832a7ce9297 100644 --- a/ets2panda/test/parser/ets/object-expected.txt +++ b/ets2panda/test/parser/ets/object-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "object.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "object.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "object.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "object.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "object.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "object.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "object.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "object.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/optional_field_class-expected.txt b/ets2panda/test/parser/ets/optional_field_class-expected.txt index 7269fb0492200f5e47a4f4457f31d4ccc11ade0f..b1271093178b2eed5df12360ae21badd5aea075a 100644 --- a/ets2panda/test/parser/ets/optional_field_class-expected.txt +++ b/ets2panda/test/parser/ets/optional_field_class-expected.txt @@ -522,112 +522,6 @@ "program": "optional_field_class.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "optional_field_class.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "optional_field_class.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "optional_field_class.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "optional_field_class.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "optional_field_class.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "optional_field_class.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "optional_field_class.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "optional_field_class.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/optional_field_interface-expected.txt b/ets2panda/test/parser/ets/optional_field_interface-expected.txt index 259cbc86cca119c0ef12e35ea19a585b9ae6b015..635b1b1807500b8f2e95449d59fb50be0f697a86 100644 --- a/ets2panda/test/parser/ets/optional_field_interface-expected.txt +++ b/ets2panda/test/parser/ets/optional_field_interface-expected.txt @@ -1455,112 +1455,6 @@ "program": "optional_field_interface.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "optional_field_interface.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "optional_field_interface.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "optional_field_interface.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "optional_field_interface.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "optional_field_interface.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "optional_field_interface.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "optional_field_interface.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "optional_field_interface.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/optional_field_interfaceUnion-expected.txt b/ets2panda/test/parser/ets/optional_field_interfaceUnion-expected.txt index eecddeb005f62b3ac7e0aafaa61b58d63c9c733c..5ce81204898b98eee044a3706df358e38463a233 100644 --- a/ets2panda/test/parser/ets/optional_field_interfaceUnion-expected.txt +++ b/ets2panda/test/parser/ets/optional_field_interfaceUnion-expected.txt @@ -1818,112 +1818,6 @@ "program": "optional_field_interfaceUnion.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "optional_field_interfaceUnion.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "optional_field_interfaceUnion.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "optional_field_interfaceUnion.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "optional_field_interfaceUnion.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "optional_field_interfaceUnion.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "optional_field_interfaceUnion.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "optional_field_interfaceUnion.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "optional_field_interfaceUnion.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/optional_union_paramter-expected.txt b/ets2panda/test/parser/ets/optional_union_paramter-expected.txt index 7033f89955b506107dc1f8a5c6a06769eebcf13a..43a4156b16889ddd1e7c4741ff1ead18090ab916 100644 --- a/ets2panda/test/parser/ets/optional_union_paramter-expected.txt +++ b/ets2panda/test/parser/ets/optional_union_paramter-expected.txt @@ -820,112 +820,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "optional_union_paramter.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "optional_union_paramter.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "optional_union_paramter.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "optional_union_paramter.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "optional_union_paramter.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "optional_union_paramter.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "optional_union_paramter.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "optional_union_paramter.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/override-expected.txt b/ets2panda/test/parser/ets/override-expected.txt index 8031f12c82a118efefcead150f895fedec6bbdbc..d595b281449dc21edf1ebbc252a78786f36bc688 100644 --- a/ets2panda/test/parser/ets/override-expected.txt +++ b/ets2panda/test/parser/ets/override-expected.txt @@ -1536,112 +1536,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "override.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "override.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/overrideStaticFunc-expected.txt b/ets2panda/test/parser/ets/overrideStaticFunc-expected.txt index a739c85984f33c18f54a119fb3f822b577db3962..9ecf817040179dbc55e31b17be1983d159d724e2 100644 --- a/ets2panda/test/parser/ets/overrideStaticFunc-expected.txt +++ b/ets2panda/test/parser/ets/overrideStaticFunc-expected.txt @@ -898,112 +898,6 @@ "program": "overrideStaticFunc.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "overrideStaticFunc.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "overrideStaticFunc.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "overrideStaticFunc.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "overrideStaticFunc.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "overrideStaticFunc.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "overrideStaticFunc.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "overrideStaticFunc.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "overrideStaticFunc.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/parentheses_expression_value-expected.txt b/ets2panda/test/parser/ets/parentheses_expression_value-expected.txt index 0f165ffb93e070580d052f5249c74fd804bb1910..640592877099715fca4353f48ca413afc35b388e 100644 --- a/ets2panda/test/parser/ets/parentheses_expression_value-expected.txt +++ b/ets2panda/test/parser/ets/parentheses_expression_value-expected.txt @@ -24,370 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "parentheses_expression_value.ets" - }, - "end": { - "line": 17, - "column": 6, - "program": "parentheses_expression_value.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 5, - "loc": { - "start": { - "line": 17, - "column": 9, - "program": "parentheses_expression_value.ets" - }, - "end": { - "line": 17, - "column": 10, - "program": "parentheses_expression_value.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "parentheses_expression_value.ets" - }, - "end": { - "line": 17, - "column": 10, - "program": "parentheses_expression_value.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "parentheses_expression_value.ets" - }, - "end": { - "line": 17, - "column": 10, - "program": "parentheses_expression_value.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "parentheses_expression_value.ets" - }, - "end": { - "line": 18, - "column": 6, - "program": "parentheses_expression_value.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 5, - "loc": { - "start": { - "line": 18, - "column": 9, - "program": "parentheses_expression_value.ets" - }, - "end": { - "line": 18, - "column": 12, - "program": "parentheses_expression_value.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "parentheses_expression_value.ets" - }, - "end": { - "line": 18, - "column": 12, - "program": "parentheses_expression_value.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "parentheses_expression_value.ets" - }, - "end": { - "line": 18, - "column": 12, - "program": "parentheses_expression_value.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "c", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "parentheses_expression_value.ets" - }, - "end": { - "line": 19, - "column": 6, - "program": "parentheses_expression_value.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 5, - "loc": { - "start": { - "line": 19, - "column": 9, - "program": "parentheses_expression_value.ets" - }, - "end": { - "line": 19, - "column": 14, - "program": "parentheses_expression_value.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "parentheses_expression_value.ets" - }, - "end": { - "line": 19, - "column": 14, - "program": "parentheses_expression_value.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "parentheses_expression_value.ets" - }, - "end": { - "line": 19, - "column": 14, - "program": "parentheses_expression_value.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "d", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "parentheses_expression_value.ets" - }, - "end": { - "line": 20, - "column": 6, - "program": "parentheses_expression_value.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "b", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 9, - "program": "parentheses_expression_value.ets" - }, - "end": { - "line": 20, - "column": 12, - "program": "parentheses_expression_value.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "parentheses_expression_value.ets" - }, - "end": { - "line": 20, - "column": 12, - "program": "parentheses_expression_value.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "parentheses_expression_value.ets" - }, - "end": { - "line": 20, - "column": 12, - "program": "parentheses_expression_value.ets" - } - } - } - ], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "parentheses_expression_value.ets" - }, - "end": { - "line": 20, - "column": 12, - "program": "parentheses_expression_value.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "parentheses_expression_value.ets" - }, - "end": { - "line": 20, - "column": 12, - "program": "parentheses_expression_value.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "parentheses_expression_value.ets" - }, - "end": { - "line": 20, - "column": 12, - "program": "parentheses_expression_value.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "parentheses_expression_value.ets" - }, - "end": { - "line": 20, - "column": 12, - "program": "parentheses_expression_value.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/predefined_types-expected.txt b/ets2panda/test/parser/ets/predefined_types-expected.txt index b3365f114b02b19c4041382d2096dbaf0febcb92..ca20e82b471c3121a95147d214ad9ef35b98e246 100644 --- a/ets2panda/test/parser/ets/predefined_types-expected.txt +++ b/ets2panda/test/parser/ets/predefined_types-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "predefined_types.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "predefined_types.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "predefined_types.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "predefined_types.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "predefined_types.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "predefined_types.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "predefined_types.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "predefined_types.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/promiseCasting-expected.txt b/ets2panda/test/parser/ets/promiseCasting-expected.txt index 7a91f82bd68923cc7184a5769f69cd073d239283..183f8f99449addad0d12aeffde7c373bcc9e8575 100644 --- a/ets2panda/test/parser/ets/promiseCasting-expected.txt +++ b/ets2panda/test/parser/ets/promiseCasting-expected.txt @@ -299,177 +299,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "fs", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "promiseCasting.ets" - }, - "end": { - "line": 21, - "column": 7, - "program": "promiseCasting.ets" - } - } - }, - "right": { - "type": "ArrayExpression", - "elements": [], - "loc": { - "start": { - "line": 21, - "column": 16, - "program": "promiseCasting.ets" - }, - "end": { - "line": 21, - "column": 18, - "program": "promiseCasting.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "promiseCasting.ets" - }, - "end": { - "line": 21, - "column": 18, - "program": "promiseCasting.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "promiseCasting.ets" - }, - "end": { - "line": 21, - "column": 18, - "program": "promiseCasting.ets" - } - } - } - ], - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "promiseCasting.ets" - }, - "end": { - "line": 21, - "column": 18, - "program": "promiseCasting.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "promiseCasting.ets" - }, - "end": { - "line": 21, - "column": 18, - "program": "promiseCasting.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "promiseCasting.ets" - }, - "end": { - "line": 21, - "column": 18, - "program": "promiseCasting.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "promiseCasting.ets" - }, - "end": { - "line": 21, - "column": 18, - "program": "promiseCasting.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -616,7 +445,7 @@ }, "end": { "line": 21, - "column": 18, + "column": 16, "program": "promiseCasting.ets" } } diff --git a/ets2panda/test/parser/ets/proxyVoidGeneration-expected.txt b/ets2panda/test/parser/ets/proxyVoidGeneration-expected.txt index 5951db822b51a1904180f3e4075e0cfa80b7aadd..b872cb1c1aa17eed0132bb4b8429aaeadc520889 100644 --- a/ets2panda/test/parser/ets/proxyVoidGeneration-expected.txt +++ b/ets2panda/test/parser/ets/proxyVoidGeneration-expected.txt @@ -1238,112 +1238,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "proxyVoidGeneration.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "proxyVoidGeneration.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "proxyVoidGeneration.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "proxyVoidGeneration.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "proxyVoidGeneration.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "proxyVoidGeneration.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "proxyVoidGeneration.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "proxyVoidGeneration.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/proxy_method-expected.txt b/ets2panda/test/parser/ets/proxy_method-expected.txt index 53ab7e7d040a40103f71905bdeb92ebd77d733f0..1026a8b67b66cc944012ed7b4080719e9984183a 100644 --- a/ets2panda/test/parser/ets/proxy_method-expected.txt +++ b/ets2panda/test/parser/ets/proxy_method-expected.txt @@ -730,112 +730,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "proxy_method.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "proxy_method.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "proxy_method.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "proxy_method.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "proxy_method.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "proxy_method.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "proxy_method.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "proxy_method.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/re_export/diamond/A-expected.txt b/ets2panda/test/parser/ets/re_export/diamond/A-expected.txt index ce40b8d6429ad7365886c5b2c3bf4156419c34fd..4f31fed006c7157e9b344af268f44b1d536005c3 100644 --- a/ets2panda/test/parser/ets/re_export/diamond/A-expected.txt +++ b/ets2panda/test/parser/ets/re_export/diamond/A-expected.txt @@ -130,177 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "foo", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "A.ets" - }, - "end": { - "line": 16, - "column": 15, - "program": "A.ets" - } - } - }, - "right": { - "type": "StringLiteral", - "value": "AAA", - "loc": { - "start": { - "line": 16, - "column": 26, - "program": "A.ets" - }, - "end": { - "line": 16, - "column": 31, - "program": "A.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "A.ets" - }, - "end": { - "line": 16, - "column": 31, - "program": "A.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "A.ets" - }, - "end": { - "line": 16, - "column": 31, - "program": "A.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "A.ets" - }, - "end": { - "line": 16, - "column": 31, - "program": "A.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "A.ets" - }, - "end": { - "line": 16, - "column": 31, - "program": "A.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "A.ets" - }, - "end": { - "line": 16, - "column": 31, - "program": "A.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 12, - "program": "A.ets" - }, - "end": { - "line": 16, - "column": 31, - "program": "A.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -383,7 +212,7 @@ }, "end": { "line": 16, - "column": 31, + "column": 26, "program": "A.ets" } } diff --git a/ets2panda/test/parser/ets/re_export/diamond/B-expected.txt b/ets2panda/test/parser/ets/re_export/diamond/B-expected.txt index 24713712a1f95a57c2ffad2445e70f9dde3d767e..91b075678e291df895c6bf88ee3451c3a8739bb7 100644 --- a/ets2panda/test/parser/ets/re_export/diamond/B-expected.txt +++ b/ets2panda/test/parser/ets/re_export/diamond/B-expected.txt @@ -226,112 +226,6 @@ "program": "B.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "B.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "B.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "B.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "B.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "B.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "B.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "B.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "B.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/re_export/diamond/B2-expected.txt b/ets2panda/test/parser/ets/re_export/diamond/B2-expected.txt index 170b501699dd0914db6810cc7c55b1de451b931e..26bc3efaa2821532481d914b764f80b2f26ace1e 100644 --- a/ets2panda/test/parser/ets/re_export/diamond/B2-expected.txt +++ b/ets2panda/test/parser/ets/re_export/diamond/B2-expected.txt @@ -226,112 +226,6 @@ "program": "B2.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "B2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "B2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "B2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "B2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "B2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "B2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "B2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "B2.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/re_export/diamond/C-expected.txt b/ets2panda/test/parser/ets/re_export/diamond/C-expected.txt index 8f29d8d90e0e591f7ea8517e23959d0a84d00664..9afc61f3dd7206fee271a23e1d45d9cd940b5762 100644 --- a/ets2panda/test/parser/ets/re_export/diamond/C-expected.txt +++ b/ets2panda/test/parser/ets/re_export/diamond/C-expected.txt @@ -226,112 +226,6 @@ "program": "C.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "C.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "C.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "C.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "C.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "C.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "C.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "C.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "C.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/re_export/diamond/C2-expected.txt b/ets2panda/test/parser/ets/re_export/diamond/C2-expected.txt index 8b7e3421bcae8cc831818bc0063bcd06dadf6142..c357910a823005b2aad9ea3ba71f8a70244e09b5 100644 --- a/ets2panda/test/parser/ets/re_export/diamond/C2-expected.txt +++ b/ets2panda/test/parser/ets/re_export/diamond/C2-expected.txt @@ -226,112 +226,6 @@ "program": "C2.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "C2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "C2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "C2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "C2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "C2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "C2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "C2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "C2.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/re_export/diamond/D-expected.txt b/ets2panda/test/parser/ets/re_export/diamond/D-expected.txt index 6f5a5dd555396b47702203802319c82cb8c7f0a6..8b1496f9743f7b53fe3430f981ba084c491af8c1 100644 --- a/ets2panda/test/parser/ets/re_export/diamond/D-expected.txt +++ b/ets2panda/test/parser/ets/re_export/diamond/D-expected.txt @@ -154,112 +154,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "D.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "D.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "D.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "D.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "D.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "D.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "D.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "D.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/re_export/diamond/D2-expected.txt b/ets2panda/test/parser/ets/re_export/diamond/D2-expected.txt index cb0d70915ce63f450d16e08f2bc89f4bdacc05e8..093b4662e7c48891b592fd43d3d424524486acf7 100644 --- a/ets2panda/test/parser/ets/re_export/diamond/D2-expected.txt +++ b/ets2panda/test/parser/ets/re_export/diamond/D2-expected.txt @@ -154,112 +154,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "D2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "D2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "D2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "D2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "D2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "D2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "D2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "D2.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/re_export/export-expected.txt b/ets2panda/test/parser/ets/re_export/export-expected.txt index d218cf7bf7594e936f8f78cb6aaab3f85df6f2df..114d87e8972f045f8d386ddd648d090d75c172c8 100644 --- a/ets2panda/test/parser/ets/re_export/export-expected.txt +++ b/ets2panda/test/parser/ets/re_export/export-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "export.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "export.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "export.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "export.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "export.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "export.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "export.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "export.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/re_export/export_2-expected.txt b/ets2panda/test/parser/ets/re_export/export_2-expected.txt index cafb9dafffdc9a5d9bc1184ba2dc5484796ff6bb..67d328167072dd3a2560cfc9434a53ce5291397b 100644 --- a/ets2panda/test/parser/ets/re_export/export_2-expected.txt +++ b/ets2panda/test/parser/ets/re_export/export_2-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "export_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "export_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "export_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "export_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "export_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "export_2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "export_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "export_2.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/re_export/export_3-expected.txt b/ets2panda/test/parser/ets/re_export/export_3-expected.txt index de4fbdc68df939a991a6da987b3638bba15d596a..b30a8e409c81c9c1322244d4ef9261bc6d4284c8 100644 --- a/ets2panda/test/parser/ets/re_export/export_3-expected.txt +++ b/ets2panda/test/parser/ets/re_export/export_3-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "export_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "export_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "export_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "export_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "export_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "export_3.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "export_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "export_3.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/re_export/folder/export-expected.txt b/ets2panda/test/parser/ets/re_export/folder/export-expected.txt index d218cf7bf7594e936f8f78cb6aaab3f85df6f2df..114d87e8972f045f8d386ddd648d090d75c172c8 100644 --- a/ets2panda/test/parser/ets/re_export/folder/export-expected.txt +++ b/ets2panda/test/parser/ets/re_export/folder/export-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "export.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "export.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "export.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "export.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "export.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "export.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "export.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "export.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/re_export/folder/folder2/export-expected.txt b/ets2panda/test/parser/ets/re_export/folder/folder2/export-expected.txt index d218cf7bf7594e936f8f78cb6aaab3f85df6f2df..114d87e8972f045f8d386ddd648d090d75c172c8 100644 --- a/ets2panda/test/parser/ets/re_export/folder/folder2/export-expected.txt +++ b/ets2panda/test/parser/ets/re_export/folder/folder2/export-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "export.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "export.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "export.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "export.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "export.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "export.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "export.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "export.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/re_export/folder/re_export_6-expected.txt b/ets2panda/test/parser/ets/re_export/folder/re_export_6-expected.txt index 042a982b661cebfdfa5038637fab284b877f3822..72671dd84c7bd4a3c34e263f56569bafedfe9b11 100644 --- a/ets2panda/test/parser/ets/re_export/folder/re_export_6-expected.txt +++ b/ets2panda/test/parser/ets/re_export/folder/re_export_6-expected.txt @@ -209,112 +209,6 @@ "program": "re_export_6.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_6.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_6.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_6.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_6.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/re_export/folder/re_export_7-expected.txt b/ets2panda/test/parser/ets/re_export/folder/re_export_7-expected.txt index 6bc6c8229c25f3f81b2f3e035a67a2da16140aac..82c95dd007a68df1598a0687c9c3ed7be70effb9 100644 --- a/ets2panda/test/parser/ets/re_export/folder/re_export_7-expected.txt +++ b/ets2panda/test/parser/ets/re_export/folder/re_export_7-expected.txt @@ -209,112 +209,6 @@ "program": "re_export_7.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_7.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_7.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_7.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_7.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/re_export/folderIndex/index-expected.txt b/ets2panda/test/parser/ets/re_export/folderIndex/index-expected.txt index f263b06b260aaf0b63fe1d07c9576e9af178fc38..49e8388dda12d70a01d825348bf63086086f066a 100644 --- a/ets2panda/test/parser/ets/re_export/folderIndex/index-expected.txt +++ b/ets2panda/test/parser/ets/re_export/folderIndex/index-expected.txt @@ -226,112 +226,6 @@ "program": "index.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "index.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "index.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "index.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "index.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "index.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "index.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "index.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "index.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/re_export/folderIndex/test-expected.txt b/ets2panda/test/parser/ets/re_export/folderIndex/test-expected.txt index 3cd598a0971f8e9965894b05462e0513048ba320..8f89981654515fe3a867f84276c0ac015d8c8f0a 100644 --- a/ets2panda/test/parser/ets/re_export/folderIndex/test-expected.txt +++ b/ets2panda/test/parser/ets/re_export/folderIndex/test-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/re_export/folderIndex2/index-expected.txt b/ets2panda/test/parser/ets/re_export/folderIndex2/index-expected.txt index 724113400b76eba9c8bac4da5e76ea6e457a2aae..8c4dbd9cf07857a90ede99d00cc652cd4d411133 100644 --- a/ets2panda/test/parser/ets/re_export/folderIndex2/index-expected.txt +++ b/ets2panda/test/parser/ets/re_export/folderIndex2/index-expected.txt @@ -323,112 +323,6 @@ "program": "index.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "index.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "index.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "index.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "index.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "index.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "index.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "index.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "index.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/re_export/folderIndex2/key-expected.txt b/ets2panda/test/parser/ets/re_export/folderIndex2/key-expected.txt index ad704e60b9afaf7caef10fdc3c123e6ac8a0dc3f..9a1cf5c1ad63b6a4e9c4878679ee6a44573d4dd9 100644 --- a/ets2panda/test/parser/ets/re_export/folderIndex2/key-expected.txt +++ b/ets2panda/test/parser/ets/re_export/folderIndex2/key-expected.txt @@ -645,112 +645,6 @@ "program": "key.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "key.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "key.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "key.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "key.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "key.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "key.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "key.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "key.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/re_export/import-expected.txt b/ets2panda/test/parser/ets/re_export/import-expected.txt index 5fff7bf409fb41c29fb80cd151588e835d01ee5f..f03fac891667c50b96fb50a718c784c1681d310a 100644 --- a/ets2panda/test/parser/ets/re_export/import-expected.txt +++ b/ets2panda/test/parser/ets/re_export/import-expected.txt @@ -89,112 +89,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/re_export/import_10-expected.txt b/ets2panda/test/parser/ets/re_export/import_10-expected.txt index a4098ad70b375c18e9a6a34a0508ffb8c2894e73..d028cca6fc15413935cbd88544cc7ce84ec1bf28 100644 --- a/ets2panda/test/parser/ets/re_export/import_10-expected.txt +++ b/ets2panda/test/parser/ets/re_export/import_10-expected.txt @@ -106,112 +106,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_10.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_10.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_10.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_10.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_10.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_10.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_10.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_10.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/re_export/import_11-expected.txt b/ets2panda/test/parser/ets/re_export/import_11-expected.txt index 30a6ebf358b8ad2649133d95d973ff7a813e902f..b4b7ff6311cd922a15b0f6eb7ff64d6a2f5afef4 100644 --- a/ets2panda/test/parser/ets/re_export/import_11-expected.txt +++ b/ets2panda/test/parser/ets/re_export/import_11-expected.txt @@ -106,112 +106,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_11.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_11.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_11.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_11.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_11.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_11.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_11.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_11.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/re_export/import_12-expected.txt b/ets2panda/test/parser/ets/re_export/import_12-expected.txt index 4388c55b713fa047b510eeef7a54ea0b734014e0..6ce6d66efa995bbfb291e0fb29c8317df086115a 100644 --- a/ets2panda/test/parser/ets/re_export/import_12-expected.txt +++ b/ets2panda/test/parser/ets/re_export/import_12-expected.txt @@ -106,112 +106,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_12.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_12.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_12.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_12.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_12.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_12.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_12.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_12.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/re_export/import_13-expected.txt b/ets2panda/test/parser/ets/re_export/import_13-expected.txt index 4d098558335306401a1384aebed1761bef8e9432..83869b328fbd8e71241d6c034e63d925bd21f5ce 100644 --- a/ets2panda/test/parser/ets/re_export/import_13-expected.txt +++ b/ets2panda/test/parser/ets/re_export/import_13-expected.txt @@ -89,112 +89,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_13.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_13.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_13.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_13.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_13.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_13.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_13.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_13.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/re_export/import_14-expected.txt b/ets2panda/test/parser/ets/re_export/import_14-expected.txt index dbacd9840b38dee273bab37118e1826c23c4af7d..2c06d08a3906cfe471077782eec80ff256157df5 100644 --- a/ets2panda/test/parser/ets/re_export/import_14-expected.txt +++ b/ets2panda/test/parser/ets/re_export/import_14-expected.txt @@ -89,112 +89,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_14.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_14.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_14.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_14.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_14.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_14.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_14.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_14.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/re_export/import_15-expected.txt b/ets2panda/test/parser/ets/re_export/import_15-expected.txt index f13f3a48df89520aa10a340e71753c3ecce12e8f..267b658306a3a80508f25606bef8171c3b8a4523 100644 --- a/ets2panda/test/parser/ets/re_export/import_15-expected.txt +++ b/ets2panda/test/parser/ets/re_export/import_15-expected.txt @@ -89,112 +89,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_15.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_15.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_15.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_15.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_15.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_15.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_15.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_15.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/re_export/import_2-expected.txt b/ets2panda/test/parser/ets/re_export/import_2-expected.txt index 2189edea677c2394ee661970e9b7464046e87d66..0fad370ee2af546f53ba53a0b2742344fa281af5 100644 --- a/ets2panda/test/parser/ets/re_export/import_2-expected.txt +++ b/ets2panda/test/parser/ets/re_export/import_2-expected.txt @@ -89,112 +89,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_2.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/re_export/import_3-expected.txt b/ets2panda/test/parser/ets/re_export/import_3-expected.txt index bf23ed8851d2b62bc9c31490ecdc2bccb2f6383f..679e35cecb9fbd68df53e505b71a182828d59b1f 100644 --- a/ets2panda/test/parser/ets/re_export/import_3-expected.txt +++ b/ets2panda/test/parser/ets/re_export/import_3-expected.txt @@ -106,112 +106,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_3.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_3.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/re_export/import_6-expected.txt b/ets2panda/test/parser/ets/re_export/import_6-expected.txt index 85d2235752732e9fff52e10f5b0ffff27ab15bb4..799cdc863590c5f4068f1eabd3e3ce7b88a44ebb 100644 --- a/ets2panda/test/parser/ets/re_export/import_6-expected.txt +++ b/ets2panda/test/parser/ets/re_export/import_6-expected.txt @@ -89,112 +89,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_6.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_6.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_6.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_6.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/re_export/import_7-expected.txt b/ets2panda/test/parser/ets/re_export/import_7-expected.txt index 7969d5840b2167a7d0aabb56f00f1db32c378c56..d2cf438c5304739980217e6a344840c34ba2be44 100644 --- a/ets2panda/test/parser/ets/re_export/import_7-expected.txt +++ b/ets2panda/test/parser/ets/re_export/import_7-expected.txt @@ -89,112 +89,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_7.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_7.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_7.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_7.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/re_export/import_8-expected.txt b/ets2panda/test/parser/ets/re_export/import_8-expected.txt index def3925024de857a919049cac08736a1bd47b931..aa93142609deb10cfa250acd2b11eab85ea0d544 100644 --- a/ets2panda/test/parser/ets/re_export/import_8-expected.txt +++ b/ets2panda/test/parser/ets/re_export/import_8-expected.txt @@ -89,112 +89,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_8.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_8.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_8.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_8.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/re_export/import_9-expected.txt b/ets2panda/test/parser/ets/re_export/import_9-expected.txt index 86ad70b08d40f0b4a41ea90753595a130fd857f6..9b4e0a3b5e9270dc2e9d432e677ae5a727c50aea 100644 --- a/ets2panda/test/parser/ets/re_export/import_9-expected.txt +++ b/ets2panda/test/parser/ets/re_export/import_9-expected.txt @@ -106,112 +106,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_9.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_9.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_9.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_9.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_9.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_9.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_9.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_9.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/re_export/import_index-expected.txt b/ets2panda/test/parser/ets/re_export/import_index-expected.txt index fda7032574b823dfb5ab1c357d21b962570a6f60..d0c01a4f973971ef5fe9521ea9cf6e78797020ed 100644 --- a/ets2panda/test/parser/ets/re_export/import_index-expected.txt +++ b/ets2panda/test/parser/ets/re_export/import_index-expected.txt @@ -194,196 +194,6 @@ "program": "import_index.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "CallExpression", - "callee": { - "type": "MemberExpression", - "object": { - "type": "Identifier", - "name": "all", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 1, - "program": "import_index.ets" - }, - "end": { - "line": 18, - "column": 4, - "program": "import_index.ets" - } - } - }, - "property": { - "type": "Identifier", - "name": "ad", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "import_index.ets" - }, - "end": { - "line": 18, - "column": 7, - "program": "import_index.ets" - } - } - }, - "computed": false, - "optional": false, - "loc": { - "start": { - "line": 18, - "column": 1, - "program": "import_index.ets" - }, - "end": { - "line": 18, - "column": 7, - "program": "import_index.ets" - } - } - }, - "arguments": [], - "optional": false, - "loc": { - "start": { - "line": 18, - "column": 1, - "program": "import_index.ets" - }, - "end": { - "line": 18, - "column": 9, - "program": "import_index.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 1, - "program": "import_index.ets" - }, - "end": { - "line": 18, - "column": 10, - "program": "import_index.ets" - } - } - } - ], - "loc": { - "start": { - "line": 18, - "column": 1, - "program": "import_index.ets" - }, - "end": { - "line": 18, - "column": 10, - "program": "import_index.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 1, - "program": "import_index.ets" - }, - "end": { - "line": 18, - "column": 10, - "program": "import_index.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 1, - "program": "import_index.ets" - }, - "end": { - "line": 18, - "column": 10, - "program": "import_index.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 1, - "program": "import_index.ets" - }, - "end": { - "line": 18, - "column": 10, - "program": "import_index.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/re_export/import_index_2-expected.txt b/ets2panda/test/parser/ets/re_export/import_index_2-expected.txt index a09cb3c6ef0403e7e27033ca4884c13e013607df..f50ba4cad3ff6f0a783533281f33e9be7fcba161 100644 --- a/ets2panda/test/parser/ets/re_export/import_index_2-expected.txt +++ b/ets2panda/test/parser/ets/re_export/import_index_2-expected.txt @@ -211,162 +211,6 @@ "program": "import_index_2.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "CallExpression", - "callee": { - "type": "Identifier", - "name": "ad", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 1, - "program": "import_index_2.ets" - }, - "end": { - "line": 18, - "column": 3, - "program": "import_index_2.ets" - } - } - }, - "arguments": [], - "optional": false, - "loc": { - "start": { - "line": 18, - "column": 1, - "program": "import_index_2.ets" - }, - "end": { - "line": 18, - "column": 5, - "program": "import_index_2.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 1, - "program": "import_index_2.ets" - }, - "end": { - "line": 18, - "column": 6, - "program": "import_index_2.ets" - } - } - } - ], - "loc": { - "start": { - "line": 18, - "column": 1, - "program": "import_index_2.ets" - }, - "end": { - "line": 18, - "column": 6, - "program": "import_index_2.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 1, - "program": "import_index_2.ets" - }, - "end": { - "line": 18, - "column": 6, - "program": "import_index_2.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 1, - "program": "import_index_2.ets" - }, - "end": { - "line": 18, - "column": 6, - "program": "import_index_2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 1, - "program": "import_index_2.ets" - }, - "end": { - "line": 18, - "column": 6, - "program": "import_index_2.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/re_export/import_index_3-expected.txt b/ets2panda/test/parser/ets/re_export/import_index_3-expected.txt index 9da7e0aad6dc457b5bb263242b2ed60888811c74..6368bbb3d2ec11998c262d41a1b0ccf58d357d6a 100644 --- a/ets2panda/test/parser/ets/re_export/import_index_3-expected.txt +++ b/ets2panda/test/parser/ets/re_export/import_index_3-expected.txt @@ -260,112 +260,6 @@ "program": "import_index_3.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_index_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_index_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_index_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_index_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_index_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_index_3.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_index_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_index_3.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/re_export/re_export-expected.txt b/ets2panda/test/parser/ets/re_export/re_export-expected.txt index 71bf5056c348a22d482a9e3657edb86f9a4b143e..f625a750e0ce32bd2c669c53a7a3c0874b6eb6ab 100644 --- a/ets2panda/test/parser/ets/re_export/re_export-expected.txt +++ b/ets2panda/test/parser/ets/re_export/re_export-expected.txt @@ -209,112 +209,6 @@ "program": "re_export.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/re_export/re_export_10-expected.txt b/ets2panda/test/parser/ets/re_export/re_export_10-expected.txt index b2b3d2ec25d34955f851675dcabebd8c6a68da31..887d4fd5a9694bccac34e5c9bcc99e679a7ec6a7 100644 --- a/ets2panda/test/parser/ets/re_export/re_export_10-expected.txt +++ b/ets2panda/test/parser/ets/re_export/re_export_10-expected.txt @@ -209,112 +209,6 @@ "program": "re_export_10.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_10.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_10.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_10.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_10.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_10.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_10.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_10.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_10.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/re_export/re_export_11-expected.txt b/ets2panda/test/parser/ets/re_export/re_export_11-expected.txt index a3bd5a56a6fe2bdb6ce1b09fa2aba846c8708c5b..9c4c1acfa1c8eba53f20bce18385f1e2ea12b069 100644 --- a/ets2panda/test/parser/ets/re_export/re_export_11-expected.txt +++ b/ets2panda/test/parser/ets/re_export/re_export_11-expected.txt @@ -306,112 +306,6 @@ "program": "re_export_11.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_11.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_11.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_11.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_11.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_11.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_11.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_11.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_11.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/re_export/re_export_12-expected.txt b/ets2panda/test/parser/ets/re_export/re_export_12-expected.txt index 508d6c6cb89837f0077ea103a96ce1d2b3f88977..08ac1bd0f05c6ec51fdb8de5e91841ceff159ae6 100644 --- a/ets2panda/test/parser/ets/re_export/re_export_12-expected.txt +++ b/ets2panda/test/parser/ets/re_export/re_export_12-expected.txt @@ -289,112 +289,6 @@ "program": "re_export_12.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_12.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_12.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_12.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_12.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_12.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_12.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_12.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_12.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/re_export/re_export_2-expected.txt b/ets2panda/test/parser/ets/re_export/re_export_2-expected.txt index c02bbe151393dfc332ca4c0c94fdb996748880d1..f170998306daccc9895199536f5908fcb18fa957 100644 --- a/ets2panda/test/parser/ets/re_export/re_export_2-expected.txt +++ b/ets2panda/test/parser/ets/re_export/re_export_2-expected.txt @@ -226,112 +226,6 @@ "program": "re_export_2.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_2.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/re_export/re_export_3-expected.txt b/ets2panda/test/parser/ets/re_export/re_export_3-expected.txt index 89d249896648e912587fdb630e61f5f0df60cc93..52af379f4bcec267f40c53dab940c183512b8928 100644 --- a/ets2panda/test/parser/ets/re_export/re_export_3-expected.txt +++ b/ets2panda/test/parser/ets/re_export/re_export_3-expected.txt @@ -226,112 +226,6 @@ "program": "re_export_3.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_3.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_3.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/re_export/re_export_4-expected.txt b/ets2panda/test/parser/ets/re_export/re_export_4-expected.txt index 26a9e8d39dd52f8847eb7b37142e939759d9fa9d..5128d6df5ed1b51dd4d2b3cbaeda05fc65cd5ac0 100644 --- a/ets2panda/test/parser/ets/re_export/re_export_4-expected.txt +++ b/ets2panda/test/parser/ets/re_export/re_export_4-expected.txt @@ -323,112 +323,6 @@ "program": "re_export_4.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_4.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_4.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_4.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_4.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/re_export/re_export_5-expected.txt b/ets2panda/test/parser/ets/re_export/re_export_5-expected.txt index ae5f36a093295ba0e80884628911f20b836833f1..8c99f73bc7560ec5482fd45180d178896f10ef28 100644 --- a/ets2panda/test/parser/ets/re_export/re_export_5-expected.txt +++ b/ets2panda/test/parser/ets/re_export/re_export_5-expected.txt @@ -289,112 +289,6 @@ "program": "re_export_5.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_5.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_5.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_5.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_5.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/re_export/re_export_7-expected.txt b/ets2panda/test/parser/ets/re_export/re_export_7-expected.txt index 00959f7fdd0176194e9b66373bc1c84bded299e5..c1a32f8f01df4ab3035825b00f4519d9091dc123 100644 --- a/ets2panda/test/parser/ets/re_export/re_export_7-expected.txt +++ b/ets2panda/test/parser/ets/re_export/re_export_7-expected.txt @@ -306,112 +306,6 @@ "program": "re_export_7.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_7.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_7.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_7.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_7.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/re_export/re_export_8-expected.txt b/ets2panda/test/parser/ets/re_export/re_export_8-expected.txt index 7329e92b7fc7d7bf62bc5a0a464cd069bef0a280..c3e353dba524ac4f73f3b8c0cf82ba0889a65c7c 100644 --- a/ets2panda/test/parser/ets/re_export/re_export_8-expected.txt +++ b/ets2panda/test/parser/ets/re_export/re_export_8-expected.txt @@ -226,112 +226,6 @@ "program": "re_export_8.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_8.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_8.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_8.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_8.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/re_export/re_export_9-expected.txt b/ets2panda/test/parser/ets/re_export/re_export_9-expected.txt index c12d4e3c6d36b61f18a98117d02800e16cfebf09..8a5abd930c4540ef19583e9cd5742a4791380087 100644 --- a/ets2panda/test/parser/ets/re_export/re_export_9-expected.txt +++ b/ets2panda/test/parser/ets/re_export/re_export_9-expected.txt @@ -226,112 +226,6 @@ "program": "re_export_9.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_9.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_9.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_9.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_9.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_9.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_9.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "re_export_9.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "re_export_9.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/regression-target-type-context-expected.txt b/ets2panda/test/parser/ets/regression-target-type-context-expected.txt index c6122a0fa970add2efc83a0a231398388026e3ba..f893b51cb672f8803420d9dd15b44992dcf32f38 100644 --- a/ets2panda/test/parser/ets/regression-target-type-context-expected.txt +++ b/ets2panda/test/parser/ets/regression-target-type-context-expected.txt @@ -1618,112 +1618,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "regression-target-type-context.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "regression-target-type-context.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "regression-target-type-context.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "regression-target-type-context.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "regression-target-type-context.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "regression-target-type-context.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "regression-target-type-context.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "regression-target-type-context.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/rest_parameter_01-expected.txt b/ets2panda/test/parser/ets/rest_parameter_01-expected.txt index c1fc9868684a5985bfd660312b68a0de8331277d..679ea301e1806db12ca32756ad6ca68e21100cf5 100644 --- a/ets2panda/test/parser/ets/rest_parameter_01-expected.txt +++ b/ets2panda/test/parser/ets/rest_parameter_01-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "rest_parameter_01.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "rest_parameter_01.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "rest_parameter_01.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "rest_parameter_01.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "rest_parameter_01.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "rest_parameter_01.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "rest_parameter_01.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "rest_parameter_01.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/rest_parameter_02-expected.txt b/ets2panda/test/parser/ets/rest_parameter_02-expected.txt index 75904393ae830688e70e591e8a44fda44b903911..c8d32910de8ea48ec0c4a7c86ad20c4351a6bca8 100644 --- a/ets2panda/test/parser/ets/rest_parameter_02-expected.txt +++ b/ets2panda/test/parser/ets/rest_parameter_02-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "rest_parameter_02.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "rest_parameter_02.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "rest_parameter_02.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "rest_parameter_02.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "rest_parameter_02.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "rest_parameter_02.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "rest_parameter_02.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "rest_parameter_02.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/return-expected.txt b/ets2panda/test/parser/ets/return-expected.txt index 4c08f545fd0a67ab1df08cbeb32fce7152d3664c..ac2cf79a658f156b50bb70b0d1bbc4e6e5e6fd36 100644 --- a/ets2panda/test/parser/ets/return-expected.txt +++ b/ets2panda/test/parser/ets/return-expected.txt @@ -24,226 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "return.ets" - }, - "end": { - "line": 16, - "column": 6, - "program": "return.ets" - } - } - }, - "right": { - "type": "ArrayExpression", - "elements": [ - { - "type": "NumberLiteral", - "value": 1, - "loc": { - "start": { - "line": 16, - "column": 17, - "program": "return.ets" - }, - "end": { - "line": 16, - "column": 18, - "program": "return.ets" - } - } - }, - { - "type": "NumberLiteral", - "value": 2, - "loc": { - "start": { - "line": 16, - "column": 20, - "program": "return.ets" - }, - "end": { - "line": 16, - "column": 21, - "program": "return.ets" - } - } - }, - { - "type": "NumberLiteral", - "value": 3, - "loc": { - "start": { - "line": 16, - "column": 23, - "program": "return.ets" - }, - "end": { - "line": 16, - "column": 24, - "program": "return.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 16, - "program": "return.ets" - }, - "end": { - "line": 16, - "column": 25, - "program": "return.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "return.ets" - }, - "end": { - "line": 16, - "column": 25, - "program": "return.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "return.ets" - }, - "end": { - "line": 16, - "column": 25, - "program": "return.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "return.ets" - }, - "end": { - "line": 16, - "column": 25, - "program": "return.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "return.ets" - }, - "end": { - "line": 16, - "column": 25, - "program": "return.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "return.ets" - }, - "end": { - "line": 16, - "column": 25, - "program": "return.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "return.ets" - }, - "end": { - "line": 16, - "column": 25, - "program": "return.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -358,7 +138,7 @@ }, "end": { "line": 16, - "column": 25, + "column": 16, "program": "return.ets" } } diff --git a/ets2panda/test/parser/ets/returnNullableFromFunction-expected.txt b/ets2panda/test/parser/ets/returnNullableFromFunction-expected.txt index b3d70cafe6b48c52d8b654ab24ae2d67321f9b32..0118b9d5b7bf7a88e30816384fcd165c185c4af2 100644 --- a/ets2panda/test/parser/ets/returnNullableFromFunction-expected.txt +++ b/ets2panda/test/parser/ets/returnNullableFromFunction-expected.txt @@ -285,112 +285,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "returnNullableFromFunction.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "returnNullableFromFunction.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "returnNullableFromFunction.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "returnNullableFromFunction.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "returnNullableFromFunction.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "returnNullableFromFunction.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "returnNullableFromFunction.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "returnNullableFromFunction.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/returnNullableFromMethod-expected.txt b/ets2panda/test/parser/ets/returnNullableFromMethod-expected.txt index ecf7fce930d061128949b774699b3f5a665f5f59..fbf400c093581eabf447e2968b0251b4dc4463eb 100644 --- a/ets2panda/test/parser/ets/returnNullableFromMethod-expected.txt +++ b/ets2panda/test/parser/ets/returnNullableFromMethod-expected.txt @@ -662,112 +662,6 @@ "program": "returnNullableFromMethod.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "returnNullableFromMethod.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "returnNullableFromMethod.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "returnNullableFromMethod.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "returnNullableFromMethod.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "returnNullableFromMethod.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "returnNullableFromMethod.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "returnNullableFromMethod.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "returnNullableFromMethod.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/scoped_decl-expected.txt b/ets2panda/test/parser/ets/scoped_decl-expected.txt index 1b84b749f114969c754ee73f4e910ed15d7cadde..eed121c9c666c7fe858898972d1dc18a65447e50 100644 --- a/ets2panda/test/parser/ets/scoped_decl-expected.txt +++ b/ets2panda/test/parser/ets/scoped_decl-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "scoped_decl.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "scoped_decl.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "scoped_decl.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "scoped_decl.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "scoped_decl.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "scoped_decl.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "scoped_decl.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "scoped_decl.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/selective_export/import_1-expected.txt b/ets2panda/test/parser/ets/selective_export/import_1-expected.txt index 666a6fd502fc15cb2831d92d3b7037bcc9603a6d..bfa4cf5d5f51fbc7c04a862c3ba4be56c4505b82 100644 --- a/ets2panda/test/parser/ets/selective_export/import_1-expected.txt +++ b/ets2panda/test/parser/ets/selective_export/import_1-expected.txt @@ -89,112 +89,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_1.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/selective_export/import_2-expected.txt b/ets2panda/test/parser/ets/selective_export/import_2-expected.txt index 6676c50d1a1a7f2d1a7efede655efb41cceeb0ff..605cb91719255e879ceb43ffb455da780983e2a2 100644 --- a/ets2panda/test/parser/ets/selective_export/import_2-expected.txt +++ b/ets2panda/test/parser/ets/selective_export/import_2-expected.txt @@ -89,112 +89,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_2.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/selective_export/import_3-expected.txt b/ets2panda/test/parser/ets/selective_export/import_3-expected.txt index 7ae1968d4bc284ef807151c447a821481a457985..a80d57bf198cde86b4ce27157c7f56233249e391 100644 --- a/ets2panda/test/parser/ets/selective_export/import_3-expected.txt +++ b/ets2panda/test/parser/ets/selective_export/import_3-expected.txt @@ -89,112 +89,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_3.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_3.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/selective_export/import_4-expected.txt b/ets2panda/test/parser/ets/selective_export/import_4-expected.txt index d99dc8511248a88d6208bfd190d3bf5c07131b83..c5a9716ae2281863df6d11c0f5c3e56064db8d7a 100644 --- a/ets2panda/test/parser/ets/selective_export/import_4-expected.txt +++ b/ets2panda/test/parser/ets/selective_export/import_4-expected.txt @@ -89,112 +89,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_4.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_4.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_4.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "import_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "import_4.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/selective_export/selective_export_1-expected.txt b/ets2panda/test/parser/ets/selective_export/selective_export_1-expected.txt index 8518599df64ae213461be56dfba2163bd59b4c80..41df6ffa05df8e428d8f8edc97daae5739fb948b 100644 --- a/ets2panda/test/parser/ets/selective_export/selective_export_1-expected.txt +++ b/ets2panda/test/parser/ets/selective_export/selective_export_1-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "selective_export_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "selective_export_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "selective_export_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "selective_export_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "selective_export_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "selective_export_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "selective_export_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "selective_export_1.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/selective_export/selective_export_2-expected.txt b/ets2panda/test/parser/ets/selective_export/selective_export_2-expected.txt index 398e6f4512b9a3984899cd238001bca6b776f7b2..2bd19edcbf7f3238e3bd158ce8ce91fc749d5005 100644 --- a/ets2panda/test/parser/ets/selective_export/selective_export_2-expected.txt +++ b/ets2panda/test/parser/ets/selective_export/selective_export_2-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "selective_export_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "selective_export_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "selective_export_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "selective_export_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "selective_export_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "selective_export_2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "selective_export_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "selective_export_2.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/selective_export/selective_export_3-expected.txt b/ets2panda/test/parser/ets/selective_export/selective_export_3-expected.txt index 3a428974714526be08d5a28399bf0aa9e4b74675..0f5219fd7a9e329cb2edbaf09425dc916c9be843 100644 --- a/ets2panda/test/parser/ets/selective_export/selective_export_3-expected.txt +++ b/ets2panda/test/parser/ets/selective_export/selective_export_3-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "selective_export_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "selective_export_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "selective_export_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "selective_export_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "selective_export_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "selective_export_3.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "selective_export_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "selective_export_3.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/selective_export/selective_export_4-expected.txt b/ets2panda/test/parser/ets/selective_export/selective_export_4-expected.txt index f6f0c98bc5ea79a006df98613d6ff7cf632c6253..a6249512b61d5fd51c2f4e23d98a3fa5513ae35e 100644 --- a/ets2panda/test/parser/ets/selective_export/selective_export_4-expected.txt +++ b/ets2panda/test/parser/ets/selective_export/selective_export_4-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "selective_export_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "selective_export_4.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "selective_export_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "selective_export_4.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "selective_export_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "selective_export_4.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "selective_export_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "selective_export_4.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/simple_types-expected.txt b/ets2panda/test/parser/ets/simple_types-expected.txt index 2800be66145580436b2cd485acee5cf2685e3992..2b069f72ab2950443f3589a270eda6a6fdd6e341 100644 --- a/ets2panda/test/parser/ets/simple_types-expected.txt +++ b/ets2panda/test/parser/ets/simple_types-expected.txt @@ -130,759 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "simple_types.ets" - }, - "end": { - "line": 16, - "column": 6, - "program": "simple_types.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 127, - "loc": { - "start": { - "line": 16, - "column": 15, - "program": "simple_types.ets" - }, - "end": { - "line": 16, - "column": 18, - "program": "simple_types.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "simple_types.ets" - }, - "end": { - "line": 16, - "column": 18, - "program": "simple_types.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "simple_types.ets" - }, - "end": { - "line": 16, - "column": 18, - "program": "simple_types.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "simple_types.ets" - }, - "end": { - "line": 17, - "column": 6, - "program": "simple_types.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": -32768, - "loc": { - "start": { - "line": 17, - "column": 16, - "program": "simple_types.ets" - }, - "end": { - "line": 17, - "column": 22, - "program": "simple_types.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "simple_types.ets" - }, - "end": { - "line": 17, - "column": 22, - "program": "simple_types.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "simple_types.ets" - }, - "end": { - "line": 17, - "column": 22, - "program": "simple_types.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "c", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "simple_types.ets" - }, - "end": { - "line": 18, - "column": 6, - "program": "simple_types.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 2147483647, - "loc": { - "start": { - "line": 18, - "column": 14, - "program": "simple_types.ets" - }, - "end": { - "line": 18, - "column": 24, - "program": "simple_types.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "simple_types.ets" - }, - "end": { - "line": 18, - "column": 24, - "program": "simple_types.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "simple_types.ets" - }, - "end": { - "line": 18, - "column": 24, - "program": "simple_types.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "d", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "simple_types.ets" - }, - "end": { - "line": 19, - "column": 6, - "program": "simple_types.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": -9223372036854775808, - "loc": { - "start": { - "line": 19, - "column": 15, - "program": "simple_types.ets" - }, - "end": { - "line": 19, - "column": 35, - "program": "simple_types.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "simple_types.ets" - }, - "end": { - "line": 19, - "column": 35, - "program": "simple_types.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "simple_types.ets" - }, - "end": { - "line": 19, - "column": 35, - "program": "simple_types.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "e", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "simple_types.ets" - }, - "end": { - "line": 21, - "column": 6, - "program": "simple_types.ets" - } - } - }, - "right": { - "type": "BooleanLiteral", - "value": true, - "loc": { - "start": { - "line": 21, - "column": 18, - "program": "simple_types.ets" - }, - "end": { - "line": 21, - "column": 22, - "program": "simple_types.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "simple_types.ets" - }, - "end": { - "line": 21, - "column": 22, - "program": "simple_types.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "simple_types.ets" - }, - "end": { - "line": 21, - "column": 22, - "program": "simple_types.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "f", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "simple_types.ets" - }, - "end": { - "line": 22, - "column": 6, - "program": "simple_types.ets" - } - } - }, - "right": { - "type": "CharLiteral", - "value": "a", - "loc": { - "start": { - "line": 22, - "column": 15, - "program": "simple_types.ets" - }, - "end": { - "line": 22, - "column": 19, - "program": "simple_types.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "simple_types.ets" - }, - "end": { - "line": 22, - "column": 19, - "program": "simple_types.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "simple_types.ets" - }, - "end": { - "line": 22, - "column": 19, - "program": "simple_types.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "k", - "decorators": [], - "loc": { - "start": { - "line": 26, - "column": 5, - "program": "simple_types.ets" - }, - "end": { - "line": 26, - "column": 6, - "program": "simple_types.ets" - } - } - }, - "right": { - "type": "CallExpression", - "callee": { - "type": "MemberExpression", - "object": { - "type": "Identifier", - "name": "Double", - "decorators": [], - "loc": { - "start": { - "line": 26, - "column": 16, - "program": "simple_types.ets" - }, - "end": { - "line": 26, - "column": 22, - "program": "simple_types.ets" - } - } - }, - "property": { - "type": "Identifier", - "name": "toFloat", - "decorators": [], - "loc": { - "start": { - "line": 26, - "column": 23, - "program": "simple_types.ets" - }, - "end": { - "line": 26, - "column": 30, - "program": "simple_types.ets" - } - } - }, - "computed": false, - "optional": false, - "loc": { - "start": { - "line": 26, - "column": 16, - "program": "simple_types.ets" - }, - "end": { - "line": 26, - "column": 30, - "program": "simple_types.ets" - } - } - }, - "arguments": [ - { - "type": "NumberLiteral", - "value": 3.1415, - "loc": { - "start": { - "line": 26, - "column": 31, - "program": "simple_types.ets" - }, - "end": { - "line": 26, - "column": 37, - "program": "simple_types.ets" - } - } - } - ], - "optional": false, - "loc": { - "start": { - "line": 26, - "column": 16, - "program": "simple_types.ets" - }, - "end": { - "line": 26, - "column": 38, - "program": "simple_types.ets" - } - } - }, - "loc": { - "start": { - "line": 26, - "column": 5, - "program": "simple_types.ets" - }, - "end": { - "line": 26, - "column": 38, - "program": "simple_types.ets" - } - } - }, - "loc": { - "start": { - "line": 26, - "column": 5, - "program": "simple_types.ets" - }, - "end": { - "line": 26, - "column": 38, - "program": "simple_types.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "l", - "decorators": [], - "loc": { - "start": { - "line": 27, - "column": 5, - "program": "simple_types.ets" - }, - "end": { - "line": 27, - "column": 6, - "program": "simple_types.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 3.1415, - "loc": { - "start": { - "line": 27, - "column": 17, - "program": "simple_types.ets" - }, - "end": { - "line": 27, - "column": 23, - "program": "simple_types.ets" - } - } - }, - "loc": { - "start": { - "line": 27, - "column": 5, - "program": "simple_types.ets" - }, - "end": { - "line": 27, - "column": 23, - "program": "simple_types.ets" - } - } - }, - "loc": { - "start": { - "line": 27, - "column": 5, - "program": "simple_types.ets" - }, - "end": { - "line": 27, - "column": 23, - "program": "simple_types.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "c2", - "decorators": [], - "loc": { - "start": { - "line": 29, - "column": 5, - "program": "simple_types.ets" - }, - "end": { - "line": 29, - "column": 7, - "program": "simple_types.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 29, - "column": 15, - "program": "simple_types.ets" - }, - "end": { - "line": 29, - "column": 16, - "program": "simple_types.ets" - } - } - }, - "loc": { - "start": { - "line": 29, - "column": 5, - "program": "simple_types.ets" - }, - "end": { - "line": 29, - "column": 16, - "program": "simple_types.ets" - } - } - }, - "loc": { - "start": { - "line": 29, - "column": 5, - "program": "simple_types.ets" - }, - "end": { - "line": 29, - "column": 16, - "program": "simple_types.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "simple_types.ets" - }, - "end": { - "line": 29, - "column": 16, - "program": "simple_types.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "simple_types.ets" - }, - "end": { - "line": 29, - "column": 16, - "program": "simple_types.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "simple_types.ets" - }, - "end": { - "line": 29, - "column": 16, - "program": "simple_types.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "simple_types.ets" - }, - "end": { - "line": 29, - "column": 16, - "program": "simple_types.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -933,7 +180,7 @@ }, "end": { "line": 16, - "column": 18, + "column": 15, "program": "simple_types.ets" } } @@ -988,7 +235,7 @@ }, "end": { "line": 17, - "column": 22, + "column": 16, "program": "simple_types.ets" } } @@ -1043,7 +290,7 @@ }, "end": { "line": 18, - "column": 24, + "column": 14, "program": "simple_types.ets" } } @@ -1098,7 +345,7 @@ }, "end": { "line": 19, - "column": 35, + "column": 15, "program": "simple_types.ets" } } @@ -1153,7 +400,7 @@ }, "end": { "line": 21, - "column": 22, + "column": 18, "program": "simple_types.ets" } } @@ -1208,7 +455,7 @@ }, "end": { "line": 22, - "column": 19, + "column": 15, "program": "simple_types.ets" } } @@ -1318,7 +565,7 @@ }, "end": { "line": 26, - "column": 38, + "column": 16, "program": "simple_types.ets" } } @@ -1373,7 +620,7 @@ }, "end": { "line": 27, - "column": 23, + "column": 17, "program": "simple_types.ets" } } @@ -1428,7 +675,7 @@ }, "end": { "line": 29, - "column": 16, + "column": 15, "program": "simple_types.ets" } } diff --git a/ets2panda/test/parser/ets/static_function_override_1-expected.txt b/ets2panda/test/parser/ets/static_function_override_1-expected.txt index 240980eabb063bb782a47cd2b52549a0b619259e..6bd157510a0e21d3ae212d9f26ec3cbf912719c5 100644 --- a/ets2panda/test/parser/ets/static_function_override_1-expected.txt +++ b/ets2panda/test/parser/ets/static_function_override_1-expected.txt @@ -727,112 +727,6 @@ "program": "static_function_override_1.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "static_function_override_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "static_function_override_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "static_function_override_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "static_function_override_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "static_function_override_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "static_function_override_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "static_function_override_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "static_function_override_1.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/static_function_override_2-expected.txt b/ets2panda/test/parser/ets/static_function_override_2-expected.txt index 2e5acdb346b91d18fe1c2b07887894d4417d2c0c..dd84296e7acf3b1a2ecb2588e45538468d2b0e89 100644 --- a/ets2panda/test/parser/ets/static_function_override_2-expected.txt +++ b/ets2panda/test/parser/ets/static_function_override_2-expected.txt @@ -727,112 +727,6 @@ "program": "static_function_override_2.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "static_function_override_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "static_function_override_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "static_function_override_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "static_function_override_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "static_function_override_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "static_function_override_2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "static_function_override_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "static_function_override_2.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/static_function_override_3-expected.txt b/ets2panda/test/parser/ets/static_function_override_3-expected.txt index 6f785b59b9115076458675c397aab6ba814bc8f7..c11604293beff8d495baa89b037716ce0ca1d994 100644 --- a/ets2panda/test/parser/ets/static_function_override_3-expected.txt +++ b/ets2panda/test/parser/ets/static_function_override_3-expected.txt @@ -727,112 +727,6 @@ "program": "static_function_override_3.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "static_function_override_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "static_function_override_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "static_function_override_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "static_function_override_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "static_function_override_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "static_function_override_3.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "static_function_override_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "static_function_override_3.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/string-expected.txt b/ets2panda/test/parser/ets/string-expected.txt index af0026148ed1392011ded4bab60c6e8d9a7244b1..1141ca043f8f65c492796ef7bedee83c06208a6c 100644 --- a/ets2panda/test/parser/ets/string-expected.txt +++ b/ets2panda/test/parser/ets/string-expected.txt @@ -130,241 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "s", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "string.ets" - }, - "end": { - "line": 16, - "column": 6, - "program": "string.ets" - } - } - }, - "right": { - "type": "StringLiteral", - "value": "Hello", - "loc": { - "start": { - "line": 16, - "column": 17, - "program": "string.ets" - }, - "end": { - "line": 16, - "column": 24, - "program": "string.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "string.ets" - }, - "end": { - "line": 16, - "column": 24, - "program": "string.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "string.ets" - }, - "end": { - "line": 16, - "column": 24, - "program": "string.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "w", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "string.ets" - }, - "end": { - "line": 17, - "column": 6, - "program": "string.ets" - } - } - }, - "right": { - "type": "StringLiteral", - "value": "World", - "loc": { - "start": { - "line": 17, - "column": 17, - "program": "string.ets" - }, - "end": { - "line": 17, - "column": 24, - "program": "string.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "string.ets" - }, - "end": { - "line": 17, - "column": 24, - "program": "string.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "string.ets" - }, - "end": { - "line": 17, - "column": 24, - "program": "string.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "string.ets" - }, - "end": { - "line": 17, - "column": 24, - "program": "string.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "string.ets" - }, - "end": { - "line": 17, - "column": 24, - "program": "string.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "string.ets" - }, - "end": { - "line": 17, - "column": 24, - "program": "string.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "string.ets" - }, - "end": { - "line": 17, - "column": 24, - "program": "string.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -447,7 +212,7 @@ }, "end": { "line": 16, - "column": 24, + "column": 17, "program": "string.ets" } } @@ -534,7 +299,7 @@ }, "end": { "line": 17, - "column": 24, + "column": 17, "program": "string.ets" } } diff --git a/ets2panda/test/parser/ets/string_template_1-expected.txt b/ets2panda/test/parser/ets/string_template_1-expected.txt index 890187012bdc027ab2c76f4d8cb5275e0679332b..51cec724941aae75c2c411f21aa0d4e82782ffc7 100644 --- a/ets2panda/test/parser/ets/string_template_1-expected.txt +++ b/ets2panda/test/parser/ets/string_template_1-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "string_template_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "string_template_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "string_template_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "string_template_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "string_template_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "string_template_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "string_template_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "string_template_1.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/string_template_2-expected.txt b/ets2panda/test/parser/ets/string_template_2-expected.txt index 81f1caa9342cbde93b96df21c1055b3110f579d5..2799c0bca61fe86d769276b65d1e79ecd1d3b041 100644 --- a/ets2panda/test/parser/ets/string_template_2-expected.txt +++ b/ets2panda/test/parser/ets/string_template_2-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "string_template_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "string_template_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "string_template_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "string_template_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "string_template_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "string_template_2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "string_template_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "string_template_2.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/string_template_3-expected.txt b/ets2panda/test/parser/ets/string_template_3-expected.txt index cfb193b398da7a0e7384ced046cdb333a8a86add..48cf4039b8a8f08e0e0561ee75dd9de2b82db45b 100644 --- a/ets2panda/test/parser/ets/string_template_3-expected.txt +++ b/ets2panda/test/parser/ets/string_template_3-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "string_template_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "string_template_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "string_template_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "string_template_3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "string_template_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "string_template_3.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "string_template_3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "string_template_3.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/string_template_4-expected.txt b/ets2panda/test/parser/ets/string_template_4-expected.txt index ed32e495cb84a07f2c05613991a0b53fd1e4037d..c335f33788338f81876bb94a038d00175419b367 100644 --- a/ets2panda/test/parser/ets/string_template_4-expected.txt +++ b/ets2panda/test/parser/ets/string_template_4-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "string_template_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "string_template_4.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "string_template_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "string_template_4.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "string_template_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "string_template_4.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "string_template_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "string_template_4.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/switch-expected.txt b/ets2panda/test/parser/ets/switch-expected.txt index b5c108708d68384d1154e3ba9e14702bc86be82a..2bde1c80ec51a7fcba96d53235479d0cad98a000 100644 --- a/ets2panda/test/parser/ets/switch-expected.txt +++ b/ets2panda/test/parser/ets/switch-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switch.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switch.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switch.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switch.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switch.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switch.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switch.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switch.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/switch_alive_1-expected.txt b/ets2panda/test/parser/ets/switch_alive_1-expected.txt index fc3f469a5e66fccdbc87ed522534d1fedba02072..0d2338c14ce4f85a5577b906509a5592df38211a 100644 --- a/ets2panda/test/parser/ets/switch_alive_1-expected.txt +++ b/ets2panda/test/parser/ets/switch_alive_1-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switch_alive_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switch_alive_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switch_alive_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switch_alive_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switch_alive_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switch_alive_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switch_alive_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switch_alive_1.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/switch_alive_4-expected.txt b/ets2panda/test/parser/ets/switch_alive_4-expected.txt index 4974b4d79fb2143e0500ccd71bb248c066c7bf14..d153d3833ee678a1c532707c19be90b24bbfa5b1 100644 --- a/ets2panda/test/parser/ets/switch_alive_4-expected.txt +++ b/ets2panda/test/parser/ets/switch_alive_4-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switch_alive_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switch_alive_4.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switch_alive_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switch_alive_4.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switch_alive_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switch_alive_4.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switch_alive_4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switch_alive_4.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/switch_enum_string_case-expected.txt b/ets2panda/test/parser/ets/switch_enum_string_case-expected.txt index 4ece619664ba035af6abd8ea732e474294a5047e..9aa71e1f25e6418315ca10f511f612cf05105137 100644 --- a/ets2panda/test/parser/ets/switch_enum_string_case-expected.txt +++ b/ets2panda/test/parser/ets/switch_enum_string_case-expected.txt @@ -5154,112 +5154,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switch_enum_string_case.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switch_enum_string_case.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switch_enum_string_case.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switch_enum_string_case.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switch_enum_string_case.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switch_enum_string_case.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switch_enum_string_case.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switch_enum_string_case.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/switch_num_compare_char-expected.txt b/ets2panda/test/parser/ets/switch_num_compare_char-expected.txt index 4e4109d1e856a1c3186b1ca6b575a39f84939d70..2ca938156c7558323cd15e0648a4b36afe2ff3e5 100644 --- a/ets2panda/test/parser/ets/switch_num_compare_char-expected.txt +++ b/ets2panda/test/parser/ets/switch_num_compare_char-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switch_num_compare_char.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switch_num_compare_char.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switch_num_compare_char.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switch_num_compare_char.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switch_num_compare_char.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switch_num_compare_char.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switch_num_compare_char.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switch_num_compare_char.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/switch_readonly_member-expected.txt b/ets2panda/test/parser/ets/switch_readonly_member-expected.txt index 4954f89cd12621e8bbd2dbe347dfd982896f0900..9fdc665342b9327f95b888e61ddb21c1858bf196 100644 --- a/ets2panda/test/parser/ets/switch_readonly_member-expected.txt +++ b/ets2panda/test/parser/ets/switch_readonly_member-expected.txt @@ -446,112 +446,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switch_readonly_member.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switch_readonly_member.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switch_readonly_member.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switch_readonly_member.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switch_readonly_member.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switch_readonly_member.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switch_readonly_member.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switch_readonly_member.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/switch_readonly_member_compare_char-expected.txt b/ets2panda/test/parser/ets/switch_readonly_member_compare_char-expected.txt index 581970ee1398608e7eb67816db39d81861823adb..b9c30f37aea59cc7783ab99a7e77faa7aecb39d7 100644 --- a/ets2panda/test/parser/ets/switch_readonly_member_compare_char-expected.txt +++ b/ets2panda/test/parser/ets/switch_readonly_member_compare_char-expected.txt @@ -446,112 +446,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switch_readonly_member_compare_char.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switch_readonly_member_compare_char.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switch_readonly_member_compare_char.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switch_readonly_member_compare_char.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switch_readonly_member_compare_char.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switch_readonly_member_compare_char.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switch_readonly_member_compare_char.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switch_readonly_member_compare_char.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/switch_readonly_member_compare_char_2-expected.txt b/ets2panda/test/parser/ets/switch_readonly_member_compare_char_2-expected.txt index a8d6babbd992b5afa3e9a364953eb092ff1ae74a..9c8c20d94383a36c33c539686fe4313d9dbac318 100644 --- a/ets2panda/test/parser/ets/switch_readonly_member_compare_char_2-expected.txt +++ b/ets2panda/test/parser/ets/switch_readonly_member_compare_char_2-expected.txt @@ -446,112 +446,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switch_readonly_member_compare_char_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switch_readonly_member_compare_char_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switch_readonly_member_compare_char_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switch_readonly_member_compare_char_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switch_readonly_member_compare_char_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switch_readonly_member_compare_char_2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "switch_readonly_member_compare_char_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "switch_readonly_member_compare_char_2.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/ternary-expected.txt b/ets2panda/test/parser/ets/ternary-expected.txt index 1a8737e1cd9bf7db7dece7edc6ba9466009cb241..7cbd07d65c1c8703950aacbcbd8e09e9c6a14c88 100644 --- a/ets2panda/test/parser/ets/ternary-expected.txt +++ b/ets2panda/test/parser/ets/ternary-expected.txt @@ -130,388 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "ternary.ets" - }, - "end": { - "line": 16, - "column": 6, - "program": "ternary.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 0, - "loc": { - "start": { - "line": 16, - "column": 9, - "program": "ternary.ets" - }, - "end": { - "line": 16, - "column": 10, - "program": "ternary.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "ternary.ets" - }, - "end": { - "line": 16, - "column": 10, - "program": "ternary.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "ternary.ets" - }, - "end": { - "line": 16, - "column": 10, - "program": "ternary.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "ternary.ets" - }, - "end": { - "line": 17, - "column": 6, - "program": "ternary.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 1, - "loc": { - "start": { - "line": 17, - "column": 9, - "program": "ternary.ets" - }, - "end": { - "line": 17, - "column": 10, - "program": "ternary.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "ternary.ets" - }, - "end": { - "line": 17, - "column": 10, - "program": "ternary.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "ternary.ets" - }, - "end": { - "line": 17, - "column": 10, - "program": "ternary.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "c", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "ternary.ets" - }, - "end": { - "line": 19, - "column": 6, - "program": "ternary.ets" - } - } - }, - "right": { - "type": "ConditionalExpression", - "test": { - "type": "BinaryExpression", - "operator": ">", - "left": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 9, - "program": "ternary.ets" - }, - "end": { - "line": 19, - "column": 10, - "program": "ternary.ets" - } - } - }, - "right": { - "type": "Identifier", - "name": "b", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 13, - "program": "ternary.ets" - }, - "end": { - "line": 19, - "column": 14, - "program": "ternary.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 9, - "program": "ternary.ets" - }, - "end": { - "line": 19, - "column": 14, - "program": "ternary.ets" - } - } - }, - "consequent": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 17, - "program": "ternary.ets" - }, - "end": { - "line": 19, - "column": 18, - "program": "ternary.ets" - } - } - }, - "alternate": { - "type": "Identifier", - "name": "b", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 21, - "program": "ternary.ets" - }, - "end": { - "line": 19, - "column": 22, - "program": "ternary.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 9, - "program": "ternary.ets" - }, - "end": { - "line": 19, - "column": 22, - "program": "ternary.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "ternary.ets" - }, - "end": { - "line": 19, - "column": 22, - "program": "ternary.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "ternary.ets" - }, - "end": { - "line": 19, - "column": 22, - "program": "ternary.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "ternary.ets" - }, - "end": { - "line": 19, - "column": 22, - "program": "ternary.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "ternary.ets" - }, - "end": { - "line": 19, - "column": 22, - "program": "ternary.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "ternary.ets" - }, - "end": { - "line": 19, - "column": 22, - "program": "ternary.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "ternary.ets" - }, - "end": { - "line": 19, - "column": 22, - "program": "ternary.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/test-type-alias-call1-expected.txt b/ets2panda/test/parser/ets/test-type-alias-call1-expected.txt index 111b160dd566d979343f61c9ccd83bc34a801d81..d47d9134ae46468b02e0944aa448249db81e31f6 100644 --- a/ets2panda/test/parser/ets/test-type-alias-call1-expected.txt +++ b/ets2panda/test/parser/ets/test-type-alias-call1-expected.txt @@ -818,112 +818,6 @@ "program": "test-type-alias-call1.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test-type-alias-call1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test-type-alias-call1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test-type-alias-call1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test-type-alias-call1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test-type-alias-call1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test-type-alias-call1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test-type-alias-call1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test-type-alias-call1.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/test-type-alias-call2-expected.txt b/ets2panda/test/parser/ets/test-type-alias-call2-expected.txt index 212c267329e06c7da974088cfc17823b4c3fe2d5..005c7523829f4dc01a8ee06b93dc3e455e337fb7 100644 --- a/ets2panda/test/parser/ets/test-type-alias-call2-expected.txt +++ b/ets2panda/test/parser/ets/test-type-alias-call2-expected.txt @@ -976,112 +976,6 @@ "program": "test-type-alias-call2.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test-type-alias-call2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test-type-alias-call2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test-type-alias-call2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test-type-alias-call2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test-type-alias-call2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test-type-alias-call2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test-type-alias-call2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test-type-alias-call2.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/test-type-alias-call3-expected.txt b/ets2panda/test/parser/ets/test-type-alias-call3-expected.txt index b7bf1683f21888ec22b7d3ddd58243c07c0e072a..4f8f65a4910885b9c35ee37d1188d77f8c477c08 100644 --- a/ets2panda/test/parser/ets/test-type-alias-call3-expected.txt +++ b/ets2panda/test/parser/ets/test-type-alias-call3-expected.txt @@ -820,112 +820,6 @@ "program": "test-type-alias-call3.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test-type-alias-call3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test-type-alias-call3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test-type-alias-call3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test-type-alias-call3.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test-type-alias-call3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test-type-alias-call3.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test-type-alias-call3.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test-type-alias-call3.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/test-type-alias-call4-expected.txt b/ets2panda/test/parser/ets/test-type-alias-call4-expected.txt index aea8f78015f27d85605ec1afa5b25f0008a02a46..a34fb8c455444b092ff1846a75a40b5501ebdeca 100644 --- a/ets2panda/test/parser/ets/test-type-alias-call4-expected.txt +++ b/ets2panda/test/parser/ets/test-type-alias-call4-expected.txt @@ -820,112 +820,6 @@ "program": "test-type-alias-call4.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test-type-alias-call4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test-type-alias-call4.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test-type-alias-call4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test-type-alias-call4.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test-type-alias-call4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test-type-alias-call4.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test-type-alias-call4.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test-type-alias-call4.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/test-type-alias-call5-expected.txt b/ets2panda/test/parser/ets/test-type-alias-call5-expected.txt index 43bb699fe32b785d0fd181c7cbca15ef648a6eb9..f7d98e3420af2eae6867bd89f2e2f03327ad86d0 100644 --- a/ets2panda/test/parser/ets/test-type-alias-call5-expected.txt +++ b/ets2panda/test/parser/ets/test-type-alias-call5-expected.txt @@ -1040,112 +1040,6 @@ "program": "test-type-alias-call5.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test-type-alias-call5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test-type-alias-call5.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test-type-alias-call5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test-type-alias-call5.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test-type-alias-call5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test-type-alias-call5.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test-type-alias-call5.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test-type-alias-call5.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/test-type-alias-call6-expected.txt b/ets2panda/test/parser/ets/test-type-alias-call6-expected.txt index 537158d735c60d8a9102c208e3425de517f59cd4..e0dfc4400e5160eb8de65479c3a9ff238d093cc2 100644 --- a/ets2panda/test/parser/ets/test-type-alias-call6-expected.txt +++ b/ets2panda/test/parser/ets/test-type-alias-call6-expected.txt @@ -1119,112 +1119,6 @@ "program": "test-type-alias-call6.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test-type-alias-call6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test-type-alias-call6.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test-type-alias-call6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test-type-alias-call6.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test-type-alias-call6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test-type-alias-call6.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test-type-alias-call6.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test-type-alias-call6.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/test-type-alias-call7-expected.txt b/ets2panda/test/parser/ets/test-type-alias-call7-expected.txt index a7ec943031d09fee613bd88a9664eab3b38603d5..58f97b68f714ae7bad8c4cd9b369706bc7b83537 100644 --- a/ets2panda/test/parser/ets/test-type-alias-call7-expected.txt +++ b/ets2panda/test/parser/ets/test-type-alias-call7-expected.txt @@ -240,112 +240,6 @@ "program": "test-type-alias-call7.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test-type-alias-call7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test-type-alias-call7.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test-type-alias-call7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test-type-alias-call7.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test-type-alias-call7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test-type-alias-call7.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test-type-alias-call7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test-type-alias-call7.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/test-type-alias-call8-expected.txt b/ets2panda/test/parser/ets/test-type-alias-call8-expected.txt index ce3e096381948e1133c9bb1edf9577f88ce7b9a7..6975799ea8b228ee1bdf486dc1deb3fcc4f88b7e 100644 --- a/ets2panda/test/parser/ets/test-type-alias-call8-expected.txt +++ b/ets2panda/test/parser/ets/test-type-alias-call8-expected.txt @@ -789,112 +789,6 @@ "program": "test-type-alias-call8.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test-type-alias-call8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test-type-alias-call8.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test-type-alias-call8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test-type-alias-call8.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test-type-alias-call8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test-type-alias-call8.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test-type-alias-call8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test-type-alias-call8.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/test_interface-expected.txt b/ets2panda/test/parser/ets/test_interface-expected.txt index d1fc821b05e64265225ef0768d6e597a34de401c..3d238cae3b24182a9291f482671c3e963692d21d 100644 --- a/ets2panda/test/parser/ets/test_interface-expected.txt +++ b/ets2panda/test/parser/ets/test_interface-expected.txt @@ -1111,112 +1111,6 @@ "program": "test_interface.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test_interface.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test_interface.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test_interface.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test_interface.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test_interface.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test_interface.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test_interface.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test_interface.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/test_jsvalue-expected.txt b/ets2panda/test/parser/ets/test_jsvalue-expected.txt index 8c7f12f1933e029f17d1d9b0a102cea394414839..695fd8313f9ac9cc0fb768a213f0bb40dcef7684 100644 --- a/ets2panda/test/parser/ets/test_jsvalue-expected.txt +++ b/ets2panda/test/parser/ets/test_jsvalue-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test_jsvalue.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test_jsvalue.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test_jsvalue.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test_jsvalue.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test_jsvalue.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test_jsvalue.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test_jsvalue.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test_jsvalue.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/test_type_alias6-expected.txt b/ets2panda/test/parser/ets/test_type_alias6-expected.txt index 315692355d0d83cb19fe72c66c8a307d46876251..1acbf3a2d89a40539500070c8b2b5255119043fe 100644 --- a/ets2panda/test/parser/ets/test_type_alias6-expected.txt +++ b/ets2panda/test/parser/ets/test_type_alias6-expected.txt @@ -177,177 +177,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "x", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "test_type_alias6.ets" - }, - "end": { - "line": 17, - "column": 6, - "program": "test_type_alias6.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 15.2, - "loc": { - "start": { - "line": 17, - "column": 9, - "program": "test_type_alias6.ets" - }, - "end": { - "line": 17, - "column": 13, - "program": "test_type_alias6.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "test_type_alias6.ets" - }, - "end": { - "line": 17, - "column": 13, - "program": "test_type_alias6.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "test_type_alias6.ets" - }, - "end": { - "line": 17, - "column": 13, - "program": "test_type_alias6.ets" - } - } - } - ], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "test_type_alias6.ets" - }, - "end": { - "line": 17, - "column": 13, - "program": "test_type_alias6.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "test_type_alias6.ets" - }, - "end": { - "line": 17, - "column": 13, - "program": "test_type_alias6.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "test_type_alias6.ets" - }, - "end": { - "line": 17, - "column": 13, - "program": "test_type_alias6.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "test_type_alias6.ets" - }, - "end": { - "line": 17, - "column": 13, - "program": "test_type_alias6.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/test_type_alias7-expected.txt b/ets2panda/test/parser/ets/test_type_alias7-expected.txt index c3e0eb220efe3b2c349dd902a5bd1f3761b1c036..2fa78f055de6e2185ac83bde6ee173d8ffedc062 100644 --- a/ets2panda/test/parser/ets/test_type_alias7-expected.txt +++ b/ets2panda/test/parser/ets/test_type_alias7-expected.txt @@ -177,112 +177,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test_type_alias7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test_type_alias7.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test_type_alias7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test_type_alias7.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test_type_alias7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test_type_alias7.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test_type_alias7.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test_type_alias7.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/test_type_alias8-expected.txt b/ets2panda/test/parser/ets/test_type_alias8-expected.txt index aead5804535c5a991bf334ac69d370bb4a2d5893..5d83d9a729a102f7f22f4db2bbbf2500eb3e4f96 100644 --- a/ets2panda/test/parser/ets/test_type_alias8-expected.txt +++ b/ets2panda/test/parser/ets/test_type_alias8-expected.txt @@ -103,112 +103,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test_type_alias8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test_type_alias8.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test_type_alias8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test_type_alias8.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test_type_alias8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test_type_alias8.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "test_type_alias8.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "test_type_alias8.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/test_type_alias9-expected.txt b/ets2panda/test/parser/ets/test_type_alias9-expected.txt index 16f592d9f0e1b6252b8c04cd9dcec918ad13e9e4..919dd36445e5307dbbb4a8442b3165ef023b0b4e 100644 --- a/ets2panda/test/parser/ets/test_type_alias9-expected.txt +++ b/ets2panda/test/parser/ets/test_type_alias9-expected.txt @@ -352,372 +352,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "num", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "test_type_alias9.ets" - }, - "end": { - "line": 19, - "column": 8, - "program": "test_type_alias9.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 32, - "loc": { - "start": { - "line": 19, - "column": 14, - "program": "test_type_alias9.ets" - }, - "end": { - "line": 19, - "column": 16, - "program": "test_type_alias9.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "test_type_alias9.ets" - }, - "end": { - "line": 19, - "column": 16, - "program": "test_type_alias9.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "test_type_alias9.ets" - }, - "end": { - "line": 19, - "column": 16, - "program": "test_type_alias9.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "m", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "test_type_alias9.ets" - }, - "end": { - "line": 20, - "column": 6, - "program": "test_type_alias9.ets" - } - } - }, - "right": { - "type": "ArrayExpression", - "elements": [ - { - "type": "ArrayExpression", - "elements": [ - { - "type": "NumberLiteral", - "value": 1.1, - "loc": { - "start": { - "line": 20, - "column": 19, - "program": "test_type_alias9.ets" - }, - "end": { - "line": 20, - "column": 22, - "program": "test_type_alias9.ets" - } - } - }, - { - "type": "NumberLiteral", - "value": 1.1, - "loc": { - "start": { - "line": 20, - "column": 24, - "program": "test_type_alias9.ets" - }, - "end": { - "line": 20, - "column": 27, - "program": "test_type_alias9.ets" - } - } - }, - { - "type": "NumberLiteral", - "value": 1.1, - "loc": { - "start": { - "line": 20, - "column": 29, - "program": "test_type_alias9.ets" - }, - "end": { - "line": 20, - "column": 32, - "program": "test_type_alias9.ets" - } - } - } - ], - "loc": { - "start": { - "line": 20, - "column": 18, - "program": "test_type_alias9.ets" - }, - "end": { - "line": 20, - "column": 33, - "program": "test_type_alias9.ets" - } - } - }, - { - "type": "ArrayExpression", - "elements": [ - { - "type": "NumberLiteral", - "value": 2.1, - "loc": { - "start": { - "line": 20, - "column": 36, - "program": "test_type_alias9.ets" - }, - "end": { - "line": 20, - "column": 39, - "program": "test_type_alias9.ets" - } - } - }, - { - "type": "NumberLiteral", - "value": 2.1, - "loc": { - "start": { - "line": 20, - "column": 41, - "program": "test_type_alias9.ets" - }, - "end": { - "line": 20, - "column": 44, - "program": "test_type_alias9.ets" - } - } - }, - { - "type": "NumberLiteral", - "value": 2.1, - "loc": { - "start": { - "line": 20, - "column": 46, - "program": "test_type_alias9.ets" - }, - "end": { - "line": 20, - "column": 49, - "program": "test_type_alias9.ets" - } - } - } - ], - "loc": { - "start": { - "line": 20, - "column": 35, - "program": "test_type_alias9.ets" - }, - "end": { - "line": 20, - "column": 50, - "program": "test_type_alias9.ets" - } - } - } - ], - "loc": { - "start": { - "line": 20, - "column": 17, - "program": "test_type_alias9.ets" - }, - "end": { - "line": 20, - "column": 51, - "program": "test_type_alias9.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "test_type_alias9.ets" - }, - "end": { - "line": 20, - "column": 51, - "program": "test_type_alias9.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "test_type_alias9.ets" - }, - "end": { - "line": 20, - "column": 51, - "program": "test_type_alias9.ets" - } - } - } - ], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "test_type_alias9.ets" - }, - "end": { - "line": 20, - "column": 51, - "program": "test_type_alias9.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "test_type_alias9.ets" - }, - "end": { - "line": 20, - "column": 51, - "program": "test_type_alias9.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "test_type_alias9.ets" - }, - "end": { - "line": 20, - "column": 51, - "program": "test_type_alias9.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "test_type_alias9.ets" - }, - "end": { - "line": 20, - "column": 51, - "program": "test_type_alias9.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -800,7 +434,7 @@ }, "end": { "line": 19, - "column": 16, + "column": 14, "program": "test_type_alias9.ets" } } @@ -887,7 +521,7 @@ }, "end": { "line": 20, - "column": 51, + "column": 17, "program": "test_type_alias9.ets" } } diff --git a/ets2panda/test/parser/ets/this_callee-expected.txt b/ets2panda/test/parser/ets/this_callee-expected.txt index 75144c164219a8860267a7101930532d31e2d71e..246568a28bbd28157e8d17aaa93250542ed4b423 100644 --- a/ets2panda/test/parser/ets/this_callee-expected.txt +++ b/ets2panda/test/parser/ets/this_callee-expected.txt @@ -1381,112 +1381,6 @@ "program": "this_callee.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "this_callee.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "this_callee.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "this_callee.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "this_callee.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "this_callee.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "this_callee.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "this_callee.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "this_callee.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/this_cmp_object-expected.txt b/ets2panda/test/parser/ets/this_cmp_object-expected.txt index 1a0b8b1d1cda0537746499fb8f4204a33a4dcd15..2ecacdbe844b9f3dc16df75cc0e1bc8d2a22aa02 100644 --- a/ets2panda/test/parser/ets/this_cmp_object-expected.txt +++ b/ets2panda/test/parser/ets/this_cmp_object-expected.txt @@ -645,112 +645,6 @@ "program": "this_cmp_object.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "this_cmp_object.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "this_cmp_object.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "this_cmp_object.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "this_cmp_object.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "this_cmp_object.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "this_cmp_object.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "this_cmp_object.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "this_cmp_object.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/this_equality-expected.txt b/ets2panda/test/parser/ets/this_equality-expected.txt index db64c6fc351e39704f13e45bb2d0289379d6d993..0e10d6a82eb82a5d347962fb63ee85ed81ed97b0 100644 --- a/ets2panda/test/parser/ets/this_equality-expected.txt +++ b/ets2panda/test/parser/ets/this_equality-expected.txt @@ -547,112 +547,6 @@ "program": "this_equality.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "this_equality.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "this_equality.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "this_equality.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "this_equality.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "this_equality.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "this_equality.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "this_equality.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "this_equality.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/this_expression-expected.txt b/ets2panda/test/parser/ets/this_expression-expected.txt index c2bb90c8181d5fc55ac992561e7dfe9774da1f8c..523c52e9a482d739e8902271b79c7235fa624be3 100644 --- a/ets2panda/test/parser/ets/this_expression-expected.txt +++ b/ets2panda/test/parser/ets/this_expression-expected.txt @@ -504,112 +504,6 @@ "program": "this_expression.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "this_expression.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "this_expression.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "this_expression.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "this_expression.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "this_expression.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "this_expression.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "this_expression.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "this_expression.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/this_type_class_method_return_valid-expected.txt b/ets2panda/test/parser/ets/this_type_class_method_return_valid-expected.txt index 432afbf6b059067e52ec2dc758fcee2f01299d04..f4fd643246d38b39934e4602717ff998e31f0197 100644 --- a/ets2panda/test/parser/ets/this_type_class_method_return_valid-expected.txt +++ b/ets2panda/test/parser/ets/this_type_class_method_return_valid-expected.txt @@ -484,112 +484,6 @@ "program": "this_type_class_method_return_valid.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "this_type_class_method_return_valid.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "this_type_class_method_return_valid.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "this_type_class_method_return_valid.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "this_type_class_method_return_valid.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "this_type_class_method_return_valid.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "this_type_class_method_return_valid.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "this_type_class_method_return_valid.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "this_type_class_method_return_valid.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_define_lambda_in_body-expected.txt b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_define_lambda_in_body-expected.txt index 7ec271f2246af6ef88a4aebe4f8b6d02f180a366..8e945381f89622f0fca3cd2347b9bd6eee8c4dbc 100644 --- a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_define_lambda_in_body-expected.txt +++ b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_define_lambda_in_body-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "trailing_lambda_define_lambda_in_body.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "trailing_lambda_define_lambda_in_body.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "trailing_lambda_define_lambda_in_body.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "trailing_lambda_define_lambda_in_body.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "trailing_lambda_define_lambda_in_body.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "trailing_lambda_define_lambda_in_body.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "trailing_lambda_define_lambda_in_body.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "trailing_lambda_define_lambda_in_body.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_define_lambda_in_body_capture_variable-expected.txt b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_define_lambda_in_body_capture_variable-expected.txt index c8692d99a385d3ce8a5db352e4448ffa9cd71ff2..2110d32cf027ce3f7b687b064601f964399b9bdc 100644 --- a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_define_lambda_in_body_capture_variable-expected.txt +++ b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_define_lambda_in_body_capture_variable-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "trailing_lambda_define_lambda_in_body_capture_variable.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "trailing_lambda_define_lambda_in_body_capture_variable.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "trailing_lambda_define_lambda_in_body_capture_variable.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "trailing_lambda_define_lambda_in_body_capture_variable.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "trailing_lambda_define_lambda_in_body_capture_variable.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "trailing_lambda_define_lambda_in_body_capture_variable.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "trailing_lambda_define_lambda_in_body_capture_variable.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "trailing_lambda_define_lambda_in_body_capture_variable.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_overload-expected.txt b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_overload-expected.txt index de78229a7f5c219ad86a16358a1cc26bfb1fdcaf..0673a3c778e4ec5c7176a3c70c38fd84dcbec0f4 100644 --- a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_overload-expected.txt +++ b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_overload-expected.txt @@ -130,112 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "trailing_lambda_overload.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "trailing_lambda_overload.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "trailing_lambda_overload.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "trailing_lambda_overload.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "trailing_lambda_overload.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "trailing_lambda_overload.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "trailing_lambda_overload.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "trailing_lambda_overload.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_overload_1-expected.txt b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_overload_1-expected.txt index 84531f90b2f0e22b9ea5bd38fba38ccf6aac10ff..0f1d58af377938942696b109f518afd4ea37008e 100644 --- a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_overload_1-expected.txt +++ b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_overload_1-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "trailing_lambda_overload_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "trailing_lambda_overload_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "trailing_lambda_overload_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "trailing_lambda_overload_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "trailing_lambda_overload_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "trailing_lambda_overload_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "trailing_lambda_overload_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "trailing_lambda_overload_1.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_transform_trailing_block-expected.txt b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_transform_trailing_block-expected.txt index 752033be59a7b70fdcbb5b0f20c7a4d0282a3d75..3b418e8f0fc8fbfcd21eb87b99e5d15d9dc3bc80 100644 --- a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_transform_trailing_block-expected.txt +++ b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_transform_trailing_block-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "trailing_lambda_transform_trailing_block.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "trailing_lambda_transform_trailing_block.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "trailing_lambda_transform_trailing_block.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "trailing_lambda_transform_trailing_block.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "trailing_lambda_transform_trailing_block.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "trailing_lambda_transform_trailing_block.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "trailing_lambda_transform_trailing_block.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "trailing_lambda_transform_trailing_block.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_type_alias-expected.txt b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_type_alias-expected.txt index f566ff434f22b418b10afc4f58fbdc90ef1594ce..7641450bbf010711fbe205972a04066b61711fa6 100644 --- a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_type_alias-expected.txt +++ b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_type_alias-expected.txt @@ -87,112 +87,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "trailing_lambda_type_alias.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "trailing_lambda_type_alias.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "trailing_lambda_type_alias.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "trailing_lambda_type_alias.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "trailing_lambda_type_alias.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "trailing_lambda_type_alias.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "trailing_lambda_type_alias.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "trailing_lambda_type_alias.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/tryFinallyBlockOnly-expected.txt b/ets2panda/test/parser/ets/tryFinallyBlockOnly-expected.txt index f7fc6d09baff65c1ed860dda9ecd7c4113fdf03d..8c60c3ffe3f3287ffb30956f1c87f678013e93ea 100644 --- a/ets2panda/test/parser/ets/tryFinallyBlockOnly-expected.txt +++ b/ets2panda/test/parser/ets/tryFinallyBlockOnly-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tryFinallyBlockOnly.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tryFinallyBlockOnly.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tryFinallyBlockOnly.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tryFinallyBlockOnly.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tryFinallyBlockOnly.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tryFinallyBlockOnly.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tryFinallyBlockOnly.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tryFinallyBlockOnly.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/tupleAsTypeParam1-expected.txt b/ets2panda/test/parser/ets/tupleAsTypeParam1-expected.txt index 389237f5c8fef573c1f892dc126d384dfdd3746f..7d20a9e95d82e6701fe99ec064297b2f53f1b9f0 100644 --- a/ets2panda/test/parser/ets/tupleAsTypeParam1-expected.txt +++ b/ets2panda/test/parser/ets/tupleAsTypeParam1-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tupleAsTypeParam1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tupleAsTypeParam1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tupleAsTypeParam1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tupleAsTypeParam1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tupleAsTypeParam1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tupleAsTypeParam1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tupleAsTypeParam1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tupleAsTypeParam1.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/tupleAsTypeParam2-expected.txt b/ets2panda/test/parser/ets/tupleAsTypeParam2-expected.txt index c4ba6083bfd72affeb19de11471ad447672e0dc8..c16b313241689b37ed6d089531d9fead1be82d2d 100644 --- a/ets2panda/test/parser/ets/tupleAsTypeParam2-expected.txt +++ b/ets2panda/test/parser/ets/tupleAsTypeParam2-expected.txt @@ -622,112 +622,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tupleAsTypeParam2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tupleAsTypeParam2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tupleAsTypeParam2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tupleAsTypeParam2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tupleAsTypeParam2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tupleAsTypeParam2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tupleAsTypeParam2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tupleAsTypeParam2.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/tupleIndexWithNumbers-expected.txt b/ets2panda/test/parser/ets/tupleIndexWithNumbers-expected.txt index aab3c5af767b75f7ffd2252c954beca7e75ad924..187fd3295d1feba10955da709f4b738ba3d2720f 100644 --- a/ets2panda/test/parser/ets/tupleIndexWithNumbers-expected.txt +++ b/ets2panda/test/parser/ets/tupleIndexWithNumbers-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tupleIndexWithNumbers.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tupleIndexWithNumbers.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tupleIndexWithNumbers.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tupleIndexWithNumbers.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tupleIndexWithNumbers.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tupleIndexWithNumbers.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "tupleIndexWithNumbers.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "tupleIndexWithNumbers.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/type_alias_1-expected.txt b/ets2panda/test/parser/ets/type_alias_1-expected.txt index 7997bdfa5df3e3240c725939e0c1640043515270..0852c934ce42cb8142a669baaf86a8e515621610 100644 --- a/ets2panda/test/parser/ets/type_alias_1-expected.txt +++ b/ets2panda/test/parser/ets/type_alias_1-expected.txt @@ -305,112 +305,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "type_alias_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "type_alias_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "type_alias_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "type_alias_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "type_alias_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "type_alias_1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "type_alias_1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "type_alias_1.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/type_alias_2-expected.txt b/ets2panda/test/parser/ets/type_alias_2-expected.txt index 66038130dc13834d762beb83c751069f7bbf9d1f..425832e992bd0d459f4d5598b3d43e011c26316f 100644 --- a/ets2panda/test/parser/ets/type_alias_2-expected.txt +++ b/ets2panda/test/parser/ets/type_alias_2-expected.txt @@ -580,112 +580,6 @@ "program": "type_alias_2.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "type_alias_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "type_alias_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "type_alias_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "type_alias_2.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "type_alias_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "type_alias_2.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "type_alias_2.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "type_alias_2.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/type_cast-expected.txt b/ets2panda/test/parser/ets/type_cast-expected.txt index 18fe8c37dad3165da26f1a5d72ed5049c582725e..846197f070d13942fa219f5bd5ca0c24823cd210 100644 --- a/ets2panda/test/parser/ets/type_cast-expected.txt +++ b/ets2panda/test/parser/ets/type_cast-expected.txt @@ -962,112 +962,6 @@ "program": "type_cast.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "type_cast.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "type_cast.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "type_cast.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "type_cast.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "type_cast.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "type_cast.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "type_cast.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "type_cast.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/type_variance1-expected.txt b/ets2panda/test/parser/ets/type_variance1-expected.txt index 792afa1273a17b579a6f282f0bb8cd5a99dd7cab..5f5f4ab7d1de0f6157f5e8a950427ca020d53771 100644 --- a/ets2panda/test/parser/ets/type_variance1-expected.txt +++ b/ets2panda/test/parser/ets/type_variance1-expected.txt @@ -2112,112 +2112,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "type_variance1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "type_variance1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "type_variance1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "type_variance1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "type_variance1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "type_variance1.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "type_variance1.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "type_variance1.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/unary_op-expected.txt b/ets2panda/test/parser/ets/unary_op-expected.txt index bf769e37b616412672e3972c0b1540c224e35d57..b3da19dedf2fb22174437bf913821f53640d71a2 100644 --- a/ets2panda/test/parser/ets/unary_op-expected.txt +++ b/ets2panda/test/parser/ets/unary_op-expected.txt @@ -130,779 +130,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "unary_op.ets" - }, - "end": { - "line": 16, - "column": 6, - "program": "unary_op.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 1, - "loc": { - "start": { - "line": 16, - "column": 9, - "program": "unary_op.ets" - }, - "end": { - "line": 16, - "column": 10, - "program": "unary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "unary_op.ets" - }, - "end": { - "line": 16, - "column": 10, - "program": "unary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "unary_op.ets" - }, - "end": { - "line": 16, - "column": 10, - "program": "unary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "unary_op.ets" - }, - "end": { - "line": 17, - "column": 6, - "program": "unary_op.ets" - } - } - }, - "right": { - "type": "UpdateExpression", - "operator": "++", - "prefix": false, - "argument": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 9, - "program": "unary_op.ets" - }, - "end": { - "line": 17, - "column": 10, - "program": "unary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 9, - "program": "unary_op.ets" - }, - "end": { - "line": 17, - "column": 12, - "program": "unary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "unary_op.ets" - }, - "end": { - "line": 17, - "column": 12, - "program": "unary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "unary_op.ets" - }, - "end": { - "line": 17, - "column": 12, - "program": "unary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "c", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "unary_op.ets" - }, - "end": { - "line": 18, - "column": 6, - "program": "unary_op.ets" - } - } - }, - "right": { - "type": "UpdateExpression", - "operator": "--", - "prefix": false, - "argument": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 9, - "program": "unary_op.ets" - }, - "end": { - "line": 18, - "column": 10, - "program": "unary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 9, - "program": "unary_op.ets" - }, - "end": { - "line": 18, - "column": 12, - "program": "unary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "unary_op.ets" - }, - "end": { - "line": 18, - "column": 12, - "program": "unary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 5, - "program": "unary_op.ets" - }, - "end": { - "line": 18, - "column": 12, - "program": "unary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "d", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "unary_op.ets" - }, - "end": { - "line": 19, - "column": 6, - "program": "unary_op.ets" - } - } - }, - "right": { - "type": "NumberLiteral", - "value": 5, - "loc": { - "start": { - "line": 19, - "column": 9, - "program": "unary_op.ets" - }, - "end": { - "line": 19, - "column": 11, - "program": "unary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "unary_op.ets" - }, - "end": { - "line": 19, - "column": 11, - "program": "unary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 5, - "program": "unary_op.ets" - }, - "end": { - "line": 19, - "column": 11, - "program": "unary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "e", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "unary_op.ets" - }, - "end": { - "line": 20, - "column": 6, - "program": "unary_op.ets" - } - } - }, - "right": { - "type": "UnaryExpression", - "operator": "-", - "prefix": true, - "argument": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 10, - "program": "unary_op.ets" - }, - "end": { - "line": 20, - "column": 11, - "program": "unary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 9, - "program": "unary_op.ets" - }, - "end": { - "line": 20, - "column": 11, - "program": "unary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "unary_op.ets" - }, - "end": { - "line": 20, - "column": 11, - "program": "unary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "unary_op.ets" - }, - "end": { - "line": 20, - "column": 11, - "program": "unary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "f", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "unary_op.ets" - }, - "end": { - "line": 21, - "column": 6, - "program": "unary_op.ets" - } - } - }, - "right": { - "type": "UnaryExpression", - "operator": "~", - "prefix": true, - "argument": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 10, - "program": "unary_op.ets" - }, - "end": { - "line": 21, - "column": 11, - "program": "unary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 9, - "program": "unary_op.ets" - }, - "end": { - "line": 21, - "column": 11, - "program": "unary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "unary_op.ets" - }, - "end": { - "line": 21, - "column": 11, - "program": "unary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 5, - "program": "unary_op.ets" - }, - "end": { - "line": 21, - "column": 11, - "program": "unary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "g", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "unary_op.ets" - }, - "end": { - "line": 22, - "column": 6, - "program": "unary_op.ets" - } - } - }, - "right": { - "type": "BooleanLiteral", - "value": true, - "loc": { - "start": { - "line": 22, - "column": 9, - "program": "unary_op.ets" - }, - "end": { - "line": 22, - "column": 13, - "program": "unary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "unary_op.ets" - }, - "end": { - "line": 22, - "column": 13, - "program": "unary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "unary_op.ets" - }, - "end": { - "line": 22, - "column": 13, - "program": "unary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "h", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 5, - "program": "unary_op.ets" - }, - "end": { - "line": 23, - "column": 6, - "program": "unary_op.ets" - } - } - }, - "right": { - "type": "UnaryExpression", - "operator": "!", - "prefix": true, - "argument": { - "type": "Identifier", - "name": "g", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 10, - "program": "unary_op.ets" - }, - "end": { - "line": 23, - "column": 11, - "program": "unary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 9, - "program": "unary_op.ets" - }, - "end": { - "line": 23, - "column": 11, - "program": "unary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 5, - "program": "unary_op.ets" - }, - "end": { - "line": 23, - "column": 11, - "program": "unary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 5, - "program": "unary_op.ets" - }, - "end": { - "line": 23, - "column": 11, - "program": "unary_op.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "j", - "decorators": [], - "loc": { - "start": { - "line": 25, - "column": 5, - "program": "unary_op.ets" - }, - "end": { - "line": 25, - "column": 6, - "program": "unary_op.ets" - } - } - }, - "right": { - "type": "BooleanLiteral", - "value": false, - "loc": { - "start": { - "line": 25, - "column": 9, - "program": "unary_op.ets" - }, - "end": { - "line": 25, - "column": 11, - "program": "unary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 25, - "column": 5, - "program": "unary_op.ets" - }, - "end": { - "line": 25, - "column": 11, - "program": "unary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 25, - "column": 5, - "program": "unary_op.ets" - }, - "end": { - "line": 25, - "column": 11, - "program": "unary_op.ets" - } - } - } - ], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "unary_op.ets" - }, - "end": { - "line": 25, - "column": 11, - "program": "unary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "unary_op.ets" - }, - "end": { - "line": 25, - "column": 11, - "program": "unary_op.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "unary_op.ets" - }, - "end": { - "line": 25, - "column": 11, - "program": "unary_op.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 5, - "program": "unary_op.ets" - }, - "end": { - "line": 25, - "column": 11, - "program": "unary_op.ets" - } - } - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/parser/ets/unary_operations-expected.txt b/ets2panda/test/parser/ets/unary_operations-expected.txt index a11ae01da3a3a1de1ce9d929154a4474ae1d4e9a..0dc3d9cb2751516e860d04dbb913dbe7a4624fa6 100644 --- a/ets2panda/test/parser/ets/unary_operations-expected.txt +++ b/ets2panda/test/parser/ets/unary_operations-expected.txt @@ -1394,112 +1394,6 @@ "program": "unary_operations.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "unary_operations.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "unary_operations.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "unary_operations.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "unary_operations.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "unary_operations.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "unary_operations.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "unary_operations.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "unary_operations.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/undefinedNullObjectTypeAnnotation-expected.txt b/ets2panda/test/parser/ets/undefinedNullObjectTypeAnnotation-expected.txt index 369e0b2918f85b887bac657ff9a21ce7f0014d09..ac6341ac40a7472cb2981f9e295acfc42559d432 100644 --- a/ets2panda/test/parser/ets/undefinedNullObjectTypeAnnotation-expected.txt +++ b/ets2panda/test/parser/ets/undefinedNullObjectTypeAnnotation-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "undefinedNullObjectTypeAnnotation.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "undefinedNullObjectTypeAnnotation.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "undefinedNullObjectTypeAnnotation.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "undefinedNullObjectTypeAnnotation.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "undefinedNullObjectTypeAnnotation.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "undefinedNullObjectTypeAnnotation.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "undefinedNullObjectTypeAnnotation.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "undefinedNullObjectTypeAnnotation.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/undefinedNullTypeAlias-expected.txt b/ets2panda/test/parser/ets/undefinedNullTypeAlias-expected.txt index e4f2eb5dad48733d2010997d5538bd1def8ee4e6..f1bf95834a9dd3c9a84cc85aa0ac7819914bbd44 100644 --- a/ets2panda/test/parser/ets/undefinedNullTypeAlias-expected.txt +++ b/ets2panda/test/parser/ets/undefinedNullTypeAlias-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "undefinedNullTypeAlias.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "undefinedNullTypeAlias.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "undefinedNullTypeAlias.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "undefinedNullTypeAlias.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "undefinedNullTypeAlias.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "undefinedNullTypeAlias.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "undefinedNullTypeAlias.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "undefinedNullTypeAlias.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/union_lowering_common_property-expected.txt b/ets2panda/test/parser/ets/union_lowering_common_property-expected.txt index c7b44b5d8a07d23a1a4a8956223cfe094560a82b..45f1ce65e271d877a2edbebb1a6472a92022798c 100644 --- a/ets2panda/test/parser/ets/union_lowering_common_property-expected.txt +++ b/ets2panda/test/parser/ets/union_lowering_common_property-expected.txt @@ -789,112 +789,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "union_lowering_common_property.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "union_lowering_common_property.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "union_lowering_common_property.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "union_lowering_common_property.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "union_lowering_common_property.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "union_lowering_common_property.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "union_lowering_common_property.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "union_lowering_common_property.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/user_defined_22-expected.txt b/ets2panda/test/parser/ets/user_defined_22-expected.txt index b62ff44fcc43e1cf049096623fe52c2a3269eac5..d466e40aad39ba99aaa7e8ec660f1552c46be394 100644 --- a/ets2panda/test/parser/ets/user_defined_22-expected.txt +++ b/ets2panda/test/parser/ets/user_defined_22-expected.txt @@ -467,354 +467,6 @@ } } }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "user_defined_22.ets" - }, - "end": { - "line": 20, - "column": 6, - "program": "user_defined_22.ets" - } - } - }, - "right": { - "type": "ETSNewClassInstanceExpression", - "typeReference": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "A", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 13, - "program": "user_defined_22.ets" - }, - "end": { - "line": 20, - "column": 14, - "program": "user_defined_22.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 13, - "program": "user_defined_22.ets" - }, - "end": { - "line": 20, - "column": 14, - "program": "user_defined_22.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 13, - "program": "user_defined_22.ets" - }, - "end": { - "line": 20, - "column": 14, - "program": "user_defined_22.ets" - } - } - }, - "arguments": [], - "loc": { - "start": { - "line": 20, - "column": 9, - "program": "user_defined_22.ets" - }, - "end": { - "line": 21, - "column": 2, - "program": "user_defined_22.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "user_defined_22.ets" - }, - "end": { - "line": 21, - "column": 2, - "program": "user_defined_22.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "user_defined_22.ets" - }, - "end": { - "line": 21, - "column": 2, - "program": "user_defined_22.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "MemberExpression", - "object": { - "type": "Identifier", - "name": "a", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 1, - "program": "user_defined_22.ets" - }, - "end": { - "line": 21, - "column": 2, - "program": "user_defined_22.ets" - } - } - }, - "property": { - "type": "Identifier", - "name": "type", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 3, - "program": "user_defined_22.ets" - }, - "end": { - "line": 21, - "column": 7, - "program": "user_defined_22.ets" - } - } - }, - "computed": false, - "optional": false, - "loc": { - "start": { - "line": 21, - "column": 1, - "program": "user_defined_22.ets" - }, - "end": { - "line": 21, - "column": 7, - "program": "user_defined_22.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 1, - "program": "user_defined_22.ets" - }, - "end": { - "line": 21, - "column": 7, - "program": "user_defined_22.ets" - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "b", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "user_defined_22.ets" - }, - "end": { - "line": 22, - "column": 6, - "program": "user_defined_22.ets" - } - } - }, - "right": { - "type": "StringLiteral", - "value": "", - "loc": { - "start": { - "line": 22, - "column": 12, - "program": "user_defined_22.ets" - }, - "end": { - "line": 22, - "column": 14, - "program": "user_defined_22.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "user_defined_22.ets" - }, - "end": { - "line": 22, - "column": 14, - "program": "user_defined_22.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 5, - "program": "user_defined_22.ets" - }, - "end": { - "line": 22, - "column": 14, - "program": "user_defined_22.ets" - } - } - } - ], - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "user_defined_22.ets" - }, - "end": { - "line": 22, - "column": 14, - "program": "user_defined_22.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "user_defined_22.ets" - }, - "end": { - "line": 22, - "column": 14, - "program": "user_defined_22.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "user_defined_22.ets" - }, - "end": { - "line": 22, - "column": 14, - "program": "user_defined_22.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 5, - "program": "user_defined_22.ets" - }, - "end": { - "line": 22, - "column": 14, - "program": "user_defined_22.ets" - } - } - }, { "type": "ClassProperty", "key": { @@ -1000,7 +652,7 @@ }, "end": { "line": 22, - "column": 14, + "column": 12, "program": "user_defined_22.ets" } } diff --git a/ets2panda/test/parser/ets/var_declare-expected.txt b/ets2panda/test/parser/ets/var_declare-expected.txt index 90be5126db79293841b546c52a618bd6dba92a7b..a03c80f127613e1872e48f4b38da3c9c448b3b80 100644 --- a/ets2panda/test/parser/ets/var_declare-expected.txt +++ b/ets2panda/test/parser/ets/var_declare-expected.txt @@ -908,112 +908,6 @@ "program": "var_declare.ets" } } - }, - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "var_declare.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "var_declare.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "var_declare.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "var_declare.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "var_declare.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "var_declare.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "var_declare.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "var_declare.ets" - } - } } ], "loc": { diff --git a/ets2panda/test/parser/ets/void-expected.txt b/ets2panda/test/parser/ets/void-expected.txt index 0547d89c7489e61f7593531fc607524c29dc3356..314461a3d666141ae582580befba95cabe8fc444 100644 --- a/ets2panda/test/parser/ets/void-expected.txt +++ b/ets2panda/test/parser/ets/void-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "void.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "void.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "void.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "void.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "void.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "void.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "void.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "void.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/parser/ets/voidAsTypeArg-expected.txt b/ets2panda/test/parser/ets/voidAsTypeArg-expected.txt index 2da78e8ed51b8ed31c665fc2141d7f0c2a9cb3bc..9ddb8ceb99dc86d6df5c9031fe989828081cb82c 100644 --- a/ets2panda/test/parser/ets/voidAsTypeArg-expected.txt +++ b/ets2panda/test/parser/ets/voidAsTypeArg-expected.txt @@ -24,112 +24,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": null - }, - "end": { - "line": 1, - "column": 1, - "program": null - } - } - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "voidAsTypeArg.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "voidAsTypeArg.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "voidAsTypeArg.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "voidAsTypeArg.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "voidAsTypeArg.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "voidAsTypeArg.ets" - } - } - }, - "overloads": [], - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 1, - "program": "voidAsTypeArg.ets" - }, - "end": { - "line": 1, - "column": 1, - "program": "voidAsTypeArg.ets" - } - } - }, { "type": "MethodDefinition", "key": { diff --git a/ets2panda/test/runtime/ets/lambda_inner_call_static_method.ets b/ets2panda/test/runtime/ets/lambda_inner_call_static_method.ets index ba42c886765ebce88fcca33f2398b5bc5c7f973a..e399ebe38dfa0d7fcaf4d1ff41b54f23b4b2a8c1 100644 --- a/ets2panda/test/runtime/ets/lambda_inner_call_static_method.ets +++ b/ets2panda/test/runtime/ets/lambda_inner_call_static_method.ets @@ -15,7 +15,7 @@ function foo(callback: () => string) { } -const bar = (): string => { +const bar: () => string = (): string => { return A.fob(); } diff --git a/ets2panda/test/runtime/ets/top_level_02.ets b/ets2panda/test/runtime/ets/top_level_02.ets index 2e8c92e5d73cb64ab52808d971b8f598cfe53d47..bbdf6f16085fac745a3fe7c28b521f4cd420ce79 100644 --- a/ets2panda/test/runtime/ets/top_level_02.ets +++ b/ets2panda/test/runtime/ets/top_level_02.ets @@ -54,13 +54,6 @@ function main(): void { arktest.assertEQ(q, 30) arktest.assertEQ(ETSGLOBAL.q, 1) - arktest.assertEQ(s, "abccba") s = "def"; arktest.assertEQ(s, "def") - - _$init$_(); - - arktest.assertEQ(s, "abccba") - arktest.assertEQ(q, 30) - arktest.assertEQ(ETSGLOBAL.q, 8) } diff --git a/ets2panda/test/unit/lsp/change_tracker_test.cpp b/ets2panda/test/unit/lsp/change_tracker_test.cpp index 1792bec428053ce66f6621fcc53b0e3291e29280..11623fefad767e64e32a84b3cbee9501a3994555 100644 --- a/ets2panda/test/unit/lsp/change_tracker_test.cpp +++ b/ets2panda/test/unit/lsp/change_tracker_test.cpp @@ -245,7 +245,8 @@ let obj = { auto *ast = context->parserProgram->Ast(); ASSERT_NE(ast, nullptr); auto *propertyNode = ast->FindChild([](const ark::es2panda::ir::AstNode *node) { - return node->IsProperty() && node->AsProperty()->Key()->AsIdentifier()->Name() == "foo"; + return node->IsProperty() && node->AsProperty()->Key()->AsIdentifier()->Name() == "foo" && + node->Parent()->IsObjectExpression() && node->Parent()->Parent()->IsAssignmentExpression(); }); ASSERT_NE(propertyNode, nullptr); ark::es2panda::ir::AstNode *newProperty = propertyNode->Clone(context->allocator, nullptr); @@ -258,7 +259,7 @@ let obj = { const auto &changes = tracker.GetChangeList(); const size_t c1 = 1; const auto bar = "bar"; - const auto newLine = ",\n"; + const auto newLine = ""; ASSERT_EQ(changes.size(), c1); const auto &change = changes[0]; const auto *replace = std::get_if(&change); diff --git a/ets2panda/test/unit/lsp/code_fix_registration_test.cpp b/ets2panda/test/unit/lsp/code_fix_registration_test.cpp index f2779d152ccf56b63c28e8b9a298af5b9b4a6e3d..1ab54a34f8c7860c6330e3c43cd1ec2c669ae7ce 100644 --- a/ets2panda/test/unit/lsp/code_fix_registration_test.cpp +++ b/ets2panda/test/unit/lsp/code_fix_registration_test.cpp @@ -86,7 +86,7 @@ TEST(RefactorProviderRegistrationTest, RegistersConvertFunctionRefactor) const auto &fixIdToRegistration = provider.GetFixIdToRegistration(); EXPECT_FALSE(errors.empty()); EXPECT_FALSE(fixIdToRegistration.empty()); - EXPECT_EQ(errors.size(), fixIdToRegistration.size()); + EXPECT_TRUE(errors.size() >= fixIdToRegistration.size()); } TEST_F(CodeFixProviderTest, CreatesCodeFixActionWithoutFixAll) @@ -192,7 +192,8 @@ a = 1; const size_t length = 1; const size_t expectedTextChangeStart = 1; const size_t expectedTextChangeLength = 5; - const int expectedFixResultSize = 1; + const int expectedFixResultSize = 2; + const int expectedcombinedFixResultSize = 1; const int expectedCombinedTextChangesSize = 1; std::vector errorCodes(ERROR_CODES.begin(), ERROR_CODES.end()); @@ -206,7 +207,7 @@ a = 1; CombinedCodeActionsInfo combinedFixResult = ark::es2panda::lsp::GetCombinedCodeFixImpl( context, std::string(ark::es2panda::lsp::codefixes::FIX_CONVERT_CONST_TO_LET.GetFixId()), emptyOptions); - ASSERT_EQ(combinedFixResult.changes_.size(), expectedFixResultSize); + ASSERT_EQ(combinedFixResult.changes_.size(), expectedcombinedFixResultSize); ASSERT_EQ(combinedFixResult.changes_[0].textChanges.size(), expectedCombinedTextChangesSize); ASSERT_EQ(combinedFixResult.changes_[0].fileName, filePaths[0]); ASSERT_EQ(combinedFixResult.changes_[0].textChanges[0].span.start, expectedTextChangeStart); diff --git a/ets2panda/test/unit/lsp/fix_convert_const_to_let_test.cpp b/ets2panda/test/unit/lsp/fix_convert_const_to_let_test.cpp index f3653aca19fdfc72b558e8cbae465d67328315b6..2e67fa3991881eeadcf1fbf9217c567ff95aedcb 100644 --- a/ets2panda/test/unit/lsp/fix_convert_const_to_let_test.cpp +++ b/ets2panda/test/unit/lsp/fix_convert_const_to_let_test.cpp @@ -91,7 +91,8 @@ a = 1; const size_t length = 1; const size_t expectedTextChangeStart = 1; const size_t expectedTextChangeLength = 5; - const int expectedFixResultSize = 1; + const int expectedFixResultSize = 2; + const int expectedCombinedFixResultSize = 1; const int expectedCombinedTextChangesSize = 1; std::vector errorCodes(ERROR_CODES.begin(), ERROR_CODES.end()); @@ -104,7 +105,7 @@ a = 1; CombinedCodeActionsInfo combinedFixResult = ark::es2panda::lsp::GetCombinedCodeFixImpl(context, EXPECTED_FIX_NAME.data(), emptyOptions); - ASSERT_EQ(combinedFixResult.changes_.size(), expectedFixResultSize); + ASSERT_EQ(combinedFixResult.changes_.size(), expectedCombinedFixResultSize); ASSERT_EQ(combinedFixResult.changes_[0].textChanges.size(), expectedCombinedTextChangesSize); ASSERT_EQ(combinedFixResult.changes_[0].fileName, filePaths[0]); ASSERT_EQ(combinedFixResult.changes_[0].textChanges[0].span.start, expectedTextChangeStart); @@ -135,7 +136,8 @@ b = 2; const size_t expectedTextChangeLength1 = 5; const size_t expectedTextChangeStart2 = 14; const size_t expectedTextChangeLength2 = 5; - const int expectedFixResultSize = 1; + const int expectedFixResultSize = 2; + const int expectedCombinedFixResultSize = 1; const int expectedCombinedTextChangesSize = 2; std::vector errorCodes(ERROR_CODES.begin(), ERROR_CODES.end()); @@ -152,7 +154,7 @@ b = 2; CombinedCodeActionsInfo combinedFixResult = ark::es2panda::lsp::GetCombinedCodeFixImpl(context, EXPECTED_FIX_NAME.data(), emptyOptions); - ASSERT_EQ(combinedFixResult.changes_.size(), expectedFixResultSize); + ASSERT_EQ(combinedFixResult.changes_.size(), expectedCombinedFixResultSize); ASSERT_EQ(combinedFixResult.changes_[0].textChanges.size(), expectedCombinedTextChangesSize); ASSERT_EQ(combinedFixResult.changes_[0].fileName, filePaths[0]); ASSERT_EQ(combinedFixResult.changes_[0].textChanges[0].span.start, expectedTextChangeStart1); @@ -181,7 +183,8 @@ a = 2; const size_t length = 1; const size_t expectedTextChangeStart = 16; const size_t expectedTextChangeLength = 5; - const int expectedFixResultSize = 1; + const int expectedFixResultSize = 2; + const int expectedCombinedFixResultSize = 1; const int expectedCombinedTextChangesSize = 1; std::vector errorCodes(ERROR_CODES.begin(), ERROR_CODES.end()); @@ -193,7 +196,7 @@ a = 2; CombinedCodeActionsInfo combinedFixResult = ark::es2panda::lsp::GetCombinedCodeFixImpl(context, EXPECTED_FIX_NAME.data(), emptyOptions); - ASSERT_EQ(combinedFixResult.changes_.size(), 1); + ASSERT_EQ(combinedFixResult.changes_.size(), expectedCombinedFixResultSize); ASSERT_EQ(combinedFixResult.changes_[0].textChanges.size(), expectedCombinedTextChangesSize); ASSERT_EQ(combinedFixResult.changes_[0].fileName, filePaths[0]); ASSERT_EQ(combinedFixResult.changes_[0].textChanges[0].span.start, expectedTextChangeStart); diff --git a/ets2panda/test/unit/lsp/get_current_token_value_test.cpp b/ets2panda/test/unit/lsp/get_current_token_value_test.cpp index 77160bf3e9e58240aa49abde5088c11312e3cee0..c3b623a302aded2aef1de94e1fccfcd9dea3c367 100644 --- a/ets2panda/test/unit/lsp/get_current_token_value_test.cpp +++ b/ets2panda/test/unit/lsp/get_current_token_value_test.cpp @@ -80,8 +80,9 @@ TEST_F(LSPAPITests, GetTokenPosOfNode1) ASSERT_EQ(ContextState(ctx), ES2PANDA_STATE_CHECKED); auto ast = GetAstFromContext(ctx); - auto targetNode = - ast->FindChild([](AstNode *node) { return node->IsIdentifier() && node->AsIdentifier()->Name() == "A"; }); + auto targetNode = ast->FindChild([](AstNode *node) { + return node->IsIdentifier() && node->AsIdentifier()->Name() == "A" && node->Parent()->IsCallExpression(); + }); ASSERT_NE(targetNode, nullptr); auto result = ark::es2panda::lsp::GetTokenPosOfNode(targetNode); diff --git a/ets2panda/test/unit/lsp/get_diagnostics.cpp b/ets2panda/test/unit/lsp/get_diagnostics.cpp index 0f6185e48d792987a718781a26c1986e0df7ba34..63dc7fb43751e5654f39841a17d7dcf1a2f531e9 100644 --- a/ets2panda/test/unit/lsp/get_diagnostics.cpp +++ b/ets2panda/test/unit/lsp/get_diagnostics.cpp @@ -51,31 +51,32 @@ add("1", 2);)"); initializer.DestroyContext(ctx); auto const expectedErrorCount = 3; ASSERT_EQ(result.diagnostic.size(), expectedErrorCount); + auto const firstIndex = 0; auto const thirdIndex = 2; auto const expectedFirstStartLine = 1; auto const expectedFirstStartCharacter = 19; auto const expectedFirstEndLine = 1; auto const expectedFirstEndCharacter = 26; - ASSERT_EQ(result.diagnostic[thirdIndex].range_.start.line_, expectedFirstStartLine); - ASSERT_EQ(result.diagnostic[thirdIndex].range_.start.character_, expectedFirstStartCharacter); - ASSERT_EQ(result.diagnostic[thirdIndex].range_.end.line_, expectedFirstEndLine); - ASSERT_EQ(result.diagnostic[thirdIndex].range_.end.character_, expectedFirstEndCharacter); - ASSERT_EQ(result.diagnostic[thirdIndex].severity_, DiagnosticSeverity::Error); - ASSERT_NE(std::get(result.diagnostic[thirdIndex].code_), 0); - ASSERT_EQ(result.diagnostic[thirdIndex].message_, R"(Type '"hello"' cannot be assigned to type 'Double')"); - ASSERT_EQ(result.diagnostic[thirdIndex].codeDescription_.href_, "test code description"); + ASSERT_EQ(result.diagnostic[firstIndex].range_.start.line_, expectedFirstStartLine); + ASSERT_EQ(result.diagnostic[firstIndex].range_.start.character_, expectedFirstStartCharacter); + ASSERT_EQ(result.diagnostic[firstIndex].range_.end.line_, expectedFirstEndLine); + ASSERT_EQ(result.diagnostic[firstIndex].range_.end.character_, expectedFirstEndCharacter); + ASSERT_EQ(result.diagnostic[firstIndex].severity_, DiagnosticSeverity::Error); + ASSERT_NE(std::get(result.diagnostic[firstIndex].code_), 0); + ASSERT_EQ(result.diagnostic[firstIndex].message_, R"(Type '"hello"' cannot be assigned to type 'Double')"); + ASSERT_EQ(result.diagnostic[firstIndex].codeDescription_.href_, "test code description"); auto const expectedSecondStartLine = 5; auto const expectedSecondStartCharacter = 5; auto const expectedSecondEndLine = 5; auto const expectedSecondEndCharacter = 8; - ASSERT_EQ(result.diagnostic[0].range_.start.line_, expectedSecondStartLine); - ASSERT_EQ(result.diagnostic[0].range_.start.character_, expectedSecondStartCharacter); - ASSERT_EQ(result.diagnostic[0].range_.end.line_, expectedSecondEndLine); - ASSERT_EQ(result.diagnostic[0].range_.end.character_, expectedSecondEndCharacter); - ASSERT_EQ(result.diagnostic[0].severity_, DiagnosticSeverity::Error); - ASSERT_NE(std::get(result.diagnostic[0].code_), 0); - ASSERT_EQ(result.diagnostic[0].message_, R"(Type '"1"' is not compatible with type 'Double' at index 1)"); - ASSERT_EQ(result.diagnostic[0].codeDescription_.href_, "test code description"); + ASSERT_EQ(result.diagnostic[thirdIndex].range_.start.line_, expectedSecondStartLine); + ASSERT_EQ(result.diagnostic[thirdIndex].range_.start.character_, expectedSecondStartCharacter); + ASSERT_EQ(result.diagnostic[thirdIndex].range_.end.line_, expectedSecondEndLine); + ASSERT_EQ(result.diagnostic[thirdIndex].range_.end.character_, expectedSecondEndCharacter); + ASSERT_EQ(result.diagnostic[thirdIndex].severity_, DiagnosticSeverity::Error); + ASSERT_NE(std::get(result.diagnostic[thirdIndex].code_), 0); + ASSERT_EQ(result.diagnostic[thirdIndex].message_, R"(Type '"1"' is not compatible with type 'Double' at index 1)"); + ASSERT_EQ(result.diagnostic[thirdIndex].codeDescription_.href_, "test code description"); } TEST_F(LspDiagnosticsTests, GetSyntacticDiagnostics1) @@ -105,7 +106,7 @@ let res = add(n, n);)"); LSPAPI const *lspApi = GetImpl(); auto result = lspApi->getSyntacticDiagnostics(ctx); initializer.DestroyContext(ctx); - auto const expectedErrorCount = 13; + auto const expectedErrorCount = 10; ASSERT_EQ(result.diagnostic.size(), expectedErrorCount); auto const expectedFirstStartLine = 1; auto const expectedFirstStartCharacter = 9; @@ -153,7 +154,7 @@ let res = add(n, n);)"); LSPAPI const *lspApi = GetImpl(); auto result = lspApi->getSyntacticDiagnostics(ctx); initializer.DestroyContext(ctx); - auto const forthIndex = 5; + auto const forthIndex = 4; auto const expectedForthStartLine = 1; auto const expectedForthStartCharacter = 22; auto const expectedForthEndLine = 1; @@ -166,7 +167,7 @@ let res = add(n, n);)"); ASSERT_NE(std::get(result.diagnostic[forthIndex].code_), 0); ASSERT_EQ(result.diagnostic[forthIndex].message_, R"(Unexpected token ','.)"); ASSERT_EQ(result.diagnostic[forthIndex].codeDescription_.href_, "test code description"); - auto const fifthIndex = 8; + auto const fifthIndex = 6; auto const expectedFifththStartLine = 1; auto const expectedFifthStartCharacter = 27; auto const expectedFifthEndLine = 1; @@ -193,7 +194,7 @@ let res = add(n, n);)"); LSPAPI const *lspApi = GetImpl(); auto result = lspApi->getSyntacticDiagnostics(ctx); initializer.DestroyContext(ctx); - auto const sixthIndex = 9; + auto const sixthIndex = 7; auto const expectedSixthStartLine = 1; auto const expectedSixthStartCharacter = 33; auto const expectedSixthEndLine = 1; @@ -206,7 +207,7 @@ let res = add(n, n);)"); ASSERT_NE(std::get(result.diagnostic[sixthIndex].code_), 0); ASSERT_EQ(result.diagnostic[sixthIndex].message_, R"(Unexpected token ')'.)"); ASSERT_EQ(result.diagnostic[sixthIndex].codeDescription_.href_, "test code description"); - auto const sevenIndex = 12; + auto const sevenIndex = 9; auto const expectedSeventhStartLine = 2; auto const expectedSeventhStartCharacter = 5; auto const expectedSeventhEndLine = 2; diff --git a/ets2panda/test/unit/lsp/get_implementation_location.cpp b/ets2panda/test/unit/lsp/get_implementation_location.cpp index 277af8005a98d0ec8efabbf13d77efd38830b95d..2bb23694b7e4109a39f36826cd0f73da5231a72d 100644 --- a/ets2panda/test/unit/lsp/get_implementation_location.cpp +++ b/ets2panda/test/unit/lsp/get_implementation_location.cpp @@ -126,10 +126,10 @@ TEST_F(LspGILAPTests, GILAPIsAsTypeNode_Test) es2panda_Context *ctx = initializer.CreateContext("dummy-node.ets", ES2PANDA_STATE_CHECKED, code); ASSERT_EQ(ContextState(ctx), ES2PANDA_STATE_CHECKED); - size_t const offset = 159; + size_t const offset = 175; auto result = ark::es2panda::lsp::GetTouchingToken(ctx, offset, false); ASSERT_NE(result, nullptr); - ASSERT_TRUE(ark::es2panda::lsp::IsAsTypeNode(result)); + ASSERT_TRUE(result->IsTSAsExpression()); initializer.DestroyContext(ctx); } diff --git a/ets2panda/test/unit/lsp/get_touching_token_test.cpp b/ets2panda/test/unit/lsp/get_touching_token_test.cpp index a25b3de2a4c4f2cea3800fdd302dd298540dc8a7..99f87f6a9afa8c384c201d675cb94d55b619f565 100644 --- a/ets2panda/test/unit/lsp/get_touching_token_test.cpp +++ b/ets2panda/test/unit/lsp/get_touching_token_test.cpp @@ -50,8 +50,9 @@ TEST_F(LSPAPITests, GetTouchingToken2) size_t const offset = 51; auto result = ark::es2panda::lsp::GetTouchingToken(ctx, offset, false); auto ast = GetAstFromContext(ctx); - auto expectedNode = ast->FindChild( - [](ark::es2panda::ir::AstNode *node) { return node->IsIdentifier() && node->AsIdentifier()->Name() == "A"; }); + auto expectedNode = ast->FindChild([](ark::es2panda::ir::AstNode *node) { + return node->IsIdentifier() && node->AsIdentifier()->Name() == "A" && node->Parent()->IsCallExpression(); + }); ASSERT_EQ(result->DumpJSON(), expectedNode->DumpJSON()); ASSERT_EQ(result->Start().index, expectedNode->Start().index); ASSERT_EQ(result->End().index, expectedNode->End().index); @@ -68,7 +69,8 @@ TEST_F(LSPAPITests, GetTouchingToken3) auto result = ark::es2panda::lsp::GetTouchingToken(ctx, offset, true); auto ast = GetAstFromContext(ctx); auto expectedNode = ast->FindChild([](ark::es2panda::ir::AstNode *node) { - return node->IsMethodDefinition() && node->AsMethodDefinition()->Key()->AsIdentifier()->Name().Is("_$init$_"); + return node->IsClassStaticBlock() && node->Parent()->IsClassDefinition() && + node->Parent()->AsClassDefinition()->IsGlobal(); }); ASSERT_EQ(result->DumpJSON(), expectedNode->DumpJSON()); ASSERT_EQ(result->Start().index, expectedNode->Start().index); diff --git a/ets2panda/test/unit/lsp/inlay_hints_test.cpp b/ets2panda/test/unit/lsp/inlay_hints_test.cpp index de404eae342dac6d6b918be5ee93099ae393f955..2fd224497dcb7776bced06ee284486c98d64c18f 100644 --- a/ets2panda/test/unit/lsp/inlay_hints_test.cpp +++ b/ets2panda/test/unit/lsp/inlay_hints_test.cpp @@ -221,7 +221,6 @@ TEST_F(LSPInlayHintsTests, VisitFunctionDeclarationLikeForReturnTypeTest1) const size_t i0 = 0; const size_t i1 = 1; const size_t i2 = 2; - const size_t i3 = 3; const auto filePaths = CreateTempFile(files, fileContent); ASSERT_EQ(filePaths.size(), i1); InlayHintList result; @@ -238,10 +237,10 @@ TEST_F(LSPInlayHintsTests, VisitFunctionDeclarationLikeForReturnTypeTest1) } return false; }); + ASSERT_EQ(result.hints[i1].text, doubleString); + ASSERT_EQ(result.hints[i1].number, addIndex); ASSERT_EQ(result.hints[i2].text, doubleString); - ASSERT_EQ(result.hints[i2].number, addIndex); - ASSERT_EQ(result.hints[i3].text, doubleString); - ASSERT_EQ(result.hints[i3].number, multiplyIndex); + ASSERT_EQ(result.hints[i2].number, multiplyIndex); initializer.DestroyContext(ctx); } @@ -265,7 +264,6 @@ TEST_F(LSPInlayHintsTests, VisitFunctionDeclarationLikeForReturnTypeTest2) const size_t i0 = 0; const size_t i1 = 1; const size_t i2 = 2; - const size_t i3 = 3; const auto filePaths = CreateTempFile(files, fileContent); ASSERT_EQ(filePaths.size(), i1); @@ -283,10 +281,10 @@ TEST_F(LSPInlayHintsTests, VisitFunctionDeclarationLikeForReturnTypeTest2) } return false; }); - ASSERT_EQ(result.hints[i2].text, stdString); - ASSERT_EQ(result.hints[i2].number, greetIndex); - ASSERT_EQ(result.hints[i3].text, voidString); - ASSERT_EQ(result.hints[i3].number, sayHelloIndex); + ASSERT_EQ(result.hints[i1].text, stdString); + ASSERT_EQ(result.hints[i1].number, greetIndex); + ASSERT_EQ(result.hints[i2].text, voidString); + ASSERT_EQ(result.hints[i2].number, sayHelloIndex); initializer.DestroyContext(ctx); } diff --git a/ets2panda/test/unit/lsp/suggestion_diagnostics_test.cpp b/ets2panda/test/unit/lsp/suggestion_diagnostics_test.cpp index c97fcbf90b3dfd144ec62d79d496d2945594a228..4f445575c8a91811fbf334d527d59df2f663af76 100644 --- a/ets2panda/test/unit/lsp/suggestion_diagnostics_test.cpp +++ b/ets2panda/test/unit/lsp/suggestion_diagnostics_test.cpp @@ -67,7 +67,7 @@ TEST_F(LspSuggestionTests, hasSupportedNumberOfArguments) } return false; }); - EXPECT_TRUE(ark::es2panda::lsp::HasSupportedNumberOfArguments(callExprs.at(0))); + EXPECT_TRUE(ark::es2panda::lsp::HasSupportedNumberOfArguments(callExprs.at(1))); initializer.DestroyContext(ctx); } TEST_F(LspSuggestionTests, hasSupportedNumberOfArguments2) @@ -86,7 +86,7 @@ TEST_F(LspSuggestionTests, hasSupportedNumberOfArguments2) return false; }); - EXPECT_TRUE(ark::es2panda::lsp::HasSupportedNumberOfArguments(callExprs.at(0))); + EXPECT_TRUE(ark::es2panda::lsp::HasSupportedNumberOfArguments(callExprs.at(1))); initializer.DestroyContext(ctx); } TEST_F(LspSuggestionTests, hasSupportedNumberOfArguments3) @@ -104,7 +104,7 @@ TEST_F(LspSuggestionTests, hasSupportedNumberOfArguments3) } return false; }); - EXPECT_TRUE(ark::es2panda::lsp::HasSupportedNumberOfArguments(callExprs.at(0))); + EXPECT_TRUE(ark::es2panda::lsp::HasSupportedNumberOfArguments(callExprs.at(1))); initializer.DestroyContext(ctx); } TEST_F(LspSuggestionTests, hasSupportedNumberOfArguments4) @@ -122,7 +122,7 @@ TEST_F(LspSuggestionTests, hasSupportedNumberOfArguments4) } return false; }); - EXPECT_TRUE(ark::es2panda::lsp::HasSupportedNumberOfArguments(callExprs.at(0))); + EXPECT_TRUE(ark::es2panda::lsp::HasSupportedNumberOfArguments(callExprs.at(1))); initializer.DestroyContext(ctx); } @@ -222,7 +222,7 @@ TEST_F(LspSuggestionTests, isPromiseHandler) } return false; }); - EXPECT_TRUE(ark::es2panda::lsp::IsPromiseHandler(callExprs.at(0))); + EXPECT_TRUE(ark::es2panda::lsp::IsPromiseHandler(callExprs.at(1))); initializer.DestroyContext(ctx); } @@ -241,7 +241,7 @@ TEST_F(LspSuggestionTests, isPromiseHandler2) } return false; }); - EXPECT_TRUE(ark::es2panda::lsp::IsPromiseHandler(callExprs.at(0))); + EXPECT_TRUE(ark::es2panda::lsp::IsPromiseHandler(callExprs.at(1))); initializer.DestroyContext(ctx); } @@ -260,7 +260,7 @@ TEST_F(LspSuggestionTests, isPromiseHandler3) } return false; }); - EXPECT_TRUE(ark::es2panda::lsp::IsPromiseHandler(callExprs.at(0))); + EXPECT_TRUE(ark::es2panda::lsp::IsPromiseHandler(callExprs.at(1))); initializer.DestroyContext(ctx); } @@ -279,7 +279,7 @@ TEST_F(LspSuggestionTests, isPromiseHandler4) } return false; }); - EXPECT_TRUE(ark::es2panda::lsp::IsPromiseHandler(callExprs.at(0))); + EXPECT_TRUE(ark::es2panda::lsp::IsPromiseHandler(callExprs.at(1))); initializer.DestroyContext(ctx); } } // namespace \ No newline at end of file diff --git a/ets2panda/test/unit/plugin/e2p_test_plugin_after_bind-expected.txt b/ets2panda/test/unit/plugin/e2p_test_plugin_after_bind-expected.txt index 825ed8e0f04c42c7b37c7974fcdceb7dacf52358..35b859a72ab21fd306cfb62565196b42c01b4717 100644 --- a/ets2panda/test/unit/plugin/e2p_test_plugin_after_bind-expected.txt +++ b/ets2panda/test/unit/plugin/e2p_test_plugin_after_bind-expected.txt @@ -12,90 +12,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [] - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [] - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "a", - "decorators": [] - }, - "right": { - "type": "CallExpression", - "callee": { - "type": "Identifier", - "name": "GoodGreeter", - "decorators": [] - }, - "arguments": [], - "optional": false - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "c", - "decorators": [] - }, - "right": { - "type": "ETSNewClassInstanceExpression", - "typeReference": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "GoodGreeter", - "decorators": [] - } - } - }, - "arguments": [] - } - } - } - ] - } - } - }, - "overloads": [], - "decorators": [] - }, { "type": "ClassProperty", "key": { @@ -606,90 +522,6 @@ "superClass": null, "implements": [], "body": [ - { - "type": "MethodDefinition", - "key": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [] - }, - "kind": "method", - "accessibility": "public", - "static": true, - "optional": false, - "computed": false, - "value": { - "type": "FunctionExpression", - "function": { - "type": "ScriptFunction", - "id": { - "type": "Identifier", - "name": "_$init$_", - "decorators": [] - }, - "generator": false, - "async": false, - "expression": false, - "params": [], - "body": { - "type": "BlockStatement", - "statements": [ - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "a", - "decorators": [] - }, - "right": { - "type": "CallExpression", - "callee": { - "type": "Identifier", - "name": "GoodGreeter", - "decorators": [] - }, - "arguments": [], - "optional": false - } - } - }, - { - "type": "ExpressionStatement", - "expression": { - "type": "AssignmentExpression", - "operator": "=", - "left": { - "type": "Identifier", - "name": "c", - "decorators": [] - }, - "right": { - "type": "ETSNewClassInstanceExpression", - "typeReference": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "GoodGreeter", - "decorators": [] - } - } - }, - "arguments": [] - } - } - } - ] - } - } - }, - "overloads": [], - "decorators": [] - }, { "type": "ClassProperty", "key": { diff --git a/ets2panda/test/unit/public/ast_verifier_private_access_negative_test.cpp b/ets2panda/test/unit/public/ast_verifier_private_access_negative_test.cpp index 4fbc212dba126534b2352772abe78d8a644b1d23..f8dd049327fa4013b67dd1832336814033683060 100644 --- a/ets2panda/test/unit/public/ast_verifier_private_access_negative_test.cpp +++ b/ets2panda/test/unit/public/ast_verifier_private_access_negative_test.cpp @@ -151,7 +151,7 @@ TEST_F(ASTVerifierTest, PrivateAccessTestNegative5) ->AsClassDeclaration() ->Definition() ->AsClassDefinition() - ->Body()[1] + ->Body()[0] ->AsClassElement() ->Value() ->AsFunctionExpression() @@ -193,7 +193,7 @@ TEST_F(ASTVerifierTest, PrivateAccessTestNegative6) ->AsClassDeclaration() ->Definition() ->AsClassDefinition() - ->Body()[1] + ->Body()[0] ->AsClassElement() ->Value() ->AsFunctionExpression() @@ -235,7 +235,7 @@ TEST_F(ASTVerifierTest, PrivateAccessTestNegative7) ->AsClassDeclaration() ->Definition() ->AsClassDefinition() - ->Body()[1] + ->Body()[0] ->AsClassElement() ->Value() ->AsFunctionExpression() diff --git a/ets2panda/test/unit/public/ast_verifier_protected_access_negative_test.cpp b/ets2panda/test/unit/public/ast_verifier_protected_access_negative_test.cpp index 2573cc1244f5604e63a9483ac5be715148b32388..f2000145e4132087de77467426aaab5e19ead0d8 100644 --- a/ets2panda/test/unit/public/ast_verifier_protected_access_negative_test.cpp +++ b/ets2panda/test/unit/public/ast_verifier_protected_access_negative_test.cpp @@ -125,7 +125,7 @@ TEST_F(ASTVerifierTest, ProtectedAccessTestNegative4) ->AsClassDeclaration() ->Definition() ->AsClassDefinition() - ->Body()[1] + ->Body()[0] ->AsClassElement() ->Value() ->AsFunctionExpression() @@ -167,7 +167,7 @@ TEST_F(ASTVerifierTest, ProtectedAccessTestNegative5) ->AsClassDeclaration() ->Definition() ->AsClassDefinition() - ->Body()[1] + ->Body()[0] ->AsClassElement() ->Value() ->AsFunctionExpression() @@ -203,13 +203,14 @@ TEST_F(ASTVerifierTest, ProtectedAccessTestNegative6) )"; CONTEXT(ES2PANDA_STATE_CHECKED, text) { - GetAst() + auto *x = GetAst(); + x->AsETSModule() ->AsETSModule() ->Statements()[0] ->AsClassDeclaration() ->Definition() ->AsClassDefinition() - ->Body()[1] + ->Body()[0] ->AsClassElement() ->Value() ->AsFunctionExpression() diff --git a/ets2panda/test/unit/public/ast_verifier_short_test.cpp b/ets2panda/test/unit/public/ast_verifier_short_test.cpp index 4a20d2a0540dbc26ed29e1649e1400191036df99..893f27a28d66caf20fdccd20223a968b6cbf820f 100644 --- a/ets2panda/test/unit/public/ast_verifier_short_test.cpp +++ b/ets2panda/test/unit/public/ast_verifier_short_test.cpp @@ -241,7 +241,7 @@ TEST_F(ASTVerifierTest, VariableNameIdentifierNameSameNegative) ->AsClassDeclaration() ->Definition() ->AsClassDefinition() - ->Body()[1] + ->Body()[0] ->AsClassElement() ->Value() ->AsFunctionExpression() diff --git a/ets2panda/util/diagnostic/semantic.yaml b/ets2panda/util/diagnostic/semantic.yaml index b07d3fb9be364cbc3059bace2b430f90c63d9d58..b3298b21ae5c0184528064278c719e4a151cfc99 100644 --- a/ets2panda/util/diagnostic/semantic.yaml +++ b/ets2panda/util/diagnostic/semantic.yaml @@ -472,6 +472,7 @@ semantic: - name: FIELD_REASSIGNMENT id: 297 message: "Cannot reassign {} {}" + code_fix_ids: [FixConvertConstToLet] - name: FINAL_METHOD_INVALID_MODIFIER id: 48 diff --git a/ets2panda/util/diagnosticEngine.cpp b/ets2panda/util/diagnosticEngine.cpp index ce2147a3f7453cff2bdfa626d009bfda7b38d4a4..82e2ad43f4574691fd11860e1185ab835c631fcf 100644 --- a/ets2panda/util/diagnosticEngine.cpp +++ b/ets2panda/util/diagnosticEngine.cpp @@ -37,6 +37,15 @@ void CLIDiagnosticPrinter::Print(const DiagnosticBase &diagnostic) const Print(diagnostic, std::cout); } +void DiagnosticEngine::CleanDuplicateLog(DiagnosticType type) +{ + DiagnosticStorage &log = diagnostics_[type]; + std::sort(log.begin(), log.end(), [](const auto &lhs, const auto &rhs) { return *lhs < *rhs; }); + auto last = + std::unique(log.begin(), log.end(), [&](const auto &rhs, const auto &lhs) -> bool { return *rhs == *lhs; }); + log.resize(std::distance(log.begin(), last)); +} + const DiagnosticStorage &DiagnosticEngine::GetDiagnosticStorage(DiagnosticType type) { return diagnostics_[type]; diff --git a/ets2panda/util/diagnosticEngine.h b/ets2panda/util/diagnosticEngine.h index 9b227cca27b5d8404860319d62a81fb323785fb9..14dbc790a8ac05a630d6eb043a17b6ba91cb0af0 100644 --- a/ets2panda/util/diagnosticEngine.h +++ b/ets2panda/util/diagnosticEngine.h @@ -141,6 +141,8 @@ public: wError_ = wError; } + void CleanDuplicateLog(DiagnosticType type); + const DiagnosticStorage &GetDiagnosticStorage(DiagnosticType type); static void InitializeSignalHandlers();