From 3676ab82f32230d55d0d8490427be1dc7dabb19a Mon Sep 17 00:00:00 2001 From: tengtengh Date: Fri, 1 Aug 2025 11:13:33 +0800 Subject: [PATCH] Reorder toplevel statements and remove _$init$_ Issue: https://gitee.com/openharmony/arkcompiler_ets_frontend/issues/ICQAON Signed-off-by: tengtengh --- .../test/expected/getSemanticDiagnostics.json | 40 +- .../expected/getSyntacticDiagnostics.json | 63 - ets2panda/checker/ETSAnalyzer.cpp | 7 + ets2panda/checker/ETSchecker.h | 1 + ets2panda/checker/ets/helpers.cpp | 57 + ets2panda/compiler/core/ETSfunction.cpp | 19 +- .../ets/topLevelStmts/globalClassHandler.cpp | 68 +- .../ets/topLevelStmts/globalClassHandler.h | 2 + .../topLevelStmts/globalDeclTransformer.cpp | 37 +- .../ets/topLevelStmts/globalDeclTransformer.h | 1 + ets2panda/ir/base/classDefinition.h | 11 + ets2panda/ir/statements/ifStatement.cpp | 2 +- .../ir/statements/switchCaseStatement.cpp | 2 +- ets2panda/lsp/src/api.cpp | 2 + ets2panda/lsp/src/completions.cpp | 14 +- ets2panda/parser/ETSparserExpressions.cpp | 3 +- .../ast/compiler/ets/DeclareCheckAssign.ets | 42 +- .../ets/FixedArray/unresolved_reference.ets | 2 +- ...ionUsage_duplicate_on_extension_lambda.ets | 2 +- .../compiler/ets/circular_variable_init.ets | 2 +- .../compiler/ets/class_cyclic_constructor.ets | 4 +- ets2panda/test/ast/compiler/ets/getType.ets | 6 +- .../import_export/eitest_import_all_4_ne.ets | 3 +- .../import_in_package_with_error.ets | 4 - .../package_with_errors_1.ets | 4 - .../package_with_errors_2.ets | 4 - .../ets/package_invalid_initializer/P3/P3.ets | 3 - .../package_invalid_initializer/main_test.ets | 3 - .../type_error_processing/var_without_def.ets | 4 +- .../ast/compiler/ets/unresolved_reference.ets | 2 +- .../ets/FixedArray/MultipleParserErrors.ets | 19 +- .../ast/parser/ets/MultipleParserErrors.ets | 14 +- .../extension_function_error2.ets | 10 +- .../test/ast/parser/ets/for_await_of_loop.ets | 8 +- .../parser/ets/invalid_object_expression.ets | 4 +- .../ast/parser/ets/unexpected_token_63.ets | 10 +- .../ast/parser/ets/update_funcscope_error.ets | 4 +- .../test/compiler/ets/116100-expected.txt | 223 +- ...ditionalExpressionCallVoidNeg-expected.txt | 106 - .../compiler/ets/FunctionType2-expected.txt | 106 - .../compiler/ets/FunctionType4-expected.txt | 174 +- ...ctMethodDeclaredInParentClass-expected.txt | 106 - ...actNewClassInstanceExpression-expected.txt | 281 - .../ets/ambient_declaration-expected.txt | 106 - ..._without_chaining_non_nullish-expected.txt | 400 +- .../ets/array_with_null_type-expected.txt | 106 - .../array_with_undefined_type-expected.txt | 106 - .../ets/arrowFunctionCapture-expected.txt | 106 - .../ets/boxingConversion10-expected.txt | 240 +- .../ets/boxingConversion2-expected.txt | 106 - .../ets/boxingConversion3-expected.txt | 106 - .../ets/boxingConversion5-expected.txt | 374 +- .../ets/boxingConversion6-expected.txt | 575 +- .../ets/boxingConversion7-expected.txt | 441 +- .../ets/boxingConversion8-expected.txt | 441 +- .../ets/boxingConversion9-expected.txt | 307 +- .../boxingUnboxingExpressions-expected.txt | 106 - .../ets/catch-soft-keyword-expected.txt | 106 - .../compiler/ets/catchParamScope-expected.txt | 106 - .../ets/class_def_varargs_1-expected.txt | 106 - .../ets/class_def_varargs_2-expected.txt | 106 - .../ets/conversion-w-ASExpr-expected.txt | 138 +- .../ets/conversion_w_functions-expected.txt | 106 - .../ets/delete-non-keyword-expected.txt | 106 - .../ensureNotNullArgNotNullable-expected.txt | 106 - ...ensureNotNullLocalNotNullable-expected.txt | 106 - ...nsureNotNullReturnNotNullable-expected.txt | 106 - ...as_class_member_getValue_call-expected.txt | 106 - .../compiler/ets/export_type-expected.txt | 106 - ...ed_conditional_expression_not-expected.txt | 106 - ...al_expression_not_return_type-expected.txt | 106 - .../test/compiler/ets/forUpdate-expected.txt | 106 - .../ets/forUpdateCharType-expected.txt | 106 - .../ets/from-soft-keyword-0-expected.txt | 106 - .../ets/from-soft-keyword-1-expected.txt | 106 - .../ets/from-soft-keyword-2-expected.txt | 106 - .../ets/func-ref-private-expected.txt | 106 - .../ets/functionPointerArray-expected.txt | 106 - .../ets/functionTypeToObject-expected.txt | 106 - .../ets/function_subtyping_1-expected.txt | 106 - ...with_ambiguous_rest_parameter-expected.txt | 106 - .../ets/generic_arrayaslist-expected.txt | 128 +- .../generic_class_getter_setter-expected.txt | 106 - .../ets/generic_deadlock-expected.txt | 106 - ..._func_rest_param_spread_infer-expected.txt | 106 - .../ets/generic_function_call_1-expected.txt | 106 - .../ets/generic_function_call_3-expected.txt | 106 - .../ets/generic_function_call_4-expected.txt | 106 - .../ets/generic_function_call_5-expected.txt | 106 - .../ets/generic_function_call_7-expected.txt | 106 - .../ets/generic_override_1-expected.txt | 106 - .../ets/generic_override_2-expected.txt | 106 - .../ets/generic_override_3-expected.txt | 106 - .../ets/generic_typealias_1-expected.txt | 106 - .../ets/generic_typealias_6-expected.txt | 106 - .../ets/generic_typealias_7_neg-expected.txt | 106 - .../ets/generic_typealias_8-expected.txt | 106 - .../ets/generic_typealias_9-expected.txt | 106 - .../ets/generic_variance_1-expected.txt | 106 - ...nerics_class_recursive_type_1-expected.txt | 106 - .../generics_implicit_lambda1-expected.txt | 106 - .../ets/generics_instantiation_1-expected.txt | 114 +- .../ets/generics_instantiation_2-expected.txt | 106 - .../ets/generics_instantiation_3-expected.txt | 106 - .../ets/generics_instantiation_4-expected.txt | 106 - .../generics_interface_bounds_1-expected.txt | 106 - .../generics_interface_bounds_2-expected.txt | 106 - ...nerics_primitive_type_param_1-expected.txt | 106 - .../ets/identifierReference14-expected.txt | 106 - .../ets/identifierReference4-expected.txt | 173 +- .../ets/implicit-conversion-expected.txt | 106 - .../package_module_1-expected.txt | 303 +- .../package_module_2-expected.txt | 301 - .../separate_module_1-expected.txt | 173 +- .../package_module_1-expected.txt | 106 - .../package_module_2-expected.txt | 106 - .../separate_module_1-expected.txt | 173 +- .../asyncfun_lambda_lib-expected.txt | 106 - .../asyncfunc_lambda_main-expected.txt | 106 - .../ets/import_tests/enum_export-expected.txt | 106 - .../ets/import_tests/enum_import-expected.txt | 106 - ...rt_class_with_getters_setters-expected.txt | 106 - .../generic_typealias_func_type-expected.txt | 106 - ...neric_typealias_func_type_lib-expected.txt | 106 - ...rt_class_with_getters_setters-expected.txt | 106 - ...imported_function_return_type-expected.txt | 106 - ...rted_function_return_type_lib-expected.txt | 106 - .../re-export_with_alias/export-expected.txt | 173 +- .../import_aliased_re-export-expected.txt | 106 - .../re-export_with_alias-expected.txt | 106 - .../import_interface-expected.txt | 106 - .../import_selective_exported-expected.txt | 106 - .../selective_export-expected.txt | 235 - .../selective_export_function-expected.txt | 106 - .../selective_export_interface-expected.txt | 106 - .../selective_export_with_alias-expected.txt | 171 - ...selective_import_with_alias_1-expected.txt | 106 - ...selective_import_with_alias_2-expected.txt | 106 - .../compiler/ets/import_type-expected.txt | 440 -- .../ets/inferTypeOfArray-expected.txt | 1010 --- .../ets/instanceof_object_long-expected.txt | 106 - ...erface_noreturn_type_function-expected.txt | 106 - .../ets/invalidCallInstruction-expected.txt | 106 - .../ets/invalidInheritance3-expected.txt | 106 - .../compiler/ets/lambdaFunction1-expected.txt | 373 +- ...ambdaFunctionArrayDeclaration-expected.txt | 106 - .../ets/lambda_capturing-expected.txt | 106 - ...bda_cast_infer_type_narrowing-expected.txt | 112 +- .../lambda_cast_infer_type_void-expected.txt | 112 +- ...mbda_cast_infer_type_widening-expected.txt | 112 +- .../lambda_cast_type_has_pramas-expected.txt | 112 +- .../lambda_infer_type-expected.txt | 106 - ...a_infer_type_arrow_expression-expected.txt | 106 - ...type_arrow_expression_literal-expected.txt | 106 - .../lambda_infer_type_has_return-expected.txt | 106 - .../lambda_infer_type_param2-expected.txt | 116 +- ...ambda_infer_type_return_array-expected.txt | 106 - ...mbda_infer_type_return_lambda-expected.txt | 106 - ...bda_infer_type_return_lambda1-expected.txt | 106 - ...type_return_lambda_expression-expected.txt | 191 +- ...bda_infer_type_return_literal-expected.txt | 106 - ...ambda_infer_type_return_union-expected.txt | 106 - .../lambda_infer_type_scope-expected.txt | 392 +- .../ets/lambda_unresolved_ref_1-expected.txt | 106 - .../ets/launch_expression-expected.txt | 431 +- .../ets/loopWithinLambda-expected.txt | 106 - .../ets/lowering-interaction-expected.txt | 106 - .../ets/manyLocalsParamRegUsage-expected.txt | 106 - .../ets/memberExprInLambda-expected.txt | 106 - ...erExpressionFromStaticContext-expected.txt | 106 - ...and-interface-in-signatures_5-expected.txt | 106 - .../methodOverrideAsyncMethod-expected.txt | 106 - ...odOverrideCovariantReturnType-expected.txt | 106 - ...hodOverrideDifferentSignature-expected.txt | 106 - ...methodOverrideWithoutModifier-expected.txt | 106 - .../ets/multipleMethodOverride-expected.txt | 106 - .../n_nullableTypeInArgNotRef-expected.txt | 106 - .../n_nullableTypeInReturnNotRef-expected.txt | 106 - .../ets/n_nullableTypeNotRef-expected.txt | 106 - .../compiler/ets/native_toplevel-expected.txt | 106 - .../non-const-lambda-with-scopes-expected.txt | 106 - .../null_coalescing_generic_1-expected.txt | 106 - .../compiler/ets/nullableTuple-expected.txt | 106 - ...ullable_type_in_arithmeticdiv-expected.txt | 106 - ...llable_type_in_arithmeticplus-expected.txt | 106 - .../ets/objectLiteralInterface-expected.txt | 173 +- .../ets/objectLiteralReadonlyKey-expected.txt | 228 +- .../ets/overload_with_generics-expected.txt | 106 - .../test/compiler/ets/override-expected.txt | 106 - .../test/compiler/ets/override10-expected.txt | 106 - .../test/compiler/ets/override12-expected.txt | 106 - .../test/compiler/ets/override13-expected.txt | 106 - .../test/compiler/ets/override16-expected.txt | 106 - .../test/compiler/ets/override17-expected.txt | 106 - .../test/compiler/ets/override2-expected.txt | 106 - .../test/compiler/ets/override4-expected.txt | 106 - .../test/compiler/ets/override5-expected.txt | 106 - .../test/compiler/ets/override6-expected.txt | 106 - .../test/compiler/ets/override8-expected.txt | 106 - .../test/compiler/ets/override9-expected.txt | 106 - .../ets/parenthesizedType-expected.txt | 106 - .../compiler/ets/requiredType_1-expected.txt | 106 - .../compiler/ets/requiredType_11-expected.txt | 106 - .../compiler/ets/requiredType_4-expected.txt | 106 - .../compiler/ets/requiredType_5-expected.txt | 106 - .../compiler/ets/requiredType_9-expected.txt | 106 - .../ets/returnTypeGenericArray-expected.txt | 106 - .../ets/switchStatementBoxing-expected.txt | 106 - ...tchStatementCorrectConversion-expected.txt | 106 - .../this_type_valid_return_type-expected.txt | 106 - .../ets/throwInCatchClause3-expected.txt | 108 +- .../ets/throwInFinallyBlock1-expected.txt | 106 - .../ets/throwInTryStatement-expected.txt | 106 - ...tryCatchErrorMissingParamType-expected.txt | 106 - .../ets/tryCatchMissingParamType-expected.txt | 106 - .../ets/tryDefaultCatches-expected.txt | 106 - .../compiler/ets/tuple_types_1-expected.txt | 106 - .../compiler/ets/tuple_types_12-expected.txt | 106 - .../compiler/ets/tuple_types_13-expected.txt | 106 - .../compiler/ets/tuple_types_14-expected.txt | 106 - .../compiler/ets/tuple_types_15-expected.txt | 106 - .../compiler/ets/tuple_types_16-expected.txt | 106 - .../compiler/ets/tuple_types_17-expected.txt | 106 - .../compiler/ets/tuple_types_18-expected.txt | 106 - .../compiler/ets/tuple_types_19-expected.txt | 106 - .../compiler/ets/tuple_types_7-expected.txt | 106 - .../test/compiler/ets/typeAlias-expected.txt | 240 - ...arReferenceFromStaticContext2-expected.txt | 106 - .../compiler/ets/union_types_1-expected.txt | 114 +- .../compiler/ets/union_types_3-expected.txt | 106 - .../compiler/ets/union_types_5-expected.txt | 106 - .../ets/union_types_merging-expected.txt | 106 - .../parser/ets/AccessBinaryTrees-expected.txt | 106 - .../parser/ets/AccessFannkuch-expected.txt | 106 - .../test/parser/ets/AccessNBody-expected.txt | 106 - .../test/parser/ets/AccessNSieve-expected.txt | 106 - .../ets/Bitops3BitBitsInByte-expected.txt | 106 - .../parser/ets/BitopsBitsInByte-expected.txt | 106 - .../parser/ets/BitopsBitwiseAnd-expected.txt | 106 - .../parser/ets/BitopsNSieveBits-expected.txt | 106 - .../parser/ets/Boolean_bitwise-expected.txt | 106 - .../ets/ControlFlowRecursive-expected.txt | 106 - .../parser/ets/Dollar_dollar_1-expected.txt | 171 - .../parser/ets/Dollar_dollar_2-expected.txt | 106 - .../parser/ets/Dollar_dollar_3-expected.txt | 283 - .../parser/ets/Dollar_dollar_4-expected.txt | 171 - .../parser/ets/FunctionInSwitch-expected.txt | 106 - .../test/parser/ets/FunctionType-expected.txt | 106 - .../FunctionalTypeAsTypeArgument-expected.txt | 106 - .../ets/InferTypeParamFromParam1-expected.txt | 106 - .../ets/InferTypeParamFromParam3-expected.txt | 106 - .../test/parser/ets/MathCordic-expected.txt | 106 - .../parser/ets/MathPartialSums-expected.txt | 106 - .../parser/ets/MathSpectralNorm-expected.txt | 106 - .../test/parser/ets/Morph3d-expected.txt | 106 - ...ametersWithGenericReturnTypes-expected.txt | 106 - .../StaticFieldAndMethodSameName-expected.txt | 106 - ...dAndMethodSameNameInheritance-expected.txt | 106 - .../test/parser/ets/StringBase64-expected.txt | 106 - .../parser/ets/access_modifier_2-expected.txt | 106 - .../parser/ets/access_modifier_3-expected.txt | 106 - .../ets/ambient_call_signature-expected.txt | 106 - .../parser/ets/ambient_indexer_1-expected.txt | 106 - .../parser/ets/ambient_indexer_6-expected.txt | 106 - .../ets/ambient_object_iterable-expected.txt | 106 - ets2panda/test/parser/ets/array-expected.txt | 337 +- .../ets/arrayHoldingNullValue-expected.txt | 305 +- .../ets/arrayLiteralReassign-expected.txt | 106 - .../array_creation_expression-expected.txt | 106 - ...sion_implicit_cast_assignment-expected.txt | 106 - ...pression_implicit_cast_return-expected.txt | 106 - .../test/parser/ets/array_new-expected.txt | 106 - .../ets/array_type_from_literal-expected.txt | 110 +- ...s_expression_unary_expression-expected.txt | 112 +- ets2panda/test/parser/ets/assert-expected.txt | 106 - ets2panda/test/parser/ets/assign-expected.txt | 171 - .../test/parser/ets/assign-func-expected.txt | 106 - ...ableFromMethodToNullableParam-expected.txt | 106 - .../assignNullableToNonNullable-expected.txt | 106 - ...ignNullableToNonNullableArray-expected.txt | 106 - ...ullableToNonNullableTypeAlias-expected.txt | 106 - .../test/parser/ets/assignments-expected.txt | 106 - .../ets/async_func_return_type-expected.txt | 106 - .../parser/ets/async_function-expected.txt | 383 +- .../parser/ets/async_overload-expected.txt | 106 - .../parser/ets/async_with_lambda-expected.txt | 106 - .../ets/await_complex_promise-expected.txt | 106 - .../parser/ets/await_keyword-expected.txt | 2020 +----- .../test/parser/ets/binary_op-expected.txt | 5714 +---------------- .../parser/ets/binary_operations-expected.txt | 106 - ets2panda/test/parser/ets/blocks-expected.txt | 289 - .../parser/ets/blocks_scopes-expected.txt | 438 -- .../test/parser/ets/boolean-expected.txt | 173 +- .../test/parser/ets/boolean_cond-expected.txt | 106 - .../parser/ets/boolean_default-expected.txt | 106 - ets2panda/test/parser/ets/break-expected.txt | 222 +- ...callFunctionWithNullableParam-expected.txt | 106 - ...erfaceMethodWithNullableParam-expected.txt | 106 - .../callMethodWithNullableParam-expected.txt | 106 - .../calling_superclass_methods-expected.txt | 106 - .../parser/ets/cast_const_union-expected.txt | 241 +- .../parser/ets/cast_expressions-expected.txt | 224 +- .../parser/ets/cast_expressions3-expected.txt | 134 +- .../parser/ets/cast_expressions4-expected.txt | 118 +- .../parser/ets/cast_expressions5-expected.txt | 173 +- .../test/parser/ets/class_init-expected.txt | 106 - .../parser/ets/class_instance-expected.txt | 607 -- .../ets/class_instance_creation-expected.txt | 106 - .../class_instance_import_alias-expected.txt | 106 - .../class_instance_initializer-expected.txt | 106 - .../ets/class_static_initializer-expected.txt | 106 - .../test/parser/ets/classes-expected.txt | 106 - .../parser/ets/comment_block-expected.txt | 106 - .../test/parser/ets/comment_line-expected.txt | 106 - .../conditionalExpressionType-expected.txt | 106 - ets2panda/test/parser/ets/const-expected.txt | 106 - .../ets/constructor_super_call1-expected.txt | 106 - .../ets/constructor_super_call3-expected.txt | 106 - .../parser/ets/constructor_test-expected.txt | 106 - .../constructor_with_return_2-expected.txt | 106 - .../test/parser/ets/continue-expected.txt | 222 +- .../test/parser/ets/conversions-expected.txt | 112 +- .../test/parser/ets/decl_infer-expected.txt | 427 -- ...eclare_ambient_const_variable-expected.txt | 106 - .../ets/default_parameter10-expected.txt | 106 - .../ets/default_parameter5-expected.txt | 106 - .../ets/default_parameter7-expected.txt | 106 - .../ets/default_parameter9-expected.txt | 106 - ..._implicitly_typed_return_void-expected.txt | 106 - .../dynamic_optional_decl-expected.txt | 108 +- .../test/parser/ets/empty_class-expected.txt | 106 - .../parser/ets/empty_statement-expected.txt | 106 - .../test/parser/ets/exports-expected.txt | 171 - ...rnal_cyclic_constructor_check-expected.txt | 106 - .../test/parser/ets/field_decl-expected.txt | 106 - .../parser/ets/final_empty_class-expected.txt | 106 - .../ets/float_pont_format_1-expected.txt | 106 - .../ets/float_pont_format_2-expected.txt | 106 - .../ets/float_pont_format_3-expected.txt | 106 - .../ets/float_pont_format_4-expected.txt | 106 - .../ets/float_pont_format_5-expected.txt | 106 - .../ets/float_pont_format_6-expected.txt | 106 - .../ets/float_pont_format_7-expected.txt | 106 - .../ets/float_pont_format_8-expected.txt | 106 - .../parser/ets/float_separator_1-expected.txt | 106 - .../folder_import_index/index-expected.txt | 106 - ets2panda/test/parser/ets/for_of-expected.txt | 222 +- .../parser/ets/for_with_break-expected.txt | 106 - .../parser/ets/forofUnboxing-expected.txt | 112 +- .../funcParamWithOptionalParam-expected.txt | 106 - .../test/parser/ets/function-expected.txt | 337 +- ...unction_implicit_return_type5-expected.txt | 106 - ...unction_implicit_return_type6-expected.txt | 106 - ...unction_implicit_return_type8-expected.txt | 106 - ...unction_implicit_return_type9-expected.txt | 106 - .../ets/genericDefaultParam_1-expected.txt | 1223 ---- .../ets/genericDefaultParam_3-expected.txt | 173 - .../parser/ets/generic_function-expected.txt | 106 - .../parser/ets/generic_resolve-expected.txt | 106 - .../test/parser/ets/generics_2-expected.txt | 108 +- .../test/parser/ets/generics_3-expected.txt | 106 - .../test/parser/ets/generics_4-expected.txt | 106 - .../test/parser/ets/generics_5-expected.txt | 106 - .../test/parser/ets/generics_6-expected.txt | 106 - .../test/parser/ets/generics_7-expected.txt | 106 - .../ets/generics_recursive-expected.txt | 106 - ...erics_type_param_constraint_1-expected.txt | 106 - ...rics_type_param_constraint_10-expected.txt | 106 - ...rics_type_param_constraint_11-expected.txt | 106 - ...rics_type_param_constraint_12-expected.txt | 106 - ...erics_type_param_constraint_2-expected.txt | 106 - ...erics_type_param_constraint_3-expected.txt | 106 - ...erics_type_param_constraint_4-expected.txt | 106 - ...erics_type_param_constraint_5-expected.txt | 106 - ...erics_type_param_constraint_6-expected.txt | 106 - ...erics_type_param_constraint_7-expected.txt | 106 - ...erics_type_param_constraint_9-expected.txt | 106 - .../parser/ets/getterOverride-expected.txt | 106 - ...etter_setter_access_modifiers-expected.txt | 106 - .../globalVarInLambdaInStatic-expected.txt | 106 - .../ets/global_const_vars3-expected.txt | 106 - .../test/parser/ets/identifier-expected.txt | 305 +- ets2panda/test/parser/ets/if-expected.txt | 106 - ets2panda/test/parser/ets/ifs-expected.txt | 106 - .../test/parser/ets/import_conts-expected.txt | 106 - .../parser/ets/import_folder-expected.txt | 190 - .../check_exported_2-expected.txt | 106 - .../check_exported_3-expected.txt | 106 - .../check_exported_default_class-expected.txt | 106 - .../import_tests/default_import-expected.txt | 106 - .../import_tests/diamond/test1-expected.txt | 106 - .../import_tests/diamond/test2-expected.txt | 172 - .../import_tests/diamond/test3-expected.txt | 172 - .../import_tests/diamond/test4-expected.txt | 171 - .../duplicated/classdef-expected.txt | 106 - .../duplicated/extdef-expected.txt | 106 - .../duplicated/extusedef-expected.txt | 106 - .../export_type_alias-expected.txt | 106 - .../separate_module-expected.txt | 173 +- .../import_alias/export-expected.txt | 235 - .../import_alias/import_alias_1-expected.txt | 106 - ...ort_alias_and_without_alias_1-expected.txt | 106 - ...ort_alias_and_without_alias_2-expected.txt | 106 - ...ort_alias_and_without_alias_3-expected.txt | 106 - .../ets/import_tests/import_all-expected.txt | 576 -- .../import_tests/import_all_3-expected.txt | 106 - .../import_all_alias_1-expected.txt | 443 -- .../import_all_type_alias-expected.txt | 250 - .../import_diff_paths-expected.txt | 106 - .../import_extension-expected.txt | 106 - .../import_extension_1-expected.txt | 171 - .../import_extension_2-expected.txt | 171 - .../import_function_overload-expected.txt | 106 - .../import_interface_test-expected.txt | 106 - .../import_interface_test_1-expected.txt | 106 - .../import_interface_test_2-expected.txt | 106 - .../import_max_as_alias-expected.txt | 106 - .../import_tests/import_name_1-expected.txt | 307 - .../import_name_alias_1-expected.txt | 307 - .../imported_module_1-expected.txt | 173 +- .../imported_module_2-expected.txt | 173 +- .../import_relative_path-expected.txt | 443 -- .../import_several_1-expected.txt | 307 - .../import_several_2-expected.txt | 206 - .../import_several_3-expected.txt | 375 -- .../import_several_4-expected.txt | 409 -- .../import_several_5-expected.txt | 375 -- .../import_several_6-expected.txt | 409 -- .../import_several_7-expected.txt | 307 - .../import_tests/import_ts_file-expected.txt | 106 - .../ets/import_tests/internals-expected.txt | 106 - .../modules/class_default_module-expected.txt | 106 - .../modules/default_export-expected.txt | 106 - .../missing_default_export-expected.txt | 106 - .../module1/src/re_export_file-expected.txt | 106 - .../module2/src/import_file-expected.txt | 106 - .../module2/src/re_export_file_2-expected.txt | 106 - .../modules/test_lib1-expected.txt | 106 - .../modules/test_lib2-expected.txt | 106 - .../import1/import1-expected.txt | 106 - .../import2/import2-expected.txt | 106 - .../import_package_with_alias-expected.txt | 106 - .../package/package_module-expected.txt | 171 - .../packages/package_module_1-expected.txt | 106 - .../packages/package_module_2-expected.txt | 106 - .../package_module_1-expected.txt | 171 - .../package_module_1-expected.txt | 171 - .../subpackage/package_module_1-expected.txt | 106 - .../subpackage_module_1-expected.txt | 239 +- .../subpackage_module_2-expected.txt | 239 +- .../relative_import/Line-expected.txt | 106 - .../relative_import/Point-expected.txt | 106 - .../relative_import/alias1-expected.txt | 106 - .../relative_import/alias2-expected.txt | 171 - .../ets/import_tests/repeat-expected.txt | 106 - .../folder1/file1-expected.txt | 106 - .../folder2/file2-expected.txt | 106 - .../folder3/file3-expected.txt | 106 - .../ets/import_tests/type/type-expected.txt | 106 - .../parser/ets/index_expressions-expected.txt | 531 -- ...overriding_method_return_type-expected.txt | 106 - .../ets/inferingEntryPointReturn-expected.txt | 106 - .../test/parser/ets/inheritance-expected.txt | 106 - .../test/parser/ets/inheritance2-expected.txt | 106 - .../test/parser/ets/instanceof-expected.txt | 106 - .../interfaceMethodWithOptional-expected.txt | 106 - ...ce_abstract_noreturn_function-expected.txt | 106 - ...interface_method_default_body-expected.txt | 106 - .../test/parser/ets/interfaces-expected.txt | 106 - .../parser/ets/internalParsing-expected.txt | 106 - .../ets/internalProtectedParsing-expected.txt | 106 - .../ets/labeledDoWhileStatement-expected.txt | 106 - .../ets/labeledForStatement-expected.txt | 106 - .../ets/labeledSwitchStatement-expected.txt | 106 - .../ets/labeledWhileStatement-expected.txt | 106 - ets2panda/test/parser/ets/lambda-expected.txt | 106 - .../parser/ets/lambda-lambda-expected.txt | 106 - .../lambda-type-inference-alias-expected.txt | 106 - ...da-type-inference-arg-no-type-expected.txt | 106 - .../ets/lambda-type-inference-expected.txt | 106 - ...da-type-inference-no-ret-type-expected.txt | 106 - ...a-type-inference-overloaded-2-expected.txt | 106 - ...a-type-inference-overloaded-3-expected.txt | 106 - .../ets/lambdaAsFunctionParam-expected.txt | 106 - ...pressionWithoutBlockStatement-expected.txt | 106 - ...ockStatementCallAVoidFunction-expected.txt | 106 - ...sionWithoutBlockStatementVoid-expected.txt | 106 - ...atementWithFunctionParameters-expected.txt | 106 - .../ets/lambda_import_alias_1-2-expected.txt | 208 +- .../ets/lambda_import_alias_1-3-expected.txt | 106 - .../ets/lambda_import_alias_1-expected.txt | 106 - .../ets/lambda_optional_param_1-expected.txt | 106 - ets2panda/test/parser/ets/launch-expected.txt | 106 - ...aunch_function_returning_void-expected.txt | 106 - .../test/parser/ets/launch_ret-expected.txt | 106 - .../test/parser/ets/launch_super-expected.txt | 106 - .../ets/launch_this_callee-expected.txt | 106 - .../launch_with_call_expression-expected.txt | 312 +- .../test/parser/ets/literals-expected.txt | 106 - .../ets/main_entry_point_1-expected.txt | 106 - .../ets/main_entry_point_6-expected.txt | 106 - .../ets/main_entry_point_7-expected.txt | 106 - .../ets/main_entry_point_8-expected.txt | 106 - .../ets/main_entry_point_9-expected.txt | 106 - .../test/parser/ets/method_empty-expected.txt | 106 - .../ets/method_modifier_check_14-expected.txt | 106 - .../ets/method_modifier_check_8-expected.txt | 106 - ...ive_function_with_return_type-expected.txt | 106 - .../parser/ets/new_expressions-expected.txt | 106 - .../test/parser/ets/new_object_3-expected.txt | 106 - ets2panda/test/parser/ets/null-expected.txt | 286 +- .../test/parser/ets/null_valid-expected.txt | 174 +- .../ets/nullableGenericSignature-expected.txt | 106 - .../ets/nullable_union_array-expected.txt | 106 - ets2panda/test/parser/ets/object-expected.txt | 106 - .../ets/optional_field_class-expected.txt | 106 - .../ets/optional_field_interface-expected.txt | 106 - ...optional_field_interfaceUnion-expected.txt | 106 - .../ets/optional_union_paramter-expected.txt | 106 - .../test/parser/ets/override-expected.txt | 106 - .../ets/overrideStaticFunc-expected.txt | 106 - .../parentheses_expression_value-expected.txt | 364 -- .../parser/ets/predefined_types-expected.txt | 106 - .../parser/ets/promiseCasting-expected.txt | 173 +- .../ets/proxyVoidGeneration-expected.txt | 106 - .../test/parser/ets/proxy_method-expected.txt | 106 - .../ets/re_export/diamond/A-expected.txt | 173 +- .../ets/re_export/diamond/B-expected.txt | 106 - .../ets/re_export/diamond/B2-expected.txt | 106 - .../ets/re_export/diamond/C-expected.txt | 106 - .../ets/re_export/diamond/C2-expected.txt | 106 - .../ets/re_export/diamond/D-expected.txt | 106 - .../ets/re_export/diamond/D2-expected.txt | 106 - .../parser/ets/re_export/export-expected.txt | 106 - .../ets/re_export/export_2-expected.txt | 106 - .../ets/re_export/export_3-expected.txt | 106 - .../ets/re_export/folder/export-expected.txt | 106 - .../folder/folder2/export-expected.txt | 106 - .../re_export/folder/re_export_6-expected.txt | 106 - .../re_export/folder/re_export_7-expected.txt | 106 - .../re_export/folderIndex/index-expected.txt | 106 - .../re_export/folderIndex/test-expected.txt | 106 - .../re_export/folderIndex2/index-expected.txt | 106 - .../re_export/folderIndex2/key-expected.txt | 106 - .../parser/ets/re_export/import-expected.txt | 106 - .../ets/re_export/import_10-expected.txt | 106 - .../ets/re_export/import_11-expected.txt | 106 - .../ets/re_export/import_12-expected.txt | 106 - .../ets/re_export/import_13-expected.txt | 106 - .../ets/re_export/import_14-expected.txt | 106 - .../ets/re_export/import_15-expected.txt | 106 - .../ets/re_export/import_2-expected.txt | 106 - .../ets/re_export/import_3-expected.txt | 106 - .../ets/re_export/import_6-expected.txt | 106 - .../ets/re_export/import_7-expected.txt | 106 - .../ets/re_export/import_8-expected.txt | 106 - .../ets/re_export/import_9-expected.txt | 106 - .../ets/re_export/import_index-expected.txt | 190 - .../ets/re_export/import_index_2-expected.txt | 156 - .../ets/re_export/import_index_3-expected.txt | 106 - .../ets/re_export/re_export-expected.txt | 106 - .../ets/re_export/re_export_10-expected.txt | 106 - .../ets/re_export/re_export_11-expected.txt | 106 - .../ets/re_export/re_export_12-expected.txt | 106 - .../ets/re_export/re_export_2-expected.txt | 106 - .../ets/re_export/re_export_3-expected.txt | 106 - .../ets/re_export/re_export_4-expected.txt | 106 - .../ets/re_export/re_export_5-expected.txt | 106 - .../ets/re_export/re_export_7-expected.txt | 106 - .../ets/re_export/re_export_8-expected.txt | 106 - .../ets/re_export/re_export_9-expected.txt | 106 - ...egression-target-type-context-expected.txt | 106 - .../parser/ets/rest_parameter_01-expected.txt | 106 - .../parser/ets/rest_parameter_02-expected.txt | 106 - ets2panda/test/parser/ets/return-expected.txt | 222 +- .../returnNullableFromFunction-expected.txt | 106 - .../ets/returnNullableFromMethod-expected.txt | 106 - .../test/parser/ets/scoped_decl-expected.txt | 106 - .../selective_export/import_1-expected.txt | 106 - .../selective_export/import_2-expected.txt | 106 - .../selective_export/import_3-expected.txt | 106 - .../selective_export/import_4-expected.txt | 106 - .../selective_export_1-expected.txt | 106 - .../selective_export_2-expected.txt | 106 - .../selective_export_3-expected.txt | 106 - .../selective_export_4-expected.txt | 106 - .../test/parser/ets/simple_types-expected.txt | 771 +-- .../static_function_override_1-expected.txt | 106 - .../static_function_override_2-expected.txt | 106 - .../static_function_override_3-expected.txt | 106 - ets2panda/test/parser/ets/string-expected.txt | 239 +- .../parser/ets/string_template_1-expected.txt | 106 - .../parser/ets/string_template_2-expected.txt | 106 - .../parser/ets/string_template_3-expected.txt | 106 - .../parser/ets/string_template_4-expected.txt | 106 - ets2panda/test/parser/ets/switch-expected.txt | 106 - .../parser/ets/switch_alive_1-expected.txt | 106 - .../parser/ets/switch_alive_4-expected.txt | 106 - .../ets/switch_enum_string_case-expected.txt | 106 - .../ets/switch_num_compare_char-expected.txt | 106 - .../ets/switch_readonly_member-expected.txt | 106 - ..._readonly_member_compare_char-expected.txt | 106 - ...eadonly_member_compare_char_2-expected.txt | 106 - .../test/parser/ets/ternary-expected.txt | 382 -- .../ets/test-type-alias-call1-expected.txt | 106 - .../ets/test-type-alias-call2-expected.txt | 106 - .../ets/test-type-alias-call3-expected.txt | 106 - .../ets/test-type-alias-call4-expected.txt | 106 - .../ets/test-type-alias-call5-expected.txt | 106 - .../ets/test-type-alias-call6-expected.txt | 106 - .../ets/test-type-alias-call7-expected.txt | 106 - .../ets/test-type-alias-call8-expected.txt | 106 - .../parser/ets/test_interface-expected.txt | 106 - .../test/parser/ets/test_jsvalue-expected.txt | 106 - .../parser/ets/test_type_alias6-expected.txt | 171 - .../parser/ets/test_type_alias7-expected.txt | 106 - .../parser/ets/test_type_alias8-expected.txt | 106 - .../parser/ets/test_type_alias9-expected.txt | 370 +- .../test/parser/ets/this_callee-expected.txt | 106 - .../parser/ets/this_cmp_object-expected.txt | 106 - .../parser/ets/this_equality-expected.txt | 106 - .../parser/ets/this_expression-expected.txt | 106 - ...ype_class_method_return_valid-expected.txt | 106 - ..._lambda_define_lambda_in_body-expected.txt | 106 - ...mbda_in_body_capture_variable-expected.txt | 106 - .../trailing_lambda_overload-expected.txt | 106 - .../trailing_lambda_overload_1-expected.txt | 106 - ...mbda_transform_trailing_block-expected.txt | 106 - .../trailing_lambda_type_alias-expected.txt | 106 - .../ets/tryFinallyBlockOnly-expected.txt | 106 - .../parser/ets/tupleAsTypeParam1-expected.txt | 106 - .../parser/ets/tupleAsTypeParam2-expected.txt | 106 - .../ets/tupleIndexWithNumbers-expected.txt | 106 - .../test/parser/ets/type_alias_1-expected.txt | 106 - .../test/parser/ets/type_alias_2-expected.txt | 106 - .../test/parser/ets/type_cast-expected.txt | 106 - .../parser/ets/type_variance1-expected.txt | 106 - .../test/parser/ets/unary_op-expected.txt | 773 --- .../parser/ets/unary_operations-expected.txt | 106 - ...finedNullObjectTypeAnnotation-expected.txt | 106 - .../ets/undefinedNullTypeAlias-expected.txt | 106 - ...nion_lowering_common_property-expected.txt | 106 - .../parser/ets/user_defined_22-expected.txt | 350 +- .../test/parser/ets/var_declare-expected.txt | 106 - ets2panda/test/parser/ets/void-expected.txt | 106 - .../parser/ets/voidAsTypeArg-expected.txt | 106 - .../ets/lambda_inner_call_static_method.ets | 2 +- ets2panda/test/runtime/ets/top_level_02.ets | 7 - .../test/unit/lsp/change_tracker_test.cpp | 5 +- .../unit/lsp/code_fix_registration_test.cpp | 7 +- .../lsp/fix_convert_const_to_let_test.cpp | 15 +- .../unit/lsp/get_current_token_value_test.cpp | 5 +- ets2panda/test/unit/lsp/get_diagnostics.cpp | 43 +- .../unit/lsp/get_implementation_location.cpp | 4 +- .../test/unit/lsp/get_touching_token_test.cpp | 8 +- ets2panda/test/unit/lsp/inlay_hints_test.cpp | 16 +- .../unit/lsp/suggestion_diagnostics_test.cpp | 16 +- .../e2p_test_plugin_after_bind-expected.txt | 168 - ..._verifier_private_access_negative_test.cpp | 6 +- ...erifier_protected_access_negative_test.cpp | 9 +- .../unit/public/ast_verifier_short_test.cpp | 2 +- ets2panda/util/diagnostic/semantic.yaml | 1 + ets2panda/util/diagnosticEngine.cpp | 9 + ets2panda/util/diagnosticEngine.h | 2 + 664 files changed, 595 insertions(+), 91605 deletions(-) diff --git a/ets2panda/bindings/test/expected/getSemanticDiagnostics.json b/ets2panda/bindings/test/expected/getSemanticDiagnostics.json index d2faf74bd4..23cb7c2138 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 e51e4621f7..647feecc45 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 12767046a3..e090584458 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 47fc4abbb2..a42ab34a91 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 d6db109207..591d007667 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 672f29e5f6..2daa3e0167 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 88a4c1ab28..d8c68fb76d 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 7f28e2a01a..2addd00448 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 bfcf892561..bd3f10bda8 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 e8631b95a2..affa47d495 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 869939f869..b1df4a83c3 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 fb33121bbc..9b50804416 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 848a715984..07d1b0d3af 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 12f2d1905a..b634b92c17 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 8b1961ff2f..58d7cefe24 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 45ea49b802..ae34f2a854 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 9e0ebf92e4..fd4f2eb8a5 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 3213a83ac1..eef306e686 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 025b88d8e8..7dcd2ce4b2 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 fc6881da7f..f5bf4a2248 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 d495c7c951..89afebb59c 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 aee120c32a..beeb87771d 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 57e068b6d1..22fc4900fc 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 d7c0b1872b..417776eca0 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 8ea80e1135..cb95afc31a 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 bd2e68d923..58ca5496f1 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 3609cbb822..718607481d 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 241151b646..442220438f 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 39be4eb79a..799e9d1a80 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 f2dff3a5f0..9478fc0e84 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 b39957d8dc..93e45d5454 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 f4c6092e3d..f5ca1c97b2 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 752a06d4cc..569109a6ae 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 3b41c8b661..9ec9ec14ae 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 a7b52b8558..16850eb682 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 40a8346dc0..2cc94b998a 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 7ca3f8b98c..3216a64552 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 3c49933eab..5834754e75 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 95df6340cd..2f8d14c14e 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 47773f7ec7..b535f2bd1f 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 e9f5618679..9ce6db1e63 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 b8144feab0..1805c53c33 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 fb714c45f7..4684d6270c 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 a8179e6b22..7c98b1cb39 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 923a421fe0..fca56233fd 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 61aea179da..5ec20d87dd 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 316fa937e7..ec88c911fd 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 d1bf564e8d..01c1a13b82 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 26279f3bdd..2c70cb2bf8 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 840418e9fb..45f6f62251 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 2bb85eafa8..c5992433dc 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 7c6fbeaa70..411bcd5a5e 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 e2fabd7e73..a13670d9ea 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 e15dcc9bbf..dd61f7a399 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 f5574b4156..4601f59853 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 08d37f8b15..6bbe4b206d 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 b79079f03d..84f91020c9 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 e07e3df303..1633125cca 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 b0b2aa45d1..1828161690 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 eedfeb7511..413df6e279 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 2b711b9f7c..c0ec7c1528 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 d41f4f5ba9..0acc079964 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 4f48c67640..96a0b6519c 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 8f4336238a..c81e277550 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 6039423c91..31ef6a5126 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 780a6c73b8..b8891fd820 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 59db2846da..a814c16e44 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 2063a36604..7ec5e1d4c5 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 180a05d278..dff1fd6902 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 c75e1bfea3..4e2952d171 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 acf957b858..60c13b421c 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 3152e96841..3011466043 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 1fe79384e1..e639d75127 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 25fda0730c..c883aac8cf 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 1ac22e9228..6021875126 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 4fecb7830e..cb4577479a 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 58adac78d3..92101be8c2 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 67d0820de0..945a69be6b 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 b32c93e03c..528775eb78 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 18c4ecc8c2..f640cf5204 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 062eb8492b..ec8067cce8 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 66fb2f4f43..7e0f01ff15 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 e052767fde..7d31183cc8 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 37f7b8aca7..4687d16597 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 7df4fb223a..81d3c18e16 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 79b358e49a..befba532ae 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 b697832de7..1b957ad29a 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 b2387071a3..423f572f79 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 4aa5fa29cf..1f32732563 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 888aeba014..98efdd5b8d 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 e2e500647e..673e4ca35c 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 82f88f738b..7787d1fb2e 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 abc1f04d13..5c0a44847a 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 850589db69..07b1fc8400 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 d33de97089..30176aa80a 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 2cb90a6edf..9e19f6a3a2 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 937661efc6..45bd8eefde 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 ae00179942..3c5d95eaaf 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 8c085de737..d08dd7fd40 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 93a03e9e62..bab06cc545 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 75757cf4f9..a4da8ef97e 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 617978c42b..032ef1779e 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 d29f711071..834924d22b 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 cd4bdaddf2..2dac44aa26 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 f2a5214864..0397ee2aca 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 a91d457548..7edde8f140 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 6901d8c756..418c3312f2 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 1f91de0de8..d87f8fdf20 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 754ec9e3c4..68bb7e9643 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 f51171adb7..c9ba567b8c 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 05b5c865db..8416f7c8ac 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 fe9fcbe764..9f84832338 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 d15a9fd865..a7ad8a5f72 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 63ecb4ba56..bffe60f94b 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 054fe4733b..92ab08d694 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 21cb115e1c..09778cdeb3 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 19601ac067..6dff739e0b 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 1848e77fcc..0a7af15a3c 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 9ae6ae1cfb..7e48b3ecc3 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 187f6198c0..e0e550426c 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 6c36670b03..15d9210d7b 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 f6b1ac06ee..7f81f89362 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 777a955287..6f4d45d3b7 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 d701d4946b..37b88ef992 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 04ebd0a98a..638ba5b3e6 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 123d6ef92b..b061a6d2c8 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 b12761b7bd..4bbf5ee9ff 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 f057022919..439d217bd4 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 ca23088a88..08d906f777 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 5e5ce9fc22..5fecf1f283 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 916c83e08d..0c7414a3ce 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 ce1c79c1a8..0b388f0b2d 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 c736677ef8..ff38ea91f2 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 3d742e0bd5..da10961316 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 ebc273ec89..e76ea24ff0 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 f00f4668bc..e97fbf3057 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 98d04ba6e3..10867c9fa4 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 14afa4bb5f..008ecceaa5 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 e0d55b07a9..cb76b9474b 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 84f87a126b..a98c1f0c4f 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 0eb332b3dd..71d18cc948 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 64bf23e6ca..2a97f4eaae 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 c182fe1332..91d5ba9b92 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 9c8b9b2aed..453d2ca808 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 d69b6613e4..564f6ac9c1 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 c9c0acc441..eaa7501d39 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 244dd1303d..2f18d85031 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 65842d8dfe..3de158333b 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 a8931f6bfd..5bb79ee4b5 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 cc44cc1b53..1a921cfc5c 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 8506f7bb23..a8a44600d5 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 fc933990d6..22383d5f18 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 b5e0feac30..de1f177e6a 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 0a368f9297..c1dc755d39 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 68328b0b6e..c4fcaf3f5a 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 ab66a2e99d..417e44087b 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 962b451fab..6b644a248c 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 4922fd7dd6..3965f87f74 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 221fc3e1d3..f5942454a4 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 6aab64e572..3dc212d27d 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 3f706b3802..295c206850 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 687fd2385a..2cd79ac0b9 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 634c55dade..f26025f7fa 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 1edc4a6c58..a635638ccc 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 481e964e2e..b3c81110d0 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 503cb31471..c23817545d 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 887ca3a636..91fcc0654d 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 3323dcf684..ced1eb0ad4 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 1b860e11ca..7de133013e 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 293198068d..a34ee7077b 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 a7d0864e6d..4034b2b2ca 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 7c7074103e..48018f8840 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 588222a15e..c9db956ae4 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 541fb88b67..d5cb6815cb 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 b58d8a37be..ab9dbd45e8 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 031babe619..4951462680 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 6fe61e5e2f..bb27cf1965 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 0dfca43de8..9e86f6bce0 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 dc47fc9969..0a7062e865 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 9c847e756b..b17b883330 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 640f23ecb7..b1582ef4bf 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 a353fa605b..dfd59e3425 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 38ba719834..869297220a 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 b933d7cb69..fcad973cb9 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 dc6a8bf4b3..f191482d07 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 87538967eb..24c94d4a94 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 7542430a1a..f3557172a9 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 fb6b102173..31f54b5e0e 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 db5b5f4cf0..6f19554d5c 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 8cc4736760..ac7cec0c13 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 f141e0adc8..278f7e2246 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 a4559ea260..d424218fec 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 c99c2661d0..60782a89a4 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 68146d9252..e2a83f90c3 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 4309080327..7a47c7b044 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 15db789e8e..fcc82a2c19 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 5337c65e23..87baa1d4fe 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 701aa38f51..e98a80d66c 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 3bf33bfedc..f501ff65cb 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 b2175d8978..f84cd0ff47 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 4f0f58731d..6bee5237c3 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 d0a92fe034..001a474540 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 6fb7973f7d..41093aed50 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 23aee53c5f..4c80cdd9ea 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 e03749b90a..c1c56b0c96 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 17fa9af04c..10395eac3a 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 0462fcd792..d0a95fae86 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 7708bb42db..e4e499a1b7 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 e7d4780552..462cefe301 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 692685e144..00d473babb 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 54aebbadb7..892dd9608c 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 3a281c7e24..39c6c06227 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 70fc90ffac..3228fb0011 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 96aab42d0b..c223829cf0 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 ccaa3c2b2f..da09105ec1 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 1b346947ab..bbdcfed6d1 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 78dbf2657c..2975fb82e7 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 561479485e..43aae6c7fa 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 bc526212dd..3f5191fc88 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 839a7b57d7..f607e17a8d 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 f09d55ff9a..5345bef652 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 cbd8e600f0..3a0b410abb 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 d56516ef3a..53885dafb5 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 07ddd1e6ea..20a4e88e5b 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 92e052e53e..2d9e625f43 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 8edfc5520f..02b35c29a2 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 25d6a1df61..bc32a4656f 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 f7bafdd20c..71737a4b74 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 1807b5c5aa..a97cc1e066 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 c8e3fd1a93..e4f94df249 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 248895af43..b843e1f0ed 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 30bd4b0e8a..cfa0a3ec20 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 59f8b0e55d..8bac61fc39 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 1140779574..d849b8d9d0 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 e2fd028d27..91947de597 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 5347dfe292..2421927e80 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 fad4b8f987..634d77ad69 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 35b141918e..ff2eb16679 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 2953e2e04d..aa1bf42250 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 ef700c6bb0..873256608c 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 2c9b987ef6..2a1078dba1 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 722aa9d5ff..6920936a6e 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 5caf5dd277..368087c522 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 76ddf4bd45..34a67b67d5 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 bc0661f2d5..3ccc3bf20a 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 aa23adf4d8..484ad01f18 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 5d047a8903..0ad429f3e7 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 b2898c74e3..ec170595d1 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 1033be5063..e0bc7b9464 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 52af532976..e044a94018 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 5b1120da3d..96cdd64918 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 802d01d283..57ecff6a0d 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 dc79e0b7fc..41bc591b28 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 7f6764fb66..3f82d2c451 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 099e63f82f..a67d5529e5 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 dbf4d1436d..77d4c2fc12 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 1b5b4f9833..6fc42809d2 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 7828b2e9b2..135e4aa970 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 e6c6ef0eb0..94852b76a5 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 e7ba39ad0c..b63e723594 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 b6437f1f5e..e2b66069e7 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 1ac57e4dae..d2bbe40f83 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 94274e8f4b..146931a7f5 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 c4b51ab23c..b9a8b91ded 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 53a3368917..690d04f853 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 0559cf8adc..c9d59f27ba 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 1b4cbae517..2e57145e6f 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 1ea8384ba8..84f1823750 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 233d966ca8..efc03bda11 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 36b29615f1..3ee407d489 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 eddeef6b23..2599dbb4a2 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 7654424bc7..7d0776852b 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 f9f1bb2285..d96edac837 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 77c49e0732..fe5985159b 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 669a90f286..bc0d581067 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 c9fdcbfaba..5adcdb05f5 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 4c37006bef..ab49aaaadd 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 3d381f859d..26bc19eb99 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 cee3555d6f..768ebff639 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 c3d394c6e9..5b7dbccd55 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 12eaa2d99e..464bdd95cb 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 c1ff444788..03d1ae1192 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 1773d4d19a..e84216ffd7 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 2d0baf6c44..e1a06a323e 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 a3d661f2f6..03f9f82deb 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 a8b26e25f2..c3245d1e1c 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 1a81850799..e9f61b9357 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 eb68f44567..f9b5c11889 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 e6e6d1b35c..adf53b1d99 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 e74bc20467..c00b564851 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 5d037504e5..868668bd9f 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 33730ccfec..ca3d6884fa 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 f33849578b..d037aef308 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 97a76c166f..851dd9142c 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 c0bfe203bc..fa255fe329 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 f3879d3ce1..17478cff57 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 b94291f4bd..e66dc60bc5 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 365e73d36b..40f1c78abe 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 7cdcaa28dc..7d9814fd7e 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 057ba765d8..bc69fd8d20 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 debb908bd5..aa31a3ba8e 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 a59feb0b96..1674f14428 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 525e4d51df..b29011ca16 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 d30c7cc90a..baaec8a20e 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 4f98ac702e..75f9899bca 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 5f0d248f14..32e1680e09 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 d67f34a88f..18fbfcdfea 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 bc4035e81e..dd65f6d76c 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 31cfa717b7..f7e697eeaa 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 b77f2f42cd..2aa02a132d 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 d9e54d9222..3927f7784c 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 758108e283..6f666aa470 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 e15e80b28d..3d07b8cac4 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 c2729f70bf..7595a6ea17 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 a571badc91..980d8287f0 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 428f2f93a3..3e19a1202c 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 cd3bc7482a..11826152fd 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 af91ee23a2..5a8f92174e 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 c359763852..cfcb80c42e 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 e8b1a538fe..e0f64c4550 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 d28fae802d..6a68211d13 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 4108a9fc06..34bcd56283 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 f0a6e3abfe..d71f676adc 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 862a6c244b..d44a3baae9 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 f976642e7a..b6fc39b0f8 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 fc79867891..fac42f021c 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 d97fda2841..1fb94ea181 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 efabf1fb01..bfdf1e36b2 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 b5d0e3d080..ede5acd513 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 f8bfa08e5e..0df90a82c6 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 59f82bdf0f..8cf346e6ce 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 14654c8721..3c4c074305 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 970424f5c0..d05ac6caf3 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 d3d8c633b8..60b959ceb9 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 b13048343f..1a7ff14cca 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 cb234dfcc6..8140907a23 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 9f2fe9f579..5b032d9499 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 d5bb53cff2..897cb93b49 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 308d54d681..268f943971 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 74f0a09756..0987812d1e 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 b5eabd70cc..54e743a1d8 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 fc847947e0..1e3167ef88 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 632e2de9ed..db2b0c06a2 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 a11a9162ba..d9a2460709 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 81c9d0875e..ba1b66b845 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 b3fd2b5adb..88a6e48ba7 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 14d19e6051..47677a6225 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 d60aa7ae34..b3c602e498 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 a03e16acba..6a9bf8406e 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 ae3287ad26..dcea619512 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 2b90f731ca..cb0676174f 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 85b3978a53..d2d139a9f7 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 03954a64fd..87f232e9c9 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 3f4706de4a..230680d3be 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 2030c5c88d..16b234f818 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 022219faa3..93b7c8396b 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 9fa6b86ddb..65e7f52606 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 ccea9a3d4d..00fe35b475 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 603c21ca60..39a6ba31dc 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 afe9c9a843..c0495b070c 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 b0d5cd0252..dad9822135 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 9d105c2638..0d67bc9950 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 f115af832b..df3510ac8d 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 dbd36d722d..74b84e7220 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 ddb4cb95c1..845151c72e 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 eac8a43f88..1809a6d36b 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 333f016815..9adc050208 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 1b3c6d7f57..66a65b6fab 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 fd28ce034b..f9c767c4f3 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 e1ca32b214..e2adbbd71a 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 a4c3da731f..513a83399f 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 f9aed84a60..b709954138 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 45d199d5a9..2e374c9aec 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 cfb6c64761..db769f8c0d 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 fefb297c1a..b56b1567e4 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 d52948dcba..f7253255a8 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 8fc8f90a72..385d739739 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 b25e62b3f7..fd0e30677e 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 2576db551e..652cb032f5 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 bf3492fb0f..202a182789 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 abb53198de..8825557063 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 a6f4417fea..73640128af 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 b012cb5e14..068174fbd9 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 58b0d3984c..810a495289 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 baf26b45e8..86a4368b7a 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 2b3a2754d3..2eee771e75 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 904d5fb076..2d41441dd0 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 c1ce9f969b..9b132b4048 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 68c51daa2b..ff42499a40 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 fe7c3e9a0c..86f2b6877c 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 e081d86b4d..72ec305a42 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 c4a28c662d..92c971aac0 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 d3f7c60275..9ced877171 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 4873ef0aca..2698961471 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 6deca414cf..df94e395c2 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 e05af7af1d..fd6ed4d494 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 8dc2532cec..24611dbef0 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 3f0b5d034f..87bffc9ccf 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 55bfea0bcf..a230fb4614 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 0ca3ab585f..4f3746120e 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 80b3629c7c..89d44f0d23 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 0ac5d41a7a..d056f359ef 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 30b22642eb..9304c6f83e 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 3327cfbf56..bf006ec60a 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 0512196c66..dcec61044e 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 494c9892e0..1e46f75f3e 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 bbac32e282..764f0c51b6 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 24b5da6c5c..7fe547cd24 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 58efe48c2a..ac19bf754e 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 a49ac592e7..4c30518d18 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 9700014139..971d99db1f 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 78421e2796..99b1152c5e 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 0cf4c3ee71..3cd6ea4481 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 9a3ebda8dd..9f3cc5e419 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 fc12b10e0b..d2c80ac0fc 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 98e3bedec2..45c4dedce4 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 a5502177bd..e96eb43dfc 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 441a88ed80..3096de97b9 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 3f0ce318a4..96de5e271c 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 b8c92a8154..74fc5481f1 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 ec74e48848..d66e18d0d7 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 59fab91e68..ff37805124 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 09a851a8c5..dbb0145f0c 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 2019883103..34e4882f53 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 2314d13920..8c1e2375f6 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 e85388d010..1ef99fb782 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 8e12cf3378..3bda1f0050 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 d675fc9526..b38ab1f783 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 473fb64084..814262395a 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 5b900073a4..44f07e2a5c 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 08d8d4bd92..9a459ff577 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 b602ac88fe..441bf4be5c 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 74fdb5881a..79552fca71 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 b9a936d13d..47a86080b2 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 60057f22d9..902ba1bf41 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 b421f27ae2..35678ad76d 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 79b65f81de..376668ede0 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 607628cb22..f3df1acd4b 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 97aac6ad83..e6ec506254 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 204f21af2b..48f9684e32 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 2360ded76c..f429b842cf 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 02c7f65e52..ca092e3c94 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 17f316a00e..526b4372e7 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 8e4ded4ec9..1a938e8adf 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 b9265122a0..77015b06c7 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 5e0a7c449a..ff49cabbfc 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 5b43722f62..377c6237a5 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 553edfedd9..a8c4773782 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 84d7af505e..5db47975ff 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 dd6e5693b3..a8ab8c85e0 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 3d4c42c98e..eda00901bf 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 498c660f48..19ced72284 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 fac134a05d..95d6fbe295 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 f4b19a9cc3..ed448ce1a4 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 93f2126e37..1622fc0524 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 5e37cd77ff..543d053ba2 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 f062113c00..9c16518630 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 2028cb3692..2f67b5729d 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 0bf85f15bd..b818946448 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 4fbdc5871f..88266ffcc8 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 1dcfc9592f..c7f1802a87 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 96fb840b5b..8a57f96ea3 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 3580751968..58481cb4a9 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 8cac93e10a..810c056104 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 c3275656e5..152e753236 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 2231e020c8..2a2ea64825 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 41d17fc97a..eb07410f9d 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 9ac31fdf23..f285ea1442 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 ae8b046692..4be68e8250 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 3eea539048..0ae18583d7 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 e69d6f3286..806fcc9726 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 b9996b3d47..2b4b6d51a4 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 efcc9ab144..3475426fa8 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 efb4dff00a..4dfe97c1b1 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 60ace5f7ef..6ce3b68061 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 0e78b38152..91d0adf99d 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 d52afdced4..6f0bbea962 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 7a623b9e18..8dfa370131 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 57e563c0b4..6d5ec375fc 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 84633d12df..b4087d9224 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 cd84c0e1c0..814efd06d9 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 1aaf04ee6b..338c5b8f71 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 f67cc61f64..f7a0c7d717 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 180bf4785e..78d98c1872 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 3e81d35081..2b00054973 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 a90efdab48..50b689374c 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 287a55a2f2..2236479653 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 9e1921d218..6be887fd9e 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 1b62bff898..2039a31cb6 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 e54f96ccfa..7bf6c40a6c 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 b7cd2b9060..4b91ecd5a1 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 83244026ab..0f35a8ad11 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 1556793616..1299dca5ce 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 072c424d63..8a11aa6401 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 95123a1f98..f66e159709 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 80b3fc5bd2..41d690c0d4 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 1ac3b4a087..d2570b1762 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 0e55c3cd27..4ab5a25a85 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 080be2aefb..27a83b54c8 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 4d5a07a4a6..bafd675769 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 ae300152d7..6ebcd76182 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 b177e54e50..f3363fa437 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 756551d4a7..58063e2aec 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 c5ec3248d5..6400be91ce 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 a8eabac839..c55d44d3d9 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 4c67bf4343..986f5a6efb 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 89a21d70b5..0771bd6f83 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 d725fa5737..1c7308b1d9 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 3117aed4ab..87194561f4 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 114a616ad3..26c8d20ce6 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 6eeafa544d..5b72c58459 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 f9093189af..842c136f06 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 3e9cf68900..4bd4e0d022 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 284320e7ef..6a5118592b 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 9b546f2a1d..f8eceedfed 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 7269fb0492..b127109317 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 259cbc86cc..635b1b1807 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 eecddeb005..5ce8120489 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 7033f89955..43a4156b16 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 8031f12c82..d595b28144 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 a739c85984..9ecf817040 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 0f165ffb93..6405928770 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 b3365f114b..ca20e82b47 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 7a91f82bd6..183f8f9944 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 5951db822b..b872cb1c1a 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 53ab7e7d04..1026a8b67b 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 ce40b8d642..4f31fed006 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 24713712a1..91b075678e 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 170b501699..26bc3efaa2 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 8f29d8d90e..9afc61f3dd 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 8b7e3421bc..c357910a82 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 6f5a5dd555..8b1496f974 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 cb0d70915c..093b4662e7 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 d218cf7bf7..114d87e897 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 cafb9dafff..67d3281670 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 de4fbdc68d..b30a8e409c 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 d218cf7bf7..114d87e897 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 d218cf7bf7..114d87e897 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 042a982b66..72671dd84c 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 6bc6c8229c..82c95dd007 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 f263b06b26..49e8388dda 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 3cd598a097..8f89981654 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 724113400b..8c4dbd9cf0 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 ad704e60b9..9a1cf5c1ad 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 5fff7bf409..f03fac8916 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 a4098ad70b..d028cca6fc 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 30a6ebf358..b4b7ff6311 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 4388c55b71..6ce6d66efa 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 4d09855833..83869b328f 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 dbacd9840b..2c06d08a39 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 f13f3a48df..267b658306 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 2189edea67..0fad370ee2 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 bf23ed8851..679e35cecb 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 85d2235752..799cdc8635 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 7969d5840b..d2cf438c53 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 def3925024..aa93142609 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 86ad70b08d..9b4e0a3b5e 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 fda7032574..d0c01a4f97 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 a09cb3c6ef..f50ba4cad3 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 9da7e0aad6..6368bbb3d2 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 71bf5056c3..f625a750e0 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 b2b3d2ec25..887d4fd5a9 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 a3bd5a56a6..9c4c1acfa1 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 508d6c6cb8..08ac1bd0f0 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 c02bbe1513..f170998306 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 89d2498966..52af379f4b 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 26a9e8d39d..5128d6df5e 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 ae5f36a093..8c99f73bc7 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 00959f7fdd..c1a32f8f01 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 7329e92b7f..c3e353dba5 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 c12d4e3c6d..8a5abd930c 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 c6122a0fa9..f893b51cb6 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 c1fc986868..679ea301e1 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 75904393ae..c8d32910de 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 4c08f545fd..ac2cf79a65 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 b3d70cafe6..0118b9d5b7 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 ecf7fce930..fbf400c093 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 1b84b749f1..eed121c9c6 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 666a6fd502..bfa4cf5d5f 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 6676c50d1a..605cb91719 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 7ae1968d4b..a80d57bf19 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 d99dc85112..c5a9716ae2 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 8518599df6..41df6ffa05 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 398e6f4512..2bd19edcbf 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 3a42897471..0f5219fd7a 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 f6f0c98bc5..a6249512b6 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 2800be6614..2b069f72ab 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 240980eabb..6bd157510a 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 2e5acdb346..dd84296e7a 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 6f785b59b9..c11604293b 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 af0026148e..1141ca043f 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 890187012b..51cec72494 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 81f1caa934..2799c0bca6 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 cfb193b398..48cf4039b8 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 ed32e495cb..c335f33788 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 b5c108708d..2bde1c80ec 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 fc3f469a5e..0d2338c14c 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 4974b4d79f..d153d3833e 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 4ece619664..9aa71e1f25 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 4e4109d1e8..2ca938156c 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 4954f89cd1..9fdc665342 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 581970ee13..b9c30f37ae 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 a8d6babbd9..9c8c20d943 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 1a8737e1cd..7cbd07d65c 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 111b160dd5..d47d9134ae 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 212c267329..005c752382 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 b7bf1683f2..4f8f65a491 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 aea8f78015..a34fb8c455 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 43bb699fe3..f7d98e3420 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 537158d735..e0dfc4400e 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 a7ec943031..58f97b68f7 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 ce3e096381..6975799ea8 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 d1fc821b05..3d238cae3b 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 8c7f12f193..695fd8313f 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 315692355d..1acbf3a2d8 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 c3e0eb220e..2fa78f055d 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 aead580453..5d83d9a729 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 16f592d9f0..919dd36445 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 75144c1642..246568a28b 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 1a0b8b1d1c..2ecacdbe84 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 db64c6fc35..0e10d6a82e 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 c2bb90c818..523c52e9a4 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 432afbf6b0..f4fd643246 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 7ec271f224..8e945381f8 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 c8692d99a3..2110d32cf0 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 de78229a7f..0673a3c778 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 84531f90b2..0f1d58af37 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 752033be59..3b418e8f0f 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 f566ff434f..7641450bbf 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 f7fc6d09ba..8c60c3ffe3 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 389237f5c8..7d20a9e95d 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 c4ba6083bf..c16b313241 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 aab3c5af76..187fd3295d 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 7997bdfa5d..0852c934ce 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 66038130dc..425832e992 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 18fe8c37da..846197f070 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 792afa1273..5f5f4ab7d1 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 bf769e37b6..b3da19dedf 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 a11ae01da3..0dc3d9cb27 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 369e0b2918..ac6341ac40 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 e4f2eb5dad..f1bf95834a 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 c7b44b5d8a..45f1ce65e2 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 b62ff44fcc..d466e40aad 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 90be5126db..a03c80f127 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 0547d89c74..314461a3d6 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 2da78e8ed5..9ddb8ceb99 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 ba42c88676..e399ebe38d 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 2e8c92e5d7..bbdf6f1608 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 1792bec428..11623fefad 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 f2779d152c..1ab54a34f8 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 f3653aca19..2e67fa3991 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 77160bf3e9..c3b623a302 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 0f6185e48d..63dc7fb437 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 277af8005a..2bb23694b7 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 a25b3de2a4..99f87f6a9a 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 de404eae34..2fd224497d 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 c97fcbf90b..4f445575c8 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 825ed8e0f0..35b859a72a 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 4fbc212dba..f8dd049327 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 2573cc1244..f2000145e4 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 4a20d2a054..893f27a28d 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 b07d3fb9be..b3298b21ae 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 ce2147a3f7..82e2ad43f4 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 9b227cca27..14dbc790a8 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(); -- Gitee