From 0e600f1b2f726ae95dcbe42d4b6f99d7a291763a Mon Sep 17 00:00:00 2001 From: xingshunxiang Date: Wed, 23 Jul 2025 17:28:42 +0800 Subject: [PATCH] Correct the source range of several ast nodes Issue: https://gitee.com/openharmony/arkcompiler_ets_frontend/issues/ICPDBZ?from=project-issue Description: here are several ast nodes contain the incorrect source range, for example, 1. the endPos of the namespace declaration. 2. the endPos of the interfaceProp. 3. the endPos of the ETSParamExpr. Reason: Correct the source range of several ast nodes Tests: ninja tests passed tests/tests-u-runner/runner.sh --ets-cts --show-progress --build-dir x64.release --processes=all passed tests/tests-u-runner/runner.sh --ets-func-tests --show-progress --build-dir x64.release --processes=all passed tests/tests-u-runner/runner.sh --astchecker --show-progress --build-dir x64.release --processes=all passed tests/tests-u-runner/runner.sh --ets-runtime --show-progress --build-dir x64.release --processes=all passed tests/tests-u-runner/runner.sh --parser --no-js --show-progress --build-dir x64.release --processes=all passed Signed-off-by: xingshunxiang --- ets2panda/parser/ETSparser.cpp | 5 +- ets2panda/parser/ETSparserClasses.cpp | 4 +- ets2panda/parser/ETSparserNamespaces.cpp | 7 +- ...ctMethodDeclaredInParentClass-expected.txt | 36 +- ...actNewClassInstanceExpression-expected.txt | 12 +- .../ets/ambient_declaration-expected.txt | 8 +- ..._without_chaining_non_nullish-expected.txt | 12 +- .../ets/boxingConversion10-expected.txt | 4 +- .../ets/boxingConversion2-expected.txt | 48 +- .../ets/boxingConversion3-expected.txt | 20 +- .../ets/boxingConversion5-expected.txt | 12 +- .../ets/boxingConversion6-expected.txt | 24 +- .../ets/boxingConversion7-expected.txt | 16 +- .../ets/boxingConversion8-expected.txt | 16 +- .../ets/boxingConversion9-expected.txt | 8 +- .../boxingUnboxingExpressions-expected.txt | 172 +++--- .../ets/catch-soft-keyword-expected.txt | 4 +- .../compiler/ets/catchParamScope-expected.txt | 12 +- .../ets/class_def_varargs_1-expected.txt | 16 +- .../ets/class_def_varargs_2-expected.txt | 8 +- .../ets/conversion-w-ASExpr-expected.txt | 48 +- .../ets/conversion_w_functions-expected.txt | 48 +- .../ensureNotNullArgNotNullable-expected.txt | 12 +- ...nsureNotNullReturnNotNullable-expected.txt | 8 +- ...as_class_member_getValue_call-expected.txt | 28 +- .../compiler/ets/export_type-expected.txt | 4 +- ...ed_conditional_expression_not-expected.txt | 8 +- ...al_expression_not_return_type-expected.txt | 8 +- .../ets/forUpdateCharType-expected.txt | 4 +- .../ets/from-soft-keyword-2-expected.txt | 4 +- .../ets/functionPointerArray-expected.txt | 12 +- .../ets/functionTypeToObject-expected.txt | 4 +- .../ets/function_subtyping_1-expected.txt | 34 +- .../ets/generic_arrayaslist-expected.txt | 556 ++++++++--------- .../generic_class_getter_setter-expected.txt | 24 +- .../ets/generic_deadlock-expected.txt | 20 +- .../ets/generic_function_call_1-expected.txt | 16 +- .../ets/generic_function_call_3-expected.txt | 20 +- .../ets/generic_function_call_4-expected.txt | 72 +-- .../ets/generic_function_call_5-expected.txt | 40 +- .../ets/generic_function_call_7-expected.txt | 12 +- .../ets/generic_override_1-expected.txt | 148 ++--- .../ets/generic_override_2-expected.txt | 196 +++--- .../ets/generic_override_3-expected.txt | 86 +-- .../ets/generic_typealias_1-expected.txt | 120 ++-- .../ets/generic_typealias_6-expected.txt | 20 +- .../ets/generic_typealias_7_neg-expected.txt | 8 +- .../ets/generic_typealias_8-expected.txt | 22 +- .../ets/generic_typealias_9-expected.txt | 24 +- .../ets/generic_variance_1-expected.txt | 68 +-- ...nerics_class_recursive_type_1-expected.txt | 438 +++++++------- .../generics_implicit_lambda1-expected.txt | 58 +- .../ets/generics_instantiation_1-expected.txt | 70 +-- .../ets/generics_instantiation_2-expected.txt | 74 +-- .../ets/generics_instantiation_3-expected.txt | 12 +- .../ets/generics_instantiation_4-expected.txt | 194 +++--- .../generics_interface_bounds_1-expected.txt | 34 +- .../generics_interface_bounds_2-expected.txt | 16 +- ...nerics_primitive_type_param_1-expected.txt | 30 +- .../ets/identifierReference14-expected.txt | 4 +- .../ets/identifierReference4-expected.txt | 8 +- .../ets/implicit-conversion-expected.txt | 48 +- .../package_module_1-expected.txt | 40 +- .../package_module_2-expected.txt | 20 +- .../separate_module_1-expected.txt | 4 +- .../package_module_1-expected.txt | 8 +- .../package_module_2-expected.txt | 10 +- .../separate_module_1-expected.txt | 4 +- .../asyncfun_lambda_lib-expected.txt | 12 +- .../asyncfunc_lambda_main-expected.txt | 32 +- .../ets/import_tests/enum_export-expected.txt | 4 +- ...rt_class_with_getters_setters-expected.txt | 56 +- .../generic_typealias_func_type-expected.txt | 12 +- ...neric_typealias_func_type_lib-expected.txt | 40 +- ...rt_class_with_getters_setters-expected.txt | 12 +- ...imported_function_return_type-expected.txt | 4 +- .../re-export_with_alias/export-expected.txt | 4 +- .../import_aliased_re-export-expected.txt | 8 +- .../import_interface-expected.txt | 8 +- .../selective_export-expected.txt | 4 +- .../selective_export_interface-expected.txt | 8 +- ...selective_import_with_alias_1-expected.txt | 4 +- ...selective_import_with_alias_2-expected.txt | 4 +- .../compiler/ets/import_type-expected.txt | 28 +- .../ets/inferTypeOfArray-expected.txt | 8 +- .../ets/instanceof_object_long-expected.txt | 8 +- ...erface_noreturn_type_function-expected.txt | 12 +- .../ets/invalidInheritance3-expected.txt | 4 +- .../compiler/ets/lambdaFunction1-expected.txt | 4 +- ...ambdaFunctionArrayDeclaration-expected.txt | 8 +- .../ets/lambda_capturing-expected.txt | 4 +- ...bda_cast_infer_type_narrowing-expected.txt | 50 +- ...mbda_cast_infer_type_widening-expected.txt | 50 +- .../lambda_cast_type_has_pramas-expected.txt | 42 +- ...a_infer_type_arrow_expression-expected.txt | 10 +- ...type_arrow_expression_literal-expected.txt | 6 +- .../lambda_infer_type_has_return-expected.txt | 14 +- ...mbda_infer_type_return_lambda-expected.txt | 8 +- ...bda_infer_type_return_literal-expected.txt | 6 +- ...ambda_infer_type_return_union-expected.txt | 22 +- .../ets/launch_expression-expected.txt | 40 +- .../ets/loopWithinLambda-expected.txt | 12 +- .../ets/lowering-interaction-expected.txt | 12 +- .../ets/manyLocalsParamRegUsage-expected.txt | 14 +- .../ets/memberExprInLambda-expected.txt | 4 +- ...erExpressionFromStaticContext-expected.txt | 36 +- ...and-interface-in-signatures_5-expected.txt | 80 +-- .../methodOverrideAsyncMethod-expected.txt | 8 +- ...odOverrideCovariantReturnType-expected.txt | 48 +- ...hodOverrideDifferentSignature-expected.txt | 12 +- ...methodOverrideWithoutModifier-expected.txt | 4 +- .../ets/multipleMethodOverride-expected.txt | 12 +- .../n_nullableTypeInArgNotRef-expected.txt | 4 +- .../compiler/ets/native_toplevel-expected.txt | 12 +- .../null_coalescing_generic_1-expected.txt | 80 +-- .../compiler/ets/nullableTuple-expected.txt | 20 +- ...ullable_type_in_arithmeticdiv-expected.txt | 8 +- ...llable_type_in_arithmeticplus-expected.txt | 8 +- .../ets/objectLiteralInterface-expected.txt | 8 +- .../ets/objectLiteralReadonlyKey-expected.txt | 4 +- .../ets/overload_with_generics-expected.txt | 24 +- .../test/compiler/ets/override-expected.txt | 72 +-- .../test/compiler/ets/override10-expected.txt | 8 +- .../test/compiler/ets/override12-expected.txt | 56 +- .../test/compiler/ets/override13-expected.txt | 28 +- .../test/compiler/ets/override16-expected.txt | 4 +- .../test/compiler/ets/override17-expected.txt | 4 +- .../test/compiler/ets/override19-expected.txt | 16 +- .../test/compiler/ets/override2-expected.txt | 12 +- .../test/compiler/ets/override4-expected.txt | 12 +- .../test/compiler/ets/override5-expected.txt | 4 +- .../test/compiler/ets/override6-expected.txt | 18 +- .../test/compiler/ets/override8-expected.txt | 20 +- .../test/compiler/ets/override9-expected.txt | 30 +- .../ets/parenthesizedType-expected.txt | 8 +- .../compiler/ets/requiredType_1-expected.txt | 16 +- .../compiler/ets/requiredType_11-expected.txt | 22 +- .../compiler/ets/requiredType_4-expected.txt | 20 +- .../compiler/ets/requiredType_5-expected.txt | 16 +- .../compiler/ets/requiredType_9-expected.txt | 48 +- .../ets/returnTypeGenericArray-expected.txt | 16 +- .../ets/switchStatementBoxing-expected.txt | 4 +- ...tchStatementCorrectConversion-expected.txt | 4 +- .../ets/throwInCatchClause3-expected.txt | 8 +- .../ets/throwInFinallyBlock1-expected.txt | 12 +- .../ets/throwInTryStatement-expected.txt | 4 +- ...tryCatchErrorMissingParamType-expected.txt | 4 +- .../ets/tryCatchMissingParamType-expected.txt | 4 +- .../ets/tryDefaultCatches-expected.txt | 8 +- .../compiler/ets/tuple_types_1-expected.txt | 52 +- .../compiler/ets/tuple_types_12-expected.txt | 40 +- .../compiler/ets/tuple_types_13-expected.txt | 12 +- .../compiler/ets/tuple_types_14-expected.txt | 54 +- .../compiler/ets/tuple_types_15-expected.txt | 44 +- .../compiler/ets/tuple_types_16-expected.txt | 68 +-- .../compiler/ets/tuple_types_17-expected.txt | 12 +- .../compiler/ets/tuple_types_18-expected.txt | 12 +- .../compiler/ets/tuple_types_19-expected.txt | 80 +-- .../compiler/ets/tuple_types_7-expected.txt | 24 +- ...arReferenceFromStaticContext2-expected.txt | 16 +- .../compiler/ets/union_types_1-expected.txt | 76 +-- .../compiler/ets/union_types_3-expected.txt | 34 +- .../compiler/ets/union_types_5-expected.txt | 110 ++-- .../ets/union_types_merging-expected.txt | 184 +++--- .../parser/ets/AccessBinaryTrees-expected.txt | 32 +- .../parser/ets/AccessFannkuch-expected.txt | 4 +- .../test/parser/ets/AccessNBody-expected.txt | 80 +-- .../test/parser/ets/AccessNSieve-expected.txt | 4 +- .../ets/Bitops3BitBitsInByte-expected.txt | 4 +- .../parser/ets/BitopsBitsInByte-expected.txt | 4 +- .../parser/ets/BitopsBitwiseAnd-expected.txt | 4 +- .../parser/ets/BitopsNSieveBits-expected.txt | 4 +- .../parser/ets/Boolean_bitwise-expected.txt | 12 +- .../parser/ets/Dollar_dollar_2-expected.txt | 12 +- .../parser/ets/Dollar_dollar_3-expected.txt | 8 +- .../FunctionalTypeAsTypeArgument-expected.txt | 12 +- .../ets/InferTypeParamFromParam1-expected.txt | 90 +-- .../ets/InferTypeParamFromParam3-expected.txt | 118 ++-- .../test/parser/ets/MathCordic-expected.txt | 4 +- .../parser/ets/MathSpectralNorm-expected.txt | 4 +- .../test/parser/ets/Morph3d-expected.txt | 4 +- ...ametersWithGenericReturnTypes-expected.txt | 36 +- .../StaticFieldAndMethodSameName-expected.txt | 8 +- ...dAndMethodSameNameInheritance-expected.txt | 12 +- .../test/parser/ets/StringBase64-expected.txt | 60 +- .../ets/ambient_call_signature-expected.txt | 16 +- .../parser/ets/ambient_indexer_1-expected.txt | 8 +- .../parser/ets/ambient_indexer_6-expected.txt | 8 +- .../ets/ambient_object_iterable-expected.txt | 46 +- .../array_creation_expression-expected.txt | 40 +- ...ableFromMethodToNullableParam-expected.txt | 20 +- .../assignNullableToNonNullable-expected.txt | 12 +- ...ignNullableToNonNullableArray-expected.txt | 24 +- ...ullableToNonNullableTypeAlias-expected.txt | 16 +- .../ets/async_func_return_type-expected.txt | 12 +- .../parser/ets/async_function-expected.txt | 34 +- .../parser/ets/async_overload-expected.txt | 44 +- .../parser/ets/async_with_lambda-expected.txt | 64 +- .../ets/await_complex_promise-expected.txt | 132 ++--- .../parser/ets/await_keyword-expected.txt | 118 ++-- .../test/parser/ets/binary_op-expected.txt | 30 +- ...callFunctionWithNullableParam-expected.txt | 16 +- ...erfaceMethodWithNullableParam-expected.txt | 36 +- .../callMethodWithNullableParam-expected.txt | 20 +- .../calling_superclass_methods-expected.txt | 4 +- .../parser/ets/cast_const_union-expected.txt | 26 +- .../parser/ets/cast_expressions-expected.txt | 160 ++--- .../parser/ets/cast_expressions3-expected.txt | 48 +- .../parser/ets/cast_expressions4-expected.txt | 48 +- .../ets/class_instance_creation-expected.txt | 32 +- .../class_instance_initializer-expected.txt | 20 +- ...terface_enum_only_top_level_4-expected.txt | 4 +- .../test/parser/ets/classes-expected.txt | 4 +- .../conditionalExpressionType-expected.txt | 20 +- ets2panda/test/parser/ets/const-expected.txt | 4 +- .../ets/constructor_super_call1-expected.txt | 4 +- .../ets/constructor_super_call3-expected.txt | 4 +- .../parser/ets/constructor_test-expected.txt | 4 +- ...eclare_ambient_const_variable-expected.txt | 4 +- .../parser/ets/declare_class-expected.txt | 20 +- .../test/parser/ets/declare_func-expected.txt | 8 +- .../parser/ets/declare_iface-expected.txt | 32 +- .../ets/default_parameter10-expected.txt | 8 +- .../ets/default_parameter7-expected.txt | 46 +- .../ets/default_parameter9-expected.txt | 8 +- ..._implicitly_typed_return_void-expected.txt | 36 +- .../dynamic_optional_decl-expected.txt | 16 +- .../modules/module-expected.txt | 114 ++-- .../test/parser/ets/exports-expected.txt | 4 +- ...rnal_cyclic_constructor_check-expected.txt | 4 +- ets2panda/test/parser/ets/for_of-expected.txt | 4 +- .../parser/ets/forofUnboxing-expected.txt | 12 +- .../funcParamWithOptionalParam-expected.txt | 4 +- .../test/parser/ets/function-expected.txt | 70 +-- ...unction_implicit_return_type8-expected.txt | 4 +- ...unction_implicit_return_type9-expected.txt | 16 +- .../ets/genericDefaultParam_1-expected.txt | 172 +++--- .../ets/genericDefaultParam_3-expected.txt | 16 +- .../parser/ets/generic_function-expected.txt | 20 +- .../parser/ets/generic_resolve-expected.txt | 38 +- .../test/parser/ets/generics_2-expected.txt | 60 +- .../test/parser/ets/generics_3-expected.txt | 34 +- .../test/parser/ets/generics_4-expected.txt | 42 +- .../test/parser/ets/generics_5-expected.txt | 26 +- .../test/parser/ets/generics_6-expected.txt | 34 +- .../test/parser/ets/generics_7-expected.txt | 62 +- .../ets/generics_recursive-expected.txt | 106 ++-- ...erics_type_param_constraint_1-expected.txt | 4 +- ...rics_type_param_constraint_10-expected.txt | 20 +- ...rics_type_param_constraint_11-expected.txt | 36 +- ...rics_type_param_constraint_12-expected.txt | 66 +-- ...erics_type_param_constraint_2-expected.txt | 8 +- ...erics_type_param_constraint_3-expected.txt | 16 +- ...erics_type_param_constraint_4-expected.txt | 16 +- ...erics_type_param_constraint_5-expected.txt | 28 +- ...erics_type_param_constraint_6-expected.txt | 8 +- ...erics_type_param_constraint_7-expected.txt | 12 +- ...erics_type_param_constraint_9-expected.txt | 24 +- .../parser/ets/getterOverride-expected.txt | 20 +- ...etter_setter_access_modifiers-expected.txt | 4 +- .../globalVarInLambdaInStatic-expected.txt | 36 +- .../ets/global_const_vars3-expected.txt | 18 +- .../check_exported_default_class-expected.txt | 8 +- .../duplicated/extdef-expected.txt | 8 +- .../export_type_alias-expected.txt | 4 +- .../import_diff_paths-expected.txt | 4 +- .../import_interface_test-expected.txt | 12 +- .../import_interface_test_1-expected.txt | 4 +- .../import_interface_test_2-expected.txt | 4 +- .../ets/import_tests/internals-expected.txt | 32 +- .../module1/src/export_file-expected.txt | 8 +- .../modules/test_lib2-expected.txt | 8 +- .../subpackage/package_module_1-expected.txt | 12 +- .../subpackage_module_1-expected.txt | 8 +- .../subpackage_module_2-expected.txt | 8 +- .../relative_import/Line-expected.txt | 28 +- .../ets/import_tests/repeat-expected.txt | 24 +- ...overriding_method_return_type-expected.txt | 8 +- .../test/parser/ets/inheritance-expected.txt | 36 +- .../test/parser/ets/inheritance2-expected.txt | 36 +- .../test/parser/ets/instanceof-expected.txt | 14 +- .../interfaceMethodWithOptional-expected.txt | 12 +- ...ce_abstract_noreturn_function-expected.txt | 4 +- ...interface_method_default_body-expected.txt | 18 +- .../test/parser/ets/interfaces-expected.txt | 48 +- .../parser/ets/internalParsing-expected.txt | 8 +- .../ets/internalProtectedParsing-expected.txt | 8 +- ets2panda/test/parser/ets/lambda-expected.txt | 16 +- .../lambda-type-inference-alias-expected.txt | 12 +- ...da-type-inference-arg-no-type-expected.txt | 8 +- .../ets/lambda-type-inference-expected.txt | 24 +- ...da-type-inference-no-ret-type-expected.txt | 16 +- ...a-type-inference-overloaded-3-expected.txt | 4 +- .../ets/lambdaAsFunctionParam-expected.txt | 54 +- .../ets/lambda_import_alias_1-2-expected.txt | 6 +- .../ets/lambda_import_alias_1-3-expected.txt | 8 +- .../ets/lambda_optional_param_1-expected.txt | 26 +- ets2panda/test/parser/ets/launch-expected.txt | 106 ++-- ...aunch_function_returning_void-expected.txt | 4 +- .../test/parser/ets/launch_ret-expected.txt | 4 +- .../test/parser/ets/launch_super-expected.txt | 4 +- .../ets/launch_this_callee-expected.txt | 76 +-- .../parser/ets/local-interface-expected.txt | 4 +- .../parser/ets/localTypeAlias-expected.txt | 108 ++-- .../ets/main_entry_point_6-expected.txt | 12 +- .../ets/main_entry_point_7-expected.txt | 4 +- .../ets/main_entry_point_8-expected.txt | 16 +- .../ets/main_entry_point_9-expected.txt | 16 +- .../parser/ets/new_expressions-expected.txt | 4 +- .../test/parser/ets/new_object_3-expected.txt | 8 +- ets2panda/test/parser/ets/null-expected.txt | 32 +- .../test/parser/ets/null_valid-expected.txt | 4 +- .../ets/nullableGenericSignature-expected.txt | 40 +- ets2panda/test/parser/ets/object-expected.txt | 4 +- .../ets/optional_field_class-expected.txt | 20 +- .../ets/optional_field_interface-expected.txt | 50 +- ...optional_field_interfaceUnion-expected.txt | 82 +-- .../ets/optional_union_paramter-expected.txt | 22 +- .../test/parser/ets/override-expected.txt | 48 +- .../ets/overrideStaticFunc-expected.txt | 8 +- .../parser/ets/promiseCasting-expected.txt | 26 +- .../ets/proxyVoidGeneration-expected.txt | 20 +- .../test/parser/ets/proxy_method-expected.txt | 20 +- .../ets/re_export/diamond/A-expected.txt | 4 +- .../re_export/folderIndex2/key-expected.txt | 8 +- .../re_export/folderIndex2/type-expected.txt | 8 +- ...egression-target-type-context-expected.txt | 16 +- .../returnNullableFromFunction-expected.txt | 12 +- .../ets/returnNullableFromMethod-expected.txt | 12 +- .../static_function_override_1-expected.txt | 4 +- .../static_function_override_2-expected.txt | 4 +- .../static_function_override_3-expected.txt | 4 +- ets2panda/test/parser/ets/string-expected.txt | 8 +- ets2panda/test/parser/ets/switch-expected.txt | 8 +- .../ets/test-type-alias-call1-expected.txt | 4 +- .../ets/test-type-alias-call2-expected.txt | 20 +- .../ets/test-type-alias-call3-expected.txt | 4 +- .../ets/test-type-alias-call4-expected.txt | 4 +- .../ets/test-type-alias-call5-expected.txt | 22 +- .../ets/test-type-alias-call6-expected.txt | 22 +- .../ets/test-type-alias-call8-expected.txt | 4 +- .../parser/ets/test_interface-expected.txt | 28 +- .../test/parser/ets/test_jsvalue-expected.txt | 4 +- .../parser/ets/test_type_alias8-expected.txt | 28 +- .../parser/ets/test_type_alias9-expected.txt | 8 +- .../test/parser/ets/this_callee-expected.txt | 32 +- .../parser/ets/this_cmp_object-expected.txt | 4 +- .../trailing_lambda_overload_1-expected.txt | 8 +- .../trailing_lambda_type_alias-expected.txt | 8 +- .../parser/ets/tupleAsTypeParam1-expected.txt | 28 +- .../parser/ets/tupleAsTypeParam2-expected.txt | 28 +- .../ets/tupleIndexWithNumbers-expected.txt | 8 +- .../test/parser/ets/type_alias_1-expected.txt | 8 +- .../parser/ets/type_variance1-expected.txt | 88 +-- ...finedNullObjectTypeAnnotation-expected.txt | 10 +- ...nion_lowering_common_property-expected.txt | 30 +- .../parser/ets/user_defined_22-expected.txt | 32 +- .../test/unit/lsp/class_hierarchys_test.cpp | 4 +- .../unit/lsp/get_class_property_info_test.cpp | 16 +- ets2panda/test/unit/lsp/inlay_hints_test.cpp | 8 +- ets2panda/test/unit/plugin/CMakeLists.txt | 1 + ...d_to_state_parse_and_verifier_position.cpp | 560 ++++++++++++++++++ 362 files changed, 5656 insertions(+), 5095 deletions(-) create mode 100644 ets2panda/test/unit/plugin/plugin_proceed_to_state_parse_and_verifier_position.cpp diff --git a/ets2panda/parser/ETSparser.cpp b/ets2panda/parser/ETSparser.cpp index d9970074638..9dda9a5add6 100644 --- a/ets2panda/parser/ETSparser.cpp +++ b/ets2panda/parser/ETSparser.cpp @@ -1034,7 +1034,8 @@ ir::TypeNode *ETSParser::ParseTypeReference(TypeAnnotationParsingOptions *option typeRefPart = AllocNode(typeName, typeParams, typeRefPart, Allocator()); ES2PANDA_ASSERT(typeRefPart != nullptr); - typeRefPart->SetRange({partPos, Lexer()->GetToken().End()}); + auto endPos = typeParams == nullptr ? typeName->End() : typeParams->End(); + typeRefPart->SetRange({partPos, endPos}); if (!Lexer()->TryEatTokenType(lexer::TokenType::PUNCTUATOR_PERIOD)) { break; @@ -1048,7 +1049,7 @@ ir::TypeNode *ETSParser::ParseTypeReference(TypeAnnotationParsingOptions *option auto *typeReference = AllocNode(typeRefPart, Allocator()); ES2PANDA_ASSERT(typeReference != nullptr); - typeReference->SetRange({startPos, Lexer()->GetToken().End()}); + typeReference->SetRange({startPos, typeRefPart->End()}); return typeReference; } diff --git a/ets2panda/parser/ETSparserClasses.cpp b/ets2panda/parser/ETSparserClasses.cpp index 5fd0dcff560..72029fd1ce0 100644 --- a/ets2panda/parser/ETSparserClasses.cpp +++ b/ets2panda/parser/ETSparserClasses.cpp @@ -879,7 +879,7 @@ ir::Statement *ETSParser::ParseInterfaceDeclaration(bool isStatic) auto *declNode = ParseInterfaceBody(id, isStatic); ES2PANDA_ASSERT(declNode != nullptr); - declNode->SetRange({interfaceStart, Lexer()->GetToken().End()}); + declNode->SetRange({interfaceStart, declNode->Body()->Range().end}); return declNode; } @@ -1075,7 +1075,7 @@ ir::AstNode *ETSParser::ParseInterfaceField() if (optionalField) { field->AddModifier(ir::ModifierFlags::OPTIONAL); } - field->SetEnd(Lexer()->GetToken().End()); + field->SetEnd(typeAnnotation->End()); return field; } diff --git a/ets2panda/parser/ETSparserNamespaces.cpp b/ets2panda/parser/ETSparserNamespaces.cpp index 0bb77dc0c3a..6909d6890fa 100644 --- a/ets2panda/parser/ETSparserNamespaces.cpp +++ b/ets2panda/parser/ETSparserNamespaces.cpp @@ -58,20 +58,18 @@ ir::Statement *ETSParser::ParseNamespace(ir::ModifierFlags flags) if ((GetContext().Status() & ParserStatus::IN_NAMESPACE) == 0) { LogError(diagnostic::NAMESPACE_ONLY_TOP_OR_IN_NAMESPACE); } - auto start = Lexer()->GetToken().Start(); ir::ETSModule *ns = ParseNamespaceImp(flags); ES2PANDA_ASSERT(ns != nullptr); - ns->SetRange({start, Lexer()->GetToken().Start()}); return ns; } ir::ETSModule *ETSParser::ParseNamespaceImp(ir::ModifierFlags flags) { + auto nsStart = Lexer()->GetToken().Start(); Lexer()->NextToken(); auto *result = AllocNode(Allocator(), ArenaVector(Allocator()->Adapter()), ExpectIdentifier(), ir::ModuleFlag::NAMESPACE, GetContext().GetLanguage(), globalProgram_); - ES2PANDA_ASSERT(result != nullptr); ir::ETSModule *parent = result; ir::ETSModule *child = nullptr; while (Lexer()->GetToken().Type() == lexer::TokenType::PUNCTUATOR_PERIOD) { @@ -80,7 +78,6 @@ ir::ETSModule *ETSParser::ParseNamespaceImp(ir::ModifierFlags flags) child = AllocNode(Allocator(), ArenaVector(Allocator()->Adapter()), ExpectIdentifier(), ir::ModuleFlag::NAMESPACE, GetContext().GetLanguage(), globalProgram_); - ES2PANDA_ASSERT(child != nullptr); child->SetParent(parent); child->SetRange({start, Lexer()->GetToken().Start()}); child->AddModifier(ir::ModifierFlags::EXPORT); @@ -104,6 +101,7 @@ ir::ETSModule *ETSParser::ParseNamespaceImp(ir::ModifierFlags flags) auto st = ParseTopLevelStatement(); statements.emplace_back(st); } + auto nsEnd = Lexer()->GetToken().End(); Lexer()->NextToken(); if (child != nullptr) { child->SetNamespaceChainLastNode(); @@ -113,6 +111,7 @@ ir::ETSModule *ETSParser::ParseNamespaceImp(ir::ModifierFlags flags) result->SetStatements(std::move(statements)); } result->AddModifier(flags); + result->SetRange({nsStart, nsEnd}); return result; } diff --git a/ets2panda/test/compiler/ets/abstractMethodDeclaredInParentClass-expected.txt b/ets2panda/test/compiler/ets/abstractMethodDeclaredInParentClass-expected.txt index c150765e866..e9c2649b99b 100644 --- a/ets2panda/test/compiler/ets/abstractMethodDeclaredInParentClass-expected.txt +++ b/ets2panda/test/compiler/ets/abstractMethodDeclaredInParentClass-expected.txt @@ -50,7 +50,7 @@ }, "end": { "line": 16, - "column": 38, + "column": 27, "program": "abstractMethodDeclaredInParentClass.ets" } } @@ -63,7 +63,7 @@ }, "end": { "line": 16, - "column": 38, + "column": 27, "program": "abstractMethodDeclaredInParentClass.ets" } } @@ -100,7 +100,7 @@ }, "end": { "line": 16, - "column": 41, + "column": 40, "program": "abstractMethodDeclaredInParentClass.ets" } } @@ -113,7 +113,7 @@ }, "end": { "line": 16, - "column": 41, + "column": 40, "program": "abstractMethodDeclaredInParentClass.ets" } } @@ -1155,8 +1155,8 @@ "program": "abstractMethodDeclaredInParentClass.ets" }, "end": { - "line": 33, - "column": 10, + "line": 31, + "column": 2, "program": "abstractMethodDeclaredInParentClass.ets" } } @@ -1405,8 +1405,8 @@ "program": "abstractMethodDeclaredInParentClass.ets" }, "end": { - "line": 37, - "column": 9, + "line": 35, + "column": 2, "program": "abstractMethodDeclaredInParentClass.ets" } } @@ -1937,7 +1937,7 @@ }, "end": { "line": 44, - "column": 29, + "column": 27, "program": "abstractMethodDeclaredInParentClass.ets" } } @@ -1950,7 +1950,7 @@ }, "end": { "line": 44, - "column": 29, + "column": 27, "program": "abstractMethodDeclaredInParentClass.ets" } } @@ -2502,8 +2502,8 @@ "program": "abstractMethodDeclaredInParentClass.ets" }, "end": { - "line": 54, - "column": 6, + "line": 52, + "column": 2, "program": "abstractMethodDeclaredInParentClass.ets" } } @@ -2557,7 +2557,7 @@ }, "end": { "line": 54, - "column": 29, + "column": 18, "program": "abstractMethodDeclaredInParentClass.ets" } } @@ -2570,7 +2570,7 @@ }, "end": { "line": 54, - "column": 29, + "column": 18, "program": "abstractMethodDeclaredInParentClass.ets" } } @@ -2607,7 +2607,7 @@ }, "end": { "line": 54, - "column": 32, + "column": 31, "program": "abstractMethodDeclaredInParentClass.ets" } } @@ -2620,7 +2620,7 @@ }, "end": { "line": 54, - "column": 32, + "column": 31, "program": "abstractMethodDeclaredInParentClass.ets" } } @@ -2669,7 +2669,7 @@ }, "end": { "line": 54, - "column": 36, + "column": 34, "program": "abstractMethodDeclaredInParentClass.ets" } } @@ -2682,7 +2682,7 @@ }, "end": { "line": 54, - "column": 36, + "column": 34, "program": "abstractMethodDeclaredInParentClass.ets" } } diff --git a/ets2panda/test/compiler/ets/abstractNewClassInstanceExpression-expected.txt b/ets2panda/test/compiler/ets/abstractNewClassInstanceExpression-expected.txt index 02f16782294..9798e81dae6 100644 --- a/ets2panda/test/compiler/ets/abstractNewClassInstanceExpression-expected.txt +++ b/ets2panda/test/compiler/ets/abstractNewClassInstanceExpression-expected.txt @@ -489,7 +489,7 @@ }, "end": { "line": 26, - "column": 20, + "column": 19, "program": "abstractNewClassInstanceExpression.ets" } } @@ -502,7 +502,7 @@ }, "end": { "line": 26, - "column": 20, + "column": 19, "program": "abstractNewClassInstanceExpression.ets" } } @@ -556,7 +556,7 @@ }, "end": { "line": 26, - "column": 13, + "column": 11, "program": "abstractNewClassInstanceExpression.ets" } } @@ -569,7 +569,7 @@ }, "end": { "line": 26, - "column": 13, + "column": 11, "program": "abstractNewClassInstanceExpression.ets" } } @@ -1091,7 +1091,7 @@ }, "end": { "line": 32, - "column": 21, + "column": 20, "program": "abstractNewClassInstanceExpression.ets" } } @@ -1104,7 +1104,7 @@ }, "end": { "line": 32, - "column": 21, + "column": 20, "program": "abstractNewClassInstanceExpression.ets" } } diff --git a/ets2panda/test/compiler/ets/ambient_declaration-expected.txt b/ets2panda/test/compiler/ets/ambient_declaration-expected.txt index fdab2a6c855..f7106d19ffa 100644 --- a/ets2panda/test/compiler/ets/ambient_declaration-expected.txt +++ b/ets2panda/test/compiler/ets/ambient_declaration-expected.txt @@ -260,7 +260,7 @@ }, "end": { "line": 16, - "column": 43, + "column": 42, "program": "ambient_declaration.ets" } } @@ -273,7 +273,7 @@ }, "end": { "line": 16, - "column": 43, + "column": 42, "program": "ambient_declaration.ets" } } @@ -287,7 +287,7 @@ }, "end": { "line": 16, - "column": 43, + "column": 42, "program": "ambient_declaration.ets" } } @@ -300,7 +300,7 @@ }, "end": { "line": 16, - "column": 43, + "column": 42, "program": "ambient_declaration.ets" } } 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 d260612eff4..923a421fe07 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 @@ -393,7 +393,7 @@ }, "end": { "line": 18, - "column": 34, + "column": 33, "program": "array_indexing_without_chaining_non_nullish.ets" } } @@ -406,7 +406,7 @@ }, "end": { "line": 18, - "column": 34, + "column": 33, "program": "array_indexing_without_chaining_non_nullish.ets" } } @@ -456,7 +456,7 @@ }, "end": { "line": 18, - "column": 43, + "column": 42, "program": "array_indexing_without_chaining_non_nullish.ets" } } @@ -469,7 +469,7 @@ }, "end": { "line": 18, - "column": 43, + "column": 42, "program": "array_indexing_without_chaining_non_nullish.ets" } } @@ -886,7 +886,7 @@ }, "end": { "line": 19, - "column": 20, + "column": 18, "program": "array_indexing_without_chaining_non_nullish.ets" } } @@ -899,7 +899,7 @@ }, "end": { "line": 19, - "column": 20, + "column": 18, "program": "array_indexing_without_chaining_non_nullish.ets" } } diff --git a/ets2panda/test/compiler/ets/boxingConversion10-expected.txt b/ets2panda/test/compiler/ets/boxingConversion10-expected.txt index 9026b11d3c4..26279f3bdd5 100644 --- a/ets2panda/test/compiler/ets/boxingConversion10-expected.txt +++ b/ets2panda/test/compiler/ets/boxingConversion10-expected.txt @@ -475,7 +475,7 @@ }, "end": { "line": 17, - "column": 16, + "column": 14, "program": "boxingConversion10.ets" } } @@ -488,7 +488,7 @@ }, "end": { "line": 17, - "column": 16, + "column": 14, "program": "boxingConversion10.ets" } } diff --git a/ets2panda/test/compiler/ets/boxingConversion2-expected.txt b/ets2panda/test/compiler/ets/boxingConversion2-expected.txt index 4d8cddd98af..840418e9fb8 100644 --- a/ets2panda/test/compiler/ets/boxingConversion2-expected.txt +++ b/ets2panda/test/compiler/ets/boxingConversion2-expected.txt @@ -882,7 +882,7 @@ }, "end": { "line": 25, - "column": 20, + "column": 18, "program": "boxingConversion2.ets" } } @@ -895,7 +895,7 @@ }, "end": { "line": 25, - "column": 20, + "column": 18, "program": "boxingConversion2.ets" } } @@ -996,7 +996,7 @@ }, "end": { "line": 26, - "column": 20, + "column": 18, "program": "boxingConversion2.ets" } } @@ -1009,7 +1009,7 @@ }, "end": { "line": 26, - "column": 20, + "column": 18, "program": "boxingConversion2.ets" } } @@ -1110,7 +1110,7 @@ }, "end": { "line": 27, - "column": 20, + "column": 18, "program": "boxingConversion2.ets" } } @@ -1123,7 +1123,7 @@ }, "end": { "line": 27, - "column": 20, + "column": 18, "program": "boxingConversion2.ets" } } @@ -1224,7 +1224,7 @@ }, "end": { "line": 28, - "column": 20, + "column": 18, "program": "boxingConversion2.ets" } } @@ -1237,7 +1237,7 @@ }, "end": { "line": 28, - "column": 20, + "column": 18, "program": "boxingConversion2.ets" } } @@ -1338,7 +1338,7 @@ }, "end": { "line": 29, - "column": 20, + "column": 18, "program": "boxingConversion2.ets" } } @@ -1351,7 +1351,7 @@ }, "end": { "line": 29, - "column": 20, + "column": 18, "program": "boxingConversion2.ets" } } @@ -1452,7 +1452,7 @@ }, "end": { "line": 30, - "column": 20, + "column": 18, "program": "boxingConversion2.ets" } } @@ -1465,7 +1465,7 @@ }, "end": { "line": 30, - "column": 20, + "column": 18, "program": "boxingConversion2.ets" } } @@ -1566,7 +1566,7 @@ }, "end": { "line": 31, - "column": 20, + "column": 18, "program": "boxingConversion2.ets" } } @@ -1579,7 +1579,7 @@ }, "end": { "line": 31, - "column": 20, + "column": 18, "program": "boxingConversion2.ets" } } @@ -1680,7 +1680,7 @@ }, "end": { "line": 32, - "column": 20, + "column": 18, "program": "boxingConversion2.ets" } } @@ -1693,7 +1693,7 @@ }, "end": { "line": 32, - "column": 20, + "column": 18, "program": "boxingConversion2.ets" } } @@ -1794,7 +1794,7 @@ }, "end": { "line": 33, - "column": 20, + "column": 18, "program": "boxingConversion2.ets" } } @@ -1807,7 +1807,7 @@ }, "end": { "line": 33, - "column": 20, + "column": 18, "program": "boxingConversion2.ets" } } @@ -1907,7 +1907,7 @@ }, "end": { "line": 34, - "column": 20, + "column": 18, "program": "boxingConversion2.ets" } } @@ -1920,7 +1920,7 @@ }, "end": { "line": 34, - "column": 20, + "column": 18, "program": "boxingConversion2.ets" } } @@ -2020,7 +2020,7 @@ }, "end": { "line": 35, - "column": 19, + "column": 17, "program": "boxingConversion2.ets" } } @@ -2033,7 +2033,7 @@ }, "end": { "line": 35, - "column": 19, + "column": 17, "program": "boxingConversion2.ets" } } @@ -2202,7 +2202,7 @@ }, "end": { "line": 36, - "column": 17, + "column": 15, "program": "boxingConversion2.ets" } } @@ -2215,7 +2215,7 @@ }, "end": { "line": 36, - "column": 17, + "column": 15, "program": "boxingConversion2.ets" } } diff --git a/ets2panda/test/compiler/ets/boxingConversion3-expected.txt b/ets2panda/test/compiler/ets/boxingConversion3-expected.txt index 620399e675d..2bb85eafa8d 100644 --- a/ets2panda/test/compiler/ets/boxingConversion3-expected.txt +++ b/ets2panda/test/compiler/ets/boxingConversion3-expected.txt @@ -425,7 +425,7 @@ }, "end": { "line": 20, - "column": 40, + "column": 38, "program": "boxingConversion3.ets" } } @@ -438,7 +438,7 @@ }, "end": { "line": 20, - "column": 40, + "column": 38, "program": "boxingConversion3.ets" } } @@ -479,7 +479,7 @@ }, "end": { "line": 21, - "column": 22, + "column": 21, "program": "boxingConversion3.ets" } } @@ -492,7 +492,7 @@ }, "end": { "line": 21, - "column": 22, + "column": 21, "program": "boxingConversion3.ets" } } @@ -701,7 +701,7 @@ }, "end": { "line": 25, - "column": 18, + "column": 16, "program": "boxingConversion3.ets" } } @@ -714,7 +714,7 @@ }, "end": { "line": 25, - "column": 18, + "column": 16, "program": "boxingConversion3.ets" } } @@ -814,7 +814,7 @@ }, "end": { "line": 26, - "column": 19, + "column": 17, "program": "boxingConversion3.ets" } } @@ -827,7 +827,7 @@ }, "end": { "line": 26, - "column": 19, + "column": 17, "program": "boxingConversion3.ets" } } @@ -927,7 +927,7 @@ }, "end": { "line": 27, - "column": 18, + "column": 16, "program": "boxingConversion3.ets" } } @@ -940,7 +940,7 @@ }, "end": { "line": 27, - "column": 18, + "column": 16, "program": "boxingConversion3.ets" } } diff --git a/ets2panda/test/compiler/ets/boxingConversion5-expected.txt b/ets2panda/test/compiler/ets/boxingConversion5-expected.txt index 6217fc4519b..7c6fbeaa700 100644 --- a/ets2panda/test/compiler/ets/boxingConversion5-expected.txt +++ b/ets2panda/test/compiler/ets/boxingConversion5-expected.txt @@ -605,7 +605,7 @@ }, "end": { "line": 17, - "column": 14, + "column": 12, "program": "boxingConversion5.ets" } } @@ -618,7 +618,7 @@ }, "end": { "line": 17, - "column": 14, + "column": 12, "program": "boxingConversion5.ets" } } @@ -692,7 +692,7 @@ }, "end": { "line": 18, - "column": 15, + "column": 13, "program": "boxingConversion5.ets" } } @@ -705,7 +705,7 @@ }, "end": { "line": 18, - "column": 15, + "column": 13, "program": "boxingConversion5.ets" } } @@ -779,7 +779,7 @@ }, "end": { "line": 19, - "column": 16, + "column": 14, "program": "boxingConversion5.ets" } } @@ -792,7 +792,7 @@ }, "end": { "line": 19, - "column": 16, + "column": 14, "program": "boxingConversion5.ets" } } diff --git a/ets2panda/test/compiler/ets/boxingConversion6-expected.txt b/ets2panda/test/compiler/ets/boxingConversion6-expected.txt index 7b5063ec58f..e2fabd7e73e 100644 --- a/ets2panda/test/compiler/ets/boxingConversion6-expected.txt +++ b/ets2panda/test/compiler/ets/boxingConversion6-expected.txt @@ -800,7 +800,7 @@ }, "end": { "line": 17, - "column": 15, + "column": 13, "program": "boxingConversion6.ets" } } @@ -813,7 +813,7 @@ }, "end": { "line": 17, - "column": 15, + "column": 13, "program": "boxingConversion6.ets" } } @@ -887,7 +887,7 @@ }, "end": { "line": 18, - "column": 13, + "column": 11, "program": "boxingConversion6.ets" } } @@ -900,7 +900,7 @@ }, "end": { "line": 18, - "column": 13, + "column": 11, "program": "boxingConversion6.ets" } } @@ -974,7 +974,7 @@ }, "end": { "line": 19, - "column": 14, + "column": 12, "program": "boxingConversion6.ets" } } @@ -987,7 +987,7 @@ }, "end": { "line": 19, - "column": 14, + "column": 12, "program": "boxingConversion6.ets" } } @@ -1061,7 +1061,7 @@ }, "end": { "line": 20, - "column": 15, + "column": 13, "program": "boxingConversion6.ets" } } @@ -1074,7 +1074,7 @@ }, "end": { "line": 20, - "column": 15, + "column": 13, "program": "boxingConversion6.ets" } } @@ -1148,7 +1148,7 @@ }, "end": { "line": 21, - "column": 16, + "column": 14, "program": "boxingConversion6.ets" } } @@ -1161,7 +1161,7 @@ }, "end": { "line": 21, - "column": 16, + "column": 14, "program": "boxingConversion6.ets" } } @@ -1235,7 +1235,7 @@ }, "end": { "line": 22, - "column": 14, + "column": 12, "program": "boxingConversion6.ets" } } @@ -1248,7 +1248,7 @@ }, "end": { "line": 22, - "column": 14, + "column": 12, "program": "boxingConversion6.ets" } } diff --git a/ets2panda/test/compiler/ets/boxingConversion7-expected.txt b/ets2panda/test/compiler/ets/boxingConversion7-expected.txt index ed0f15234f5..e15dcc9bbf1 100644 --- a/ets2panda/test/compiler/ets/boxingConversion7-expected.txt +++ b/ets2panda/test/compiler/ets/boxingConversion7-expected.txt @@ -670,7 +670,7 @@ }, "end": { "line": 17, - "column": 13, + "column": 11, "program": "boxingConversion7.ets" } } @@ -683,7 +683,7 @@ }, "end": { "line": 17, - "column": 13, + "column": 11, "program": "boxingConversion7.ets" } } @@ -757,7 +757,7 @@ }, "end": { "line": 18, - "column": 14, + "column": 12, "program": "boxingConversion7.ets" } } @@ -770,7 +770,7 @@ }, "end": { "line": 18, - "column": 14, + "column": 12, "program": "boxingConversion7.ets" } } @@ -844,7 +844,7 @@ }, "end": { "line": 19, - "column": 15, + "column": 13, "program": "boxingConversion7.ets" } } @@ -857,7 +857,7 @@ }, "end": { "line": 19, - "column": 15, + "column": 13, "program": "boxingConversion7.ets" } } @@ -931,7 +931,7 @@ }, "end": { "line": 20, - "column": 16, + "column": 14, "program": "boxingConversion7.ets" } } @@ -944,7 +944,7 @@ }, "end": { "line": 20, - "column": 16, + "column": 14, "program": "boxingConversion7.ets" } } diff --git a/ets2panda/test/compiler/ets/boxingConversion8-expected.txt b/ets2panda/test/compiler/ets/boxingConversion8-expected.txt index cb1abb58a60..f5574b41567 100644 --- a/ets2panda/test/compiler/ets/boxingConversion8-expected.txt +++ b/ets2panda/test/compiler/ets/boxingConversion8-expected.txt @@ -670,7 +670,7 @@ }, "end": { "line": 17, - "column": 13, + "column": 11, "program": "boxingConversion8.ets" } } @@ -683,7 +683,7 @@ }, "end": { "line": 17, - "column": 13, + "column": 11, "program": "boxingConversion8.ets" } } @@ -757,7 +757,7 @@ }, "end": { "line": 18, - "column": 14, + "column": 12, "program": "boxingConversion8.ets" } } @@ -770,7 +770,7 @@ }, "end": { "line": 18, - "column": 14, + "column": 12, "program": "boxingConversion8.ets" } } @@ -844,7 +844,7 @@ }, "end": { "line": 19, - "column": 15, + "column": 13, "program": "boxingConversion8.ets" } } @@ -857,7 +857,7 @@ }, "end": { "line": 19, - "column": 15, + "column": 13, "program": "boxingConversion8.ets" } } @@ -931,7 +931,7 @@ }, "end": { "line": 20, - "column": 16, + "column": 14, "program": "boxingConversion8.ets" } } @@ -944,7 +944,7 @@ }, "end": { "line": 20, - "column": 16, + "column": 14, "program": "boxingConversion8.ets" } } diff --git a/ets2panda/test/compiler/ets/boxingConversion9-expected.txt b/ets2panda/test/compiler/ets/boxingConversion9-expected.txt index 6844c681fb7..08d37f8b150 100644 --- a/ets2panda/test/compiler/ets/boxingConversion9-expected.txt +++ b/ets2panda/test/compiler/ets/boxingConversion9-expected.txt @@ -540,7 +540,7 @@ }, "end": { "line": 17, - "column": 15, + "column": 13, "program": "boxingConversion9.ets" } } @@ -553,7 +553,7 @@ }, "end": { "line": 17, - "column": 15, + "column": 13, "program": "boxingConversion9.ets" } } @@ -627,7 +627,7 @@ }, "end": { "line": 18, - "column": 16, + "column": 14, "program": "boxingConversion9.ets" } } @@ -640,7 +640,7 @@ }, "end": { "line": 18, - "column": 16, + "column": 14, "program": "boxingConversion9.ets" } } diff --git a/ets2panda/test/compiler/ets/boxingUnboxingExpressions-expected.txt b/ets2panda/test/compiler/ets/boxingUnboxingExpressions-expected.txt index b3aab0e5db6..b79079f03d5 100644 --- a/ets2panda/test/compiler/ets/boxingUnboxingExpressions-expected.txt +++ b/ets2panda/test/compiler/ets/boxingUnboxingExpressions-expected.txt @@ -159,7 +159,7 @@ }, "end": { "line": 18, - "column": 38, + "column": 37, "program": "boxingUnboxingExpressions.ets" } } @@ -172,7 +172,7 @@ }, "end": { "line": 18, - "column": 38, + "column": 37, "program": "boxingUnboxingExpressions.ets" } } @@ -273,7 +273,7 @@ }, "end": { "line": 19, - "column": 25, + "column": 23, "program": "boxingUnboxingExpressions.ets" } } @@ -286,7 +286,7 @@ }, "end": { "line": 19, - "column": 25, + "column": 23, "program": "boxingUnboxingExpressions.ets" } } @@ -498,7 +498,7 @@ }, "end": { "line": 21, - "column": 32, + "column": 31, "program": "boxingUnboxingExpressions.ets" } } @@ -511,7 +511,7 @@ }, "end": { "line": 21, - "column": 32, + "column": 31, "program": "boxingUnboxingExpressions.ets" } } @@ -613,7 +613,7 @@ }, "end": { "line": 22, - "column": 22, + "column": 20, "program": "boxingUnboxingExpressions.ets" } } @@ -626,7 +626,7 @@ }, "end": { "line": 22, - "column": 22, + "column": 20, "program": "boxingUnboxingExpressions.ets" } } @@ -838,7 +838,7 @@ }, "end": { "line": 24, - "column": 34, + "column": 33, "program": "boxingUnboxingExpressions.ets" } } @@ -851,7 +851,7 @@ }, "end": { "line": 24, - "column": 34, + "column": 33, "program": "boxingUnboxingExpressions.ets" } } @@ -953,7 +953,7 @@ }, "end": { "line": 25, - "column": 23, + "column": 21, "program": "boxingUnboxingExpressions.ets" } } @@ -966,7 +966,7 @@ }, "end": { "line": 25, - "column": 23, + "column": 21, "program": "boxingUnboxingExpressions.ets" } } @@ -1066,7 +1066,7 @@ }, "end": { "line": 26, - "column": 23, + "column": 21, "program": "boxingUnboxingExpressions.ets" } } @@ -1079,7 +1079,7 @@ }, "end": { "line": 26, - "column": 23, + "column": 21, "program": "boxingUnboxingExpressions.ets" } } @@ -1210,7 +1210,7 @@ }, "end": { "line": 27, - "column": 32, + "column": 31, "program": "boxingUnboxingExpressions.ets" } } @@ -1223,7 +1223,7 @@ }, "end": { "line": 27, - "column": 32, + "column": 31, "program": "boxingUnboxingExpressions.ets" } } @@ -1324,7 +1324,7 @@ }, "end": { "line": 28, - "column": 22, + "column": 20, "program": "boxingUnboxingExpressions.ets" } } @@ -1337,7 +1337,7 @@ }, "end": { "line": 28, - "column": 22, + "column": 20, "program": "boxingUnboxingExpressions.ets" } } @@ -1468,7 +1468,7 @@ }, "end": { "line": 29, - "column": 30, + "column": 29, "program": "boxingUnboxingExpressions.ets" } } @@ -1481,7 +1481,7 @@ }, "end": { "line": 29, - "column": 30, + "column": 29, "program": "boxingUnboxingExpressions.ets" } } @@ -1582,7 +1582,7 @@ }, "end": { "line": 30, - "column": 21, + "column": 19, "program": "boxingUnboxingExpressions.ets" } } @@ -1595,7 +1595,7 @@ }, "end": { "line": 30, - "column": 21, + "column": 19, "program": "boxingUnboxingExpressions.ets" } } @@ -1695,7 +1695,7 @@ }, "end": { "line": 31, - "column": 21, + "column": 19, "program": "boxingUnboxingExpressions.ets" } } @@ -1708,7 +1708,7 @@ }, "end": { "line": 31, - "column": 21, + "column": 19, "program": "boxingUnboxingExpressions.ets" } } @@ -1808,7 +1808,7 @@ }, "end": { "line": 32, - "column": 21, + "column": 19, "program": "boxingUnboxingExpressions.ets" } } @@ -1821,7 +1821,7 @@ }, "end": { "line": 32, - "column": 21, + "column": 19, "program": "boxingUnboxingExpressions.ets" } } @@ -1952,7 +1952,7 @@ }, "end": { "line": 33, - "column": 32, + "column": 31, "program": "boxingUnboxingExpressions.ets" } } @@ -1965,7 +1965,7 @@ }, "end": { "line": 33, - "column": 32, + "column": 31, "program": "boxingUnboxingExpressions.ets" } } @@ -2066,7 +2066,7 @@ }, "end": { "line": 34, - "column": 22, + "column": 20, "program": "boxingUnboxingExpressions.ets" } } @@ -2079,7 +2079,7 @@ }, "end": { "line": 34, - "column": 22, + "column": 20, "program": "boxingUnboxingExpressions.ets" } } @@ -2291,7 +2291,7 @@ }, "end": { "line": 36, - "column": 34, + "column": 33, "program": "boxingUnboxingExpressions.ets" } } @@ -2304,7 +2304,7 @@ }, "end": { "line": 36, - "column": 34, + "column": 33, "program": "boxingUnboxingExpressions.ets" } } @@ -2406,7 +2406,7 @@ }, "end": { "line": 37, - "column": 23, + "column": 21, "program": "boxingUnboxingExpressions.ets" } } @@ -2419,7 +2419,7 @@ }, "end": { "line": 37, - "column": 23, + "column": 21, "program": "boxingUnboxingExpressions.ets" } } @@ -2551,7 +2551,7 @@ }, "end": { "line": 38, - "column": 36, + "column": 35, "program": "boxingUnboxingExpressions.ets" } } @@ -2564,7 +2564,7 @@ }, "end": { "line": 38, - "column": 36, + "column": 35, "program": "boxingUnboxingExpressions.ets" } } @@ -2665,7 +2665,7 @@ }, "end": { "line": 39, - "column": 24, + "column": 22, "program": "boxingUnboxingExpressions.ets" } } @@ -2678,7 +2678,7 @@ }, "end": { "line": 39, - "column": 24, + "column": 22, "program": "boxingUnboxingExpressions.ets" } } @@ -3048,7 +3048,7 @@ }, "end": { "line": 43, - "column": 33, + "column": 32, "program": "boxingUnboxingExpressions.ets" } } @@ -3061,7 +3061,7 @@ }, "end": { "line": 43, - "column": 33, + "column": 32, "program": "boxingUnboxingExpressions.ets" } } @@ -3075,7 +3075,7 @@ }, "end": { "line": 43, - "column": 33, + "column": 32, "program": "boxingUnboxingExpressions.ets" } } @@ -3088,7 +3088,7 @@ }, "end": { "line": 43, - "column": 33, + "column": 32, "program": "boxingUnboxingExpressions.ets" } } @@ -3418,7 +3418,7 @@ }, "end": { "line": 45, - "column": 27, + "column": 26, "program": "boxingUnboxingExpressions.ets" } } @@ -3431,7 +3431,7 @@ }, "end": { "line": 45, - "column": 27, + "column": 26, "program": "boxingUnboxingExpressions.ets" } } @@ -3445,7 +3445,7 @@ }, "end": { "line": 45, - "column": 27, + "column": 26, "program": "boxingUnboxingExpressions.ets" } } @@ -3458,7 +3458,7 @@ }, "end": { "line": 45, - "column": 27, + "column": 26, "program": "boxingUnboxingExpressions.ets" } } @@ -3788,7 +3788,7 @@ }, "end": { "line": 47, - "column": 29, + "column": 28, "program": "boxingUnboxingExpressions.ets" } } @@ -3801,7 +3801,7 @@ }, "end": { "line": 47, - "column": 29, + "column": 28, "program": "boxingUnboxingExpressions.ets" } } @@ -3815,7 +3815,7 @@ }, "end": { "line": 47, - "column": 29, + "column": 28, "program": "boxingUnboxingExpressions.ets" } } @@ -3828,7 +3828,7 @@ }, "end": { "line": 47, - "column": 29, + "column": 28, "program": "boxingUnboxingExpressions.ets" } } @@ -4158,7 +4158,7 @@ }, "end": { "line": 49, - "column": 27, + "column": 26, "program": "boxingUnboxingExpressions.ets" } } @@ -4171,7 +4171,7 @@ }, "end": { "line": 49, - "column": 27, + "column": 26, "program": "boxingUnboxingExpressions.ets" } } @@ -4185,7 +4185,7 @@ }, "end": { "line": 49, - "column": 27, + "column": 26, "program": "boxingUnboxingExpressions.ets" } } @@ -4198,7 +4198,7 @@ }, "end": { "line": 49, - "column": 27, + "column": 26, "program": "boxingUnboxingExpressions.ets" } } @@ -4528,7 +4528,7 @@ }, "end": { "line": 51, - "column": 29, + "column": 28, "program": "boxingUnboxingExpressions.ets" } } @@ -4541,7 +4541,7 @@ }, "end": { "line": 51, - "column": 29, + "column": 28, "program": "boxingUnboxingExpressions.ets" } } @@ -4555,7 +4555,7 @@ }, "end": { "line": 51, - "column": 29, + "column": 28, "program": "boxingUnboxingExpressions.ets" } } @@ -4568,7 +4568,7 @@ }, "end": { "line": 51, - "column": 29, + "column": 28, "program": "boxingUnboxingExpressions.ets" } } @@ -4898,7 +4898,7 @@ }, "end": { "line": 53, - "column": 27, + "column": 26, "program": "boxingUnboxingExpressions.ets" } } @@ -4911,7 +4911,7 @@ }, "end": { "line": 53, - "column": 27, + "column": 26, "program": "boxingUnboxingExpressions.ets" } } @@ -4925,7 +4925,7 @@ }, "end": { "line": 53, - "column": 27, + "column": 26, "program": "boxingUnboxingExpressions.ets" } } @@ -4938,7 +4938,7 @@ }, "end": { "line": 53, - "column": 27, + "column": 26, "program": "boxingUnboxingExpressions.ets" } } @@ -5268,7 +5268,7 @@ }, "end": { "line": 55, - "column": 29, + "column": 28, "program": "boxingUnboxingExpressions.ets" } } @@ -5281,7 +5281,7 @@ }, "end": { "line": 55, - "column": 29, + "column": 28, "program": "boxingUnboxingExpressions.ets" } } @@ -5295,7 +5295,7 @@ }, "end": { "line": 55, - "column": 29, + "column": 28, "program": "boxingUnboxingExpressions.ets" } } @@ -5308,7 +5308,7 @@ }, "end": { "line": 55, - "column": 29, + "column": 28, "program": "boxingUnboxingExpressions.ets" } } @@ -5638,7 +5638,7 @@ }, "end": { "line": 57, - "column": 31, + "column": 30, "program": "boxingUnboxingExpressions.ets" } } @@ -5651,7 +5651,7 @@ }, "end": { "line": 57, - "column": 31, + "column": 30, "program": "boxingUnboxingExpressions.ets" } } @@ -5665,7 +5665,7 @@ }, "end": { "line": 57, - "column": 31, + "column": 30, "program": "boxingUnboxingExpressions.ets" } } @@ -5678,7 +5678,7 @@ }, "end": { "line": 57, - "column": 31, + "column": 30, "program": "boxingUnboxingExpressions.ets" } } @@ -5908,7 +5908,7 @@ }, "end": { "line": 60, - "column": 43, + "column": 42, "program": "boxingUnboxingExpressions.ets" } } @@ -5921,7 +5921,7 @@ }, "end": { "line": 60, - "column": 43, + "column": 42, "program": "boxingUnboxingExpressions.ets" } } @@ -6249,7 +6249,7 @@ }, "end": { "line": 63, - "column": 37, + "column": 36, "program": "boxingUnboxingExpressions.ets" } } @@ -6262,7 +6262,7 @@ }, "end": { "line": 63, - "column": 37, + "column": 36, "program": "boxingUnboxingExpressions.ets" } } @@ -6592,7 +6592,7 @@ }, "end": { "line": 66, - "column": 39, + "column": 38, "program": "boxingUnboxingExpressions.ets" } } @@ -6605,7 +6605,7 @@ }, "end": { "line": 66, - "column": 39, + "column": 38, "program": "boxingUnboxingExpressions.ets" } } @@ -6854,7 +6854,7 @@ }, "end": { "line": 68, - "column": 37, + "column": 36, "program": "boxingUnboxingExpressions.ets" } } @@ -6867,7 +6867,7 @@ }, "end": { "line": 68, - "column": 37, + "column": 36, "program": "boxingUnboxingExpressions.ets" } } @@ -7114,7 +7114,7 @@ }, "end": { "line": 70, - "column": 39, + "column": 38, "program": "boxingUnboxingExpressions.ets" } } @@ -7127,7 +7127,7 @@ }, "end": { "line": 70, - "column": 39, + "column": 38, "program": "boxingUnboxingExpressions.ets" } } @@ -7374,7 +7374,7 @@ }, "end": { "line": 72, - "column": 37, + "column": 36, "program": "boxingUnboxingExpressions.ets" } } @@ -7387,7 +7387,7 @@ }, "end": { "line": 72, - "column": 37, + "column": 36, "program": "boxingUnboxingExpressions.ets" } } @@ -7715,7 +7715,7 @@ }, "end": { "line": 75, - "column": 39, + "column": 38, "program": "boxingUnboxingExpressions.ets" } } @@ -7728,7 +7728,7 @@ }, "end": { "line": 75, - "column": 39, + "column": 38, "program": "boxingUnboxingExpressions.ets" } } @@ -7977,7 +7977,7 @@ }, "end": { "line": 77, - "column": 41, + "column": 40, "program": "boxingUnboxingExpressions.ets" } } @@ -7990,7 +7990,7 @@ }, "end": { "line": 77, - "column": 41, + "column": 40, "program": "boxingUnboxingExpressions.ets" } } diff --git a/ets2panda/test/compiler/ets/catch-soft-keyword-expected.txt b/ets2panda/test/compiler/ets/catch-soft-keyword-expected.txt index 00b03aa72af..039d935533c 100644 --- a/ets2panda/test/compiler/ets/catch-soft-keyword-expected.txt +++ b/ets2panda/test/compiler/ets/catch-soft-keyword-expected.txt @@ -884,7 +884,7 @@ }, "end": { "line": 26, - "column": 29, + "column": 28, "program": "catch-soft-keyword.ets" } } @@ -897,7 +897,7 @@ }, "end": { "line": 26, - "column": 29, + "column": 28, "program": "catch-soft-keyword.ets" } } diff --git a/ets2panda/test/compiler/ets/catchParamScope-expected.txt b/ets2panda/test/compiler/ets/catchParamScope-expected.txt index c2a99cefe11..2f2ba3007ed 100644 --- a/ets2panda/test/compiler/ets/catchParamScope-expected.txt +++ b/ets2panda/test/compiler/ets/catchParamScope-expected.txt @@ -213,7 +213,7 @@ }, "end": { "line": 16, - "column": 31, + "column": 30, "program": "catchParamScope.ets" } } @@ -226,7 +226,7 @@ }, "end": { "line": 16, - "column": 31, + "column": 30, "program": "catchParamScope.ets" } } @@ -240,7 +240,7 @@ }, "end": { "line": 16, - "column": 31, + "column": 30, "program": "catchParamScope.ets" } } @@ -253,7 +253,7 @@ }, "end": { "line": 16, - "column": 31, + "column": 30, "program": "catchParamScope.ets" } } @@ -615,7 +615,7 @@ }, "end": { "line": 22, - "column": 35, + "column": 34, "program": "catchParamScope.ets" } } @@ -628,7 +628,7 @@ }, "end": { "line": 22, - "column": 35, + "column": 34, "program": "catchParamScope.ets" } } 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 3a4ffec7a6a..a725c49c816 100644 --- a/ets2panda/test/compiler/ets/class_def_varargs_1-expected.txt +++ b/ets2panda/test/compiler/ets/class_def_varargs_1-expected.txt @@ -567,7 +567,7 @@ }, "end": { "line": 18, - "column": 40, + "column": 39, "program": "class_def_varargs_1.ets" } } @@ -580,7 +580,7 @@ }, "end": { "line": 18, - "column": 40, + "column": 39, "program": "class_def_varargs_1.ets" } } @@ -607,7 +607,7 @@ }, "end": { "line": 18, - "column": 42, + "column": 40, "program": "class_def_varargs_1.ets" } } @@ -620,7 +620,7 @@ }, "end": { "line": 18, - "column": 42, + "column": 40, "program": "class_def_varargs_1.ets" } } @@ -754,7 +754,7 @@ }, "end": { "line": 19, - "column": 29, + "column": 28, "program": "class_def_varargs_1.ets" } } @@ -767,7 +767,7 @@ }, "end": { "line": 19, - "column": 29, + "column": 28, "program": "class_def_varargs_1.ets" } } @@ -794,7 +794,7 @@ }, "end": { "line": 19, - "column": 30, + "column": 29, "program": "class_def_varargs_1.ets" } } @@ -807,7 +807,7 @@ }, "end": { "line": 19, - "column": 30, + "column": 29, "program": "class_def_varargs_1.ets" } } 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 41f57b17079..39caaea5f40 100644 --- a/ets2panda/test/compiler/ets/class_def_varargs_2-expected.txt +++ b/ets2panda/test/compiler/ets/class_def_varargs_2-expected.txt @@ -550,7 +550,7 @@ }, "end": { "line": 21, - "column": 19, + "column": 18, "program": "class_def_varargs_2.ets" } } @@ -563,7 +563,7 @@ }, "end": { "line": 21, - "column": 19, + "column": 18, "program": "class_def_varargs_2.ets" } } @@ -663,7 +663,7 @@ }, "end": { "line": 22, - "column": 15, + "column": 14, "program": "class_def_varargs_2.ets" } } @@ -676,7 +676,7 @@ }, "end": { "line": 22, - "column": 15, + "column": 14, "program": "class_def_varargs_2.ets" } } diff --git a/ets2panda/test/compiler/ets/conversion-w-ASExpr-expected.txt b/ets2panda/test/compiler/ets/conversion-w-ASExpr-expected.txt index 22661874e67..d41f4f5ba96 100644 --- a/ets2panda/test/compiler/ets/conversion-w-ASExpr-expected.txt +++ b/ets2panda/test/compiler/ets/conversion-w-ASExpr-expected.txt @@ -234,7 +234,7 @@ }, "end": { "line": 17, - "column": 23, + "column": 21, "program": "conversion-w-ASExpr.ets" } } @@ -247,7 +247,7 @@ }, "end": { "line": 17, - "column": 23, + "column": 21, "program": "conversion-w-ASExpr.ets" } } @@ -377,7 +377,7 @@ }, "end": { "line": 18, - "column": 25, + "column": 23, "program": "conversion-w-ASExpr.ets" } } @@ -390,7 +390,7 @@ }, "end": { "line": 18, - "column": 25, + "column": 23, "program": "conversion-w-ASExpr.ets" } } @@ -520,7 +520,7 @@ }, "end": { "line": 19, - "column": 23, + "column": 21, "program": "conversion-w-ASExpr.ets" } } @@ -533,7 +533,7 @@ }, "end": { "line": 19, - "column": 23, + "column": 21, "program": "conversion-w-ASExpr.ets" } } @@ -663,7 +663,7 @@ }, "end": { "line": 20, - "column": 22, + "column": 20, "program": "conversion-w-ASExpr.ets" } } @@ -676,7 +676,7 @@ }, "end": { "line": 20, - "column": 22, + "column": 20, "program": "conversion-w-ASExpr.ets" } } @@ -806,7 +806,7 @@ }, "end": { "line": 21, - "column": 29, + "column": 27, "program": "conversion-w-ASExpr.ets" } } @@ -819,7 +819,7 @@ }, "end": { "line": 21, - "column": 29, + "column": 27, "program": "conversion-w-ASExpr.ets" } } @@ -949,7 +949,7 @@ }, "end": { "line": 22, - "column": 22, + "column": 20, "program": "conversion-w-ASExpr.ets" } } @@ -962,7 +962,7 @@ }, "end": { "line": 22, - "column": 22, + "column": 20, "program": "conversion-w-ASExpr.ets" } } @@ -1062,7 +1062,7 @@ }, "end": { "line": 23, - "column": 25, + "column": 23, "program": "conversion-w-ASExpr.ets" } } @@ -1075,7 +1075,7 @@ }, "end": { "line": 23, - "column": 25, + "column": 23, "program": "conversion-w-ASExpr.ets" } } @@ -1205,7 +1205,7 @@ }, "end": { "line": 24, - "column": 33, + "column": 31, "program": "conversion-w-ASExpr.ets" } } @@ -1218,7 +1218,7 @@ }, "end": { "line": 24, - "column": 33, + "column": 31, "program": "conversion-w-ASExpr.ets" } } @@ -1348,7 +1348,7 @@ }, "end": { "line": 25, - "column": 28, + "column": 26, "program": "conversion-w-ASExpr.ets" } } @@ -1361,7 +1361,7 @@ }, "end": { "line": 25, - "column": 28, + "column": 26, "program": "conversion-w-ASExpr.ets" } } @@ -1491,7 +1491,7 @@ }, "end": { "line": 28, - "column": 28, + "column": 26, "program": "conversion-w-ASExpr.ets" } } @@ -1504,7 +1504,7 @@ }, "end": { "line": 28, - "column": 28, + "column": 26, "program": "conversion-w-ASExpr.ets" } } @@ -1655,7 +1655,7 @@ }, "end": { "line": 29, - "column": 27, + "column": 25, "program": "conversion-w-ASExpr.ets" } } @@ -1668,7 +1668,7 @@ }, "end": { "line": 29, - "column": 27, + "column": 25, "program": "conversion-w-ASExpr.ets" } } @@ -1819,7 +1819,7 @@ }, "end": { "line": 30, - "column": 24, + "column": 22, "program": "conversion-w-ASExpr.ets" } } @@ -1832,7 +1832,7 @@ }, "end": { "line": 30, - "column": 24, + "column": 22, "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 35040cc0c84..4f48c67640d 100644 --- a/ets2panda/test/compiler/ets/conversion_w_functions-expected.txt +++ b/ets2panda/test/compiler/ets/conversion_w_functions-expected.txt @@ -612,7 +612,7 @@ }, "end": { "line": 24, - "column": 25, + "column": 23, "program": "conversion_w_functions.ets" } } @@ -625,7 +625,7 @@ }, "end": { "line": 24, - "column": 25, + "column": 23, "program": "conversion_w_functions.ets" } } @@ -883,7 +883,7 @@ }, "end": { "line": 28, - "column": 27, + "column": 25, "program": "conversion_w_functions.ets" } } @@ -896,7 +896,7 @@ }, "end": { "line": 28, - "column": 27, + "column": 25, "program": "conversion_w_functions.ets" } } @@ -1154,7 +1154,7 @@ }, "end": { "line": 32, - "column": 25, + "column": 23, "program": "conversion_w_functions.ets" } } @@ -1167,7 +1167,7 @@ }, "end": { "line": 32, - "column": 25, + "column": 23, "program": "conversion_w_functions.ets" } } @@ -1425,7 +1425,7 @@ }, "end": { "line": 36, - "column": 24, + "column": 22, "program": "conversion_w_functions.ets" } } @@ -1438,7 +1438,7 @@ }, "end": { "line": 36, - "column": 24, + "column": 22, "program": "conversion_w_functions.ets" } } @@ -1696,7 +1696,7 @@ }, "end": { "line": 40, - "column": 31, + "column": 29, "program": "conversion_w_functions.ets" } } @@ -1709,7 +1709,7 @@ }, "end": { "line": 40, - "column": 31, + "column": 29, "program": "conversion_w_functions.ets" } } @@ -1967,7 +1967,7 @@ }, "end": { "line": 44, - "column": 24, + "column": 22, "program": "conversion_w_functions.ets" } } @@ -1980,7 +1980,7 @@ }, "end": { "line": 44, - "column": 24, + "column": 22, "program": "conversion_w_functions.ets" } } @@ -2238,7 +2238,7 @@ }, "end": { "line": 48, - "column": 27, + "column": 25, "program": "conversion_w_functions.ets" } } @@ -2251,7 +2251,7 @@ }, "end": { "line": 48, - "column": 27, + "column": 25, "program": "conversion_w_functions.ets" } } @@ -2509,7 +2509,7 @@ }, "end": { "line": 52, - "column": 35, + "column": 33, "program": "conversion_w_functions.ets" } } @@ -2522,7 +2522,7 @@ }, "end": { "line": 52, - "column": 35, + "column": 33, "program": "conversion_w_functions.ets" } } @@ -2780,7 +2780,7 @@ }, "end": { "line": 56, - "column": 30, + "column": 28, "program": "conversion_w_functions.ets" } } @@ -2793,7 +2793,7 @@ }, "end": { "line": 56, - "column": 30, + "column": 28, "program": "conversion_w_functions.ets" } } @@ -3051,7 +3051,7 @@ }, "end": { "line": 60, - "column": 30, + "column": 28, "program": "conversion_w_functions.ets" } } @@ -3064,7 +3064,7 @@ }, "end": { "line": 60, - "column": 30, + "column": 28, "program": "conversion_w_functions.ets" } } @@ -3322,7 +3322,7 @@ }, "end": { "line": 64, - "column": 29, + "column": 27, "program": "conversion_w_functions.ets" } } @@ -3335,7 +3335,7 @@ }, "end": { "line": 64, - "column": 29, + "column": 27, "program": "conversion_w_functions.ets" } } @@ -3593,7 +3593,7 @@ }, "end": { "line": 68, - "column": 26, + "column": 24, "program": "conversion_w_functions.ets" } } @@ -3606,7 +3606,7 @@ }, "end": { "line": 68, - "column": 26, + "column": 24, "program": "conversion_w_functions.ets" } } diff --git a/ets2panda/test/compiler/ets/ensureNotNullArgNotNullable-expected.txt b/ets2panda/test/compiler/ets/ensureNotNullArgNotNullable-expected.txt index d7785640f8e..6039423c91f 100644 --- a/ets2panda/test/compiler/ets/ensureNotNullArgNotNullable-expected.txt +++ b/ets2panda/test/compiler/ets/ensureNotNullArgNotNullable-expected.txt @@ -52,7 +52,7 @@ }, "end": { "line": 16, - "column": 17, + "column": 16, "program": "ensureNotNullArgNotNullable.ets" } } @@ -65,7 +65,7 @@ }, "end": { "line": 16, - "column": 17, + "column": 16, "program": "ensureNotNullArgNotNullable.ets" } } @@ -324,7 +324,7 @@ }, "end": { "line": 18, - "column": 22, + "column": 21, "program": "ensureNotNullArgNotNullable.ets" } } @@ -337,7 +337,7 @@ }, "end": { "line": 18, - "column": 22, + "column": 21, "program": "ensureNotNullArgNotNullable.ets" } } @@ -351,7 +351,7 @@ }, "end": { "line": 18, - "column": 22, + "column": 21, "program": "ensureNotNullArgNotNullable.ets" } } @@ -364,7 +364,7 @@ }, "end": { "line": 18, - "column": 22, + "column": 21, "program": "ensureNotNullArgNotNullable.ets" } } diff --git a/ets2panda/test/compiler/ets/ensureNotNullReturnNotNullable-expected.txt b/ets2panda/test/compiler/ets/ensureNotNullReturnNotNullable-expected.txt index 0d0389239ba..59db2846da2 100644 --- a/ets2panda/test/compiler/ets/ensureNotNullReturnNotNullable-expected.txt +++ b/ets2panda/test/compiler/ets/ensureNotNullReturnNotNullable-expected.txt @@ -211,7 +211,7 @@ }, "end": { "line": 16, - "column": 26, + "column": 24, "program": "ensureNotNullReturnNotNullable.ets" } } @@ -224,7 +224,7 @@ }, "end": { "line": 16, - "column": 26, + "column": 24, "program": "ensureNotNullReturnNotNullable.ets" } } @@ -294,7 +294,7 @@ }, "end": { "line": 17, - "column": 21, + "column": 20, "program": "ensureNotNullReturnNotNullable.ets" } } @@ -307,7 +307,7 @@ }, "end": { "line": 17, - "column": 21, + "column": 20, "program": "ensureNotNullReturnNotNullable.ets" } } 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 09c65034d23..e2f3506d0ef 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 @@ -10346,7 +10346,7 @@ }, "end": { "line": 33, - "column": 23, + "column": 22, "program": "enum_as_class_member_getValue_call.ets" } } @@ -10359,7 +10359,7 @@ }, "end": { "line": 33, - "column": 23, + "column": 22, "program": "enum_as_class_member_getValue_call.ets" } } @@ -10374,7 +10374,7 @@ }, "end": { "line": 33, - "column": 23, + "column": 22, "program": "enum_as_class_member_getValue_call.ets" } } @@ -10433,7 +10433,7 @@ }, "end": { "line": 34, - "column": 25, + "column": 24, "program": "enum_as_class_member_getValue_call.ets" } } @@ -10446,7 +10446,7 @@ }, "end": { "line": 34, - "column": 25, + "column": 24, "program": "enum_as_class_member_getValue_call.ets" } } @@ -10461,7 +10461,7 @@ }, "end": { "line": 34, - "column": 25, + "column": 24, "program": "enum_as_class_member_getValue_call.ets" } } @@ -10549,7 +10549,7 @@ }, "end": { "line": 36, - "column": 28, + "column": 27, "program": "enum_as_class_member_getValue_call.ets" } } @@ -10562,7 +10562,7 @@ }, "end": { "line": 36, - "column": 28, + "column": 27, "program": "enum_as_class_member_getValue_call.ets" } } @@ -10576,7 +10576,7 @@ }, "end": { "line": 36, - "column": 28, + "column": 27, "program": "enum_as_class_member_getValue_call.ets" } } @@ -10589,7 +10589,7 @@ }, "end": { "line": 36, - "column": 28, + "column": 27, "program": "enum_as_class_member_getValue_call.ets" } } @@ -10628,7 +10628,7 @@ }, "end": { "line": 36, - "column": 42, + "column": 41, "program": "enum_as_class_member_getValue_call.ets" } } @@ -10641,7 +10641,7 @@ }, "end": { "line": 36, - "column": 42, + "column": 41, "program": "enum_as_class_member_getValue_call.ets" } } @@ -10655,7 +10655,7 @@ }, "end": { "line": 36, - "column": 42, + "column": 41, "program": "enum_as_class_member_getValue_call.ets" } } @@ -10668,7 +10668,7 @@ }, "end": { "line": 36, - "column": 42, + "column": 41, "program": "enum_as_class_member_getValue_call.ets" } } diff --git a/ets2panda/test/compiler/ets/export_type-expected.txt b/ets2panda/test/compiler/ets/export_type-expected.txt index 28f42dc5764..180a05d2784 100644 --- a/ets2panda/test/compiler/ets/export_type-expected.txt +++ b/ets2panda/test/compiler/ets/export_type-expected.txt @@ -199,8 +199,8 @@ "program": "export_type.ets" }, "end": { - "line": 19, - "column": 7, + "line": 17, + "column": 15, "program": "export_type.ets" } } 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 81df7457975..c75e1bfea3d 100644 --- a/ets2panda/test/compiler/ets/extended_conditional_expression_not-expected.txt +++ b/ets2panda/test/compiler/ets/extended_conditional_expression_not-expected.txt @@ -319,7 +319,7 @@ }, "end": { "line": 16, - "column": 22, + "column": 21, "program": "extended_conditional_expression_not.ets" } } @@ -332,7 +332,7 @@ }, "end": { "line": 16, - "column": 22, + "column": 21, "program": "extended_conditional_expression_not.ets" } } @@ -346,7 +346,7 @@ }, "end": { "line": 16, - "column": 22, + "column": 21, "program": "extended_conditional_expression_not.ets" } } @@ -359,7 +359,7 @@ }, "end": { "line": 16, - "column": 22, + "column": 21, "program": "extended_conditional_expression_not.ets" } } 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 5625d266707..acf957b8586 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 @@ -319,7 +319,7 @@ }, "end": { "line": 16, - "column": 22, + "column": 21, "program": "extended_conditional_expression_not_return_type.ets" } } @@ -332,7 +332,7 @@ }, "end": { "line": 16, - "column": 22, + "column": 21, "program": "extended_conditional_expression_not_return_type.ets" } } @@ -346,7 +346,7 @@ }, "end": { "line": 16, - "column": 22, + "column": 21, "program": "extended_conditional_expression_not_return_type.ets" } } @@ -359,7 +359,7 @@ }, "end": { "line": 16, - "column": 22, + "column": 21, "program": "extended_conditional_expression_not_return_type.ets" } } diff --git a/ets2panda/test/compiler/ets/forUpdateCharType-expected.txt b/ets2panda/test/compiler/ets/forUpdateCharType-expected.txt index a1126a66eff..1fe79384e17 100644 --- a/ets2panda/test/compiler/ets/forUpdateCharType-expected.txt +++ b/ets2panda/test/compiler/ets/forUpdateCharType-expected.txt @@ -234,7 +234,7 @@ }, "end": { "line": 17, - "column": 26, + "column": 24, "program": "forUpdateCharType.ets" } } @@ -247,7 +247,7 @@ }, "end": { "line": 17, - "column": 26, + "column": 24, "program": "forUpdateCharType.ets" } } 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 f154bc195c9..4fecb7830e4 100644 --- a/ets2panda/test/compiler/ets/from-soft-keyword-2-expected.txt +++ b/ets2panda/test/compiler/ets/from-soft-keyword-2-expected.txt @@ -263,8 +263,8 @@ "program": "from-soft-keyword-2.ets" }, "end": { - "line": 22, - "column": 9, + "line": 20, + "column": 2, "program": "from-soft-keyword-2.ets" } } diff --git a/ets2panda/test/compiler/ets/functionPointerArray-expected.txt b/ets2panda/test/compiler/ets/functionPointerArray-expected.txt index 94b9bcf948f..67d0820de08 100644 --- a/ets2panda/test/compiler/ets/functionPointerArray-expected.txt +++ b/ets2panda/test/compiler/ets/functionPointerArray-expected.txt @@ -397,7 +397,7 @@ }, "end": { "line": 20, - "column": 35, + "column": 34, "program": "functionPointerArray.ets" } } @@ -410,7 +410,7 @@ }, "end": { "line": 20, - "column": 35, + "column": 34, "program": "functionPointerArray.ets" } } @@ -424,7 +424,7 @@ }, "end": { "line": 20, - "column": 35, + "column": 34, "program": "functionPointerArray.ets" } } @@ -437,7 +437,7 @@ }, "end": { "line": 20, - "column": 35, + "column": 34, "program": "functionPointerArray.ets" } } @@ -960,7 +960,7 @@ }, "end": { "line": 27, - "column": 21, + "column": 19, "program": "functionPointerArray.ets" } } @@ -973,7 +973,7 @@ }, "end": { "line": 27, - "column": 21, + "column": 19, "program": "functionPointerArray.ets" } } diff --git a/ets2panda/test/compiler/ets/functionTypeToObject-expected.txt b/ets2panda/test/compiler/ets/functionTypeToObject-expected.txt index a3009be5123..b32c93e03cf 100644 --- a/ets2panda/test/compiler/ets/functionTypeToObject-expected.txt +++ b/ets2panda/test/compiler/ets/functionTypeToObject-expected.txt @@ -817,7 +817,7 @@ }, "end": { "line": 22, - "column": 20, + "column": 18, "program": "functionTypeToObject.ets" } } @@ -830,7 +830,7 @@ }, "end": { "line": 22, - "column": 20, + "column": 18, "program": "functionTypeToObject.ets" } } diff --git a/ets2panda/test/compiler/ets/function_subtyping_1-expected.txt b/ets2panda/test/compiler/ets/function_subtyping_1-expected.txt index bb165494d63..18c4ecc8c24 100644 --- a/ets2panda/test/compiler/ets/function_subtyping_1-expected.txt +++ b/ets2panda/test/compiler/ets/function_subtyping_1-expected.txt @@ -205,7 +205,7 @@ }, "end": { "line": 17, - "column": 20, + "column": 18, "program": "function_subtyping_1.ets" } } @@ -218,7 +218,7 @@ }, "end": { "line": 17, - "column": 20, + "column": 18, "program": "function_subtyping_1.ets" } } @@ -598,7 +598,7 @@ }, "end": { "line": 20, - "column": 18, + "column": 17, "program": "function_subtyping_1.ets" } } @@ -611,7 +611,7 @@ }, "end": { "line": 20, - "column": 18, + "column": 17, "program": "function_subtyping_1.ets" } } @@ -625,7 +625,7 @@ }, "end": { "line": 20, - "column": 18, + "column": 17, "program": "function_subtyping_1.ets" } } @@ -638,7 +638,7 @@ }, "end": { "line": 20, - "column": 18, + "column": 17, "program": "function_subtyping_1.ets" } } @@ -673,7 +673,7 @@ }, "end": { "line": 20, - "column": 25, + "column": 23, "program": "function_subtyping_1.ets" } } @@ -686,7 +686,7 @@ }, "end": { "line": 20, - "column": 25, + "column": 23, "program": "function_subtyping_1.ets" } } @@ -699,7 +699,7 @@ }, "end": { "line": 20, - "column": 25, + "column": 23, "program": "function_subtyping_1.ets" } } @@ -761,7 +761,7 @@ }, "end": { "line": 20, - "column": 32, + "column": 31, "program": "function_subtyping_1.ets" } } @@ -774,7 +774,7 @@ }, "end": { "line": 20, - "column": 32, + "column": 31, "program": "function_subtyping_1.ets" } } @@ -788,7 +788,7 @@ }, "end": { "line": 20, - "column": 32, + "column": 31, "program": "function_subtyping_1.ets" } } @@ -801,7 +801,7 @@ }, "end": { "line": 20, - "column": 32, + "column": 31, "program": "function_subtyping_1.ets" } } @@ -836,7 +836,7 @@ }, "end": { "line": 20, - "column": 38, + "column": 35, "program": "function_subtyping_1.ets" } } @@ -849,7 +849,7 @@ }, "end": { "line": 20, - "column": 38, + "column": 35, "program": "function_subtyping_1.ets" } } @@ -890,7 +890,7 @@ }, "end": { "line": 20, - "column": 54, + "column": 53, "program": "function_subtyping_1.ets" } } @@ -903,7 +903,7 @@ }, "end": { "line": 20, - "column": 54, + "column": 53, "program": "function_subtyping_1.ets" } } diff --git a/ets2panda/test/compiler/ets/generic_arrayaslist-expected.txt b/ets2panda/test/compiler/ets/generic_arrayaslist-expected.txt index 7bc0e6b1701..3ac3c91e50b 100644 --- a/ets2panda/test/compiler/ets/generic_arrayaslist-expected.txt +++ b/ets2panda/test/compiler/ets/generic_arrayaslist-expected.txt @@ -89,7 +89,7 @@ }, "end": { "line": 20, - "column": 20, + "column": 19, "program": "generic_arrayaslist.ets" } } @@ -102,7 +102,7 @@ }, "end": { "line": 20, - "column": 20, + "column": 19, "program": "generic_arrayaslist.ets" } } @@ -116,7 +116,7 @@ }, "end": { "line": 20, - "column": 20, + "column": 19, "program": "generic_arrayaslist.ets" } } @@ -129,7 +129,7 @@ }, "end": { "line": 20, - "column": 20, + "column": 19, "program": "generic_arrayaslist.ets" } } @@ -269,7 +269,7 @@ }, "end": { "line": 21, - "column": 19, + "column": 18, "program": "generic_arrayaslist.ets" } } @@ -282,7 +282,7 @@ }, "end": { "line": 21, - "column": 19, + "column": 18, "program": "generic_arrayaslist.ets" } } @@ -295,7 +295,7 @@ }, "end": { "line": 21, - "column": 19, + "column": 18, "program": "generic_arrayaslist.ets" } } @@ -308,7 +308,7 @@ }, "end": { "line": 21, - "column": 19, + "column": 18, "program": "generic_arrayaslist.ets" } } @@ -411,7 +411,7 @@ }, "end": { "line": 22, - "column": 19, + "column": 18, "program": "generic_arrayaslist.ets" } } @@ -424,7 +424,7 @@ }, "end": { "line": 22, - "column": 19, + "column": 18, "program": "generic_arrayaslist.ets" } } @@ -438,7 +438,7 @@ }, "end": { "line": 22, - "column": 19, + "column": 18, "program": "generic_arrayaslist.ets" } } @@ -451,7 +451,7 @@ }, "end": { "line": 22, - "column": 19, + "column": 18, "program": "generic_arrayaslist.ets" } } @@ -591,7 +591,7 @@ }, "end": { "line": 23, - "column": 18, + "column": 17, "program": "generic_arrayaslist.ets" } } @@ -604,7 +604,7 @@ }, "end": { "line": 23, - "column": 18, + "column": 17, "program": "generic_arrayaslist.ets" } } @@ -617,7 +617,7 @@ }, "end": { "line": 23, - "column": 18, + "column": 17, "program": "generic_arrayaslist.ets" } } @@ -630,7 +630,7 @@ }, "end": { "line": 23, - "column": 18, + "column": 17, "program": "generic_arrayaslist.ets" } } @@ -881,7 +881,7 @@ }, "end": { "line": 26, - "column": 23, + "column": 22, "program": "generic_arrayaslist.ets" } } @@ -894,7 +894,7 @@ }, "end": { "line": 26, - "column": 23, + "column": 22, "program": "generic_arrayaslist.ets" } } @@ -907,7 +907,7 @@ }, "end": { "line": 26, - "column": 23, + "column": 22, "program": "generic_arrayaslist.ets" } } @@ -920,7 +920,7 @@ }, "end": { "line": 26, - "column": 23, + "column": 22, "program": "generic_arrayaslist.ets" } } @@ -1023,7 +1023,7 @@ }, "end": { "line": 27, - "column": 14, + "column": 13, "program": "generic_arrayaslist.ets" } } @@ -1036,7 +1036,7 @@ }, "end": { "line": 27, - "column": 14, + "column": 13, "program": "generic_arrayaslist.ets" } } @@ -1050,7 +1050,7 @@ }, "end": { "line": 27, - "column": 14, + "column": 13, "program": "generic_arrayaslist.ets" } } @@ -1063,7 +1063,7 @@ }, "end": { "line": 27, - "column": 14, + "column": 13, "program": "generic_arrayaslist.ets" } } @@ -1216,7 +1216,7 @@ }, "end": { "line": 29, - "column": 23, + "column": 22, "program": "generic_arrayaslist.ets" } } @@ -1229,7 +1229,7 @@ }, "end": { "line": 29, - "column": 23, + "column": 22, "program": "generic_arrayaslist.ets" } } @@ -1243,7 +1243,7 @@ }, "end": { "line": 29, - "column": 23, + "column": 22, "program": "generic_arrayaslist.ets" } } @@ -1256,7 +1256,7 @@ }, "end": { "line": 29, - "column": 23, + "column": 22, "program": "generic_arrayaslist.ets" } } @@ -1291,7 +1291,7 @@ }, "end": { "line": 29, - "column": 29, + "column": 28, "program": "generic_arrayaslist.ets" } } @@ -1304,7 +1304,7 @@ }, "end": { "line": 29, - "column": 29, + "column": 28, "program": "generic_arrayaslist.ets" } } @@ -1317,7 +1317,7 @@ }, "end": { "line": 29, - "column": 29, + "column": 28, "program": "generic_arrayaslist.ets" } } @@ -1331,7 +1331,7 @@ }, "end": { "line": 29, - "column": 29, + "column": 28, "program": "generic_arrayaslist.ets" } } @@ -1344,7 +1344,7 @@ }, "end": { "line": 29, - "column": 29, + "column": 28, "program": "generic_arrayaslist.ets" } } @@ -1406,7 +1406,7 @@ }, "end": { "line": 29, - "column": 39, + "column": 38, "program": "generic_arrayaslist.ets" } } @@ -1419,7 +1419,7 @@ }, "end": { "line": 29, - "column": 39, + "column": 38, "program": "generic_arrayaslist.ets" } } @@ -1446,7 +1446,7 @@ }, "end": { "line": 29, - "column": 41, + "column": 39, "program": "generic_arrayaslist.ets" } } @@ -1459,7 +1459,7 @@ }, "end": { "line": 29, - "column": 41, + "column": 39, "program": "generic_arrayaslist.ets" } } @@ -1625,7 +1625,7 @@ }, "end": { "line": 30, - "column": 22, + "column": 21, "program": "generic_arrayaslist.ets" } } @@ -1638,7 +1638,7 @@ }, "end": { "line": 30, - "column": 22, + "column": 21, "program": "generic_arrayaslist.ets" } } @@ -1652,7 +1652,7 @@ }, "end": { "line": 30, - "column": 22, + "column": 21, "program": "generic_arrayaslist.ets" } } @@ -1665,7 +1665,7 @@ }, "end": { "line": 30, - "column": 22, + "column": 21, "program": "generic_arrayaslist.ets" } } @@ -1700,7 +1700,7 @@ }, "end": { "line": 30, - "column": 28, + "column": 27, "program": "generic_arrayaslist.ets" } } @@ -1713,7 +1713,7 @@ }, "end": { "line": 30, - "column": 28, + "column": 27, "program": "generic_arrayaslist.ets" } } @@ -1726,7 +1726,7 @@ }, "end": { "line": 30, - "column": 28, + "column": 27, "program": "generic_arrayaslist.ets" } } @@ -1740,7 +1740,7 @@ }, "end": { "line": 30, - "column": 28, + "column": 27, "program": "generic_arrayaslist.ets" } } @@ -1753,7 +1753,7 @@ }, "end": { "line": 30, - "column": 28, + "column": 27, "program": "generic_arrayaslist.ets" } } @@ -1812,7 +1812,7 @@ }, "end": { "line": 30, - "column": 38, + "column": 37, "program": "generic_arrayaslist.ets" } } @@ -1825,7 +1825,7 @@ }, "end": { "line": 30, - "column": 38, + "column": 37, "program": "generic_arrayaslist.ets" } } @@ -1852,7 +1852,7 @@ }, "end": { "line": 30, - "column": 39, + "column": 38, "program": "generic_arrayaslist.ets" } } @@ -1865,7 +1865,7 @@ }, "end": { "line": 30, - "column": 39, + "column": 38, "program": "generic_arrayaslist.ets" } } @@ -1927,7 +1927,7 @@ }, "end": { "line": 30, - "column": 39, + "column": 38, "program": "generic_arrayaslist.ets" } } @@ -1940,7 +1940,7 @@ }, "end": { "line": 30, - "column": 39, + "column": 38, "program": "generic_arrayaslist.ets" } } @@ -2051,7 +2051,7 @@ }, "end": { "line": 31, - "column": 27, + "column": 26, "program": "generic_arrayaslist.ets" } } @@ -2064,7 +2064,7 @@ }, "end": { "line": 31, - "column": 27, + "column": 26, "program": "generic_arrayaslist.ets" } } @@ -2078,7 +2078,7 @@ }, "end": { "line": 31, - "column": 27, + "column": 26, "program": "generic_arrayaslist.ets" } } @@ -2091,7 +2091,7 @@ }, "end": { "line": 31, - "column": 27, + "column": 26, "program": "generic_arrayaslist.ets" } } @@ -2130,7 +2130,7 @@ }, "end": { "line": 31, - "column": 35, + "column": 34, "program": "generic_arrayaslist.ets" } } @@ -2143,7 +2143,7 @@ }, "end": { "line": 31, - "column": 35, + "column": 34, "program": "generic_arrayaslist.ets" } } @@ -2157,7 +2157,7 @@ }, "end": { "line": 31, - "column": 35, + "column": 34, "program": "generic_arrayaslist.ets" } } @@ -2170,7 +2170,7 @@ }, "end": { "line": 31, - "column": 35, + "column": 34, "program": "generic_arrayaslist.ets" } } @@ -2205,7 +2205,7 @@ }, "end": { "line": 31, - "column": 41, + "column": 40, "program": "generic_arrayaslist.ets" } } @@ -2218,7 +2218,7 @@ }, "end": { "line": 31, - "column": 41, + "column": 40, "program": "generic_arrayaslist.ets" } } @@ -2231,7 +2231,7 @@ }, "end": { "line": 31, - "column": 41, + "column": 40, "program": "generic_arrayaslist.ets" } } @@ -2245,7 +2245,7 @@ }, "end": { "line": 31, - "column": 41, + "column": 40, "program": "generic_arrayaslist.ets" } } @@ -2258,7 +2258,7 @@ }, "end": { "line": 31, - "column": 41, + "column": 40, "program": "generic_arrayaslist.ets" } } @@ -2296,7 +2296,7 @@ }, "end": { "line": 31, - "column": 46, + "column": 44, "program": "generic_arrayaslist.ets" } } @@ -2309,7 +2309,7 @@ }, "end": { "line": 31, - "column": 46, + "column": 44, "program": "generic_arrayaslist.ets" } } @@ -2475,7 +2475,7 @@ }, "end": { "line": 32, - "column": 34, + "column": 33, "program": "generic_arrayaslist.ets" } } @@ -2488,7 +2488,7 @@ }, "end": { "line": 32, - "column": 34, + "column": 33, "program": "generic_arrayaslist.ets" } } @@ -2502,7 +2502,7 @@ }, "end": { "line": 32, - "column": 34, + "column": 33, "program": "generic_arrayaslist.ets" } } @@ -2515,7 +2515,7 @@ }, "end": { "line": 32, - "column": 34, + "column": 33, "program": "generic_arrayaslist.ets" } } @@ -2554,7 +2554,7 @@ }, "end": { "line": 32, - "column": 42, + "column": 41, "program": "generic_arrayaslist.ets" } } @@ -2567,7 +2567,7 @@ }, "end": { "line": 32, - "column": 42, + "column": 41, "program": "generic_arrayaslist.ets" } } @@ -2581,7 +2581,7 @@ }, "end": { "line": 32, - "column": 42, + "column": 41, "program": "generic_arrayaslist.ets" } } @@ -2594,7 +2594,7 @@ }, "end": { "line": 32, - "column": 42, + "column": 41, "program": "generic_arrayaslist.ets" } } @@ -2629,7 +2629,7 @@ }, "end": { "line": 32, - "column": 48, + "column": 47, "program": "generic_arrayaslist.ets" } } @@ -2642,7 +2642,7 @@ }, "end": { "line": 32, - "column": 48, + "column": 47, "program": "generic_arrayaslist.ets" } } @@ -2655,7 +2655,7 @@ }, "end": { "line": 32, - "column": 48, + "column": 47, "program": "generic_arrayaslist.ets" } } @@ -2669,7 +2669,7 @@ }, "end": { "line": 32, - "column": 48, + "column": 47, "program": "generic_arrayaslist.ets" } } @@ -2682,7 +2682,7 @@ }, "end": { "line": 32, - "column": 48, + "column": 47, "program": "generic_arrayaslist.ets" } } @@ -2721,7 +2721,7 @@ }, "end": { "line": 32, - "column": 60, + "column": 59, "program": "generic_arrayaslist.ets" } } @@ -2734,7 +2734,7 @@ }, "end": { "line": 32, - "column": 60, + "column": 59, "program": "generic_arrayaslist.ets" } } @@ -2748,7 +2748,7 @@ }, "end": { "line": 32, - "column": 60, + "column": 59, "program": "generic_arrayaslist.ets" } } @@ -2761,7 +2761,7 @@ }, "end": { "line": 32, - "column": 60, + "column": 59, "program": "generic_arrayaslist.ets" } } @@ -2796,7 +2796,7 @@ }, "end": { "line": 32, - "column": 64, + "column": 63, "program": "generic_arrayaslist.ets" } } @@ -2809,7 +2809,7 @@ }, "end": { "line": 32, - "column": 64, + "column": 63, "program": "generic_arrayaslist.ets" } } @@ -2871,7 +2871,7 @@ }, "end": { "line": 32, - "column": 64, + "column": 63, "program": "generic_arrayaslist.ets" } } @@ -2884,7 +2884,7 @@ }, "end": { "line": 32, - "column": 64, + "column": 63, "program": "generic_arrayaslist.ets" } } @@ -2995,7 +2995,7 @@ }, "end": { "line": 33, - "column": 30, + "column": 29, "program": "generic_arrayaslist.ets" } } @@ -3008,7 +3008,7 @@ }, "end": { "line": 33, - "column": 30, + "column": 29, "program": "generic_arrayaslist.ets" } } @@ -3022,7 +3022,7 @@ }, "end": { "line": 33, - "column": 30, + "column": 29, "program": "generic_arrayaslist.ets" } } @@ -3035,7 +3035,7 @@ }, "end": { "line": 33, - "column": 30, + "column": 29, "program": "generic_arrayaslist.ets" } } @@ -3153,7 +3153,7 @@ }, "end": { "line": 33, - "column": 53, + "column": 52, "program": "generic_arrayaslist.ets" } } @@ -3166,7 +3166,7 @@ }, "end": { "line": 33, - "column": 53, + "column": 52, "program": "generic_arrayaslist.ets" } } @@ -3193,7 +3193,7 @@ }, "end": { "line": 33, - "column": 55, + "column": 53, "program": "generic_arrayaslist.ets" } } @@ -3206,7 +3206,7 @@ }, "end": { "line": 33, - "column": 55, + "column": 53, "program": "generic_arrayaslist.ets" } } @@ -3372,7 +3372,7 @@ }, "end": { "line": 34, - "column": 30, + "column": 29, "program": "generic_arrayaslist.ets" } } @@ -3385,7 +3385,7 @@ }, "end": { "line": 34, - "column": 30, + "column": 29, "program": "generic_arrayaslist.ets" } } @@ -3399,7 +3399,7 @@ }, "end": { "line": 34, - "column": 30, + "column": 29, "program": "generic_arrayaslist.ets" } } @@ -3412,7 +3412,7 @@ }, "end": { "line": 34, - "column": 30, + "column": 29, "program": "generic_arrayaslist.ets" } } @@ -3451,7 +3451,7 @@ }, "end": { "line": 34, - "column": 38, + "column": 37, "program": "generic_arrayaslist.ets" } } @@ -3464,7 +3464,7 @@ }, "end": { "line": 34, - "column": 38, + "column": 37, "program": "generic_arrayaslist.ets" } } @@ -3478,7 +3478,7 @@ }, "end": { "line": 34, - "column": 38, + "column": 37, "program": "generic_arrayaslist.ets" } } @@ -3491,7 +3491,7 @@ }, "end": { "line": 34, - "column": 38, + "column": 37, "program": "generic_arrayaslist.ets" } } @@ -3609,7 +3609,7 @@ }, "end": { "line": 34, - "column": 61, + "column": 60, "program": "generic_arrayaslist.ets" } } @@ -3622,7 +3622,7 @@ }, "end": { "line": 34, - "column": 61, + "column": 60, "program": "generic_arrayaslist.ets" } } @@ -3649,7 +3649,7 @@ }, "end": { "line": 34, - "column": 63, + "column": 61, "program": "generic_arrayaslist.ets" } } @@ -3662,7 +3662,7 @@ }, "end": { "line": 34, - "column": 63, + "column": 61, "program": "generic_arrayaslist.ets" } } @@ -3825,8 +3825,8 @@ "program": "generic_arrayaslist.ets" }, "end": { - "line": 37, - "column": 6, + "line": 35, + "column": 2, "program": "generic_arrayaslist.ets" } } @@ -3957,7 +3957,7 @@ }, "end": { "line": 37, - "column": 42, + "column": 41, "program": "generic_arrayaslist.ets" } } @@ -3970,7 +3970,7 @@ }, "end": { "line": 37, - "column": 42, + "column": 41, "program": "generic_arrayaslist.ets" } } @@ -3997,7 +3997,7 @@ }, "end": { "line": 37, - "column": 44, + "column": 42, "program": "generic_arrayaslist.ets" } } @@ -4010,7 +4010,7 @@ }, "end": { "line": 37, - "column": 44, + "column": 42, "program": "generic_arrayaslist.ets" } } @@ -4163,7 +4163,7 @@ }, "end": { "line": 39, - "column": 41, + "column": 39, "program": "generic_arrayaslist.ets" } } @@ -4176,7 +4176,7 @@ }, "end": { "line": 39, - "column": 41, + "column": 39, "program": "generic_arrayaslist.ets" } } @@ -4344,7 +4344,7 @@ }, "end": { "line": 40, - "column": 29, + "column": 27, "program": "generic_arrayaslist.ets" } } @@ -4357,7 +4357,7 @@ }, "end": { "line": 40, - "column": 29, + "column": 27, "program": "generic_arrayaslist.ets" } } @@ -4976,7 +4976,7 @@ }, "end": { "line": 46, - "column": 39, + "column": 38, "program": "generic_arrayaslist.ets" } } @@ -4989,7 +4989,7 @@ }, "end": { "line": 46, - "column": 39, + "column": 38, "program": "generic_arrayaslist.ets" } } @@ -5003,7 +5003,7 @@ }, "end": { "line": 46, - "column": 39, + "column": 38, "program": "generic_arrayaslist.ets" } } @@ -5016,7 +5016,7 @@ }, "end": { "line": 46, - "column": 39, + "column": 38, "program": "generic_arrayaslist.ets" } } @@ -5980,7 +5980,7 @@ }, "end": { "line": 60, - "column": 35, + "column": 33, "program": "generic_arrayaslist.ets" } } @@ -5993,7 +5993,7 @@ }, "end": { "line": 60, - "column": 35, + "column": 33, "program": "generic_arrayaslist.ets" } } @@ -7319,7 +7319,7 @@ }, "end": { "line": 79, - "column": 36, + "column": 35, "program": "generic_arrayaslist.ets" } } @@ -7332,7 +7332,7 @@ }, "end": { "line": 79, - "column": 36, + "column": 35, "program": "generic_arrayaslist.ets" } } @@ -7346,7 +7346,7 @@ }, "end": { "line": 79, - "column": 36, + "column": 35, "program": "generic_arrayaslist.ets" } } @@ -7359,7 +7359,7 @@ }, "end": { "line": 79, - "column": 36, + "column": 35, "program": "generic_arrayaslist.ets" } } @@ -7691,7 +7691,7 @@ }, "end": { "line": 82, - "column": 27, + "column": 25, "program": "generic_arrayaslist.ets" } } @@ -7704,7 +7704,7 @@ }, "end": { "line": 82, - "column": 27, + "column": 25, "program": "generic_arrayaslist.ets" } } @@ -8858,7 +8858,7 @@ }, "end": { "line": 92, - "column": 36, + "column": 34, "program": "generic_arrayaslist.ets" } } @@ -8871,7 +8871,7 @@ }, "end": { "line": 92, - "column": 36, + "column": 34, "program": "generic_arrayaslist.ets" } } @@ -9081,7 +9081,7 @@ }, "end": { "line": 94, - "column": 21, + "column": 19, "program": "generic_arrayaslist.ets" } } @@ -9094,7 +9094,7 @@ }, "end": { "line": 94, - "column": 21, + "column": 19, "program": "generic_arrayaslist.ets" } } @@ -9226,7 +9226,7 @@ }, "end": { "line": 94, - "column": 40, + "column": 39, "program": "generic_arrayaslist.ets" } } @@ -9239,7 +9239,7 @@ }, "end": { "line": 94, - "column": 40, + "column": 39, "program": "generic_arrayaslist.ets" } } @@ -9979,7 +9979,7 @@ }, "end": { "line": 102, - "column": 35, + "column": 34, "program": "generic_arrayaslist.ets" } } @@ -9992,7 +9992,7 @@ }, "end": { "line": 102, - "column": 35, + "column": 34, "program": "generic_arrayaslist.ets" } } @@ -10006,7 +10006,7 @@ }, "end": { "line": 102, - "column": 35, + "column": 34, "program": "generic_arrayaslist.ets" } } @@ -10019,7 +10019,7 @@ }, "end": { "line": 102, - "column": 35, + "column": 34, "program": "generic_arrayaslist.ets" } } @@ -10252,7 +10252,7 @@ }, "end": { "line": 104, - "column": 35, + "column": 33, "program": "generic_arrayaslist.ets" } } @@ -10265,7 +10265,7 @@ }, "end": { "line": 104, - "column": 35, + "column": 33, "program": "generic_arrayaslist.ets" } } @@ -11422,7 +11422,7 @@ }, "end": { "line": 114, - "column": 35, + "column": 33, "program": "generic_arrayaslist.ets" } } @@ -11435,7 +11435,7 @@ }, "end": { "line": 114, - "column": 35, + "column": 33, "program": "generic_arrayaslist.ets" } } @@ -11837,7 +11837,7 @@ }, "end": { "line": 117, - "column": 45, + "column": 44, "program": "generic_arrayaslist.ets" } } @@ -11850,7 +11850,7 @@ }, "end": { "line": 117, - "column": 45, + "column": 44, "program": "generic_arrayaslist.ets" } } @@ -12248,7 +12248,7 @@ }, "end": { "line": 124, - "column": 40, + "column": 38, "program": "generic_arrayaslist.ets" } } @@ -12261,7 +12261,7 @@ }, "end": { "line": 124, - "column": 40, + "column": 38, "program": "generic_arrayaslist.ets" } } @@ -12385,7 +12385,7 @@ }, "end": { "line": 125, - "column": 38, + "column": 37, "program": "generic_arrayaslist.ets" } } @@ -12398,7 +12398,7 @@ }, "end": { "line": 125, - "column": 38, + "column": 37, "program": "generic_arrayaslist.ets" } } @@ -12567,7 +12567,7 @@ }, "end": { "line": 128, - "column": 30, + "column": 29, "program": "generic_arrayaslist.ets" } } @@ -12580,7 +12580,7 @@ }, "end": { "line": 128, - "column": 30, + "column": 29, "program": "generic_arrayaslist.ets" } } @@ -12594,7 +12594,7 @@ }, "end": { "line": 128, - "column": 30, + "column": 29, "program": "generic_arrayaslist.ets" } } @@ -12607,7 +12607,7 @@ }, "end": { "line": 128, - "column": 30, + "column": 29, "program": "generic_arrayaslist.ets" } } @@ -13321,7 +13321,7 @@ }, "end": { "line": 141, - "column": 39, + "column": 38, "program": "generic_arrayaslist.ets" } } @@ -13334,7 +13334,7 @@ }, "end": { "line": 141, - "column": 39, + "column": 38, "program": "generic_arrayaslist.ets" } } @@ -13348,7 +13348,7 @@ }, "end": { "line": 141, - "column": 39, + "column": 38, "program": "generic_arrayaslist.ets" } } @@ -13361,7 +13361,7 @@ }, "end": { "line": 141, - "column": 39, + "column": 38, "program": "generic_arrayaslist.ets" } } @@ -13396,7 +13396,7 @@ }, "end": { "line": 141, - "column": 45, + "column": 44, "program": "generic_arrayaslist.ets" } } @@ -13409,7 +13409,7 @@ }, "end": { "line": 141, - "column": 45, + "column": 44, "program": "generic_arrayaslist.ets" } } @@ -13422,7 +13422,7 @@ }, "end": { "line": 141, - "column": 45, + "column": 44, "program": "generic_arrayaslist.ets" } } @@ -13436,7 +13436,7 @@ }, "end": { "line": 141, - "column": 45, + "column": 44, "program": "generic_arrayaslist.ets" } } @@ -13449,7 +13449,7 @@ }, "end": { "line": 141, - "column": 45, + "column": 44, "program": "generic_arrayaslist.ets" } } @@ -13511,7 +13511,7 @@ }, "end": { "line": 141, - "column": 55, + "column": 54, "program": "generic_arrayaslist.ets" } } @@ -13524,7 +13524,7 @@ }, "end": { "line": 141, - "column": 55, + "column": 54, "program": "generic_arrayaslist.ets" } } @@ -13551,7 +13551,7 @@ }, "end": { "line": 141, - "column": 57, + "column": 55, "program": "generic_arrayaslist.ets" } } @@ -13564,7 +13564,7 @@ }, "end": { "line": 141, - "column": 57, + "column": 55, "program": "generic_arrayaslist.ets" } } @@ -14010,7 +14010,7 @@ }, "end": { "line": 143, - "column": 49, + "column": 48, "program": "generic_arrayaslist.ets" } } @@ -14023,7 +14023,7 @@ }, "end": { "line": 143, - "column": 49, + "column": 48, "program": "generic_arrayaslist.ets" } } @@ -14286,7 +14286,7 @@ }, "end": { "line": 148, - "column": 38, + "column": 37, "program": "generic_arrayaslist.ets" } } @@ -14299,7 +14299,7 @@ }, "end": { "line": 148, - "column": 38, + "column": 37, "program": "generic_arrayaslist.ets" } } @@ -14313,7 +14313,7 @@ }, "end": { "line": 148, - "column": 38, + "column": 37, "program": "generic_arrayaslist.ets" } } @@ -14326,7 +14326,7 @@ }, "end": { "line": 148, - "column": 38, + "column": 37, "program": "generic_arrayaslist.ets" } } @@ -14361,7 +14361,7 @@ }, "end": { "line": 148, - "column": 44, + "column": 43, "program": "generic_arrayaslist.ets" } } @@ -14374,7 +14374,7 @@ }, "end": { "line": 148, - "column": 44, + "column": 43, "program": "generic_arrayaslist.ets" } } @@ -14387,7 +14387,7 @@ }, "end": { "line": 148, - "column": 44, + "column": 43, "program": "generic_arrayaslist.ets" } } @@ -14401,7 +14401,7 @@ }, "end": { "line": 148, - "column": 44, + "column": 43, "program": "generic_arrayaslist.ets" } } @@ -14414,7 +14414,7 @@ }, "end": { "line": 148, - "column": 44, + "column": 43, "program": "generic_arrayaslist.ets" } } @@ -14473,7 +14473,7 @@ }, "end": { "line": 148, - "column": 54, + "column": 53, "program": "generic_arrayaslist.ets" } } @@ -14486,7 +14486,7 @@ }, "end": { "line": 148, - "column": 54, + "column": 53, "program": "generic_arrayaslist.ets" } } @@ -14513,7 +14513,7 @@ }, "end": { "line": 148, - "column": 56, + "column": 54, "program": "generic_arrayaslist.ets" } } @@ -14526,7 +14526,7 @@ }, "end": { "line": 148, - "column": 56, + "column": 54, "program": "generic_arrayaslist.ets" } } @@ -14660,7 +14660,7 @@ }, "end": { "line": 149, - "column": 38, + "column": 37, "program": "generic_arrayaslist.ets" } } @@ -14673,7 +14673,7 @@ }, "end": { "line": 149, - "column": 38, + "column": 37, "program": "generic_arrayaslist.ets" } } @@ -14700,7 +14700,7 @@ }, "end": { "line": 149, - "column": 39, + "column": 38, "program": "generic_arrayaslist.ets" } } @@ -14713,7 +14713,7 @@ }, "end": { "line": 149, - "column": 39, + "column": 38, "program": "generic_arrayaslist.ets" } } @@ -15137,7 +15137,7 @@ }, "end": { "line": 151, - "column": 47, + "column": 46, "program": "generic_arrayaslist.ets" } } @@ -15150,7 +15150,7 @@ }, "end": { "line": 151, - "column": 47, + "column": 46, "program": "generic_arrayaslist.ets" } } @@ -15416,7 +15416,7 @@ }, "end": { "line": 156, - "column": 43, + "column": 42, "program": "generic_arrayaslist.ets" } } @@ -15429,7 +15429,7 @@ }, "end": { "line": 156, - "column": 43, + "column": 42, "program": "generic_arrayaslist.ets" } } @@ -15443,7 +15443,7 @@ }, "end": { "line": 156, - "column": 43, + "column": 42, "program": "generic_arrayaslist.ets" } } @@ -15456,7 +15456,7 @@ }, "end": { "line": 156, - "column": 43, + "column": 42, "program": "generic_arrayaslist.ets" } } @@ -15495,7 +15495,7 @@ }, "end": { "line": 156, - "column": 51, + "column": 50, "program": "generic_arrayaslist.ets" } } @@ -15508,7 +15508,7 @@ }, "end": { "line": 156, - "column": 51, + "column": 50, "program": "generic_arrayaslist.ets" } } @@ -15522,7 +15522,7 @@ }, "end": { "line": 156, - "column": 51, + "column": 50, "program": "generic_arrayaslist.ets" } } @@ -15535,7 +15535,7 @@ }, "end": { "line": 156, - "column": 51, + "column": 50, "program": "generic_arrayaslist.ets" } } @@ -15570,7 +15570,7 @@ }, "end": { "line": 156, - "column": 57, + "column": 56, "program": "generic_arrayaslist.ets" } } @@ -15583,7 +15583,7 @@ }, "end": { "line": 156, - "column": 57, + "column": 56, "program": "generic_arrayaslist.ets" } } @@ -15596,7 +15596,7 @@ }, "end": { "line": 156, - "column": 57, + "column": 56, "program": "generic_arrayaslist.ets" } } @@ -15610,7 +15610,7 @@ }, "end": { "line": 156, - "column": 57, + "column": 56, "program": "generic_arrayaslist.ets" } } @@ -15623,7 +15623,7 @@ }, "end": { "line": 156, - "column": 57, + "column": 56, "program": "generic_arrayaslist.ets" } } @@ -15661,7 +15661,7 @@ }, "end": { "line": 156, - "column": 62, + "column": 60, "program": "generic_arrayaslist.ets" } } @@ -15674,7 +15674,7 @@ }, "end": { "line": 156, - "column": 62, + "column": 60, "program": "generic_arrayaslist.ets" } } @@ -15932,7 +15932,7 @@ }, "end": { "line": 158, - "column": 41, + "column": 40, "program": "generic_arrayaslist.ets" } } @@ -15945,7 +15945,7 @@ }, "end": { "line": 158, - "column": 41, + "column": 40, "program": "generic_arrayaslist.ets" } } @@ -16351,7 +16351,7 @@ }, "end": { "line": 160, - "column": 54, + "column": 53, "program": "generic_arrayaslist.ets" } } @@ -16364,7 +16364,7 @@ }, "end": { "line": 160, - "column": 54, + "column": 53, "program": "generic_arrayaslist.ets" } } @@ -16548,7 +16548,7 @@ }, "end": { "line": 165, - "column": 35, + "column": 34, "program": "generic_arrayaslist.ets" } } @@ -16561,7 +16561,7 @@ }, "end": { "line": 165, - "column": 35, + "column": 34, "program": "generic_arrayaslist.ets" } } @@ -16848,7 +16848,7 @@ }, "end": { "line": 170, - "column": 50, + "column": 49, "program": "generic_arrayaslist.ets" } } @@ -16861,7 +16861,7 @@ }, "end": { "line": 170, - "column": 50, + "column": 49, "program": "generic_arrayaslist.ets" } } @@ -16875,7 +16875,7 @@ }, "end": { "line": 170, - "column": 50, + "column": 49, "program": "generic_arrayaslist.ets" } } @@ -16888,7 +16888,7 @@ }, "end": { "line": 170, - "column": 50, + "column": 49, "program": "generic_arrayaslist.ets" } } @@ -16927,7 +16927,7 @@ }, "end": { "line": 170, - "column": 58, + "column": 57, "program": "generic_arrayaslist.ets" } } @@ -16940,7 +16940,7 @@ }, "end": { "line": 170, - "column": 58, + "column": 57, "program": "generic_arrayaslist.ets" } } @@ -16954,7 +16954,7 @@ }, "end": { "line": 170, - "column": 58, + "column": 57, "program": "generic_arrayaslist.ets" } } @@ -16967,7 +16967,7 @@ }, "end": { "line": 170, - "column": 58, + "column": 57, "program": "generic_arrayaslist.ets" } } @@ -17002,7 +17002,7 @@ }, "end": { "line": 170, - "column": 64, + "column": 63, "program": "generic_arrayaslist.ets" } } @@ -17015,7 +17015,7 @@ }, "end": { "line": 170, - "column": 64, + "column": 63, "program": "generic_arrayaslist.ets" } } @@ -17028,7 +17028,7 @@ }, "end": { "line": 170, - "column": 64, + "column": 63, "program": "generic_arrayaslist.ets" } } @@ -17042,7 +17042,7 @@ }, "end": { "line": 170, - "column": 64, + "column": 63, "program": "generic_arrayaslist.ets" } } @@ -17055,7 +17055,7 @@ }, "end": { "line": 170, - "column": 64, + "column": 63, "program": "generic_arrayaslist.ets" } } @@ -17094,7 +17094,7 @@ }, "end": { "line": 170, - "column": 76, + "column": 75, "program": "generic_arrayaslist.ets" } } @@ -17107,7 +17107,7 @@ }, "end": { "line": 170, - "column": 76, + "column": 75, "program": "generic_arrayaslist.ets" } } @@ -17121,7 +17121,7 @@ }, "end": { "line": 170, - "column": 76, + "column": 75, "program": "generic_arrayaslist.ets" } } @@ -17134,7 +17134,7 @@ }, "end": { "line": 170, - "column": 76, + "column": 75, "program": "generic_arrayaslist.ets" } } @@ -17169,7 +17169,7 @@ }, "end": { "line": 170, - "column": 81, + "column": 79, "program": "generic_arrayaslist.ets" } } @@ -17182,7 +17182,7 @@ }, "end": { "line": 170, - "column": 81, + "column": 79, "program": "generic_arrayaslist.ets" } } @@ -17666,7 +17666,7 @@ }, "end": { "line": 173, - "column": 50, + "column": 49, "program": "generic_arrayaslist.ets" } } @@ -17679,7 +17679,7 @@ }, "end": { "line": 173, - "column": 50, + "column": 49, "program": "generic_arrayaslist.ets" } } @@ -17943,7 +17943,7 @@ }, "end": { "line": 178, - "column": 46, + "column": 45, "program": "generic_arrayaslist.ets" } } @@ -17956,7 +17956,7 @@ }, "end": { "line": 178, - "column": 46, + "column": 45, "program": "generic_arrayaslist.ets" } } @@ -17970,7 +17970,7 @@ }, "end": { "line": 178, - "column": 46, + "column": 45, "program": "generic_arrayaslist.ets" } } @@ -17983,7 +17983,7 @@ }, "end": { "line": 178, - "column": 46, + "column": 45, "program": "generic_arrayaslist.ets" } } @@ -18101,7 +18101,7 @@ }, "end": { "line": 178, - "column": 75, + "column": 74, "program": "generic_arrayaslist.ets" } } @@ -18114,7 +18114,7 @@ }, "end": { "line": 178, - "column": 75, + "column": 74, "program": "generic_arrayaslist.ets" } } @@ -18141,7 +18141,7 @@ }, "end": { "line": 178, - "column": 77, + "column": 75, "program": "generic_arrayaslist.ets" } } @@ -18154,7 +18154,7 @@ }, "end": { "line": 178, - "column": 77, + "column": 75, "program": "generic_arrayaslist.ets" } } @@ -18797,7 +18797,7 @@ }, "end": { "line": 182, - "column": 58, + "column": 57, "program": "generic_arrayaslist.ets" } } @@ -18810,7 +18810,7 @@ }, "end": { "line": 182, - "column": 58, + "column": 57, "program": "generic_arrayaslist.ets" } } @@ -19085,7 +19085,7 @@ }, "end": { "line": 187, - "column": 27, + "column": 25, "program": "generic_arrayaslist.ets" } } @@ -19098,7 +19098,7 @@ }, "end": { "line": 187, - "column": 27, + "column": 25, "program": "generic_arrayaslist.ets" } } @@ -20024,7 +20024,7 @@ }, "end": { "line": 198, - "column": 46, + "column": 45, "program": "generic_arrayaslist.ets" } } @@ -20037,7 +20037,7 @@ }, "end": { "line": 198, - "column": 46, + "column": 45, "program": "generic_arrayaslist.ets" } } @@ -20051,7 +20051,7 @@ }, "end": { "line": 198, - "column": 46, + "column": 45, "program": "generic_arrayaslist.ets" } } @@ -20064,7 +20064,7 @@ }, "end": { "line": 198, - "column": 46, + "column": 45, "program": "generic_arrayaslist.ets" } } @@ -20103,7 +20103,7 @@ }, "end": { "line": 198, - "column": 54, + "column": 53, "program": "generic_arrayaslist.ets" } } @@ -20116,7 +20116,7 @@ }, "end": { "line": 198, - "column": 54, + "column": 53, "program": "generic_arrayaslist.ets" } } @@ -20130,7 +20130,7 @@ }, "end": { "line": 198, - "column": 54, + "column": 53, "program": "generic_arrayaslist.ets" } } @@ -20143,7 +20143,7 @@ }, "end": { "line": 198, - "column": 54, + "column": 53, "program": "generic_arrayaslist.ets" } } @@ -20261,7 +20261,7 @@ }, "end": { "line": 198, - "column": 83, + "column": 82, "program": "generic_arrayaslist.ets" } } @@ -20274,7 +20274,7 @@ }, "end": { "line": 198, - "column": 83, + "column": 82, "program": "generic_arrayaslist.ets" } } @@ -20301,7 +20301,7 @@ }, "end": { "line": 198, - "column": 85, + "column": 83, "program": "generic_arrayaslist.ets" } } @@ -20314,7 +20314,7 @@ }, "end": { "line": 198, - "column": 85, + "column": 83, "program": "generic_arrayaslist.ets" } } @@ -21010,7 +21010,7 @@ }, "end": { "line": 203, - "column": 82, + "column": 81, "program": "generic_arrayaslist.ets" } } @@ -21023,7 +21023,7 @@ }, "end": { "line": 203, - "column": 82, + "column": 81, "program": "generic_arrayaslist.ets" } } @@ -21037,7 +21037,7 @@ }, "end": { "line": 203, - "column": 82, + "column": 81, "program": "generic_arrayaslist.ets" } } @@ -21050,7 +21050,7 @@ }, "end": { "line": 203, - "column": 82, + "column": 81, "program": "generic_arrayaslist.ets" } } @@ -21089,7 +21089,7 @@ }, "end": { "line": 203, - "column": 90, + "column": 89, "program": "generic_arrayaslist.ets" } } @@ -21102,7 +21102,7 @@ }, "end": { "line": 203, - "column": 90, + "column": 89, "program": "generic_arrayaslist.ets" } } @@ -21116,7 +21116,7 @@ }, "end": { "line": 203, - "column": 90, + "column": 89, "program": "generic_arrayaslist.ets" } } @@ -21129,7 +21129,7 @@ }, "end": { "line": 203, - "column": 90, + "column": 89, "program": "generic_arrayaslist.ets" } } @@ -21591,7 +21591,7 @@ }, "end": { "line": 207, - "column": 76, + "column": 75, "program": "generic_arrayaslist.ets" } } @@ -21604,7 +21604,7 @@ }, "end": { "line": 207, - "column": 76, + "column": 75, "program": "generic_arrayaslist.ets" } } @@ -21618,7 +21618,7 @@ }, "end": { "line": 207, - "column": 76, + "column": 75, "program": "generic_arrayaslist.ets" } } @@ -21631,7 +21631,7 @@ }, "end": { "line": 207, - "column": 76, + "column": 75, "program": "generic_arrayaslist.ets" } } @@ -21670,7 +21670,7 @@ }, "end": { "line": 207, - "column": 84, + "column": 83, "program": "generic_arrayaslist.ets" } } @@ -21683,7 +21683,7 @@ }, "end": { "line": 207, - "column": 84, + "column": 83, "program": "generic_arrayaslist.ets" } } @@ -21697,7 +21697,7 @@ }, "end": { "line": 207, - "column": 84, + "column": 83, "program": "generic_arrayaslist.ets" } } @@ -21710,7 +21710,7 @@ }, "end": { "line": 207, - "column": 84, + "column": 83, "program": "generic_arrayaslist.ets" } } @@ -23634,7 +23634,7 @@ }, "end": { "line": 225, - "column": 77, + "column": 76, "program": "generic_arrayaslist.ets" } } @@ -23647,7 +23647,7 @@ }, "end": { "line": 225, - "column": 77, + "column": 76, "program": "generic_arrayaslist.ets" } } @@ -23661,7 +23661,7 @@ }, "end": { "line": 225, - "column": 77, + "column": 76, "program": "generic_arrayaslist.ets" } } @@ -23674,7 +23674,7 @@ }, "end": { "line": 225, - "column": 77, + "column": 76, "program": "generic_arrayaslist.ets" } } @@ -23713,7 +23713,7 @@ }, "end": { "line": 225, - "column": 85, + "column": 84, "program": "generic_arrayaslist.ets" } } @@ -23726,7 +23726,7 @@ }, "end": { "line": 225, - "column": 85, + "column": 84, "program": "generic_arrayaslist.ets" } } @@ -23740,7 +23740,7 @@ }, "end": { "line": 225, - "column": 85, + "column": 84, "program": "generic_arrayaslist.ets" } } @@ -23753,7 +23753,7 @@ }, "end": { "line": 225, - "column": 85, + "column": 84, "program": "generic_arrayaslist.ets" } } 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 a1392dbfafe..e052767fdef 100644 --- a/ets2panda/test/compiler/ets/generic_class_getter_setter-expected.txt +++ b/ets2panda/test/compiler/ets/generic_class_getter_setter-expected.txt @@ -151,7 +151,7 @@ }, "end": { "line": 17, - "column": 25, + "column": 23, "program": "generic_class_getter_setter.ets" } } @@ -164,7 +164,7 @@ }, "end": { "line": 17, - "column": 25, + "column": 23, "program": "generic_class_getter_setter.ets" } } @@ -327,7 +327,7 @@ }, "end": { "line": 18, - "column": 25, + "column": 24, "program": "generic_class_getter_setter.ets" } } @@ -340,7 +340,7 @@ }, "end": { "line": 18, - "column": 25, + "column": 24, "program": "generic_class_getter_setter.ets" } } @@ -354,7 +354,7 @@ }, "end": { "line": 18, - "column": 25, + "column": 24, "program": "generic_class_getter_setter.ets" } } @@ -367,7 +367,7 @@ }, "end": { "line": 18, - "column": 25, + "column": 24, "program": "generic_class_getter_setter.ets" } } @@ -810,7 +810,7 @@ }, "end": { "line": 22, - "column": 23, + "column": 21, "program": "generic_class_getter_setter.ets" } } @@ -823,7 +823,7 @@ }, "end": { "line": 22, - "column": 23, + "column": 21, "program": "generic_class_getter_setter.ets" } } @@ -899,7 +899,7 @@ }, "end": { "line": 22, - "column": 37, + "column": 36, "program": "generic_class_getter_setter.ets" } } @@ -912,7 +912,7 @@ }, "end": { "line": 22, - "column": 37, + "column": 36, "program": "generic_class_getter_setter.ets" } } @@ -939,7 +939,7 @@ }, "end": { "line": 22, - "column": 38, + "column": 37, "program": "generic_class_getter_setter.ets" } } @@ -952,7 +952,7 @@ }, "end": { "line": 22, - "column": 38, + "column": 37, "program": "generic_class_getter_setter.ets" } } diff --git a/ets2panda/test/compiler/ets/generic_deadlock-expected.txt b/ets2panda/test/compiler/ets/generic_deadlock-expected.txt index 7e0bce2638d..2ea5d957b23 100644 --- a/ets2panda/test/compiler/ets/generic_deadlock-expected.txt +++ b/ets2panda/test/compiler/ets/generic_deadlock-expected.txt @@ -102,7 +102,7 @@ }, "end": { "line": 17, - "column": 34, + "column": 32, "program": "generic_deadlock.ets" } } @@ -115,7 +115,7 @@ }, "end": { "line": 17, - "column": 34, + "column": 32, "program": "generic_deadlock.ets" } } @@ -261,7 +261,7 @@ }, "end": { "line": 18, - "column": 26, + "column": 25, "program": "generic_deadlock.ets" } } @@ -274,7 +274,7 @@ }, "end": { "line": 18, - "column": 26, + "column": 25, "program": "generic_deadlock.ets" } } @@ -452,7 +452,7 @@ }, "end": { "line": 20, - "column": 34, + "column": 32, "program": "generic_deadlock.ets" } } @@ -465,7 +465,7 @@ }, "end": { "line": 20, - "column": 34, + "column": 32, "program": "generic_deadlock.ets" } } @@ -611,7 +611,7 @@ }, "end": { "line": 21, - "column": 26, + "column": 25, "program": "generic_deadlock.ets" } } @@ -624,7 +624,7 @@ }, "end": { "line": 21, - "column": 26, + "column": 25, "program": "generic_deadlock.ets" } } @@ -1141,7 +1141,7 @@ }, "end": { "line": 26, - "column": 17, + "column": 16, "program": "generic_deadlock.ets" } } @@ -1154,7 +1154,7 @@ }, "end": { "line": 26, - "column": 17, + "column": 16, "program": "generic_deadlock.ets" } } 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 9e5c24ccf86..79b358e49a6 100644 --- a/ets2panda/test/compiler/ets/generic_function_call_1-expected.txt +++ b/ets2panda/test/compiler/ets/generic_function_call_1-expected.txt @@ -368,7 +368,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 19, "program": "generic_function_call_1.ets" } } @@ -381,7 +381,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 19, "program": "generic_function_call_1.ets" } } @@ -395,7 +395,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 19, "program": "generic_function_call_1.ets" } } @@ -408,7 +408,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 19, "program": "generic_function_call_1.ets" } } @@ -640,7 +640,7 @@ }, "end": { "line": 21, - "column": 17, + "column": 16, "program": "generic_function_call_1.ets" } } @@ -653,7 +653,7 @@ }, "end": { "line": 21, - "column": 17, + "column": 16, "program": "generic_function_call_1.ets" } } @@ -773,7 +773,7 @@ }, "end": { "line": 23, - "column": 8, + "column": 7, "program": "generic_function_call_1.ets" } } @@ -786,7 +786,7 @@ }, "end": { "line": 23, - "column": 8, + "column": 7, "program": "generic_function_call_1.ets" } } 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 d0c98d2a9a5..b697832de71 100644 --- a/ets2panda/test/compiler/ets/generic_function_call_3-expected.txt +++ b/ets2panda/test/compiler/ets/generic_function_call_3-expected.txt @@ -205,7 +205,7 @@ }, "end": { "line": 17, - "column": 20, + "column": 18, "program": "generic_function_call_3.ets" } } @@ -218,7 +218,7 @@ }, "end": { "line": 17, - "column": 20, + "column": 18, "program": "generic_function_call_3.ets" } } @@ -569,7 +569,7 @@ }, "end": { "line": 19, - "column": 20, + "column": 19, "program": "generic_function_call_3.ets" } } @@ -582,7 +582,7 @@ }, "end": { "line": 19, - "column": 20, + "column": 19, "program": "generic_function_call_3.ets" } } @@ -596,7 +596,7 @@ }, "end": { "line": 19, - "column": 20, + "column": 19, "program": "generic_function_call_3.ets" } } @@ -609,7 +609,7 @@ }, "end": { "line": 19, - "column": 20, + "column": 19, "program": "generic_function_call_3.ets" } } @@ -841,7 +841,7 @@ }, "end": { "line": 22, - "column": 17, + "column": 16, "program": "generic_function_call_3.ets" } } @@ -854,7 +854,7 @@ }, "end": { "line": 22, - "column": 17, + "column": 16, "program": "generic_function_call_3.ets" } } @@ -974,7 +974,7 @@ }, "end": { "line": 24, - "column": 8, + "column": 7, "program": "generic_function_call_3.ets" } } @@ -987,7 +987,7 @@ }, "end": { "line": 24, - "column": 8, + "column": 7, "program": "generic_function_call_3.ets" } } 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 4c26e04289a..b2387071a32 100644 --- a/ets2panda/test/compiler/ets/generic_function_call_4-expected.txt +++ b/ets2panda/test/compiler/ets/generic_function_call_4-expected.txt @@ -591,7 +591,7 @@ }, "end": { "line": 19, - "column": 26, + "column": 25, "program": "generic_function_call_4.ets" } } @@ -604,7 +604,7 @@ }, "end": { "line": 19, - "column": 26, + "column": 25, "program": "generic_function_call_4.ets" } } @@ -631,7 +631,7 @@ }, "end": { "line": 19, - "column": 28, + "column": 26, "program": "generic_function_call_4.ets" } } @@ -644,7 +644,7 @@ }, "end": { "line": 19, - "column": 28, + "column": 26, "program": "generic_function_call_4.ets" } } @@ -762,7 +762,7 @@ }, "end": { "line": 20, - "column": 16, + "column": 15, "program": "generic_function_call_4.ets" } } @@ -775,7 +775,7 @@ }, "end": { "line": 20, - "column": 16, + "column": 15, "program": "generic_function_call_4.ets" } } @@ -802,7 +802,7 @@ }, "end": { "line": 20, - "column": 18, + "column": 16, "program": "generic_function_call_4.ets" } } @@ -815,7 +815,7 @@ }, "end": { "line": 20, - "column": 18, + "column": 16, "program": "generic_function_call_4.ets" } } @@ -889,7 +889,7 @@ }, "end": { "line": 20, - "column": 27, + "column": 26, "program": "generic_function_call_4.ets" } } @@ -902,7 +902,7 @@ }, "end": { "line": 20, - "column": 27, + "column": 26, "program": "generic_function_call_4.ets" } } @@ -929,7 +929,7 @@ }, "end": { "line": 20, - "column": 28, + "column": 27, "program": "generic_function_call_4.ets" } } @@ -942,7 +942,7 @@ }, "end": { "line": 20, - "column": 28, + "column": 27, "program": "generic_function_call_4.ets" } } @@ -1202,7 +1202,7 @@ }, "end": { "line": 24, - "column": 29, + "column": 27, "program": "generic_function_call_4.ets" } } @@ -1215,7 +1215,7 @@ }, "end": { "line": 24, - "column": 29, + "column": 27, "program": "generic_function_call_4.ets" } } @@ -1282,7 +1282,7 @@ }, "end": { "line": 24, - "column": 31, + "column": 29, "program": "generic_function_call_4.ets" } } @@ -1295,7 +1295,7 @@ }, "end": { "line": 24, - "column": 31, + "column": 29, "program": "generic_function_call_4.ets" } } @@ -1437,7 +1437,7 @@ }, "end": { "line": 25, - "column": 19, + "column": 17, "program": "generic_function_call_4.ets" } } @@ -1450,7 +1450,7 @@ }, "end": { "line": 25, - "column": 19, + "column": 17, "program": "generic_function_call_4.ets" } } @@ -1517,7 +1517,7 @@ }, "end": { "line": 25, - "column": 21, + "column": 19, "program": "generic_function_call_4.ets" } } @@ -1530,7 +1530,7 @@ }, "end": { "line": 25, - "column": 21, + "column": 19, "program": "generic_function_call_4.ets" } } @@ -1628,7 +1628,7 @@ }, "end": { "line": 25, - "column": 33, + "column": 31, "program": "generic_function_call_4.ets" } } @@ -1641,7 +1641,7 @@ }, "end": { "line": 25, - "column": 33, + "column": 31, "program": "generic_function_call_4.ets" } } @@ -1708,7 +1708,7 @@ }, "end": { "line": 25, - "column": 34, + "column": 33, "program": "generic_function_call_4.ets" } } @@ -1721,7 +1721,7 @@ }, "end": { "line": 25, - "column": 34, + "column": 33, "program": "generic_function_call_4.ets" } } @@ -1983,7 +1983,7 @@ }, "end": { "line": 30, - "column": 19, + "column": 18, "program": "generic_function_call_4.ets" } } @@ -1996,7 +1996,7 @@ }, "end": { "line": 30, - "column": 19, + "column": 18, "program": "generic_function_call_4.ets" } } @@ -2023,7 +2023,7 @@ }, "end": { "line": 30, - "column": 21, + "column": 19, "program": "generic_function_call_4.ets" } } @@ -2036,7 +2036,7 @@ }, "end": { "line": 30, - "column": 21, + "column": 19, "program": "generic_function_call_4.ets" } } @@ -2108,7 +2108,7 @@ }, "end": { "line": 30, - "column": 30, + "column": 29, "program": "generic_function_call_4.ets" } } @@ -2121,7 +2121,7 @@ }, "end": { "line": 30, - "column": 30, + "column": 29, "program": "generic_function_call_4.ets" } } @@ -2266,7 +2266,7 @@ }, "end": { "line": 31, - "column": 23, + "column": 21, "program": "generic_function_call_4.ets" } } @@ -2279,7 +2279,7 @@ }, "end": { "line": 31, - "column": 23, + "column": 21, "program": "generic_function_call_4.ets" } } @@ -2346,7 +2346,7 @@ }, "end": { "line": 31, - "column": 25, + "column": 23, "program": "generic_function_call_4.ets" } } @@ -2359,7 +2359,7 @@ }, "end": { "line": 31, - "column": 25, + "column": 23, "program": "generic_function_call_4.ets" } } @@ -2431,7 +2431,7 @@ }, "end": { "line": 31, - "column": 34, + "column": 33, "program": "generic_function_call_4.ets" } } @@ -2444,7 +2444,7 @@ }, "end": { "line": 31, - "column": 34, + "column": 33, "program": "generic_function_call_4.ets" } } 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 91bd40a6df6..595a89c371b 100644 --- a/ets2panda/test/compiler/ets/generic_function_call_5-expected.txt +++ b/ets2panda/test/compiler/ets/generic_function_call_5-expected.txt @@ -172,7 +172,7 @@ }, "end": { "line": 17, - "column": 47, + "column": 46, "program": "generic_function_call_5.ets" } } @@ -185,7 +185,7 @@ }, "end": { "line": 17, - "column": 47, + "column": 46, "program": "generic_function_call_5.ets" } } @@ -199,7 +199,7 @@ }, "end": { "line": 17, - "column": 47, + "column": 46, "program": "generic_function_call_5.ets" } } @@ -212,7 +212,7 @@ }, "end": { "line": 17, - "column": 47, + "column": 46, "program": "generic_function_call_5.ets" } } @@ -437,7 +437,7 @@ }, "end": { "line": 20, - "column": 38, + "column": 37, "program": "generic_function_call_5.ets" } } @@ -450,7 +450,7 @@ }, "end": { "line": 20, - "column": 38, + "column": 37, "program": "generic_function_call_5.ets" } } @@ -504,7 +504,7 @@ }, "end": { "line": 20, - "column": 26, + "column": 24, "program": "generic_function_call_5.ets" } } @@ -517,7 +517,7 @@ }, "end": { "line": 20, - "column": 26, + "column": 24, "program": "generic_function_call_5.ets" } } @@ -901,7 +901,7 @@ }, "end": { "line": 23, - "column": 26, + "column": 25, "program": "generic_function_call_5.ets" } } @@ -914,7 +914,7 @@ }, "end": { "line": 23, - "column": 26, + "column": 25, "program": "generic_function_call_5.ets" } } @@ -941,7 +941,7 @@ }, "end": { "line": 23, - "column": 28, + "column": 26, "program": "generic_function_call_5.ets" } } @@ -954,7 +954,7 @@ }, "end": { "line": 23, - "column": 28, + "column": 26, "program": "generic_function_call_5.ets" } } @@ -1019,7 +1019,7 @@ }, "end": { "line": 24, - "column": 25, + "column": 24, "program": "generic_function_call_5.ets" } } @@ -1032,7 +1032,7 @@ }, "end": { "line": 24, - "column": 25, + "column": 24, "program": "generic_function_call_5.ets" } } @@ -1059,7 +1059,7 @@ }, "end": { "line": 24, - "column": 26, + "column": 25, "program": "generic_function_call_5.ets" } } @@ -1072,7 +1072,7 @@ }, "end": { "line": 24, - "column": 26, + "column": 25, "program": "generic_function_call_5.ets" } } @@ -1129,7 +1129,7 @@ }, "end": { "line": 24, - "column": 49, + "column": 48, "program": "generic_function_call_5.ets" } } @@ -1142,7 +1142,7 @@ }, "end": { "line": 24, - "column": 49, + "column": 48, "program": "generic_function_call_5.ets" } } @@ -1156,7 +1156,7 @@ }, "end": { "line": 24, - "column": 49, + "column": 48, "program": "generic_function_call_5.ets" } } @@ -1169,7 +1169,7 @@ }, "end": { "line": 24, - "column": 49, + "column": 48, "program": "generic_function_call_5.ets" } } 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 074c3a749d6..888aeba014d 100644 --- a/ets2panda/test/compiler/ets/generic_function_call_7-expected.txt +++ b/ets2panda/test/compiler/ets/generic_function_call_7-expected.txt @@ -213,7 +213,7 @@ }, "end": { "line": 16, - "column": 23, + "column": 22, "program": "generic_function_call_7.ets" } } @@ -226,7 +226,7 @@ }, "end": { "line": 16, - "column": 23, + "column": 22, "program": "generic_function_call_7.ets" } } @@ -240,7 +240,7 @@ }, "end": { "line": 16, - "column": 23, + "column": 22, "program": "generic_function_call_7.ets" } } @@ -253,7 +253,7 @@ }, "end": { "line": 16, - "column": 23, + "column": 22, "program": "generic_function_call_7.ets" } } @@ -288,7 +288,7 @@ }, "end": { "line": 16, - "column": 28, + "column": 26, "program": "generic_function_call_7.ets" } } @@ -301,7 +301,7 @@ }, "end": { "line": 16, - "column": 28, + "column": 26, "program": "generic_function_call_7.ets" } } diff --git a/ets2panda/test/compiler/ets/generic_override_1-expected.txt b/ets2panda/test/compiler/ets/generic_override_1-expected.txt index b1bdaa73c37..e2e500647e8 100644 --- a/ets2panda/test/compiler/ets/generic_override_1-expected.txt +++ b/ets2panda/test/compiler/ets/generic_override_1-expected.txt @@ -93,8 +93,8 @@ "program": "generic_override_1.ets" }, "end": { - "line": 18, - "column": 6, + "line": 16, + "column": 33, "program": "generic_override_1.ets" } } @@ -225,7 +225,7 @@ }, "end": { "line": 18, - "column": 54, + "column": 53, "program": "generic_override_1.ets" } } @@ -238,7 +238,7 @@ }, "end": { "line": 18, - "column": 54, + "column": 53, "program": "generic_override_1.ets" } } @@ -265,7 +265,7 @@ }, "end": { "line": 18, - "column": 56, + "column": 54, "program": "generic_override_1.ets" } } @@ -278,7 +278,7 @@ }, "end": { "line": 18, - "column": 56, + "column": 54, "program": "generic_override_1.ets" } } @@ -542,7 +542,7 @@ }, "end": { "line": 21, - "column": 48, + "column": 47, "program": "generic_override_1.ets" } } @@ -555,7 +555,7 @@ }, "end": { "line": 21, - "column": 48, + "column": 47, "program": "generic_override_1.ets" } } @@ -582,7 +582,7 @@ }, "end": { "line": 21, - "column": 49, + "column": 48, "program": "generic_override_1.ets" } } @@ -595,7 +595,7 @@ }, "end": { "line": 21, - "column": 49, + "column": 48, "program": "generic_override_1.ets" } } @@ -609,7 +609,7 @@ }, "end": { "line": 21, - "column": 49, + "column": 48, "program": "generic_override_1.ets" } } @@ -622,7 +622,7 @@ }, "end": { "line": 21, - "column": 49, + "column": 48, "program": "generic_override_1.ets" } } @@ -685,7 +685,7 @@ }, "end": { "line": 21, - "column": 79, + "column": 78, "program": "generic_override_1.ets" } } @@ -698,7 +698,7 @@ }, "end": { "line": 21, - "column": 79, + "column": 78, "program": "generic_override_1.ets" } } @@ -725,7 +725,7 @@ }, "end": { "line": 21, - "column": 80, + "column": 79, "program": "generic_override_1.ets" } } @@ -738,7 +738,7 @@ }, "end": { "line": 21, - "column": 80, + "column": 79, "program": "generic_override_1.ets" } } @@ -752,7 +752,7 @@ }, "end": { "line": 21, - "column": 80, + "column": 79, "program": "generic_override_1.ets" } } @@ -765,7 +765,7 @@ }, "end": { "line": 21, - "column": 80, + "column": 79, "program": "generic_override_1.ets" } } @@ -824,7 +824,7 @@ }, "end": { "line": 21, - "column": 101, + "column": 100, "program": "generic_override_1.ets" } } @@ -837,7 +837,7 @@ }, "end": { "line": 21, - "column": 101, + "column": 100, "program": "generic_override_1.ets" } } @@ -863,8 +863,8 @@ "program": "generic_override_1.ets" }, "end": { - "line": 22, - "column": 2, + "line": 21, + "column": 101, "program": "generic_override_1.ets" } } @@ -876,8 +876,8 @@ "program": "generic_override_1.ets" }, "end": { - "line": 22, - "column": 2, + "line": 21, + "column": 101, "program": "generic_override_1.ets" } } @@ -950,8 +950,8 @@ "program": "generic_override_1.ets" }, "end": { - "line": 22, - "column": 2, + "line": 21, + "column": 101, "program": "generic_override_1.ets" } } @@ -967,8 +967,8 @@ "program": "generic_override_1.ets" }, "end": { - "line": 22, - "column": 2, + "line": 21, + "column": 101, "program": "generic_override_1.ets" } } @@ -980,8 +980,8 @@ "program": "generic_override_1.ets" }, "end": { - "line": 22, - "column": 2, + "line": 21, + "column": 101, "program": "generic_override_1.ets" } } @@ -993,8 +993,8 @@ "program": "generic_override_1.ets" }, "end": { - "line": 22, - "column": 2, + "line": 21, + "column": 101, "program": "generic_override_1.ets" } } @@ -1006,8 +1006,8 @@ "program": "generic_override_1.ets" }, "end": { - "line": 22, - "column": 2, + "line": 21, + "column": 101, "program": "generic_override_1.ets" } } @@ -1026,8 +1026,8 @@ "program": "generic_override_1.ets" }, "end": { - "line": 22, - "column": 2, + "line": 21, + "column": 101, "program": "generic_override_1.ets" } } @@ -1042,8 +1042,8 @@ "program": "generic_override_1.ets" }, "end": { - "line": 22, - "column": 2, + "line": 21, + "column": 101, "program": "generic_override_1.ets" } } @@ -1062,8 +1062,8 @@ "program": "generic_override_1.ets" }, "end": { - "line": 22, - "column": 2, + "line": 21, + "column": 101, "program": "generic_override_1.ets" } } @@ -1076,8 +1076,8 @@ "program": "generic_override_1.ets" }, "end": { - "line": 22, - "column": 2, + "line": 21, + "column": 101, "program": "generic_override_1.ets" } } @@ -1090,8 +1090,8 @@ "program": "generic_override_1.ets" }, "end": { - "line": 22, - "column": 2, + "line": 21, + "column": 101, "program": "generic_override_1.ets" } } @@ -1103,8 +1103,8 @@ "program": "generic_override_1.ets" }, "end": { - "line": 22, - "column": 2, + "line": 21, + "column": 101, "program": "generic_override_1.ets" } } @@ -1118,8 +1118,8 @@ "program": "generic_override_1.ets" }, "end": { - "line": 22, - "column": 2, + "line": 21, + "column": 101, "program": "generic_override_1.ets" } } @@ -1163,8 +1163,8 @@ "program": "generic_override_1.ets" }, "end": { - "line": 24, - "column": 10, + "line": 22, + "column": 2, "program": "generic_override_1.ets" } } @@ -1261,8 +1261,8 @@ "program": "generic_override_1.ets" }, "end": { - "line": 26, - "column": 6, + "line": 24, + "column": 33, "program": "generic_override_1.ets" } } @@ -1320,7 +1320,7 @@ }, "end": { "line": 26, - "column": 49, + "column": 47, "program": "generic_override_1.ets" } } @@ -1333,7 +1333,7 @@ }, "end": { "line": 26, - "column": 49, + "column": 47, "program": "generic_override_1.ets" } } @@ -1460,7 +1460,7 @@ }, "end": { "line": 27, - "column": 48, + "column": 47, "program": "generic_override_1.ets" } } @@ -1473,7 +1473,7 @@ }, "end": { "line": 27, - "column": 48, + "column": 47, "program": "generic_override_1.ets" } } @@ -1500,7 +1500,7 @@ }, "end": { "line": 27, - "column": 49, + "column": 48, "program": "generic_override_1.ets" } } @@ -1513,7 +1513,7 @@ }, "end": { "line": 27, - "column": 49, + "column": 48, "program": "generic_override_1.ets" } } @@ -1527,7 +1527,7 @@ }, "end": { "line": 27, - "column": 49, + "column": 48, "program": "generic_override_1.ets" } } @@ -1540,7 +1540,7 @@ }, "end": { "line": 27, - "column": 49, + "column": 48, "program": "generic_override_1.ets" } } @@ -1603,7 +1603,7 @@ }, "end": { "line": 27, - "column": 78, + "column": 77, "program": "generic_override_1.ets" } } @@ -1616,7 +1616,7 @@ }, "end": { "line": 27, - "column": 78, + "column": 77, "program": "generic_override_1.ets" } } @@ -1643,7 +1643,7 @@ }, "end": { "line": 27, - "column": 79, + "column": 78, "program": "generic_override_1.ets" } } @@ -1656,7 +1656,7 @@ }, "end": { "line": 27, - "column": 79, + "column": 78, "program": "generic_override_1.ets" } } @@ -1670,7 +1670,7 @@ }, "end": { "line": 27, - "column": 79, + "column": 78, "program": "generic_override_1.ets" } } @@ -1683,7 +1683,7 @@ }, "end": { "line": 27, - "column": 79, + "column": 78, "program": "generic_override_1.ets" } } @@ -1742,7 +1742,7 @@ }, "end": { "line": 27, - "column": 97, + "column": 96, "program": "generic_override_1.ets" } } @@ -1755,7 +1755,7 @@ }, "end": { "line": 27, - "column": 97, + "column": 96, "program": "generic_override_1.ets" } } @@ -1782,7 +1782,7 @@ }, "end": { "line": 27, - "column": 99, + "column": 97, "program": "generic_override_1.ets" } } @@ -1795,7 +1795,7 @@ }, "end": { "line": 27, - "column": 99, + "column": 97, "program": "generic_override_1.ets" } } @@ -1909,7 +1909,7 @@ }, "end": { "line": 28, - "column": 36, + "column": 35, "program": "generic_override_1.ets" } } @@ -1922,7 +1922,7 @@ }, "end": { "line": 28, - "column": 36, + "column": 35, "program": "generic_override_1.ets" } } @@ -1949,7 +1949,7 @@ }, "end": { "line": 28, - "column": 37, + "column": 36, "program": "generic_override_1.ets" } } @@ -1962,7 +1962,7 @@ }, "end": { "line": 28, - "column": 37, + "column": 36, "program": "generic_override_1.ets" } } diff --git a/ets2panda/test/compiler/ets/generic_override_2-expected.txt b/ets2panda/test/compiler/ets/generic_override_2-expected.txt index be247d543a6..82f88f738b4 100644 --- a/ets2panda/test/compiler/ets/generic_override_2-expected.txt +++ b/ets2panda/test/compiler/ets/generic_override_2-expected.txt @@ -97,7 +97,7 @@ }, "end": { "line": 17, - "column": 48, + "column": 47, "program": "generic_override_2.ets" } } @@ -110,7 +110,7 @@ }, "end": { "line": 17, - "column": 48, + "column": 47, "program": "generic_override_2.ets" } } @@ -124,7 +124,7 @@ }, "end": { "line": 17, - "column": 48, + "column": 47, "program": "generic_override_2.ets" } } @@ -137,7 +137,7 @@ }, "end": { "line": 17, - "column": 48, + "column": 47, "program": "generic_override_2.ets" } } @@ -175,7 +175,7 @@ }, "end": { "line": 17, - "column": 54, + "column": 53, "program": "generic_override_2.ets" } } @@ -188,7 +188,7 @@ }, "end": { "line": 17, - "column": 54, + "column": 53, "program": "generic_override_2.ets" } } @@ -246,7 +246,7 @@ }, "end": { "line": 17, - "column": 59, + "column": 58, "program": "generic_override_2.ets" } } @@ -259,7 +259,7 @@ }, "end": { "line": 17, - "column": 59, + "column": 58, "program": "generic_override_2.ets" } } @@ -286,7 +286,7 @@ }, "end": { "line": 17, - "column": 60, + "column": 59, "program": "generic_override_2.ets" } } @@ -299,7 +299,7 @@ }, "end": { "line": 17, - "column": 60, + "column": 59, "program": "generic_override_2.ets" } } @@ -313,7 +313,7 @@ }, "end": { "line": 17, - "column": 60, + "column": 59, "program": "generic_override_2.ets" } } @@ -326,7 +326,7 @@ }, "end": { "line": 17, - "column": 60, + "column": 59, "program": "generic_override_2.ets" } } @@ -340,7 +340,7 @@ }, "end": { "line": 17, - "column": 60, + "column": 59, "program": "generic_override_2.ets" } } @@ -353,7 +353,7 @@ }, "end": { "line": 17, - "column": 60, + "column": 59, "program": "generic_override_2.ets" } } @@ -400,7 +400,7 @@ }, "end": { "line": 18, - "column": 46, + "column": 45, "program": "generic_override_2.ets" } } @@ -413,7 +413,7 @@ }, "end": { "line": 18, - "column": 46, + "column": 45, "program": "generic_override_2.ets" } } @@ -427,7 +427,7 @@ }, "end": { "line": 18, - "column": 46, + "column": 45, "program": "generic_override_2.ets" } } @@ -440,7 +440,7 @@ }, "end": { "line": 18, - "column": 46, + "column": 45, "program": "generic_override_2.ets" } } @@ -478,7 +478,7 @@ }, "end": { "line": 18, - "column": 52, + "column": 51, "program": "generic_override_2.ets" } } @@ -491,7 +491,7 @@ }, "end": { "line": 18, - "column": 52, + "column": 51, "program": "generic_override_2.ets" } } @@ -549,7 +549,7 @@ }, "end": { "line": 18, - "column": 57, + "column": 56, "program": "generic_override_2.ets" } } @@ -562,7 +562,7 @@ }, "end": { "line": 18, - "column": 57, + "column": 56, "program": "generic_override_2.ets" } } @@ -589,7 +589,7 @@ }, "end": { "line": 18, - "column": 58, + "column": 57, "program": "generic_override_2.ets" } } @@ -602,7 +602,7 @@ }, "end": { "line": 18, - "column": 58, + "column": 57, "program": "generic_override_2.ets" } } @@ -616,7 +616,7 @@ }, "end": { "line": 18, - "column": 58, + "column": 57, "program": "generic_override_2.ets" } } @@ -629,7 +629,7 @@ }, "end": { "line": 18, - "column": 58, + "column": 57, "program": "generic_override_2.ets" } } @@ -643,7 +643,7 @@ }, "end": { "line": 18, - "column": 58, + "column": 57, "program": "generic_override_2.ets" } } @@ -656,7 +656,7 @@ }, "end": { "line": 18, - "column": 58, + "column": 57, "program": "generic_override_2.ets" } } @@ -718,7 +718,7 @@ }, "end": { "line": 18, - "column": 65, + "column": 64, "program": "generic_override_2.ets" } } @@ -731,7 +731,7 @@ }, "end": { "line": 18, - "column": 65, + "column": 64, "program": "generic_override_2.ets" } } @@ -765,7 +765,7 @@ }, "end": { "line": 18, - "column": 67, + "column": 66, "program": "generic_override_2.ets" } } @@ -778,7 +778,7 @@ }, "end": { "line": 18, - "column": 67, + "column": 66, "program": "generic_override_2.ets" } } @@ -792,7 +792,7 @@ }, "end": { "line": 18, - "column": 67, + "column": 66, "program": "generic_override_2.ets" } } @@ -819,7 +819,7 @@ }, "end": { "line": 18, - "column": 68, + "column": 67, "program": "generic_override_2.ets" } } @@ -832,7 +832,7 @@ }, "end": { "line": 18, - "column": 68, + "column": 67, "program": "generic_override_2.ets" } } @@ -920,7 +920,7 @@ }, "end": { "line": 17, - "column": 23, + "column": 22, "program": "generic_override_2.ets" } } @@ -933,7 +933,7 @@ }, "end": { "line": 17, - "column": 23, + "column": 22, "program": "generic_override_2.ets" } } @@ -985,7 +985,7 @@ }, "end": { "line": 18, - "column": 68, + "column": 67, "program": "generic_override_2.ets" } } @@ -1002,7 +1002,7 @@ }, "end": { "line": 18, - "column": 68, + "column": 67, "program": "generic_override_2.ets" } } @@ -1015,7 +1015,7 @@ }, "end": { "line": 18, - "column": 68, + "column": 67, "program": "generic_override_2.ets" } } @@ -1028,7 +1028,7 @@ }, "end": { "line": 18, - "column": 68, + "column": 67, "program": "generic_override_2.ets" } } @@ -1041,7 +1041,7 @@ }, "end": { "line": 18, - "column": 68, + "column": 67, "program": "generic_override_2.ets" } } @@ -1061,7 +1061,7 @@ }, "end": { "line": 18, - "column": 68, + "column": 67, "program": "generic_override_2.ets" } } @@ -1077,7 +1077,7 @@ }, "end": { "line": 18, - "column": 68, + "column": 67, "program": "generic_override_2.ets" } } @@ -1097,7 +1097,7 @@ }, "end": { "line": 18, - "column": 68, + "column": 67, "program": "generic_override_2.ets" } } @@ -1111,7 +1111,7 @@ }, "end": { "line": 18, - "column": 68, + "column": 67, "program": "generic_override_2.ets" } } @@ -1125,7 +1125,7 @@ }, "end": { "line": 18, - "column": 68, + "column": 67, "program": "generic_override_2.ets" } } @@ -1138,7 +1138,7 @@ }, "end": { "line": 18, - "column": 68, + "column": 67, "program": "generic_override_2.ets" } } @@ -1246,8 +1246,8 @@ "program": "generic_override_2.ets" }, "end": { - "line": 21, - "column": 6, + "line": 19, + "column": 2, "program": "generic_override_2.ets" } } @@ -1378,7 +1378,7 @@ }, "end": { "line": 21, - "column": 28, + "column": 27, "program": "generic_override_2.ets" } } @@ -1391,7 +1391,7 @@ }, "end": { "line": 21, - "column": 28, + "column": 27, "program": "generic_override_2.ets" } } @@ -1418,7 +1418,7 @@ }, "end": { "line": 21, - "column": 30, + "column": 28, "program": "generic_override_2.ets" } } @@ -1431,7 +1431,7 @@ }, "end": { "line": 21, - "column": 30, + "column": 28, "program": "generic_override_2.ets" } } @@ -1542,7 +1542,7 @@ }, "end": { "line": 22, - "column": 48, + "column": 47, "program": "generic_override_2.ets" } } @@ -1555,7 +1555,7 @@ }, "end": { "line": 22, - "column": 48, + "column": 47, "program": "generic_override_2.ets" } } @@ -1569,7 +1569,7 @@ }, "end": { "line": 22, - "column": 48, + "column": 47, "program": "generic_override_2.ets" } } @@ -1582,7 +1582,7 @@ }, "end": { "line": 22, - "column": 48, + "column": 47, "program": "generic_override_2.ets" } } @@ -1620,7 +1620,7 @@ }, "end": { "line": 22, - "column": 54, + "column": 53, "program": "generic_override_2.ets" } } @@ -1633,7 +1633,7 @@ }, "end": { "line": 22, - "column": 54, + "column": 53, "program": "generic_override_2.ets" } } @@ -1691,7 +1691,7 @@ }, "end": { "line": 22, - "column": 59, + "column": 58, "program": "generic_override_2.ets" } } @@ -1704,7 +1704,7 @@ }, "end": { "line": 22, - "column": 59, + "column": 58, "program": "generic_override_2.ets" } } @@ -1731,7 +1731,7 @@ }, "end": { "line": 22, - "column": 60, + "column": 59, "program": "generic_override_2.ets" } } @@ -1744,7 +1744,7 @@ }, "end": { "line": 22, - "column": 60, + "column": 59, "program": "generic_override_2.ets" } } @@ -1758,7 +1758,7 @@ }, "end": { "line": 22, - "column": 60, + "column": 59, "program": "generic_override_2.ets" } } @@ -1771,7 +1771,7 @@ }, "end": { "line": 22, - "column": 60, + "column": 59, "program": "generic_override_2.ets" } } @@ -1785,7 +1785,7 @@ }, "end": { "line": 22, - "column": 60, + "column": 59, "program": "generic_override_2.ets" } } @@ -1798,7 +1798,7 @@ }, "end": { "line": 22, - "column": 60, + "column": 59, "program": "generic_override_2.ets" } } @@ -1845,7 +1845,7 @@ }, "end": { "line": 23, - "column": 46, + "column": 45, "program": "generic_override_2.ets" } } @@ -1858,7 +1858,7 @@ }, "end": { "line": 23, - "column": 46, + "column": 45, "program": "generic_override_2.ets" } } @@ -1872,7 +1872,7 @@ }, "end": { "line": 23, - "column": 46, + "column": 45, "program": "generic_override_2.ets" } } @@ -1885,7 +1885,7 @@ }, "end": { "line": 23, - "column": 46, + "column": 45, "program": "generic_override_2.ets" } } @@ -1923,7 +1923,7 @@ }, "end": { "line": 23, - "column": 52, + "column": 51, "program": "generic_override_2.ets" } } @@ -1936,7 +1936,7 @@ }, "end": { "line": 23, - "column": 52, + "column": 51, "program": "generic_override_2.ets" } } @@ -1994,7 +1994,7 @@ }, "end": { "line": 23, - "column": 57, + "column": 56, "program": "generic_override_2.ets" } } @@ -2007,7 +2007,7 @@ }, "end": { "line": 23, - "column": 57, + "column": 56, "program": "generic_override_2.ets" } } @@ -2034,7 +2034,7 @@ }, "end": { "line": 23, - "column": 58, + "column": 57, "program": "generic_override_2.ets" } } @@ -2047,7 +2047,7 @@ }, "end": { "line": 23, - "column": 58, + "column": 57, "program": "generic_override_2.ets" } } @@ -2061,7 +2061,7 @@ }, "end": { "line": 23, - "column": 58, + "column": 57, "program": "generic_override_2.ets" } } @@ -2074,7 +2074,7 @@ }, "end": { "line": 23, - "column": 58, + "column": 57, "program": "generic_override_2.ets" } } @@ -2088,7 +2088,7 @@ }, "end": { "line": 23, - "column": 58, + "column": 57, "program": "generic_override_2.ets" } } @@ -2101,7 +2101,7 @@ }, "end": { "line": 23, - "column": 58, + "column": 57, "program": "generic_override_2.ets" } } @@ -2163,7 +2163,7 @@ }, "end": { "line": 23, - "column": 65, + "column": 64, "program": "generic_override_2.ets" } } @@ -2176,7 +2176,7 @@ }, "end": { "line": 23, - "column": 65, + "column": 64, "program": "generic_override_2.ets" } } @@ -2210,7 +2210,7 @@ }, "end": { "line": 23, - "column": 67, + "column": 66, "program": "generic_override_2.ets" } } @@ -2223,7 +2223,7 @@ }, "end": { "line": 23, - "column": 67, + "column": 66, "program": "generic_override_2.ets" } } @@ -2237,7 +2237,7 @@ }, "end": { "line": 23, - "column": 67, + "column": 66, "program": "generic_override_2.ets" } } @@ -2264,7 +2264,7 @@ }, "end": { "line": 23, - "column": 69, + "column": 67, "program": "generic_override_2.ets" } } @@ -2277,7 +2277,7 @@ }, "end": { "line": 23, - "column": 69, + "column": 67, "program": "generic_override_2.ets" } } @@ -2365,7 +2365,7 @@ }, "end": { "line": 22, - "column": 23, + "column": 22, "program": "generic_override_2.ets" } } @@ -2378,7 +2378,7 @@ }, "end": { "line": 22, - "column": 23, + "column": 22, "program": "generic_override_2.ets" } } @@ -2473,7 +2473,7 @@ }, "end": { "line": 24, - "column": 24, + "column": 23, "program": "generic_override_2.ets" } } @@ -2486,7 +2486,7 @@ }, "end": { "line": 24, - "column": 24, + "column": 23, "program": "generic_override_2.ets" } } @@ -2520,7 +2520,7 @@ }, "end": { "line": 24, - "column": 26, + "column": 25, "program": "generic_override_2.ets" } } @@ -2533,7 +2533,7 @@ }, "end": { "line": 24, - "column": 26, + "column": 25, "program": "generic_override_2.ets" } } @@ -2547,7 +2547,7 @@ }, "end": { "line": 24, - "column": 26, + "column": 25, "program": "generic_override_2.ets" } } @@ -2574,7 +2574,7 @@ }, "end": { "line": 24, - "column": 27, + "column": 26, "program": "generic_override_2.ets" } } @@ -2587,7 +2587,7 @@ }, "end": { "line": 24, - "column": 27, + "column": 26, "program": "generic_override_2.ets" } } diff --git a/ets2panda/test/compiler/ets/generic_override_3-expected.txt b/ets2panda/test/compiler/ets/generic_override_3-expected.txt index 26dac385b9c..d82e215fac9 100644 --- a/ets2panda/test/compiler/ets/generic_override_3-expected.txt +++ b/ets2panda/test/compiler/ets/generic_override_3-expected.txt @@ -327,7 +327,7 @@ }, "end": { "line": 17, - "column": 24, + "column": 23, "program": "generic_override_3.ets" } } @@ -340,7 +340,7 @@ }, "end": { "line": 17, - "column": 24, + "column": 23, "program": "generic_override_3.ets" } } @@ -367,7 +367,7 @@ }, "end": { "line": 17, - "column": 26, + "column": 24, "program": "generic_override_3.ets" } } @@ -380,7 +380,7 @@ }, "end": { "line": 17, - "column": 26, + "column": 24, "program": "generic_override_3.ets" } } @@ -835,7 +835,7 @@ }, "end": { "line": 21, - "column": 29, + "column": 28, "program": "generic_override_3.ets" } } @@ -848,7 +848,7 @@ }, "end": { "line": 21, - "column": 29, + "column": 28, "program": "generic_override_3.ets" } } @@ -875,7 +875,7 @@ }, "end": { "line": 21, - "column": 30, + "column": 29, "program": "generic_override_3.ets" } } @@ -888,7 +888,7 @@ }, "end": { "line": 21, - "column": 30, + "column": 29, "program": "generic_override_3.ets" } } @@ -902,7 +902,7 @@ }, "end": { "line": 21, - "column": 30, + "column": 29, "program": "generic_override_3.ets" } } @@ -915,7 +915,7 @@ }, "end": { "line": 21, - "column": 30, + "column": 29, "program": "generic_override_3.ets" } } @@ -974,7 +974,7 @@ }, "end": { "line": 21, - "column": 36, + "column": 35, "program": "generic_override_3.ets" } } @@ -987,7 +987,7 @@ }, "end": { "line": 21, - "column": 36, + "column": 35, "program": "generic_override_3.ets" } } @@ -1014,7 +1014,7 @@ }, "end": { "line": 21, - "column": 37, + "column": 36, "program": "generic_override_3.ets" } } @@ -1027,7 +1027,7 @@ }, "end": { "line": 21, - "column": 37, + "column": 36, "program": "generic_override_3.ets" } } @@ -1101,7 +1101,7 @@ }, "end": { "line": 21, - "column": 37, + "column": 36, "program": "generic_override_3.ets" } } @@ -1118,7 +1118,7 @@ }, "end": { "line": 21, - "column": 37, + "column": 36, "program": "generic_override_3.ets" } } @@ -1131,7 +1131,7 @@ }, "end": { "line": 21, - "column": 37, + "column": 36, "program": "generic_override_3.ets" } } @@ -1144,7 +1144,7 @@ }, "end": { "line": 21, - "column": 37, + "column": 36, "program": "generic_override_3.ets" } } @@ -1157,7 +1157,7 @@ }, "end": { "line": 21, - "column": 37, + "column": 36, "program": "generic_override_3.ets" } } @@ -1177,7 +1177,7 @@ }, "end": { "line": 21, - "column": 37, + "column": 36, "program": "generic_override_3.ets" } } @@ -1193,7 +1193,7 @@ }, "end": { "line": 21, - "column": 37, + "column": 36, "program": "generic_override_3.ets" } } @@ -1213,7 +1213,7 @@ }, "end": { "line": 21, - "column": 37, + "column": 36, "program": "generic_override_3.ets" } } @@ -1227,7 +1227,7 @@ }, "end": { "line": 21, - "column": 37, + "column": 36, "program": "generic_override_3.ets" } } @@ -1241,7 +1241,7 @@ }, "end": { "line": 21, - "column": 37, + "column": 36, "program": "generic_override_3.ets" } } @@ -1254,7 +1254,7 @@ }, "end": { "line": 21, - "column": 37, + "column": 36, "program": "generic_override_3.ets" } } @@ -1313,8 +1313,8 @@ "program": "generic_override_3.ets" }, "end": { - "line": 24, - "column": 6, + "line": 22, + "column": 2, "program": "generic_override_3.ets" } } @@ -1372,7 +1372,7 @@ }, "end": { "line": 24, - "column": 32, + "column": 30, "program": "generic_override_3.ets" } } @@ -1385,7 +1385,7 @@ }, "end": { "line": 24, - "column": 32, + "column": 30, "program": "generic_override_3.ets" } } @@ -1512,7 +1512,7 @@ }, "end": { "line": 25, - "column": 45, + "column": 44, "program": "generic_override_3.ets" } } @@ -1525,7 +1525,7 @@ }, "end": { "line": 25, - "column": 45, + "column": 44, "program": "generic_override_3.ets" } } @@ -1552,7 +1552,7 @@ }, "end": { "line": 25, - "column": 46, + "column": 45, "program": "generic_override_3.ets" } } @@ -1565,7 +1565,7 @@ }, "end": { "line": 25, - "column": 46, + "column": 45, "program": "generic_override_3.ets" } } @@ -1579,7 +1579,7 @@ }, "end": { "line": 25, - "column": 46, + "column": 45, "program": "generic_override_3.ets" } } @@ -1592,7 +1592,7 @@ }, "end": { "line": 25, - "column": 46, + "column": 45, "program": "generic_override_3.ets" } } @@ -1651,7 +1651,7 @@ }, "end": { "line": 25, - "column": 52, + "column": 51, "program": "generic_override_3.ets" } } @@ -1664,7 +1664,7 @@ }, "end": { "line": 25, - "column": 52, + "column": 51, "program": "generic_override_3.ets" } } @@ -1691,7 +1691,7 @@ }, "end": { "line": 25, - "column": 54, + "column": 52, "program": "generic_override_3.ets" } } @@ -1704,7 +1704,7 @@ }, "end": { "line": 25, - "column": 54, + "column": 52, "program": "generic_override_3.ets" } } @@ -1818,7 +1818,7 @@ }, "end": { "line": 26, - "column": 24, + "column": 23, "program": "generic_override_3.ets" } } @@ -1831,7 +1831,7 @@ }, "end": { "line": 26, - "column": 24, + "column": 23, "program": "generic_override_3.ets" } } @@ -1858,7 +1858,7 @@ }, "end": { "line": 26, - "column": 25, + "column": 24, "program": "generic_override_3.ets" } } @@ -1871,7 +1871,7 @@ }, "end": { "line": 26, - "column": 25, + "column": 24, "program": "generic_override_3.ets" } } diff --git a/ets2panda/test/compiler/ets/generic_typealias_1-expected.txt b/ets2panda/test/compiler/ets/generic_typealias_1-expected.txt index a4235a75e58..850589db695 100644 --- a/ets2panda/test/compiler/ets/generic_typealias_1-expected.txt +++ b/ets2panda/test/compiler/ets/generic_typealias_1-expected.txt @@ -48,8 +48,8 @@ "program": "generic_typealias_1.ets" }, "end": { - "line": 17, - "column": 5, + "line": 16, + "column": 18, "program": "generic_typealias_1.ets" } } @@ -61,8 +61,8 @@ "program": "generic_typealias_1.ets" }, "end": { - "line": 17, - "column": 5, + "line": 16, + "column": 18, "program": "generic_typealias_1.ets" } } @@ -128,7 +128,7 @@ }, "end": { "line": 17, - "column": 21, + "column": 20, "program": "generic_typealias_1.ets" } } @@ -141,7 +141,7 @@ }, "end": { "line": 17, - "column": 21, + "column": 20, "program": "generic_typealias_1.ets" } } @@ -280,7 +280,7 @@ }, "end": { "line": 18, - "column": 19, + "column": 18, "program": "generic_typealias_1.ets" } } @@ -293,7 +293,7 @@ }, "end": { "line": 18, - "column": 19, + "column": 18, "program": "generic_typealias_1.ets" } } @@ -320,7 +320,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 19, "program": "generic_typealias_1.ets" } } @@ -333,7 +333,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 19, "program": "generic_typealias_1.ets" } } @@ -837,7 +837,7 @@ }, "end": { "line": 23, - "column": 17, + "column": 15, "program": "generic_typealias_1.ets" } } @@ -850,7 +850,7 @@ }, "end": { "line": 23, - "column": 17, + "column": 15, "program": "generic_typealias_1.ets" } } @@ -924,7 +924,7 @@ }, "end": { "line": 23, - "column": 34, + "column": 33, "program": "generic_typealias_1.ets" } } @@ -937,7 +937,7 @@ }, "end": { "line": 23, - "column": 34, + "column": 33, "program": "generic_typealias_1.ets" } } @@ -964,7 +964,7 @@ }, "end": { "line": 23, - "column": 35, + "column": 34, "program": "generic_typealias_1.ets" } } @@ -977,7 +977,7 @@ }, "end": { "line": 23, - "column": 35, + "column": 34, "program": "generic_typealias_1.ets" } } @@ -1102,7 +1102,7 @@ }, "end": { "line": 24, - "column": 21, + "column": 20, "program": "generic_typealias_1.ets" } } @@ -1115,7 +1115,7 @@ }, "end": { "line": 24, - "column": 21, + "column": 20, "program": "generic_typealias_1.ets" } } @@ -1142,7 +1142,7 @@ }, "end": { "line": 24, - "column": 23, + "column": 21, "program": "generic_typealias_1.ets" } } @@ -1155,7 +1155,7 @@ }, "end": { "line": 24, - "column": 23, + "column": 21, "program": "generic_typealias_1.ets" } } @@ -1253,7 +1253,7 @@ }, "end": { "line": 24, - "column": 46, + "column": 44, "program": "generic_typealias_1.ets" } } @@ -1266,7 +1266,7 @@ }, "end": { "line": 24, - "column": 46, + "column": 44, "program": "generic_typealias_1.ets" } } @@ -1333,7 +1333,7 @@ }, "end": { "line": 24, - "column": 47, + "column": 46, "program": "generic_typealias_1.ets" } } @@ -1346,7 +1346,7 @@ }, "end": { "line": 24, - "column": 47, + "column": 46, "program": "generic_typealias_1.ets" } } @@ -1478,7 +1478,7 @@ }, "end": { "line": 25, - "column": 28, + "column": 26, "program": "generic_typealias_1.ets" } } @@ -1491,7 +1491,7 @@ }, "end": { "line": 25, - "column": 28, + "column": 26, "program": "generic_typealias_1.ets" } } @@ -1558,7 +1558,7 @@ }, "end": { "line": 25, - "column": 30, + "column": 28, "program": "generic_typealias_1.ets" } } @@ -1571,7 +1571,7 @@ }, "end": { "line": 25, - "column": 30, + "column": 28, "program": "generic_typealias_1.ets" } } @@ -1645,7 +1645,7 @@ }, "end": { "line": 25, - "column": 42, + "column": 41, "program": "generic_typealias_1.ets" } } @@ -1658,7 +1658,7 @@ }, "end": { "line": 25, - "column": 42, + "column": 41, "program": "generic_typealias_1.ets" } } @@ -1685,7 +1685,7 @@ }, "end": { "line": 25, - "column": 43, + "column": 42, "program": "generic_typealias_1.ets" } } @@ -1698,7 +1698,7 @@ }, "end": { "line": 25, - "column": 43, + "column": 42, "program": "generic_typealias_1.ets" } } @@ -1830,7 +1830,7 @@ }, "end": { "line": 26, - "column": 27, + "column": 25, "program": "generic_typealias_1.ets" } } @@ -1843,7 +1843,7 @@ }, "end": { "line": 26, - "column": 27, + "column": 25, "program": "generic_typealias_1.ets" } } @@ -1910,7 +1910,7 @@ }, "end": { "line": 26, - "column": 29, + "column": 27, "program": "generic_typealias_1.ets" } } @@ -1923,7 +1923,7 @@ }, "end": { "line": 26, - "column": 29, + "column": 27, "program": "generic_typealias_1.ets" } } @@ -2021,7 +2021,7 @@ }, "end": { "line": 26, - "column": 49, + "column": 47, "program": "generic_typealias_1.ets" } } @@ -2034,7 +2034,7 @@ }, "end": { "line": 26, - "column": 49, + "column": 47, "program": "generic_typealias_1.ets" } } @@ -2101,7 +2101,7 @@ }, "end": { "line": 26, - "column": 50, + "column": 49, "program": "generic_typealias_1.ets" } } @@ -2114,7 +2114,7 @@ }, "end": { "line": 26, - "column": 50, + "column": 49, "program": "generic_typealias_1.ets" } } @@ -2222,7 +2222,7 @@ }, "end": { "line": 28, - "column": 20, + "column": 19, "program": "generic_typealias_1.ets" } } @@ -2235,7 +2235,7 @@ }, "end": { "line": 28, - "column": 20, + "column": 19, "program": "generic_typealias_1.ets" } } @@ -2262,7 +2262,7 @@ }, "end": { "line": 28, - "column": 22, + "column": 20, "program": "generic_typealias_1.ets" } } @@ -2275,7 +2275,7 @@ }, "end": { "line": 28, - "column": 22, + "column": 20, "program": "generic_typealias_1.ets" } } @@ -2400,7 +2400,7 @@ }, "end": { "line": 29, - "column": 23, + "column": 22, "program": "generic_typealias_1.ets" } } @@ -2413,7 +2413,7 @@ }, "end": { "line": 29, - "column": 23, + "column": 22, "program": "generic_typealias_1.ets" } } @@ -2440,7 +2440,7 @@ }, "end": { "line": 29, - "column": 25, + "column": 23, "program": "generic_typealias_1.ets" } } @@ -2453,7 +2453,7 @@ }, "end": { "line": 29, - "column": 25, + "column": 23, "program": "generic_typealias_1.ets" } } @@ -2602,7 +2602,7 @@ }, "end": { "line": 30, - "column": 29, + "column": 27, "program": "generic_typealias_1.ets" } } @@ -2615,7 +2615,7 @@ }, "end": { "line": 30, - "column": 29, + "column": 27, "program": "generic_typealias_1.ets" } } @@ -2682,7 +2682,7 @@ }, "end": { "line": 30, - "column": 31, + "column": 29, "program": "generic_typealias_1.ets" } } @@ -2695,7 +2695,7 @@ }, "end": { "line": 30, - "column": 31, + "column": 29, "program": "generic_typealias_1.ets" } } @@ -2844,7 +2844,7 @@ }, "end": { "line": 31, - "column": 32, + "column": 30, "program": "generic_typealias_1.ets" } } @@ -2857,7 +2857,7 @@ }, "end": { "line": 31, - "column": 32, + "column": 30, "program": "generic_typealias_1.ets" } } @@ -2924,7 +2924,7 @@ }, "end": { "line": 31, - "column": 34, + "column": 32, "program": "generic_typealias_1.ets" } } @@ -2937,7 +2937,7 @@ }, "end": { "line": 31, - "column": 34, + "column": 32, "program": "generic_typealias_1.ets" } } @@ -3011,7 +3011,7 @@ }, "end": { "line": 31, - "column": 45, + "column": 44, "program": "generic_typealias_1.ets" } } @@ -3024,7 +3024,7 @@ }, "end": { "line": 31, - "column": 45, + "column": 44, "program": "generic_typealias_1.ets" } } @@ -3051,7 +3051,7 @@ }, "end": { "line": 31, - "column": 46, + "column": 45, "program": "generic_typealias_1.ets" } } @@ -3064,7 +3064,7 @@ }, "end": { "line": 31, - "column": 46, + "column": 45, "program": "generic_typealias_1.ets" } } diff --git a/ets2panda/test/compiler/ets/generic_typealias_6-expected.txt b/ets2panda/test/compiler/ets/generic_typealias_6-expected.txt index 3cb0c9580f0..d33de970894 100644 --- a/ets2panda/test/compiler/ets/generic_typealias_6-expected.txt +++ b/ets2panda/test/compiler/ets/generic_typealias_6-expected.txt @@ -96,7 +96,7 @@ }, "end": { "line": 16, - "column": 33, + "column": 31, "program": "generic_typealias_6.ets" } } @@ -109,7 +109,7 @@ }, "end": { "line": 16, - "column": 33, + "column": 31, "program": "generic_typealias_6.ets" } } @@ -388,7 +388,7 @@ }, "end": { "line": 18, - "column": 22, + "column": 21, "program": "generic_typealias_6.ets" } } @@ -401,7 +401,7 @@ }, "end": { "line": 18, - "column": 22, + "column": 21, "program": "generic_typealias_6.ets" } } @@ -428,7 +428,7 @@ }, "end": { "line": 18, - "column": 23, + "column": 22, "program": "generic_typealias_6.ets" } } @@ -441,7 +441,7 @@ }, "end": { "line": 18, - "column": 23, + "column": 22, "program": "generic_typealias_6.ets" } } @@ -765,7 +765,7 @@ }, "end": { "line": 21, - "column": 18, + "column": 17, "program": "generic_typealias_6.ets" } } @@ -778,7 +778,7 @@ }, "end": { "line": 21, - "column": 18, + "column": 17, "program": "generic_typealias_6.ets" } } @@ -805,7 +805,7 @@ }, "end": { "line": 21, - "column": 19, + "column": 18, "program": "generic_typealias_6.ets" } } @@ -818,7 +818,7 @@ }, "end": { "line": 21, - "column": 19, + "column": 18, "program": "generic_typealias_6.ets" } } 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 b67e9bdf21e..2cb90a6edf7 100644 --- a/ets2panda/test/compiler/ets/generic_typealias_7_neg-expected.txt +++ b/ets2panda/test/compiler/ets/generic_typealias_7_neg-expected.txt @@ -49,7 +49,7 @@ }, "end": { "line": 15, - "column": 20, + "column": 19, "program": "generic_typealias_7_neg.ets" } } @@ -62,7 +62,7 @@ }, "end": { "line": 15, - "column": 20, + "column": 19, "program": "generic_typealias_7_neg.ets" } } @@ -394,7 +394,7 @@ }, "end": { "line": 18, - "column": 25, + "column": 23, "program": "generic_typealias_7_neg.ets" } } @@ -407,7 +407,7 @@ }, "end": { "line": 18, - "column": 25, + "column": 23, "program": "generic_typealias_7_neg.ets" } } diff --git a/ets2panda/test/compiler/ets/generic_typealias_8-expected.txt b/ets2panda/test/compiler/ets/generic_typealias_8-expected.txt index 4f2a59a9b9a..937661efc68 100644 --- a/ets2panda/test/compiler/ets/generic_typealias_8-expected.txt +++ b/ets2panda/test/compiler/ets/generic_typealias_8-expected.txt @@ -49,7 +49,7 @@ }, "end": { "line": 15, - "column": 20, + "column": 19, "program": "generic_typealias_8.ets" } } @@ -62,7 +62,7 @@ }, "end": { "line": 15, - "column": 20, + "column": 19, "program": "generic_typealias_8.ets" } } @@ -544,7 +544,7 @@ }, "end": { "line": 19, - "column": 24, + "column": 22, "program": "generic_typealias_8.ets" } } @@ -557,7 +557,7 @@ }, "end": { "line": 19, - "column": 24, + "column": 22, "program": "generic_typealias_8.ets" } } @@ -591,7 +591,7 @@ }, "end": { "line": 19, - "column": 27, + "column": 26, "program": "generic_typealias_8.ets" } } @@ -604,7 +604,7 @@ }, "end": { "line": 19, - "column": 27, + "column": 26, "program": "generic_typealias_8.ets" } } @@ -618,7 +618,7 @@ }, "end": { "line": 19, - "column": 27, + "column": 26, "program": "generic_typealias_8.ets" } } @@ -645,7 +645,7 @@ }, "end": { "line": 19, - "column": 29, + "column": 27, "program": "generic_typealias_8.ets" } } @@ -658,7 +658,7 @@ }, "end": { "line": 19, - "column": 29, + "column": 27, "program": "generic_typealias_8.ets" } } @@ -708,7 +708,7 @@ }, "end": { "line": 19, - "column": 36, + "column": 35, "program": "generic_typealias_8.ets" } } @@ -721,7 +721,7 @@ }, "end": { "line": 19, - "column": 36, + "column": 35, "program": "generic_typealias_8.ets" } } diff --git a/ets2panda/test/compiler/ets/generic_typealias_9-expected.txt b/ets2panda/test/compiler/ets/generic_typealias_9-expected.txt index 4192403c560..ae00179942f 100644 --- a/ets2panda/test/compiler/ets/generic_typealias_9-expected.txt +++ b/ets2panda/test/compiler/ets/generic_typealias_9-expected.txt @@ -99,8 +99,8 @@ "program": "generic_typealias_9.ets" }, "end": { - "line": 17, - "column": 9, + "line": 15, + "column": 53, "program": "generic_typealias_9.ets" } } @@ -112,8 +112,8 @@ "program": "generic_typealias_9.ets" }, "end": { - "line": 17, - "column": 9, + "line": 15, + "column": 53, "program": "generic_typealias_9.ets" } } @@ -125,8 +125,8 @@ "program": "generic_typealias_9.ets" }, "end": { - "line": 17, - "column": 9, + "line": 15, + "column": 53, "program": "generic_typealias_9.ets" } } @@ -450,7 +450,7 @@ }, "end": { "line": 18, - "column": 31, + "column": 30, "program": "generic_typealias_9.ets" } } @@ -463,7 +463,7 @@ }, "end": { "line": 18, - "column": 31, + "column": 30, "program": "generic_typealias_9.ets" } } @@ -490,7 +490,7 @@ }, "end": { "line": 18, - "column": 33, + "column": 31, "program": "generic_typealias_9.ets" } } @@ -503,7 +503,7 @@ }, "end": { "line": 18, - "column": 33, + "column": 31, "program": "generic_typealias_9.ets" } } @@ -608,7 +608,7 @@ }, "end": { "line": 18, - "column": 54, + "column": 51, "program": "generic_typealias_9.ets" } } @@ -621,7 +621,7 @@ }, "end": { "line": 18, - "column": 54, + "column": 51, "program": "generic_typealias_9.ets" } } diff --git a/ets2panda/test/compiler/ets/generic_variance_1-expected.txt b/ets2panda/test/compiler/ets/generic_variance_1-expected.txt index 4e142e0137e..8c085de7378 100644 --- a/ets2panda/test/compiler/ets/generic_variance_1-expected.txt +++ b/ets2panda/test/compiler/ets/generic_variance_1-expected.txt @@ -205,7 +205,7 @@ }, "end": { "line": 17, - "column": 20, + "column": 18, "program": "generic_variance_1.ets" } } @@ -218,7 +218,7 @@ }, "end": { "line": 17, - "column": 20, + "column": 18, "program": "generic_variance_1.ets" } } @@ -1024,7 +1024,7 @@ }, "end": { "line": 23, - "column": 18, + "column": 17, "program": "generic_variance_1.ets" } } @@ -1037,7 +1037,7 @@ }, "end": { "line": 23, - "column": 18, + "column": 17, "program": "generic_variance_1.ets" } } @@ -1064,7 +1064,7 @@ }, "end": { "line": 23, - "column": 20, + "column": 18, "program": "generic_variance_1.ets" } } @@ -1077,7 +1077,7 @@ }, "end": { "line": 23, - "column": 20, + "column": 18, "program": "generic_variance_1.ets" } } @@ -1151,7 +1151,7 @@ }, "end": { "line": 23, - "column": 30, + "column": 29, "program": "generic_variance_1.ets" } } @@ -1164,7 +1164,7 @@ }, "end": { "line": 23, - "column": 30, + "column": 29, "program": "generic_variance_1.ets" } } @@ -1191,7 +1191,7 @@ }, "end": { "line": 23, - "column": 31, + "column": 30, "program": "generic_variance_1.ets" } } @@ -1204,7 +1204,7 @@ }, "end": { "line": 23, - "column": 31, + "column": 30, "program": "generic_variance_1.ets" } } @@ -1312,7 +1312,7 @@ }, "end": { "line": 24, - "column": 18, + "column": 17, "program": "generic_variance_1.ets" } } @@ -1325,7 +1325,7 @@ }, "end": { "line": 24, - "column": 18, + "column": 17, "program": "generic_variance_1.ets" } } @@ -1352,7 +1352,7 @@ }, "end": { "line": 24, - "column": 20, + "column": 18, "program": "generic_variance_1.ets" } } @@ -1365,7 +1365,7 @@ }, "end": { "line": 24, - "column": 20, + "column": 18, "program": "generic_variance_1.ets" } } @@ -1439,7 +1439,7 @@ }, "end": { "line": 24, - "column": 30, + "column": 29, "program": "generic_variance_1.ets" } } @@ -1452,7 +1452,7 @@ }, "end": { "line": 24, - "column": 30, + "column": 29, "program": "generic_variance_1.ets" } } @@ -1479,7 +1479,7 @@ }, "end": { "line": 24, - "column": 31, + "column": 30, "program": "generic_variance_1.ets" } } @@ -1492,7 +1492,7 @@ }, "end": { "line": 24, - "column": 31, + "column": 30, "program": "generic_variance_1.ets" } } @@ -1600,7 +1600,7 @@ }, "end": { "line": 26, - "column": 18, + "column": 17, "program": "generic_variance_1.ets" } } @@ -1613,7 +1613,7 @@ }, "end": { "line": 26, - "column": 18, + "column": 17, "program": "generic_variance_1.ets" } } @@ -1640,7 +1640,7 @@ }, "end": { "line": 26, - "column": 20, + "column": 18, "program": "generic_variance_1.ets" } } @@ -1653,7 +1653,7 @@ }, "end": { "line": 26, - "column": 20, + "column": 18, "program": "generic_variance_1.ets" } } @@ -1727,7 +1727,7 @@ }, "end": { "line": 26, - "column": 30, + "column": 29, "program": "generic_variance_1.ets" } } @@ -1740,7 +1740,7 @@ }, "end": { "line": 26, - "column": 30, + "column": 29, "program": "generic_variance_1.ets" } } @@ -1767,7 +1767,7 @@ }, "end": { "line": 26, - "column": 31, + "column": 30, "program": "generic_variance_1.ets" } } @@ -1780,7 +1780,7 @@ }, "end": { "line": 26, - "column": 31, + "column": 30, "program": "generic_variance_1.ets" } } @@ -1888,7 +1888,7 @@ }, "end": { "line": 27, - "column": 18, + "column": 17, "program": "generic_variance_1.ets" } } @@ -1901,7 +1901,7 @@ }, "end": { "line": 27, - "column": 18, + "column": 17, "program": "generic_variance_1.ets" } } @@ -1928,7 +1928,7 @@ }, "end": { "line": 27, - "column": 20, + "column": 18, "program": "generic_variance_1.ets" } } @@ -1941,7 +1941,7 @@ }, "end": { "line": 27, - "column": 20, + "column": 18, "program": "generic_variance_1.ets" } } @@ -2015,7 +2015,7 @@ }, "end": { "line": 27, - "column": 30, + "column": 29, "program": "generic_variance_1.ets" } } @@ -2028,7 +2028,7 @@ }, "end": { "line": 27, - "column": 30, + "column": 29, "program": "generic_variance_1.ets" } } @@ -2055,7 +2055,7 @@ }, "end": { "line": 27, - "column": 31, + "column": 30, "program": "generic_variance_1.ets" } } @@ -2068,7 +2068,7 @@ }, "end": { "line": 27, - "column": 31, + "column": 30, "program": "generic_variance_1.ets" } } 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 146ad7ffb81..5297b107993 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 @@ -96,7 +96,7 @@ }, "end": { "line": 16, - "column": 36, + "column": 35, "program": "generics_class_recursive_type_1.ets" } } @@ -109,7 +109,7 @@ }, "end": { "line": 16, - "column": 36, + "column": 35, "program": "generics_class_recursive_type_1.ets" } } @@ -136,7 +136,7 @@ }, "end": { "line": 16, - "column": 37, + "column": 36, "program": "generics_class_recursive_type_1.ets" } } @@ -149,7 +149,7 @@ }, "end": { "line": 16, - "column": 37, + "column": 36, "program": "generics_class_recursive_type_1.ets" } } @@ -294,7 +294,7 @@ }, "end": { "line": 17, - "column": 19, + "column": 18, "program": "generics_class_recursive_type_1.ets" } } @@ -307,7 +307,7 @@ }, "end": { "line": 17, - "column": 19, + "column": 18, "program": "generics_class_recursive_type_1.ets" } } @@ -341,7 +341,7 @@ }, "end": { "line": 17, - "column": 22, + "column": 21, "program": "generics_class_recursive_type_1.ets" } } @@ -354,7 +354,7 @@ }, "end": { "line": 17, - "column": 22, + "column": 21, "program": "generics_class_recursive_type_1.ets" } } @@ -381,7 +381,7 @@ }, "end": { "line": 17, - "column": 23, + "column": 22, "program": "generics_class_recursive_type_1.ets" } } @@ -394,7 +394,7 @@ }, "end": { "line": 17, - "column": 23, + "column": 22, "program": "generics_class_recursive_type_1.ets" } } @@ -409,7 +409,7 @@ }, "end": { "line": 17, - "column": 23, + "column": 22, "program": "generics_class_recursive_type_1.ets" } } @@ -468,7 +468,7 @@ }, "end": { "line": 18, - "column": 12, + "column": 11, "program": "generics_class_recursive_type_1.ets" } } @@ -481,7 +481,7 @@ }, "end": { "line": 18, - "column": 12, + "column": 11, "program": "generics_class_recursive_type_1.ets" } } @@ -496,7 +496,7 @@ }, "end": { "line": 18, - "column": 12, + "column": 11, "program": "generics_class_recursive_type_1.ets" } } @@ -555,7 +555,7 @@ }, "end": { "line": 19, - "column": 14, + "column": 13, "program": "generics_class_recursive_type_1.ets" } } @@ -568,7 +568,7 @@ }, "end": { "line": 19, - "column": 14, + "column": 13, "program": "generics_class_recursive_type_1.ets" } } @@ -583,7 +583,7 @@ }, "end": { "line": 19, - "column": 14, + "column": 13, "program": "generics_class_recursive_type_1.ets" } } @@ -721,7 +721,7 @@ }, "end": { "line": 21, - "column": 20, + "column": 19, "program": "generics_class_recursive_type_1.ets" } } @@ -734,7 +734,7 @@ }, "end": { "line": 21, - "column": 20, + "column": 19, "program": "generics_class_recursive_type_1.ets" } } @@ -768,7 +768,7 @@ }, "end": { "line": 21, - "column": 23, + "column": 22, "program": "generics_class_recursive_type_1.ets" } } @@ -781,7 +781,7 @@ }, "end": { "line": 21, - "column": 23, + "column": 22, "program": "generics_class_recursive_type_1.ets" } } @@ -808,7 +808,7 @@ }, "end": { "line": 21, - "column": 24, + "column": 23, "program": "generics_class_recursive_type_1.ets" } } @@ -821,7 +821,7 @@ }, "end": { "line": 21, - "column": 24, + "column": 23, "program": "generics_class_recursive_type_1.ets" } } @@ -836,7 +836,7 @@ }, "end": { "line": 21, - "column": 24, + "column": 23, "program": "generics_class_recursive_type_1.ets" } } @@ -948,7 +948,7 @@ }, "end": { "line": 23, - "column": 23, + "column": 22, "program": "generics_class_recursive_type_1.ets" } } @@ -961,7 +961,7 @@ }, "end": { "line": 23, - "column": 23, + "column": 22, "program": "generics_class_recursive_type_1.ets" } } @@ -995,7 +995,7 @@ }, "end": { "line": 23, - "column": 26, + "column": 25, "program": "generics_class_recursive_type_1.ets" } } @@ -1008,7 +1008,7 @@ }, "end": { "line": 23, - "column": 26, + "column": 25, "program": "generics_class_recursive_type_1.ets" } } @@ -1035,7 +1035,7 @@ }, "end": { "line": 23, - "column": 27, + "column": 26, "program": "generics_class_recursive_type_1.ets" } } @@ -1048,7 +1048,7 @@ }, "end": { "line": 23, - "column": 27, + "column": 26, "program": "generics_class_recursive_type_1.ets" } } @@ -1062,7 +1062,7 @@ }, "end": { "line": 23, - "column": 27, + "column": 26, "program": "generics_class_recursive_type_1.ets" } } @@ -1075,7 +1075,7 @@ }, "end": { "line": 23, - "column": 27, + "column": 26, "program": "generics_class_recursive_type_1.ets" } } @@ -1114,7 +1114,7 @@ }, "end": { "line": 24, - "column": 16, + "column": 15, "program": "generics_class_recursive_type_1.ets" } } @@ -1127,7 +1127,7 @@ }, "end": { "line": 24, - "column": 16, + "column": 15, "program": "generics_class_recursive_type_1.ets" } } @@ -1141,7 +1141,7 @@ }, "end": { "line": 24, - "column": 16, + "column": 15, "program": "generics_class_recursive_type_1.ets" } } @@ -1154,7 +1154,7 @@ }, "end": { "line": 24, - "column": 16, + "column": 15, "program": "generics_class_recursive_type_1.ets" } } @@ -1193,7 +1193,7 @@ }, "end": { "line": 25, - "column": 18, + "column": 17, "program": "generics_class_recursive_type_1.ets" } } @@ -1206,7 +1206,7 @@ }, "end": { "line": 25, - "column": 18, + "column": 17, "program": "generics_class_recursive_type_1.ets" } } @@ -1220,7 +1220,7 @@ }, "end": { "line": 25, - "column": 18, + "column": 17, "program": "generics_class_recursive_type_1.ets" } } @@ -1233,7 +1233,7 @@ }, "end": { "line": 25, - "column": 18, + "column": 17, "program": "generics_class_recursive_type_1.ets" } } @@ -1343,7 +1343,7 @@ }, "end": { "line": 27, - "column": 24, + "column": 23, "program": "generics_class_recursive_type_1.ets" } } @@ -1356,7 +1356,7 @@ }, "end": { "line": 27, - "column": 24, + "column": 23, "program": "generics_class_recursive_type_1.ets" } } @@ -1390,7 +1390,7 @@ }, "end": { "line": 27, - "column": 27, + "column": 26, "program": "generics_class_recursive_type_1.ets" } } @@ -1403,7 +1403,7 @@ }, "end": { "line": 27, - "column": 27, + "column": 26, "program": "generics_class_recursive_type_1.ets" } } @@ -1429,8 +1429,8 @@ "program": "generics_class_recursive_type_1.ets" }, "end": { - "line": 28, - "column": 10, + "line": 27, + "column": 27, "program": "generics_class_recursive_type_1.ets" } } @@ -1442,8 +1442,8 @@ "program": "generics_class_recursive_type_1.ets" }, "end": { - "line": 28, - "column": 10, + "line": 27, + "column": 27, "program": "generics_class_recursive_type_1.ets" } } @@ -1456,8 +1456,8 @@ "program": "generics_class_recursive_type_1.ets" }, "end": { - "line": 28, - "column": 10, + "line": 27, + "column": 27, "program": "generics_class_recursive_type_1.ets" } } @@ -1469,8 +1469,8 @@ "program": "generics_class_recursive_type_1.ets" }, "end": { - "line": 28, - "column": 10, + "line": 27, + "column": 27, "program": "generics_class_recursive_type_1.ets" } } @@ -2134,7 +2134,7 @@ }, "end": { "line": 39, - "column": 20, + "column": 19, "program": "generics_class_recursive_type_1.ets" } } @@ -2147,7 +2147,7 @@ }, "end": { "line": 39, - "column": 20, + "column": 19, "program": "generics_class_recursive_type_1.ets" } } @@ -2161,7 +2161,7 @@ }, "end": { "line": 39, - "column": 20, + "column": 19, "program": "generics_class_recursive_type_1.ets" } } @@ -2174,7 +2174,7 @@ }, "end": { "line": 39, - "column": 20, + "column": 19, "program": "generics_class_recursive_type_1.ets" } } @@ -2314,7 +2314,7 @@ }, "end": { "line": 40, - "column": 19, + "column": 18, "program": "generics_class_recursive_type_1.ets" } } @@ -2327,7 +2327,7 @@ }, "end": { "line": 40, - "column": 19, + "column": 18, "program": "generics_class_recursive_type_1.ets" } } @@ -2340,7 +2340,7 @@ }, "end": { "line": 40, - "column": 19, + "column": 18, "program": "generics_class_recursive_type_1.ets" } } @@ -2353,7 +2353,7 @@ }, "end": { "line": 40, - "column": 19, + "column": 18, "program": "generics_class_recursive_type_1.ets" } } @@ -2456,7 +2456,7 @@ }, "end": { "line": 41, - "column": 19, + "column": 18, "program": "generics_class_recursive_type_1.ets" } } @@ -2469,7 +2469,7 @@ }, "end": { "line": 41, - "column": 19, + "column": 18, "program": "generics_class_recursive_type_1.ets" } } @@ -2483,7 +2483,7 @@ }, "end": { "line": 41, - "column": 19, + "column": 18, "program": "generics_class_recursive_type_1.ets" } } @@ -2496,7 +2496,7 @@ }, "end": { "line": 41, - "column": 19, + "column": 18, "program": "generics_class_recursive_type_1.ets" } } @@ -2636,7 +2636,7 @@ }, "end": { "line": 42, - "column": 18, + "column": 17, "program": "generics_class_recursive_type_1.ets" } } @@ -2649,7 +2649,7 @@ }, "end": { "line": 42, - "column": 18, + "column": 17, "program": "generics_class_recursive_type_1.ets" } } @@ -2662,7 +2662,7 @@ }, "end": { "line": 42, - "column": 18, + "column": 17, "program": "generics_class_recursive_type_1.ets" } } @@ -2675,7 +2675,7 @@ }, "end": { "line": 42, - "column": 18, + "column": 17, "program": "generics_class_recursive_type_1.ets" } } @@ -2926,7 +2926,7 @@ }, "end": { "line": 44, - "column": 23, + "column": 22, "program": "generics_class_recursive_type_1.ets" } } @@ -2939,7 +2939,7 @@ }, "end": { "line": 44, - "column": 23, + "column": 22, "program": "generics_class_recursive_type_1.ets" } } @@ -2952,7 +2952,7 @@ }, "end": { "line": 44, - "column": 23, + "column": 22, "program": "generics_class_recursive_type_1.ets" } } @@ -2965,7 +2965,7 @@ }, "end": { "line": 44, - "column": 23, + "column": 22, "program": "generics_class_recursive_type_1.ets" } } @@ -3068,7 +3068,7 @@ }, "end": { "line": 45, - "column": 14, + "column": 13, "program": "generics_class_recursive_type_1.ets" } } @@ -3081,7 +3081,7 @@ }, "end": { "line": 45, - "column": 14, + "column": 13, "program": "generics_class_recursive_type_1.ets" } } @@ -3095,7 +3095,7 @@ }, "end": { "line": 45, - "column": 14, + "column": 13, "program": "generics_class_recursive_type_1.ets" } } @@ -3108,7 +3108,7 @@ }, "end": { "line": 45, - "column": 14, + "column": 13, "program": "generics_class_recursive_type_1.ets" } } @@ -3261,7 +3261,7 @@ }, "end": { "line": 46, - "column": 23, + "column": 22, "program": "generics_class_recursive_type_1.ets" } } @@ -3274,7 +3274,7 @@ }, "end": { "line": 46, - "column": 23, + "column": 22, "program": "generics_class_recursive_type_1.ets" } } @@ -3288,7 +3288,7 @@ }, "end": { "line": 46, - "column": 23, + "column": 22, "program": "generics_class_recursive_type_1.ets" } } @@ -3301,7 +3301,7 @@ }, "end": { "line": 46, - "column": 23, + "column": 22, "program": "generics_class_recursive_type_1.ets" } } @@ -3336,7 +3336,7 @@ }, "end": { "line": 46, - "column": 29, + "column": 28, "program": "generics_class_recursive_type_1.ets" } } @@ -3349,7 +3349,7 @@ }, "end": { "line": 46, - "column": 29, + "column": 28, "program": "generics_class_recursive_type_1.ets" } } @@ -3362,7 +3362,7 @@ }, "end": { "line": 46, - "column": 29, + "column": 28, "program": "generics_class_recursive_type_1.ets" } } @@ -3376,7 +3376,7 @@ }, "end": { "line": 46, - "column": 29, + "column": 28, "program": "generics_class_recursive_type_1.ets" } } @@ -3389,7 +3389,7 @@ }, "end": { "line": 46, - "column": 29, + "column": 28, "program": "generics_class_recursive_type_1.ets" } } @@ -3448,7 +3448,7 @@ }, "end": { "line": 46, - "column": 39, + "column": 38, "program": "generics_class_recursive_type_1.ets" } } @@ -3461,7 +3461,7 @@ }, "end": { "line": 46, - "column": 39, + "column": 38, "program": "generics_class_recursive_type_1.ets" } } @@ -3488,7 +3488,7 @@ }, "end": { "line": 46, - "column": 40, + "column": 39, "program": "generics_class_recursive_type_1.ets" } } @@ -3501,7 +3501,7 @@ }, "end": { "line": 46, - "column": 40, + "column": 39, "program": "generics_class_recursive_type_1.ets" } } @@ -3514,7 +3514,7 @@ }, "end": { "line": 46, - "column": 40, + "column": 39, "program": "generics_class_recursive_type_1.ets" } } @@ -3527,7 +3527,7 @@ }, "end": { "line": 46, - "column": 40, + "column": 39, "program": "generics_class_recursive_type_1.ets" } } @@ -3638,7 +3638,7 @@ }, "end": { "line": 47, - "column": 43, + "column": 42, "program": "generics_class_recursive_type_1.ets" } } @@ -3651,7 +3651,7 @@ }, "end": { "line": 47, - "column": 43, + "column": 42, "program": "generics_class_recursive_type_1.ets" } } @@ -3665,7 +3665,7 @@ }, "end": { "line": 47, - "column": 43, + "column": 42, "program": "generics_class_recursive_type_1.ets" } } @@ -3678,7 +3678,7 @@ }, "end": { "line": 47, - "column": 43, + "column": 42, "program": "generics_class_recursive_type_1.ets" } } @@ -3713,7 +3713,7 @@ }, "end": { "line": 47, - "column": 49, + "column": 48, "program": "generics_class_recursive_type_1.ets" } } @@ -3726,7 +3726,7 @@ }, "end": { "line": 47, - "column": 49, + "column": 48, "program": "generics_class_recursive_type_1.ets" } } @@ -3739,7 +3739,7 @@ }, "end": { "line": 47, - "column": 49, + "column": 48, "program": "generics_class_recursive_type_1.ets" } } @@ -3753,7 +3753,7 @@ }, "end": { "line": 47, - "column": 49, + "column": 48, "program": "generics_class_recursive_type_1.ets" } } @@ -3766,7 +3766,7 @@ }, "end": { "line": 47, - "column": 49, + "column": 48, "program": "generics_class_recursive_type_1.ets" } } @@ -3801,7 +3801,7 @@ }, "end": { "line": 47, - "column": 54, + "column": 53, "program": "generics_class_recursive_type_1.ets" } } @@ -3814,7 +3814,7 @@ }, "end": { "line": 47, - "column": 54, + "column": 53, "program": "generics_class_recursive_type_1.ets" } } @@ -3926,7 +3926,7 @@ }, "end": { "line": 47, - "column": 32, + "column": 30, "program": "generics_class_recursive_type_1.ets" } } @@ -3939,7 +3939,7 @@ }, "end": { "line": 47, - "column": 32, + "column": 30, "program": "generics_class_recursive_type_1.ets" } } @@ -4019,7 +4019,7 @@ }, "end": { "line": 47, - "column": 54, + "column": 53, "program": "generics_class_recursive_type_1.ets" } } @@ -4032,7 +4032,7 @@ }, "end": { "line": 47, - "column": 54, + "column": 53, "program": "generics_class_recursive_type_1.ets" } } @@ -4143,7 +4143,7 @@ }, "end": { "line": 48, - "column": 27, + "column": 26, "program": "generics_class_recursive_type_1.ets" } } @@ -4156,7 +4156,7 @@ }, "end": { "line": 48, - "column": 27, + "column": 26, "program": "generics_class_recursive_type_1.ets" } } @@ -4170,7 +4170,7 @@ }, "end": { "line": 48, - "column": 27, + "column": 26, "program": "generics_class_recursive_type_1.ets" } } @@ -4183,7 +4183,7 @@ }, "end": { "line": 48, - "column": 27, + "column": 26, "program": "generics_class_recursive_type_1.ets" } } @@ -4222,7 +4222,7 @@ }, "end": { "line": 48, - "column": 35, + "column": 34, "program": "generics_class_recursive_type_1.ets" } } @@ -4235,7 +4235,7 @@ }, "end": { "line": 48, - "column": 35, + "column": 34, "program": "generics_class_recursive_type_1.ets" } } @@ -4249,7 +4249,7 @@ }, "end": { "line": 48, - "column": 35, + "column": 34, "program": "generics_class_recursive_type_1.ets" } } @@ -4262,7 +4262,7 @@ }, "end": { "line": 48, - "column": 35, + "column": 34, "program": "generics_class_recursive_type_1.ets" } } @@ -4297,7 +4297,7 @@ }, "end": { "line": 48, - "column": 41, + "column": 40, "program": "generics_class_recursive_type_1.ets" } } @@ -4310,7 +4310,7 @@ }, "end": { "line": 48, - "column": 41, + "column": 40, "program": "generics_class_recursive_type_1.ets" } } @@ -4323,7 +4323,7 @@ }, "end": { "line": 48, - "column": 41, + "column": 40, "program": "generics_class_recursive_type_1.ets" } } @@ -4337,7 +4337,7 @@ }, "end": { "line": 48, - "column": 41, + "column": 40, "program": "generics_class_recursive_type_1.ets" } } @@ -4350,7 +4350,7 @@ }, "end": { "line": 48, - "column": 41, + "column": 40, "program": "generics_class_recursive_type_1.ets" } } @@ -4385,7 +4385,7 @@ }, "end": { "line": 48, - "column": 45, + "column": 44, "program": "generics_class_recursive_type_1.ets" } } @@ -4398,7 +4398,7 @@ }, "end": { "line": 48, - "column": 45, + "column": 44, "program": "generics_class_recursive_type_1.ets" } } @@ -4411,7 +4411,7 @@ }, "end": { "line": 48, - "column": 45, + "column": 44, "program": "generics_class_recursive_type_1.ets" } } @@ -4424,7 +4424,7 @@ }, "end": { "line": 48, - "column": 45, + "column": 44, "program": "generics_class_recursive_type_1.ets" } } @@ -4535,7 +4535,7 @@ }, "end": { "line": 49, - "column": 34, + "column": 33, "program": "generics_class_recursive_type_1.ets" } } @@ -4548,7 +4548,7 @@ }, "end": { "line": 49, - "column": 34, + "column": 33, "program": "generics_class_recursive_type_1.ets" } } @@ -4562,7 +4562,7 @@ }, "end": { "line": 49, - "column": 34, + "column": 33, "program": "generics_class_recursive_type_1.ets" } } @@ -4575,7 +4575,7 @@ }, "end": { "line": 49, - "column": 34, + "column": 33, "program": "generics_class_recursive_type_1.ets" } } @@ -4614,7 +4614,7 @@ }, "end": { "line": 49, - "column": 42, + "column": 41, "program": "generics_class_recursive_type_1.ets" } } @@ -4627,7 +4627,7 @@ }, "end": { "line": 49, - "column": 42, + "column": 41, "program": "generics_class_recursive_type_1.ets" } } @@ -4641,7 +4641,7 @@ }, "end": { "line": 49, - "column": 42, + "column": 41, "program": "generics_class_recursive_type_1.ets" } } @@ -4654,7 +4654,7 @@ }, "end": { "line": 49, - "column": 42, + "column": 41, "program": "generics_class_recursive_type_1.ets" } } @@ -4689,7 +4689,7 @@ }, "end": { "line": 49, - "column": 47, + "column": 46, "program": "generics_class_recursive_type_1.ets" } } @@ -4702,7 +4702,7 @@ }, "end": { "line": 49, - "column": 47, + "column": 46, "program": "generics_class_recursive_type_1.ets" } } @@ -4715,7 +4715,7 @@ }, "end": { "line": 49, - "column": 47, + "column": 46, "program": "generics_class_recursive_type_1.ets" } } @@ -4729,7 +4729,7 @@ }, "end": { "line": 49, - "column": 47, + "column": 46, "program": "generics_class_recursive_type_1.ets" } } @@ -4742,7 +4742,7 @@ }, "end": { "line": 49, - "column": 47, + "column": 46, "program": "generics_class_recursive_type_1.ets" } } @@ -4781,7 +4781,7 @@ }, "end": { "line": 49, - "column": 59, + "column": 58, "program": "generics_class_recursive_type_1.ets" } } @@ -4794,7 +4794,7 @@ }, "end": { "line": 49, - "column": 59, + "column": 58, "program": "generics_class_recursive_type_1.ets" } } @@ -4808,7 +4808,7 @@ }, "end": { "line": 49, - "column": 59, + "column": 58, "program": "generics_class_recursive_type_1.ets" } } @@ -4821,7 +4821,7 @@ }, "end": { "line": 49, - "column": 59, + "column": 58, "program": "generics_class_recursive_type_1.ets" } } @@ -4856,7 +4856,7 @@ }, "end": { "line": 49, - "column": 63, + "column": 62, "program": "generics_class_recursive_type_1.ets" } } @@ -4869,7 +4869,7 @@ }, "end": { "line": 49, - "column": 63, + "column": 62, "program": "generics_class_recursive_type_1.ets" } } @@ -4931,7 +4931,7 @@ }, "end": { "line": 49, - "column": 63, + "column": 62, "program": "generics_class_recursive_type_1.ets" } } @@ -4944,7 +4944,7 @@ }, "end": { "line": 49, - "column": 63, + "column": 62, "program": "generics_class_recursive_type_1.ets" } } @@ -5055,7 +5055,7 @@ }, "end": { "line": 50, - "column": 30, + "column": 29, "program": "generics_class_recursive_type_1.ets" } } @@ -5068,7 +5068,7 @@ }, "end": { "line": 50, - "column": 30, + "column": 29, "program": "generics_class_recursive_type_1.ets" } } @@ -5082,7 +5082,7 @@ }, "end": { "line": 50, - "column": 30, + "column": 29, "program": "generics_class_recursive_type_1.ets" } } @@ -5095,7 +5095,7 @@ }, "end": { "line": 50, - "column": 30, + "column": 29, "program": "generics_class_recursive_type_1.ets" } } @@ -5210,7 +5210,7 @@ }, "end": { "line": 50, - "column": 51, + "column": 50, "program": "generics_class_recursive_type_1.ets" } } @@ -5223,7 +5223,7 @@ }, "end": { "line": 50, - "column": 51, + "column": 50, "program": "generics_class_recursive_type_1.ets" } } @@ -5250,7 +5250,7 @@ }, "end": { "line": 50, - "column": 52, + "column": 51, "program": "generics_class_recursive_type_1.ets" } } @@ -5263,7 +5263,7 @@ }, "end": { "line": 50, - "column": 52, + "column": 51, "program": "generics_class_recursive_type_1.ets" } } @@ -5276,7 +5276,7 @@ }, "end": { "line": 50, - "column": 52, + "column": 51, "program": "generics_class_recursive_type_1.ets" } } @@ -5289,7 +5289,7 @@ }, "end": { "line": 50, - "column": 52, + "column": 51, "program": "generics_class_recursive_type_1.ets" } } @@ -5400,7 +5400,7 @@ }, "end": { "line": 51, - "column": 30, + "column": 29, "program": "generics_class_recursive_type_1.ets" } } @@ -5413,7 +5413,7 @@ }, "end": { "line": 51, - "column": 30, + "column": 29, "program": "generics_class_recursive_type_1.ets" } } @@ -5427,7 +5427,7 @@ }, "end": { "line": 51, - "column": 30, + "column": 29, "program": "generics_class_recursive_type_1.ets" } } @@ -5440,7 +5440,7 @@ }, "end": { "line": 51, - "column": 30, + "column": 29, "program": "generics_class_recursive_type_1.ets" } } @@ -5479,7 +5479,7 @@ }, "end": { "line": 51, - "column": 38, + "column": 37, "program": "generics_class_recursive_type_1.ets" } } @@ -5492,7 +5492,7 @@ }, "end": { "line": 51, - "column": 38, + "column": 37, "program": "generics_class_recursive_type_1.ets" } } @@ -5506,7 +5506,7 @@ }, "end": { "line": 51, - "column": 38, + "column": 37, "program": "generics_class_recursive_type_1.ets" } } @@ -5519,7 +5519,7 @@ }, "end": { "line": 51, - "column": 38, + "column": 37, "program": "generics_class_recursive_type_1.ets" } } @@ -5634,7 +5634,7 @@ }, "end": { "line": 51, - "column": 59, + "column": 58, "program": "generics_class_recursive_type_1.ets" } } @@ -5647,7 +5647,7 @@ }, "end": { "line": 51, - "column": 59, + "column": 58, "program": "generics_class_recursive_type_1.ets" } } @@ -5674,7 +5674,7 @@ }, "end": { "line": 51, - "column": 60, + "column": 59, "program": "generics_class_recursive_type_1.ets" } } @@ -5687,7 +5687,7 @@ }, "end": { "line": 51, - "column": 60, + "column": 59, "program": "generics_class_recursive_type_1.ets" } } @@ -5700,7 +5700,7 @@ }, "end": { "line": 51, - "column": 60, + "column": 59, "program": "generics_class_recursive_type_1.ets" } } @@ -5713,7 +5713,7 @@ }, "end": { "line": 51, - "column": 60, + "column": 59, "program": "generics_class_recursive_type_1.ets" } } @@ -5821,8 +5821,8 @@ "program": "generics_class_recursive_type_1.ets" }, "end": { - "line": 54, - "column": 6, + "line": 52, + "column": 2, "program": "generics_class_recursive_type_1.ets" } } @@ -5977,7 +5977,7 @@ }, "end": { "line": 55, - "column": 12, + "column": 11, "program": "generics_class_recursive_type_1.ets" } } @@ -5990,7 +5990,7 @@ }, "end": { "line": 55, - "column": 12, + "column": 11, "program": "generics_class_recursive_type_1.ets" } } @@ -6017,7 +6017,7 @@ }, "end": { "line": 55, - "column": 13, + "column": 12, "program": "generics_class_recursive_type_1.ets" } } @@ -6030,7 +6030,7 @@ }, "end": { "line": 55, - "column": 13, + "column": 12, "program": "generics_class_recursive_type_1.ets" } } @@ -6045,7 +6045,7 @@ }, "end": { "line": 55, - "column": 13, + "column": 12, "program": "generics_class_recursive_type_1.ets" } } @@ -6157,7 +6157,7 @@ }, "end": { "line": 56, - "column": 24, + "column": 23, "program": "generics_class_recursive_type_1.ets" } } @@ -6170,7 +6170,7 @@ }, "end": { "line": 56, - "column": 24, + "column": 23, "program": "generics_class_recursive_type_1.ets" } } @@ -6197,7 +6197,7 @@ }, "end": { "line": 56, - "column": 25, + "column": 24, "program": "generics_class_recursive_type_1.ets" } } @@ -6210,7 +6210,7 @@ }, "end": { "line": 56, - "column": 25, + "column": 24, "program": "generics_class_recursive_type_1.ets" } } @@ -6224,7 +6224,7 @@ }, "end": { "line": 56, - "column": 25, + "column": 24, "program": "generics_class_recursive_type_1.ets" } } @@ -6237,7 +6237,7 @@ }, "end": { "line": 56, - "column": 25, + "column": 24, "program": "generics_class_recursive_type_1.ets" } } @@ -6520,7 +6520,7 @@ }, "end": { "line": 61, - "column": 32, + "column": 31, "program": "generics_class_recursive_type_1.ets" } } @@ -6533,7 +6533,7 @@ }, "end": { "line": 61, - "column": 32, + "column": 31, "program": "generics_class_recursive_type_1.ets" } } @@ -6560,7 +6560,7 @@ }, "end": { "line": 61, - "column": 33, + "column": 32, "program": "generics_class_recursive_type_1.ets" } } @@ -6573,7 +6573,7 @@ }, "end": { "line": 61, - "column": 33, + "column": 32, "program": "generics_class_recursive_type_1.ets" } } @@ -6718,7 +6718,7 @@ }, "end": { "line": 62, - "column": 16, + "column": 15, "program": "generics_class_recursive_type_1.ets" } } @@ -6731,7 +6731,7 @@ }, "end": { "line": 62, - "column": 16, + "column": 15, "program": "generics_class_recursive_type_1.ets" } } @@ -6765,7 +6765,7 @@ }, "end": { "line": 62, - "column": 19, + "column": 18, "program": "generics_class_recursive_type_1.ets" } } @@ -6778,7 +6778,7 @@ }, "end": { "line": 62, - "column": 19, + "column": 18, "program": "generics_class_recursive_type_1.ets" } } @@ -6805,7 +6805,7 @@ }, "end": { "line": 62, - "column": 20, + "column": 19, "program": "generics_class_recursive_type_1.ets" } } @@ -6818,7 +6818,7 @@ }, "end": { "line": 62, - "column": 20, + "column": 19, "program": "generics_class_recursive_type_1.ets" } } @@ -6833,7 +6833,7 @@ }, "end": { "line": 62, - "column": 20, + "column": 19, "program": "generics_class_recursive_type_1.ets" } } @@ -6916,7 +6916,7 @@ }, "end": { "line": 63, - "column": 16, + "column": 15, "program": "generics_class_recursive_type_1.ets" } } @@ -6929,7 +6929,7 @@ }, "end": { "line": 63, - "column": 16, + "column": 15, "program": "generics_class_recursive_type_1.ets" } } @@ -6963,7 +6963,7 @@ }, "end": { "line": 63, - "column": 19, + "column": 18, "program": "generics_class_recursive_type_1.ets" } } @@ -6976,7 +6976,7 @@ }, "end": { "line": 63, - "column": 19, + "column": 18, "program": "generics_class_recursive_type_1.ets" } } @@ -7003,7 +7003,7 @@ }, "end": { "line": 63, - "column": 20, + "column": 19, "program": "generics_class_recursive_type_1.ets" } } @@ -7016,7 +7016,7 @@ }, "end": { "line": 63, - "column": 20, + "column": 19, "program": "generics_class_recursive_type_1.ets" } } @@ -7031,7 +7031,7 @@ }, "end": { "line": 63, - "column": 20, + "column": 19, "program": "generics_class_recursive_type_1.ets" } } @@ -7143,7 +7143,7 @@ }, "end": { "line": 65, - "column": 20, + "column": 19, "program": "generics_class_recursive_type_1.ets" } } @@ -7156,7 +7156,7 @@ }, "end": { "line": 65, - "column": 20, + "column": 19, "program": "generics_class_recursive_type_1.ets" } } @@ -7190,7 +7190,7 @@ }, "end": { "line": 65, - "column": 23, + "column": 22, "program": "generics_class_recursive_type_1.ets" } } @@ -7203,7 +7203,7 @@ }, "end": { "line": 65, - "column": 23, + "column": 22, "program": "generics_class_recursive_type_1.ets" } } @@ -7230,7 +7230,7 @@ }, "end": { "line": 65, - "column": 24, + "column": 23, "program": "generics_class_recursive_type_1.ets" } } @@ -7243,7 +7243,7 @@ }, "end": { "line": 65, - "column": 24, + "column": 23, "program": "generics_class_recursive_type_1.ets" } } @@ -7257,7 +7257,7 @@ }, "end": { "line": 65, - "column": 24, + "column": 23, "program": "generics_class_recursive_type_1.ets" } } @@ -7270,7 +7270,7 @@ }, "end": { "line": 65, - "column": 24, + "column": 23, "program": "generics_class_recursive_type_1.ets" } } @@ -7333,7 +7333,7 @@ }, "end": { "line": 66, - "column": 20, + "column": 19, "program": "generics_class_recursive_type_1.ets" } } @@ -7346,7 +7346,7 @@ }, "end": { "line": 66, - "column": 20, + "column": 19, "program": "generics_class_recursive_type_1.ets" } } @@ -7380,7 +7380,7 @@ }, "end": { "line": 66, - "column": 23, + "column": 22, "program": "generics_class_recursive_type_1.ets" } } @@ -7393,7 +7393,7 @@ }, "end": { "line": 66, - "column": 23, + "column": 22, "program": "generics_class_recursive_type_1.ets" } } @@ -7419,8 +7419,8 @@ "program": "generics_class_recursive_type_1.ets" }, "end": { - "line": 67, - "column": 10, + "line": 66, + "column": 23, "program": "generics_class_recursive_type_1.ets" } } @@ -7432,8 +7432,8 @@ "program": "generics_class_recursive_type_1.ets" }, "end": { - "line": 67, - "column": 10, + "line": 66, + "column": 23, "program": "generics_class_recursive_type_1.ets" } } @@ -7446,8 +7446,8 @@ "program": "generics_class_recursive_type_1.ets" }, "end": { - "line": 67, - "column": 10, + "line": 66, + "column": 23, "program": "generics_class_recursive_type_1.ets" } } @@ -7459,8 +7459,8 @@ "program": "generics_class_recursive_type_1.ets" }, "end": { - "line": 67, - "column": 10, + "line": 66, + "column": 23, "program": "generics_class_recursive_type_1.ets" } } diff --git a/ets2panda/test/compiler/ets/generics_implicit_lambda1-expected.txt b/ets2panda/test/compiler/ets/generics_implicit_lambda1-expected.txt index ded34117695..1e486d79efd 100644 --- a/ets2panda/test/compiler/ets/generics_implicit_lambda1-expected.txt +++ b/ets2panda/test/compiler/ets/generics_implicit_lambda1-expected.txt @@ -110,7 +110,7 @@ }, "end": { "line": 22, - "column": 34, + "column": 33, "program": "generics_implicit_lambda1.ets" } } @@ -123,7 +123,7 @@ }, "end": { "line": 22, - "column": 34, + "column": 33, "program": "generics_implicit_lambda1.ets" } } @@ -136,7 +136,7 @@ }, "end": { "line": 22, - "column": 34, + "column": 33, "program": "generics_implicit_lambda1.ets" } } @@ -150,7 +150,7 @@ }, "end": { "line": 22, - "column": 34, + "column": 33, "program": "generics_implicit_lambda1.ets" } } @@ -163,7 +163,7 @@ }, "end": { "line": 22, - "column": 34, + "column": 33, "program": "generics_implicit_lambda1.ets" } } @@ -261,7 +261,7 @@ }, "end": { "line": 22, - "column": 59, + "column": 57, "program": "generics_implicit_lambda1.ets" } } @@ -274,7 +274,7 @@ }, "end": { "line": 22, - "column": 59, + "column": 57, "program": "generics_implicit_lambda1.ets" } } @@ -637,7 +637,7 @@ }, "end": { "line": 28, - "column": 39, + "column": 38, "program": "generics_implicit_lambda1.ets" } } @@ -650,7 +650,7 @@ }, "end": { "line": 28, - "column": 39, + "column": 38, "program": "generics_implicit_lambda1.ets" } } @@ -663,7 +663,7 @@ }, "end": { "line": 28, - "column": 39, + "column": 38, "program": "generics_implicit_lambda1.ets" } } @@ -677,7 +677,7 @@ }, "end": { "line": 28, - "column": 39, + "column": 38, "program": "generics_implicit_lambda1.ets" } } @@ -690,7 +690,7 @@ }, "end": { "line": 28, - "column": 39, + "column": 38, "program": "generics_implicit_lambda1.ets" } } @@ -788,7 +788,7 @@ }, "end": { "line": 28, - "column": 64, + "column": 62, "program": "generics_implicit_lambda1.ets" } } @@ -801,7 +801,7 @@ }, "end": { "line": 28, - "column": 64, + "column": 62, "program": "generics_implicit_lambda1.ets" } } @@ -1425,7 +1425,7 @@ }, "end": { "line": 16, - "column": 32, + "column": 31, "program": "generics_implicit_lambda1.ets" } } @@ -1438,7 +1438,7 @@ }, "end": { "line": 16, - "column": 32, + "column": 31, "program": "generics_implicit_lambda1.ets" } } @@ -1451,7 +1451,7 @@ }, "end": { "line": 16, - "column": 32, + "column": 31, "program": "generics_implicit_lambda1.ets" } } @@ -1465,7 +1465,7 @@ }, "end": { "line": 16, - "column": 32, + "column": 31, "program": "generics_implicit_lambda1.ets" } } @@ -1478,7 +1478,7 @@ }, "end": { "line": 16, - "column": 32, + "column": 31, "program": "generics_implicit_lambda1.ets" } } @@ -1513,7 +1513,7 @@ }, "end": { "line": 16, - "column": 37, + "column": 35, "program": "generics_implicit_lambda1.ets" } } @@ -1526,7 +1526,7 @@ }, "end": { "line": 16, - "column": 37, + "column": 35, "program": "generics_implicit_lambda1.ets" } } @@ -1866,7 +1866,7 @@ }, "end": { "line": 36, - "column": 22, + "column": 19, "program": "generics_implicit_lambda1.ets" } } @@ -1879,7 +1879,7 @@ }, "end": { "line": 36, - "column": 22, + "column": 19, "program": "generics_implicit_lambda1.ets" } } @@ -2046,7 +2046,7 @@ }, "end": { "line": 38, - "column": 19, + "column": 16, "program": "generics_implicit_lambda1.ets" } } @@ -2059,7 +2059,7 @@ }, "end": { "line": 38, - "column": 19, + "column": 16, "program": "generics_implicit_lambda1.ets" } } @@ -2100,7 +2100,7 @@ }, "end": { "line": 38, - "column": 37, + "column": 36, "program": "generics_implicit_lambda1.ets" } } @@ -2113,7 +2113,7 @@ }, "end": { "line": 38, - "column": 37, + "column": 36, "program": "generics_implicit_lambda1.ets" } } @@ -2290,7 +2290,7 @@ }, "end": { "line": 41, - "column": 18, + "column": 15, "program": "generics_implicit_lambda1.ets" } } @@ -2303,7 +2303,7 @@ }, "end": { "line": 41, - "column": 18, + "column": 15, "program": "generics_implicit_lambda1.ets" } } diff --git a/ets2panda/test/compiler/ets/generics_instantiation_1-expected.txt b/ets2panda/test/compiler/ets/generics_instantiation_1-expected.txt index 7162f7a4341..abdcea54faf 100644 --- a/ets2panda/test/compiler/ets/generics_instantiation_1-expected.txt +++ b/ets2panda/test/compiler/ets/generics_instantiation_1-expected.txt @@ -72,7 +72,7 @@ }, "end": { "line": 16, - "column": 26, + "column": 25, "program": "generics_instantiation_1.ets" } } @@ -85,7 +85,7 @@ }, "end": { "line": 16, - "column": 26, + "column": 25, "program": "generics_instantiation_1.ets" } } @@ -174,7 +174,7 @@ }, "end": { "line": 17, - "column": 19, + "column": 18, "program": "generics_instantiation_1.ets" } } @@ -187,7 +187,7 @@ }, "end": { "line": 17, - "column": 19, + "column": 18, "program": "generics_instantiation_1.ets" } } @@ -202,7 +202,7 @@ }, "end": { "line": 17, - "column": 19, + "column": 18, "program": "generics_instantiation_1.ets" } } @@ -290,7 +290,7 @@ }, "end": { "line": 18, - "column": 23, + "column": 22, "program": "generics_instantiation_1.ets" } } @@ -303,7 +303,7 @@ }, "end": { "line": 18, - "column": 23, + "column": 22, "program": "generics_instantiation_1.ets" } } @@ -317,7 +317,7 @@ }, "end": { "line": 18, - "column": 23, + "column": 22, "program": "generics_instantiation_1.ets" } } @@ -330,7 +330,7 @@ }, "end": { "line": 18, - "column": 23, + "column": 22, "program": "generics_instantiation_1.ets" } } @@ -569,7 +569,7 @@ }, "end": { "line": 21, - "column": 21, + "column": 19, "program": "generics_instantiation_1.ets" } } @@ -582,7 +582,7 @@ }, "end": { "line": 21, - "column": 21, + "column": 19, "program": "generics_instantiation_1.ets" } } @@ -842,7 +842,7 @@ }, "end": { "line": 27, - "column": 30, + "column": 29, "program": "generics_instantiation_1.ets" } } @@ -855,7 +855,7 @@ }, "end": { "line": 27, - "column": 30, + "column": 29, "program": "generics_instantiation_1.ets" } } @@ -869,7 +869,7 @@ }, "end": { "line": 27, - "column": 30, + "column": 29, "program": "generics_instantiation_1.ets" } } @@ -882,7 +882,7 @@ }, "end": { "line": 27, - "column": 30, + "column": 29, "program": "generics_instantiation_1.ets" } } @@ -967,7 +967,7 @@ }, "end": { "line": 28, - "column": 32, + "column": 31, "program": "generics_instantiation_1.ets" } } @@ -980,7 +980,7 @@ }, "end": { "line": 28, - "column": 32, + "column": 31, "program": "generics_instantiation_1.ets" } } @@ -1007,7 +1007,7 @@ }, "end": { "line": 28, - "column": 34, + "column": 32, "program": "generics_instantiation_1.ets" } } @@ -1020,7 +1020,7 @@ }, "end": { "line": 28, - "column": 34, + "column": 32, "program": "generics_instantiation_1.ets" } } @@ -1160,7 +1160,7 @@ }, "end": { "line": 28, - "column": 57, + "column": 56, "program": "generics_instantiation_1.ets" } } @@ -1173,7 +1173,7 @@ }, "end": { "line": 28, - "column": 57, + "column": 56, "program": "generics_instantiation_1.ets" } } @@ -1200,7 +1200,7 @@ }, "end": { "line": 28, - "column": 58, + "column": 57, "program": "generics_instantiation_1.ets" } } @@ -1213,7 +1213,7 @@ }, "end": { "line": 28, - "column": 58, + "column": 57, "program": "generics_instantiation_1.ets" } } @@ -1442,7 +1442,7 @@ }, "end": { "line": 31, - "column": 27, + "column": 26, "program": "generics_instantiation_1.ets" } } @@ -1455,7 +1455,7 @@ }, "end": { "line": 31, - "column": 27, + "column": 26, "program": "generics_instantiation_1.ets" } } @@ -1482,7 +1482,7 @@ }, "end": { "line": 31, - "column": 29, + "column": 27, "program": "generics_instantiation_1.ets" } } @@ -1495,7 +1495,7 @@ }, "end": { "line": 31, - "column": 29, + "column": 27, "program": "generics_instantiation_1.ets" } } @@ -1635,7 +1635,7 @@ }, "end": { "line": 31, - "column": 52, + "column": 51, "program": "generics_instantiation_1.ets" } } @@ -1648,7 +1648,7 @@ }, "end": { "line": 31, - "column": 52, + "column": 51, "program": "generics_instantiation_1.ets" } } @@ -1675,7 +1675,7 @@ }, "end": { "line": 31, - "column": 53, + "column": 52, "program": "generics_instantiation_1.ets" } } @@ -1688,7 +1688,7 @@ }, "end": { "line": 31, - "column": 53, + "column": 52, "program": "generics_instantiation_1.ets" } } @@ -1999,7 +1999,7 @@ }, "end": { "line": 35, - "column": 28, + "column": 26, "program": "generics_instantiation_1.ets" } } @@ -2012,7 +2012,7 @@ }, "end": { "line": 35, - "column": 28, + "column": 26, "program": "generics_instantiation_1.ets" } } @@ -2053,7 +2053,7 @@ }, "end": { "line": 35, - "column": 47, + "column": 46, "program": "generics_instantiation_1.ets" } } @@ -2066,7 +2066,7 @@ }, "end": { "line": 35, - "column": 47, + "column": 46, "program": "generics_instantiation_1.ets" } } diff --git a/ets2panda/test/compiler/ets/generics_instantiation_2-expected.txt b/ets2panda/test/compiler/ets/generics_instantiation_2-expected.txt index 86c5ee5895f..d29f7110710 100644 --- a/ets2panda/test/compiler/ets/generics_instantiation_2-expected.txt +++ b/ets2panda/test/compiler/ets/generics_instantiation_2-expected.txt @@ -178,7 +178,7 @@ }, "end": { "line": 17, - "column": 22, + "column": 21, "program": "generics_instantiation_2.ets" } } @@ -191,7 +191,7 @@ }, "end": { "line": 17, - "column": 22, + "column": 21, "program": "generics_instantiation_2.ets" } } @@ -218,7 +218,7 @@ }, "end": { "line": 17, - "column": 24, + "column": 22, "program": "generics_instantiation_2.ets" } } @@ -231,7 +231,7 @@ }, "end": { "line": 17, - "column": 24, + "column": 22, "program": "generics_instantiation_2.ets" } } @@ -457,7 +457,7 @@ }, "end": { "line": 21, - "column": 21, + "column": 20, "program": "generics_instantiation_2.ets" } } @@ -470,7 +470,7 @@ }, "end": { "line": 21, - "column": 21, + "column": 20, "program": "generics_instantiation_2.ets" } } @@ -485,7 +485,7 @@ }, "end": { "line": 21, - "column": 21, + "column": 20, "program": "generics_instantiation_2.ets" } } @@ -799,7 +799,7 @@ }, "end": { "line": 25, - "column": 16, + "column": 15, "program": "generics_instantiation_2.ets" } } @@ -812,7 +812,7 @@ }, "end": { "line": 25, - "column": 16, + "column": 15, "program": "generics_instantiation_2.ets" } } @@ -839,7 +839,7 @@ }, "end": { "line": 25, - "column": 18, + "column": 16, "program": "generics_instantiation_2.ets" } } @@ -852,7 +852,7 @@ }, "end": { "line": 25, - "column": 18, + "column": 16, "program": "generics_instantiation_2.ets" } } @@ -1080,7 +1080,7 @@ }, "end": { "line": 29, - "column": 18, + "column": 17, "program": "generics_instantiation_2.ets" } } @@ -1093,7 +1093,7 @@ }, "end": { "line": 29, - "column": 18, + "column": 17, "program": "generics_instantiation_2.ets" } } @@ -1120,7 +1120,7 @@ }, "end": { "line": 29, - "column": 20, + "column": 18, "program": "generics_instantiation_2.ets" } } @@ -1133,7 +1133,7 @@ }, "end": { "line": 29, - "column": 20, + "column": 18, "program": "generics_instantiation_2.ets" } } @@ -1730,7 +1730,7 @@ }, "end": { "line": 34, - "column": 28, + "column": 27, "program": "generics_instantiation_2.ets" } } @@ -1743,7 +1743,7 @@ }, "end": { "line": 34, - "column": 28, + "column": 27, "program": "generics_instantiation_2.ets" } } @@ -1770,7 +1770,7 @@ }, "end": { "line": 34, - "column": 29, + "column": 28, "program": "generics_instantiation_2.ets" } } @@ -1783,7 +1783,7 @@ }, "end": { "line": 34, - "column": 29, + "column": 28, "program": "generics_instantiation_2.ets" } } @@ -1797,7 +1797,7 @@ }, "end": { "line": 34, - "column": 29, + "column": 28, "program": "generics_instantiation_2.ets" } } @@ -1810,7 +1810,7 @@ }, "end": { "line": 34, - "column": 29, + "column": 28, "program": "generics_instantiation_2.ets" } } @@ -1898,7 +1898,7 @@ }, "end": { "line": 35, - "column": 24, + "column": 23, "program": "generics_instantiation_2.ets" } } @@ -1911,7 +1911,7 @@ }, "end": { "line": 35, - "column": 24, + "column": 23, "program": "generics_instantiation_2.ets" } } @@ -1938,7 +1938,7 @@ }, "end": { "line": 35, - "column": 26, + "column": 24, "program": "generics_instantiation_2.ets" } } @@ -1951,7 +1951,7 @@ }, "end": { "line": 35, - "column": 26, + "column": 24, "program": "generics_instantiation_2.ets" } } @@ -2086,7 +2086,7 @@ }, "end": { "line": 35, - "column": 48, + "column": 47, "program": "generics_instantiation_2.ets" } } @@ -2099,7 +2099,7 @@ }, "end": { "line": 35, - "column": 48, + "column": 47, "program": "generics_instantiation_2.ets" } } @@ -2268,7 +2268,7 @@ }, "end": { "line": 36, - "column": 30, + "column": 27, "program": "generics_instantiation_2.ets" } } @@ -2281,7 +2281,7 @@ }, "end": { "line": 36, - "column": 30, + "column": 27, "program": "generics_instantiation_2.ets" } } @@ -2388,7 +2388,7 @@ }, "end": { "line": 36, - "column": 32, + "column": 30, "program": "generics_instantiation_2.ets" } } @@ -2401,7 +2401,7 @@ }, "end": { "line": 36, - "column": 32, + "column": 30, "program": "generics_instantiation_2.ets" } } @@ -2523,7 +2523,7 @@ }, "end": { "line": 36, - "column": 54, + "column": 51, "program": "generics_instantiation_2.ets" } } @@ -2536,7 +2536,7 @@ }, "end": { "line": 36, - "column": 54, + "column": 51, "program": "generics_instantiation_2.ets" } } @@ -2643,7 +2643,7 @@ }, "end": { "line": 36, - "column": 55, + "column": 54, "program": "generics_instantiation_2.ets" } } @@ -2656,7 +2656,7 @@ }, "end": { "line": 36, - "column": 55, + "column": 54, "program": "generics_instantiation_2.ets" } } @@ -2978,7 +2978,7 @@ }, "end": { "line": 37, - "column": 45, + "column": 44, "program": "generics_instantiation_2.ets" } } @@ -2991,7 +2991,7 @@ }, "end": { "line": 37, - "column": 45, + "column": 44, "program": "generics_instantiation_2.ets" } } diff --git a/ets2panda/test/compiler/ets/generics_instantiation_3-expected.txt b/ets2panda/test/compiler/ets/generics_instantiation_3-expected.txt index 7429ca1722e..aceea53fa2a 100644 --- a/ets2panda/test/compiler/ets/generics_instantiation_3-expected.txt +++ b/ets2panda/test/compiler/ets/generics_instantiation_3-expected.txt @@ -72,7 +72,7 @@ }, "end": { "line": 16, - "column": 26, + "column": 25, "program": "generics_instantiation_3.ets" } } @@ -85,7 +85,7 @@ }, "end": { "line": 16, - "column": 26, + "column": 25, "program": "generics_instantiation_3.ets" } } @@ -203,7 +203,7 @@ }, "end": { "line": 17, - "column": 21, + "column": 20, "program": "generics_instantiation_3.ets" } } @@ -216,7 +216,7 @@ }, "end": { "line": 17, - "column": 21, + "column": 20, "program": "generics_instantiation_3.ets" } } @@ -230,7 +230,7 @@ }, "end": { "line": 17, - "column": 21, + "column": 20, "program": "generics_instantiation_3.ets" } } @@ -243,7 +243,7 @@ }, "end": { "line": 17, - "column": 21, + "column": 20, "program": "generics_instantiation_3.ets" } } diff --git a/ets2panda/test/compiler/ets/generics_instantiation_4-expected.txt b/ets2panda/test/compiler/ets/generics_instantiation_4-expected.txt index 11f31c14a43..f2a52148643 100644 --- a/ets2panda/test/compiler/ets/generics_instantiation_4-expected.txt +++ b/ets2panda/test/compiler/ets/generics_instantiation_4-expected.txt @@ -180,7 +180,7 @@ }, "end": { "line": 17, - "column": 17, + "column": 16, "program": "generics_instantiation_4.ets" } } @@ -193,7 +193,7 @@ }, "end": { "line": 17, - "column": 17, + "column": 16, "program": "generics_instantiation_4.ets" } } @@ -220,7 +220,7 @@ }, "end": { "line": 17, - "column": 18, + "column": 17, "program": "generics_instantiation_4.ets" } } @@ -233,7 +233,7 @@ }, "end": { "line": 17, - "column": 18, + "column": 17, "program": "generics_instantiation_4.ets" } } @@ -247,7 +247,7 @@ }, "end": { "line": 17, - "column": 18, + "column": 17, "program": "generics_instantiation_4.ets" } } @@ -260,7 +260,7 @@ }, "end": { "line": 17, - "column": 18, + "column": 17, "program": "generics_instantiation_4.ets" } } @@ -319,7 +319,7 @@ }, "end": { "line": 17, - "column": 24, + "column": 23, "program": "generics_instantiation_4.ets" } } @@ -332,7 +332,7 @@ }, "end": { "line": 17, - "column": 24, + "column": 23, "program": "generics_instantiation_4.ets" } } @@ -359,7 +359,7 @@ }, "end": { "line": 17, - "column": 26, + "column": 24, "program": "generics_instantiation_4.ets" } } @@ -372,7 +372,7 @@ }, "end": { "line": 17, - "column": 26, + "column": 24, "program": "generics_instantiation_4.ets" } } @@ -574,7 +574,7 @@ }, "end": { "line": 21, - "column": 18, + "column": 17, "program": "generics_instantiation_4.ets" } } @@ -587,7 +587,7 @@ }, "end": { "line": 21, - "column": 18, + "column": 17, "program": "generics_instantiation_4.ets" } } @@ -614,7 +614,7 @@ }, "end": { "line": 21, - "column": 19, + "column": 18, "program": "generics_instantiation_4.ets" } } @@ -627,7 +627,7 @@ }, "end": { "line": 21, - "column": 19, + "column": 18, "program": "generics_instantiation_4.ets" } } @@ -641,7 +641,7 @@ }, "end": { "line": 21, - "column": 19, + "column": 18, "program": "generics_instantiation_4.ets" } } @@ -654,7 +654,7 @@ }, "end": { "line": 21, - "column": 19, + "column": 18, "program": "generics_instantiation_4.ets" } } @@ -713,7 +713,7 @@ }, "end": { "line": 21, - "column": 25, + "column": 24, "program": "generics_instantiation_4.ets" } } @@ -726,7 +726,7 @@ }, "end": { "line": 21, - "column": 25, + "column": 24, "program": "generics_instantiation_4.ets" } } @@ -753,7 +753,7 @@ }, "end": { "line": 21, - "column": 27, + "column": 25, "program": "generics_instantiation_4.ets" } } @@ -766,7 +766,7 @@ }, "end": { "line": 21, - "column": 27, + "column": 25, "program": "generics_instantiation_4.ets" } } @@ -1165,7 +1165,7 @@ }, "end": { "line": 27, - "column": 16, + "column": 15, "program": "generics_instantiation_4.ets" } } @@ -1178,7 +1178,7 @@ }, "end": { "line": 27, - "column": 16, + "column": 15, "program": "generics_instantiation_4.ets" } } @@ -1205,7 +1205,7 @@ }, "end": { "line": 27, - "column": 18, + "column": 16, "program": "generics_instantiation_4.ets" } } @@ -1218,7 +1218,7 @@ }, "end": { "line": 27, - "column": 18, + "column": 16, "program": "generics_instantiation_4.ets" } } @@ -1416,7 +1416,7 @@ }, "end": { "line": 31, - "column": 16, + "column": 15, "program": "generics_instantiation_4.ets" } } @@ -1429,7 +1429,7 @@ }, "end": { "line": 31, - "column": 16, + "column": 15, "program": "generics_instantiation_4.ets" } } @@ -1456,7 +1456,7 @@ }, "end": { "line": 31, - "column": 18, + "column": 16, "program": "generics_instantiation_4.ets" } } @@ -1469,7 +1469,7 @@ }, "end": { "line": 31, - "column": 18, + "column": 16, "program": "generics_instantiation_4.ets" } } @@ -1879,7 +1879,7 @@ }, "end": { "line": 37, - "column": 19, + "column": 18, "program": "generics_instantiation_4.ets" } } @@ -1892,7 +1892,7 @@ }, "end": { "line": 37, - "column": 19, + "column": 18, "program": "generics_instantiation_4.ets" } } @@ -1906,7 +1906,7 @@ }, "end": { "line": 37, - "column": 19, + "column": 18, "program": "generics_instantiation_4.ets" } } @@ -1919,7 +1919,7 @@ }, "end": { "line": 37, - "column": 19, + "column": 18, "program": "generics_instantiation_4.ets" } } @@ -1981,7 +1981,7 @@ }, "end": { "line": 37, - "column": 25, + "column": 24, "program": "generics_instantiation_4.ets" } } @@ -1994,7 +1994,7 @@ }, "end": { "line": 37, - "column": 25, + "column": 24, "program": "generics_instantiation_4.ets" } } @@ -2021,7 +2021,7 @@ }, "end": { "line": 37, - "column": 27, + "column": 25, "program": "generics_instantiation_4.ets" } } @@ -2034,7 +2034,7 @@ }, "end": { "line": 37, - "column": 27, + "column": 25, "program": "generics_instantiation_4.ets" } } @@ -2260,7 +2260,7 @@ }, "end": { "line": 41, - "column": 21, + "column": 20, "program": "generics_instantiation_4.ets" } } @@ -2273,7 +2273,7 @@ }, "end": { "line": 41, - "column": 21, + "column": 20, "program": "generics_instantiation_4.ets" } } @@ -2288,7 +2288,7 @@ }, "end": { "line": 41, - "column": 21, + "column": 20, "program": "generics_instantiation_4.ets" } } @@ -2767,7 +2767,7 @@ }, "end": { "line": 44, - "column": 26, + "column": 25, "program": "generics_instantiation_4.ets" } } @@ -2780,7 +2780,7 @@ }, "end": { "line": 44, - "column": 26, + "column": 25, "program": "generics_instantiation_4.ets" } } @@ -2807,7 +2807,7 @@ }, "end": { "line": 44, - "column": 27, + "column": 26, "program": "generics_instantiation_4.ets" } } @@ -2820,7 +2820,7 @@ }, "end": { "line": 44, - "column": 27, + "column": 26, "program": "generics_instantiation_4.ets" } } @@ -2834,7 +2834,7 @@ }, "end": { "line": 44, - "column": 27, + "column": 26, "program": "generics_instantiation_4.ets" } } @@ -2847,7 +2847,7 @@ }, "end": { "line": 44, - "column": 27, + "column": 26, "program": "generics_instantiation_4.ets" } } @@ -2932,7 +2932,7 @@ }, "end": { "line": 45, - "column": 22, + "column": 21, "program": "generics_instantiation_4.ets" } } @@ -2945,7 +2945,7 @@ }, "end": { "line": 45, - "column": 22, + "column": 21, "program": "generics_instantiation_4.ets" } } @@ -2972,7 +2972,7 @@ }, "end": { "line": 45, - "column": 24, + "column": 22, "program": "generics_instantiation_4.ets" } } @@ -2985,7 +2985,7 @@ }, "end": { "line": 45, - "column": 24, + "column": 22, "program": "generics_instantiation_4.ets" } } @@ -3059,7 +3059,7 @@ }, "end": { "line": 45, - "column": 35, + "column": 34, "program": "generics_instantiation_4.ets" } } @@ -3072,7 +3072,7 @@ }, "end": { "line": 45, - "column": 35, + "column": 34, "program": "generics_instantiation_4.ets" } } @@ -3099,7 +3099,7 @@ }, "end": { "line": 45, - "column": 36, + "column": 35, "program": "generics_instantiation_4.ets" } } @@ -3112,7 +3112,7 @@ }, "end": { "line": 45, - "column": 36, + "column": 35, "program": "generics_instantiation_4.ets" } } @@ -3324,7 +3324,7 @@ }, "end": { "line": 48, - "column": 22, + "column": 21, "program": "generics_instantiation_4.ets" } } @@ -3337,7 +3337,7 @@ }, "end": { "line": 48, - "column": 22, + "column": 21, "program": "generics_instantiation_4.ets" } } @@ -3364,7 +3364,7 @@ }, "end": { "line": 48, - "column": 24, + "column": 22, "program": "generics_instantiation_4.ets" } } @@ -3377,7 +3377,7 @@ }, "end": { "line": 48, - "column": 24, + "column": 22, "program": "generics_instantiation_4.ets" } } @@ -3510,7 +3510,7 @@ }, "end": { "line": 48, - "column": 58, + "column": 57, "program": "generics_instantiation_4.ets" } } @@ -3523,7 +3523,7 @@ }, "end": { "line": 48, - "column": 58, + "column": 57, "program": "generics_instantiation_4.ets" } } @@ -3576,7 +3576,7 @@ }, "end": { "line": 48, - "column": 46, + "column": 45, "program": "generics_instantiation_4.ets" } } @@ -3589,7 +3589,7 @@ }, "end": { "line": 48, - "column": 46, + "column": 45, "program": "generics_instantiation_4.ets" } } @@ -3758,7 +3758,7 @@ }, "end": { "line": 49, - "column": 28, + "column": 25, "program": "generics_instantiation_4.ets" } } @@ -3771,7 +3771,7 @@ }, "end": { "line": 49, - "column": 28, + "column": 25, "program": "generics_instantiation_4.ets" } } @@ -3878,7 +3878,7 @@ }, "end": { "line": 49, - "column": 30, + "column": 28, "program": "generics_instantiation_4.ets" } } @@ -3891,7 +3891,7 @@ }, "end": { "line": 49, - "column": 30, + "column": 28, "program": "generics_instantiation_4.ets" } } @@ -4013,7 +4013,7 @@ }, "end": { "line": 49, - "column": 50, + "column": 47, "program": "generics_instantiation_4.ets" } } @@ -4026,7 +4026,7 @@ }, "end": { "line": 49, - "column": 50, + "column": 47, "program": "generics_instantiation_4.ets" } } @@ -4133,7 +4133,7 @@ }, "end": { "line": 49, - "column": 51, + "column": 50, "program": "generics_instantiation_4.ets" } } @@ -4146,7 +4146,7 @@ }, "end": { "line": 49, - "column": 51, + "column": 50, "program": "generics_instantiation_4.ets" } } @@ -4300,7 +4300,7 @@ }, "end": { "line": 50, - "column": 37, + "column": 36, "program": "generics_instantiation_4.ets" } } @@ -4313,7 +4313,7 @@ }, "end": { "line": 50, - "column": 37, + "column": 36, "program": "generics_instantiation_4.ets" } } @@ -4366,7 +4366,7 @@ }, "end": { "line": 50, - "column": 25, + "column": 24, "program": "generics_instantiation_4.ets" } } @@ -4379,7 +4379,7 @@ }, "end": { "line": 50, - "column": 25, + "column": 24, "program": "generics_instantiation_4.ets" } } @@ -4695,7 +4695,7 @@ }, "end": { "line": 51, - "column": 56, + "column": 55, "program": "generics_instantiation_4.ets" } } @@ -4708,7 +4708,7 @@ }, "end": { "line": 51, - "column": 56, + "column": 55, "program": "generics_instantiation_4.ets" } } @@ -4761,7 +4761,7 @@ }, "end": { "line": 51, - "column": 44, + "column": 43, "program": "generics_instantiation_4.ets" } } @@ -4774,7 +4774,7 @@ }, "end": { "line": 51, - "column": 44, + "column": 43, "program": "generics_instantiation_4.ets" } } @@ -5090,7 +5090,7 @@ }, "end": { "line": 52, - "column": 56, + "column": 55, "program": "generics_instantiation_4.ets" } } @@ -5103,7 +5103,7 @@ }, "end": { "line": 52, - "column": 56, + "column": 55, "program": "generics_instantiation_4.ets" } } @@ -5156,7 +5156,7 @@ }, "end": { "line": 52, - "column": 44, + "column": 43, "program": "generics_instantiation_4.ets" } } @@ -5169,7 +5169,7 @@ }, "end": { "line": 52, - "column": 44, + "column": 43, "program": "generics_instantiation_4.ets" } } @@ -5291,7 +5291,7 @@ }, "end": { "line": 54, - "column": 22, + "column": 21, "program": "generics_instantiation_4.ets" } } @@ -5304,7 +5304,7 @@ }, "end": { "line": 54, - "column": 22, + "column": 21, "program": "generics_instantiation_4.ets" } } @@ -5331,7 +5331,7 @@ }, "end": { "line": 54, - "column": 24, + "column": 22, "program": "generics_instantiation_4.ets" } } @@ -5344,7 +5344,7 @@ }, "end": { "line": 54, - "column": 24, + "column": 22, "program": "generics_instantiation_4.ets" } } @@ -5477,7 +5477,7 @@ }, "end": { "line": 54, - "column": 58, + "column": 57, "program": "generics_instantiation_4.ets" } } @@ -5490,7 +5490,7 @@ }, "end": { "line": 54, - "column": 58, + "column": 57, "program": "generics_instantiation_4.ets" } } @@ -5543,7 +5543,7 @@ }, "end": { "line": 54, - "column": 46, + "column": 45, "program": "generics_instantiation_4.ets" } } @@ -5556,7 +5556,7 @@ }, "end": { "line": 54, - "column": 46, + "column": 45, "program": "generics_instantiation_4.ets" } } @@ -5725,7 +5725,7 @@ }, "end": { "line": 55, - "column": 28, + "column": 25, "program": "generics_instantiation_4.ets" } } @@ -5738,7 +5738,7 @@ }, "end": { "line": 55, - "column": 28, + "column": 25, "program": "generics_instantiation_4.ets" } } @@ -5845,7 +5845,7 @@ }, "end": { "line": 55, - "column": 30, + "column": 28, "program": "generics_instantiation_4.ets" } } @@ -5858,7 +5858,7 @@ }, "end": { "line": 55, - "column": 30, + "column": 28, "program": "generics_instantiation_4.ets" } } @@ -5980,7 +5980,7 @@ }, "end": { "line": 55, - "column": 50, + "column": 47, "program": "generics_instantiation_4.ets" } } @@ -5993,7 +5993,7 @@ }, "end": { "line": 55, - "column": 50, + "column": 47, "program": "generics_instantiation_4.ets" } } @@ -6100,7 +6100,7 @@ }, "end": { "line": 55, - "column": 51, + "column": 50, "program": "generics_instantiation_4.ets" } } @@ -6113,7 +6113,7 @@ }, "end": { "line": 55, - "column": 51, + "column": 50, "program": "generics_instantiation_4.ets" } } 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 8826b894a9f..2043e2eefff 100644 --- a/ets2panda/test/compiler/ets/generics_interface_bounds_1-expected.txt +++ b/ets2panda/test/compiler/ets/generics_interface_bounds_1-expected.txt @@ -89,7 +89,7 @@ }, "end": { "line": 17, - "column": 15, + "column": 14, "program": "generics_interface_bounds_1.ets" } } @@ -102,7 +102,7 @@ }, "end": { "line": 17, - "column": 15, + "column": 14, "program": "generics_interface_bounds_1.ets" } } @@ -116,7 +116,7 @@ }, "end": { "line": 17, - "column": 15, + "column": 14, "program": "generics_interface_bounds_1.ets" } } @@ -129,7 +129,7 @@ }, "end": { "line": 17, - "column": 15, + "column": 14, "program": "generics_interface_bounds_1.ets" } } @@ -279,8 +279,8 @@ "program": "generics_interface_bounds_1.ets" }, "end": { - "line": 20, - "column": 6, + "line": 18, + "column": 2, "program": "generics_interface_bounds_1.ets" } } @@ -380,7 +380,7 @@ }, "end": { "line": 20, - "column": 29, + "column": 27, "program": "generics_interface_bounds_1.ets" } } @@ -393,7 +393,7 @@ }, "end": { "line": 20, - "column": 29, + "column": 27, "program": "generics_interface_bounds_1.ets" } } @@ -522,7 +522,7 @@ }, "end": { "line": 21, - "column": 23, + "column": 22, "program": "generics_interface_bounds_1.ets" } } @@ -535,7 +535,7 @@ }, "end": { "line": 21, - "column": 23, + "column": 22, "program": "generics_interface_bounds_1.ets" } } @@ -550,7 +550,7 @@ }, "end": { "line": 21, - "column": 23, + "column": 22, "program": "generics_interface_bounds_1.ets" } } @@ -638,7 +638,7 @@ }, "end": { "line": 23, - "column": 27, + "column": 26, "program": "generics_interface_bounds_1.ets" } } @@ -651,7 +651,7 @@ }, "end": { "line": 23, - "column": 27, + "column": 26, "program": "generics_interface_bounds_1.ets" } } @@ -665,7 +665,7 @@ }, "end": { "line": 23, - "column": 27, + "column": 26, "program": "generics_interface_bounds_1.ets" } } @@ -678,7 +678,7 @@ }, "end": { "line": 23, - "column": 27, + "column": 26, "program": "generics_interface_bounds_1.ets" } } @@ -943,7 +943,7 @@ }, "end": { "line": 28, - "column": 24, + "column": 22, "program": "generics_interface_bounds_1.ets" } } @@ -956,7 +956,7 @@ }, "end": { "line": 28, - "column": 24, + "column": 22, "program": "generics_interface_bounds_1.ets" } } 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 59a5dffb4e5..6901d8c7563 100644 --- a/ets2panda/test/compiler/ets/generics_interface_bounds_2-expected.txt +++ b/ets2panda/test/compiler/ets/generics_interface_bounds_2-expected.txt @@ -44,8 +44,8 @@ "program": "generics_interface_bounds_2.ets" }, "end": { - "line": 17, - "column": 10, + "line": 16, + "column": 18, "program": "generics_interface_bounds_2.ets" } } @@ -169,7 +169,7 @@ }, "end": { "line": 17, - "column": 28, + "column": 27, "program": "generics_interface_bounds_2.ets" } } @@ -182,7 +182,7 @@ }, "end": { "line": 17, - "column": 28, + "column": 27, "program": "generics_interface_bounds_2.ets" } } @@ -248,7 +248,7 @@ }, "end": { "line": 17, - "column": 44, + "column": 43, "program": "generics_interface_bounds_2.ets" } } @@ -261,7 +261,7 @@ }, "end": { "line": 17, - "column": 44, + "column": 43, "program": "generics_interface_bounds_2.ets" } } @@ -300,8 +300,8 @@ "program": "generics_interface_bounds_2.ets" }, "end": { - "line": 18, - "column": 1, + "line": 17, + "column": 47, "program": "generics_interface_bounds_2.ets" } } 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 ffa5c109705..1f91de0de81 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 @@ -127,7 +127,7 @@ }, "end": { "line": 17, - "column": 21, + "column": 20, "program": "generics_primitive_type_param_1.ets" } } @@ -140,7 +140,7 @@ }, "end": { "line": 17, - "column": 21, + "column": 20, "program": "generics_primitive_type_param_1.ets" } } @@ -155,7 +155,7 @@ }, "end": { "line": 17, - "column": 21, + "column": 20, "program": "generics_primitive_type_param_1.ets" } } @@ -903,7 +903,7 @@ }, "end": { "line": 24, - "column": 24, + "column": 22, "program": "generics_primitive_type_param_1.ets" } } @@ -916,7 +916,7 @@ }, "end": { "line": 24, - "column": 24, + "column": 22, "program": "generics_primitive_type_param_1.ets" } } @@ -998,7 +998,7 @@ }, "end": { "line": 24, - "column": 36, + "column": 35, "program": "generics_primitive_type_param_1.ets" } } @@ -1011,7 +1011,7 @@ }, "end": { "line": 24, - "column": 36, + "column": 35, "program": "generics_primitive_type_param_1.ets" } } @@ -1790,7 +1790,7 @@ }, "end": { "line": 32, - "column": 30, + "column": 28, "program": "generics_primitive_type_param_1.ets" } } @@ -1803,7 +1803,7 @@ }, "end": { "line": 32, - "column": 30, + "column": 28, "program": "generics_primitive_type_param_1.ets" } } @@ -1885,7 +1885,7 @@ }, "end": { "line": 32, - "column": 45, + "column": 44, "program": "generics_primitive_type_param_1.ets" } } @@ -1898,7 +1898,7 @@ }, "end": { "line": 32, - "column": 45, + "column": 44, "program": "generics_primitive_type_param_1.ets" } } @@ -2245,7 +2245,7 @@ }, "end": { "line": 36, - "column": 32, + "column": 30, "program": "generics_primitive_type_param_1.ets" } } @@ -2258,7 +2258,7 @@ }, "end": { "line": 36, - "column": 32, + "column": 30, "program": "generics_primitive_type_param_1.ets" } } @@ -2340,7 +2340,7 @@ }, "end": { "line": 36, - "column": 48, + "column": 47, "program": "generics_primitive_type_param_1.ets" } } @@ -2353,7 +2353,7 @@ }, "end": { "line": 36, - "column": 48, + "column": 47, "program": "generics_primitive_type_param_1.ets" } } diff --git a/ets2panda/test/compiler/ets/identifierReference14-expected.txt b/ets2panda/test/compiler/ets/identifierReference14-expected.txt index e0f435c79bc..754ec9e3c42 100644 --- a/ets2panda/test/compiler/ets/identifierReference14-expected.txt +++ b/ets2panda/test/compiler/ets/identifierReference14-expected.txt @@ -326,7 +326,7 @@ }, "end": { "line": 27, - "column": 20, + "column": 18, "program": "identifierReference14.ets" } } @@ -339,7 +339,7 @@ }, "end": { "line": 27, - "column": 20, + "column": 18, "program": "identifierReference14.ets" } } diff --git a/ets2panda/test/compiler/ets/identifierReference4-expected.txt b/ets2panda/test/compiler/ets/identifierReference4-expected.txt index 4b321f925a4..f51171adb73 100644 --- a/ets2panda/test/compiler/ets/identifierReference4-expected.txt +++ b/ets2panda/test/compiler/ets/identifierReference4-expected.txt @@ -94,7 +94,7 @@ }, "end": { "line": 19, - "column": 14, + "column": 12, "program": "identifierReference4.ets" } } @@ -107,7 +107,7 @@ }, "end": { "line": 19, - "column": 14, + "column": 12, "program": "identifierReference4.ets" } } @@ -308,7 +308,7 @@ }, "end": { "line": 22, - "column": 20, + "column": 18, "program": "identifierReference4.ets" } } @@ -321,7 +321,7 @@ }, "end": { "line": 22, - "column": 20, + "column": 18, "program": "identifierReference4.ets" } } diff --git a/ets2panda/test/compiler/ets/implicit-conversion-expected.txt b/ets2panda/test/compiler/ets/implicit-conversion-expected.txt index 65183ede7dd..05b5c865db8 100644 --- a/ets2panda/test/compiler/ets/implicit-conversion-expected.txt +++ b/ets2panda/test/compiler/ets/implicit-conversion-expected.txt @@ -234,7 +234,7 @@ }, "end": { "line": 17, - "column": 23, + "column": 21, "program": "implicit-conversion.ets" } } @@ -247,7 +247,7 @@ }, "end": { "line": 17, - "column": 23, + "column": 21, "program": "implicit-conversion.ets" } } @@ -347,7 +347,7 @@ }, "end": { "line": 18, - "column": 25, + "column": 23, "program": "implicit-conversion.ets" } } @@ -360,7 +360,7 @@ }, "end": { "line": 18, - "column": 25, + "column": 23, "program": "implicit-conversion.ets" } } @@ -460,7 +460,7 @@ }, "end": { "line": 19, - "column": 23, + "column": 21, "program": "implicit-conversion.ets" } } @@ -473,7 +473,7 @@ }, "end": { "line": 19, - "column": 23, + "column": 21, "program": "implicit-conversion.ets" } } @@ -573,7 +573,7 @@ }, "end": { "line": 20, - "column": 22, + "column": 20, "program": "implicit-conversion.ets" } } @@ -586,7 +586,7 @@ }, "end": { "line": 20, - "column": 22, + "column": 20, "program": "implicit-conversion.ets" } } @@ -755,7 +755,7 @@ }, "end": { "line": 21, - "column": 29, + "column": 27, "program": "implicit-conversion.ets" } } @@ -768,7 +768,7 @@ }, "end": { "line": 21, - "column": 29, + "column": 27, "program": "implicit-conversion.ets" } } @@ -937,7 +937,7 @@ }, "end": { "line": 22, - "column": 22, + "column": 20, "program": "implicit-conversion.ets" } } @@ -950,7 +950,7 @@ }, "end": { "line": 22, - "column": 22, + "column": 20, "program": "implicit-conversion.ets" } } @@ -1119,7 +1119,7 @@ }, "end": { "line": 23, - "column": 25, + "column": 23, "program": "implicit-conversion.ets" } } @@ -1132,7 +1132,7 @@ }, "end": { "line": 23, - "column": 25, + "column": 23, "program": "implicit-conversion.ets" } } @@ -1232,7 +1232,7 @@ }, "end": { "line": 24, - "column": 33, + "column": 31, "program": "implicit-conversion.ets" } } @@ -1245,7 +1245,7 @@ }, "end": { "line": 24, - "column": 33, + "column": 31, "program": "implicit-conversion.ets" } } @@ -1345,7 +1345,7 @@ }, "end": { "line": 25, - "column": 28, + "column": 26, "program": "implicit-conversion.ets" } } @@ -1358,7 +1358,7 @@ }, "end": { "line": 25, - "column": 28, + "column": 26, "program": "implicit-conversion.ets" } } @@ -1458,7 +1458,7 @@ }, "end": { "line": 28, - "column": 28, + "column": 26, "program": "implicit-conversion.ets" } } @@ -1471,7 +1471,7 @@ }, "end": { "line": 28, - "column": 28, + "column": 26, "program": "implicit-conversion.ets" } } @@ -1640,7 +1640,7 @@ }, "end": { "line": 29, - "column": 27, + "column": 25, "program": "implicit-conversion.ets" } } @@ -1653,7 +1653,7 @@ }, "end": { "line": 29, - "column": 27, + "column": 25, "program": "implicit-conversion.ets" } } @@ -1822,7 +1822,7 @@ }, "end": { "line": 30, - "column": 24, + "column": 22, "program": "implicit-conversion.ets" } } @@ -1835,7 +1835,7 @@ }, "end": { "line": 30, - "column": 24, + "column": 22, "program": "implicit-conversion.ets" } } 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 9088eefd25c..fe9fcbe7649 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 @@ -751,7 +751,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 19, "program": "package_module_1.ets" } } @@ -764,7 +764,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 19, "program": "package_module_1.ets" } } @@ -838,7 +838,7 @@ }, "end": { "line": 20, - "column": 21, + "column": 19, "program": "package_module_1.ets" } } @@ -851,7 +851,7 @@ }, "end": { "line": 20, - "column": 21, + "column": 19, "program": "package_module_1.ets" } } @@ -960,7 +960,7 @@ }, "end": { "line": 23, - "column": 23, + "column": 21, "program": "package_module_1.ets" } } @@ -973,7 +973,7 @@ }, "end": { "line": 23, - "column": 23, + "column": 21, "program": "package_module_1.ets" } } @@ -1023,7 +1023,7 @@ }, "end": { "line": 23, - "column": 38, + "column": 37, "program": "package_module_1.ets" } } @@ -1036,7 +1036,7 @@ }, "end": { "line": 23, - "column": 38, + "column": 37, "program": "package_module_1.ets" } } @@ -1120,7 +1120,7 @@ }, "end": { "line": 24, - "column": 20, + "column": 18, "program": "package_module_1.ets" } } @@ -1133,7 +1133,7 @@ }, "end": { "line": 24, - "column": 20, + "column": 18, "program": "package_module_1.ets" } } @@ -1234,7 +1234,7 @@ }, "end": { "line": 25, - "column": 20, + "column": 18, "program": "package_module_1.ets" } } @@ -1247,7 +1247,7 @@ }, "end": { "line": 25, - "column": 20, + "column": 18, "program": "package_module_1.ets" } } @@ -1348,7 +1348,7 @@ }, "end": { "line": 26, - "column": 20, + "column": 18, "program": "package_module_1.ets" } } @@ -1361,7 +1361,7 @@ }, "end": { "line": 26, - "column": 20, + "column": 18, "program": "package_module_1.ets" } } @@ -1462,7 +1462,7 @@ }, "end": { "line": 27, - "column": 20, + "column": 18, "program": "package_module_1.ets" } } @@ -1475,7 +1475,7 @@ }, "end": { "line": 27, - "column": 20, + "column": 18, "program": "package_module_1.ets" } } @@ -1576,7 +1576,7 @@ }, "end": { "line": 28, - "column": 20, + "column": 18, "program": "package_module_1.ets" } } @@ -1589,7 +1589,7 @@ }, "end": { "line": 28, - "column": 20, + "column": 18, "program": "package_module_1.ets" } } @@ -1707,7 +1707,7 @@ }, "end": { "line": 29, - "column": 20, + "column": 18, "program": "package_module_1.ets" } } @@ -1720,7 +1720,7 @@ }, "end": { "line": 29, - "column": 20, + "column": 18, "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 4a7b7b6d6fb..d15a9fd865c 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 @@ -208,7 +208,7 @@ }, "end": { "line": 28, - "column": 19, + "column": 17, "program": "package_module_2.ets" } } @@ -221,7 +221,7 @@ }, "end": { "line": 28, - "column": 19, + "column": 17, "program": "package_module_2.ets" } } @@ -751,7 +751,7 @@ }, "end": { "line": 19, - "column": 20, + "column": 19, "program": "package_module_2.ets" } } @@ -764,7 +764,7 @@ }, "end": { "line": 19, - "column": 20, + "column": 19, "program": "package_module_2.ets" } } @@ -862,7 +862,7 @@ }, "end": { "line": 22, - "column": 25, + "column": 23, "program": "package_module_2.ets" } } @@ -875,7 +875,7 @@ }, "end": { "line": 22, - "column": 25, + "column": 23, "program": "package_module_2.ets" } } @@ -920,7 +920,7 @@ }, "end": { "line": 23, - "column": 28, + "column": 26, "program": "package_module_2.ets" } } @@ -933,7 +933,7 @@ }, "end": { "line": 23, - "column": 28, + "column": 26, "program": "package_module_2.ets" } } @@ -1410,7 +1410,7 @@ }, "end": { "line": 23, - "column": 7, + "column": 6, "program": "package_module_1.ets" } } @@ -1423,7 +1423,7 @@ }, "end": { "line": 23, - "column": 7, + "column": 6, "program": "package_module_1.ets" } } 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 ce069d891f5..63ecb4ba564 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 @@ -355,7 +355,7 @@ }, "end": { "line": 16, - "column": 32, + "column": 30, "program": "separate_module_1.ets" } } @@ -368,7 +368,7 @@ }, "end": { "line": 16, - "column": 32, + "column": 30, "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 4b6dcadf6c7..64386964c3a 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 @@ -636,7 +636,7 @@ }, "end": { "line": 19, - "column": 20, + "column": 18, "program": "package_module_1.ets" } } @@ -649,7 +649,7 @@ }, "end": { "line": 19, - "column": 20, + "column": 18, "program": "package_module_1.ets" } } @@ -767,7 +767,7 @@ }, "end": { "line": 20, - "column": 20, + "column": 18, "program": "package_module_1.ets" } } @@ -780,7 +780,7 @@ }, "end": { "line": 20, - "column": 20, + "column": 18, "program": "package_module_1.ets" } } 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 b2196585c2a..eef02299222 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 @@ -253,7 +253,7 @@ }, "end": { "line": 21, - "column": 24, + "column": 21, "program": "package_module_2.ets" } } @@ -266,7 +266,7 @@ }, "end": { "line": 21, - "column": 24, + "column": 21, "program": "package_module_2.ets" } } @@ -604,7 +604,7 @@ }, "end": { "line": 19, - "column": 23, + "column": 22, "program": "package_module_2.ets" } } @@ -617,7 +617,7 @@ }, "end": { "line": 19, - "column": 23, + "column": 22, "program": "package_module_2.ets" } } @@ -630,7 +630,7 @@ }, "end": { "line": 19, - "column": 23, + "column": 22, "program": "package_module_2.ets" } } 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 e4917aa0975..19601ac067e 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 @@ -355,7 +355,7 @@ }, "end": { "line": 16, - "column": 27, + "column": 25, "program": "separate_module_1.ets" } } @@ -368,7 +368,7 @@ }, "end": { "line": 16, - "column": 27, + "column": 25, "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 3c874f399f6..ae9bb2e03a6 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 @@ -129,7 +129,7 @@ }, "end": { "line": 16, - "column": 47, + "column": 46, "program": "asyncfun_lambda_lib.ets" } } @@ -142,7 +142,7 @@ }, "end": { "line": 16, - "column": 47, + "column": 46, "program": "asyncfun_lambda_lib.ets" } } @@ -198,7 +198,7 @@ }, "end": { "line": 16, - "column": 54, + "column": 52, "program": "asyncfun_lambda_lib.ets" } } @@ -211,7 +211,7 @@ }, "end": { "line": 16, - "column": 54, + "column": 52, "program": "asyncfun_lambda_lib.ets" } } @@ -541,7 +541,7 @@ }, "end": { "line": 17, - "column": 34, + "column": 32, "program": "asyncfun_lambda_lib.ets" } } @@ -554,7 +554,7 @@ }, "end": { "line": 17, - "column": 34, + "column": 32, "program": "asyncfun_lambda_lib.ets" } } 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 0a3c93a3714..9ae6ae1cfbe 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 @@ -562,7 +562,7 @@ }, "end": { "line": 23, - "column": 21, + "column": 19, "program": "asyncfunc_lambda_main.ets" } } @@ -575,7 +575,7 @@ }, "end": { "line": 23, - "column": 21, + "column": 19, "program": "asyncfunc_lambda_main.ets" } } @@ -625,7 +625,7 @@ }, "end": { "line": 23, - "column": 29, + "column": 28, "program": "asyncfunc_lambda_main.ets" } } @@ -638,7 +638,7 @@ }, "end": { "line": 23, - "column": 29, + "column": 28, "program": "asyncfunc_lambda_main.ets" } } @@ -820,7 +820,7 @@ }, "end": { "line": 26, - "column": 21, + "column": 19, "program": "asyncfunc_lambda_main.ets" } } @@ -833,7 +833,7 @@ }, "end": { "line": 26, - "column": 21, + "column": 19, "program": "asyncfunc_lambda_main.ets" } } @@ -883,7 +883,7 @@ }, "end": { "line": 26, - "column": 29, + "column": 28, "program": "asyncfunc_lambda_main.ets" } } @@ -896,7 +896,7 @@ }, "end": { "line": 26, - "column": 29, + "column": 28, "program": "asyncfunc_lambda_main.ets" } } @@ -1063,7 +1063,7 @@ }, "end": { "line": 29, - "column": 21, + "column": 19, "program": "asyncfunc_lambda_main.ets" } } @@ -1076,7 +1076,7 @@ }, "end": { "line": 29, - "column": 21, + "column": 19, "program": "asyncfunc_lambda_main.ets" } } @@ -1126,7 +1126,7 @@ }, "end": { "line": 29, - "column": 29, + "column": 28, "program": "asyncfunc_lambda_main.ets" } } @@ -1139,7 +1139,7 @@ }, "end": { "line": 29, - "column": 29, + "column": 28, "program": "asyncfunc_lambda_main.ets" } } @@ -1373,7 +1373,7 @@ }, "end": { "line": 32, - "column": 21, + "column": 19, "program": "asyncfunc_lambda_main.ets" } } @@ -1386,7 +1386,7 @@ }, "end": { "line": 32, - "column": 21, + "column": 19, "program": "asyncfunc_lambda_main.ets" } } @@ -1436,7 +1436,7 @@ }, "end": { "line": 32, - "column": 29, + "column": 28, "program": "asyncfunc_lambda_main.ets" } } @@ -1449,7 +1449,7 @@ }, "end": { "line": 32, - "column": 29, + "column": 28, "program": "asyncfunc_lambda_main.ets" } } 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 b637e562e8c..187f6198c00 100644 --- a/ets2panda/test/compiler/ets/import_tests/enum_export-expected.txt +++ b/ets2panda/test/compiler/ets/import_tests/enum_export-expected.txt @@ -12509,7 +12509,7 @@ }, "end": { "line": 32, - "column": 21, + "column": 19, "program": "enum_export.ets" } } @@ -12522,7 +12522,7 @@ }, "end": { "line": 32, - "column": 21, + "column": 19, "program": "enum_export.ets" } } 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 5259630c360..918f5784e7b 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 @@ -238,8 +238,8 @@ "program": "export_class_with_getters_setters.ets" }, "end": { - "line": 20, - "column": 2, + "line": 19, + "column": 18, "program": "export_class_with_getters_setters.ets" } } @@ -251,8 +251,8 @@ "program": "export_class_with_getters_setters.ets" }, "end": { - "line": 20, - "column": 2, + "line": 19, + "column": 18, "program": "export_class_with_getters_setters.ets" } } @@ -264,8 +264,8 @@ "program": "export_class_with_getters_setters.ets" }, "end": { - "line": 20, - "column": 2, + "line": 19, + "column": 18, "program": "export_class_with_getters_setters.ets" } } @@ -277,8 +277,8 @@ "program": "export_class_with_getters_setters.ets" }, "end": { - "line": 20, - "column": 2, + "line": 19, + "column": 18, "program": "export_class_with_getters_setters.ets" } } @@ -366,8 +366,8 @@ "program": "export_class_with_getters_setters.ets" }, "end": { - "line": 20, - "column": 2, + "line": 19, + "column": 18, "program": "export_class_with_getters_setters.ets" } } @@ -379,8 +379,8 @@ "program": "export_class_with_getters_setters.ets" }, "end": { - "line": 20, - "column": 2, + "line": 19, + "column": 18, "program": "export_class_with_getters_setters.ets" } } @@ -420,8 +420,8 @@ "program": "export_class_with_getters_setters.ets" }, "end": { - "line": 20, - "column": 2, + "line": 19, + "column": 18, "program": "export_class_with_getters_setters.ets" } } @@ -433,8 +433,8 @@ "program": "export_class_with_getters_setters.ets" }, "end": { - "line": 20, - "column": 2, + "line": 19, + "column": 18, "program": "export_class_with_getters_setters.ets" } } @@ -448,8 +448,8 @@ "program": "export_class_with_getters_setters.ets" }, "end": { - "line": 20, - "column": 2, + "line": 19, + "column": 18, "program": "export_class_with_getters_setters.ets" } } @@ -463,8 +463,8 @@ "program": "export_class_with_getters_setters.ets" }, "end": { - "line": 20, - "column": 2, + "line": 19, + "column": 18, "program": "export_class_with_getters_setters.ets" } } @@ -508,8 +508,8 @@ "program": "export_class_with_getters_setters.ets" }, "end": { - "line": 22, - "column": 7, + "line": 20, + "column": 2, "program": "export_class_with_getters_setters.ets" } } @@ -567,7 +567,7 @@ }, "end": { "line": 22, - "column": 49, + "column": 47, "program": "export_class_with_getters_setters.ets" } } @@ -580,7 +580,7 @@ }, "end": { "line": 22, - "column": 49, + "column": 47, "program": "export_class_with_getters_setters.ets" } } @@ -650,7 +650,7 @@ }, "end": { "line": 23, - "column": 35, + "column": 34, "program": "export_class_with_getters_setters.ets" } } @@ -663,7 +663,7 @@ }, "end": { "line": 23, - "column": 35, + "column": 34, "program": "export_class_with_getters_setters.ets" } } @@ -717,7 +717,7 @@ }, "end": { "line": 23, - "column": 20, + "column": 18, "program": "export_class_with_getters_setters.ets" } } @@ -730,7 +730,7 @@ }, "end": { "line": 23, - "column": 20, + "column": 18, "program": "export_class_with_getters_setters.ets" } } 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 2726b422afa..e61728f4130 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 @@ -329,7 +329,7 @@ }, "end": { "line": 19, - "column": 21, + "column": 20, "program": "generic_typealias_func_type.ets" } } @@ -342,7 +342,7 @@ }, "end": { "line": 19, - "column": 21, + "column": 20, "program": "generic_typealias_func_type.ets" } } @@ -356,7 +356,7 @@ }, "end": { "line": 19, - "column": 21, + "column": 20, "program": "generic_typealias_func_type.ets" } } @@ -369,7 +369,7 @@ }, "end": { "line": 19, - "column": 21, + "column": 20, "program": "generic_typealias_func_type.ets" } } @@ -411,7 +411,7 @@ }, "end": { "line": 19, - "column": 33, + "column": 32, "program": "generic_typealias_func_type.ets" } } @@ -424,7 +424,7 @@ }, "end": { "line": 19, - "column": 33, + "column": 32, "program": "generic_typealias_func_type.ets" } } 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 6b6704bf237..d701d4946ba 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 @@ -57,7 +57,7 @@ }, "end": { "line": 16, - "column": 38, + "column": 37, "program": "generic_typealias_func_type_lib.ets" } } @@ -70,7 +70,7 @@ }, "end": { "line": 16, - "column": 38, + "column": 37, "program": "generic_typealias_func_type_lib.ets" } } @@ -84,7 +84,7 @@ }, "end": { "line": 16, - "column": 38, + "column": 37, "program": "generic_typealias_func_type_lib.ets" } } @@ -97,7 +97,7 @@ }, "end": { "line": 16, - "column": 38, + "column": 37, "program": "generic_typealias_func_type_lib.ets" } } @@ -131,8 +131,8 @@ "program": "generic_typealias_func_type_lib.ets" }, "end": { - "line": 18, - "column": 7, + "line": 16, + "column": 43, "program": "generic_typealias_func_type_lib.ets" } } @@ -144,8 +144,8 @@ "program": "generic_typealias_func_type_lib.ets" }, "end": { - "line": 18, - "column": 7, + "line": 16, + "column": 43, "program": "generic_typealias_func_type_lib.ets" } } @@ -157,8 +157,8 @@ "program": "generic_typealias_func_type_lib.ets" }, "end": { - "line": 18, - "column": 7, + "line": 16, + "column": 43, "program": "generic_typealias_func_type_lib.ets" } } @@ -599,7 +599,7 @@ }, "end": { "line": 18, - "column": 42, + "column": 41, "program": "generic_typealias_func_type_lib.ets" } } @@ -612,7 +612,7 @@ }, "end": { "line": 18, - "column": 42, + "column": 41, "program": "generic_typealias_func_type_lib.ets" } } @@ -646,7 +646,7 @@ }, "end": { "line": 18, - "column": 45, + "column": 44, "program": "generic_typealias_func_type_lib.ets" } } @@ -659,7 +659,7 @@ }, "end": { "line": 18, - "column": 45, + "column": 44, "program": "generic_typealias_func_type_lib.ets" } } @@ -686,7 +686,7 @@ }, "end": { "line": 18, - "column": 46, + "column": 45, "program": "generic_typealias_func_type_lib.ets" } } @@ -699,7 +699,7 @@ }, "end": { "line": 18, - "column": 46, + "column": 45, "program": "generic_typealias_func_type_lib.ets" } } @@ -713,7 +713,7 @@ }, "end": { "line": 18, - "column": 46, + "column": 45, "program": "generic_typealias_func_type_lib.ets" } } @@ -726,7 +726,7 @@ }, "end": { "line": 18, - "column": 46, + "column": 45, "program": "generic_typealias_func_type_lib.ets" } } @@ -761,7 +761,7 @@ }, "end": { "line": 18, - "column": 51, + "column": 49, "program": "generic_typealias_func_type_lib.ets" } } @@ -774,7 +774,7 @@ }, "end": { "line": 18, - "column": 51, + "column": 49, "program": "generic_typealias_func_type_lib.ets" } } 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 831bf3e6e7b..04ebd0a98ab 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 @@ -381,7 +381,7 @@ }, "end": { "line": 19, - "column": 25, + "column": 24, "program": "import_class_with_getters_setters.ets" } } @@ -394,7 +394,7 @@ }, "end": { "line": 19, - "column": 25, + "column": 24, "program": "import_class_with_getters_setters.ets" } } @@ -478,7 +478,7 @@ }, "end": { "line": 20, - "column": 21, + "column": 19, "program": "import_class_with_getters_setters.ets" } } @@ -491,7 +491,7 @@ }, "end": { "line": 20, - "column": 21, + "column": 19, "program": "import_class_with_getters_setters.ets" } } @@ -541,7 +541,7 @@ }, "end": { "line": 20, - "column": 36, + "column": 35, "program": "import_class_with_getters_setters.ets" } } @@ -554,7 +554,7 @@ }, "end": { "line": 20, - "column": 36, + "column": 35, "program": "import_class_with_getters_setters.ets" } } 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 fafbcca9302..123d6ef92b9 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 @@ -304,7 +304,7 @@ }, "end": { "line": 19, - "column": 20, + "column": 18, "program": "infer_imported_function_return_type.ets" } } @@ -317,7 +317,7 @@ }, "end": { "line": 19, - "column": 20, + "column": 18, "program": "infer_imported_function_return_type.ets" } } 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 d7e4adcd2f8..f0570229197 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 @@ -732,7 +732,7 @@ }, "end": { "line": 16, - "column": 30, + "column": 28, "program": "export.ets" } } @@ -745,7 +745,7 @@ }, "end": { "line": 16, - "column": 30, + "column": 28, "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 06e3ee1472d..ca23088a88f 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 @@ -629,7 +629,7 @@ }, "end": { "line": 23, - "column": 32, + "column": 30, "program": "import_aliased_re-export.ets" } } @@ -642,7 +642,7 @@ }, "end": { "line": 23, - "column": 32, + "column": 30, "program": "import_aliased_re-export.ets" } } @@ -692,7 +692,7 @@ }, "end": { "line": 23, - "column": 50, + "column": 49, "program": "import_aliased_re-export.ets" } } @@ -705,7 +705,7 @@ }, "end": { "line": 23, - "column": 50, + "column": 49, "program": "import_aliased_re-export.ets" } } 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 dd90a1ec715..916c83e08dc 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 @@ -185,7 +185,7 @@ }, "end": { "line": 18, - "column": 43, + "column": 41, "program": "import_interface.ets" } } @@ -198,7 +198,7 @@ }, "end": { "line": 18, - "column": 43, + "column": 41, "program": "import_interface.ets" } } @@ -403,7 +403,7 @@ }, "end": { "line": 20, - "column": 47, + "column": 45, "program": "import_interface.ets" } } @@ -416,7 +416,7 @@ }, "end": { "line": 20, - "column": 47, + "column": 45, "program": "import_interface.ets" } } 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 08cdb11de23..c736677ef8c 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 @@ -758,7 +758,7 @@ }, "end": { "line": 34, - "column": 27, + "column": 26, "program": "selective_export.ets" } } @@ -771,7 +771,7 @@ }, "end": { "line": 34, - "column": 27, + "column": 26, "program": "selective_export.ets" } } 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 986b4a3f83a..ebc273ec89f 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 @@ -44,8 +44,8 @@ "program": "selective_export_interface.ets" }, "end": { - "line": 17, - "column": 10, + "line": 16, + "column": 27, "program": "selective_export_interface.ets" } } @@ -93,8 +93,8 @@ "program": "selective_export_interface.ets" }, "end": { - "line": 19, - "column": 7, + "line": 17, + "column": 30, "program": "selective_export_interface.ets" } } 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 d2e7b533380..98d04ba6e30 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 @@ -136,7 +136,7 @@ }, "end": { "line": 18, - "column": 47, + "column": 45, "program": "selective_import_with_alias_1.ets" } } @@ -149,7 +149,7 @@ }, "end": { "line": 18, - "column": 47, + "column": 45, "program": "selective_import_with_alias_1.ets" } } 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 be43e25602f..14afa4bb5f3 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 @@ -136,7 +136,7 @@ }, "end": { "line": 18, - "column": 44, + "column": 42, "program": "selective_import_with_alias_2.ets" } } @@ -149,7 +149,7 @@ }, "end": { "line": 18, - "column": 44, + "column": 42, "program": "selective_import_with_alias_2.ets" } } diff --git a/ets2panda/test/compiler/ets/import_type-expected.txt b/ets2panda/test/compiler/ets/import_type-expected.txt index a7d06b7c06d..e0d55b07a97 100644 --- a/ets2panda/test/compiler/ets/import_type-expected.txt +++ b/ets2panda/test/compiler/ets/import_type-expected.txt @@ -234,7 +234,7 @@ }, "end": { "line": 19, - "column": 23, + "column": 21, "program": "import_type.ets" } } @@ -247,7 +247,7 @@ }, "end": { "line": 19, - "column": 23, + "column": 21, "program": "import_type.ets" } } @@ -633,7 +633,7 @@ }, "end": { "line": 18, - "column": 15, + "column": 14, "program": "import_type.ets" } } @@ -646,7 +646,7 @@ }, "end": { "line": 18, - "column": 15, + "column": 14, "program": "import_type.ets" } } @@ -744,7 +744,7 @@ }, "end": { "line": 20, - "column": 15, + "column": 14, "program": "import_type.ets" } } @@ -757,7 +757,7 @@ }, "end": { "line": 20, - "column": 15, + "column": 14, "program": "import_type.ets" } } @@ -855,7 +855,7 @@ }, "end": { "line": 21, - "column": 15, + "column": 14, "program": "import_type.ets" } } @@ -868,7 +868,7 @@ }, "end": { "line": 21, - "column": 15, + "column": 14, "program": "import_type.ets" } } @@ -1018,7 +1018,7 @@ }, "end": { "line": 18, - "column": 15, + "column": 14, "program": "import_type.ets" } } @@ -1031,7 +1031,7 @@ }, "end": { "line": 18, - "column": 15, + "column": 14, "program": "import_type.ets" } } @@ -1121,7 +1121,7 @@ }, "end": { "line": 20, - "column": 15, + "column": 14, "program": "import_type.ets" } } @@ -1134,7 +1134,7 @@ }, "end": { "line": 20, - "column": 15, + "column": 14, "program": "import_type.ets" } } @@ -1224,7 +1224,7 @@ }, "end": { "line": 21, - "column": 15, + "column": 14, "program": "import_type.ets" } } @@ -1237,7 +1237,7 @@ }, "end": { "line": 21, - "column": 15, + "column": 14, "program": "import_type.ets" } } diff --git a/ets2panda/test/compiler/ets/inferTypeOfArray-expected.txt b/ets2panda/test/compiler/ets/inferTypeOfArray-expected.txt index bd593cc9727..84f87a126b6 100644 --- a/ets2panda/test/compiler/ets/inferTypeOfArray-expected.txt +++ b/ets2panda/test/compiler/ets/inferTypeOfArray-expected.txt @@ -625,7 +625,7 @@ }, "end": { "line": 20, - "column": 32, + "column": 31, "program": "inferTypeOfArray.ets" } } @@ -638,7 +638,7 @@ }, "end": { "line": 20, - "column": 32, + "column": 31, "program": "inferTypeOfArray.ets" } } @@ -1548,7 +1548,7 @@ }, "end": { "line": 20, - "column": 32, + "column": 31, "program": "inferTypeOfArray.ets" } } @@ -1561,7 +1561,7 @@ }, "end": { "line": 20, - "column": 32, + "column": 31, "program": "inferTypeOfArray.ets" } } diff --git a/ets2panda/test/compiler/ets/instanceof_object_long-expected.txt b/ets2panda/test/compiler/ets/instanceof_object_long-expected.txt index a93110f754d..0eb332b3dd4 100644 --- a/ets2panda/test/compiler/ets/instanceof_object_long-expected.txt +++ b/ets2panda/test/compiler/ets/instanceof_object_long-expected.txt @@ -319,7 +319,7 @@ }, "end": { "line": 20, - "column": 23, + "column": 22, "program": "instanceof_object_long.ets" } } @@ -332,7 +332,7 @@ }, "end": { "line": 20, - "column": 23, + "column": 22, "program": "instanceof_object_long.ets" } } @@ -346,7 +346,7 @@ }, "end": { "line": 20, - "column": 23, + "column": 22, "program": "instanceof_object_long.ets" } } @@ -359,7 +359,7 @@ }, "end": { "line": 20, - "column": 23, + "column": 22, "program": "instanceof_object_long.ets" } } 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 07eb0caf227..64bf23e6ca6 100644 --- a/ets2panda/test/compiler/ets/interface_noreturn_type_function-expected.txt +++ b/ets2panda/test/compiler/ets/interface_noreturn_type_function-expected.txt @@ -183,8 +183,8 @@ "program": "interface_noreturn_type_function.ets" }, "end": { - "line": 22, - "column": 6, + "line": 20, + "column": 2, "program": "interface_noreturn_type_function.ets" } } @@ -242,7 +242,7 @@ }, "end": { "line": 22, - "column": 23, + "column": 21, "program": "interface_noreturn_type_function.ets" } } @@ -255,7 +255,7 @@ }, "end": { "line": 22, - "column": 23, + "column": 21, "program": "interface_noreturn_type_function.ets" } } @@ -656,7 +656,7 @@ }, "end": { "line": 25, - "column": 19, + "column": 18, "program": "interface_noreturn_type_function.ets" } } @@ -669,7 +669,7 @@ }, "end": { "line": 25, - "column": 19, + "column": 18, "program": "interface_noreturn_type_function.ets" } } diff --git a/ets2panda/test/compiler/ets/invalidInheritance3-expected.txt b/ets2panda/test/compiler/ets/invalidInheritance3-expected.txt index 3e6c99e7bee..9c8b9b2aed8 100644 --- a/ets2panda/test/compiler/ets/invalidInheritance3-expected.txt +++ b/ets2panda/test/compiler/ets/invalidInheritance3-expected.txt @@ -534,7 +534,7 @@ }, "end": { "line": 20, - "column": 20, + "column": 18, "program": "invalidInheritance3.ets" } } @@ -547,7 +547,7 @@ }, "end": { "line": 20, - "column": 20, + "column": 18, "program": "invalidInheritance3.ets" } } diff --git a/ets2panda/test/compiler/ets/lambdaFunction1-expected.txt b/ets2panda/test/compiler/ets/lambdaFunction1-expected.txt index 327c2296c5e..d69b6613e44 100644 --- a/ets2panda/test/compiler/ets/lambdaFunction1-expected.txt +++ b/ets2panda/test/compiler/ets/lambdaFunction1-expected.txt @@ -1885,7 +1885,7 @@ }, "end": { "line": 40, - "column": 19, + "column": 18, "program": "lambdaFunction1.ets" } } @@ -1898,7 +1898,7 @@ }, "end": { "line": 40, - "column": 19, + "column": 18, "program": "lambdaFunction1.ets" } } diff --git a/ets2panda/test/compiler/ets/lambdaFunctionArrayDeclaration-expected.txt b/ets2panda/test/compiler/ets/lambdaFunctionArrayDeclaration-expected.txt index d8d092b9db6..c9c0acc4412 100644 --- a/ets2panda/test/compiler/ets/lambdaFunctionArrayDeclaration-expected.txt +++ b/ets2panda/test/compiler/ets/lambdaFunctionArrayDeclaration-expected.txt @@ -440,7 +440,7 @@ }, "end": { "line": 17, - "column": 48, + "column": 47, "program": "lambdaFunctionArrayDeclaration.ets" } } @@ -453,7 +453,7 @@ }, "end": { "line": 17, - "column": 48, + "column": 47, "program": "lambdaFunctionArrayDeclaration.ets" } } @@ -467,7 +467,7 @@ }, "end": { "line": 17, - "column": 48, + "column": 47, "program": "lambdaFunctionArrayDeclaration.ets" } } @@ -480,7 +480,7 @@ }, "end": { "line": 17, - "column": 48, + "column": 47, "program": "lambdaFunctionArrayDeclaration.ets" } } diff --git a/ets2panda/test/compiler/ets/lambda_capturing-expected.txt b/ets2panda/test/compiler/ets/lambda_capturing-expected.txt index 47376b0f3a3..244dd1303d7 100644 --- a/ets2panda/test/compiler/ets/lambda_capturing-expected.txt +++ b/ets2panda/test/compiler/ets/lambda_capturing-expected.txt @@ -473,7 +473,7 @@ }, "end": { "line": 18, - "column": 40, + "column": 38, "program": "lambda_capturing.ets" } } @@ -486,7 +486,7 @@ }, "end": { "line": 18, - "column": 40, + "column": 38, "program": "lambda_capturing.ets" } } 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 7ee5a14864c..65842d8dfee 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 @@ -205,7 +205,7 @@ }, "end": { "line": 20, - "column": 20, + "column": 18, "program": "lambda_cast_infer_type_narrowing.ets" } } @@ -218,7 +218,7 @@ }, "end": { "line": 20, - "column": 20, + "column": 18, "program": "lambda_cast_infer_type_narrowing.ets" } } @@ -344,7 +344,7 @@ }, "end": { "line": 22, - "column": 24, + "column": 23, "program": "lambda_cast_infer_type_narrowing.ets" } } @@ -357,7 +357,7 @@ }, "end": { "line": 22, - "column": 24, + "column": 23, "program": "lambda_cast_infer_type_narrowing.ets" } } @@ -371,7 +371,7 @@ }, "end": { "line": 22, - "column": 24, + "column": 23, "program": "lambda_cast_infer_type_narrowing.ets" } } @@ -384,7 +384,7 @@ }, "end": { "line": 22, - "column": 24, + "column": 23, "program": "lambda_cast_infer_type_narrowing.ets" } } @@ -426,7 +426,7 @@ }, "end": { "line": 22, - "column": 43, + "column": 42, "program": "lambda_cast_infer_type_narrowing.ets" } } @@ -439,7 +439,7 @@ }, "end": { "line": 22, - "column": 43, + "column": 42, "program": "lambda_cast_infer_type_narrowing.ets" } } @@ -548,7 +548,7 @@ }, "end": { "line": 22, - "column": 57, + "column": 56, "program": "lambda_cast_infer_type_narrowing.ets" } } @@ -561,7 +561,7 @@ }, "end": { "line": 22, - "column": 57, + "column": 56, "program": "lambda_cast_infer_type_narrowing.ets" } } @@ -575,7 +575,7 @@ }, "end": { "line": 22, - "column": 57, + "column": 56, "program": "lambda_cast_infer_type_narrowing.ets" } } @@ -588,7 +588,7 @@ }, "end": { "line": 22, - "column": 57, + "column": 56, "program": "lambda_cast_infer_type_narrowing.ets" } } @@ -622,8 +622,8 @@ "program": "lambda_cast_infer_type_narrowing.ets" }, "end": { - "line": 23, - "column": 12, + "line": 22, + "column": 62, "program": "lambda_cast_infer_type_narrowing.ets" } } @@ -635,8 +635,8 @@ "program": "lambda_cast_infer_type_narrowing.ets" }, "end": { - "line": 23, - "column": 12, + "line": 22, + "column": 62, "program": "lambda_cast_infer_type_narrowing.ets" } } @@ -648,8 +648,8 @@ "program": "lambda_cast_infer_type_narrowing.ets" }, "end": { - "line": 23, - "column": 12, + "line": 22, + "column": 62, "program": "lambda_cast_infer_type_narrowing.ets" } } @@ -740,7 +740,7 @@ }, "end": { "line": 23, - "column": 31, + "column": 30, "program": "lambda_cast_infer_type_narrowing.ets" } } @@ -753,7 +753,7 @@ }, "end": { "line": 23, - "column": 31, + "column": 30, "program": "lambda_cast_infer_type_narrowing.ets" } } @@ -767,7 +767,7 @@ }, "end": { "line": 23, - "column": 31, + "column": 30, "program": "lambda_cast_infer_type_narrowing.ets" } } @@ -780,7 +780,7 @@ }, "end": { "line": 23, - "column": 31, + "column": 30, "program": "lambda_cast_infer_type_narrowing.ets" } } @@ -815,7 +815,7 @@ }, "end": { "line": 23, - "column": 38, + "column": 36, "program": "lambda_cast_infer_type_narrowing.ets" } } @@ -828,7 +828,7 @@ }, "end": { "line": 23, - "column": 38, + "column": 36, "program": "lambda_cast_infer_type_narrowing.ets" } } @@ -841,7 +841,7 @@ }, "end": { "line": 23, - "column": 38, + "column": 36, "program": "lambda_cast_infer_type_narrowing.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 39f4aa30bb6..cc44cc1b533 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 @@ -205,7 +205,7 @@ }, "end": { "line": 20, - "column": 20, + "column": 18, "program": "lambda_cast_infer_type_widening.ets" } } @@ -218,7 +218,7 @@ }, "end": { "line": 20, - "column": 20, + "column": 18, "program": "lambda_cast_infer_type_widening.ets" } } @@ -344,7 +344,7 @@ }, "end": { "line": 22, - "column": 24, + "column": 23, "program": "lambda_cast_infer_type_widening.ets" } } @@ -357,7 +357,7 @@ }, "end": { "line": 22, - "column": 24, + "column": 23, "program": "lambda_cast_infer_type_widening.ets" } } @@ -371,7 +371,7 @@ }, "end": { "line": 22, - "column": 24, + "column": 23, "program": "lambda_cast_infer_type_widening.ets" } } @@ -384,7 +384,7 @@ }, "end": { "line": 22, - "column": 24, + "column": 23, "program": "lambda_cast_infer_type_widening.ets" } } @@ -426,7 +426,7 @@ }, "end": { "line": 22, - "column": 44, + "column": 42, "program": "lambda_cast_infer_type_widening.ets" } } @@ -439,7 +439,7 @@ }, "end": { "line": 22, - "column": 44, + "column": 42, "program": "lambda_cast_infer_type_widening.ets" } } @@ -548,7 +548,7 @@ }, "end": { "line": 22, - "column": 55, + "column": 54, "program": "lambda_cast_infer_type_widening.ets" } } @@ -561,7 +561,7 @@ }, "end": { "line": 22, - "column": 55, + "column": 54, "program": "lambda_cast_infer_type_widening.ets" } } @@ -575,7 +575,7 @@ }, "end": { "line": 22, - "column": 55, + "column": 54, "program": "lambda_cast_infer_type_widening.ets" } } @@ -588,7 +588,7 @@ }, "end": { "line": 22, - "column": 55, + "column": 54, "program": "lambda_cast_infer_type_widening.ets" } } @@ -622,8 +622,8 @@ "program": "lambda_cast_infer_type_widening.ets" }, "end": { - "line": 23, - "column": 12, + "line": 22, + "column": 60, "program": "lambda_cast_infer_type_widening.ets" } } @@ -635,8 +635,8 @@ "program": "lambda_cast_infer_type_widening.ets" }, "end": { - "line": 23, - "column": 12, + "line": 22, + "column": 60, "program": "lambda_cast_infer_type_widening.ets" } } @@ -648,8 +648,8 @@ "program": "lambda_cast_infer_type_widening.ets" }, "end": { - "line": 23, - "column": 12, + "line": 22, + "column": 60, "program": "lambda_cast_infer_type_widening.ets" } } @@ -740,7 +740,7 @@ }, "end": { "line": 23, - "column": 31, + "column": 30, "program": "lambda_cast_infer_type_widening.ets" } } @@ -753,7 +753,7 @@ }, "end": { "line": 23, - "column": 31, + "column": 30, "program": "lambda_cast_infer_type_widening.ets" } } @@ -767,7 +767,7 @@ }, "end": { "line": 23, - "column": 31, + "column": 30, "program": "lambda_cast_infer_type_widening.ets" } } @@ -780,7 +780,7 @@ }, "end": { "line": 23, - "column": 31, + "column": 30, "program": "lambda_cast_infer_type_widening.ets" } } @@ -815,7 +815,7 @@ }, "end": { "line": 23, - "column": 38, + "column": 36, "program": "lambda_cast_infer_type_widening.ets" } } @@ -828,7 +828,7 @@ }, "end": { "line": 23, - "column": 38, + "column": 36, "program": "lambda_cast_infer_type_widening.ets" } } @@ -841,7 +841,7 @@ }, "end": { "line": 23, - "column": 38, + "column": 36, "program": "lambda_cast_infer_type_widening.ets" } } 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 2785b4bdfcb..8506f7bb23f 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 @@ -249,7 +249,7 @@ }, "end": { "line": 17, - "column": 22, + "column": 21, "program": "lambda_cast_type_has_pramas.ets" } } @@ -262,7 +262,7 @@ }, "end": { "line": 17, - "column": 22, + "column": 21, "program": "lambda_cast_type_has_pramas.ets" } } @@ -276,7 +276,7 @@ }, "end": { "line": 17, - "column": 22, + "column": 21, "program": "lambda_cast_type_has_pramas.ets" } } @@ -289,7 +289,7 @@ }, "end": { "line": 17, - "column": 22, + "column": 21, "program": "lambda_cast_type_has_pramas.ets" } } @@ -406,7 +406,7 @@ }, "end": { "line": 17, - "column": 52, + "column": 51, "program": "lambda_cast_type_has_pramas.ets" } } @@ -419,7 +419,7 @@ }, "end": { "line": 17, - "column": 52, + "column": 51, "program": "lambda_cast_type_has_pramas.ets" } } @@ -433,7 +433,7 @@ }, "end": { "line": 17, - "column": 52, + "column": 51, "program": "lambda_cast_type_has_pramas.ets" } } @@ -446,7 +446,7 @@ }, "end": { "line": 17, - "column": 52, + "column": 51, "program": "lambda_cast_type_has_pramas.ets" } } @@ -480,8 +480,8 @@ "program": "lambda_cast_type_has_pramas.ets" }, "end": { - "line": 18, - "column": 8, + "line": 17, + "column": 59, "program": "lambda_cast_type_has_pramas.ets" } } @@ -493,8 +493,8 @@ "program": "lambda_cast_type_has_pramas.ets" }, "end": { - "line": 18, - "column": 8, + "line": 17, + "column": 59, "program": "lambda_cast_type_has_pramas.ets" } } @@ -506,8 +506,8 @@ "program": "lambda_cast_type_has_pramas.ets" }, "end": { - "line": 18, - "column": 8, + "line": 17, + "column": 59, "program": "lambda_cast_type_has_pramas.ets" } } @@ -598,7 +598,7 @@ }, "end": { "line": 18, - "column": 29, + "column": 28, "program": "lambda_cast_type_has_pramas.ets" } } @@ -611,7 +611,7 @@ }, "end": { "line": 18, - "column": 29, + "column": 28, "program": "lambda_cast_type_has_pramas.ets" } } @@ -625,7 +625,7 @@ }, "end": { "line": 18, - "column": 29, + "column": 28, "program": "lambda_cast_type_has_pramas.ets" } } @@ -638,7 +638,7 @@ }, "end": { "line": 18, - "column": 29, + "column": 28, "program": "lambda_cast_type_has_pramas.ets" } } @@ -673,7 +673,7 @@ }, "end": { "line": 18, - "column": 38, + "column": 36, "program": "lambda_cast_type_has_pramas.ets" } } @@ -686,7 +686,7 @@ }, "end": { "line": 18, - "column": 38, + "column": 36, "program": "lambda_cast_type_has_pramas.ets" } } @@ -699,7 +699,7 @@ }, "end": { "line": 18, - "column": 38, + "column": 36, "program": "lambda_cast_type_has_pramas.ets" } } 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 94ab0e2a26a..a417023c36f 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 @@ -143,7 +143,7 @@ }, "end": { "line": 18, - "column": 29, + "column": 28, "program": "lambda_infer_type_arrow_expression.ets" } } @@ -156,7 +156,7 @@ }, "end": { "line": 18, - "column": 29, + "column": 28, "program": "lambda_infer_type_arrow_expression.ets" } } @@ -296,7 +296,7 @@ }, "end": { "line": 19, - "column": 33, + "column": 31, "program": "lambda_infer_type_arrow_expression.ets" } } @@ -309,7 +309,7 @@ }, "end": { "line": 19, - "column": 33, + "column": 31, "program": "lambda_infer_type_arrow_expression.ets" } } @@ -322,7 +322,7 @@ }, "end": { "line": 19, - "column": 33, + "column": 31, "program": "lambda_infer_type_arrow_expression.ets" } } 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 84d41df13bb..1b5b31b5826 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 @@ -249,7 +249,7 @@ }, "end": { "line": 19, - "column": 35, + "column": 33, "program": "lambda_infer_type_arrow_expression_literal.ets" } } @@ -262,7 +262,7 @@ }, "end": { "line": 19, - "column": 35, + "column": 33, "program": "lambda_infer_type_arrow_expression_literal.ets" } } @@ -275,7 +275,7 @@ }, "end": { "line": 19, - "column": 35, + "column": 33, "program": "lambda_infer_type_arrow_expression_literal.ets" } } 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 84661a99515..68328b0b6e0 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 @@ -147,7 +147,7 @@ }, "end": { "line": 19, - "column": 23, + "column": 21, "program": "lambda_infer_type_has_return.ets" } } @@ -160,7 +160,7 @@ }, "end": { "line": 19, - "column": 23, + "column": 21, "program": "lambda_infer_type_has_return.ets" } } @@ -210,7 +210,7 @@ }, "end": { "line": 19, - "column": 30, + "column": 29, "program": "lambda_infer_type_has_return.ets" } } @@ -223,7 +223,7 @@ }, "end": { "line": 19, - "column": 30, + "column": 29, "program": "lambda_infer_type_has_return.ets" } } @@ -410,7 +410,7 @@ }, "end": { "line": 22, - "column": 33, + "column": 31, "program": "lambda_infer_type_has_return.ets" } } @@ -423,7 +423,7 @@ }, "end": { "line": 22, - "column": 33, + "column": 31, "program": "lambda_infer_type_has_return.ets" } } @@ -436,7 +436,7 @@ }, "end": { "line": 22, - "column": 33, + "column": 31, "program": "lambda_infer_type_has_return.ets" } } 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 1b6f4822a16..4922fd7dd60 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 @@ -492,7 +492,7 @@ }, "end": { "line": 23, - "column": 37, + "column": 35, "program": "lambda_infer_type_return_lambda.ets" } } @@ -505,7 +505,7 @@ }, "end": { "line": 23, - "column": 37, + "column": 35, "program": "lambda_infer_type_return_lambda.ets" } } @@ -518,7 +518,7 @@ }, "end": { "line": 23, - "column": 37, + "column": 35, "program": "lambda_infer_type_return_lambda.ets" } } @@ -531,7 +531,7 @@ }, "end": { "line": 23, - "column": 37, + "column": 35, "program": "lambda_infer_type_return_lambda.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 e52b2b93df8..3f706b38020 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 @@ -355,7 +355,7 @@ }, "end": { "line": 20, - "column": 31, + "column": 29, "program": "lambda_infer_type_return_literal.ets" } } @@ -368,7 +368,7 @@ }, "end": { "line": 20, - "column": 31, + "column": 29, "program": "lambda_infer_type_return_literal.ets" } } @@ -381,7 +381,7 @@ }, "end": { "line": 20, - "column": 31, + "column": 29, "program": "lambda_infer_type_return_literal.ets" } } 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 15901d7ccce..687fd2385a9 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 @@ -256,7 +256,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 18, "program": "lambda_infer_type_return_union.ets" } } @@ -269,7 +269,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 18, "program": "lambda_infer_type_return_union.ets" } } @@ -303,7 +303,7 @@ }, "end": { "line": 18, - "column": 29, + "column": 27, "program": "lambda_infer_type_return_union.ets" } } @@ -316,7 +316,7 @@ }, "end": { "line": 18, - "column": 29, + "column": 27, "program": "lambda_infer_type_return_union.ets" } } @@ -330,7 +330,7 @@ }, "end": { "line": 18, - "column": 29, + "column": 27, "program": "lambda_infer_type_return_union.ets" } } @@ -536,7 +536,7 @@ }, "end": { "line": 21, - "column": 29, + "column": 27, "program": "lambda_infer_type_return_union.ets" } } @@ -549,7 +549,7 @@ }, "end": { "line": 21, - "column": 29, + "column": 27, "program": "lambda_infer_type_return_union.ets" } } @@ -583,7 +583,7 @@ }, "end": { "line": 21, - "column": 38, + "column": 36, "program": "lambda_infer_type_return_union.ets" } } @@ -596,7 +596,7 @@ }, "end": { "line": 21, - "column": 38, + "column": 36, "program": "lambda_infer_type_return_union.ets" } } @@ -610,7 +610,7 @@ }, "end": { "line": 21, - "column": 38, + "column": 36, "program": "lambda_infer_type_return_union.ets" } } @@ -623,7 +623,7 @@ }, "end": { "line": 21, - "column": 38, + "column": 36, "program": "lambda_infer_type_return_union.ets" } } diff --git a/ets2panda/test/compiler/ets/launch_expression-expected.txt b/ets2panda/test/compiler/ets/launch_expression-expected.txt index 10c0205c50b..481e964e2e6 100644 --- a/ets2panda/test/compiler/ets/launch_expression-expected.txt +++ b/ets2panda/test/compiler/ets/launch_expression-expected.txt @@ -158,7 +158,7 @@ }, "end": { "line": 22, - "column": 18, + "column": 17, "program": "launch_expression.ets" } } @@ -171,7 +171,7 @@ }, "end": { "line": 22, - "column": 18, + "column": 17, "program": "launch_expression.ets" } } @@ -198,7 +198,7 @@ }, "end": { "line": 22, - "column": 20, + "column": 18, "program": "launch_expression.ets" } } @@ -211,7 +211,7 @@ }, "end": { "line": 22, - "column": 20, + "column": 18, "program": "launch_expression.ets" } } @@ -1548,7 +1548,7 @@ }, "end": { "line": 28, - "column": 21, + "column": 20, "program": "launch_expression.ets" } } @@ -1561,7 +1561,7 @@ }, "end": { "line": 28, - "column": 21, + "column": 20, "program": "launch_expression.ets" } } @@ -1774,7 +1774,7 @@ }, "end": { "line": 30, - "column": 30, + "column": 28, "program": "launch_expression.ets" } } @@ -1787,7 +1787,7 @@ }, "end": { "line": 30, - "column": 30, + "column": 28, "program": "launch_expression.ets" } } @@ -2173,7 +2173,7 @@ }, "end": { "line": 34, - "column": 24, + "column": 23, "program": "launch_expression.ets" } } @@ -2186,7 +2186,7 @@ }, "end": { "line": 34, - "column": 24, + "column": 23, "program": "launch_expression.ets" } } @@ -2613,7 +2613,7 @@ }, "end": { "line": 36, - "column": 27, + "column": 26, "program": "launch_expression.ets" } } @@ -2626,7 +2626,7 @@ }, "end": { "line": 36, - "column": 27, + "column": 26, "program": "launch_expression.ets" } } @@ -2711,7 +2711,7 @@ }, "end": { "line": 36, - "column": 44, + "column": 43, "program": "launch_expression.ets" } } @@ -2724,7 +2724,7 @@ }, "end": { "line": 36, - "column": 44, + "column": 43, "program": "launch_expression.ets" } } @@ -2737,7 +2737,7 @@ }, "end": { "line": 36, - "column": 44, + "column": 43, "program": "launch_expression.ets" } } @@ -5018,7 +5018,7 @@ }, "end": { "line": 60, - "column": 24, + "column": 23, "program": "launch_expression.ets" } } @@ -5031,7 +5031,7 @@ }, "end": { "line": 60, - "column": 24, + "column": 23, "program": "launch_expression.ets" } } @@ -5116,7 +5116,7 @@ }, "end": { "line": 60, - "column": 41, + "column": 40, "program": "launch_expression.ets" } } @@ -5129,7 +5129,7 @@ }, "end": { "line": 60, - "column": 41, + "column": 40, "program": "launch_expression.ets" } } @@ -5142,7 +5142,7 @@ }, "end": { "line": 60, - "column": 41, + "column": 40, "program": "launch_expression.ets" } } diff --git a/ets2panda/test/compiler/ets/loopWithinLambda-expected.txt b/ets2panda/test/compiler/ets/loopWithinLambda-expected.txt index a281d834d86..503cb31471e 100644 --- a/ets2panda/test/compiler/ets/loopWithinLambda-expected.txt +++ b/ets2panda/test/compiler/ets/loopWithinLambda-expected.txt @@ -690,7 +690,7 @@ }, "end": { "line": 21, - "column": 29, + "column": 27, "program": "loopWithinLambda.ets" } } @@ -703,7 +703,7 @@ }, "end": { "line": 21, - "column": 29, + "column": 27, "program": "loopWithinLambda.ets" } } @@ -1065,7 +1065,7 @@ }, "end": { "line": 22, - "column": 17, + "column": 15, "program": "loopWithinLambda.ets" } } @@ -1078,7 +1078,7 @@ }, "end": { "line": 22, - "column": 17, + "column": 15, "program": "loopWithinLambda.ets" } } @@ -1528,7 +1528,7 @@ }, "end": { "line": 20, - "column": 16, + "column": 14, "program": "loopWithinLambda.ets" } } @@ -1541,7 +1541,7 @@ }, "end": { "line": 20, - "column": 16, + "column": 14, "program": "loopWithinLambda.ets" } } diff --git a/ets2panda/test/compiler/ets/lowering-interaction-expected.txt b/ets2panda/test/compiler/ets/lowering-interaction-expected.txt index e97d598b79a..8007472e073 100644 --- a/ets2panda/test/compiler/ets/lowering-interaction-expected.txt +++ b/ets2panda/test/compiler/ets/lowering-interaction-expected.txt @@ -229,7 +229,7 @@ }, "end": { "line": 19, - "column": 22, + "column": 21, "program": "lowering-interaction.ets" } } @@ -242,7 +242,7 @@ }, "end": { "line": 19, - "column": 22, + "column": 21, "program": "lowering-interaction.ets" } } @@ -296,7 +296,7 @@ }, "end": { "line": 19, - "column": 15, + "column": 13, "program": "lowering-interaction.ets" } } @@ -309,7 +309,7 @@ }, "end": { "line": 19, - "column": 15, + "column": 13, "program": "lowering-interaction.ets" } } @@ -1132,7 +1132,7 @@ }, "end": { "line": 31, - "column": 15, + "column": 13, "program": "lowering-interaction.ets" } } @@ -1145,7 +1145,7 @@ }, "end": { "line": 31, - "column": 15, + "column": 13, "program": "lowering-interaction.ets" } } diff --git a/ets2panda/test/compiler/ets/manyLocalsParamRegUsage-expected.txt b/ets2panda/test/compiler/ets/manyLocalsParamRegUsage-expected.txt index c1180a71845..b72bb48d94e 100644 --- a/ets2panda/test/compiler/ets/manyLocalsParamRegUsage-expected.txt +++ b/ets2panda/test/compiler/ets/manyLocalsParamRegUsage-expected.txt @@ -12318,7 +12318,7 @@ }, "end": { "line": 281, - "column": 25, + "column": 24, "program": "manyLocalsParamRegUsage.ets" } } @@ -12331,7 +12331,7 @@ }, "end": { "line": 281, - "column": 25, + "column": 24, "program": "manyLocalsParamRegUsage.ets" } } @@ -17682,7 +17682,7 @@ }, "end": { "line": 558, - "column": 28, + "column": 26, "program": "manyLocalsParamRegUsage.ets" } } @@ -17695,7 +17695,7 @@ }, "end": { "line": 558, - "column": 28, + "column": 26, "program": "manyLocalsParamRegUsage.ets" } } @@ -17708,7 +17708,7 @@ }, "end": { "line": 558, - "column": 28, + "column": 26, "program": "manyLocalsParamRegUsage.ets" } } @@ -17765,7 +17765,7 @@ }, "end": { "line": 558, - "column": 40, + "column": 37, "program": "manyLocalsParamRegUsage.ets" } } @@ -17778,7 +17778,7 @@ }, "end": { "line": 558, - "column": 40, + "column": 37, "program": "manyLocalsParamRegUsage.ets" } } diff --git a/ets2panda/test/compiler/ets/memberExprInLambda-expected.txt b/ets2panda/test/compiler/ets/memberExprInLambda-expected.txt index 4d8fc13a427..1b860e11caf 100644 --- a/ets2panda/test/compiler/ets/memberExprInLambda-expected.txt +++ b/ets2panda/test/compiler/ets/memberExprInLambda-expected.txt @@ -645,7 +645,7 @@ }, "end": { "line": 20, - "column": 40, + "column": 38, "program": "memberExprInLambda.ets" } } @@ -658,7 +658,7 @@ }, "end": { "line": 20, - "column": 40, + "column": 38, "program": "memberExprInLambda.ets" } } diff --git a/ets2panda/test/compiler/ets/memberExpressionFromStaticContext-expected.txt b/ets2panda/test/compiler/ets/memberExpressionFromStaticContext-expected.txt index aa4becc7505..d7379dffb50 100644 --- a/ets2panda/test/compiler/ets/memberExpressionFromStaticContext-expected.txt +++ b/ets2panda/test/compiler/ets/memberExpressionFromStaticContext-expected.txt @@ -349,7 +349,7 @@ }, "end": { "line": 20, - "column": 28, + "column": 27, "program": "memberExpressionFromStaticContext.ets" } } @@ -362,7 +362,7 @@ }, "end": { "line": 20, - "column": 28, + "column": 27, "program": "memberExpressionFromStaticContext.ets" } } @@ -376,7 +376,7 @@ }, "end": { "line": 20, - "column": 28, + "column": 27, "program": "memberExpressionFromStaticContext.ets" } } @@ -389,7 +389,7 @@ }, "end": { "line": 20, - "column": 28, + "column": 27, "program": "memberExpressionFromStaticContext.ets" } } @@ -1114,7 +1114,7 @@ }, "end": { "line": 30, - "column": 28, + "column": 27, "program": "memberExpressionFromStaticContext.ets" } } @@ -1127,7 +1127,7 @@ }, "end": { "line": 30, - "column": 28, + "column": 27, "program": "memberExpressionFromStaticContext.ets" } } @@ -1141,7 +1141,7 @@ }, "end": { "line": 30, - "column": 28, + "column": 27, "program": "memberExpressionFromStaticContext.ets" } } @@ -1154,7 +1154,7 @@ }, "end": { "line": 30, - "column": 28, + "column": 27, "program": "memberExpressionFromStaticContext.ets" } } @@ -1480,7 +1480,7 @@ }, "end": { "line": 35, - "column": 32, + "column": 31, "program": "memberExpressionFromStaticContext.ets" } } @@ -1493,7 +1493,7 @@ }, "end": { "line": 35, - "column": 32, + "column": 31, "program": "memberExpressionFromStaticContext.ets" } } @@ -1859,7 +1859,7 @@ }, "end": { "line": 40, - "column": 20, + "column": 18, "program": "memberExpressionFromStaticContext.ets" } } @@ -1872,7 +1872,7 @@ }, "end": { "line": 40, - "column": 20, + "column": 18, "program": "memberExpressionFromStaticContext.ets" } } @@ -2204,7 +2204,7 @@ }, "end": { "line": 44, - "column": 28, + "column": 27, "program": "memberExpressionFromStaticContext.ets" } } @@ -2217,7 +2217,7 @@ }, "end": { "line": 44, - "column": 28, + "column": 27, "program": "memberExpressionFromStaticContext.ets" } } @@ -2231,7 +2231,7 @@ }, "end": { "line": 44, - "column": 28, + "column": 27, "program": "memberExpressionFromStaticContext.ets" } } @@ -2244,7 +2244,7 @@ }, "end": { "line": 44, - "column": 28, + "column": 27, "program": "memberExpressionFromStaticContext.ets" } } @@ -2570,7 +2570,7 @@ }, "end": { "line": 49, - "column": 32, + "column": 31, "program": "memberExpressionFromStaticContext.ets" } } @@ -2583,7 +2583,7 @@ }, "end": { "line": 49, - "column": 32, + "column": 31, "program": "memberExpressionFromStaticContext.ets" } } 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 b70b285df18..a7d0864e6de 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 @@ -44,8 +44,8 @@ "program": "method-resolution-class-and-interface-in-signatures_5.ets" }, "end": { - "line": 17, - "column": 10, + "line": 16, + "column": 15, "program": "method-resolution-class-and-interface-in-signatures_5.ets" } } @@ -93,8 +93,8 @@ "program": "method-resolution-class-and-interface-in-signatures_5.ets" }, "end": { - "line": 19, - "column": 6, + "line": 17, + "column": 15, "program": "method-resolution-class-and-interface-in-signatures_5.ets" } } @@ -303,7 +303,7 @@ }, "end": { "line": 20, - "column": 29, + "column": 18, "program": "method-resolution-class-and-interface-in-signatures_5.ets" } } @@ -316,7 +316,7 @@ }, "end": { "line": 20, - "column": 29, + "column": 18, "program": "method-resolution-class-and-interface-in-signatures_5.ets" } } @@ -353,7 +353,7 @@ }, "end": { "line": 20, - "column": 32, + "column": 31, "program": "method-resolution-class-and-interface-in-signatures_5.ets" } } @@ -366,7 +366,7 @@ }, "end": { "line": 20, - "column": 32, + "column": 31, "program": "method-resolution-class-and-interface-in-signatures_5.ets" } } @@ -415,7 +415,7 @@ }, "end": { "line": 20, - "column": 36, + "column": 34, "program": "method-resolution-class-and-interface-in-signatures_5.ets" } } @@ -428,7 +428,7 @@ }, "end": { "line": 20, - "column": 36, + "column": 34, "program": "method-resolution-class-and-interface-in-signatures_5.ets" } } @@ -629,7 +629,7 @@ }, "end": { "line": 21, - "column": 20, + "column": 18, "program": "method-resolution-class-and-interface-in-signatures_5.ets" } } @@ -642,7 +642,7 @@ }, "end": { "line": 21, - "column": 20, + "column": 18, "program": "method-resolution-class-and-interface-in-signatures_5.ets" } } @@ -993,7 +993,7 @@ }, "end": { "line": 23, - "column": 19, + "column": 18, "program": "method-resolution-class-and-interface-in-signatures_5.ets" } } @@ -1006,7 +1006,7 @@ }, "end": { "line": 23, - "column": 19, + "column": 18, "program": "method-resolution-class-and-interface-in-signatures_5.ets" } } @@ -1020,7 +1020,7 @@ }, "end": { "line": 23, - "column": 19, + "column": 18, "program": "method-resolution-class-and-interface-in-signatures_5.ets" } } @@ -1033,7 +1033,7 @@ }, "end": { "line": 23, - "column": 19, + "column": 18, "program": "method-resolution-class-and-interface-in-signatures_5.ets" } } @@ -1068,7 +1068,7 @@ }, "end": { "line": 23, - "column": 29, + "column": 27, "program": "method-resolution-class-and-interface-in-signatures_5.ets" } } @@ -1081,7 +1081,7 @@ }, "end": { "line": 23, - "column": 29, + "column": 27, "program": "method-resolution-class-and-interface-in-signatures_5.ets" } } @@ -1244,7 +1244,7 @@ }, "end": { "line": 26, - "column": 19, + "column": 18, "program": "method-resolution-class-and-interface-in-signatures_5.ets" } } @@ -1257,7 +1257,7 @@ }, "end": { "line": 26, - "column": 19, + "column": 18, "program": "method-resolution-class-and-interface-in-signatures_5.ets" } } @@ -1271,7 +1271,7 @@ }, "end": { "line": 26, - "column": 19, + "column": 18, "program": "method-resolution-class-and-interface-in-signatures_5.ets" } } @@ -1284,7 +1284,7 @@ }, "end": { "line": 26, - "column": 19, + "column": 18, "program": "method-resolution-class-and-interface-in-signatures_5.ets" } } @@ -1319,7 +1319,7 @@ }, "end": { "line": 26, - "column": 29, + "column": 27, "program": "method-resolution-class-and-interface-in-signatures_5.ets" } } @@ -1332,7 +1332,7 @@ }, "end": { "line": 26, - "column": 29, + "column": 27, "program": "method-resolution-class-and-interface-in-signatures_5.ets" } } @@ -1509,7 +1509,7 @@ }, "end": { "line": 29, - "column": 19, + "column": 18, "program": "method-resolution-class-and-interface-in-signatures_5.ets" } } @@ -1522,7 +1522,7 @@ }, "end": { "line": 29, - "column": 19, + "column": 18, "program": "method-resolution-class-and-interface-in-signatures_5.ets" } } @@ -1536,7 +1536,7 @@ }, "end": { "line": 29, - "column": 19, + "column": 18, "program": "method-resolution-class-and-interface-in-signatures_5.ets" } } @@ -1549,7 +1549,7 @@ }, "end": { "line": 29, - "column": 19, + "column": 18, "program": "method-resolution-class-and-interface-in-signatures_5.ets" } } @@ -1584,7 +1584,7 @@ }, "end": { "line": 29, - "column": 29, + "column": 27, "program": "method-resolution-class-and-interface-in-signatures_5.ets" } } @@ -1597,7 +1597,7 @@ }, "end": { "line": 29, - "column": 29, + "column": 27, "program": "method-resolution-class-and-interface-in-signatures_5.ets" } } @@ -1774,7 +1774,7 @@ }, "end": { "line": 32, - "column": 19, + "column": 18, "program": "method-resolution-class-and-interface-in-signatures_5.ets" } } @@ -1787,7 +1787,7 @@ }, "end": { "line": 32, - "column": 19, + "column": 18, "program": "method-resolution-class-and-interface-in-signatures_5.ets" } } @@ -1801,7 +1801,7 @@ }, "end": { "line": 32, - "column": 19, + "column": 18, "program": "method-resolution-class-and-interface-in-signatures_5.ets" } } @@ -1814,7 +1814,7 @@ }, "end": { "line": 32, - "column": 19, + "column": 18, "program": "method-resolution-class-and-interface-in-signatures_5.ets" } } @@ -1849,7 +1849,7 @@ }, "end": { "line": 32, - "column": 29, + "column": 27, "program": "method-resolution-class-and-interface-in-signatures_5.ets" } } @@ -1862,7 +1862,7 @@ }, "end": { "line": 32, - "column": 29, + "column": 27, "program": "method-resolution-class-and-interface-in-signatures_5.ets" } } @@ -2075,7 +2075,7 @@ }, "end": { "line": 37, - "column": 21, + "column": 19, "program": "method-resolution-class-and-interface-in-signatures_5.ets" } } @@ -2088,7 +2088,7 @@ }, "end": { "line": 37, - "column": 21, + "column": 19, "program": "method-resolution-class-and-interface-in-signatures_5.ets" } } @@ -2158,7 +2158,7 @@ }, "end": { "line": 37, - "column": 32, + "column": 31, "program": "method-resolution-class-and-interface-in-signatures_5.ets" } } @@ -2171,7 +2171,7 @@ }, "end": { "line": 37, - "column": 32, + "column": 31, "program": "method-resolution-class-and-interface-in-signatures_5.ets" } } diff --git a/ets2panda/test/compiler/ets/methodOverrideAsyncMethod-expected.txt b/ets2panda/test/compiler/ets/methodOverrideAsyncMethod-expected.txt index 206c21a6614..ba95703b1a5 100644 --- a/ets2panda/test/compiler/ets/methodOverrideAsyncMethod-expected.txt +++ b/ets2panda/test/compiler/ets/methodOverrideAsyncMethod-expected.txt @@ -198,7 +198,7 @@ }, "end": { "line": 17, - "column": 57, + "column": 55, "program": "methodOverrideAsyncMethod.ets" } } @@ -211,7 +211,7 @@ }, "end": { "line": 17, - "column": 57, + "column": 55, "program": "methodOverrideAsyncMethod.ets" } } @@ -734,7 +734,7 @@ }, "end": { "line": 25, - "column": 63, + "column": 61, "program": "methodOverrideAsyncMethod.ets" } } @@ -747,7 +747,7 @@ }, "end": { "line": 25, - "column": 63, + "column": 61, "program": "methodOverrideAsyncMethod.ets" } } diff --git a/ets2panda/test/compiler/ets/methodOverrideCovariantReturnType-expected.txt b/ets2panda/test/compiler/ets/methodOverrideCovariantReturnType-expected.txt index f0848c04faf..b6fe78b2f8c 100644 --- a/ets2panda/test/compiler/ets/methodOverrideCovariantReturnType-expected.txt +++ b/ets2panda/test/compiler/ets/methodOverrideCovariantReturnType-expected.txt @@ -102,7 +102,7 @@ }, "end": { "line": 17, - "column": 23, + "column": 22, "program": "methodOverrideCovariantReturnType.ets" } } @@ -115,7 +115,7 @@ }, "end": { "line": 17, - "column": 23, + "column": 22, "program": "methodOverrideCovariantReturnType.ets" } } @@ -442,8 +442,8 @@ "program": "methodOverrideCovariantReturnType.ets" }, "end": { - "line": 24, - "column": 6, + "line": 22, + "column": 2, "program": "methodOverrideCovariantReturnType.ets" } } @@ -497,7 +497,7 @@ }, "end": { "line": 24, - "column": 29, + "column": 18, "program": "methodOverrideCovariantReturnType.ets" } } @@ -510,7 +510,7 @@ }, "end": { "line": 24, - "column": 29, + "column": 18, "program": "methodOverrideCovariantReturnType.ets" } } @@ -547,7 +547,7 @@ }, "end": { "line": 24, - "column": 32, + "column": 31, "program": "methodOverrideCovariantReturnType.ets" } } @@ -560,7 +560,7 @@ }, "end": { "line": 24, - "column": 32, + "column": 31, "program": "methodOverrideCovariantReturnType.ets" } } @@ -658,7 +658,7 @@ }, "end": { "line": 25, - "column": 24, + "column": 22, "program": "methodOverrideCovariantReturnType.ets" } } @@ -671,7 +671,7 @@ }, "end": { "line": 25, - "column": 24, + "column": 22, "program": "methodOverrideCovariantReturnType.ets" } } @@ -1238,7 +1238,7 @@ }, "end": { "line": 37, - "column": 20, + "column": 18, "program": "methodOverrideCovariantReturnType.ets" } } @@ -1251,7 +1251,7 @@ }, "end": { "line": 37, - "column": 20, + "column": 18, "program": "methodOverrideCovariantReturnType.ets" } } @@ -1336,7 +1336,7 @@ }, "end": { "line": 38, - "column": 24, + "column": 22, "program": "methodOverrideCovariantReturnType.ets" } } @@ -1349,7 +1349,7 @@ }, "end": { "line": 38, - "column": 24, + "column": 22, "program": "methodOverrideCovariantReturnType.ets" } } @@ -1394,7 +1394,7 @@ }, "end": { "line": 39, - "column": 24, + "column": 22, "program": "methodOverrideCovariantReturnType.ets" } } @@ -1407,7 +1407,7 @@ }, "end": { "line": 39, - "column": 24, + "column": 22, "program": "methodOverrideCovariantReturnType.ets" } } @@ -1457,7 +1457,7 @@ }, "end": { "line": 39, - "column": 31, + "column": 30, "program": "methodOverrideCovariantReturnType.ets" } } @@ -1470,7 +1470,7 @@ }, "end": { "line": 39, - "column": 31, + "column": 30, "program": "methodOverrideCovariantReturnType.ets" } } @@ -1716,7 +1716,7 @@ }, "end": { "line": 42, - "column": 21, + "column": 19, "program": "methodOverrideCovariantReturnType.ets" } } @@ -1729,7 +1729,7 @@ }, "end": { "line": 42, - "column": 21, + "column": 19, "program": "methodOverrideCovariantReturnType.ets" } } @@ -1774,7 +1774,7 @@ }, "end": { "line": 43, - "column": 24, + "column": 22, "program": "methodOverrideCovariantReturnType.ets" } } @@ -1787,7 +1787,7 @@ }, "end": { "line": 43, - "column": 24, + "column": 22, "program": "methodOverrideCovariantReturnType.ets" } } @@ -1837,7 +1837,7 @@ }, "end": { "line": 43, - "column": 31, + "column": 30, "program": "methodOverrideCovariantReturnType.ets" } } @@ -1850,7 +1850,7 @@ }, "end": { "line": 43, - "column": 31, + "column": 30, "program": "methodOverrideCovariantReturnType.ets" } } diff --git a/ets2panda/test/compiler/ets/methodOverrideDifferentSignature-expected.txt b/ets2panda/test/compiler/ets/methodOverrideDifferentSignature-expected.txt index 5ff1567cc22..02bf5b60ba3 100644 --- a/ets2panda/test/compiler/ets/methodOverrideDifferentSignature-expected.txt +++ b/ets2panda/test/compiler/ets/methodOverrideDifferentSignature-expected.txt @@ -150,8 +150,8 @@ "program": "methodOverrideDifferentSignature.ets" }, "end": { - "line": 20, - "column": 9, + "line": 18, + "column": 2, "program": "methodOverrideDifferentSignature.ets" } } @@ -209,7 +209,7 @@ }, "end": { "line": 20, - "column": 32, + "column": 30, "program": "methodOverrideDifferentSignature.ets" } } @@ -222,7 +222,7 @@ }, "end": { "line": 20, - "column": 32, + "column": 30, "program": "methodOverrideDifferentSignature.ets" } } @@ -972,7 +972,7 @@ }, "end": { "line": 31, - "column": 20, + "column": 18, "program": "methodOverrideDifferentSignature.ets" } } @@ -985,7 +985,7 @@ }, "end": { "line": 31, - "column": 20, + "column": 18, "program": "methodOverrideDifferentSignature.ets" } } diff --git a/ets2panda/test/compiler/ets/methodOverrideWithoutModifier-expected.txt b/ets2panda/test/compiler/ets/methodOverrideWithoutModifier-expected.txt index b0e01bfbf17..3542cd7533e 100644 --- a/ets2panda/test/compiler/ets/methodOverrideWithoutModifier-expected.txt +++ b/ets2panda/test/compiler/ets/methodOverrideWithoutModifier-expected.txt @@ -326,7 +326,7 @@ }, "end": { "line": 22, - "column": 20, + "column": 18, "program": "methodOverrideWithoutModifier.ets" } } @@ -339,7 +339,7 @@ }, "end": { "line": 22, - "column": 20, + "column": 18, "program": "methodOverrideWithoutModifier.ets" } } diff --git a/ets2panda/test/compiler/ets/multipleMethodOverride-expected.txt b/ets2panda/test/compiler/ets/multipleMethodOverride-expected.txt index 89d9bd12269..3aab31ccb78 100644 --- a/ets2panda/test/compiler/ets/multipleMethodOverride-expected.txt +++ b/ets2panda/test/compiler/ets/multipleMethodOverride-expected.txt @@ -326,7 +326,7 @@ }, "end": { "line": 22, - "column": 19, + "column": 18, "program": "multipleMethodOverride.ets" } } @@ -339,7 +339,7 @@ }, "end": { "line": 22, - "column": 19, + "column": 18, "program": "multipleMethodOverride.ets" } } @@ -648,7 +648,7 @@ }, "end": { "line": 29, - "column": 19, + "column": 18, "program": "multipleMethodOverride.ets" } } @@ -661,7 +661,7 @@ }, "end": { "line": 29, - "column": 19, + "column": 18, "program": "multipleMethodOverride.ets" } } @@ -849,7 +849,7 @@ }, "end": { "line": 33, - "column": 20, + "column": 18, "program": "multipleMethodOverride.ets" } } @@ -862,7 +862,7 @@ }, "end": { "line": 33, - "column": 20, + "column": 18, "program": "multipleMethodOverride.ets" } } diff --git a/ets2panda/test/compiler/ets/n_nullableTypeInArgNotRef-expected.txt b/ets2panda/test/compiler/ets/n_nullableTypeInArgNotRef-expected.txt index 54d1502833e..6fe61e5e2f4 100644 --- a/ets2panda/test/compiler/ets/n_nullableTypeInArgNotRef-expected.txt +++ b/ets2panda/test/compiler/ets/n_nullableTypeInArgNotRef-expected.txt @@ -631,7 +631,7 @@ }, "end": { "line": 21, - "column": 37, + "column": 35, "program": "n_nullableTypeInArgNotRef.ets" } } @@ -644,7 +644,7 @@ }, "end": { "line": 21, - "column": 37, + "column": 35, "program": "n_nullableTypeInArgNotRef.ets" } } diff --git a/ets2panda/test/compiler/ets/native_toplevel-expected.txt b/ets2panda/test/compiler/ets/native_toplevel-expected.txt index 58147c8f0af..9c847e756b6 100644 --- a/ets2panda/test/compiler/ets/native_toplevel-expected.txt +++ b/ets2panda/test/compiler/ets/native_toplevel-expected.txt @@ -319,7 +319,7 @@ }, "end": { "line": 16, - "column": 35, + "column": 34, "program": "native_toplevel.ets" } } @@ -332,7 +332,7 @@ }, "end": { "line": 16, - "column": 35, + "column": 34, "program": "native_toplevel.ets" } } @@ -346,7 +346,7 @@ }, "end": { "line": 16, - "column": 35, + "column": 34, "program": "native_toplevel.ets" } } @@ -359,7 +359,7 @@ }, "end": { "line": 16, - "column": 35, + "column": 34, "program": "native_toplevel.ets" } } @@ -394,7 +394,7 @@ }, "end": { "line": 16, - "column": 44, + "column": 43, "program": "native_toplevel.ets" } } @@ -407,7 +407,7 @@ }, "end": { "line": 16, - "column": 44, + "column": 43, "program": "native_toplevel.ets" } } 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 c03de913a8c..a353fa605b5 100644 --- a/ets2panda/test/compiler/ets/null_coalescing_generic_1-expected.txt +++ b/ets2panda/test/compiler/ets/null_coalescing_generic_1-expected.txt @@ -477,7 +477,7 @@ }, "end": { "line": 17, - "column": 14, + "column": 12, "program": "null_coalescing_generic_1.ets" } } @@ -490,7 +490,7 @@ }, "end": { "line": 17, - "column": 14, + "column": 12, "program": "null_coalescing_generic_1.ets" } } @@ -596,7 +596,7 @@ }, "end": { "line": 18, - "column": 24, + "column": 22, "program": "null_coalescing_generic_1.ets" } } @@ -609,7 +609,7 @@ }, "end": { "line": 18, - "column": 24, + "column": 22, "program": "null_coalescing_generic_1.ets" } } @@ -699,8 +699,8 @@ "program": "null_coalescing_generic_1.ets" }, "end": { - "line": 19, - "column": 2, + "line": 18, + "column": 40, "program": "null_coalescing_generic_1.ets" } } @@ -712,8 +712,8 @@ "program": "null_coalescing_generic_1.ets" }, "end": { - "line": 19, - "column": 2, + "line": 18, + "column": 40, "program": "null_coalescing_generic_1.ets" } } @@ -725,8 +725,8 @@ "program": "null_coalescing_generic_1.ets" }, "end": { - "line": 19, - "column": 2, + "line": 18, + "column": 40, "program": "null_coalescing_generic_1.ets" } } @@ -739,8 +739,8 @@ "program": "null_coalescing_generic_1.ets" }, "end": { - "line": 19, - "column": 2, + "line": 18, + "column": 40, "program": "null_coalescing_generic_1.ets" } } @@ -752,8 +752,8 @@ "program": "null_coalescing_generic_1.ets" }, "end": { - "line": 19, - "column": 2, + "line": 18, + "column": 40, "program": "null_coalescing_generic_1.ets" } } @@ -788,7 +788,7 @@ }, "end": { "line": 19, - "column": 7, + "column": 5, "program": "null_coalescing_generic_1.ets" } } @@ -801,7 +801,7 @@ }, "end": { "line": 19, - "column": 7, + "column": 5, "program": "null_coalescing_generic_1.ets" } } @@ -857,7 +857,7 @@ }, "end": { "line": 16, - "column": 35, + "column": 34, "program": "null_coalescing_generic_1.ets" } } @@ -870,7 +870,7 @@ }, "end": { "line": 16, - "column": 35, + "column": 34, "program": "null_coalescing_generic_1.ets" } } @@ -1174,7 +1174,7 @@ }, "end": { "line": 24, - "column": 37, + "column": 36, "program": "null_coalescing_generic_1.ets" } } @@ -1187,7 +1187,7 @@ }, "end": { "line": 24, - "column": 37, + "column": 36, "program": "null_coalescing_generic_1.ets" } } @@ -1201,7 +1201,7 @@ }, "end": { "line": 24, - "column": 37, + "column": 36, "program": "null_coalescing_generic_1.ets" } } @@ -1214,7 +1214,7 @@ }, "end": { "line": 24, - "column": 37, + "column": 36, "program": "null_coalescing_generic_1.ets" } } @@ -1286,7 +1286,7 @@ }, "end": { "line": 24, - "column": 28, + "column": 27, "program": "null_coalescing_generic_1.ets" } } @@ -1299,7 +1299,7 @@ }, "end": { "line": 24, - "column": 28, + "column": 27, "program": "null_coalescing_generic_1.ets" } } @@ -1371,7 +1371,7 @@ }, "end": { "line": 25, - "column": 21, + "column": 19, "program": "null_coalescing_generic_1.ets" } } @@ -1384,7 +1384,7 @@ }, "end": { "line": 25, - "column": 21, + "column": 19, "program": "null_coalescing_generic_1.ets" } } @@ -1434,7 +1434,7 @@ }, "end": { "line": 25, - "column": 28, + "column": 27, "program": "null_coalescing_generic_1.ets" } } @@ -1447,7 +1447,7 @@ }, "end": { "line": 25, - "column": 28, + "column": 27, "program": "null_coalescing_generic_1.ets" } } @@ -1531,7 +1531,7 @@ }, "end": { "line": 26, - "column": 24, + "column": 22, "program": "null_coalescing_generic_1.ets" } } @@ -1544,7 +1544,7 @@ }, "end": { "line": 26, - "column": 24, + "column": 22, "program": "null_coalescing_generic_1.ets" } } @@ -1779,7 +1779,7 @@ }, "end": { "line": 29, - "column": 35, + "column": 34, "program": "null_coalescing_generic_1.ets" } } @@ -1792,7 +1792,7 @@ }, "end": { "line": 29, - "column": 35, + "column": 34, "program": "null_coalescing_generic_1.ets" } } @@ -1806,7 +1806,7 @@ }, "end": { "line": 29, - "column": 35, + "column": 34, "program": "null_coalescing_generic_1.ets" } } @@ -1819,7 +1819,7 @@ }, "end": { "line": 29, - "column": 35, + "column": 34, "program": "null_coalescing_generic_1.ets" } } @@ -1854,7 +1854,7 @@ }, "end": { "line": 29, - "column": 47, + "column": 45, "program": "null_coalescing_generic_1.ets" } } @@ -1867,7 +1867,7 @@ }, "end": { "line": 29, - "column": 47, + "column": 45, "program": "null_coalescing_generic_1.ets" } } @@ -1923,7 +1923,7 @@ }, "end": { "line": 29, - "column": 28, + "column": 27, "program": "null_coalescing_generic_1.ets" } } @@ -1936,7 +1936,7 @@ }, "end": { "line": 29, - "column": 28, + "column": 27, "program": "null_coalescing_generic_1.ets" } } @@ -2008,7 +2008,7 @@ }, "end": { "line": 30, - "column": 23, + "column": 21, "program": "null_coalescing_generic_1.ets" } } @@ -2021,7 +2021,7 @@ }, "end": { "line": 30, - "column": 23, + "column": 21, "program": "null_coalescing_generic_1.ets" } } diff --git a/ets2panda/test/compiler/ets/nullableTuple-expected.txt b/ets2panda/test/compiler/ets/nullableTuple-expected.txt index b8e7ca99db5..38ba719834b 100644 --- a/ets2panda/test/compiler/ets/nullableTuple-expected.txt +++ b/ets2panda/test/compiler/ets/nullableTuple-expected.txt @@ -52,7 +52,7 @@ }, "end": { "line": 16, - "column": 34, + "column": 33, "program": "nullableTuple.ets" } } @@ -65,7 +65,7 @@ }, "end": { "line": 16, - "column": 34, + "column": 33, "program": "nullableTuple.ets" } } @@ -99,7 +99,7 @@ }, "end": { "line": 16, - "column": 42, + "column": 41, "program": "nullableTuple.ets" } } @@ -112,7 +112,7 @@ }, "end": { "line": 16, - "column": 42, + "column": 41, "program": "nullableTuple.ets" } } @@ -195,7 +195,7 @@ }, "end": { "line": 17, - "column": 38, + "column": 37, "program": "nullableTuple.ets" } } @@ -208,7 +208,7 @@ }, "end": { "line": 17, - "column": 38, + "column": 37, "program": "nullableTuple.ets" } } @@ -488,7 +488,7 @@ }, "end": { "line": 20, - "column": 30, + "column": 28, "program": "nullableTuple.ets" } } @@ -501,7 +501,7 @@ }, "end": { "line": 20, - "column": 30, + "column": 28, "program": "nullableTuple.ets" } } @@ -634,7 +634,7 @@ }, "end": { "line": 21, - "column": 24, + "column": 22, "program": "nullableTuple.ets" } } @@ -647,7 +647,7 @@ }, "end": { "line": 21, - "column": 24, + "column": 22, "program": "nullableTuple.ets" } } 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 8ba128c6557..b933d7cb695 100644 --- a/ets2panda/test/compiler/ets/nullable_type_in_arithmeticdiv-expected.txt +++ b/ets2panda/test/compiler/ets/nullable_type_in_arithmeticdiv-expected.txt @@ -222,7 +222,7 @@ }, "end": { "line": 17, - "column": 16, + "column": 15, "program": "nullable_type_in_arithmeticdiv.ets" } } @@ -235,7 +235,7 @@ }, "end": { "line": 17, - "column": 16, + "column": 15, "program": "nullable_type_in_arithmeticdiv.ets" } } @@ -367,7 +367,7 @@ }, "end": { "line": 18, - "column": 19, + "column": 18, "program": "nullable_type_in_arithmeticdiv.ets" } } @@ -380,7 +380,7 @@ }, "end": { "line": 18, - "column": 19, + "column": 18, "program": "nullable_type_in_arithmeticdiv.ets" } } 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 44d8c319bc5..dc6a8bf4b31 100644 --- a/ets2panda/test/compiler/ets/nullable_type_in_arithmeticplus-expected.txt +++ b/ets2panda/test/compiler/ets/nullable_type_in_arithmeticplus-expected.txt @@ -222,7 +222,7 @@ }, "end": { "line": 17, - "column": 16, + "column": 15, "program": "nullable_type_in_arithmeticplus.ets" } } @@ -235,7 +235,7 @@ }, "end": { "line": 17, - "column": 16, + "column": 15, "program": "nullable_type_in_arithmeticplus.ets" } } @@ -367,7 +367,7 @@ }, "end": { "line": 18, - "column": 19, + "column": 18, "program": "nullable_type_in_arithmeticplus.ets" } } @@ -380,7 +380,7 @@ }, "end": { "line": 18, - "column": 19, + "column": 18, "program": "nullable_type_in_arithmeticplus.ets" } } diff --git a/ets2panda/test/compiler/ets/objectLiteralInterface-expected.txt b/ets2panda/test/compiler/ets/objectLiteralInterface-expected.txt index f8825ab52ef..87538967ebb 100644 --- a/ets2panda/test/compiler/ets/objectLiteralInterface-expected.txt +++ b/ets2panda/test/compiler/ets/objectLiteralInterface-expected.txt @@ -44,8 +44,8 @@ "program": "objectLiteralInterface.ets" }, "end": { - "line": 18, - "column": 4, + "line": 16, + "column": 15, "program": "objectLiteralInterface.ets" } } @@ -404,7 +404,7 @@ }, "end": { "line": 18, - "column": 11, + "column": 9, "program": "objectLiteralInterface.ets" } } @@ -417,7 +417,7 @@ }, "end": { "line": 18, - "column": 11, + "column": 9, "program": "objectLiteralInterface.ets" } } diff --git a/ets2panda/test/compiler/ets/objectLiteralReadonlyKey-expected.txt b/ets2panda/test/compiler/ets/objectLiteralReadonlyKey-expected.txt index c6b01e8dda0..7542430a1ad 100644 --- a/ets2panda/test/compiler/ets/objectLiteralReadonlyKey-expected.txt +++ b/ets2panda/test/compiler/ets/objectLiteralReadonlyKey-expected.txt @@ -618,7 +618,7 @@ }, "end": { "line": 20, - "column": 11, + "column": 9, "program": "objectLiteralReadonlyKey.ets" } } @@ -631,7 +631,7 @@ }, "end": { "line": 20, - "column": 11, + "column": 9, "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 d7052bb0488..b9f327529ea 100644 --- a/ets2panda/test/compiler/ets/overload_with_generics-expected.txt +++ b/ets2panda/test/compiler/ets/overload_with_generics-expected.txt @@ -107,7 +107,7 @@ }, "end": { "line": 17, - "column": 35, + "column": 34, "program": "overload_with_generics.ets" } } @@ -120,7 +120,7 @@ }, "end": { "line": 17, - "column": 35, + "column": 34, "program": "overload_with_generics.ets" } } @@ -134,7 +134,7 @@ }, "end": { "line": 17, - "column": 35, + "column": 34, "program": "overload_with_generics.ets" } } @@ -147,7 +147,7 @@ }, "end": { "line": 17, - "column": 35, + "column": 34, "program": "overload_with_generics.ets" } } @@ -343,7 +343,7 @@ }, "end": { "line": 18, - "column": 40, + "column": 39, "program": "overload_with_generics.ets" } } @@ -356,7 +356,7 @@ }, "end": { "line": 18, - "column": 40, + "column": 39, "program": "overload_with_generics.ets" } } @@ -370,7 +370,7 @@ }, "end": { "line": 18, - "column": 40, + "column": 39, "program": "overload_with_generics.ets" } } @@ -383,7 +383,7 @@ }, "end": { "line": 18, - "column": 40, + "column": 39, "program": "overload_with_generics.ets" } } @@ -422,7 +422,7 @@ }, "end": { "line": 18, - "column": 50, + "column": 49, "program": "overload_with_generics.ets" } } @@ -435,7 +435,7 @@ }, "end": { "line": 18, - "column": 50, + "column": 49, "program": "overload_with_generics.ets" } } @@ -449,7 +449,7 @@ }, "end": { "line": 18, - "column": 50, + "column": 49, "program": "overload_with_generics.ets" } } @@ -462,7 +462,7 @@ }, "end": { "line": 18, - "column": 50, + "column": 49, "program": "overload_with_generics.ets" } } diff --git a/ets2panda/test/compiler/ets/override-expected.txt b/ets2panda/test/compiler/ets/override-expected.txt index e10847ed61a..c6bb1561347 100644 --- a/ets2panda/test/compiler/ets/override-expected.txt +++ b/ets2panda/test/compiler/ets/override-expected.txt @@ -84,7 +84,7 @@ }, "end": { "line": 17, - "column": 16, + "column": 15, "program": "override.ets" } } @@ -97,7 +97,7 @@ }, "end": { "line": 17, - "column": 16, + "column": 15, "program": "override.ets" } } @@ -110,7 +110,7 @@ }, "end": { "line": 17, - "column": 16, + "column": 15, "program": "override.ets" } } @@ -123,7 +123,7 @@ }, "end": { "line": 17, - "column": 16, + "column": 15, "program": "override.ets" } } @@ -221,7 +221,7 @@ }, "end": { "line": 18, - "column": 17, + "column": 16, "program": "override.ets" } } @@ -234,7 +234,7 @@ }, "end": { "line": 18, - "column": 17, + "column": 16, "program": "override.ets" } } @@ -247,7 +247,7 @@ }, "end": { "line": 18, - "column": 17, + "column": 16, "program": "override.ets" } } @@ -260,7 +260,7 @@ }, "end": { "line": 18, - "column": 17, + "column": 16, "program": "override.ets" } } @@ -358,7 +358,7 @@ }, "end": { "line": 19, - "column": 17, + "column": 16, "program": "override.ets" } } @@ -371,7 +371,7 @@ }, "end": { "line": 19, - "column": 17, + "column": 16, "program": "override.ets" } } @@ -384,7 +384,7 @@ }, "end": { "line": 19, - "column": 17, + "column": 16, "program": "override.ets" } } @@ -397,7 +397,7 @@ }, "end": { "line": 19, - "column": 17, + "column": 16, "program": "override.ets" } } @@ -519,7 +519,7 @@ }, "end": { "line": 20, - "column": 28, + "column": 27, "program": "override.ets" } } @@ -532,7 +532,7 @@ }, "end": { "line": 20, - "column": 28, + "column": 27, "program": "override.ets" } } @@ -559,7 +559,7 @@ }, "end": { "line": 20, - "column": 29, + "column": 28, "program": "override.ets" } } @@ -572,7 +572,7 @@ }, "end": { "line": 20, - "column": 29, + "column": 28, "program": "override.ets" } } @@ -585,7 +585,7 @@ }, "end": { "line": 20, - "column": 29, + "column": 28, "program": "override.ets" } } @@ -598,7 +598,7 @@ }, "end": { "line": 20, - "column": 29, + "column": 28, "program": "override.ets" } } @@ -657,8 +657,8 @@ "program": "override.ets" }, "end": { - "line": 23, - "column": 6, + "line": 21, + "column": 2, "program": "override.ets" } } @@ -716,7 +716,7 @@ }, "end": { "line": 23, - "column": 23, + "column": 21, "program": "override.ets" } } @@ -729,7 +729,7 @@ }, "end": { "line": 23, - "column": 23, + "column": 21, "program": "override.ets" } } @@ -827,7 +827,7 @@ }, "end": { "line": 24, - "column": 26, + "column": 24, "program": "override.ets" } } @@ -840,7 +840,7 @@ }, "end": { "line": 24, - "column": 26, + "column": 24, "program": "override.ets" } } @@ -1036,7 +1036,7 @@ }, "end": { "line": 25, - "column": 37, + "column": 36, "program": "override.ets" } } @@ -1049,7 +1049,7 @@ }, "end": { "line": 25, - "column": 37, + "column": 36, "program": "override.ets" } } @@ -1076,7 +1076,7 @@ }, "end": { "line": 25, - "column": 39, + "column": 37, "program": "override.ets" } } @@ -1089,7 +1089,7 @@ }, "end": { "line": 25, - "column": 39, + "column": 37, "program": "override.ets" } } @@ -1133,7 +1133,7 @@ }, "end": { "line": 25, - "column": 59, + "column": 58, "program": "override.ets" } } @@ -1146,7 +1146,7 @@ }, "end": { "line": 25, - "column": 59, + "column": 58, "program": "override.ets" } } @@ -1357,7 +1357,7 @@ }, "end": { "line": 26, - "column": 36, + "column": 34, "program": "override.ets" } } @@ -1370,7 +1370,7 @@ }, "end": { "line": 26, - "column": 36, + "column": 34, "program": "override.ets" } } @@ -1583,7 +1583,7 @@ }, "end": { "line": 27, - "column": 37, + "column": 36, "program": "override.ets" } } @@ -1596,7 +1596,7 @@ }, "end": { "line": 27, - "column": 37, + "column": 36, "program": "override.ets" } } @@ -1623,7 +1623,7 @@ }, "end": { "line": 27, - "column": 39, + "column": 37, "program": "override.ets" } } @@ -1636,7 +1636,7 @@ }, "end": { "line": 27, - "column": 39, + "column": 37, "program": "override.ets" } } diff --git a/ets2panda/test/compiler/ets/override10-expected.txt b/ets2panda/test/compiler/ets/override10-expected.txt index 9d7a82d6d2a..f71899b72ae 100644 --- a/ets2panda/test/compiler/ets/override10-expected.txt +++ b/ets2panda/test/compiler/ets/override10-expected.txt @@ -480,7 +480,7 @@ }, "end": { "line": 20, - "column": 26, + "column": 25, "program": "override10.ets" } } @@ -493,7 +493,7 @@ }, "end": { "line": 20, - "column": 26, + "column": 25, "program": "override10.ets" } } @@ -520,7 +520,7 @@ }, "end": { "line": 20, - "column": 28, + "column": 26, "program": "override10.ets" } } @@ -533,7 +533,7 @@ }, "end": { "line": 20, - "column": 28, + "column": 26, "program": "override10.ets" } } diff --git a/ets2panda/test/compiler/ets/override12-expected.txt b/ets2panda/test/compiler/ets/override12-expected.txt index 35d00ec6c99..8fa610e91cf 100644 --- a/ets2panda/test/compiler/ets/override12-expected.txt +++ b/ets2panda/test/compiler/ets/override12-expected.txt @@ -156,7 +156,7 @@ }, "end": { "line": 17, - "column": 11, + "column": 10, "program": "override12.ets" } } @@ -169,7 +169,7 @@ }, "end": { "line": 17, - "column": 11, + "column": 10, "program": "override12.ets" } } @@ -183,7 +183,7 @@ }, "end": { "line": 17, - "column": 11, + "column": 10, "program": "override12.ets" } } @@ -196,7 +196,7 @@ }, "end": { "line": 17, - "column": 11, + "column": 10, "program": "override12.ets" } } @@ -231,7 +231,7 @@ }, "end": { "line": 17, - "column": 16, + "column": 14, "program": "override12.ets" } } @@ -244,7 +244,7 @@ }, "end": { "line": 17, - "column": 16, + "column": 14, "program": "override12.ets" } } @@ -422,7 +422,7 @@ }, "end": { "line": 18, - "column": 12, + "column": 11, "program": "override12.ets" } } @@ -435,7 +435,7 @@ }, "end": { "line": 18, - "column": 12, + "column": 11, "program": "override12.ets" } } @@ -449,7 +449,7 @@ }, "end": { "line": 18, - "column": 12, + "column": 11, "program": "override12.ets" } } @@ -462,7 +462,7 @@ }, "end": { "line": 18, - "column": 12, + "column": 11, "program": "override12.ets" } } @@ -497,7 +497,7 @@ }, "end": { "line": 18, - "column": 17, + "column": 15, "program": "override12.ets" } } @@ -510,7 +510,7 @@ }, "end": { "line": 18, - "column": 17, + "column": 15, "program": "override12.ets" } } @@ -810,7 +810,7 @@ }, "end": { "line": 21, - "column": 26, + "column": 25, "program": "override12.ets" } } @@ -823,7 +823,7 @@ }, "end": { "line": 21, - "column": 26, + "column": 25, "program": "override12.ets" } } @@ -850,7 +850,7 @@ }, "end": { "line": 21, - "column": 28, + "column": 26, "program": "override12.ets" } } @@ -863,7 +863,7 @@ }, "end": { "line": 21, - "column": 28, + "column": 26, "program": "override12.ets" } } @@ -953,7 +953,7 @@ }, "end": { "line": 22, - "column": 25, + "column": 24, "program": "override12.ets" } } @@ -966,7 +966,7 @@ }, "end": { "line": 22, - "column": 25, + "column": 24, "program": "override12.ets" } } @@ -980,7 +980,7 @@ }, "end": { "line": 22, - "column": 25, + "column": 24, "program": "override12.ets" } } @@ -993,7 +993,7 @@ }, "end": { "line": 22, - "column": 25, + "column": 24, "program": "override12.ets" } } @@ -1028,7 +1028,7 @@ }, "end": { "line": 22, - "column": 35, + "column": 33, "program": "override12.ets" } } @@ -1041,7 +1041,7 @@ }, "end": { "line": 22, - "column": 35, + "column": 33, "program": "override12.ets" } } @@ -1219,7 +1219,7 @@ }, "end": { "line": 25, - "column": 26, + "column": 25, "program": "override12.ets" } } @@ -1232,7 +1232,7 @@ }, "end": { "line": 25, - "column": 26, + "column": 25, "program": "override12.ets" } } @@ -1246,7 +1246,7 @@ }, "end": { "line": 25, - "column": 26, + "column": 25, "program": "override12.ets" } } @@ -1259,7 +1259,7 @@ }, "end": { "line": 25, - "column": 26, + "column": 25, "program": "override12.ets" } } @@ -1294,7 +1294,7 @@ }, "end": { "line": 25, - "column": 36, + "column": 34, "program": "override12.ets" } } @@ -1307,7 +1307,7 @@ }, "end": { "line": 25, - "column": 36, + "column": 34, "program": "override12.ets" } } diff --git a/ets2panda/test/compiler/ets/override13-expected.txt b/ets2panda/test/compiler/ets/override13-expected.txt index f38d28582b6..41aed5b4695 100644 --- a/ets2panda/test/compiler/ets/override13-expected.txt +++ b/ets2panda/test/compiler/ets/override13-expected.txt @@ -107,7 +107,7 @@ }, "end": { "line": 17, - "column": 14, + "column": 13, "program": "override13.ets" } } @@ -120,7 +120,7 @@ }, "end": { "line": 17, - "column": 14, + "column": 13, "program": "override13.ets" } } @@ -134,7 +134,7 @@ }, "end": { "line": 17, - "column": 14, + "column": 13, "program": "override13.ets" } } @@ -147,7 +147,7 @@ }, "end": { "line": 17, - "column": 14, + "column": 13, "program": "override13.ets" } } @@ -182,7 +182,7 @@ }, "end": { "line": 17, - "column": 19, + "column": 17, "program": "override13.ets" } } @@ -195,7 +195,7 @@ }, "end": { "line": 17, - "column": 19, + "column": 17, "program": "override13.ets" } } @@ -520,7 +520,7 @@ }, "end": { "line": 20, - "column": 20, + "column": 18, "program": "override13.ets" } } @@ -533,7 +533,7 @@ }, "end": { "line": 20, - "column": 20, + "column": 18, "program": "override13.ets" } } @@ -623,7 +623,7 @@ }, "end": { "line": 21, - "column": 33, + "column": 32, "program": "override13.ets" } } @@ -636,7 +636,7 @@ }, "end": { "line": 21, - "column": 33, + "column": 32, "program": "override13.ets" } } @@ -650,7 +650,7 @@ }, "end": { "line": 21, - "column": 33, + "column": 32, "program": "override13.ets" } } @@ -663,7 +663,7 @@ }, "end": { "line": 21, - "column": 33, + "column": 32, "program": "override13.ets" } } @@ -698,7 +698,7 @@ }, "end": { "line": 21, - "column": 43, + "column": 41, "program": "override13.ets" } } @@ -711,7 +711,7 @@ }, "end": { "line": 21, - "column": 43, + "column": 41, "program": "override13.ets" } } diff --git a/ets2panda/test/compiler/ets/override16-expected.txt b/ets2panda/test/compiler/ets/override16-expected.txt index cb2c09ed0f0..28e49dc4fde 100644 --- a/ets2panda/test/compiler/ets/override16-expected.txt +++ b/ets2panda/test/compiler/ets/override16-expected.txt @@ -358,7 +358,7 @@ }, "end": { "line": 22, - "column": 20, + "column": 18, "program": "override16.ets" } } @@ -371,7 +371,7 @@ }, "end": { "line": 22, - "column": 20, + "column": 18, "program": "override16.ets" } } diff --git a/ets2panda/test/compiler/ets/override17-expected.txt b/ets2panda/test/compiler/ets/override17-expected.txt index 004feec041d..6cfdf156238 100644 --- a/ets2panda/test/compiler/ets/override17-expected.txt +++ b/ets2panda/test/compiler/ets/override17-expected.txt @@ -358,7 +358,7 @@ }, "end": { "line": 22, - "column": 20, + "column": 18, "program": "override17.ets" } } @@ -371,7 +371,7 @@ }, "end": { "line": 22, - "column": 20, + "column": 18, "program": "override17.ets" } } diff --git a/ets2panda/test/compiler/ets/override19-expected.txt b/ets2panda/test/compiler/ets/override19-expected.txt index 41840f86e85..39b8700737d 100644 --- a/ets2panda/test/compiler/ets/override19-expected.txt +++ b/ets2panda/test/compiler/ets/override19-expected.txt @@ -102,7 +102,7 @@ }, "end": { "line": 17, - "column": 34, + "column": 32, "program": "override19.ets" } } @@ -115,7 +115,7 @@ }, "end": { "line": 17, - "column": 34, + "column": 32, "program": "override19.ets" } } @@ -543,7 +543,7 @@ }, "end": { "line": 25, - "column": 22, + "column": 21, "program": "override19.ets" } } @@ -556,7 +556,7 @@ }, "end": { "line": 25, - "column": 22, + "column": 21, "program": "override19.ets" } } @@ -928,7 +928,7 @@ }, "end": { "line": 29, - "column": 18, + "column": 16, "program": "override19.ets" } } @@ -941,7 +941,7 @@ }, "end": { "line": 29, - "column": 18, + "column": 16, "program": "override19.ets" } } @@ -991,7 +991,7 @@ }, "end": { "line": 29, - "column": 28, + "column": 27, "program": "override19.ets" } } @@ -1004,7 +1004,7 @@ }, "end": { "line": 29, - "column": 28, + "column": 27, "program": "override19.ets" } } diff --git a/ets2panda/test/compiler/ets/override2-expected.txt b/ets2panda/test/compiler/ets/override2-expected.txt index fb39e96cdda..a1238b2ade5 100644 --- a/ets2panda/test/compiler/ets/override2-expected.txt +++ b/ets2panda/test/compiler/ets/override2-expected.txt @@ -150,8 +150,8 @@ "program": "override2.ets" }, "end": { - "line": 20, - "column": 6, + "line": 18, + "column": 2, "program": "override2.ets" } } @@ -513,7 +513,7 @@ }, "end": { "line": 24, - "column": 38, + "column": 27, "program": "override2.ets" } } @@ -526,7 +526,7 @@ }, "end": { "line": 24, - "column": 38, + "column": 27, "program": "override2.ets" } } @@ -563,7 +563,7 @@ }, "end": { "line": 24, - "column": 42, + "column": 40, "program": "override2.ets" } } @@ -576,7 +576,7 @@ }, "end": { "line": 24, - "column": 42, + "column": 40, "program": "override2.ets" } } diff --git a/ets2panda/test/compiler/ets/override4-expected.txt b/ets2panda/test/compiler/ets/override4-expected.txt index f967d535dd2..15db789e8ef 100644 --- a/ets2panda/test/compiler/ets/override4-expected.txt +++ b/ets2panda/test/compiler/ets/override4-expected.txt @@ -198,8 +198,8 @@ "program": "override4.ets" }, "end": { - "line": 20, - "column": 6, + "line": 18, + "column": 2, "program": "override4.ets" } } @@ -561,7 +561,7 @@ }, "end": { "line": 24, - "column": 29, + "column": 18, "program": "override4.ets" } } @@ -574,7 +574,7 @@ }, "end": { "line": 24, - "column": 29, + "column": 18, "program": "override4.ets" } } @@ -611,7 +611,7 @@ }, "end": { "line": 24, - "column": 33, + "column": 31, "program": "override4.ets" } } @@ -624,7 +624,7 @@ }, "end": { "line": 24, - "column": 33, + "column": 31, "program": "override4.ets" } } diff --git a/ets2panda/test/compiler/ets/override5-expected.txt b/ets2panda/test/compiler/ets/override5-expected.txt index 144d24fdb4a..d67021c936f 100644 --- a/ets2panda/test/compiler/ets/override5-expected.txt +++ b/ets2panda/test/compiler/ets/override5-expected.txt @@ -358,7 +358,7 @@ }, "end": { "line": 20, - "column": 20, + "column": 18, "program": "override5.ets" } } @@ -371,7 +371,7 @@ }, "end": { "line": 20, - "column": 20, + "column": 18, "program": "override5.ets" } } diff --git a/ets2panda/test/compiler/ets/override6-expected.txt b/ets2panda/test/compiler/ets/override6-expected.txt index f7aa2706ddd..608592351d3 100644 --- a/ets2panda/test/compiler/ets/override6-expected.txt +++ b/ets2panda/test/compiler/ets/override6-expected.txt @@ -150,8 +150,8 @@ "program": "override6.ets" }, "end": { - "line": 20, - "column": 10, + "line": 18, + "column": 2, "program": "override6.ets" } } @@ -223,7 +223,7 @@ }, "end": { "line": 20, - "column": 24, + "column": 22, "program": "override6.ets" } } @@ -236,7 +236,7 @@ }, "end": { "line": 20, - "column": 24, + "column": 22, "program": "override6.ets" } } @@ -249,7 +249,7 @@ }, "end": { "line": 20, - "column": 24, + "column": 22, "program": "override6.ets" } } @@ -262,8 +262,8 @@ "program": "override6.ets" }, "end": { - "line": 22, - "column": 6, + "line": 20, + "column": 25, "program": "override6.ets" } } @@ -321,7 +321,7 @@ }, "end": { "line": 22, - "column": 23, + "column": 21, "program": "override6.ets" } } @@ -334,7 +334,7 @@ }, "end": { "line": 22, - "column": 23, + "column": 21, "program": "override6.ets" } } diff --git a/ets2panda/test/compiler/ets/override8-expected.txt b/ets2panda/test/compiler/ets/override8-expected.txt index d2f411e0726..9ece98b7fb4 100644 --- a/ets2panda/test/compiler/ets/override8-expected.txt +++ b/ets2panda/test/compiler/ets/override8-expected.txt @@ -84,7 +84,7 @@ }, "end": { "line": 17, - "column": 13, + "column": 12, "program": "override8.ets" } } @@ -97,7 +97,7 @@ }, "end": { "line": 17, - "column": 13, + "column": 12, "program": "override8.ets" } } @@ -110,7 +110,7 @@ }, "end": { "line": 17, - "column": 13, + "column": 12, "program": "override8.ets" } } @@ -123,7 +123,7 @@ }, "end": { "line": 17, - "column": 13, + "column": 12, "program": "override8.ets" } } @@ -182,8 +182,8 @@ "program": "override8.ets" }, "end": { - "line": 20, - "column": 6, + "line": 18, + "column": 2, "program": "override8.ets" } } @@ -241,7 +241,7 @@ }, "end": { "line": 20, - "column": 23, + "column": 21, "program": "override8.ets" } } @@ -254,7 +254,7 @@ }, "end": { "line": 20, - "column": 23, + "column": 21, "program": "override8.ets" } } @@ -352,7 +352,7 @@ }, "end": { "line": 21, - "column": 30, + "column": 28, "program": "override8.ets" } } @@ -365,7 +365,7 @@ }, "end": { "line": 21, - "column": 30, + "column": 28, "program": "override8.ets" } } diff --git a/ets2panda/test/compiler/ets/override9-expected.txt b/ets2panda/test/compiler/ets/override9-expected.txt index 5f519f8d23b..691a51b7a08 100644 --- a/ets2panda/test/compiler/ets/override9-expected.txt +++ b/ets2panda/test/compiler/ets/override9-expected.txt @@ -84,7 +84,7 @@ }, "end": { "line": 17, - "column": 13, + "column": 12, "program": "override9.ets" } } @@ -97,7 +97,7 @@ }, "end": { "line": 17, - "column": 13, + "column": 12, "program": "override9.ets" } } @@ -110,7 +110,7 @@ }, "end": { "line": 17, - "column": 13, + "column": 12, "program": "override9.ets" } } @@ -123,7 +123,7 @@ }, "end": { "line": 17, - "column": 13, + "column": 12, "program": "override9.ets" } } @@ -182,8 +182,8 @@ "program": "override9.ets" }, "end": { - "line": 20, - "column": 10, + "line": 18, + "column": 2, "program": "override9.ets" } } @@ -255,7 +255,7 @@ }, "end": { "line": 20, - "column": 25, + "column": 23, "program": "override9.ets" } } @@ -268,7 +268,7 @@ }, "end": { "line": 20, - "column": 25, + "column": 23, "program": "override9.ets" } } @@ -281,7 +281,7 @@ }, "end": { "line": 20, - "column": 25, + "column": 23, "program": "override9.ets" } } @@ -294,8 +294,8 @@ "program": "override9.ets" }, "end": { - "line": 22, - "column": 6, + "line": 20, + "column": 26, "program": "override9.ets" } } @@ -353,7 +353,7 @@ }, "end": { "line": 22, - "column": 24, + "column": 22, "program": "override9.ets" } } @@ -366,7 +366,7 @@ }, "end": { "line": 22, - "column": 24, + "column": 22, "program": "override9.ets" } } @@ -464,7 +464,7 @@ }, "end": { "line": 23, - "column": 31, + "column": 29, "program": "override9.ets" } } @@ -477,7 +477,7 @@ }, "end": { "line": 23, - "column": 31, + "column": 29, "program": "override9.ets" } } diff --git a/ets2panda/test/compiler/ets/parenthesizedType-expected.txt b/ets2panda/test/compiler/ets/parenthesizedType-expected.txt index f51678869e4..4f0f58731dc 100644 --- a/ets2panda/test/compiler/ets/parenthesizedType-expected.txt +++ b/ets2panda/test/compiler/ets/parenthesizedType-expected.txt @@ -300,7 +300,7 @@ }, "end": { "line": 18, - "column": 19, + "column": 18, "program": "parenthesizedType.ets" } } @@ -313,7 +313,7 @@ }, "end": { "line": 18, - "column": 19, + "column": 18, "program": "parenthesizedType.ets" } } @@ -401,7 +401,7 @@ }, "end": { "line": 19, - "column": 20, + "column": 18, "program": "parenthesizedType.ets" } } @@ -414,7 +414,7 @@ }, "end": { "line": 19, - "column": 20, + "column": 18, "program": "parenthesizedType.ets" } } diff --git a/ets2panda/test/compiler/ets/requiredType_1-expected.txt b/ets2panda/test/compiler/ets/requiredType_1-expected.txt index 2059ce24101..d0a92fe034a 100644 --- a/ets2panda/test/compiler/ets/requiredType_1-expected.txt +++ b/ets2panda/test/compiler/ets/requiredType_1-expected.txt @@ -97,7 +97,7 @@ }, "end": { "line": 17, - "column": 17, + "column": 16, "program": "requiredType_1.ets" } } @@ -110,7 +110,7 @@ }, "end": { "line": 17, - "column": 17, + "column": 16, "program": "requiredType_1.ets" } } @@ -548,7 +548,7 @@ }, "end": { "line": 21, - "column": 27, + "column": 26, "program": "requiredType_1.ets" } } @@ -561,7 +561,7 @@ }, "end": { "line": 21, - "column": 27, + "column": 26, "program": "requiredType_1.ets" } } @@ -588,7 +588,7 @@ }, "end": { "line": 21, - "column": 29, + "column": 27, "program": "requiredType_1.ets" } } @@ -601,7 +601,7 @@ }, "end": { "line": 21, - "column": 29, + "column": 27, "program": "requiredType_1.ets" } } @@ -754,7 +754,7 @@ }, "end": { "line": 22, - "column": 24, + "column": 22, "program": "requiredType_1.ets" } } @@ -767,7 +767,7 @@ }, "end": { "line": 22, - "column": 24, + "column": 22, "program": "requiredType_1.ets" } } diff --git a/ets2panda/test/compiler/ets/requiredType_11-expected.txt b/ets2panda/test/compiler/ets/requiredType_11-expected.txt index 41e27345ba4..2b29e7ecd96 100644 --- a/ets2panda/test/compiler/ets/requiredType_11-expected.txt +++ b/ets2panda/test/compiler/ets/requiredType_11-expected.txt @@ -81,7 +81,7 @@ }, "end": { "line": 17, - "column": 19, + "column": 18, "program": "requiredType_11.ets" } } @@ -94,7 +94,7 @@ }, "end": { "line": 17, - "column": 19, + "column": 18, "program": "requiredType_11.ets" } } @@ -425,7 +425,7 @@ }, "end": { "line": 21, - "column": 21, + "column": 20, "program": "requiredType_11.ets" } } @@ -438,7 +438,7 @@ }, "end": { "line": 21, - "column": 21, + "column": 20, "program": "requiredType_11.ets" } } @@ -465,7 +465,7 @@ }, "end": { "line": 21, - "column": 22, + "column": 21, "program": "requiredType_11.ets" } } @@ -478,7 +478,7 @@ }, "end": { "line": 21, - "column": 22, + "column": 21, "program": "requiredType_11.ets" } } @@ -493,7 +493,7 @@ }, "end": { "line": 21, - "column": 22, + "column": 21, "program": "requiredType_11.ets" } } @@ -935,7 +935,7 @@ }, "end": { "line": 25, - "column": 40, + "column": 37, "program": "requiredType_11.ets" } } @@ -948,7 +948,7 @@ }, "end": { "line": 25, - "column": 40, + "column": 37, "program": "requiredType_11.ets" } } @@ -1055,7 +1055,7 @@ }, "end": { "line": 25, - "column": 42, + "column": 40, "program": "requiredType_11.ets" } } @@ -1068,7 +1068,7 @@ }, "end": { "line": 25, - "column": 42, + "column": 40, "program": "requiredType_11.ets" } } diff --git a/ets2panda/test/compiler/ets/requiredType_4-expected.txt b/ets2panda/test/compiler/ets/requiredType_4-expected.txt index 4c9bbeee77d..23aee53c5f2 100644 --- a/ets2panda/test/compiler/ets/requiredType_4-expected.txt +++ b/ets2panda/test/compiler/ets/requiredType_4-expected.txt @@ -97,7 +97,7 @@ }, "end": { "line": 17, - "column": 17, + "column": 16, "program": "requiredType_4.ets" } } @@ -110,7 +110,7 @@ }, "end": { "line": 17, - "column": 17, + "column": 16, "program": "requiredType_4.ets" } } @@ -503,7 +503,7 @@ }, "end": { "line": 20, - "column": 25, + "column": 24, "program": "requiredType_4.ets" } } @@ -516,7 +516,7 @@ }, "end": { "line": 20, - "column": 25, + "column": 24, "program": "requiredType_4.ets" } } @@ -530,7 +530,7 @@ }, "end": { "line": 20, - "column": 25, + "column": 24, "program": "requiredType_4.ets" } } @@ -543,7 +543,7 @@ }, "end": { "line": 20, - "column": 25, + "column": 24, "program": "requiredType_4.ets" } } @@ -749,7 +749,7 @@ }, "end": { "line": 23, - "column": 27, + "column": 26, "program": "requiredType_4.ets" } } @@ -762,7 +762,7 @@ }, "end": { "line": 23, - "column": 27, + "column": 26, "program": "requiredType_4.ets" } } @@ -789,7 +789,7 @@ }, "end": { "line": 23, - "column": 29, + "column": 27, "program": "requiredType_4.ets" } } @@ -802,7 +802,7 @@ }, "end": { "line": 23, - "column": 29, + "column": 27, "program": "requiredType_4.ets" } } diff --git a/ets2panda/test/compiler/ets/requiredType_5-expected.txt b/ets2panda/test/compiler/ets/requiredType_5-expected.txt index 82b78550bb9..e03749b90ac 100644 --- a/ets2panda/test/compiler/ets/requiredType_5-expected.txt +++ b/ets2panda/test/compiler/ets/requiredType_5-expected.txt @@ -97,7 +97,7 @@ }, "end": { "line": 17, - "column": 18, + "column": 16, "program": "requiredType_5.ets" } } @@ -110,7 +110,7 @@ }, "end": { "line": 17, - "column": 18, + "column": 16, "program": "requiredType_5.ets" } } @@ -232,7 +232,7 @@ }, "end": { "line": 18, - "column": 16, + "column": 14, "program": "requiredType_5.ets" } } @@ -245,7 +245,7 @@ }, "end": { "line": 18, - "column": 16, + "column": 14, "program": "requiredType_5.ets" } } @@ -698,7 +698,7 @@ }, "end": { "line": 22, - "column": 27, + "column": 26, "program": "requiredType_5.ets" } } @@ -711,7 +711,7 @@ }, "end": { "line": 22, - "column": 27, + "column": 26, "program": "requiredType_5.ets" } } @@ -738,7 +738,7 @@ }, "end": { "line": 22, - "column": 29, + "column": 27, "program": "requiredType_5.ets" } } @@ -751,7 +751,7 @@ }, "end": { "line": 22, - "column": 29, + "column": 27, "program": "requiredType_5.ets" } } diff --git a/ets2panda/test/compiler/ets/requiredType_9-expected.txt b/ets2panda/test/compiler/ets/requiredType_9-expected.txt index 2b7ed4053ec..6acb9904d87 100644 --- a/ets2panda/test/compiler/ets/requiredType_9-expected.txt +++ b/ets2panda/test/compiler/ets/requiredType_9-expected.txt @@ -78,7 +78,7 @@ }, "end": { "line": 17, - "column": 19, + "column": 18, "program": "requiredType_9.ets" } } @@ -91,7 +91,7 @@ }, "end": { "line": 17, - "column": 19, + "column": 18, "program": "requiredType_9.ets" } } @@ -106,7 +106,7 @@ }, "end": { "line": 17, - "column": 19, + "column": 18, "program": "requiredType_9.ets" } } @@ -372,7 +372,7 @@ }, "end": { "line": 21, - "column": 13, + "column": 11, "program": "requiredType_9.ets" } } @@ -385,7 +385,7 @@ }, "end": { "line": 21, - "column": 13, + "column": 11, "program": "requiredType_9.ets" } } @@ -512,7 +512,7 @@ }, "end": { "line": 22, - "column": 22, + "column": 21, "program": "requiredType_9.ets" } } @@ -525,7 +525,7 @@ }, "end": { "line": 22, - "column": 22, + "column": 21, "program": "requiredType_9.ets" } } @@ -552,7 +552,7 @@ }, "end": { "line": 22, - "column": 23, + "column": 22, "program": "requiredType_9.ets" } } @@ -565,7 +565,7 @@ }, "end": { "line": 22, - "column": 23, + "column": 22, "program": "requiredType_9.ets" } } @@ -580,7 +580,7 @@ }, "end": { "line": 22, - "column": 23, + "column": 22, "program": "requiredType_9.ets" } } @@ -666,7 +666,7 @@ }, "end": { "line": 23, - "column": 22, + "column": 21, "program": "requiredType_9.ets" } } @@ -679,7 +679,7 @@ }, "end": { "line": 23, - "column": 22, + "column": 21, "program": "requiredType_9.ets" } } @@ -734,8 +734,8 @@ "program": "requiredType_9.ets" }, "end": { - "line": 24, - "column": 2, + "line": 23, + "column": 32, "program": "requiredType_9.ets" } } @@ -747,8 +747,8 @@ "program": "requiredType_9.ets" }, "end": { - "line": 24, - "column": 2, + "line": 23, + "column": 32, "program": "requiredType_9.ets" } } @@ -762,8 +762,8 @@ "program": "requiredType_9.ets" }, "end": { - "line": 24, - "column": 2, + "line": 23, + "column": 32, "program": "requiredType_9.ets" } } @@ -1181,7 +1181,7 @@ }, "end": { "line": 27, - "column": 30, + "column": 28, "program": "requiredType_9.ets" } } @@ -1194,7 +1194,7 @@ }, "end": { "line": 27, - "column": 30, + "column": 28, "program": "requiredType_9.ets" } } @@ -1261,7 +1261,7 @@ }, "end": { "line": 27, - "column": 32, + "column": 30, "program": "requiredType_9.ets" } } @@ -1274,7 +1274,7 @@ }, "end": { "line": 27, - "column": 32, + "column": 30, "program": "requiredType_9.ets" } } @@ -1349,7 +1349,7 @@ }, "end": { "line": 27, - "column": 45, + "column": 44, "program": "requiredType_9.ets" } } @@ -1362,7 +1362,7 @@ }, "end": { "line": 27, - "column": 45, + "column": 44, "program": "requiredType_9.ets" } } diff --git a/ets2panda/test/compiler/ets/returnTypeGenericArray-expected.txt b/ets2panda/test/compiler/ets/returnTypeGenericArray-expected.txt index 0ea37958658..04311c1709d 100644 --- a/ets2panda/test/compiler/ets/returnTypeGenericArray-expected.txt +++ b/ets2panda/test/compiler/ets/returnTypeGenericArray-expected.txt @@ -327,8 +327,8 @@ "program": "returnTypeGenericArray.ets" }, "end": { - "line": 20, - "column": 6, + "line": 18, + "column": 2, "program": "returnTypeGenericArray.ets" } } @@ -459,7 +459,7 @@ }, "end": { "line": 20, - "column": 33, + "column": 32, "program": "returnTypeGenericArray.ets" } } @@ -472,7 +472,7 @@ }, "end": { "line": 20, - "column": 33, + "column": 32, "program": "returnTypeGenericArray.ets" } } @@ -499,7 +499,7 @@ }, "end": { "line": 20, - "column": 35, + "column": 33, "program": "returnTypeGenericArray.ets" } } @@ -512,7 +512,7 @@ }, "end": { "line": 20, - "column": 35, + "column": 33, "program": "returnTypeGenericArray.ets" } } @@ -763,7 +763,7 @@ }, "end": { "line": 22, - "column": 24, + "column": 22, "program": "returnTypeGenericArray.ets" } } @@ -776,7 +776,7 @@ }, "end": { "line": 22, - "column": 24, + "column": 22, "program": "returnTypeGenericArray.ets" } } diff --git a/ets2panda/test/compiler/ets/switchStatementBoxing-expected.txt b/ets2panda/test/compiler/ets/switchStatementBoxing-expected.txt index 93586bf6dda..7708bb42db1 100644 --- a/ets2panda/test/compiler/ets/switchStatementBoxing-expected.txt +++ b/ets2panda/test/compiler/ets/switchStatementBoxing-expected.txt @@ -128,7 +128,7 @@ }, "end": { "line": 18, - "column": 21, + "column": 19, "program": "switchStatementBoxing.ets" } } @@ -141,7 +141,7 @@ }, "end": { "line": 18, - "column": 21, + "column": 19, "program": "switchStatementBoxing.ets" } } diff --git a/ets2panda/test/compiler/ets/switchStatementCorrectConversion-expected.txt b/ets2panda/test/compiler/ets/switchStatementCorrectConversion-expected.txt index af7db0e4eb3..e7d4780552a 100644 --- a/ets2panda/test/compiler/ets/switchStatementCorrectConversion-expected.txt +++ b/ets2panda/test/compiler/ets/switchStatementCorrectConversion-expected.txt @@ -488,7 +488,7 @@ }, "end": { "line": 32, - "column": 21, + "column": 19, "program": "switchStatementCorrectConversion.ets" } } @@ -501,7 +501,7 @@ }, "end": { "line": 32, - "column": 21, + "column": 19, "program": "switchStatementCorrectConversion.ets" } } diff --git a/ets2panda/test/compiler/ets/throwInCatchClause3-expected.txt b/ets2panda/test/compiler/ets/throwInCatchClause3-expected.txt index 464bf819e4d..54aebbadb78 100644 --- a/ets2panda/test/compiler/ets/throwInCatchClause3-expected.txt +++ b/ets2panda/test/compiler/ets/throwInCatchClause3-expected.txt @@ -346,7 +346,7 @@ }, "end": { "line": 19, - "column": 33, + "column": 32, "program": "throwInCatchClause3.ets" } } @@ -359,7 +359,7 @@ }, "end": { "line": 19, - "column": 33, + "column": 32, "program": "throwInCatchClause3.ets" } } @@ -461,7 +461,7 @@ }, "end": { "line": 21, - "column": 34, + "column": 33, "program": "throwInCatchClause3.ets" } } @@ -474,7 +474,7 @@ }, "end": { "line": 21, - "column": 34, + "column": 33, "program": "throwInCatchClause3.ets" } } diff --git a/ets2panda/test/compiler/ets/throwInFinallyBlock1-expected.txt b/ets2panda/test/compiler/ets/throwInFinallyBlock1-expected.txt index b02aacc5c6c..3a281c7e24b 100644 --- a/ets2panda/test/compiler/ets/throwInFinallyBlock1-expected.txt +++ b/ets2panda/test/compiler/ets/throwInFinallyBlock1-expected.txt @@ -235,7 +235,7 @@ }, "end": { "line": 18, - "column": 25, + "column": 24, "program": "throwInFinallyBlock1.ets" } } @@ -248,7 +248,7 @@ }, "end": { "line": 18, - "column": 25, + "column": 24, "program": "throwInFinallyBlock1.ets" } } @@ -409,7 +409,7 @@ }, "end": { "line": 24, - "column": 29, + "column": 28, "program": "throwInFinallyBlock1.ets" } } @@ -422,7 +422,7 @@ }, "end": { "line": 24, - "column": 29, + "column": 28, "program": "throwInFinallyBlock1.ets" } } @@ -645,7 +645,7 @@ }, "end": { "line": 30, - "column": 27, + "column": 26, "program": "throwInFinallyBlock1.ets" } } @@ -658,7 +658,7 @@ }, "end": { "line": 30, - "column": 27, + "column": 26, "program": "throwInFinallyBlock1.ets" } } diff --git a/ets2panda/test/compiler/ets/throwInTryStatement-expected.txt b/ets2panda/test/compiler/ets/throwInTryStatement-expected.txt index fcf93a23b72..70fc90ffac3 100644 --- a/ets2panda/test/compiler/ets/throwInTryStatement-expected.txt +++ b/ets2panda/test/compiler/ets/throwInTryStatement-expected.txt @@ -235,7 +235,7 @@ }, "end": { "line": 18, - "column": 25, + "column": 24, "program": "throwInTryStatement.ets" } } @@ -248,7 +248,7 @@ }, "end": { "line": 18, - "column": 25, + "column": 24, "program": "throwInTryStatement.ets" } } diff --git a/ets2panda/test/compiler/ets/tryCatchErrorMissingParamType-expected.txt b/ets2panda/test/compiler/ets/tryCatchErrorMissingParamType-expected.txt index 8517a871da9..96aab42d0b0 100644 --- a/ets2panda/test/compiler/ets/tryCatchErrorMissingParamType-expected.txt +++ b/ets2panda/test/compiler/ets/tryCatchErrorMissingParamType-expected.txt @@ -235,7 +235,7 @@ }, "end": { "line": 18, - "column": 25, + "column": 24, "program": "tryCatchErrorMissingParamType.ets" } } @@ -248,7 +248,7 @@ }, "end": { "line": 18, - "column": 25, + "column": 24, "program": "tryCatchErrorMissingParamType.ets" } } diff --git a/ets2panda/test/compiler/ets/tryCatchMissingParamType-expected.txt b/ets2panda/test/compiler/ets/tryCatchMissingParamType-expected.txt index 4b3df3d3296..ccaa3c2b2f6 100644 --- a/ets2panda/test/compiler/ets/tryCatchMissingParamType-expected.txt +++ b/ets2panda/test/compiler/ets/tryCatchMissingParamType-expected.txt @@ -235,7 +235,7 @@ }, "end": { "line": 18, - "column": 29, + "column": 28, "program": "tryCatchMissingParamType.ets" } } @@ -248,7 +248,7 @@ }, "end": { "line": 18, - "column": 29, + "column": 28, "program": "tryCatchMissingParamType.ets" } } diff --git a/ets2panda/test/compiler/ets/tryDefaultCatches-expected.txt b/ets2panda/test/compiler/ets/tryDefaultCatches-expected.txt index cae4964823d..1a1a65b7c40 100644 --- a/ets2panda/test/compiler/ets/tryDefaultCatches-expected.txt +++ b/ets2panda/test/compiler/ets/tryDefaultCatches-expected.txt @@ -235,7 +235,7 @@ }, "end": { "line": 18, - "column": 32, + "column": 31, "program": "tryDefaultCatches.ets" } } @@ -248,7 +248,7 @@ }, "end": { "line": 18, - "column": 32, + "column": 31, "program": "tryDefaultCatches.ets" } } @@ -345,7 +345,7 @@ }, "end": { "line": 19, - "column": 25, + "column": 24, "program": "tryDefaultCatches.ets" } } @@ -358,7 +358,7 @@ }, "end": { "line": 19, - "column": 25, + "column": 24, "program": "tryDefaultCatches.ets" } } diff --git a/ets2panda/test/compiler/ets/tuple_types_1-expected.txt b/ets2panda/test/compiler/ets/tuple_types_1-expected.txt index f03f541e341..78dbf2657ce 100644 --- a/ets2panda/test/compiler/ets/tuple_types_1-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_1-expected.txt @@ -311,7 +311,7 @@ }, "end": { "line": 17, - "column": 20, + "column": 18, "program": "tuple_types_1.ets" } } @@ -324,7 +324,7 @@ }, "end": { "line": 17, - "column": 20, + "column": 18, "program": "tuple_types_1.ets" } } @@ -620,7 +620,7 @@ }, "end": { "line": 19, - "column": 33, + "column": 32, "program": "tuple_types_1.ets" } } @@ -633,7 +633,7 @@ }, "end": { "line": 19, - "column": 33, + "column": 32, "program": "tuple_types_1.ets" } } @@ -667,7 +667,7 @@ }, "end": { "line": 19, - "column": 41, + "column": 40, "program": "tuple_types_1.ets" } } @@ -680,7 +680,7 @@ }, "end": { "line": 19, - "column": 41, + "column": 40, "program": "tuple_types_1.ets" } } @@ -714,7 +714,7 @@ }, "end": { "line": 19, - "column": 49, + "column": 48, "program": "tuple_types_1.ets" } } @@ -727,7 +727,7 @@ }, "end": { "line": 19, - "column": 49, + "column": 48, "program": "tuple_types_1.ets" } } @@ -810,7 +810,7 @@ }, "end": { "line": 20, - "column": 49, + "column": 48, "program": "tuple_types_1.ets" } } @@ -823,7 +823,7 @@ }, "end": { "line": 20, - "column": 49, + "column": 48, "program": "tuple_types_1.ets" } } @@ -2995,7 +2995,7 @@ }, "end": { "line": 39, - "column": 24, + "column": 23, "program": "tuple_types_1.ets" } } @@ -3008,7 +3008,7 @@ }, "end": { "line": 39, - "column": 24, + "column": 23, "program": "tuple_types_1.ets" } } @@ -3042,7 +3042,7 @@ }, "end": { "line": 39, - "column": 32, + "column": 31, "program": "tuple_types_1.ets" } } @@ -3055,7 +3055,7 @@ }, "end": { "line": 39, - "column": 32, + "column": 31, "program": "tuple_types_1.ets" } } @@ -3205,7 +3205,7 @@ }, "end": { "line": 40, - "column": 24, + "column": 23, "program": "tuple_types_1.ets" } } @@ -3218,7 +3218,7 @@ }, "end": { "line": 40, - "column": 24, + "column": 23, "program": "tuple_types_1.ets" } } @@ -3252,7 +3252,7 @@ }, "end": { "line": 40, - "column": 32, + "column": 31, "program": "tuple_types_1.ets" } } @@ -3265,7 +3265,7 @@ }, "end": { "line": 40, - "column": 32, + "column": 31, "program": "tuple_types_1.ets" } } @@ -3446,7 +3446,7 @@ }, "end": { "line": 41, - "column": 24, + "column": 23, "program": "tuple_types_1.ets" } } @@ -3459,7 +3459,7 @@ }, "end": { "line": 41, - "column": 24, + "column": 23, "program": "tuple_types_1.ets" } } @@ -3493,7 +3493,7 @@ }, "end": { "line": 41, - "column": 32, + "column": 31, "program": "tuple_types_1.ets" } } @@ -3506,7 +3506,7 @@ }, "end": { "line": 41, - "column": 32, + "column": 31, "program": "tuple_types_1.ets" } } @@ -3555,7 +3555,7 @@ }, "end": { "line": 41, - "column": 49, + "column": 48, "program": "tuple_types_1.ets" } } @@ -3568,7 +3568,7 @@ }, "end": { "line": 41, - "column": 49, + "column": 48, "program": "tuple_types_1.ets" } } @@ -3602,7 +3602,7 @@ }, "end": { "line": 41, - "column": 57, + "column": 56, "program": "tuple_types_1.ets" } } @@ -3615,7 +3615,7 @@ }, "end": { "line": 41, - "column": 57, + "column": 56, "program": "tuple_types_1.ets" } } diff --git a/ets2panda/test/compiler/ets/tuple_types_12-expected.txt b/ets2panda/test/compiler/ets/tuple_types_12-expected.txt index 64c9f8e3d79..561479485e3 100644 --- a/ets2panda/test/compiler/ets/tuple_types_12-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_12-expected.txt @@ -52,7 +52,7 @@ }, "end": { "line": 16, - "column": 34, + "column": 33, "program": "tuple_types_12.ets" } } @@ -65,7 +65,7 @@ }, "end": { "line": 16, - "column": 34, + "column": 33, "program": "tuple_types_12.ets" } } @@ -422,7 +422,7 @@ }, "end": { "line": 19, - "column": 20, + "column": 18, "program": "tuple_types_12.ets" } } @@ -435,7 +435,7 @@ }, "end": { "line": 19, - "column": 20, + "column": 18, "program": "tuple_types_12.ets" } } @@ -934,7 +934,7 @@ }, "end": { "line": 22, - "column": 30, + "column": 29, "program": "tuple_types_12.ets" } } @@ -947,7 +947,7 @@ }, "end": { "line": 22, - "column": 30, + "column": 29, "program": "tuple_types_12.ets" } } @@ -998,7 +998,7 @@ }, "end": { "line": 22, - "column": 51, + "column": 50, "program": "tuple_types_12.ets" } } @@ -1011,7 +1011,7 @@ }, "end": { "line": 22, - "column": 51, + "column": 50, "program": "tuple_types_12.ets" } } @@ -1062,7 +1062,7 @@ }, "end": { "line": 22, - "column": 56, + "column": 55, "program": "tuple_types_12.ets" } } @@ -1075,7 +1075,7 @@ }, "end": { "line": 22, - "column": 56, + "column": 55, "program": "tuple_types_12.ets" } } @@ -1109,7 +1109,7 @@ }, "end": { "line": 22, - "column": 59, + "column": 58, "program": "tuple_types_12.ets" } } @@ -1122,7 +1122,7 @@ }, "end": { "line": 22, - "column": 59, + "column": 58, "program": "tuple_types_12.ets" } } @@ -1432,7 +1432,7 @@ }, "end": { "line": 22, - "column": 112, + "column": 111, "program": "tuple_types_12.ets" } } @@ -1445,7 +1445,7 @@ }, "end": { "line": 22, - "column": 112, + "column": 111, "program": "tuple_types_12.ets" } } @@ -1495,7 +1495,7 @@ }, "end": { "line": 22, - "column": 121, + "column": 120, "program": "tuple_types_12.ets" } } @@ -1508,7 +1508,7 @@ }, "end": { "line": 22, - "column": 121, + "column": 120, "program": "tuple_types_12.ets" } } @@ -1784,7 +1784,7 @@ }, "end": { "line": 23, - "column": 25, + "column": 23, "program": "tuple_types_12.ets" } } @@ -1797,7 +1797,7 @@ }, "end": { "line": 23, - "column": 25, + "column": 23, "program": "tuple_types_12.ets" } } @@ -1997,7 +1997,7 @@ }, "end": { "line": 24, - "column": 27, + "column": 25, "program": "tuple_types_12.ets" } } @@ -2010,7 +2010,7 @@ }, "end": { "line": 24, - "column": 27, + "column": 25, "program": "tuple_types_12.ets" } } diff --git a/ets2panda/test/compiler/ets/tuple_types_13-expected.txt b/ets2panda/test/compiler/ets/tuple_types_13-expected.txt index 20eb7a92ff6..bc526212dd3 100644 --- a/ets2panda/test/compiler/ets/tuple_types_13-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_13-expected.txt @@ -52,7 +52,7 @@ }, "end": { "line": 16, - "column": 28, + "column": 27, "program": "tuple_types_13.ets" } } @@ -65,7 +65,7 @@ }, "end": { "line": 16, - "column": 28, + "column": 27, "program": "tuple_types_13.ets" } } @@ -99,7 +99,7 @@ }, "end": { "line": 16, - "column": 36, + "column": 35, "program": "tuple_types_13.ets" } } @@ -112,7 +112,7 @@ }, "end": { "line": 16, - "column": 36, + "column": 35, "program": "tuple_types_13.ets" } } @@ -146,7 +146,7 @@ }, "end": { "line": 16, - "column": 44, + "column": 43, "program": "tuple_types_13.ets" } } @@ -159,7 +159,7 @@ }, "end": { "line": 16, - "column": 44, + "column": 43, "program": "tuple_types_13.ets" } } diff --git a/ets2panda/test/compiler/ets/tuple_types_14-expected.txt b/ets2panda/test/compiler/ets/tuple_types_14-expected.txt index 1e2a45c9847..839a7b57d75 100644 --- a/ets2panda/test/compiler/ets/tuple_types_14-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_14-expected.txt @@ -127,7 +127,7 @@ }, "end": { "line": 17, - "column": 13, + "column": 12, "program": "tuple_types_14.ets" } } @@ -140,7 +140,7 @@ }, "end": { "line": 17, - "column": 13, + "column": 12, "program": "tuple_types_14.ets" } } @@ -155,7 +155,7 @@ }, "end": { "line": 17, - "column": 13, + "column": 12, "program": "tuple_types_14.ets" } } @@ -243,7 +243,7 @@ }, "end": { "line": 18, - "column": 15, + "column": 14, "program": "tuple_types_14.ets" } } @@ -256,7 +256,7 @@ }, "end": { "line": 18, - "column": 15, + "column": 14, "program": "tuple_types_14.ets" } } @@ -270,7 +270,7 @@ }, "end": { "line": 18, - "column": 15, + "column": 14, "program": "tuple_types_14.ets" } } @@ -283,7 +283,7 @@ }, "end": { "line": 18, - "column": 15, + "column": 14, "program": "tuple_types_14.ets" } } @@ -439,7 +439,7 @@ }, "end": { "line": 19, - "column": 15, + "column": 13, "program": "tuple_types_14.ets" } } @@ -452,7 +452,7 @@ }, "end": { "line": 19, - "column": 15, + "column": 13, "program": "tuple_types_14.ets" } } @@ -986,7 +986,7 @@ }, "end": { "line": 25, - "column": 32, + "column": 31, "program": "tuple_types_14.ets" } } @@ -999,7 +999,7 @@ }, "end": { "line": 25, - "column": 32, + "column": 31, "program": "tuple_types_14.ets" } } @@ -1040,7 +1040,7 @@ }, "end": { "line": 25, - "column": 35, + "column": 33, "program": "tuple_types_14.ets" } } @@ -1053,7 +1053,7 @@ }, "end": { "line": 25, - "column": 35, + "column": 33, "program": "tuple_types_14.ets" } } @@ -1145,7 +1145,7 @@ }, "end": { "line": 25, - "column": 55, + "column": 54, "program": "tuple_types_14.ets" } } @@ -1158,7 +1158,7 @@ }, "end": { "line": 25, - "column": 55, + "column": 54, "program": "tuple_types_14.ets" } } @@ -1199,7 +1199,7 @@ }, "end": { "line": 25, - "column": 57, + "column": 56, "program": "tuple_types_14.ets" } } @@ -1212,7 +1212,7 @@ }, "end": { "line": 25, - "column": 57, + "column": 56, "program": "tuple_types_14.ets" } } @@ -1445,7 +1445,7 @@ }, "end": { "line": 27, - "column": 27, + "column": 26, "program": "tuple_types_14.ets" } } @@ -1458,7 +1458,7 @@ }, "end": { "line": 27, - "column": 27, + "column": 26, "program": "tuple_types_14.ets" } } @@ -1748,7 +1748,7 @@ }, "end": { "line": 30, - "column": 34, + "column": 33, "program": "tuple_types_14.ets" } } @@ -1761,7 +1761,7 @@ }, "end": { "line": 30, - "column": 34, + "column": 33, "program": "tuple_types_14.ets" } } @@ -1802,7 +1802,7 @@ }, "end": { "line": 30, - "column": 37, + "column": 35, "program": "tuple_types_14.ets" } } @@ -1815,7 +1815,7 @@ }, "end": { "line": 30, - "column": 37, + "column": 35, "program": "tuple_types_14.ets" } } @@ -1907,7 +1907,7 @@ }, "end": { "line": 30, - "column": 57, + "column": 56, "program": "tuple_types_14.ets" } } @@ -1920,7 +1920,7 @@ }, "end": { "line": 30, - "column": 57, + "column": 56, "program": "tuple_types_14.ets" } } @@ -1961,7 +1961,7 @@ }, "end": { "line": 30, - "column": 59, + "column": 58, "program": "tuple_types_14.ets" } } @@ -1974,7 +1974,7 @@ }, "end": { "line": 30, - "column": 59, + "column": 58, "program": "tuple_types_14.ets" } } diff --git a/ets2panda/test/compiler/ets/tuple_types_15-expected.txt b/ets2panda/test/compiler/ets/tuple_types_15-expected.txt index 9f4319f7ac4..f09d55ff9ae 100644 --- a/ets2panda/test/compiler/ets/tuple_types_15-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_15-expected.txt @@ -52,7 +52,7 @@ }, "end": { "line": 16, - "column": 28, + "column": 27, "program": "tuple_types_15.ets" } } @@ -65,7 +65,7 @@ }, "end": { "line": 16, - "column": 28, + "column": 27, "program": "tuple_types_15.ets" } } @@ -322,7 +322,7 @@ }, "end": { "line": 18, - "column": 37, + "column": 36, "program": "tuple_types_15.ets" } } @@ -335,7 +335,7 @@ }, "end": { "line": 18, - "column": 37, + "column": 36, "program": "tuple_types_15.ets" } } @@ -369,7 +369,7 @@ }, "end": { "line": 18, - "column": 45, + "column": 44, "program": "tuple_types_15.ets" } } @@ -382,7 +382,7 @@ }, "end": { "line": 18, - "column": 45, + "column": 44, "program": "tuple_types_15.ets" } } @@ -444,7 +444,7 @@ }, "end": { "line": 19, - "column": 22, + "column": 21, "program": "tuple_types_15.ets" } } @@ -457,7 +457,7 @@ }, "end": { "line": 19, - "column": 22, + "column": 21, "program": "tuple_types_15.ets" } } @@ -491,7 +491,7 @@ }, "end": { "line": 19, - "column": 30, + "column": 29, "program": "tuple_types_15.ets" } } @@ -504,7 +504,7 @@ }, "end": { "line": 19, - "column": 30, + "column": 29, "program": "tuple_types_15.ets" } } @@ -808,7 +808,7 @@ }, "end": { "line": 24, - "column": 31, + "column": 30, "program": "tuple_types_15.ets" } } @@ -821,7 +821,7 @@ }, "end": { "line": 24, - "column": 31, + "column": 30, "program": "tuple_types_15.ets" } } @@ -870,7 +870,7 @@ }, "end": { "line": 24, - "column": 48, + "column": 47, "program": "tuple_types_15.ets" } } @@ -883,7 +883,7 @@ }, "end": { "line": 24, - "column": 48, + "column": 47, "program": "tuple_types_15.ets" } } @@ -917,7 +917,7 @@ }, "end": { "line": 24, - "column": 56, + "column": 55, "program": "tuple_types_15.ets" } } @@ -930,7 +930,7 @@ }, "end": { "line": 24, - "column": 56, + "column": 55, "program": "tuple_types_15.ets" } } @@ -1109,7 +1109,7 @@ }, "end": { "line": 31, - "column": 25, + "column": 23, "program": "tuple_types_15.ets" } } @@ -1122,7 +1122,7 @@ }, "end": { "line": 31, - "column": 25, + "column": 23, "program": "tuple_types_15.ets" } } @@ -2155,7 +2155,7 @@ }, "end": { "line": 37, - "column": 24, + "column": 23, "program": "tuple_types_15.ets" } } @@ -2168,7 +2168,7 @@ }, "end": { "line": 37, - "column": 24, + "column": 23, "program": "tuple_types_15.ets" } } @@ -2202,7 +2202,7 @@ }, "end": { "line": 37, - "column": 32, + "column": 31, "program": "tuple_types_15.ets" } } @@ -2215,7 +2215,7 @@ }, "end": { "line": 37, - "column": 32, + "column": 31, "program": "tuple_types_15.ets" } } diff --git a/ets2panda/test/compiler/ets/tuple_types_16-expected.txt b/ets2panda/test/compiler/ets/tuple_types_16-expected.txt index e467d2ac934..cbd8e600f0c 100644 --- a/ets2panda/test/compiler/ets/tuple_types_16-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_16-expected.txt @@ -57,7 +57,7 @@ }, "end": { "line": 16, - "column": 29, + "column": 28, "program": "tuple_types_16.ets" } } @@ -70,7 +70,7 @@ }, "end": { "line": 16, - "column": 29, + "column": 28, "program": "tuple_types_16.ets" } } @@ -84,7 +84,7 @@ }, "end": { "line": 16, - "column": 29, + "column": 28, "program": "tuple_types_16.ets" } } @@ -97,7 +97,7 @@ }, "end": { "line": 16, - "column": 29, + "column": 28, "program": "tuple_types_16.ets" } } @@ -258,7 +258,7 @@ }, "end": { "line": 18, - "column": 26, + "column": 25, "program": "tuple_types_16.ets" } } @@ -271,7 +271,7 @@ }, "end": { "line": 18, - "column": 26, + "column": 25, "program": "tuple_types_16.ets" } } @@ -305,7 +305,7 @@ }, "end": { "line": 18, - "column": 33, + "column": 32, "program": "tuple_types_16.ets" } } @@ -318,7 +318,7 @@ }, "end": { "line": 18, - "column": 33, + "column": 32, "program": "tuple_types_16.ets" } } @@ -401,7 +401,7 @@ }, "end": { "line": 19, - "column": 26, + "column": 25, "program": "tuple_types_16.ets" } } @@ -414,7 +414,7 @@ }, "end": { "line": 19, - "column": 26, + "column": 25, "program": "tuple_types_16.ets" } } @@ -448,7 +448,7 @@ }, "end": { "line": 19, - "column": 33, + "column": 32, "program": "tuple_types_16.ets" } } @@ -461,7 +461,7 @@ }, "end": { "line": 19, - "column": 33, + "column": 32, "program": "tuple_types_16.ets" } } @@ -495,7 +495,7 @@ }, "end": { "line": 19, - "column": 40, + "column": 39, "program": "tuple_types_16.ets" } } @@ -508,7 +508,7 @@ }, "end": { "line": 19, - "column": 40, + "column": 39, "program": "tuple_types_16.ets" } } @@ -773,7 +773,7 @@ }, "end": { "line": 22, - "column": 23, + "column": 21, "program": "tuple_types_16.ets" } } @@ -786,7 +786,7 @@ }, "end": { "line": 22, - "column": 23, + "column": 21, "program": "tuple_types_16.ets" } } @@ -851,7 +851,7 @@ }, "end": { "line": 22, - "column": 40, + "column": 39, "program": "tuple_types_16.ets" } } @@ -864,7 +864,7 @@ }, "end": { "line": 22, - "column": 40, + "column": 39, "program": "tuple_types_16.ets" } } @@ -878,7 +878,7 @@ }, "end": { "line": 22, - "column": 40, + "column": 39, "program": "tuple_types_16.ets" } } @@ -891,7 +891,7 @@ }, "end": { "line": 22, - "column": 40, + "column": 39, "program": "tuple_types_16.ets" } } @@ -982,7 +982,7 @@ }, "end": { "line": 22, - "column": 63, + "column": 62, "program": "tuple_types_16.ets" } } @@ -995,7 +995,7 @@ }, "end": { "line": 22, - "column": 63, + "column": 62, "program": "tuple_types_16.ets" } } @@ -1009,7 +1009,7 @@ }, "end": { "line": 22, - "column": 63, + "column": 62, "program": "tuple_types_16.ets" } } @@ -1022,7 +1022,7 @@ }, "end": { "line": 22, - "column": 63, + "column": 62, "program": "tuple_types_16.ets" } } @@ -1149,7 +1149,7 @@ }, "end": { "line": 23, - "column": 23, + "column": 21, "program": "tuple_types_16.ets" } } @@ -1162,7 +1162,7 @@ }, "end": { "line": 23, - "column": 23, + "column": 21, "program": "tuple_types_16.ets" } } @@ -1227,7 +1227,7 @@ }, "end": { "line": 23, - "column": 40, + "column": 39, "program": "tuple_types_16.ets" } } @@ -1240,7 +1240,7 @@ }, "end": { "line": 23, - "column": 40, + "column": 39, "program": "tuple_types_16.ets" } } @@ -1254,7 +1254,7 @@ }, "end": { "line": 23, - "column": 40, + "column": 39, "program": "tuple_types_16.ets" } } @@ -1267,7 +1267,7 @@ }, "end": { "line": 23, - "column": 40, + "column": 39, "program": "tuple_types_16.ets" } } @@ -1358,7 +1358,7 @@ }, "end": { "line": 23, - "column": 63, + "column": 62, "program": "tuple_types_16.ets" } } @@ -1371,7 +1371,7 @@ }, "end": { "line": 23, - "column": 63, + "column": 62, "program": "tuple_types_16.ets" } } @@ -1385,7 +1385,7 @@ }, "end": { "line": 23, - "column": 63, + "column": 62, "program": "tuple_types_16.ets" } } @@ -1398,7 +1398,7 @@ }, "end": { "line": 23, - "column": 63, + "column": 62, "program": "tuple_types_16.ets" } } diff --git a/ets2panda/test/compiler/ets/tuple_types_17-expected.txt b/ets2panda/test/compiler/ets/tuple_types_17-expected.txt index 984be6af6d5..d56516ef3a4 100644 --- a/ets2panda/test/compiler/ets/tuple_types_17-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_17-expected.txt @@ -55,7 +55,7 @@ }, "end": { "line": 16, - "column": 17, + "column": 16, "program": "tuple_types_17.ets" } } @@ -68,7 +68,7 @@ }, "end": { "line": 16, - "column": 17, + "column": 16, "program": "tuple_types_17.ets" } } @@ -131,7 +131,7 @@ }, "end": { "line": 16, - "column": 35, + "column": 34, "program": "tuple_types_17.ets" } } @@ -144,7 +144,7 @@ }, "end": { "line": 16, - "column": 35, + "column": 34, "program": "tuple_types_17.ets" } } @@ -409,7 +409,7 @@ }, "end": { "line": 18, - "column": 17, + "column": 15, "program": "tuple_types_17.ets" } } @@ -422,7 +422,7 @@ }, "end": { "line": 18, - "column": 17, + "column": 15, "program": "tuple_types_17.ets" } } diff --git a/ets2panda/test/compiler/ets/tuple_types_18-expected.txt b/ets2panda/test/compiler/ets/tuple_types_18-expected.txt index 6c2c9e5f601..07ddd1e6ea2 100644 --- a/ets2panda/test/compiler/ets/tuple_types_18-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_18-expected.txt @@ -102,7 +102,7 @@ }, "end": { "line": 18, - "column": 17, + "column": 16, "program": "tuple_types_18.ets" } } @@ -115,7 +115,7 @@ }, "end": { "line": 18, - "column": 17, + "column": 16, "program": "tuple_types_18.ets" } } @@ -178,7 +178,7 @@ }, "end": { "line": 18, - "column": 35, + "column": 34, "program": "tuple_types_18.ets" } } @@ -191,7 +191,7 @@ }, "end": { "line": 18, - "column": 35, + "column": 34, "program": "tuple_types_18.ets" } } @@ -456,7 +456,7 @@ }, "end": { "line": 21, - "column": 17, + "column": 15, "program": "tuple_types_18.ets" } } @@ -469,7 +469,7 @@ }, "end": { "line": 21, - "column": 17, + "column": 15, "program": "tuple_types_18.ets" } } diff --git a/ets2panda/test/compiler/ets/tuple_types_19-expected.txt b/ets2panda/test/compiler/ets/tuple_types_19-expected.txt index 1dd4cab4050..bd66c1c9b28 100644 --- a/ets2panda/test/compiler/ets/tuple_types_19-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_19-expected.txt @@ -162,7 +162,7 @@ }, "end": { "line": 17, - "column": 13, + "column": 12, "program": "tuple_types_19.ets" } } @@ -175,7 +175,7 @@ }, "end": { "line": 17, - "column": 13, + "column": 12, "program": "tuple_types_19.ets" } } @@ -209,7 +209,7 @@ }, "end": { "line": 17, - "column": 16, + "column": 15, "program": "tuple_types_19.ets" } } @@ -222,7 +222,7 @@ }, "end": { "line": 17, - "column": 16, + "column": 15, "program": "tuple_types_19.ets" } } @@ -342,7 +342,7 @@ }, "end": { "line": 18, - "column": 27, + "column": 26, "program": "tuple_types_19.ets" } } @@ -355,7 +355,7 @@ }, "end": { "line": 18, - "column": 27, + "column": 26, "program": "tuple_types_19.ets" } } @@ -389,7 +389,7 @@ }, "end": { "line": 18, - "column": 30, + "column": 29, "program": "tuple_types_19.ets" } } @@ -402,7 +402,7 @@ }, "end": { "line": 18, - "column": 30, + "column": 29, "program": "tuple_types_19.ets" } } @@ -685,7 +685,7 @@ }, "end": { "line": 19, - "column": 26, + "column": 25, "program": "tuple_types_19.ets" } } @@ -698,7 +698,7 @@ }, "end": { "line": 19, - "column": 26, + "column": 25, "program": "tuple_types_19.ets" } } @@ -732,7 +732,7 @@ }, "end": { "line": 19, - "column": 29, + "column": 28, "program": "tuple_types_19.ets" } } @@ -745,7 +745,7 @@ }, "end": { "line": 19, - "column": 29, + "column": 28, "program": "tuple_types_19.ets" } } @@ -1042,7 +1042,7 @@ }, "end": { "line": 23, - "column": 14, + "column": 13, "program": "tuple_types_19.ets" } } @@ -1055,7 +1055,7 @@ }, "end": { "line": 23, - "column": 14, + "column": 13, "program": "tuple_types_19.ets" } } @@ -1089,7 +1089,7 @@ }, "end": { "line": 23, - "column": 17, + "column": 16, "program": "tuple_types_19.ets" } } @@ -1102,7 +1102,7 @@ }, "end": { "line": 23, - "column": 17, + "column": 16, "program": "tuple_types_19.ets" } } @@ -1222,7 +1222,7 @@ }, "end": { "line": 24, - "column": 27, + "column": 26, "program": "tuple_types_19.ets" } } @@ -1235,7 +1235,7 @@ }, "end": { "line": 24, - "column": 27, + "column": 26, "program": "tuple_types_19.ets" } } @@ -1269,7 +1269,7 @@ }, "end": { "line": 24, - "column": 30, + "column": 29, "program": "tuple_types_19.ets" } } @@ -1282,7 +1282,7 @@ }, "end": { "line": 24, - "column": 30, + "column": 29, "program": "tuple_types_19.ets" } } @@ -1565,7 +1565,7 @@ }, "end": { "line": 25, - "column": 26, + "column": 25, "program": "tuple_types_19.ets" } } @@ -1578,7 +1578,7 @@ }, "end": { "line": 25, - "column": 26, + "column": 25, "program": "tuple_types_19.ets" } } @@ -1612,7 +1612,7 @@ }, "end": { "line": 25, - "column": 29, + "column": 28, "program": "tuple_types_19.ets" } } @@ -1625,7 +1625,7 @@ }, "end": { "line": 25, - "column": 29, + "column": 28, "program": "tuple_types_19.ets" } } @@ -2120,7 +2120,7 @@ }, "end": { "line": 29, - "column": 29, + "column": 28, "program": "tuple_types_19.ets" } } @@ -2133,7 +2133,7 @@ }, "end": { "line": 29, - "column": 29, + "column": 28, "program": "tuple_types_19.ets" } } @@ -2167,7 +2167,7 @@ }, "end": { "line": 29, - "column": 37, + "column": 36, "program": "tuple_types_19.ets" } } @@ -2180,7 +2180,7 @@ }, "end": { "line": 29, - "column": 37, + "column": 36, "program": "tuple_types_19.ets" } } @@ -2351,7 +2351,7 @@ }, "end": { "line": 30, - "column": 34, + "column": 33, "program": "tuple_types_19.ets" } } @@ -2364,7 +2364,7 @@ }, "end": { "line": 30, - "column": 34, + "column": 33, "program": "tuple_types_19.ets" } } @@ -2391,7 +2391,7 @@ }, "end": { "line": 30, - "column": 36, + "column": 34, "program": "tuple_types_19.ets" } } @@ -2404,7 +2404,7 @@ }, "end": { "line": 30, - "column": 36, + "column": 34, "program": "tuple_types_19.ets" } } @@ -2478,7 +2478,7 @@ }, "end": { "line": 30, - "column": 62, + "column": 61, "program": "tuple_types_19.ets" } } @@ -2491,7 +2491,7 @@ }, "end": { "line": 30, - "column": 62, + "column": 61, "program": "tuple_types_19.ets" } } @@ -2518,7 +2518,7 @@ }, "end": { "line": 30, - "column": 63, + "column": 62, "program": "tuple_types_19.ets" } } @@ -2531,7 +2531,7 @@ }, "end": { "line": 30, - "column": 63, + "column": 62, "program": "tuple_types_19.ets" } } @@ -2636,7 +2636,7 @@ }, "end": { "line": 31, - "column": 25, + "column": 24, "program": "tuple_types_19.ets" } } @@ -2649,7 +2649,7 @@ }, "end": { "line": 31, - "column": 25, + "column": 24, "program": "tuple_types_19.ets" } } @@ -2683,7 +2683,7 @@ }, "end": { "line": 31, - "column": 33, + "column": 32, "program": "tuple_types_19.ets" } } @@ -2696,7 +2696,7 @@ }, "end": { "line": 31, - "column": 33, + "column": 32, "program": "tuple_types_19.ets" } } diff --git a/ets2panda/test/compiler/ets/tuple_types_7-expected.txt b/ets2panda/test/compiler/ets/tuple_types_7-expected.txt index ec5cc856c23..8edfc5520f7 100644 --- a/ets2panda/test/compiler/ets/tuple_types_7-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_7-expected.txt @@ -237,7 +237,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 19, "program": "tuple_types_7.ets" } } @@ -250,7 +250,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 19, "program": "tuple_types_7.ets" } } @@ -284,7 +284,7 @@ }, "end": { "line": 18, - "column": 28, + "column": 27, "program": "tuple_types_7.ets" } } @@ -297,7 +297,7 @@ }, "end": { "line": 18, - "column": 28, + "column": 27, "program": "tuple_types_7.ets" } } @@ -331,7 +331,7 @@ }, "end": { "line": 18, - "column": 33, + "column": 32, "program": "tuple_types_7.ets" } } @@ -344,7 +344,7 @@ }, "end": { "line": 18, - "column": 33, + "column": 32, "program": "tuple_types_7.ets" } } @@ -510,7 +510,7 @@ }, "end": { "line": 19, - "column": 20, + "column": 19, "program": "tuple_types_7.ets" } } @@ -523,7 +523,7 @@ }, "end": { "line": 19, - "column": 20, + "column": 19, "program": "tuple_types_7.ets" } } @@ -557,7 +557,7 @@ }, "end": { "line": 19, - "column": 28, + "column": 27, "program": "tuple_types_7.ets" } } @@ -570,7 +570,7 @@ }, "end": { "line": 19, - "column": 28, + "column": 27, "program": "tuple_types_7.ets" } } @@ -604,7 +604,7 @@ }, "end": { "line": 19, - "column": 33, + "column": 32, "program": "tuple_types_7.ets" } } @@ -617,7 +617,7 @@ }, "end": { "line": 19, - "column": 33, + "column": 32, "program": "tuple_types_7.ets" } } diff --git a/ets2panda/test/compiler/ets/typeVarReferenceFromStaticContext2-expected.txt b/ets2panda/test/compiler/ets/typeVarReferenceFromStaticContext2-expected.txt index 99dd369916b..3fac9cb5194 100644 --- a/ets2panda/test/compiler/ets/typeVarReferenceFromStaticContext2-expected.txt +++ b/ets2panda/test/compiler/ets/typeVarReferenceFromStaticContext2-expected.txt @@ -175,7 +175,7 @@ }, "end": { "line": 17, - "column": 32, + "column": 31, "program": "typeVarReferenceFromStaticContext2.ets" } } @@ -188,7 +188,7 @@ }, "end": { "line": 17, - "column": 32, + "column": 31, "program": "typeVarReferenceFromStaticContext2.ets" } } @@ -215,7 +215,7 @@ }, "end": { "line": 17, - "column": 34, + "column": 32, "program": "typeVarReferenceFromStaticContext2.ets" } } @@ -228,7 +228,7 @@ }, "end": { "line": 17, - "column": 34, + "column": 32, "program": "typeVarReferenceFromStaticContext2.ets" } } @@ -342,7 +342,7 @@ }, "end": { "line": 18, - "column": 26, + "column": 25, "program": "typeVarReferenceFromStaticContext2.ets" } } @@ -355,7 +355,7 @@ }, "end": { "line": 18, - "column": 26, + "column": 25, "program": "typeVarReferenceFromStaticContext2.ets" } } @@ -382,7 +382,7 @@ }, "end": { "line": 18, - "column": 27, + "column": 26, "program": "typeVarReferenceFromStaticContext2.ets" } } @@ -395,7 +395,7 @@ }, "end": { "line": 18, - "column": 27, + "column": 26, "program": "typeVarReferenceFromStaticContext2.ets" } } diff --git a/ets2panda/test/compiler/ets/union_types_1-expected.txt b/ets2panda/test/compiler/ets/union_types_1-expected.txt index 67fb8db8dc7..64c30d77428 100644 --- a/ets2panda/test/compiler/ets/union_types_1-expected.txt +++ b/ets2panda/test/compiler/ets/union_types_1-expected.txt @@ -1227,7 +1227,7 @@ }, "end": { "line": 34, - "column": 21, + "column": 19, "program": "union_types_1.ets" } } @@ -1240,7 +1240,7 @@ }, "end": { "line": 34, - "column": 21, + "column": 19, "program": "union_types_1.ets" } } @@ -1274,7 +1274,7 @@ }, "end": { "line": 34, - "column": 25, + "column": 23, "program": "union_types_1.ets" } } @@ -1287,7 +1287,7 @@ }, "end": { "line": 34, - "column": 25, + "column": 23, "program": "union_types_1.ets" } } @@ -1321,7 +1321,7 @@ }, "end": { "line": 34, - "column": 28, + "column": 27, "program": "union_types_1.ets" } } @@ -1334,7 +1334,7 @@ }, "end": { "line": 34, - "column": 28, + "column": 27, "program": "union_types_1.ets" } } @@ -1348,7 +1348,7 @@ }, "end": { "line": 34, - "column": 28, + "column": 27, "program": "union_types_1.ets" } } @@ -1362,7 +1362,7 @@ }, "end": { "line": 34, - "column": 28, + "column": 27, "program": "union_types_1.ets" } } @@ -1375,7 +1375,7 @@ }, "end": { "line": 34, - "column": 28, + "column": 27, "program": "union_types_1.ets" } } @@ -1435,7 +1435,7 @@ }, "end": { "line": 35, - "column": 24, + "column": 23, "program": "union_types_1.ets" } } @@ -1448,7 +1448,7 @@ }, "end": { "line": 35, - "column": 24, + "column": 23, "program": "union_types_1.ets" } } @@ -1461,7 +1461,7 @@ }, "end": { "line": 35, - "column": 24, + "column": 23, "program": "union_types_1.ets" } } @@ -1539,7 +1539,7 @@ }, "end": { "line": 36, - "column": 25, + "column": 24, "program": "union_types_1.ets" } } @@ -1552,7 +1552,7 @@ }, "end": { "line": 36, - "column": 25, + "column": 24, "program": "union_types_1.ets" } } @@ -1861,7 +1861,7 @@ }, "end": { "line": 39, - "column": 24, + "column": 23, "program": "union_types_1.ets" } } @@ -1874,7 +1874,7 @@ }, "end": { "line": 39, - "column": 24, + "column": 23, "program": "union_types_1.ets" } } @@ -1887,7 +1887,7 @@ }, "end": { "line": 39, - "column": 24, + "column": 23, "program": "union_types_1.ets" } } @@ -2899,7 +2899,7 @@ }, "end": { "line": 50, - "column": 16, + "column": 14, "program": "union_types_1.ets" } } @@ -2912,7 +2912,7 @@ }, "end": { "line": 50, - "column": 16, + "column": 14, "program": "union_types_1.ets" } } @@ -2946,7 +2946,7 @@ }, "end": { "line": 50, - "column": 20, + "column": 18, "program": "union_types_1.ets" } } @@ -2959,7 +2959,7 @@ }, "end": { "line": 50, - "column": 20, + "column": 18, "program": "union_types_1.ets" } } @@ -2993,7 +2993,7 @@ }, "end": { "line": 50, - "column": 23, + "column": 22, "program": "union_types_1.ets" } } @@ -3006,7 +3006,7 @@ }, "end": { "line": 50, - "column": 23, + "column": 22, "program": "union_types_1.ets" } } @@ -3020,7 +3020,7 @@ }, "end": { "line": 50, - "column": 23, + "column": 22, "program": "union_types_1.ets" } } @@ -3121,7 +3121,7 @@ }, "end": { "line": 51, - "column": 15, + "column": 14, "program": "union_types_1.ets" } } @@ -3134,7 +3134,7 @@ }, "end": { "line": 51, - "column": 15, + "column": 14, "program": "union_types_1.ets" } } @@ -3481,7 +3481,7 @@ }, "end": { "line": 54, - "column": 24, + "column": 23, "program": "union_types_1.ets" } } @@ -3494,7 +3494,7 @@ }, "end": { "line": 54, - "column": 24, + "column": 23, "program": "union_types_1.ets" } } @@ -3507,7 +3507,7 @@ }, "end": { "line": 54, - "column": 24, + "column": 23, "program": "union_types_1.ets" } } @@ -3585,7 +3585,7 @@ }, "end": { "line": 55, - "column": 25, + "column": 24, "program": "union_types_1.ets" } } @@ -3598,7 +3598,7 @@ }, "end": { "line": 55, - "column": 25, + "column": 24, "program": "union_types_1.ets" } } @@ -3907,7 +3907,7 @@ }, "end": { "line": 58, - "column": 24, + "column": 23, "program": "union_types_1.ets" } } @@ -3920,7 +3920,7 @@ }, "end": { "line": 58, - "column": 24, + "column": 23, "program": "union_types_1.ets" } } @@ -3933,7 +3933,7 @@ }, "end": { "line": 58, - "column": 24, + "column": 23, "program": "union_types_1.ets" } } @@ -4138,7 +4138,7 @@ }, "end": { "line": 61, - "column": 15, + "column": 14, "program": "union_types_1.ets" } } @@ -4151,7 +4151,7 @@ }, "end": { "line": 61, - "column": 15, + "column": 14, "program": "union_types_1.ets" } } @@ -4416,7 +4416,7 @@ }, "end": { "line": 63, - "column": 15, + "column": 14, "program": "union_types_1.ets" } } @@ -4429,7 +4429,7 @@ }, "end": { "line": 63, - "column": 15, + "column": 14, "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 a5f9e2000f2..c8e3fd1a93d 100644 --- a/ets2panda/test/compiler/ets/union_types_3-expected.txt +++ b/ets2panda/test/compiler/ets/union_types_3-expected.txt @@ -237,7 +237,7 @@ }, "end": { "line": 17, - "column": 28, + "column": 26, "program": "union_types_3.ets" } } @@ -250,7 +250,7 @@ }, "end": { "line": 17, - "column": 28, + "column": 26, "program": "union_types_3.ets" } } @@ -1198,7 +1198,7 @@ }, "end": { "line": 24, - "column": 39, + "column": 38, "program": "union_types_3.ets" } } @@ -1211,7 +1211,7 @@ }, "end": { "line": 24, - "column": 39, + "column": 38, "program": "union_types_3.ets" } } @@ -1406,7 +1406,7 @@ }, "end": { "line": 25, - "column": 22, + "column": 20, "program": "union_types_3.ets" } } @@ -1419,7 +1419,7 @@ }, "end": { "line": 25, - "column": 22, + "column": 20, "program": "union_types_3.ets" } } @@ -1562,7 +1562,7 @@ }, "end": { "line": 26, - "column": 30, + "column": 29, "program": "union_types_3.ets" } } @@ -1575,7 +1575,7 @@ }, "end": { "line": 26, - "column": 30, + "column": 29, "program": "union_types_3.ets" } } @@ -1588,7 +1588,7 @@ }, "end": { "line": 26, - "column": 30, + "column": 29, "program": "union_types_3.ets" } } @@ -1704,7 +1704,7 @@ }, "end": { "line": 27, - "column": 42, + "column": 41, "program": "union_types_3.ets" } } @@ -1717,7 +1717,7 @@ }, "end": { "line": 27, - "column": 42, + "column": 41, "program": "union_types_3.ets" } } @@ -1911,7 +1911,7 @@ }, "end": { "line": 29, - "column": 22, + "column": 20, "program": "union_types_3.ets" } } @@ -1924,7 +1924,7 @@ }, "end": { "line": 29, - "column": 22, + "column": 20, "program": "union_types_3.ets" } } @@ -2249,7 +2249,7 @@ }, "end": { "line": 31, - "column": 22, + "column": 20, "program": "union_types_3.ets" } } @@ -2262,7 +2262,7 @@ }, "end": { "line": 31, - "column": 22, + "column": 20, "program": "union_types_3.ets" } } @@ -2488,7 +2488,7 @@ }, "end": { "line": 33, - "column": 36, + "column": 35, "program": "union_types_3.ets" } } @@ -2501,7 +2501,7 @@ }, "end": { "line": 33, - "column": 36, + "column": 35, "program": "union_types_3.ets" } } diff --git a/ets2panda/test/compiler/ets/union_types_5-expected.txt b/ets2panda/test/compiler/ets/union_types_5-expected.txt index 377f67e68e5..f650c418b46 100644 --- a/ets2panda/test/compiler/ets/union_types_5-expected.txt +++ b/ets2panda/test/compiler/ets/union_types_5-expected.txt @@ -72,7 +72,7 @@ }, "end": { "line": 16, - "column": 26, + "column": 25, "program": "union_types_5.ets" } } @@ -85,7 +85,7 @@ }, "end": { "line": 16, - "column": 26, + "column": 25, "program": "union_types_5.ets" } } @@ -174,7 +174,7 @@ }, "end": { "line": 17, - "column": 15, + "column": 14, "program": "union_types_5.ets" } } @@ -187,7 +187,7 @@ }, "end": { "line": 17, - "column": 15, + "column": 14, "program": "union_types_5.ets" } } @@ -202,7 +202,7 @@ }, "end": { "line": 17, - "column": 15, + "column": 14, "program": "union_types_5.ets" } } @@ -290,7 +290,7 @@ }, "end": { "line": 18, - "column": 27, + "column": 26, "program": "union_types_5.ets" } } @@ -303,7 +303,7 @@ }, "end": { "line": 18, - "column": 27, + "column": 26, "program": "union_types_5.ets" } } @@ -317,7 +317,7 @@ }, "end": { "line": 18, - "column": 27, + "column": 26, "program": "union_types_5.ets" } } @@ -330,7 +330,7 @@ }, "end": { "line": 18, - "column": 27, + "column": 26, "program": "union_types_5.ets" } } @@ -1185,7 +1185,7 @@ }, "end": { "line": 29, - "column": 19, + "column": 18, "program": "union_types_5.ets" } } @@ -1198,7 +1198,7 @@ }, "end": { "line": 29, - "column": 19, + "column": 18, "program": "union_types_5.ets" } } @@ -1232,7 +1232,7 @@ }, "end": { "line": 29, - "column": 21, + "column": 20, "program": "union_types_5.ets" } } @@ -1245,7 +1245,7 @@ }, "end": { "line": 29, - "column": 21, + "column": 20, "program": "union_types_5.ets" } } @@ -1259,7 +1259,7 @@ }, "end": { "line": 29, - "column": 21, + "column": 20, "program": "union_types_5.ets" } } @@ -1273,7 +1273,7 @@ }, "end": { "line": 29, - "column": 21, + "column": 20, "program": "union_types_5.ets" } } @@ -1286,7 +1286,7 @@ }, "end": { "line": 29, - "column": 21, + "column": 20, "program": "union_types_5.ets" } } @@ -1346,7 +1346,7 @@ }, "end": { "line": 30, - "column": 24, + "column": 23, "program": "union_types_5.ets" } } @@ -1359,7 +1359,7 @@ }, "end": { "line": 30, - "column": 24, + "column": 23, "program": "union_types_5.ets" } } @@ -1372,7 +1372,7 @@ }, "end": { "line": 30, - "column": 24, + "column": 23, "program": "union_types_5.ets" } } @@ -1612,7 +1612,7 @@ }, "end": { "line": 32, - "column": 31, + "column": 30, "program": "union_types_5.ets" } } @@ -1625,7 +1625,7 @@ }, "end": { "line": 32, - "column": 31, + "column": 30, "program": "union_types_5.ets" } } @@ -1638,7 +1638,7 @@ }, "end": { "line": 32, - "column": 31, + "column": 30, "program": "union_types_5.ets" } } @@ -2151,7 +2151,7 @@ }, "end": { "line": 39, - "column": 21, + "column": 20, "program": "union_types_5.ets" } } @@ -2164,7 +2164,7 @@ }, "end": { "line": 39, - "column": 21, + "column": 20, "program": "union_types_5.ets" } } @@ -2198,7 +2198,7 @@ }, "end": { "line": 39, - "column": 23, + "column": 22, "program": "union_types_5.ets" } } @@ -2211,7 +2211,7 @@ }, "end": { "line": 39, - "column": 23, + "column": 22, "program": "union_types_5.ets" } } @@ -2225,7 +2225,7 @@ }, "end": { "line": 39, - "column": 23, + "column": 22, "program": "union_types_5.ets" } } @@ -2252,7 +2252,7 @@ }, "end": { "line": 39, - "column": 24, + "column": 23, "program": "union_types_5.ets" } } @@ -2265,7 +2265,7 @@ }, "end": { "line": 39, - "column": 24, + "column": 23, "program": "union_types_5.ets" } } @@ -2279,7 +2279,7 @@ }, "end": { "line": 39, - "column": 24, + "column": 23, "program": "union_types_5.ets" } } @@ -2292,7 +2292,7 @@ }, "end": { "line": 39, - "column": 24, + "column": 23, "program": "union_types_5.ets" } } @@ -2386,7 +2386,7 @@ }, "end": { "line": 40, - "column": 31, + "column": 30, "program": "union_types_5.ets" } } @@ -2399,7 +2399,7 @@ }, "end": { "line": 40, - "column": 31, + "column": 30, "program": "union_types_5.ets" } } @@ -2412,7 +2412,7 @@ }, "end": { "line": 40, - "column": 31, + "column": 30, "program": "union_types_5.ets" } } @@ -2720,7 +2720,7 @@ }, "end": { "line": 42, - "column": 38, + "column": 37, "program": "union_types_5.ets" } } @@ -2733,7 +2733,7 @@ }, "end": { "line": 42, - "column": 38, + "column": 37, "program": "union_types_5.ets" } } @@ -2746,7 +2746,7 @@ }, "end": { "line": 42, - "column": 38, + "column": 37, "program": "union_types_5.ets" } } @@ -3314,7 +3314,7 @@ }, "end": { "line": 50, - "column": 16, + "column": 15, "program": "union_types_5.ets" } } @@ -3327,7 +3327,7 @@ }, "end": { "line": 50, - "column": 16, + "column": 15, "program": "union_types_5.ets" } } @@ -3361,7 +3361,7 @@ }, "end": { "line": 50, - "column": 18, + "column": 17, "program": "union_types_5.ets" } } @@ -3374,7 +3374,7 @@ }, "end": { "line": 50, - "column": 18, + "column": 17, "program": "union_types_5.ets" } } @@ -3388,7 +3388,7 @@ }, "end": { "line": 50, - "column": 18, + "column": 17, "program": "union_types_5.ets" } } @@ -3415,7 +3415,7 @@ }, "end": { "line": 50, - "column": 20, + "column": 18, "program": "union_types_5.ets" } } @@ -3428,7 +3428,7 @@ }, "end": { "line": 50, - "column": 20, + "column": 18, "program": "union_types_5.ets" } } @@ -3505,7 +3505,7 @@ }, "end": { "line": 50, - "column": 29, + "column": 28, "program": "union_types_5.ets" } } @@ -3518,7 +3518,7 @@ }, "end": { "line": 50, - "column": 29, + "column": 28, "program": "union_types_5.ets" } } @@ -3552,7 +3552,7 @@ }, "end": { "line": 50, - "column": 31, + "column": 30, "program": "union_types_5.ets" } } @@ -3565,7 +3565,7 @@ }, "end": { "line": 50, - "column": 31, + "column": 30, "program": "union_types_5.ets" } } @@ -3579,7 +3579,7 @@ }, "end": { "line": 50, - "column": 31, + "column": 30, "program": "union_types_5.ets" } } @@ -3606,7 +3606,7 @@ }, "end": { "line": 50, - "column": 32, + "column": 31, "program": "union_types_5.ets" } } @@ -3619,7 +3619,7 @@ }, "end": { "line": 50, - "column": 32, + "column": 31, "program": "union_types_5.ets" } } @@ -3656,7 +3656,7 @@ }, "end": { "line": 50, - "column": 38, + "column": 37, "program": "union_types_5.ets" } } @@ -3669,7 +3669,7 @@ }, "end": { "line": 50, - "column": 38, + "column": 37, "program": "union_types_5.ets" } } @@ -3985,7 +3985,7 @@ }, "end": { "line": 53, - "column": 22, + "column": 21, "program": "union_types_5.ets" } } @@ -3998,7 +3998,7 @@ }, "end": { "line": 53, - "column": 22, + "column": 21, "program": "union_types_5.ets" } } diff --git a/ets2panda/test/compiler/ets/union_types_merging-expected.txt b/ets2panda/test/compiler/ets/union_types_merging-expected.txt index 54b9ed2d39b..30bd4b0e8a2 100644 --- a/ets2panda/test/compiler/ets/union_types_merging-expected.txt +++ b/ets2panda/test/compiler/ets/union_types_merging-expected.txt @@ -205,7 +205,7 @@ }, "end": { "line": 30, - "column": 22, + "column": 20, "program": "union_types_merging.ets" } } @@ -218,7 +218,7 @@ }, "end": { "line": 30, - "column": 22, + "column": 20, "program": "union_types_merging.ets" } } @@ -406,7 +406,7 @@ }, "end": { "line": 31, - "column": 22, + "column": 20, "program": "union_types_merging.ets" } } @@ -419,7 +419,7 @@ }, "end": { "line": 31, - "column": 22, + "column": 20, "program": "union_types_merging.ets" } } @@ -607,7 +607,7 @@ }, "end": { "line": 32, - "column": 22, + "column": 20, "program": "union_types_merging.ets" } } @@ -620,7 +620,7 @@ }, "end": { "line": 32, - "column": 22, + "column": 20, "program": "union_types_merging.ets" } } @@ -808,7 +808,7 @@ }, "end": { "line": 33, - "column": 22, + "column": 20, "program": "union_types_merging.ets" } } @@ -821,7 +821,7 @@ }, "end": { "line": 33, - "column": 22, + "column": 20, "program": "union_types_merging.ets" } } @@ -1164,7 +1164,7 @@ }, "end": { "line": 36, - "column": 22, + "column": 20, "program": "union_types_merging.ets" } } @@ -1177,7 +1177,7 @@ }, "end": { "line": 36, - "column": 22, + "column": 20, "program": "union_types_merging.ets" } } @@ -1365,7 +1365,7 @@ }, "end": { "line": 37, - "column": 22, + "column": 20, "program": "union_types_merging.ets" } } @@ -1378,7 +1378,7 @@ }, "end": { "line": 37, - "column": 22, + "column": 20, "program": "union_types_merging.ets" } } @@ -1566,7 +1566,7 @@ }, "end": { "line": 38, - "column": 22, + "column": 20, "program": "union_types_merging.ets" } } @@ -1579,7 +1579,7 @@ }, "end": { "line": 38, - "column": 22, + "column": 20, "program": "union_types_merging.ets" } } @@ -1767,7 +1767,7 @@ }, "end": { "line": 39, - "column": 22, + "column": 20, "program": "union_types_merging.ets" } } @@ -1780,7 +1780,7 @@ }, "end": { "line": 39, - "column": 22, + "column": 20, "program": "union_types_merging.ets" } } @@ -2155,7 +2155,7 @@ }, "end": { "line": 17, - "column": 20, + "column": 18, "program": "union_types_merging.ets" } } @@ -2168,7 +2168,7 @@ }, "end": { "line": 17, - "column": 20, + "column": 18, "program": "union_types_merging.ets" } } @@ -2202,7 +2202,7 @@ }, "end": { "line": 17, - "column": 25, + "column": 23, "program": "union_types_merging.ets" } } @@ -2215,7 +2215,7 @@ }, "end": { "line": 17, - "column": 25, + "column": 23, "program": "union_types_merging.ets" } } @@ -2249,7 +2249,7 @@ }, "end": { "line": 17, - "column": 30, + "column": 28, "program": "union_types_merging.ets" } } @@ -2262,7 +2262,7 @@ }, "end": { "line": 17, - "column": 30, + "column": 28, "program": "union_types_merging.ets" } } @@ -2296,7 +2296,7 @@ }, "end": { "line": 17, - "column": 35, + "column": 33, "program": "union_types_merging.ets" } } @@ -2309,7 +2309,7 @@ }, "end": { "line": 17, - "column": 35, + "column": 33, "program": "union_types_merging.ets" } } @@ -2343,7 +2343,7 @@ }, "end": { "line": 17, - "column": 39, + "column": 38, "program": "union_types_merging.ets" } } @@ -2356,7 +2356,7 @@ }, "end": { "line": 17, - "column": 39, + "column": 38, "program": "union_types_merging.ets" } } @@ -2370,7 +2370,7 @@ }, "end": { "line": 17, - "column": 39, + "column": 38, "program": "union_types_merging.ets" } } @@ -2458,7 +2458,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 18, "program": "union_types_merging.ets" } } @@ -2471,7 +2471,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 18, "program": "union_types_merging.ets" } } @@ -2505,7 +2505,7 @@ }, "end": { "line": 18, - "column": 25, + "column": 23, "program": "union_types_merging.ets" } } @@ -2518,7 +2518,7 @@ }, "end": { "line": 18, - "column": 25, + "column": 23, "program": "union_types_merging.ets" } } @@ -2552,7 +2552,7 @@ }, "end": { "line": 18, - "column": 30, + "column": 28, "program": "union_types_merging.ets" } } @@ -2565,7 +2565,7 @@ }, "end": { "line": 18, - "column": 30, + "column": 28, "program": "union_types_merging.ets" } } @@ -2599,7 +2599,7 @@ }, "end": { "line": 18, - "column": 35, + "column": 33, "program": "union_types_merging.ets" } } @@ -2612,7 +2612,7 @@ }, "end": { "line": 18, - "column": 35, + "column": 33, "program": "union_types_merging.ets" } } @@ -2646,7 +2646,7 @@ }, "end": { "line": 18, - "column": 39, + "column": 38, "program": "union_types_merging.ets" } } @@ -2659,7 +2659,7 @@ }, "end": { "line": 18, - "column": 39, + "column": 38, "program": "union_types_merging.ets" } } @@ -2673,7 +2673,7 @@ }, "end": { "line": 18, - "column": 39, + "column": 38, "program": "union_types_merging.ets" } } @@ -2761,7 +2761,7 @@ }, "end": { "line": 19, - "column": 20, + "column": 18, "program": "union_types_merging.ets" } } @@ -2774,7 +2774,7 @@ }, "end": { "line": 19, - "column": 20, + "column": 18, "program": "union_types_merging.ets" } } @@ -2808,7 +2808,7 @@ }, "end": { "line": 19, - "column": 25, + "column": 23, "program": "union_types_merging.ets" } } @@ -2821,7 +2821,7 @@ }, "end": { "line": 19, - "column": 25, + "column": 23, "program": "union_types_merging.ets" } } @@ -2855,7 +2855,7 @@ }, "end": { "line": 19, - "column": 30, + "column": 28, "program": "union_types_merging.ets" } } @@ -2868,7 +2868,7 @@ }, "end": { "line": 19, - "column": 30, + "column": 28, "program": "union_types_merging.ets" } } @@ -2902,7 +2902,7 @@ }, "end": { "line": 19, - "column": 35, + "column": 33, "program": "union_types_merging.ets" } } @@ -2915,7 +2915,7 @@ }, "end": { "line": 19, - "column": 35, + "column": 33, "program": "union_types_merging.ets" } } @@ -2949,7 +2949,7 @@ }, "end": { "line": 19, - "column": 40, + "column": 38, "program": "union_types_merging.ets" } } @@ -2962,7 +2962,7 @@ }, "end": { "line": 19, - "column": 40, + "column": 38, "program": "union_types_merging.ets" } } @@ -2996,7 +2996,7 @@ }, "end": { "line": 19, - "column": 45, + "column": 43, "program": "union_types_merging.ets" } } @@ -3009,7 +3009,7 @@ }, "end": { "line": 19, - "column": 45, + "column": 43, "program": "union_types_merging.ets" } } @@ -3043,7 +3043,7 @@ }, "end": { "line": 19, - "column": 50, + "column": 48, "program": "union_types_merging.ets" } } @@ -3056,7 +3056,7 @@ }, "end": { "line": 19, - "column": 50, + "column": 48, "program": "union_types_merging.ets" } } @@ -3090,7 +3090,7 @@ }, "end": { "line": 19, - "column": 55, + "column": 53, "program": "union_types_merging.ets" } } @@ -3103,7 +3103,7 @@ }, "end": { "line": 19, - "column": 55, + "column": 53, "program": "union_types_merging.ets" } } @@ -3137,7 +3137,7 @@ }, "end": { "line": 19, - "column": 60, + "column": 58, "program": "union_types_merging.ets" } } @@ -3150,7 +3150,7 @@ }, "end": { "line": 19, - "column": 60, + "column": 58, "program": "union_types_merging.ets" } } @@ -3184,7 +3184,7 @@ }, "end": { "line": 19, - "column": 64, + "column": 63, "program": "union_types_merging.ets" } } @@ -3197,7 +3197,7 @@ }, "end": { "line": 19, - "column": 64, + "column": 63, "program": "union_types_merging.ets" } } @@ -3211,7 +3211,7 @@ }, "end": { "line": 19, - "column": 64, + "column": 63, "program": "union_types_merging.ets" } } @@ -3299,7 +3299,7 @@ }, "end": { "line": 20, - "column": 20, + "column": 18, "program": "union_types_merging.ets" } } @@ -3312,7 +3312,7 @@ }, "end": { "line": 20, - "column": 20, + "column": 18, "program": "union_types_merging.ets" } } @@ -3346,7 +3346,7 @@ }, "end": { "line": 20, - "column": 25, + "column": 23, "program": "union_types_merging.ets" } } @@ -3359,7 +3359,7 @@ }, "end": { "line": 20, - "column": 25, + "column": 23, "program": "union_types_merging.ets" } } @@ -3393,7 +3393,7 @@ }, "end": { "line": 20, - "column": 30, + "column": 28, "program": "union_types_merging.ets" } } @@ -3406,7 +3406,7 @@ }, "end": { "line": 20, - "column": 30, + "column": 28, "program": "union_types_merging.ets" } } @@ -3440,7 +3440,7 @@ }, "end": { "line": 20, - "column": 35, + "column": 33, "program": "union_types_merging.ets" } } @@ -3453,7 +3453,7 @@ }, "end": { "line": 20, - "column": 35, + "column": 33, "program": "union_types_merging.ets" } } @@ -3487,7 +3487,7 @@ }, "end": { "line": 20, - "column": 40, + "column": 38, "program": "union_types_merging.ets" } } @@ -3500,7 +3500,7 @@ }, "end": { "line": 20, - "column": 40, + "column": 38, "program": "union_types_merging.ets" } } @@ -3534,7 +3534,7 @@ }, "end": { "line": 20, - "column": 49, + "column": 47, "program": "union_types_merging.ets" } } @@ -3547,7 +3547,7 @@ }, "end": { "line": 20, - "column": 49, + "column": 47, "program": "union_types_merging.ets" } } @@ -3581,7 +3581,7 @@ }, "end": { "line": 20, - "column": 54, + "column": 52, "program": "union_types_merging.ets" } } @@ -3594,7 +3594,7 @@ }, "end": { "line": 20, - "column": 54, + "column": 52, "program": "union_types_merging.ets" } } @@ -3628,7 +3628,7 @@ }, "end": { "line": 20, - "column": 59, + "column": 57, "program": "union_types_merging.ets" } } @@ -3641,7 +3641,7 @@ }, "end": { "line": 20, - "column": 59, + "column": 57, "program": "union_types_merging.ets" } } @@ -3675,7 +3675,7 @@ }, "end": { "line": 20, - "column": 64, + "column": 62, "program": "union_types_merging.ets" } } @@ -3688,7 +3688,7 @@ }, "end": { "line": 20, - "column": 64, + "column": 62, "program": "union_types_merging.ets" } } @@ -3722,7 +3722,7 @@ }, "end": { "line": 20, - "column": 69, + "column": 67, "program": "union_types_merging.ets" } } @@ -3735,7 +3735,7 @@ }, "end": { "line": 20, - "column": 69, + "column": 67, "program": "union_types_merging.ets" } } @@ -3769,7 +3769,7 @@ }, "end": { "line": 20, - "column": 73, + "column": 72, "program": "union_types_merging.ets" } } @@ -3782,7 +3782,7 @@ }, "end": { "line": 20, - "column": 73, + "column": 72, "program": "union_types_merging.ets" } } @@ -3796,7 +3796,7 @@ }, "end": { "line": 20, - "column": 73, + "column": 72, "program": "union_types_merging.ets" } } @@ -3897,7 +3897,7 @@ }, "end": { "line": 22, - "column": 19, + "column": 18, "program": "union_types_merging.ets" } } @@ -3910,7 +3910,7 @@ }, "end": { "line": 22, - "column": 19, + "column": 18, "program": "union_types_merging.ets" } } @@ -4008,7 +4008,7 @@ }, "end": { "line": 23, - "column": 19, + "column": 18, "program": "union_types_merging.ets" } } @@ -4021,7 +4021,7 @@ }, "end": { "line": 23, - "column": 19, + "column": 18, "program": "union_types_merging.ets" } } @@ -4119,7 +4119,7 @@ }, "end": { "line": 24, - "column": 19, + "column": 18, "program": "union_types_merging.ets" } } @@ -4132,7 +4132,7 @@ }, "end": { "line": 24, - "column": 19, + "column": 18, "program": "union_types_merging.ets" } } @@ -4230,7 +4230,7 @@ }, "end": { "line": 25, - "column": 19, + "column": 18, "program": "union_types_merging.ets" } } @@ -4243,7 +4243,7 @@ }, "end": { "line": 25, - "column": 19, + "column": 18, "program": "union_types_merging.ets" } } @@ -4341,7 +4341,7 @@ }, "end": { "line": 26, - "column": 23, + "column": 22, "program": "union_types_merging.ets" } } @@ -4354,7 +4354,7 @@ }, "end": { "line": 26, - "column": 23, + "column": 22, "program": "union_types_merging.ets" } } diff --git a/ets2panda/test/parser/ets/AccessBinaryTrees-expected.txt b/ets2panda/test/parser/ets/AccessBinaryTrees-expected.txt index 741fd7deaa4..0b6c86dc583 100644 --- a/ets2panda/test/parser/ets/AccessBinaryTrees-expected.txt +++ b/ets2panda/test/parser/ets/AccessBinaryTrees-expected.txt @@ -81,7 +81,7 @@ }, "end": { "line": 17, - "column": 27, + "column": 25, "program": "AccessBinaryTrees.ets" } } @@ -94,7 +94,7 @@ }, "end": { "line": 17, - "column": 27, + "column": 25, "program": "AccessBinaryTrees.ets" } } @@ -200,7 +200,7 @@ }, "end": { "line": 18, - "column": 28, + "column": 26, "program": "AccessBinaryTrees.ets" } } @@ -213,7 +213,7 @@ }, "end": { "line": 18, - "column": 28, + "column": 26, "program": "AccessBinaryTrees.ets" } } @@ -403,7 +403,7 @@ }, "end": { "line": 21, - "column": 31, + "column": 29, "program": "AccessBinaryTrees.ets" } } @@ -416,7 +416,7 @@ }, "end": { "line": 21, - "column": 31, + "column": 29, "program": "AccessBinaryTrees.ets" } } @@ -514,7 +514,7 @@ }, "end": { "line": 21, - "column": 55, + "column": 53, "program": "AccessBinaryTrees.ets" } } @@ -527,7 +527,7 @@ }, "end": { "line": 21, - "column": 55, + "column": 53, "program": "AccessBinaryTrees.ets" } } @@ -1984,7 +1984,7 @@ }, "end": { "line": 40, - "column": 57, + "column": 55, "program": "AccessBinaryTrees.ets" } } @@ -1997,7 +1997,7 @@ }, "end": { "line": 40, - "column": 57, + "column": 55, "program": "AccessBinaryTrees.ets" } } @@ -2092,7 +2092,7 @@ }, "end": { "line": 42, - "column": 26, + "column": 25, "program": "AccessBinaryTrees.ets" } } @@ -2105,7 +2105,7 @@ }, "end": { "line": 42, - "column": 26, + "column": 25, "program": "AccessBinaryTrees.ets" } } @@ -2582,7 +2582,7 @@ }, "end": { "line": 48, - "column": 24, + "column": 23, "program": "AccessBinaryTrees.ets" } } @@ -2595,7 +2595,7 @@ }, "end": { "line": 48, - "column": 24, + "column": 23, "program": "AccessBinaryTrees.ets" } } @@ -5552,7 +5552,7 @@ }, "end": { "line": 80, - "column": 33, + "column": 32, "program": "AccessBinaryTrees.ets" } } @@ -5565,7 +5565,7 @@ }, "end": { "line": 80, - "column": 33, + "column": 32, "program": "AccessBinaryTrees.ets" } } diff --git a/ets2panda/test/parser/ets/AccessFannkuch-expected.txt b/ets2panda/test/parser/ets/AccessFannkuch-expected.txt index 65ec727abb3..90c12dddd90 100644 --- a/ets2panda/test/parser/ets/AccessFannkuch-expected.txt +++ b/ets2panda/test/parser/ets/AccessFannkuch-expected.txt @@ -6369,7 +6369,7 @@ }, "end": { "line": 91, - "column": 32, + "column": 31, "program": "AccessFannkuch.ets" } } @@ -6382,7 +6382,7 @@ }, "end": { "line": 91, - "column": 32, + "column": 31, "program": "AccessFannkuch.ets" } } diff --git a/ets2panda/test/parser/ets/AccessNBody-expected.txt b/ets2panda/test/parser/ets/AccessNBody-expected.txt index c64a0444fa9..6c6c6d7bb83 100644 --- a/ets2panda/test/parser/ets/AccessNBody-expected.txt +++ b/ets2panda/test/parser/ets/AccessNBody-expected.txt @@ -1964,7 +1964,7 @@ }, "end": { "line": 38, - "column": 75, + "column": 73, "program": "AccessNBody.ets" } } @@ -1977,7 +1977,7 @@ }, "end": { "line": 38, - "column": 75, + "column": 73, "program": "AccessNBody.ets" } } @@ -3750,7 +3750,7 @@ }, "end": { "line": 55, - "column": 28, + "column": 26, "program": "AccessNBody.ets" } } @@ -3763,7 +3763,7 @@ }, "end": { "line": 55, - "column": 28, + "column": 26, "program": "AccessNBody.ets" } } @@ -5538,7 +5538,7 @@ }, "end": { "line": 72, - "column": 32, + "column": 30, "program": "AccessNBody.ets" } } @@ -5551,7 +5551,7 @@ }, "end": { "line": 72, - "column": 32, + "column": 30, "program": "AccessNBody.ets" } } @@ -5921,7 +5921,7 @@ }, "end": { "line": 74, - "column": 36, + "column": 34, "program": "AccessNBody.ets" } } @@ -5934,7 +5934,7 @@ }, "end": { "line": 74, - "column": 36, + "column": 34, "program": "AccessNBody.ets" } } @@ -8446,7 +8446,7 @@ }, "end": { "line": 89, - "column": 31, + "column": 29, "program": "AccessNBody.ets" } } @@ -8459,7 +8459,7 @@ }, "end": { "line": 89, - "column": 31, + "column": 29, "program": "AccessNBody.ets" } } @@ -9987,7 +9987,7 @@ }, "end": { "line": 103, - "column": 32, + "column": 30, "program": "AccessNBody.ets" } } @@ -10000,7 +10000,7 @@ }, "end": { "line": 103, - "column": 32, + "column": 30, "program": "AccessNBody.ets" } } @@ -10903,7 +10903,7 @@ }, "end": { "line": 106, - "column": 36, + "column": 34, "program": "AccessNBody.ets" } } @@ -10916,7 +10916,7 @@ }, "end": { "line": 106, - "column": 36, + "column": 34, "program": "AccessNBody.ets" } } @@ -12627,7 +12627,7 @@ }, "end": { "line": 124, - "column": 29, + "column": 27, "program": "AccessNBody.ets" } } @@ -12640,7 +12640,7 @@ }, "end": { "line": 124, - "column": 29, + "column": 27, "program": "AccessNBody.ets" } } @@ -12681,7 +12681,7 @@ }, "end": { "line": 125, - "column": 25, + "column": 24, "program": "AccessNBody.ets" } } @@ -12694,7 +12694,7 @@ }, "end": { "line": 125, - "column": 25, + "column": 24, "program": "AccessNBody.ets" } } @@ -13039,7 +13039,7 @@ }, "end": { "line": 127, - "column": 28, + "column": 26, "program": "AccessNBody.ets" } } @@ -13052,7 +13052,7 @@ }, "end": { "line": 127, - "column": 28, + "column": 26, "program": "AccessNBody.ets" } } @@ -13093,7 +13093,7 @@ }, "end": { "line": 128, - "column": 25, + "column": 24, "program": "AccessNBody.ets" } } @@ -13106,7 +13106,7 @@ }, "end": { "line": 128, - "column": 25, + "column": 24, "program": "AccessNBody.ets" } } @@ -13451,7 +13451,7 @@ }, "end": { "line": 130, - "column": 28, + "column": 26, "program": "AccessNBody.ets" } } @@ -13464,7 +13464,7 @@ }, "end": { "line": 130, - "column": 28, + "column": 26, "program": "AccessNBody.ets" } } @@ -13505,7 +13505,7 @@ }, "end": { "line": 131, - "column": 25, + "column": 24, "program": "AccessNBody.ets" } } @@ -13518,7 +13518,7 @@ }, "end": { "line": 131, - "column": 25, + "column": 24, "program": "AccessNBody.ets" } } @@ -13863,7 +13863,7 @@ }, "end": { "line": 133, - "column": 29, + "column": 27, "program": "AccessNBody.ets" } } @@ -13876,7 +13876,7 @@ }, "end": { "line": 133, - "column": 29, + "column": 27, "program": "AccessNBody.ets" } } @@ -13917,7 +13917,7 @@ }, "end": { "line": 134, - "column": 25, + "column": 24, "program": "AccessNBody.ets" } } @@ -13930,7 +13930,7 @@ }, "end": { "line": 134, - "column": 25, + "column": 24, "program": "AccessNBody.ets" } } @@ -14275,7 +14275,7 @@ }, "end": { "line": 136, - "column": 25, + "column": 23, "program": "AccessNBody.ets" } } @@ -14288,7 +14288,7 @@ }, "end": { "line": 136, - "column": 25, + "column": 23, "program": "AccessNBody.ets" } } @@ -14329,7 +14329,7 @@ }, "end": { "line": 137, - "column": 25, + "column": 24, "program": "AccessNBody.ets" } } @@ -14342,7 +14342,7 @@ }, "end": { "line": 137, - "column": 25, + "column": 24, "program": "AccessNBody.ets" } } @@ -15083,7 +15083,7 @@ }, "end": { "line": 143, - "column": 39, + "column": 37, "program": "AccessNBody.ets" } } @@ -15096,7 +15096,7 @@ }, "end": { "line": 143, - "column": 39, + "column": 37, "program": "AccessNBody.ets" } } @@ -15146,7 +15146,7 @@ }, "end": { "line": 143, - "column": 56, + "column": 55, "program": "AccessNBody.ets" } } @@ -15159,7 +15159,7 @@ }, "end": { "line": 143, - "column": 56, + "column": 55, "program": "AccessNBody.ets" } } @@ -16836,7 +16836,7 @@ }, "end": { "line": 157, - "column": 27, + "column": 26, "program": "AccessNBody.ets" } } @@ -16849,7 +16849,7 @@ }, "end": { "line": 157, - "column": 27, + "column": 26, "program": "AccessNBody.ets" } } diff --git a/ets2panda/test/parser/ets/AccessNSieve-expected.txt b/ets2panda/test/parser/ets/AccessNSieve-expected.txt index 55fb9c7065a..2bedee7c9ff 100644 --- a/ets2panda/test/parser/ets/AccessNSieve-expected.txt +++ b/ets2panda/test/parser/ets/AccessNSieve-expected.txt @@ -3457,7 +3457,7 @@ }, "end": { "line": 60, - "column": 28, + "column": 27, "program": "AccessNSieve.ets" } } @@ -3470,7 +3470,7 @@ }, "end": { "line": 60, - "column": 28, + "column": 27, "program": "AccessNSieve.ets" } } diff --git a/ets2panda/test/parser/ets/Bitops3BitBitsInByte-expected.txt b/ets2panda/test/parser/ets/Bitops3BitBitsInByte-expected.txt index b1f1dd02988..48f0e5eeac9 100644 --- a/ets2panda/test/parser/ets/Bitops3BitBitsInByte-expected.txt +++ b/ets2panda/test/parser/ets/Bitops3BitBitsInByte-expected.txt @@ -2477,7 +2477,7 @@ }, "end": { "line": 42, - "column": 36, + "column": 35, "program": "Bitops3BitBitsInByte.ets" } } @@ -2490,7 +2490,7 @@ }, "end": { "line": 42, - "column": 36, + "column": 35, "program": "Bitops3BitBitsInByte.ets" } } diff --git a/ets2panda/test/parser/ets/BitopsBitsInByte-expected.txt b/ets2panda/test/parser/ets/BitopsBitsInByte-expected.txt index 17e1544ecf6..3ca02a5e298 100644 --- a/ets2panda/test/parser/ets/BitopsBitsInByte-expected.txt +++ b/ets2panda/test/parser/ets/BitopsBitsInByte-expected.txt @@ -2219,7 +2219,7 @@ }, "end": { "line": 45, - "column": 32, + "column": 31, "program": "BitopsBitsInByte.ets" } } @@ -2232,7 +2232,7 @@ }, "end": { "line": 45, - "column": 32, + "column": 31, "program": "BitopsBitsInByte.ets" } } diff --git a/ets2panda/test/parser/ets/BitopsBitwiseAnd-expected.txt b/ets2panda/test/parser/ets/BitopsBitwiseAnd-expected.txt index 8d065daf166..614115c9e41 100644 --- a/ets2panda/test/parser/ets/BitopsBitwiseAnd-expected.txt +++ b/ets2panda/test/parser/ets/BitopsBitwiseAnd-expected.txt @@ -1210,7 +1210,7 @@ }, "end": { "line": 31, - "column": 32, + "column": 31, "program": "BitopsBitwiseAnd.ets" } } @@ -1223,7 +1223,7 @@ }, "end": { "line": 31, - "column": 32, + "column": 31, "program": "BitopsBitwiseAnd.ets" } } diff --git a/ets2panda/test/parser/ets/BitopsNSieveBits-expected.txt b/ets2panda/test/parser/ets/BitopsNSieveBits-expected.txt index 5ca725511bb..a56f3926beb 100644 --- a/ets2panda/test/parser/ets/BitopsNSieveBits-expected.txt +++ b/ets2panda/test/parser/ets/BitopsNSieveBits-expected.txt @@ -4088,7 +4088,7 @@ }, "end": { "line": 58, - "column": 32, + "column": 31, "program": "BitopsNSieveBits.ets" } } @@ -4101,7 +4101,7 @@ }, "end": { "line": 58, - "column": 32, + "column": 31, "program": "BitopsNSieveBits.ets" } } diff --git a/ets2panda/test/parser/ets/Boolean_bitwise-expected.txt b/ets2panda/test/parser/ets/Boolean_bitwise-expected.txt index c18cffd19e2..2c9b987ef66 100644 --- a/ets2panda/test/parser/ets/Boolean_bitwise-expected.txt +++ b/ets2panda/test/parser/ets/Boolean_bitwise-expected.txt @@ -234,7 +234,7 @@ }, "end": { "line": 17, - "column": 19, + "column": 17, "program": "Boolean_bitwise.ets" } } @@ -247,7 +247,7 @@ }, "end": { "line": 17, - "column": 19, + "column": 17, "program": "Boolean_bitwise.ets" } } @@ -347,7 +347,7 @@ }, "end": { "line": 18, - "column": 19, + "column": 17, "program": "Boolean_bitwise.ets" } } @@ -360,7 +360,7 @@ }, "end": { "line": 18, - "column": 19, + "column": 17, "program": "Boolean_bitwise.ets" } } @@ -460,7 +460,7 @@ }, "end": { "line": 19, - "column": 22, + "column": 20, "program": "Boolean_bitwise.ets" } } @@ -473,7 +473,7 @@ }, "end": { "line": 19, - "column": 22, + "column": 20, "program": "Boolean_bitwise.ets" } } diff --git a/ets2panda/test/parser/ets/Dollar_dollar_2-expected.txt b/ets2panda/test/parser/ets/Dollar_dollar_2-expected.txt index 9e4bd37922b..76ddf4bd455 100644 --- a/ets2panda/test/parser/ets/Dollar_dollar_2-expected.txt +++ b/ets2panda/test/parser/ets/Dollar_dollar_2-expected.txt @@ -236,7 +236,7 @@ }, "end": { "line": 19, - "column": 23, + "column": 21, "program": "Dollar_dollar_2.ets" } } @@ -249,7 +249,7 @@ }, "end": { "line": 19, - "column": 23, + "column": 21, "program": "Dollar_dollar_2.ets" } } @@ -446,7 +446,7 @@ }, "end": { "line": 20, - "column": 53, + "column": 52, "program": "Dollar_dollar_2.ets" } } @@ -459,7 +459,7 @@ }, "end": { "line": 20, - "column": 53, + "column": 52, "program": "Dollar_dollar_2.ets" } } @@ -473,7 +473,7 @@ }, "end": { "line": 20, - "column": 53, + "column": 52, "program": "Dollar_dollar_2.ets" } } @@ -486,7 +486,7 @@ }, "end": { "line": 20, - "column": 53, + "column": 52, "program": "Dollar_dollar_2.ets" } } diff --git a/ets2panda/test/parser/ets/Dollar_dollar_3-expected.txt b/ets2panda/test/parser/ets/Dollar_dollar_3-expected.txt index 1320b38631b..bc0661f2d50 100644 --- a/ets2panda/test/parser/ets/Dollar_dollar_3-expected.txt +++ b/ets2panda/test/parser/ets/Dollar_dollar_3-expected.txt @@ -390,7 +390,7 @@ }, "end": { "line": 17, - "column": 17, + "column": 16, "program": "Dollar_dollar_3.ets" } } @@ -403,7 +403,7 @@ }, "end": { "line": 17, - "column": 17, + "column": 16, "program": "Dollar_dollar_3.ets" } } @@ -618,7 +618,7 @@ }, "end": { "line": 17, - "column": 17, + "column": 16, "program": "Dollar_dollar_3.ets" } } @@ -631,7 +631,7 @@ }, "end": { "line": 17, - "column": 17, + "column": 16, "program": "Dollar_dollar_3.ets" } } diff --git a/ets2panda/test/parser/ets/FunctionalTypeAsTypeArgument-expected.txt b/ets2panda/test/parser/ets/FunctionalTypeAsTypeArgument-expected.txt index 8f915148482..1033be50637 100644 --- a/ets2panda/test/parser/ets/FunctionalTypeAsTypeArgument-expected.txt +++ b/ets2panda/test/parser/ets/FunctionalTypeAsTypeArgument-expected.txt @@ -318,7 +318,7 @@ }, "end": { "line": 16, - "column": 38, + "column": 37, "program": "FunctionalTypeAsTypeArgument.ets" } } @@ -331,7 +331,7 @@ }, "end": { "line": 16, - "column": 38, + "column": 37, "program": "FunctionalTypeAsTypeArgument.ets" } } @@ -345,7 +345,7 @@ }, "end": { "line": 16, - "column": 38, + "column": 37, "program": "FunctionalTypeAsTypeArgument.ets" } } @@ -358,7 +358,7 @@ }, "end": { "line": 16, - "column": 38, + "column": 37, "program": "FunctionalTypeAsTypeArgument.ets" } } @@ -414,7 +414,7 @@ }, "end": { "line": 16, - "column": 48, + "column": 47, "program": "FunctionalTypeAsTypeArgument.ets" } } @@ -427,7 +427,7 @@ }, "end": { "line": 16, - "column": 48, + "column": 47, "program": "FunctionalTypeAsTypeArgument.ets" } } diff --git a/ets2panda/test/parser/ets/InferTypeParamFromParam1-expected.txt b/ets2panda/test/parser/ets/InferTypeParamFromParam1-expected.txt index 4423a330e55..d3595fb50d3 100644 --- a/ets2panda/test/parser/ets/InferTypeParamFromParam1-expected.txt +++ b/ets2panda/test/parser/ets/InferTypeParamFromParam1-expected.txt @@ -93,8 +93,8 @@ "program": "InferTypeParamFromParam1.ets" }, "end": { - "line": 17, - "column": 10, + "line": 16, + "column": 27, "program": "InferTypeParamFromParam1.ets" } } @@ -190,7 +190,7 @@ }, "end": { "line": 17, - "column": 46, + "column": 45, "program": "InferTypeParamFromParam1.ets" } } @@ -203,7 +203,7 @@ }, "end": { "line": 17, - "column": 46, + "column": 45, "program": "InferTypeParamFromParam1.ets" } } @@ -230,7 +230,7 @@ }, "end": { "line": 17, - "column": 48, + "column": 46, "program": "InferTypeParamFromParam1.ets" } } @@ -243,7 +243,7 @@ }, "end": { "line": 17, - "column": 48, + "column": 46, "program": "InferTypeParamFromParam1.ets" } } @@ -256,7 +256,7 @@ }, "end": { "line": 17, - "column": 48, + "column": 46, "program": "InferTypeParamFromParam1.ets" } } @@ -318,8 +318,8 @@ "program": "InferTypeParamFromParam1.ets" }, "end": { - "line": 18, - "column": 6, + "line": 17, + "column": 49, "program": "InferTypeParamFromParam1.ets" } } @@ -450,7 +450,7 @@ }, "end": { "line": 18, - "column": 42, + "column": 41, "program": "InferTypeParamFromParam1.ets" } } @@ -463,7 +463,7 @@ }, "end": { "line": 18, - "column": 42, + "column": 41, "program": "InferTypeParamFromParam1.ets" } } @@ -490,7 +490,7 @@ }, "end": { "line": 18, - "column": 43, + "column": 42, "program": "InferTypeParamFromParam1.ets" } } @@ -503,7 +503,7 @@ }, "end": { "line": 18, - "column": 43, + "column": 42, "program": "InferTypeParamFromParam1.ets" } } @@ -781,7 +781,7 @@ }, "end": { "line": 20, - "column": 52, + "column": 51, "program": "InferTypeParamFromParam1.ets" } } @@ -794,7 +794,7 @@ }, "end": { "line": 20, - "column": 52, + "column": 51, "program": "InferTypeParamFromParam1.ets" } } @@ -821,7 +821,7 @@ }, "end": { "line": 20, - "column": 53, + "column": 52, "program": "InferTypeParamFromParam1.ets" } } @@ -834,7 +834,7 @@ }, "end": { "line": 20, - "column": 53, + "column": 52, "program": "InferTypeParamFromParam1.ets" } } @@ -961,7 +961,7 @@ }, "end": { "line": 21, - "column": 55, + "column": 54, "program": "InferTypeParamFromParam1.ets" } } @@ -974,7 +974,7 @@ }, "end": { "line": 21, - "column": 55, + "column": 54, "program": "InferTypeParamFromParam1.ets" } } @@ -1001,7 +1001,7 @@ }, "end": { "line": 21, - "column": 56, + "column": 55, "program": "InferTypeParamFromParam1.ets" } } @@ -1014,7 +1014,7 @@ }, "end": { "line": 21, - "column": 56, + "column": 55, "program": "InferTypeParamFromParam1.ets" } } @@ -1028,7 +1028,7 @@ }, "end": { "line": 21, - "column": 56, + "column": 55, "program": "InferTypeParamFromParam1.ets" } } @@ -1041,7 +1041,7 @@ }, "end": { "line": 21, - "column": 56, + "column": 55, "program": "InferTypeParamFromParam1.ets" } } @@ -1100,7 +1100,7 @@ }, "end": { "line": 21, - "column": 73, + "column": 72, "program": "InferTypeParamFromParam1.ets" } } @@ -1113,7 +1113,7 @@ }, "end": { "line": 21, - "column": 73, + "column": 72, "program": "InferTypeParamFromParam1.ets" } } @@ -1140,7 +1140,7 @@ }, "end": { "line": 21, - "column": 75, + "column": 73, "program": "InferTypeParamFromParam1.ets" } } @@ -1153,7 +1153,7 @@ }, "end": { "line": 21, - "column": 75, + "column": 73, "program": "InferTypeParamFromParam1.ets" } } @@ -1267,7 +1267,7 @@ }, "end": { "line": 22, - "column": 34, + "column": 33, "program": "InferTypeParamFromParam1.ets" } } @@ -1280,7 +1280,7 @@ }, "end": { "line": 22, - "column": 34, + "column": 33, "program": "InferTypeParamFromParam1.ets" } } @@ -1307,7 +1307,7 @@ }, "end": { "line": 22, - "column": 35, + "column": 34, "program": "InferTypeParamFromParam1.ets" } } @@ -1320,7 +1320,7 @@ }, "end": { "line": 22, - "column": 35, + "column": 34, "program": "InferTypeParamFromParam1.ets" } } @@ -1476,7 +1476,7 @@ }, "end": { "line": 25, - "column": 49, + "column": 48, "program": "InferTypeParamFromParam1.ets" } } @@ -1489,7 +1489,7 @@ }, "end": { "line": 25, - "column": 49, + "column": 48, "program": "InferTypeParamFromParam1.ets" } } @@ -1503,7 +1503,7 @@ }, "end": { "line": 25, - "column": 49, + "column": 48, "program": "InferTypeParamFromParam1.ets" } } @@ -1516,7 +1516,7 @@ }, "end": { "line": 25, - "column": 49, + "column": 48, "program": "InferTypeParamFromParam1.ets" } } @@ -2044,7 +2044,7 @@ }, "end": { "line": 30, - "column": 30, + "column": 29, "program": "InferTypeParamFromParam1.ets" } } @@ -2057,7 +2057,7 @@ }, "end": { "line": 30, - "column": 30, + "column": 29, "program": "InferTypeParamFromParam1.ets" } } @@ -2084,7 +2084,7 @@ }, "end": { "line": 30, - "column": 31, + "column": 30, "program": "InferTypeParamFromParam1.ets" } } @@ -2097,7 +2097,7 @@ }, "end": { "line": 30, - "column": 31, + "column": 30, "program": "InferTypeParamFromParam1.ets" } } @@ -2111,7 +2111,7 @@ }, "end": { "line": 30, - "column": 31, + "column": 30, "program": "InferTypeParamFromParam1.ets" } } @@ -2124,7 +2124,7 @@ }, "end": { "line": 30, - "column": 31, + "column": 30, "program": "InferTypeParamFromParam1.ets" } } @@ -2438,7 +2438,7 @@ }, "end": { "line": 35, - "column": 31, + "column": 30, "program": "InferTypeParamFromParam1.ets" } } @@ -2451,7 +2451,7 @@ }, "end": { "line": 35, - "column": 31, + "column": 30, "program": "InferTypeParamFromParam1.ets" } } @@ -2478,7 +2478,7 @@ }, "end": { "line": 35, - "column": 32, + "column": 31, "program": "InferTypeParamFromParam1.ets" } } @@ -2491,7 +2491,7 @@ }, "end": { "line": 35, - "column": 32, + "column": 31, "program": "InferTypeParamFromParam1.ets" } } diff --git a/ets2panda/test/parser/ets/InferTypeParamFromParam3-expected.txt b/ets2panda/test/parser/ets/InferTypeParamFromParam3-expected.txt index f043cd239ed..5e7e8adbcd2 100644 --- a/ets2panda/test/parser/ets/InferTypeParamFromParam3-expected.txt +++ b/ets2panda/test/parser/ets/InferTypeParamFromParam3-expected.txt @@ -125,8 +125,8 @@ "program": "InferTypeParamFromParam3.ets" }, "end": { - "line": 17, - "column": 10, + "line": 16, + "column": 30, "program": "InferTypeParamFromParam3.ets" } } @@ -222,7 +222,7 @@ }, "end": { "line": 17, - "column": 49, + "column": 48, "program": "InferTypeParamFromParam3.ets" } } @@ -235,7 +235,7 @@ }, "end": { "line": 17, - "column": 49, + "column": 48, "program": "InferTypeParamFromParam3.ets" } } @@ -269,7 +269,7 @@ }, "end": { "line": 17, - "column": 52, + "column": 51, "program": "InferTypeParamFromParam3.ets" } } @@ -282,7 +282,7 @@ }, "end": { "line": 17, - "column": 52, + "column": 51, "program": "InferTypeParamFromParam3.ets" } } @@ -309,7 +309,7 @@ }, "end": { "line": 17, - "column": 54, + "column": 52, "program": "InferTypeParamFromParam3.ets" } } @@ -322,7 +322,7 @@ }, "end": { "line": 17, - "column": 54, + "column": 52, "program": "InferTypeParamFromParam3.ets" } } @@ -335,7 +335,7 @@ }, "end": { "line": 17, - "column": 54, + "column": 52, "program": "InferTypeParamFromParam3.ets" } } @@ -429,8 +429,8 @@ "program": "InferTypeParamFromParam3.ets" }, "end": { - "line": 18, - "column": 6, + "line": 17, + "column": 55, "program": "InferTypeParamFromParam3.ets" } } @@ -593,7 +593,7 @@ }, "end": { "line": 18, - "column": 45, + "column": 44, "program": "InferTypeParamFromParam3.ets" } } @@ -606,7 +606,7 @@ }, "end": { "line": 18, - "column": 45, + "column": 44, "program": "InferTypeParamFromParam3.ets" } } @@ -640,7 +640,7 @@ }, "end": { "line": 18, - "column": 48, + "column": 47, "program": "InferTypeParamFromParam3.ets" } } @@ -653,7 +653,7 @@ }, "end": { "line": 18, - "column": 48, + "column": 47, "program": "InferTypeParamFromParam3.ets" } } @@ -680,7 +680,7 @@ }, "end": { "line": 18, - "column": 49, + "column": 48, "program": "InferTypeParamFromParam3.ets" } } @@ -693,7 +693,7 @@ }, "end": { "line": 18, - "column": 49, + "column": 48, "program": "InferTypeParamFromParam3.ets" } } @@ -1003,7 +1003,7 @@ }, "end": { "line": 20, - "column": 55, + "column": 54, "program": "InferTypeParamFromParam3.ets" } } @@ -1016,7 +1016,7 @@ }, "end": { "line": 20, - "column": 55, + "column": 54, "program": "InferTypeParamFromParam3.ets" } } @@ -1050,7 +1050,7 @@ }, "end": { "line": 20, - "column": 58, + "column": 57, "program": "InferTypeParamFromParam3.ets" } } @@ -1063,7 +1063,7 @@ }, "end": { "line": 20, - "column": 58, + "column": 57, "program": "InferTypeParamFromParam3.ets" } } @@ -1090,7 +1090,7 @@ }, "end": { "line": 20, - "column": 59, + "column": 58, "program": "InferTypeParamFromParam3.ets" } } @@ -1103,7 +1103,7 @@ }, "end": { "line": 20, - "column": 59, + "column": 58, "program": "InferTypeParamFromParam3.ets" } } @@ -1230,7 +1230,7 @@ }, "end": { "line": 21, - "column": 67, + "column": 66, "program": "InferTypeParamFromParam3.ets" } } @@ -1243,7 +1243,7 @@ }, "end": { "line": 21, - "column": 67, + "column": 66, "program": "InferTypeParamFromParam3.ets" } } @@ -1277,7 +1277,7 @@ }, "end": { "line": 21, - "column": 70, + "column": 69, "program": "InferTypeParamFromParam3.ets" } } @@ -1290,7 +1290,7 @@ }, "end": { "line": 21, - "column": 70, + "column": 69, "program": "InferTypeParamFromParam3.ets" } } @@ -1317,7 +1317,7 @@ }, "end": { "line": 21, - "column": 71, + "column": 70, "program": "InferTypeParamFromParam3.ets" } } @@ -1330,7 +1330,7 @@ }, "end": { "line": 21, - "column": 71, + "column": 70, "program": "InferTypeParamFromParam3.ets" } } @@ -1344,7 +1344,7 @@ }, "end": { "line": 21, - "column": 71, + "column": 70, "program": "InferTypeParamFromParam3.ets" } } @@ -1357,7 +1357,7 @@ }, "end": { "line": 21, - "column": 71, + "column": 70, "program": "InferTypeParamFromParam3.ets" } } @@ -1416,7 +1416,7 @@ }, "end": { "line": 21, - "column": 88, + "column": 87, "program": "InferTypeParamFromParam3.ets" } } @@ -1429,7 +1429,7 @@ }, "end": { "line": 21, - "column": 88, + "column": 87, "program": "InferTypeParamFromParam3.ets" } } @@ -1463,7 +1463,7 @@ }, "end": { "line": 21, - "column": 91, + "column": 90, "program": "InferTypeParamFromParam3.ets" } } @@ -1476,7 +1476,7 @@ }, "end": { "line": 21, - "column": 91, + "column": 90, "program": "InferTypeParamFromParam3.ets" } } @@ -1503,7 +1503,7 @@ }, "end": { "line": 21, - "column": 93, + "column": 91, "program": "InferTypeParamFromParam3.ets" } } @@ -1516,7 +1516,7 @@ }, "end": { "line": 21, - "column": 93, + "column": 91, "program": "InferTypeParamFromParam3.ets" } } @@ -1604,7 +1604,7 @@ }, "end": { "line": 21, - "column": 48, + "column": 47, "program": "InferTypeParamFromParam3.ets" } } @@ -1617,7 +1617,7 @@ }, "end": { "line": 21, - "column": 48, + "column": 47, "program": "InferTypeParamFromParam3.ets" } } @@ -1709,7 +1709,7 @@ }, "end": { "line": 22, - "column": 34, + "column": 33, "program": "InferTypeParamFromParam3.ets" } } @@ -1722,7 +1722,7 @@ }, "end": { "line": 22, - "column": 34, + "column": 33, "program": "InferTypeParamFromParam3.ets" } } @@ -1756,7 +1756,7 @@ }, "end": { "line": 22, - "column": 37, + "column": 36, "program": "InferTypeParamFromParam3.ets" } } @@ -1769,7 +1769,7 @@ }, "end": { "line": 22, - "column": 37, + "column": 36, "program": "InferTypeParamFromParam3.ets" } } @@ -1796,7 +1796,7 @@ }, "end": { "line": 22, - "column": 38, + "column": 37, "program": "InferTypeParamFromParam3.ets" } } @@ -1809,7 +1809,7 @@ }, "end": { "line": 22, - "column": 38, + "column": 37, "program": "InferTypeParamFromParam3.ets" } } @@ -2264,7 +2264,7 @@ }, "end": { "line": 26, - "column": 30, + "column": 29, "program": "InferTypeParamFromParam3.ets" } } @@ -2277,7 +2277,7 @@ }, "end": { "line": 26, - "column": 30, + "column": 29, "program": "InferTypeParamFromParam3.ets" } } @@ -2311,7 +2311,7 @@ }, "end": { "line": 26, - "column": 38, + "column": 37, "program": "InferTypeParamFromParam3.ets" } } @@ -2324,7 +2324,7 @@ }, "end": { "line": 26, - "column": 38, + "column": 37, "program": "InferTypeParamFromParam3.ets" } } @@ -2351,7 +2351,7 @@ }, "end": { "line": 26, - "column": 39, + "column": 38, "program": "InferTypeParamFromParam3.ets" } } @@ -2364,7 +2364,7 @@ }, "end": { "line": 26, - "column": 39, + "column": 38, "program": "InferTypeParamFromParam3.ets" } } @@ -2378,7 +2378,7 @@ }, "end": { "line": 26, - "column": 39, + "column": 38, "program": "InferTypeParamFromParam3.ets" } } @@ -2391,7 +2391,7 @@ }, "end": { "line": 26, - "column": 39, + "column": 38, "program": "InferTypeParamFromParam3.ets" } } @@ -2705,7 +2705,7 @@ }, "end": { "line": 31, - "column": 31, + "column": 30, "program": "InferTypeParamFromParam3.ets" } } @@ -2718,7 +2718,7 @@ }, "end": { "line": 31, - "column": 31, + "column": 30, "program": "InferTypeParamFromParam3.ets" } } @@ -2752,7 +2752,7 @@ }, "end": { "line": 31, - "column": 39, + "column": 38, "program": "InferTypeParamFromParam3.ets" } } @@ -2765,7 +2765,7 @@ }, "end": { "line": 31, - "column": 39, + "column": 38, "program": "InferTypeParamFromParam3.ets" } } @@ -2792,7 +2792,7 @@ }, "end": { "line": 31, - "column": 40, + "column": 39, "program": "InferTypeParamFromParam3.ets" } } @@ -2805,7 +2805,7 @@ }, "end": { "line": 31, - "column": 40, + "column": 39, "program": "InferTypeParamFromParam3.ets" } } diff --git a/ets2panda/test/parser/ets/MathCordic-expected.txt b/ets2panda/test/parser/ets/MathCordic-expected.txt index ab95c14b412..4fee71fabff 100644 --- a/ets2panda/test/parser/ets/MathCordic-expected.txt +++ b/ets2panda/test/parser/ets/MathCordic-expected.txt @@ -6250,7 +6250,7 @@ }, "end": { "line": 79, - "column": 26, + "column": 25, "program": "MathCordic.ets" } } @@ -6263,7 +6263,7 @@ }, "end": { "line": 79, - "column": 26, + "column": 25, "program": "MathCordic.ets" } } diff --git a/ets2panda/test/parser/ets/MathSpectralNorm-expected.txt b/ets2panda/test/parser/ets/MathSpectralNorm-expected.txt index 81b830b8f12..e23fab3c9d9 100644 --- a/ets2panda/test/parser/ets/MathSpectralNorm-expected.txt +++ b/ets2panda/test/parser/ets/MathSpectralNorm-expected.txt @@ -7361,7 +7361,7 @@ }, "end": { "line": 92, - "column": 32, + "column": 31, "program": "MathSpectralNorm.ets" } } @@ -7374,7 +7374,7 @@ }, "end": { "line": 92, - "column": 32, + "column": 31, "program": "MathSpectralNorm.ets" } } diff --git a/ets2panda/test/parser/ets/Morph3d-expected.txt b/ets2panda/test/parser/ets/Morph3d-expected.txt index 35ffe6f1196..efa82de7ffb 100644 --- a/ets2panda/test/parser/ets/Morph3d-expected.txt +++ b/ets2panda/test/parser/ets/Morph3d-expected.txt @@ -4014,7 +4014,7 @@ }, "end": { "line": 61, - "column": 23, + "column": 22, "program": "Morph3d.ets" } } @@ -4027,7 +4027,7 @@ }, "end": { "line": 61, - "column": 23, + "column": 22, "program": "Morph3d.ets" } } diff --git a/ets2panda/test/parser/ets/OptionalParametersWithGenericReturnTypes-expected.txt b/ets2panda/test/parser/ets/OptionalParametersWithGenericReturnTypes-expected.txt index f87faf7ebad..dbf4d1436d1 100644 --- a/ets2panda/test/parser/ets/OptionalParametersWithGenericReturnTypes-expected.txt +++ b/ets2panda/test/parser/ets/OptionalParametersWithGenericReturnTypes-expected.txt @@ -156,7 +156,7 @@ }, "end": { "line": 17, - "column": 24, + "column": 23, "program": "OptionalParametersWithGenericReturnTypes.ets" } } @@ -169,7 +169,7 @@ }, "end": { "line": 17, - "column": 24, + "column": 23, "program": "OptionalParametersWithGenericReturnTypes.ets" } } @@ -183,7 +183,7 @@ }, "end": { "line": 17, - "column": 24, + "column": 23, "program": "OptionalParametersWithGenericReturnTypes.ets" } } @@ -196,7 +196,7 @@ }, "end": { "line": 17, - "column": 24, + "column": 23, "program": "OptionalParametersWithGenericReturnTypes.ets" } } @@ -255,7 +255,7 @@ }, "end": { "line": 17, - "column": 30, + "column": 29, "program": "OptionalParametersWithGenericReturnTypes.ets" } } @@ -268,7 +268,7 @@ }, "end": { "line": 17, - "column": 30, + "column": 29, "program": "OptionalParametersWithGenericReturnTypes.ets" } } @@ -295,7 +295,7 @@ }, "end": { "line": 17, - "column": 32, + "column": 30, "program": "OptionalParametersWithGenericReturnTypes.ets" } } @@ -308,7 +308,7 @@ }, "end": { "line": 17, - "column": 32, + "column": 30, "program": "OptionalParametersWithGenericReturnTypes.ets" } } @@ -872,7 +872,7 @@ }, "end": { "line": 23, - "column": 24, + "column": 23, "program": "OptionalParametersWithGenericReturnTypes.ets" } } @@ -885,7 +885,7 @@ }, "end": { "line": 23, - "column": 24, + "column": 23, "program": "OptionalParametersWithGenericReturnTypes.ets" } } @@ -899,7 +899,7 @@ }, "end": { "line": 23, - "column": 24, + "column": 23, "program": "OptionalParametersWithGenericReturnTypes.ets" } } @@ -912,7 +912,7 @@ }, "end": { "line": 23, - "column": 24, + "column": 23, "program": "OptionalParametersWithGenericReturnTypes.ets" } } @@ -971,7 +971,7 @@ }, "end": { "line": 23, - "column": 30, + "column": 29, "program": "OptionalParametersWithGenericReturnTypes.ets" } } @@ -984,7 +984,7 @@ }, "end": { "line": 23, - "column": 30, + "column": 29, "program": "OptionalParametersWithGenericReturnTypes.ets" } } @@ -1018,7 +1018,7 @@ }, "end": { "line": 23, - "column": 32, + "column": 31, "program": "OptionalParametersWithGenericReturnTypes.ets" } } @@ -1031,7 +1031,7 @@ }, "end": { "line": 23, - "column": 32, + "column": 31, "program": "OptionalParametersWithGenericReturnTypes.ets" } } @@ -1058,7 +1058,7 @@ }, "end": { "line": 23, - "column": 34, + "column": 32, "program": "OptionalParametersWithGenericReturnTypes.ets" } } @@ -1071,7 +1071,7 @@ }, "end": { "line": 23, - "column": 34, + "column": 32, "program": "OptionalParametersWithGenericReturnTypes.ets" } } diff --git a/ets2panda/test/parser/ets/StaticFieldAndMethodSameName-expected.txt b/ets2panda/test/parser/ets/StaticFieldAndMethodSameName-expected.txt index 583a8f6d7d5..bf69b66fa94 100644 --- a/ets2panda/test/parser/ets/StaticFieldAndMethodSameName-expected.txt +++ b/ets2panda/test/parser/ets/StaticFieldAndMethodSameName-expected.txt @@ -94,7 +94,7 @@ }, "end": { "line": 17, - "column": 15, + "column": 13, "program": "StaticFieldAndMethodSameName.ets" } } @@ -107,7 +107,7 @@ }, "end": { "line": 17, - "column": 15, + "column": 13, "program": "StaticFieldAndMethodSameName.ets" } } @@ -694,7 +694,7 @@ }, "end": { "line": 23, - "column": 11, + "column": 10, "program": "StaticFieldAndMethodSameName.ets" } } @@ -707,7 +707,7 @@ }, "end": { "line": 23, - "column": 11, + "column": 10, "program": "StaticFieldAndMethodSameName.ets" } } diff --git a/ets2panda/test/parser/ets/StaticFieldAndMethodSameNameInheritance-expected.txt b/ets2panda/test/parser/ets/StaticFieldAndMethodSameNameInheritance-expected.txt index 02df1019bff..4ed09144c7c 100644 --- a/ets2panda/test/parser/ets/StaticFieldAndMethodSameNameInheritance-expected.txt +++ b/ets2panda/test/parser/ets/StaticFieldAndMethodSameNameInheritance-expected.txt @@ -326,7 +326,7 @@ }, "end": { "line": 20, - "column": 20, + "column": 18, "program": "StaticFieldAndMethodSameNameInheritance.ets" } } @@ -339,7 +339,7 @@ }, "end": { "line": 20, - "column": 20, + "column": 18, "program": "StaticFieldAndMethodSameNameInheritance.ets" } } @@ -416,7 +416,7 @@ }, "end": { "line": 21, - "column": 15, + "column": 13, "program": "StaticFieldAndMethodSameNameInheritance.ets" } } @@ -429,7 +429,7 @@ }, "end": { "line": 21, - "column": 15, + "column": 13, "program": "StaticFieldAndMethodSameNameInheritance.ets" } } @@ -895,7 +895,7 @@ }, "end": { "line": 26, - "column": 11, + "column": 10, "program": "StaticFieldAndMethodSameNameInheritance.ets" } } @@ -908,7 +908,7 @@ }, "end": { "line": 26, - "column": 11, + "column": 10, "program": "StaticFieldAndMethodSameNameInheritance.ets" } } diff --git a/ets2panda/test/parser/ets/StringBase64-expected.txt b/ets2panda/test/parser/ets/StringBase64-expected.txt index 3f5fe930fae..0c52d2cd0dc 100644 --- a/ets2panda/test/parser/ets/StringBase64-expected.txt +++ b/ets2panda/test/parser/ets/StringBase64-expected.txt @@ -94,7 +94,7 @@ }, "end": { "line": 17, - "column": 47, + "column": 45, "program": "StringBase64.ets" } } @@ -107,7 +107,7 @@ }, "end": { "line": 17, - "column": 47, + "column": 45, "program": "StringBase64.ets" } } @@ -2465,7 +2465,7 @@ }, "end": { "line": 20, - "column": 29, + "column": 28, "program": "StringBase64.ets" } } @@ -2478,7 +2478,7 @@ }, "end": { "line": 20, - "column": 29, + "column": 28, "program": "StringBase64.ets" } } @@ -2492,7 +2492,7 @@ }, "end": { "line": 20, - "column": 29, + "column": 28, "program": "StringBase64.ets" } } @@ -2505,7 +2505,7 @@ }, "end": { "line": 20, - "column": 29, + "column": 28, "program": "StringBase64.ets" } } @@ -2540,7 +2540,7 @@ }, "end": { "line": 20, - "column": 39, + "column": 37, "program": "StringBase64.ets" } } @@ -2553,7 +2553,7 @@ }, "end": { "line": 20, - "column": 39, + "column": 37, "program": "StringBase64.ets" } } @@ -2598,7 +2598,7 @@ }, "end": { "line": 21, - "column": 37, + "column": 35, "program": "StringBase64.ets" } } @@ -2611,7 +2611,7 @@ }, "end": { "line": 21, - "column": 37, + "column": 35, "program": "StringBase64.ets" } } @@ -2661,7 +2661,7 @@ }, "end": { "line": 21, - "column": 56, + "column": 55, "program": "StringBase64.ets" } } @@ -2674,7 +2674,7 @@ }, "end": { "line": 21, - "column": 56, + "column": 55, "program": "StringBase64.ets" } } @@ -6975,7 +6975,7 @@ }, "end": { "line": 46, - "column": 35, + "column": 34, "program": "StringBase64.ets" } } @@ -6988,7 +6988,7 @@ }, "end": { "line": 46, - "column": 35, + "column": 34, "program": "StringBase64.ets" } } @@ -7002,7 +7002,7 @@ }, "end": { "line": 46, - "column": 35, + "column": 34, "program": "StringBase64.ets" } } @@ -7015,7 +7015,7 @@ }, "end": { "line": 46, - "column": 35, + "column": 34, "program": "StringBase64.ets" } } @@ -7050,7 +7050,7 @@ }, "end": { "line": 46, - "column": 45, + "column": 43, "program": "StringBase64.ets" } } @@ -7063,7 +7063,7 @@ }, "end": { "line": 46, - "column": 45, + "column": 43, "program": "StringBase64.ets" } } @@ -7108,7 +7108,7 @@ }, "end": { "line": 47, - "column": 37, + "column": 35, "program": "StringBase64.ets" } } @@ -7121,7 +7121,7 @@ }, "end": { "line": 47, - "column": 37, + "column": 35, "program": "StringBase64.ets" } } @@ -7171,7 +7171,7 @@ }, "end": { "line": 47, - "column": 56, + "column": 55, "program": "StringBase64.ets" } } @@ -7184,7 +7184,7 @@ }, "end": { "line": 47, - "column": 56, + "column": 55, "program": "StringBase64.ets" } } @@ -9374,7 +9374,7 @@ }, "end": { "line": 73, - "column": 27, + "column": 25, "program": "StringBase64.ets" } } @@ -9387,7 +9387,7 @@ }, "end": { "line": 73, - "column": 27, + "column": 25, "program": "StringBase64.ets" } } @@ -10214,7 +10214,7 @@ }, "end": { "line": 78, - "column": 34, + "column": 32, "program": "StringBase64.ets" } } @@ -10227,7 +10227,7 @@ }, "end": { "line": 78, - "column": 34, + "column": 32, "program": "StringBase64.ets" } } @@ -10395,7 +10395,7 @@ }, "end": { "line": 79, - "column": 35, + "column": 33, "program": "StringBase64.ets" } } @@ -10408,7 +10408,7 @@ }, "end": { "line": 79, - "column": 35, + "column": 33, "program": "StringBase64.ets" } } @@ -11202,7 +11202,7 @@ }, "end": { "line": 89, - "column": 28, + "column": 27, "program": "StringBase64.ets" } } @@ -11215,7 +11215,7 @@ }, "end": { "line": 89, - "column": 28, + "column": 27, "program": "StringBase64.ets" } } diff --git a/ets2panda/test/parser/ets/ambient_call_signature-expected.txt b/ets2panda/test/parser/ets/ambient_call_signature-expected.txt index 2af8e374b29..cac03c53acc 100644 --- a/ets2panda/test/parser/ets/ambient_call_signature-expected.txt +++ b/ets2panda/test/parser/ets/ambient_call_signature-expected.txt @@ -107,7 +107,7 @@ }, "end": { "line": 17, - "column": 15, + "column": 14, "program": "ambient_call_signature.ets" } } @@ -120,7 +120,7 @@ }, "end": { "line": 17, - "column": 15, + "column": 14, "program": "ambient_call_signature.ets" } } @@ -134,7 +134,7 @@ }, "end": { "line": 17, - "column": 15, + "column": 14, "program": "ambient_call_signature.ets" } } @@ -147,7 +147,7 @@ }, "end": { "line": 17, - "column": 15, + "column": 14, "program": "ambient_call_signature.ets" } } @@ -181,8 +181,8 @@ "program": "ambient_call_signature.ets" }, "end": { - "line": 18, - "column": 2, + "line": 17, + "column": 22, "program": "ambient_call_signature.ets" } } @@ -194,8 +194,8 @@ "program": "ambient_call_signature.ets" }, "end": { - "line": 18, - "column": 2, + "line": 17, + "column": 22, "program": "ambient_call_signature.ets" } } diff --git a/ets2panda/test/parser/ets/ambient_indexer_1-expected.txt b/ets2panda/test/parser/ets/ambient_indexer_1-expected.txt index 0cbb526fdcc..94274e8f4bb 100644 --- a/ets2panda/test/parser/ets/ambient_indexer_1-expected.txt +++ b/ets2panda/test/parser/ets/ambient_indexer_1-expected.txt @@ -857,7 +857,7 @@ }, "end": { "line": 21, - "column": 16, + "column": 14, "program": "ambient_indexer_1.ets" } } @@ -870,7 +870,7 @@ }, "end": { "line": 21, - "column": 16, + "column": 14, "program": "ambient_indexer_1.ets" } } @@ -920,7 +920,7 @@ }, "end": { "line": 21, - "column": 23, + "column": 22, "program": "ambient_indexer_1.ets" } } @@ -933,7 +933,7 @@ }, "end": { "line": 21, - "column": 23, + "column": 22, "program": "ambient_indexer_1.ets" } } diff --git a/ets2panda/test/parser/ets/ambient_indexer_6-expected.txt b/ets2panda/test/parser/ets/ambient_indexer_6-expected.txt index 87d901d090d..c4b51ab23cd 100644 --- a/ets2panda/test/parser/ets/ambient_indexer_6-expected.txt +++ b/ets2panda/test/parser/ets/ambient_indexer_6-expected.txt @@ -857,7 +857,7 @@ }, "end": { "line": 21, - "column": 16, + "column": 14, "program": "ambient_indexer_6.ets" } } @@ -870,7 +870,7 @@ }, "end": { "line": 21, - "column": 16, + "column": 14, "program": "ambient_indexer_6.ets" } } @@ -920,7 +920,7 @@ }, "end": { "line": 21, - "column": 23, + "column": 22, "program": "ambient_indexer_6.ets" } } @@ -933,7 +933,7 @@ }, "end": { "line": 21, - "column": 23, + "column": 22, "program": "ambient_indexer_6.ets" } } diff --git a/ets2panda/test/parser/ets/ambient_object_iterable-expected.txt b/ets2panda/test/parser/ets/ambient_object_iterable-expected.txt index a0db0354614..b63cb1f2342 100644 --- a/ets2panda/test/parser/ets/ambient_object_iterable-expected.txt +++ b/ets2panda/test/parser/ets/ambient_object_iterable-expected.txt @@ -78,7 +78,7 @@ }, "end": { "line": 16, - "column": 52, + "column": 51, "program": "ambient_object_iterable.ets" } } @@ -91,7 +91,7 @@ }, "end": { "line": 16, - "column": 52, + "column": 51, "program": "ambient_object_iterable.ets" } } @@ -118,7 +118,7 @@ }, "end": { "line": 16, - "column": 54, + "column": 52, "program": "ambient_object_iterable.ets" } } @@ -131,7 +131,7 @@ }, "end": { "line": 16, - "column": 54, + "column": 52, "program": "ambient_object_iterable.ets" } } @@ -260,7 +260,7 @@ }, "end": { "line": 19, - "column": 19, + "column": 18, "program": "ambient_object_iterable.ets" } } @@ -273,7 +273,7 @@ }, "end": { "line": 19, - "column": 19, + "column": 18, "program": "ambient_object_iterable.ets" } } @@ -288,7 +288,7 @@ }, "end": { "line": 19, - "column": 19, + "column": 18, "program": "ambient_object_iterable.ets" } } @@ -376,7 +376,7 @@ }, "end": { "line": 21, - "column": 24, + "column": 23, "program": "ambient_object_iterable.ets" } } @@ -389,7 +389,7 @@ }, "end": { "line": 21, - "column": 24, + "column": 23, "program": "ambient_object_iterable.ets" } } @@ -403,7 +403,7 @@ }, "end": { "line": 21, - "column": 24, + "column": 23, "program": "ambient_object_iterable.ets" } } @@ -416,7 +416,7 @@ }, "end": { "line": 21, - "column": 24, + "column": 23, "program": "ambient_object_iterable.ets" } } @@ -566,7 +566,7 @@ }, "end": { "line": 23, - "column": 42, + "column": 41, "program": "ambient_object_iterable.ets" } } @@ -579,7 +579,7 @@ }, "end": { "line": 23, - "column": 42, + "column": 41, "program": "ambient_object_iterable.ets" } } @@ -605,8 +605,8 @@ "program": "ambient_object_iterable.ets" }, "end": { - "line": 24, - "column": 2, + "line": 23, + "column": 42, "program": "ambient_object_iterable.ets" } } @@ -618,8 +618,8 @@ "program": "ambient_object_iterable.ets" }, "end": { - "line": 24, - "column": 2, + "line": 23, + "column": 42, "program": "ambient_object_iterable.ets" } } @@ -944,8 +944,8 @@ "program": "ambient_object_iterable.ets" }, "end": { - "line": 30, - "column": 2, + "line": 29, + "column": 33, "program": "ambient_object_iterable.ets" } } @@ -957,8 +957,8 @@ "program": "ambient_object_iterable.ets" }, "end": { - "line": 30, - "column": 2, + "line": 29, + "column": 33, "program": "ambient_object_iterable.ets" } } @@ -1386,7 +1386,7 @@ }, "end": { "line": 34, - "column": 17, + "column": 16, "program": "ambient_object_iterable.ets" } } @@ -1399,7 +1399,7 @@ }, "end": { "line": 34, - "column": 17, + "column": 16, "program": "ambient_object_iterable.ets" } } diff --git a/ets2panda/test/parser/ets/array_creation_expression-expected.txt b/ets2panda/test/parser/ets/array_creation_expression-expected.txt index 1a0fdd026ed..c1cf9705a89 100644 --- a/ets2panda/test/parser/ets/array_creation_expression-expected.txt +++ b/ets2panda/test/parser/ets/array_creation_expression-expected.txt @@ -78,7 +78,7 @@ }, "end": { "line": 17, - "column": 15, + "column": 14, "program": "array_creation_expression.ets" } } @@ -91,7 +91,7 @@ }, "end": { "line": 17, - "column": 15, + "column": 14, "program": "array_creation_expression.ets" } } @@ -106,7 +106,7 @@ }, "end": { "line": 17, - "column": 15, + "column": 14, "program": "array_creation_expression.ets" } } @@ -165,7 +165,7 @@ }, "end": { "line": 18, - "column": 15, + "column": 14, "program": "array_creation_expression.ets" } } @@ -178,7 +178,7 @@ }, "end": { "line": 18, - "column": 15, + "column": 14, "program": "array_creation_expression.ets" } } @@ -193,7 +193,7 @@ }, "end": { "line": 18, - "column": 15, + "column": 14, "program": "array_creation_expression.ets" } } @@ -638,7 +638,7 @@ }, "end": { "line": 25, - "column": 29, + "column": 27, "program": "array_creation_expression.ets" } } @@ -651,7 +651,7 @@ }, "end": { "line": 25, - "column": 29, + "column": 27, "program": "array_creation_expression.ets" } } @@ -1342,7 +1342,7 @@ }, "end": { "line": 32, - "column": 24, + "column": 23, "program": "array_creation_expression.ets" } } @@ -1355,7 +1355,7 @@ }, "end": { "line": 32, - "column": 24, + "column": 23, "program": "array_creation_expression.ets" } } @@ -1470,7 +1470,7 @@ }, "end": { "line": 33, - "column": 24, + "column": 23, "program": "array_creation_expression.ets" } } @@ -1483,7 +1483,7 @@ }, "end": { "line": 33, - "column": 24, + "column": 23, "program": "array_creation_expression.ets" } } @@ -1598,7 +1598,7 @@ }, "end": { "line": 34, - "column": 21, + "column": 20, "program": "array_creation_expression.ets" } } @@ -1611,7 +1611,7 @@ }, "end": { "line": 34, - "column": 21, + "column": 20, "program": "array_creation_expression.ets" } } @@ -1726,7 +1726,7 @@ }, "end": { "line": 35, - "column": 23, + "column": 22, "program": "array_creation_expression.ets" } } @@ -1739,7 +1739,7 @@ }, "end": { "line": 35, - "column": 23, + "column": 22, "program": "array_creation_expression.ets" } } @@ -1878,7 +1878,7 @@ }, "end": { "line": 36, - "column": 32, + "column": 31, "program": "array_creation_expression.ets" } } @@ -1891,7 +1891,7 @@ }, "end": { "line": 36, - "column": 32, + "column": 31, "program": "array_creation_expression.ets" } } @@ -1918,7 +1918,7 @@ }, "end": { "line": 36, - "column": 33, + "column": 32, "program": "array_creation_expression.ets" } } @@ -1931,7 +1931,7 @@ }, "end": { "line": 36, - "column": 33, + "column": 32, "program": "array_creation_expression.ets" } } diff --git a/ets2panda/test/parser/ets/assignNullableFromMethodToNullableParam-expected.txt b/ets2panda/test/parser/ets/assignNullableFromMethodToNullableParam-expected.txt index 63d8c1ba459..3d381f859d5 100644 --- a/ets2panda/test/parser/ets/assignNullableFromMethodToNullableParam-expected.txt +++ b/ets2panda/test/parser/ets/assignNullableFromMethodToNullableParam-expected.txt @@ -105,7 +105,7 @@ }, "end": { "line": 17, - "column": 16, + "column": 14, "program": "assignNullableFromMethodToNullableParam.ets" } } @@ -118,7 +118,7 @@ }, "end": { "line": 17, - "column": 16, + "column": 14, "program": "assignNullableFromMethodToNullableParam.ets" } } @@ -188,7 +188,7 @@ }, "end": { "line": 18, - "column": 22, + "column": 21, "program": "assignNullableFromMethodToNullableParam.ets" } } @@ -201,7 +201,7 @@ }, "end": { "line": 18, - "column": 22, + "column": 21, "program": "assignNullableFromMethodToNullableParam.ets" } } @@ -656,7 +656,7 @@ }, "end": { "line": 23, - "column": 17, + "column": 15, "program": "assignNullableFromMethodToNullableParam.ets" } } @@ -669,7 +669,7 @@ }, "end": { "line": 23, - "column": 17, + "column": 15, "program": "assignNullableFromMethodToNullableParam.ets" } } @@ -748,7 +748,7 @@ }, "end": { "line": 23, - "column": 31, + "column": 30, "program": "assignNullableFromMethodToNullableParam.ets" } } @@ -761,7 +761,7 @@ }, "end": { "line": 23, - "column": 31, + "column": 30, "program": "assignNullableFromMethodToNullableParam.ets" } } @@ -845,7 +845,7 @@ }, "end": { "line": 24, - "column": 21, + "column": 19, "program": "assignNullableFromMethodToNullableParam.ets" } } @@ -858,7 +858,7 @@ }, "end": { "line": 24, - "column": 21, + "column": 19, "program": "assignNullableFromMethodToNullableParam.ets" } } diff --git a/ets2panda/test/parser/ets/assignNullableToNonNullable-expected.txt b/ets2panda/test/parser/ets/assignNullableToNonNullable-expected.txt index 2aca76bfaea..cee3555d6ff 100644 --- a/ets2panda/test/parser/ets/assignNullableToNonNullable-expected.txt +++ b/ets2panda/test/parser/ets/assignNullableToNonNullable-expected.txt @@ -389,7 +389,7 @@ }, "end": { "line": 19, - "column": 20, + "column": 19, "program": "assignNullableToNonNullable.ets" } } @@ -402,7 +402,7 @@ }, "end": { "line": 19, - "column": 20, + "column": 19, "program": "assignNullableToNonNullable.ets" } } @@ -490,7 +490,7 @@ }, "end": { "line": 20, - "column": 17, + "column": 15, "program": "assignNullableToNonNullable.ets" } } @@ -503,7 +503,7 @@ }, "end": { "line": 20, - "column": 17, + "column": 15, "program": "assignNullableToNonNullable.ets" } } @@ -582,7 +582,7 @@ }, "end": { "line": 20, - "column": 31, + "column": 30, "program": "assignNullableToNonNullable.ets" } } @@ -595,7 +595,7 @@ }, "end": { "line": 20, - "column": 31, + "column": 30, "program": "assignNullableToNonNullable.ets" } } diff --git a/ets2panda/test/parser/ets/assignNullableToNonNullableArray-expected.txt b/ets2panda/test/parser/ets/assignNullableToNonNullableArray-expected.txt index 42083111fb8..c3d394c6e93 100644 --- a/ets2panda/test/parser/ets/assignNullableToNonNullableArray-expected.txt +++ b/ets2panda/test/parser/ets/assignNullableToNonNullableArray-expected.txt @@ -413,7 +413,7 @@ }, "end": { "line": 19, - "column": 32, + "column": 31, "program": "assignNullableToNonNullableArray.ets" } } @@ -426,7 +426,7 @@ }, "end": { "line": 19, - "column": 32, + "column": 31, "program": "assignNullableToNonNullableArray.ets" } } @@ -453,7 +453,7 @@ }, "end": { "line": 19, - "column": 33, + "column": 32, "program": "assignNullableToNonNullableArray.ets" } } @@ -466,7 +466,7 @@ }, "end": { "line": 19, - "column": 33, + "column": 32, "program": "assignNullableToNonNullableArray.ets" } } @@ -578,7 +578,7 @@ }, "end": { "line": 20, - "column": 27, + "column": 26, "program": "assignNullableToNonNullableArray.ets" } } @@ -591,7 +591,7 @@ }, "end": { "line": 20, - "column": 27, + "column": 26, "program": "assignNullableToNonNullableArray.ets" } } @@ -618,7 +618,7 @@ }, "end": { "line": 20, - "column": 29, + "column": 27, "program": "assignNullableToNonNullableArray.ets" } } @@ -631,7 +631,7 @@ }, "end": { "line": 20, - "column": 29, + "column": 27, "program": "assignNullableToNonNullableArray.ets" } } @@ -713,7 +713,7 @@ }, "end": { "line": 20, - "column": 44, + "column": 43, "program": "assignNullableToNonNullableArray.ets" } } @@ -726,7 +726,7 @@ }, "end": { "line": 20, - "column": 44, + "column": 43, "program": "assignNullableToNonNullableArray.ets" } } @@ -776,7 +776,7 @@ }, "end": { "line": 20, - "column": 53, + "column": 52, "program": "assignNullableToNonNullableArray.ets" } } @@ -789,7 +789,7 @@ }, "end": { "line": 20, - "column": 53, + "column": 52, "program": "assignNullableToNonNullableArray.ets" } } diff --git a/ets2panda/test/parser/ets/assignNullableToNonNullableTypeAlias-expected.txt b/ets2panda/test/parser/ets/assignNullableToNonNullableTypeAlias-expected.txt index 6c337052f3c..12eaa2d99e1 100644 --- a/ets2panda/test/parser/ets/assignNullableToNonNullableTypeAlias-expected.txt +++ b/ets2panda/test/parser/ets/assignNullableToNonNullableTypeAlias-expected.txt @@ -207,7 +207,7 @@ }, "end": { "line": 18, - "column": 14, + "column": 12, "program": "assignNullableToNonNullableTypeAlias.ets" } } @@ -220,7 +220,7 @@ }, "end": { "line": 18, - "column": 14, + "column": 12, "program": "assignNullableToNonNullableTypeAlias.ets" } } @@ -500,7 +500,7 @@ }, "end": { "line": 21, - "column": 20, + "column": 19, "program": "assignNullableToNonNullableTypeAlias.ets" } } @@ -513,7 +513,7 @@ }, "end": { "line": 21, - "column": 20, + "column": 19, "program": "assignNullableToNonNullableTypeAlias.ets" } } @@ -598,7 +598,7 @@ }, "end": { "line": 22, - "column": 18, + "column": 16, "program": "assignNullableToNonNullableTypeAlias.ets" } } @@ -611,7 +611,7 @@ }, "end": { "line": 22, - "column": 18, + "column": 16, "program": "assignNullableToNonNullableTypeAlias.ets" } } @@ -661,7 +661,7 @@ }, "end": { "line": 22, - "column": 25, + "column": 24, "program": "assignNullableToNonNullableTypeAlias.ets" } } @@ -674,7 +674,7 @@ }, "end": { "line": 22, - "column": 25, + "column": 24, "program": "assignNullableToNonNullableTypeAlias.ets" } } 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 79eae8cee49..1773d4d19a1 100644 --- a/ets2panda/test/parser/ets/async_func_return_type-expected.txt +++ b/ets2panda/test/parser/ets/async_func_return_type-expected.txt @@ -346,7 +346,7 @@ }, "end": { "line": 16, - "column": 50, + "column": 49, "program": "async_func_return_type.ets" } } @@ -359,7 +359,7 @@ }, "end": { "line": 16, - "column": 50, + "column": 49, "program": "async_func_return_type.ets" } } @@ -515,7 +515,7 @@ }, "end": { "line": 18, - "column": 37, + "column": 35, "program": "async_func_return_type.ets" } } @@ -528,7 +528,7 @@ }, "end": { "line": 18, - "column": 37, + "column": 35, "program": "async_func_return_type.ets" } } @@ -780,7 +780,7 @@ }, "end": { "line": 22, - "column": 53, + "column": 51, "program": "async_func_return_type.ets" } } @@ -793,7 +793,7 @@ }, "end": { "line": 22, - "column": 53, + "column": 51, "program": "async_func_return_type.ets" } } diff --git a/ets2panda/test/parser/ets/async_function-expected.txt b/ets2panda/test/parser/ets/async_function-expected.txt index 07c34ec1ac4..89e223dc442 100644 --- a/ets2panda/test/parser/ets/async_function-expected.txt +++ b/ets2panda/test/parser/ets/async_function-expected.txt @@ -129,7 +129,7 @@ }, "end": { "line": 17, - "column": 41, + "column": 39, "program": "async_function.ets" } } @@ -142,7 +142,7 @@ }, "end": { "line": 17, - "column": 41, + "column": 39, "program": "async_function.ets" } } @@ -198,7 +198,7 @@ }, "end": { "line": 17, - "column": 49, + "column": 47, "program": "async_function.ets" } } @@ -211,7 +211,7 @@ }, "end": { "line": 17, - "column": 49, + "column": 47, "program": "async_function.ets" } } @@ -705,7 +705,7 @@ }, "end": { "line": 22, - "column": 70, + "column": 68, "program": "async_function.ets" } } @@ -718,7 +718,7 @@ }, "end": { "line": 22, - "column": 70, + "column": 68, "program": "async_function.ets" } } @@ -774,7 +774,7 @@ }, "end": { "line": 22, - "column": 79, + "column": 76, "program": "async_function.ets" } } @@ -787,7 +787,7 @@ }, "end": { "line": 22, - "column": 79, + "column": 76, "program": "async_function.ets" } } @@ -1052,7 +1052,7 @@ }, "end": { "line": 20, - "column": 39, + "column": 37, "program": "async_function.ets" } } @@ -1065,7 +1065,7 @@ }, "end": { "line": 20, - "column": 39, + "column": 37, "program": "async_function.ets" } } @@ -1121,7 +1121,7 @@ }, "end": { "line": 20, - "column": 47, + "column": 45, "program": "async_function.ets" } } @@ -1134,7 +1134,7 @@ }, "end": { "line": 20, - "column": 47, + "column": 45, "program": "async_function.ets" } } @@ -1312,7 +1312,7 @@ }, "end": { "line": 22, - "column": 35, + "column": 33, "program": "async_function.ets" } } @@ -1325,7 +1325,7 @@ }, "end": { "line": 22, - "column": 35, + "column": 33, "program": "async_function.ets" } } @@ -1381,7 +1381,7 @@ }, "end": { "line": 22, - "column": 43, + "column": 41, "program": "async_function.ets" } } @@ -1394,7 +1394,7 @@ }, "end": { "line": 22, - "column": 43, + "column": 41, "program": "async_function.ets" } } @@ -1407,7 +1407,7 @@ }, "end": { "line": 22, - "column": 43, + "column": 41, "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 ca6a8d918f6..9930044848b 100644 --- a/ets2panda/test/parser/ets/async_overload-expected.txt +++ b/ets2panda/test/parser/ets/async_overload-expected.txt @@ -177,7 +177,7 @@ }, "end": { "line": 17, - "column": 40, + "column": 38, "program": "async_overload.ets" } } @@ -190,7 +190,7 @@ }, "end": { "line": 17, - "column": 40, + "column": 38, "program": "async_overload.ets" } } @@ -246,7 +246,7 @@ }, "end": { "line": 17, - "column": 48, + "column": 46, "program": "async_overload.ets" } } @@ -259,7 +259,7 @@ }, "end": { "line": 17, - "column": 48, + "column": 46, "program": "async_overload.ets" } } @@ -425,7 +425,7 @@ }, "end": { "line": 21, - "column": 26, + "column": 24, "program": "async_overload.ets" } } @@ -438,7 +438,7 @@ }, "end": { "line": 21, - "column": 26, + "column": 24, "program": "async_overload.ets" } } @@ -603,7 +603,7 @@ }, "end": { "line": 21, - "column": 58, + "column": 56, "program": "async_overload.ets" } } @@ -616,7 +616,7 @@ }, "end": { "line": 21, - "column": 58, + "column": 56, "program": "async_overload.ets" } } @@ -672,7 +672,7 @@ }, "end": { "line": 21, - "column": 66, + "column": 64, "program": "async_overload.ets" } } @@ -685,7 +685,7 @@ }, "end": { "line": 21, - "column": 66, + "column": 64, "program": "async_overload.ets" } } @@ -1176,7 +1176,7 @@ }, "end": { "line": 25, - "column": 45, + "column": 43, "program": "async_overload.ets" } } @@ -1189,7 +1189,7 @@ }, "end": { "line": 25, - "column": 45, + "column": 43, "program": "async_overload.ets" } } @@ -1245,7 +1245,7 @@ }, "end": { "line": 25, - "column": 53, + "column": 51, "program": "async_overload.ets" } } @@ -1258,7 +1258,7 @@ }, "end": { "line": 25, - "column": 53, + "column": 51, "program": "async_overload.ets" } } @@ -1424,7 +1424,7 @@ }, "end": { "line": 29, - "column": 31, + "column": 29, "program": "async_overload.ets" } } @@ -1437,7 +1437,7 @@ }, "end": { "line": 29, - "column": 31, + "column": 29, "program": "async_overload.ets" } } @@ -1602,7 +1602,7 @@ }, "end": { "line": 29, - "column": 63, + "column": 61, "program": "async_overload.ets" } } @@ -1615,7 +1615,7 @@ }, "end": { "line": 29, - "column": 63, + "column": 61, "program": "async_overload.ets" } } @@ -1671,7 +1671,7 @@ }, "end": { "line": 29, - "column": 70, + "column": 69, "program": "async_overload.ets" } } @@ -1684,7 +1684,7 @@ }, "end": { "line": 29, - "column": 70, + "column": 69, "program": "async_overload.ets" } } @@ -2061,7 +2061,7 @@ }, "end": { "line": 36, - "column": 23, + "column": 22, "program": "async_overload.ets" } } @@ -2074,7 +2074,7 @@ }, "end": { "line": 36, - "column": 23, + "column": 22, "program": "async_overload.ets" } } diff --git a/ets2panda/test/parser/ets/async_with_lambda-expected.txt b/ets2panda/test/parser/ets/async_with_lambda-expected.txt index 9e47c47d77f..a8b26e25f2c 100644 --- a/ets2panda/test/parser/ets/async_with_lambda-expected.txt +++ b/ets2panda/test/parser/ets/async_with_lambda-expected.txt @@ -444,7 +444,7 @@ }, "end": { "line": 18, - "column": 50, + "column": 48, "program": "async_with_lambda.ets" } } @@ -457,7 +457,7 @@ }, "end": { "line": 18, - "column": 50, + "column": 48, "program": "async_with_lambda.ets" } } @@ -513,7 +513,7 @@ }, "end": { "line": 18, - "column": 58, + "column": 56, "program": "async_with_lambda.ets" } } @@ -526,7 +526,7 @@ }, "end": { "line": 18, - "column": 58, + "column": 56, "program": "async_with_lambda.ets" } } @@ -977,7 +977,7 @@ }, "end": { "line": 26, - "column": 45, + "column": 43, "program": "async_with_lambda.ets" } } @@ -990,7 +990,7 @@ }, "end": { "line": 26, - "column": 45, + "column": 43, "program": "async_with_lambda.ets" } } @@ -1046,7 +1046,7 @@ }, "end": { "line": 26, - "column": 53, + "column": 51, "program": "async_with_lambda.ets" } } @@ -1059,7 +1059,7 @@ }, "end": { "line": 26, - "column": 53, + "column": 51, "program": "async_with_lambda.ets" } } @@ -1072,7 +1072,7 @@ }, "end": { "line": 26, - "column": 53, + "column": 51, "program": "async_with_lambda.ets" } } @@ -1156,7 +1156,7 @@ }, "end": { "line": 26, - "column": 80, + "column": 78, "program": "async_with_lambda.ets" } } @@ -1169,7 +1169,7 @@ }, "end": { "line": 26, - "column": 80, + "column": 78, "program": "async_with_lambda.ets" } } @@ -1225,7 +1225,7 @@ }, "end": { "line": 26, - "column": 89, + "column": 86, "program": "async_with_lambda.ets" } } @@ -1238,7 +1238,7 @@ }, "end": { "line": 26, - "column": 89, + "column": 86, "program": "async_with_lambda.ets" } } @@ -1571,7 +1571,7 @@ }, "end": { "line": 33, - "column": 43, + "column": 42, "program": "async_with_lambda.ets" } } @@ -1584,7 +1584,7 @@ }, "end": { "line": 33, - "column": 43, + "column": 42, "program": "async_with_lambda.ets" } } @@ -1611,7 +1611,7 @@ }, "end": { "line": 33, - "column": 45, + "column": 43, "program": "async_with_lambda.ets" } } @@ -1624,7 +1624,7 @@ }, "end": { "line": 33, - "column": 45, + "column": 43, "program": "async_with_lambda.ets" } } @@ -1637,7 +1637,7 @@ }, "end": { "line": 33, - "column": 45, + "column": 43, "program": "async_with_lambda.ets" } } @@ -1718,7 +1718,7 @@ }, "end": { "line": 33, - "column": 71, + "column": 70, "program": "async_with_lambda.ets" } } @@ -1731,7 +1731,7 @@ }, "end": { "line": 33, - "column": 71, + "column": 70, "program": "async_with_lambda.ets" } } @@ -1758,7 +1758,7 @@ }, "end": { "line": 33, - "column": 74, + "column": 71, "program": "async_with_lambda.ets" } } @@ -1771,7 +1771,7 @@ }, "end": { "line": 33, - "column": 74, + "column": 71, "program": "async_with_lambda.ets" } } @@ -1836,7 +1836,7 @@ }, "end": { "line": 34, - "column": 35, + "column": 34, "program": "async_with_lambda.ets" } } @@ -1849,7 +1849,7 @@ }, "end": { "line": 34, - "column": 35, + "column": 34, "program": "async_with_lambda.ets" } } @@ -1876,7 +1876,7 @@ }, "end": { "line": 34, - "column": 36, + "column": 35, "program": "async_with_lambda.ets" } } @@ -1889,7 +1889,7 @@ }, "end": { "line": 34, - "column": 36, + "column": 35, "program": "async_with_lambda.ets" } } @@ -1946,7 +1946,7 @@ }, "end": { "line": 34, - "column": 61, + "column": 60, "program": "async_with_lambda.ets" } } @@ -1959,7 +1959,7 @@ }, "end": { "line": 34, - "column": 61, + "column": 60, "program": "async_with_lambda.ets" } } @@ -1973,7 +1973,7 @@ }, "end": { "line": 34, - "column": 61, + "column": 60, "program": "async_with_lambda.ets" } } @@ -1986,7 +1986,7 @@ }, "end": { "line": 34, - "column": 61, + "column": 60, "program": "async_with_lambda.ets" } } @@ -2119,7 +2119,7 @@ }, "end": { "line": 35, - "column": 32, + "column": 31, "program": "async_with_lambda.ets" } } @@ -2132,7 +2132,7 @@ }, "end": { "line": 35, - "column": 32, + "column": 31, "program": "async_with_lambda.ets" } } diff --git a/ets2panda/test/parser/ets/await_complex_promise-expected.txt b/ets2panda/test/parser/ets/await_complex_promise-expected.txt index 1b5b00439c7..1a818507990 100644 --- a/ets2panda/test/parser/ets/await_complex_promise-expected.txt +++ b/ets2panda/test/parser/ets/await_complex_promise-expected.txt @@ -76,7 +76,7 @@ }, "end": { "line": 32, - "column": 29, + "column": 28, "program": "await_complex_promise.ets" } } @@ -89,7 +89,7 @@ }, "end": { "line": 32, - "column": 29, + "column": 28, "program": "await_complex_promise.ets" } } @@ -116,7 +116,7 @@ }, "end": { "line": 32, - "column": 30, + "column": 29, "program": "await_complex_promise.ets" } } @@ -129,7 +129,7 @@ }, "end": { "line": 32, - "column": 30, + "column": 29, "program": "await_complex_promise.ets" } } @@ -163,7 +163,7 @@ }, "end": { "line": 32, - "column": 37, + "column": 36, "program": "await_complex_promise.ets" } } @@ -176,7 +176,7 @@ }, "end": { "line": 32, - "column": 37, + "column": 36, "program": "await_complex_promise.ets" } } @@ -190,7 +190,7 @@ }, "end": { "line": 32, - "column": 37, + "column": 36, "program": "await_complex_promise.ets" } } @@ -574,7 +574,7 @@ }, "end": { "line": 16, - "column": 42, + "column": 40, "program": "await_complex_promise.ets" } } @@ -587,7 +587,7 @@ }, "end": { "line": 16, - "column": 42, + "column": 40, "program": "await_complex_promise.ets" } } @@ -654,7 +654,7 @@ }, "end": { "line": 16, - "column": 43, + "column": 42, "program": "await_complex_promise.ets" } } @@ -667,7 +667,7 @@ }, "end": { "line": 16, - "column": 43, + "column": 42, "program": "await_complex_promise.ets" } } @@ -681,7 +681,7 @@ }, "end": { "line": 16, - "column": 43, + "column": 42, "program": "await_complex_promise.ets" } } @@ -694,7 +694,7 @@ }, "end": { "line": 16, - "column": 43, + "column": 42, "program": "await_complex_promise.ets" } } @@ -755,7 +755,7 @@ }, "end": { "line": 17, - "column": 25, + "column": 23, "program": "await_complex_promise.ets" } } @@ -768,7 +768,7 @@ }, "end": { "line": 17, - "column": 25, + "column": 23, "program": "await_complex_promise.ets" } } @@ -1036,7 +1036,7 @@ }, "end": { "line": 20, - "column": 41, + "column": 40, "program": "await_complex_promise.ets" } } @@ -1049,7 +1049,7 @@ }, "end": { "line": 20, - "column": 41, + "column": 40, "program": "await_complex_promise.ets" } } @@ -1076,7 +1076,7 @@ }, "end": { "line": 20, - "column": 42, + "column": 41, "program": "await_complex_promise.ets" } } @@ -1089,7 +1089,7 @@ }, "end": { "line": 20, - "column": 42, + "column": 41, "program": "await_complex_promise.ets" } } @@ -1123,7 +1123,7 @@ }, "end": { "line": 20, - "column": 49, + "column": 48, "program": "await_complex_promise.ets" } } @@ -1136,7 +1136,7 @@ }, "end": { "line": 20, - "column": 49, + "column": 48, "program": "await_complex_promise.ets" } } @@ -1150,7 +1150,7 @@ }, "end": { "line": 20, - "column": 49, + "column": 48, "program": "await_complex_promise.ets" } } @@ -1177,7 +1177,7 @@ }, "end": { "line": 20, - "column": 50, + "column": 49, "program": "await_complex_promise.ets" } } @@ -1190,7 +1190,7 @@ }, "end": { "line": 20, - "column": 50, + "column": 49, "program": "await_complex_promise.ets" } } @@ -1204,7 +1204,7 @@ }, "end": { "line": 20, - "column": 50, + "column": 49, "program": "await_complex_promise.ets" } } @@ -1217,7 +1217,7 @@ }, "end": { "line": 20, - "column": 50, + "column": 49, "program": "await_complex_promise.ets" } } @@ -1281,7 +1281,7 @@ }, "end": { "line": 21, - "column": 24, + "column": 23, "program": "await_complex_promise.ets" } } @@ -1294,7 +1294,7 @@ }, "end": { "line": 21, - "column": 24, + "column": 23, "program": "await_complex_promise.ets" } } @@ -1328,7 +1328,7 @@ }, "end": { "line": 21, - "column": 32, + "column": 30, "program": "await_complex_promise.ets" } } @@ -1341,7 +1341,7 @@ }, "end": { "line": 21, - "column": 32, + "column": 30, "program": "await_complex_promise.ets" } } @@ -1355,7 +1355,7 @@ }, "end": { "line": 21, - "column": 32, + "column": 30, "program": "await_complex_promise.ets" } } @@ -1623,7 +1623,7 @@ }, "end": { "line": 24, - "column": 41, + "column": 40, "program": "await_complex_promise.ets" } } @@ -1636,7 +1636,7 @@ }, "end": { "line": 24, - "column": 41, + "column": 40, "program": "await_complex_promise.ets" } } @@ -1663,7 +1663,7 @@ }, "end": { "line": 24, - "column": 42, + "column": 41, "program": "await_complex_promise.ets" } } @@ -1676,7 +1676,7 @@ }, "end": { "line": 24, - "column": 42, + "column": 41, "program": "await_complex_promise.ets" } } @@ -1734,7 +1734,7 @@ }, "end": { "line": 24, - "column": 58, + "column": 56, "program": "await_complex_promise.ets" } } @@ -1747,7 +1747,7 @@ }, "end": { "line": 24, - "column": 58, + "column": 56, "program": "await_complex_promise.ets" } } @@ -1828,7 +1828,7 @@ }, "end": { "line": 24, - "column": 59, + "column": 58, "program": "await_complex_promise.ets" } } @@ -1841,7 +1841,7 @@ }, "end": { "line": 24, - "column": 59, + "column": 58, "program": "await_complex_promise.ets" } } @@ -1855,7 +1855,7 @@ }, "end": { "line": 24, - "column": 59, + "column": 58, "program": "await_complex_promise.ets" } } @@ -1868,7 +1868,7 @@ }, "end": { "line": 24, - "column": 59, + "column": 58, "program": "await_complex_promise.ets" } } @@ -1932,7 +1932,7 @@ }, "end": { "line": 25, - "column": 24, + "column": 23, "program": "await_complex_promise.ets" } } @@ -1945,7 +1945,7 @@ }, "end": { "line": 25, - "column": 24, + "column": 23, "program": "await_complex_promise.ets" } } @@ -1979,7 +1979,7 @@ }, "end": { "line": 25, - "column": 32, + "column": 30, "program": "await_complex_promise.ets" } } @@ -1992,7 +1992,7 @@ }, "end": { "line": 25, - "column": 32, + "column": 30, "program": "await_complex_promise.ets" } } @@ -2006,7 +2006,7 @@ }, "end": { "line": 25, - "column": 32, + "column": 30, "program": "await_complex_promise.ets" } } @@ -2289,7 +2289,7 @@ }, "end": { "line": 28, - "column": 47, + "column": 45, "program": "await_complex_promise.ets" } } @@ -2302,7 +2302,7 @@ }, "end": { "line": 28, - "column": 47, + "column": 45, "program": "await_complex_promise.ets" } } @@ -2383,7 +2383,7 @@ }, "end": { "line": 28, - "column": 48, + "column": 47, "program": "await_complex_promise.ets" } } @@ -2396,7 +2396,7 @@ }, "end": { "line": 28, - "column": 48, + "column": 47, "program": "await_complex_promise.ets" } } @@ -2410,7 +2410,7 @@ }, "end": { "line": 28, - "column": 48, + "column": 47, "program": "await_complex_promise.ets" } } @@ -2423,7 +2423,7 @@ }, "end": { "line": 28, - "column": 48, + "column": 47, "program": "await_complex_promise.ets" } } @@ -2502,7 +2502,7 @@ }, "end": { "line": 29, - "column": 30, + "column": 28, "program": "await_complex_promise.ets" } } @@ -2515,7 +2515,7 @@ }, "end": { "line": 29, - "column": 30, + "column": 28, "program": "await_complex_promise.ets" } } @@ -2529,7 +2529,7 @@ }, "end": { "line": 29, - "column": 30, + "column": 28, "program": "await_complex_promise.ets" } } @@ -2770,7 +2770,7 @@ }, "end": { "line": 33, - "column": 32, + "column": 31, "program": "await_complex_promise.ets" } } @@ -2783,7 +2783,7 @@ }, "end": { "line": 33, - "column": 32, + "column": 31, "program": "await_complex_promise.ets" } } @@ -2810,7 +2810,7 @@ }, "end": { "line": 33, - "column": 33, + "column": 32, "program": "await_complex_promise.ets" } } @@ -2823,7 +2823,7 @@ }, "end": { "line": 33, - "column": 33, + "column": 32, "program": "await_complex_promise.ets" } } @@ -2837,7 +2837,7 @@ }, "end": { "line": 33, - "column": 33, + "column": 32, "program": "await_complex_promise.ets" } } @@ -2850,7 +2850,7 @@ }, "end": { "line": 33, - "column": 33, + "column": 32, "program": "await_complex_promise.ets" } } @@ -2914,7 +2914,7 @@ }, "end": { "line": 34, - "column": 24, + "column": 23, "program": "await_complex_promise.ets" } } @@ -2927,7 +2927,7 @@ }, "end": { "line": 34, - "column": 24, + "column": 23, "program": "await_complex_promise.ets" } } @@ -2961,7 +2961,7 @@ }, "end": { "line": 34, - "column": 32, + "column": 30, "program": "await_complex_promise.ets" } } @@ -2974,7 +2974,7 @@ }, "end": { "line": 34, - "column": 32, + "column": 30, "program": "await_complex_promise.ets" } } @@ -2988,7 +2988,7 @@ }, "end": { "line": 34, - "column": 32, + "column": 30, "program": "await_complex_promise.ets" } } diff --git a/ets2panda/test/parser/ets/await_keyword-expected.txt b/ets2panda/test/parser/ets/await_keyword-expected.txt index 250f778f454..eb68f44567d 100644 --- a/ets2panda/test/parser/ets/await_keyword-expected.txt +++ b/ets2panda/test/parser/ets/await_keyword-expected.txt @@ -269,7 +269,7 @@ }, "end": { "line": 22, - "column": 75, + "column": 73, "program": "await_keyword.ets" } } @@ -282,7 +282,7 @@ }, "end": { "line": 22, - "column": 75, + "column": 73, "program": "await_keyword.ets" } } @@ -338,7 +338,7 @@ }, "end": { "line": 22, - "column": 84, + "column": 81, "program": "await_keyword.ets" } } @@ -351,7 +351,7 @@ }, "end": { "line": 22, - "column": 84, + "column": 81, "program": "await_keyword.ets" } } @@ -426,7 +426,7 @@ }, "end": { "line": 23, - "column": 34, + "column": 32, "program": "await_keyword.ets" } } @@ -439,7 +439,7 @@ }, "end": { "line": 23, - "column": 34, + "column": 32, "program": "await_keyword.ets" } } @@ -495,7 +495,7 @@ }, "end": { "line": 23, - "column": 42, + "column": 40, "program": "await_keyword.ets" } } @@ -508,7 +508,7 @@ }, "end": { "line": 23, - "column": 42, + "column": 40, "program": "await_keyword.ets" } } @@ -626,7 +626,7 @@ }, "end": { "line": 23, - "column": 70, + "column": 68, "program": "await_keyword.ets" } } @@ -639,7 +639,7 @@ }, "end": { "line": 23, - "column": 70, + "column": 68, "program": "await_keyword.ets" } } @@ -695,7 +695,7 @@ }, "end": { "line": 23, - "column": 78, + "column": 76, "program": "await_keyword.ets" } } @@ -708,7 +708,7 @@ }, "end": { "line": 23, - "column": 78, + "column": 76, "program": "await_keyword.ets" } } @@ -899,7 +899,7 @@ }, "end": { "line": 24, - "column": 22, + "column": 20, "program": "await_keyword.ets" } } @@ -912,7 +912,7 @@ }, "end": { "line": 24, - "column": 22, + "column": 20, "program": "await_keyword.ets" } } @@ -1249,7 +1249,7 @@ }, "end": { "line": 34, - "column": 34, + "column": 32, "program": "await_keyword.ets" } } @@ -1262,7 +1262,7 @@ }, "end": { "line": 34, - "column": 34, + "column": 32, "program": "await_keyword.ets" } } @@ -1318,7 +1318,7 @@ }, "end": { "line": 34, - "column": 42, + "column": 40, "program": "await_keyword.ets" } } @@ -1331,7 +1331,7 @@ }, "end": { "line": 34, - "column": 42, + "column": 40, "program": "await_keyword.ets" } } @@ -1449,7 +1449,7 @@ }, "end": { "line": 34, - "column": 70, + "column": 68, "program": "await_keyword.ets" } } @@ -1462,7 +1462,7 @@ }, "end": { "line": 34, - "column": 70, + "column": 68, "program": "await_keyword.ets" } } @@ -1518,7 +1518,7 @@ }, "end": { "line": 34, - "column": 78, + "column": 76, "program": "await_keyword.ets" } } @@ -1531,7 +1531,7 @@ }, "end": { "line": 34, - "column": 78, + "column": 76, "program": "await_keyword.ets" } } @@ -1722,7 +1722,7 @@ }, "end": { "line": 35, - "column": 22, + "column": 20, "program": "await_keyword.ets" } } @@ -1735,7 +1735,7 @@ }, "end": { "line": 35, - "column": 22, + "column": 20, "program": "await_keyword.ets" } } @@ -2243,7 +2243,7 @@ }, "end": { "line": 16, - "column": 44, + "column": 42, "program": "await_keyword.ets" } } @@ -2256,7 +2256,7 @@ }, "end": { "line": 16, - "column": 44, + "column": 42, "program": "await_keyword.ets" } } @@ -2312,7 +2312,7 @@ }, "end": { "line": 16, - "column": 52, + "column": 50, "program": "await_keyword.ets" } } @@ -2325,7 +2325,7 @@ }, "end": { "line": 16, - "column": 52, + "column": 50, "program": "await_keyword.ets" } } @@ -2400,7 +2400,7 @@ }, "end": { "line": 17, - "column": 34, + "column": 32, "program": "await_keyword.ets" } } @@ -2413,7 +2413,7 @@ }, "end": { "line": 17, - "column": 34, + "column": 32, "program": "await_keyword.ets" } } @@ -2469,7 +2469,7 @@ }, "end": { "line": 17, - "column": 42, + "column": 40, "program": "await_keyword.ets" } } @@ -2482,7 +2482,7 @@ }, "end": { "line": 17, - "column": 42, + "column": 40, "program": "await_keyword.ets" } } @@ -2600,7 +2600,7 @@ }, "end": { "line": 17, - "column": 70, + "column": 68, "program": "await_keyword.ets" } } @@ -2613,7 +2613,7 @@ }, "end": { "line": 17, - "column": 70, + "column": 68, "program": "await_keyword.ets" } } @@ -2669,7 +2669,7 @@ }, "end": { "line": 17, - "column": 78, + "column": 76, "program": "await_keyword.ets" } } @@ -2682,7 +2682,7 @@ }, "end": { "line": 17, - "column": 78, + "column": 76, "program": "await_keyword.ets" } } @@ -2873,7 +2873,7 @@ }, "end": { "line": 18, - "column": 22, + "column": 20, "program": "await_keyword.ets" } } @@ -2886,7 +2886,7 @@ }, "end": { "line": 18, - "column": 22, + "column": 20, "program": "await_keyword.ets" } } @@ -3180,7 +3180,7 @@ }, "end": { "line": 22, - "column": 40, + "column": 38, "program": "await_keyword.ets" } } @@ -3193,7 +3193,7 @@ }, "end": { "line": 22, - "column": 40, + "column": 38, "program": "await_keyword.ets" } } @@ -3249,7 +3249,7 @@ }, "end": { "line": 22, - "column": 48, + "column": 46, "program": "await_keyword.ets" } } @@ -3262,7 +3262,7 @@ }, "end": { "line": 22, - "column": 48, + "column": 46, "program": "await_keyword.ets" } } @@ -3275,7 +3275,7 @@ }, "end": { "line": 22, - "column": 48, + "column": 46, "program": "await_keyword.ets" } } @@ -3429,7 +3429,7 @@ }, "end": { "line": 29, - "column": 34, + "column": 32, "program": "await_keyword.ets" } } @@ -3442,7 +3442,7 @@ }, "end": { "line": 29, - "column": 34, + "column": 32, "program": "await_keyword.ets" } } @@ -3498,7 +3498,7 @@ }, "end": { "line": 29, - "column": 42, + "column": 40, "program": "await_keyword.ets" } } @@ -3511,7 +3511,7 @@ }, "end": { "line": 29, - "column": 42, + "column": 40, "program": "await_keyword.ets" } } @@ -3629,7 +3629,7 @@ }, "end": { "line": 29, - "column": 70, + "column": 68, "program": "await_keyword.ets" } } @@ -3642,7 +3642,7 @@ }, "end": { "line": 29, - "column": 70, + "column": 68, "program": "await_keyword.ets" } } @@ -3698,7 +3698,7 @@ }, "end": { "line": 29, - "column": 78, + "column": 76, "program": "await_keyword.ets" } } @@ -3711,7 +3711,7 @@ }, "end": { "line": 29, - "column": 78, + "column": 76, "program": "await_keyword.ets" } } @@ -3902,7 +3902,7 @@ }, "end": { "line": 30, - "column": 22, + "column": 20, "program": "await_keyword.ets" } } @@ -3915,7 +3915,7 @@ }, "end": { "line": 30, - "column": 22, + "column": 20, "program": "await_keyword.ets" } } @@ -4248,7 +4248,7 @@ }, "end": { "line": 38, - "column": 30, + "column": 28, "program": "await_keyword.ets" } } @@ -4261,7 +4261,7 @@ }, "end": { "line": 38, - "column": 30, + "column": 28, "program": "await_keyword.ets" } } @@ -4317,7 +4317,7 @@ }, "end": { "line": 38, - "column": 38, + "column": 36, "program": "await_keyword.ets" } } @@ -4330,7 +4330,7 @@ }, "end": { "line": 38, - "column": 38, + "column": 36, "program": "await_keyword.ets" } } @@ -4436,7 +4436,7 @@ }, "end": { "line": 39, - "column": 18, + "column": 16, "program": "await_keyword.ets" } } @@ -4449,7 +4449,7 @@ }, "end": { "line": 39, - "column": 18, + "column": 16, "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 f4bf9db30e5..e6e6d1b35ce 100644 --- a/ets2panda/test/parser/ets/binary_op-expected.txt +++ b/ets2panda/test/parser/ets/binary_op-expected.txt @@ -491,7 +491,7 @@ }, "end": { "line": 21, - "column": 21, + "column": 20, "program": "binary_op.ets" } } @@ -504,7 +504,7 @@ }, "end": { "line": 21, - "column": 21, + "column": 20, "program": "binary_op.ets" } } @@ -3073,7 +3073,7 @@ }, "end": { "line": 53, - "column": 32, + "column": 31, "program": "binary_op.ets" } } @@ -3086,7 +3086,7 @@ }, "end": { "line": 53, - "column": 32, + "column": 31, "program": "binary_op.ets" } } @@ -3099,7 +3099,7 @@ }, "end": { "line": 53, - "column": 32, + "column": 31, "program": "binary_op.ets" } } @@ -3112,7 +3112,7 @@ }, "end": { "line": 53, - "column": 32, + "column": 31, "program": "binary_op.ets" } } @@ -3125,7 +3125,7 @@ }, "end": { "line": 53, - "column": 32, + "column": 31, "program": "binary_op.ets" } } @@ -6116,7 +6116,7 @@ }, "end": { "line": 21, - "column": 21, + "column": 20, "program": "binary_op.ets" } } @@ -6129,7 +6129,7 @@ }, "end": { "line": 21, - "column": 21, + "column": 20, "program": "binary_op.ets" } } @@ -6226,7 +6226,7 @@ }, "end": { "line": 22, - "column": 17, + "column": 15, "program": "binary_op.ets" } } @@ -6239,7 +6239,7 @@ }, "end": { "line": 22, - "column": 17, + "column": 15, "program": "binary_op.ets" } } @@ -8585,7 +8585,7 @@ }, "end": { "line": 53, - "column": 32, + "column": 31, "program": "binary_op.ets" } } @@ -8598,7 +8598,7 @@ }, "end": { "line": 53, - "column": 32, + "column": 31, "program": "binary_op.ets" } } @@ -8611,7 +8611,7 @@ }, "end": { "line": 53, - "column": 32, + "column": 31, "program": "binary_op.ets" } } @@ -8632,7 +8632,7 @@ }, "end": { "line": 53, - "column": 32, + "column": 31, "program": "binary_op.ets" } } diff --git a/ets2panda/test/parser/ets/callFunctionWithNullableParam-expected.txt b/ets2panda/test/parser/ets/callFunctionWithNullableParam-expected.txt index 343d19a3edc..b94291f4bd1 100644 --- a/ets2panda/test/parser/ets/callFunctionWithNullableParam-expected.txt +++ b/ets2panda/test/parser/ets/callFunctionWithNullableParam-expected.txt @@ -368,7 +368,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 19, "program": "callFunctionWithNullableParam.ets" } } @@ -381,7 +381,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 19, "program": "callFunctionWithNullableParam.ets" } } @@ -395,7 +395,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 19, "program": "callFunctionWithNullableParam.ets" } } @@ -408,7 +408,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 19, "program": "callFunctionWithNullableParam.ets" } } @@ -593,7 +593,7 @@ }, "end": { "line": 21, - "column": 17, + "column": 15, "program": "callFunctionWithNullableParam.ets" } } @@ -606,7 +606,7 @@ }, "end": { "line": 21, - "column": 17, + "column": 15, "program": "callFunctionWithNullableParam.ets" } } @@ -685,7 +685,7 @@ }, "end": { "line": 21, - "column": 31, + "column": 30, "program": "callFunctionWithNullableParam.ets" } } @@ -698,7 +698,7 @@ }, "end": { "line": 21, - "column": 31, + "column": 30, "program": "callFunctionWithNullableParam.ets" } } diff --git a/ets2panda/test/parser/ets/callInterfaceMethodWithNullableParam-expected.txt b/ets2panda/test/parser/ets/callInterfaceMethodWithNullableParam-expected.txt index 5f65c07269b..365e73d36b2 100644 --- a/ets2panda/test/parser/ets/callInterfaceMethodWithNullableParam-expected.txt +++ b/ets2panda/test/parser/ets/callInterfaceMethodWithNullableParam-expected.txt @@ -89,7 +89,7 @@ }, "end": { "line": 17, - "column": 15, + "column": 14, "program": "callInterfaceMethodWithNullableParam.ets" } } @@ -102,7 +102,7 @@ }, "end": { "line": 17, - "column": 15, + "column": 14, "program": "callInterfaceMethodWithNullableParam.ets" } } @@ -116,7 +116,7 @@ }, "end": { "line": 17, - "column": 15, + "column": 14, "program": "callInterfaceMethodWithNullableParam.ets" } } @@ -129,7 +129,7 @@ }, "end": { "line": 17, - "column": 15, + "column": 14, "program": "callInterfaceMethodWithNullableParam.ets" } } @@ -230,8 +230,8 @@ "program": "callInterfaceMethodWithNullableParam.ets" }, "end": { - "line": 20, - "column": 6, + "line": 18, + "column": 2, "program": "callInterfaceMethodWithNullableParam.ets" } } @@ -289,7 +289,7 @@ }, "end": { "line": 20, - "column": 23, + "column": 21, "program": "callInterfaceMethodWithNullableParam.ets" } } @@ -302,7 +302,7 @@ }, "end": { "line": 20, - "column": 23, + "column": 21, "program": "callInterfaceMethodWithNullableParam.ets" } } @@ -405,7 +405,7 @@ }, "end": { "line": 21, - "column": 15, + "column": 14, "program": "callInterfaceMethodWithNullableParam.ets" } } @@ -418,7 +418,7 @@ }, "end": { "line": 21, - "column": 15, + "column": 14, "program": "callInterfaceMethodWithNullableParam.ets" } } @@ -432,7 +432,7 @@ }, "end": { "line": 21, - "column": 15, + "column": 14, "program": "callInterfaceMethodWithNullableParam.ets" } } @@ -445,7 +445,7 @@ }, "end": { "line": 21, - "column": 15, + "column": 14, "program": "callInterfaceMethodWithNullableParam.ets" } } @@ -891,7 +891,7 @@ }, "end": { "line": 25, - "column": 17, + "column": 15, "program": "callInterfaceMethodWithNullableParam.ets" } } @@ -904,7 +904,7 @@ }, "end": { "line": 25, - "column": 17, + "column": 15, "program": "callInterfaceMethodWithNullableParam.ets" } } @@ -983,7 +983,7 @@ }, "end": { "line": 25, - "column": 31, + "column": 30, "program": "callInterfaceMethodWithNullableParam.ets" } } @@ -996,7 +996,7 @@ }, "end": { "line": 25, - "column": 31, + "column": 30, "program": "callInterfaceMethodWithNullableParam.ets" } } @@ -1080,7 +1080,7 @@ }, "end": { "line": 27, - "column": 11, + "column": 10, "program": "callInterfaceMethodWithNullableParam.ets" } } @@ -1093,7 +1093,7 @@ }, "end": { "line": 27, - "column": 11, + "column": 10, "program": "callInterfaceMethodWithNullableParam.ets" } } diff --git a/ets2panda/test/parser/ets/callMethodWithNullableParam-expected.txt b/ets2panda/test/parser/ets/callMethodWithNullableParam-expected.txt index 235762958a0..7cdcaa28dc4 100644 --- a/ets2panda/test/parser/ets/callMethodWithNullableParam-expected.txt +++ b/ets2panda/test/parser/ets/callMethodWithNullableParam-expected.txt @@ -107,7 +107,7 @@ }, "end": { "line": 17, - "column": 15, + "column": 14, "program": "callMethodWithNullableParam.ets" } } @@ -120,7 +120,7 @@ }, "end": { "line": 17, - "column": 15, + "column": 14, "program": "callMethodWithNullableParam.ets" } } @@ -134,7 +134,7 @@ }, "end": { "line": 17, - "column": 15, + "column": 14, "program": "callMethodWithNullableParam.ets" } } @@ -147,7 +147,7 @@ }, "end": { "line": 17, - "column": 15, + "column": 14, "program": "callMethodWithNullableParam.ets" } } @@ -593,7 +593,7 @@ }, "end": { "line": 21, - "column": 17, + "column": 15, "program": "callMethodWithNullableParam.ets" } } @@ -606,7 +606,7 @@ }, "end": { "line": 21, - "column": 17, + "column": 15, "program": "callMethodWithNullableParam.ets" } } @@ -685,7 +685,7 @@ }, "end": { "line": 21, - "column": 31, + "column": 30, "program": "callMethodWithNullableParam.ets" } } @@ -698,7 +698,7 @@ }, "end": { "line": 21, - "column": 31, + "column": 30, "program": "callMethodWithNullableParam.ets" } } @@ -782,7 +782,7 @@ }, "end": { "line": 23, - "column": 11, + "column": 10, "program": "callMethodWithNullableParam.ets" } } @@ -795,7 +795,7 @@ }, "end": { "line": 23, - "column": 11, + "column": 10, "program": "callMethodWithNullableParam.ets" } } diff --git a/ets2panda/test/parser/ets/calling_superclass_methods-expected.txt b/ets2panda/test/parser/ets/calling_superclass_methods-expected.txt index 084c4c27f5f..25be02feee0 100644 --- a/ets2panda/test/parser/ets/calling_superclass_methods-expected.txt +++ b/ets2panda/test/parser/ets/calling_superclass_methods-expected.txt @@ -326,7 +326,7 @@ }, "end": { "line": 22, - "column": 29, + "column": 27, "program": "calling_superclass_methods.ets" } } @@ -339,7 +339,7 @@ }, "end": { "line": 22, - "column": 29, + "column": 27, "program": "calling_superclass_methods.ets" } } diff --git a/ets2panda/test/parser/ets/cast_const_union-expected.txt b/ets2panda/test/parser/ets/cast_const_union-expected.txt index 00e5e906557..debb908bd59 100644 --- a/ets2panda/test/parser/ets/cast_const_union-expected.txt +++ b/ets2panda/test/parser/ets/cast_const_union-expected.txt @@ -129,7 +129,7 @@ }, "end": { "line": 16, - "column": 29, + "column": 28, "program": "cast_const_union.ets" } } @@ -142,7 +142,7 @@ }, "end": { "line": 16, - "column": 29, + "column": 28, "program": "cast_const_union.ets" } } @@ -313,7 +313,7 @@ }, "end": { "line": 16, - "column": 17, + "column": 15, "program": "cast_const_union.ets" } } @@ -326,7 +326,7 @@ }, "end": { "line": 16, - "column": 17, + "column": 15, "program": "cast_const_union.ets" } } @@ -438,7 +438,7 @@ }, "end": { "line": 19, - "column": 22, + "column": 20, "program": "cast_const_union.ets" } } @@ -451,7 +451,7 @@ }, "end": { "line": 19, - "column": 22, + "column": 20, "program": "cast_const_union.ets" } } @@ -485,7 +485,7 @@ }, "end": { "line": 19, - "column": 31, + "column": 29, "program": "cast_const_union.ets" } } @@ -498,7 +498,7 @@ }, "end": { "line": 19, - "column": 31, + "column": 29, "program": "cast_const_union.ets" } } @@ -532,7 +532,7 @@ }, "end": { "line": 19, - "column": 40, + "column": 38, "program": "cast_const_union.ets" } } @@ -545,7 +545,7 @@ }, "end": { "line": 19, - "column": 40, + "column": 38, "program": "cast_const_union.ets" } } @@ -559,7 +559,7 @@ }, "end": { "line": 19, - "column": 40, + "column": 38, "program": "cast_const_union.ets" } } @@ -727,7 +727,7 @@ }, "end": { "line": 20, - "column": 34, + "column": 33, "program": "cast_const_union.ets" } } @@ -740,7 +740,7 @@ }, "end": { "line": 20, - "column": 34, + "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 681bcf41501..a59feb0b96d 100644 --- a/ets2panda/test/parser/ets/cast_expressions-expected.txt +++ b/ets2panda/test/parser/ets/cast_expressions-expected.txt @@ -421,7 +421,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 18, "program": "cast_expressions.ets" } } @@ -434,7 +434,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 18, "program": "cast_expressions.ets" } } @@ -484,7 +484,7 @@ }, "end": { "line": 18, - "column": 30, + "column": 29, "program": "cast_expressions.ets" } } @@ -497,7 +497,7 @@ }, "end": { "line": 18, - "column": 30, + "column": 29, "program": "cast_expressions.ets" } } @@ -2215,7 +2215,7 @@ }, "end": { "line": 40, - "column": 37, + "column": 36, "program": "cast_expressions.ets" } } @@ -2228,7 +2228,7 @@ }, "end": { "line": 40, - "column": 37, + "column": 36, "program": "cast_expressions.ets" } } @@ -2344,7 +2344,7 @@ }, "end": { "line": 41, - "column": 37, + "column": 36, "program": "cast_expressions.ets" } } @@ -2357,7 +2357,7 @@ }, "end": { "line": 41, - "column": 37, + "column": 36, "program": "cast_expressions.ets" } } @@ -2473,7 +2473,7 @@ }, "end": { "line": 42, - "column": 39, + "column": 38, "program": "cast_expressions.ets" } } @@ -2486,7 +2486,7 @@ }, "end": { "line": 42, - "column": 39, + "column": 38, "program": "cast_expressions.ets" } } @@ -2786,7 +2786,7 @@ }, "end": { "line": 48, - "column": 22, + "column": 20, "program": "cast_expressions.ets" } } @@ -2799,7 +2799,7 @@ }, "end": { "line": 48, - "column": 22, + "column": 20, "program": "cast_expressions.ets" } } @@ -2849,7 +2849,7 @@ }, "end": { "line": 48, - "column": 33, + "column": 32, "program": "cast_expressions.ets" } } @@ -2862,7 +2862,7 @@ }, "end": { "line": 48, - "column": 33, + "column": 32, "program": "cast_expressions.ets" } } @@ -4462,7 +4462,7 @@ }, "end": { "line": 69, - "column": 41, + "column": 40, "program": "cast_expressions.ets" } } @@ -4475,7 +4475,7 @@ }, "end": { "line": 69, - "column": 41, + "column": 40, "program": "cast_expressions.ets" } } @@ -4591,7 +4591,7 @@ }, "end": { "line": 70, - "column": 41, + "column": 40, "program": "cast_expressions.ets" } } @@ -4604,7 +4604,7 @@ }, "end": { "line": 70, - "column": 41, + "column": 40, "program": "cast_expressions.ets" } } @@ -4720,7 +4720,7 @@ }, "end": { "line": 71, - "column": 42, + "column": 41, "program": "cast_expressions.ets" } } @@ -4733,7 +4733,7 @@ }, "end": { "line": 71, - "column": 42, + "column": 41, "program": "cast_expressions.ets" } } @@ -5033,7 +5033,7 @@ }, "end": { "line": 77, - "column": 20, + "column": 18, "program": "cast_expressions.ets" } } @@ -5046,7 +5046,7 @@ }, "end": { "line": 77, - "column": 20, + "column": 18, "program": "cast_expressions.ets" } } @@ -5096,7 +5096,7 @@ }, "end": { "line": 77, - "column": 30, + "column": 29, "program": "cast_expressions.ets" } } @@ -5109,7 +5109,7 @@ }, "end": { "line": 77, - "column": 30, + "column": 29, "program": "cast_expressions.ets" } } @@ -6709,7 +6709,7 @@ }, "end": { "line": 98, - "column": 37, + "column": 36, "program": "cast_expressions.ets" } } @@ -6722,7 +6722,7 @@ }, "end": { "line": 98, - "column": 37, + "column": 36, "program": "cast_expressions.ets" } } @@ -6838,7 +6838,7 @@ }, "end": { "line": 99, - "column": 37, + "column": 36, "program": "cast_expressions.ets" } } @@ -6851,7 +6851,7 @@ }, "end": { "line": 99, - "column": 37, + "column": 36, "program": "cast_expressions.ets" } } @@ -6967,7 +6967,7 @@ }, "end": { "line": 100, - "column": 39, + "column": 38, "program": "cast_expressions.ets" } } @@ -6980,7 +6980,7 @@ }, "end": { "line": 100, - "column": 39, + "column": 38, "program": "cast_expressions.ets" } } @@ -7280,7 +7280,7 @@ }, "end": { "line": 106, - "column": 18, + "column": 16, "program": "cast_expressions.ets" } } @@ -7293,7 +7293,7 @@ }, "end": { "line": 106, - "column": 18, + "column": 16, "program": "cast_expressions.ets" } } @@ -7343,7 +7343,7 @@ }, "end": { "line": 106, - "column": 27, + "column": 26, "program": "cast_expressions.ets" } } @@ -7356,7 +7356,7 @@ }, "end": { "line": 106, - "column": 27, + "column": 26, "program": "cast_expressions.ets" } } @@ -8838,7 +8838,7 @@ }, "end": { "line": 126, - "column": 35, + "column": 34, "program": "cast_expressions.ets" } } @@ -8851,7 +8851,7 @@ }, "end": { "line": 126, - "column": 35, + "column": 34, "program": "cast_expressions.ets" } } @@ -8967,7 +8967,7 @@ }, "end": { "line": 127, - "column": 35, + "column": 34, "program": "cast_expressions.ets" } } @@ -8980,7 +8980,7 @@ }, "end": { "line": 127, - "column": 35, + "column": 34, "program": "cast_expressions.ets" } } @@ -9096,7 +9096,7 @@ }, "end": { "line": 128, - "column": 38, + "column": 37, "program": "cast_expressions.ets" } } @@ -9109,7 +9109,7 @@ }, "end": { "line": 128, - "column": 38, + "column": 37, "program": "cast_expressions.ets" } } @@ -9409,7 +9409,7 @@ }, "end": { "line": 134, - "column": 20, + "column": 18, "program": "cast_expressions.ets" } } @@ -9422,7 +9422,7 @@ }, "end": { "line": 134, - "column": 20, + "column": 18, "program": "cast_expressions.ets" } } @@ -9472,7 +9472,7 @@ }, "end": { "line": 134, - "column": 30, + "column": 29, "program": "cast_expressions.ets" } } @@ -9485,7 +9485,7 @@ }, "end": { "line": 134, - "column": 30, + "column": 29, "program": "cast_expressions.ets" } } @@ -10849,7 +10849,7 @@ }, "end": { "line": 153, - "column": 37, + "column": 36, "program": "cast_expressions.ets" } } @@ -10862,7 +10862,7 @@ }, "end": { "line": 153, - "column": 37, + "column": 36, "program": "cast_expressions.ets" } } @@ -10978,7 +10978,7 @@ }, "end": { "line": 154, - "column": 37, + "column": 36, "program": "cast_expressions.ets" } } @@ -10991,7 +10991,7 @@ }, "end": { "line": 154, - "column": 37, + "column": 36, "program": "cast_expressions.ets" } } @@ -11107,7 +11107,7 @@ }, "end": { "line": 155, - "column": 39, + "column": 38, "program": "cast_expressions.ets" } } @@ -11120,7 +11120,7 @@ }, "end": { "line": 155, - "column": 39, + "column": 38, "program": "cast_expressions.ets" } } @@ -11420,7 +11420,7 @@ }, "end": { "line": 161, - "column": 22, + "column": 20, "program": "cast_expressions.ets" } } @@ -11433,7 +11433,7 @@ }, "end": { "line": 161, - "column": 22, + "column": 20, "program": "cast_expressions.ets" } } @@ -11483,7 +11483,7 @@ }, "end": { "line": 161, - "column": 33, + "column": 32, "program": "cast_expressions.ets" } } @@ -11496,7 +11496,7 @@ }, "end": { "line": 161, - "column": 33, + "column": 32, "program": "cast_expressions.ets" } } @@ -12624,7 +12624,7 @@ }, "end": { "line": 178, - "column": 41, + "column": 40, "program": "cast_expressions.ets" } } @@ -12637,7 +12637,7 @@ }, "end": { "line": 178, - "column": 41, + "column": 40, "program": "cast_expressions.ets" } } @@ -12753,7 +12753,7 @@ }, "end": { "line": 179, - "column": 41, + "column": 40, "program": "cast_expressions.ets" } } @@ -12766,7 +12766,7 @@ }, "end": { "line": 179, - "column": 41, + "column": 40, "program": "cast_expressions.ets" } } @@ -12882,7 +12882,7 @@ }, "end": { "line": 180, - "column": 42, + "column": 41, "program": "cast_expressions.ets" } } @@ -12895,7 +12895,7 @@ }, "end": { "line": 180, - "column": 42, + "column": 41, "program": "cast_expressions.ets" } } @@ -13195,7 +13195,7 @@ }, "end": { "line": 186, - "column": 24, + "column": 22, "program": "cast_expressions.ets" } } @@ -13208,7 +13208,7 @@ }, "end": { "line": 186, - "column": 24, + "column": 22, "program": "cast_expressions.ets" } } @@ -13258,7 +13258,7 @@ }, "end": { "line": 186, - "column": 36, + "column": 35, "program": "cast_expressions.ets" } } @@ -13271,7 +13271,7 @@ }, "end": { "line": 186, - "column": 36, + "column": 35, "program": "cast_expressions.ets" } } @@ -14281,7 +14281,7 @@ }, "end": { "line": 202, - "column": 45, + "column": 44, "program": "cast_expressions.ets" } } @@ -14294,7 +14294,7 @@ }, "end": { "line": 202, - "column": 45, + "column": 44, "program": "cast_expressions.ets" } } @@ -14410,7 +14410,7 @@ }, "end": { "line": 203, - "column": 45, + "column": 44, "program": "cast_expressions.ets" } } @@ -14423,7 +14423,7 @@ }, "end": { "line": 203, - "column": 45, + "column": 44, "program": "cast_expressions.ets" } } @@ -14539,7 +14539,7 @@ }, "end": { "line": 204, - "column": 45, + "column": 44, "program": "cast_expressions.ets" } } @@ -14552,7 +14552,7 @@ }, "end": { "line": 204, - "column": 45, + "column": 44, "program": "cast_expressions.ets" } } @@ -14852,7 +14852,7 @@ }, "end": { "line": 210, - "column": 26, + "column": 24, "program": "cast_expressions.ets" } } @@ -14865,7 +14865,7 @@ }, "end": { "line": 210, - "column": 26, + "column": 24, "program": "cast_expressions.ets" } } @@ -14915,7 +14915,7 @@ }, "end": { "line": 210, - "column": 39, + "column": 38, "program": "cast_expressions.ets" } } @@ -14928,7 +14928,7 @@ }, "end": { "line": 210, - "column": 39, + "column": 38, "program": "cast_expressions.ets" } } @@ -15276,7 +15276,7 @@ }, "end": { "line": 220, - "column": 47, + "column": 46, "program": "cast_expressions.ets" } } @@ -15289,7 +15289,7 @@ }, "end": { "line": 220, - "column": 47, + "column": 46, "program": "cast_expressions.ets" } } @@ -15405,7 +15405,7 @@ }, "end": { "line": 221, - "column": 47, + "column": 46, "program": "cast_expressions.ets" } } @@ -15418,7 +15418,7 @@ }, "end": { "line": 221, - "column": 47, + "column": 46, "program": "cast_expressions.ets" } } @@ -15534,7 +15534,7 @@ }, "end": { "line": 222, - "column": 46, + "column": 45, "program": "cast_expressions.ets" } } @@ -15547,7 +15547,7 @@ }, "end": { "line": 222, - "column": 46, + "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 b21a1e97b39..525e4d51df9 100644 --- a/ets2panda/test/parser/ets/cast_expressions3-expected.txt +++ b/ets2panda/test/parser/ets/cast_expressions3-expected.txt @@ -199,8 +199,8 @@ "program": "cast_expressions3.ets" }, "end": { - "line": 18, - "column": 6, + "line": 17, + "column": 15, "program": "cast_expressions3.ets" } } @@ -254,7 +254,7 @@ }, "end": { "line": 18, - "column": 29, + "column": 18, "program": "cast_expressions3.ets" } } @@ -267,7 +267,7 @@ }, "end": { "line": 18, - "column": 29, + "column": 18, "program": "cast_expressions3.ets" } } @@ -304,7 +304,7 @@ }, "end": { "line": 18, - "column": 33, + "column": 31, "program": "cast_expressions3.ets" } } @@ -317,7 +317,7 @@ }, "end": { "line": 18, - "column": 33, + "column": 31, "program": "cast_expressions3.ets" } } @@ -518,7 +518,7 @@ }, "end": { "line": 19, - "column": 20, + "column": 18, "program": "cast_expressions3.ets" } } @@ -531,7 +531,7 @@ }, "end": { "line": 19, - "column": 20, + "column": 18, "program": "cast_expressions3.ets" } } @@ -1025,7 +1025,7 @@ }, "end": { "line": 22, - "column": 18, + "column": 17, "program": "cast_expressions3.ets" } } @@ -1038,7 +1038,7 @@ }, "end": { "line": 22, - "column": 18, + "column": 17, "program": "cast_expressions3.ets" } } @@ -1155,7 +1155,7 @@ }, "end": { "line": 24, - "column": 21, + "column": 20, "program": "cast_expressions3.ets" } } @@ -1168,7 +1168,7 @@ }, "end": { "line": 24, - "column": 21, + "column": 20, "program": "cast_expressions3.ets" } } @@ -1284,7 +1284,7 @@ }, "end": { "line": 25, - "column": 21, + "column": 20, "program": "cast_expressions3.ets" } } @@ -1297,7 +1297,7 @@ }, "end": { "line": 25, - "column": 21, + "column": 20, "program": "cast_expressions3.ets" } } @@ -1413,7 +1413,7 @@ }, "end": { "line": 26, - "column": 21, + "column": 20, "program": "cast_expressions3.ets" } } @@ -1426,7 +1426,7 @@ }, "end": { "line": 26, - "column": 21, + "column": 20, "program": "cast_expressions3.ets" } } @@ -1542,7 +1542,7 @@ }, "end": { "line": 27, - "column": 21, + "column": 20, "program": "cast_expressions3.ets" } } @@ -1555,7 +1555,7 @@ }, "end": { "line": 27, - "column": 21, + "column": 20, "program": "cast_expressions3.ets" } } @@ -1671,7 +1671,7 @@ }, "end": { "line": 29, - "column": 22, + "column": 21, "program": "cast_expressions3.ets" } } @@ -1684,7 +1684,7 @@ }, "end": { "line": 29, - "column": 22, + "column": 21, "program": "cast_expressions3.ets" } } @@ -1800,7 +1800,7 @@ }, "end": { "line": 30, - "column": 22, + "column": 21, "program": "cast_expressions3.ets" } } @@ -1813,7 +1813,7 @@ }, "end": { "line": 30, - "column": 22, + "column": 21, "program": "cast_expressions3.ets" } } @@ -1929,7 +1929,7 @@ }, "end": { "line": 31, - "column": 22, + "column": 21, "program": "cast_expressions3.ets" } } @@ -1942,7 +1942,7 @@ }, "end": { "line": 31, - "column": 22, + "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 8241915ac09..d30c7cc90a1 100644 --- a/ets2panda/test/parser/ets/cast_expressions4-expected.txt +++ b/ets2panda/test/parser/ets/cast_expressions4-expected.txt @@ -364,7 +364,7 @@ }, "end": { "line": 17, - "column": 28, + "column": 27, "program": "cast_expressions4.ets" } } @@ -377,7 +377,7 @@ }, "end": { "line": 17, - "column": 28, + "column": 27, "program": "cast_expressions4.ets" } } @@ -404,7 +404,7 @@ }, "end": { "line": 17, - "column": 30, + "column": 28, "program": "cast_expressions4.ets" } } @@ -417,7 +417,7 @@ }, "end": { "line": 17, - "column": 30, + "column": 28, "program": "cast_expressions4.ets" } } @@ -470,7 +470,7 @@ }, "end": { "line": 17, - "column": 40, + "column": 39, "program": "cast_expressions4.ets" } } @@ -483,7 +483,7 @@ }, "end": { "line": 17, - "column": 40, + "column": 39, "program": "cast_expressions4.ets" } } @@ -605,7 +605,7 @@ }, "end": { "line": 18, - "column": 34, + "column": 33, "program": "cast_expressions4.ets" } } @@ -618,7 +618,7 @@ }, "end": { "line": 18, - "column": 34, + "column": 33, "program": "cast_expressions4.ets" } } @@ -645,7 +645,7 @@ }, "end": { "line": 18, - "column": 36, + "column": 34, "program": "cast_expressions4.ets" } } @@ -658,7 +658,7 @@ }, "end": { "line": 18, - "column": 36, + "column": 34, "program": "cast_expressions4.ets" } } @@ -749,7 +749,7 @@ }, "end": { "line": 18, - "column": 63, + "column": 62, "program": "cast_expressions4.ets" } } @@ -762,7 +762,7 @@ }, "end": { "line": 18, - "column": 63, + "column": 62, "program": "cast_expressions4.ets" } } @@ -789,7 +789,7 @@ }, "end": { "line": 18, - "column": 64, + "column": 63, "program": "cast_expressions4.ets" } } @@ -802,7 +802,7 @@ }, "end": { "line": 18, - "column": 64, + "column": 63, "program": "cast_expressions4.ets" } } @@ -909,7 +909,7 @@ }, "end": { "line": 19, - "column": 29, + "column": 28, "program": "cast_expressions4.ets" } } @@ -922,7 +922,7 @@ }, "end": { "line": 19, - "column": 29, + "column": 28, "program": "cast_expressions4.ets" } } @@ -949,7 +949,7 @@ }, "end": { "line": 19, - "column": 31, + "column": 29, "program": "cast_expressions4.ets" } } @@ -962,7 +962,7 @@ }, "end": { "line": 19, - "column": 31, + "column": 29, "program": "cast_expressions4.ets" } } @@ -1053,7 +1053,7 @@ }, "end": { "line": 19, - "column": 58, + "column": 57, "program": "cast_expressions4.ets" } } @@ -1066,7 +1066,7 @@ }, "end": { "line": 19, - "column": 58, + "column": 57, "program": "cast_expressions4.ets" } } @@ -1093,7 +1093,7 @@ }, "end": { "line": 19, - "column": 59, + "column": 58, "program": "cast_expressions4.ets" } } @@ -1106,7 +1106,7 @@ }, "end": { "line": 19, - "column": 59, + "column": 58, "program": "cast_expressions4.ets" } } @@ -1222,7 +1222,7 @@ }, "end": { "line": 21, - "column": 29, + "column": 28, "program": "cast_expressions4.ets" } } @@ -1235,7 +1235,7 @@ }, "end": { "line": 21, - "column": 29, + "column": 28, "program": "cast_expressions4.ets" } } diff --git a/ets2panda/test/parser/ets/class_instance_creation-expected.txt b/ets2panda/test/parser/ets/class_instance_creation-expected.txt index 39e1e72cc11..8ede3786a52 100644 --- a/ets2panda/test/parser/ets/class_instance_creation-expected.txt +++ b/ets2panda/test/parser/ets/class_instance_creation-expected.txt @@ -353,7 +353,7 @@ }, "end": { "line": 23, - "column": 28, + "column": 27, "program": "class_instance_creation.ets" } } @@ -366,7 +366,7 @@ }, "end": { "line": 23, - "column": 28, + "column": 27, "program": "class_instance_creation.ets" } } @@ -380,7 +380,7 @@ }, "end": { "line": 23, - "column": 28, + "column": 27, "program": "class_instance_creation.ets" } } @@ -393,7 +393,7 @@ }, "end": { "line": 23, - "column": 28, + "column": 27, "program": "class_instance_creation.ets" } } @@ -568,7 +568,7 @@ }, "end": { "line": 26, - "column": 74, + "column": 73, "program": "class_instance_creation.ets" } } @@ -581,7 +581,7 @@ }, "end": { "line": 26, - "column": 74, + "column": 73, "program": "class_instance_creation.ets" } } @@ -635,7 +635,7 @@ }, "end": { "line": 26, - "column": 45, + "column": 43, "program": "class_instance_creation.ets" } } @@ -648,7 +648,7 @@ }, "end": { "line": 26, - "column": 45, + "column": 43, "program": "class_instance_creation.ets" } } @@ -718,7 +718,7 @@ }, "end": { "line": 27, - "column": 74, + "column": 73, "program": "class_instance_creation.ets" } } @@ -731,7 +731,7 @@ }, "end": { "line": 27, - "column": 74, + "column": 73, "program": "class_instance_creation.ets" } } @@ -802,7 +802,7 @@ }, "end": { "line": 27, - "column": 45, + "column": 43, "program": "class_instance_creation.ets" } } @@ -815,7 +815,7 @@ }, "end": { "line": 27, - "column": 45, + "column": 43, "program": "class_instance_creation.ets" } } @@ -885,7 +885,7 @@ }, "end": { "line": 28, - "column": 74, + "column": 73, "program": "class_instance_creation.ets" } } @@ -898,7 +898,7 @@ }, "end": { "line": 28, - "column": 74, + "column": 73, "program": "class_instance_creation.ets" } } @@ -985,7 +985,7 @@ }, "end": { "line": 28, - "column": 45, + "column": 43, "program": "class_instance_creation.ets" } } @@ -998,7 +998,7 @@ }, "end": { "line": 28, - "column": 45, + "column": 43, "program": "class_instance_creation.ets" } } diff --git a/ets2panda/test/parser/ets/class_instance_initializer-expected.txt b/ets2panda/test/parser/ets/class_instance_initializer-expected.txt index d02a3786fcc..10c042955ff 100644 --- a/ets2panda/test/parser/ets/class_instance_initializer-expected.txt +++ b/ets2panda/test/parser/ets/class_instance_initializer-expected.txt @@ -1120,7 +1120,7 @@ }, "end": { "line": 32, - "column": 35, + "column": 34, "program": "class_instance_initializer.ets" } } @@ -1133,7 +1133,7 @@ }, "end": { "line": 32, - "column": 35, + "column": 34, "program": "class_instance_initializer.ets" } } @@ -1147,7 +1147,7 @@ }, "end": { "line": 32, - "column": 35, + "column": 34, "program": "class_instance_initializer.ets" } } @@ -1160,7 +1160,7 @@ }, "end": { "line": 32, - "column": 35, + "column": 34, "program": "class_instance_initializer.ets" } } @@ -1699,7 +1699,7 @@ }, "end": { "line": 41, - "column": 21, + "column": 18, "program": "class_instance_initializer.ets" } } @@ -1712,7 +1712,7 @@ }, "end": { "line": 41, - "column": 21, + "column": 18, "program": "class_instance_initializer.ets" } } @@ -2815,7 +2815,7 @@ }, "end": { "line": 57, - "column": 35, + "column": 34, "program": "class_instance_initializer.ets" } } @@ -2828,7 +2828,7 @@ }, "end": { "line": 57, - "column": 35, + "column": 34, "program": "class_instance_initializer.ets" } } @@ -2842,7 +2842,7 @@ }, "end": { "line": 57, - "column": 35, + "column": 34, "program": "class_instance_initializer.ets" } } @@ -2855,7 +2855,7 @@ }, "end": { "line": 57, - "column": 35, + "column": 34, "program": "class_instance_initializer.ets" } } diff --git a/ets2panda/test/parser/ets/class_interface_enum_only_top_level_4-expected.txt b/ets2panda/test/parser/ets/class_interface_enum_only_top_level_4-expected.txt index dc39673caba..50e613f8319 100644 --- a/ets2panda/test/parser/ets/class_interface_enum_only_top_level_4-expected.txt +++ b/ets2panda/test/parser/ets/class_interface_enum_only_top_level_4-expected.txt @@ -394,8 +394,8 @@ "program": "class_interface_enum_only_top_level_4.ets" }, "end": { - "line": 21, - "column": 2, + "line": 20, + "column": 4, "program": "class_interface_enum_only_top_level_4.ets" } } diff --git a/ets2panda/test/parser/ets/classes-expected.txt b/ets2panda/test/parser/ets/classes-expected.txt index 264010ea537..758108e2834 100644 --- a/ets2panda/test/parser/ets/classes-expected.txt +++ b/ets2panda/test/parser/ets/classes-expected.txt @@ -515,7 +515,7 @@ }, "end": { "line": 25, - "column": 22, + "column": 20, "program": "classes.ets" } } @@ -528,7 +528,7 @@ }, "end": { "line": 25, - "column": 22, + "column": 20, "program": "classes.ets" } } diff --git a/ets2panda/test/parser/ets/conditionalExpressionType-expected.txt b/ets2panda/test/parser/ets/conditionalExpressionType-expected.txt index ea9efc57536..a571badc913 100644 --- a/ets2panda/test/parser/ets/conditionalExpressionType-expected.txt +++ b/ets2panda/test/parser/ets/conditionalExpressionType-expected.txt @@ -529,7 +529,7 @@ }, "end": { "line": 23, - "column": 20, + "column": 18, "program": "conditionalExpressionType.ets" } } @@ -542,7 +542,7 @@ }, "end": { "line": 23, - "column": 20, + "column": 18, "program": "conditionalExpressionType.ets" } } @@ -856,7 +856,7 @@ }, "end": { "line": 29, - "column": 19, + "column": 17, "program": "conditionalExpressionType.ets" } } @@ -869,7 +869,7 @@ }, "end": { "line": 29, - "column": 19, + "column": 17, "program": "conditionalExpressionType.ets" } } @@ -1453,7 +1453,7 @@ }, "end": { "line": 40, - "column": 19, + "column": 17, "program": "conditionalExpressionType.ets" } } @@ -1466,7 +1466,7 @@ }, "end": { "line": 40, - "column": 19, + "column": 17, "program": "conditionalExpressionType.ets" } } @@ -1714,7 +1714,7 @@ }, "end": { "line": 44, - "column": 18, + "column": 16, "program": "conditionalExpressionType.ets" } } @@ -1727,7 +1727,7 @@ }, "end": { "line": 44, - "column": 18, + "column": 16, "program": "conditionalExpressionType.ets" } } @@ -2421,7 +2421,7 @@ }, "end": { "line": 54, - "column": 20, + "column": 18, "program": "conditionalExpressionType.ets" } } @@ -2434,7 +2434,7 @@ }, "end": { "line": 54, - "column": 20, + "column": 18, "program": "conditionalExpressionType.ets" } } diff --git a/ets2panda/test/parser/ets/const-expected.txt b/ets2panda/test/parser/ets/const-expected.txt index 5e04fa18415..428f2f93a3c 100644 --- a/ets2panda/test/parser/ets/const-expected.txt +++ b/ets2panda/test/parser/ets/const-expected.txt @@ -362,7 +362,7 @@ }, "end": { "line": 17, - "column": 18, + "column": 16, "program": "const.ets" } } @@ -375,7 +375,7 @@ }, "end": { "line": 17, - "column": 18, + "column": 16, "program": "const.ets" } } diff --git a/ets2panda/test/parser/ets/constructor_super_call1-expected.txt b/ets2panda/test/parser/ets/constructor_super_call1-expected.txt index a3b865478ec..abfe45f7f1a 100644 --- a/ets2panda/test/parser/ets/constructor_super_call1-expected.txt +++ b/ets2panda/test/parser/ets/constructor_super_call1-expected.txt @@ -254,7 +254,7 @@ }, "end": { "line": 20, - "column": 20, + "column": 18, "program": "constructor_super_call1.ets" } } @@ -267,7 +267,7 @@ }, "end": { "line": 20, - "column": 20, + "column": 18, "program": "constructor_super_call1.ets" } } diff --git a/ets2panda/test/parser/ets/constructor_super_call3-expected.txt b/ets2panda/test/parser/ets/constructor_super_call3-expected.txt index e3d4a31ae3f..a23e1dd68c6 100644 --- a/ets2panda/test/parser/ets/constructor_super_call3-expected.txt +++ b/ets2panda/test/parser/ets/constructor_super_call3-expected.txt @@ -206,7 +206,7 @@ }, "end": { "line": 20, - "column": 20, + "column": 18, "program": "constructor_super_call3.ets" } } @@ -219,7 +219,7 @@ }, "end": { "line": 20, - "column": 20, + "column": 18, "program": "constructor_super_call3.ets" } } diff --git a/ets2panda/test/parser/ets/constructor_test-expected.txt b/ets2panda/test/parser/ets/constructor_test-expected.txt index 3350e9aab78..c8015c848eb 100644 --- a/ets2panda/test/parser/ets/constructor_test-expected.txt +++ b/ets2panda/test/parser/ets/constructor_test-expected.txt @@ -674,7 +674,7 @@ }, "end": { "line": 29, - "column": 42, + "column": 39, "program": "constructor_test.ets" } } @@ -687,7 +687,7 @@ }, "end": { "line": 29, - "column": 42, + "column": 39, "program": "constructor_test.ets" } } 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 cf14e29753e..862a6c244bd 100644 --- a/ets2panda/test/parser/ets/declare_ambient_const_variable-expected.txt +++ b/ets2panda/test/parser/ets/declare_ambient_const_variable-expected.txt @@ -184,7 +184,7 @@ }, "end": { "line": 16, - "column": 26, + "column": 25, "program": "declare_ambient_const_variable.ets" } } @@ -197,7 +197,7 @@ }, "end": { "line": 16, - "column": 26, + "column": 25, "program": "declare_ambient_const_variable.ets" } } diff --git a/ets2panda/test/parser/ets/declare_class-expected.txt b/ets2panda/test/parser/ets/declare_class-expected.txt index 0021db53e22..3d702f66a61 100644 --- a/ets2panda/test/parser/ets/declare_class-expected.txt +++ b/ets2panda/test/parser/ets/declare_class-expected.txt @@ -77,8 +77,8 @@ "program": "declare_class.ets" }, "end": { - "line": 18, - "column": 11, + "line": 17, + "column": 15, "program": "declare_class.ets" } } @@ -90,8 +90,8 @@ "program": "declare_class.ets" }, "end": { - "line": 18, - "column": 11, + "line": 17, + "column": 15, "program": "declare_class.ets" } } @@ -105,8 +105,8 @@ "program": "declare_class.ets" }, "end": { - "line": 18, - "column": 11, + "line": 17, + "column": 15, "program": "declare_class.ets" } } @@ -249,7 +249,7 @@ }, "end": { "line": 19, - "column": 19, + "column": 18, "program": "declare_class.ets" } } @@ -262,7 +262,7 @@ }, "end": { "line": 19, - "column": 19, + "column": 18, "program": "declare_class.ets" } } @@ -276,7 +276,7 @@ }, "end": { "line": 19, - "column": 19, + "column": 18, "program": "declare_class.ets" } } @@ -289,7 +289,7 @@ }, "end": { "line": 19, - "column": 19, + "column": 18, "program": "declare_class.ets" } } diff --git a/ets2panda/test/parser/ets/declare_func-expected.txt b/ets2panda/test/parser/ets/declare_func-expected.txt index 90ec31f3de3..383ca52e3ad 100644 --- a/ets2panda/test/parser/ets/declare_func-expected.txt +++ b/ets2panda/test/parser/ets/declare_func-expected.txt @@ -107,7 +107,7 @@ }, "end": { "line": 16, - "column": 32, + "column": 31, "program": "declare_func.ets" } } @@ -120,7 +120,7 @@ }, "end": { "line": 16, - "column": 32, + "column": 31, "program": "declare_func.ets" } } @@ -134,7 +134,7 @@ }, "end": { "line": 16, - "column": 32, + "column": 31, "program": "declare_func.ets" } } @@ -147,7 +147,7 @@ }, "end": { "line": 16, - "column": 32, + "column": 31, "program": "declare_func.ets" } } diff --git a/ets2panda/test/parser/ets/declare_iface-expected.txt b/ets2panda/test/parser/ets/declare_iface-expected.txt index 72a55240a8a..295b7a14441 100644 --- a/ets2panda/test/parser/ets/declare_iface-expected.txt +++ b/ets2panda/test/parser/ets/declare_iface-expected.txt @@ -84,7 +84,7 @@ }, "end": { "line": 17, - "column": 16, + "column": 15, "program": "declare_iface.ets" } } @@ -97,7 +97,7 @@ }, "end": { "line": 17, - "column": 16, + "column": 15, "program": "declare_iface.ets" } } @@ -110,7 +110,7 @@ }, "end": { "line": 17, - "column": 16, + "column": 15, "program": "declare_iface.ets" } } @@ -123,7 +123,7 @@ }, "end": { "line": 17, - "column": 16, + "column": 15, "program": "declare_iface.ets" } } @@ -212,7 +212,7 @@ }, "end": { "line": 17, - "column": 16, + "column": 15, "program": "declare_iface.ets" } } @@ -225,7 +225,7 @@ }, "end": { "line": 17, - "column": 16, + "column": 15, "program": "declare_iface.ets" } } @@ -266,7 +266,7 @@ }, "end": { "line": 17, - "column": 16, + "column": 15, "program": "declare_iface.ets" } } @@ -279,7 +279,7 @@ }, "end": { "line": 17, - "column": 16, + "column": 15, "program": "declare_iface.ets" } } @@ -294,7 +294,7 @@ }, "end": { "line": 17, - "column": 16, + "column": 15, "program": "declare_iface.ets" } } @@ -309,7 +309,7 @@ }, "end": { "line": 17, - "column": 16, + "column": 15, "program": "declare_iface.ets" } } @@ -397,7 +397,7 @@ }, "end": { "line": 18, - "column": 19, + "column": 18, "program": "declare_iface.ets" } } @@ -410,7 +410,7 @@ }, "end": { "line": 18, - "column": 19, + "column": 18, "program": "declare_iface.ets" } } @@ -424,7 +424,7 @@ }, "end": { "line": 18, - "column": 19, + "column": 18, "program": "declare_iface.ets" } } @@ -437,7 +437,7 @@ }, "end": { "line": 18, - "column": 19, + "column": 18, "program": "declare_iface.ets" } } @@ -693,8 +693,8 @@ "program": "declare_iface.ets" }, "end": { - "line": 21, - "column": 1, + "line": 20, + "column": 2, "program": "declare_iface.ets" } } diff --git a/ets2panda/test/parser/ets/default_parameter10-expected.txt b/ets2panda/test/parser/ets/default_parameter10-expected.txt index 26d1df2fb9e..f976642e7a2 100644 --- a/ets2panda/test/parser/ets/default_parameter10-expected.txt +++ b/ets2panda/test/parser/ets/default_parameter10-expected.txt @@ -107,7 +107,7 @@ }, "end": { "line": 17, - "column": 18, + "column": 17, "program": "default_parameter10.ets" } } @@ -120,7 +120,7 @@ }, "end": { "line": 17, - "column": 18, + "column": 17, "program": "default_parameter10.ets" } } @@ -134,7 +134,7 @@ }, "end": { "line": 17, - "column": 18, + "column": 17, "program": "default_parameter10.ets" } } @@ -147,7 +147,7 @@ }, "end": { "line": 17, - "column": 18, + "column": 17, "program": "default_parameter10.ets" } } diff --git a/ets2panda/test/parser/ets/default_parameter7-expected.txt b/ets2panda/test/parser/ets/default_parameter7-expected.txt index 36fee450877..778da1a32d2 100644 --- a/ets2panda/test/parser/ets/default_parameter7-expected.txt +++ b/ets2panda/test/parser/ets/default_parameter7-expected.txt @@ -472,8 +472,8 @@ "program": "default_parameter7.ets" }, "end": { - "line": 17, - "column": 2, + "line": 16, + "column": 33, "program": "default_parameter7.ets" } } @@ -485,8 +485,8 @@ "program": "default_parameter7.ets" }, "end": { - "line": 17, - "column": 2, + "line": 16, + "column": 33, "program": "default_parameter7.ets" } } @@ -649,7 +649,7 @@ }, "end": { "line": 21, - "column": 22, + "column": 21, "program": "default_parameter7.ets" } } @@ -662,7 +662,7 @@ }, "end": { "line": 21, - "column": 22, + "column": 21, "program": "default_parameter7.ets" } } @@ -676,7 +676,7 @@ }, "end": { "line": 21, - "column": 22, + "column": 21, "program": "default_parameter7.ets" } } @@ -689,7 +689,7 @@ }, "end": { "line": 21, - "column": 22, + "column": 21, "program": "default_parameter7.ets" } } @@ -728,7 +728,7 @@ }, "end": { "line": 21, - "column": 35, + "column": 34, "program": "default_parameter7.ets" } } @@ -741,7 +741,7 @@ }, "end": { "line": 21, - "column": 35, + "column": 34, "program": "default_parameter7.ets" } } @@ -755,7 +755,7 @@ }, "end": { "line": 21, - "column": 35, + "column": 34, "program": "default_parameter7.ets" } } @@ -768,7 +768,7 @@ }, "end": { "line": 21, - "column": 35, + "column": 34, "program": "default_parameter7.ets" } } @@ -807,7 +807,7 @@ }, "end": { "line": 21, - "column": 45, + "column": 43, "program": "default_parameter7.ets" } } @@ -820,7 +820,7 @@ }, "end": { "line": 21, - "column": 45, + "column": 43, "program": "default_parameter7.ets" } } @@ -881,8 +881,8 @@ "program": "default_parameter7.ets" }, "end": { - "line": 22, - "column": 2, + "line": 21, + "column": 55, "program": "default_parameter7.ets" } } @@ -894,8 +894,8 @@ "program": "default_parameter7.ets" }, "end": { - "line": 22, - "column": 2, + "line": 21, + "column": 55, "program": "default_parameter7.ets" } } @@ -940,7 +940,7 @@ }, "end": { "line": 21, - "column": 45, + "column": 43, "program": "default_parameter7.ets" } } @@ -953,7 +953,7 @@ }, "end": { "line": 21, - "column": 45, + "column": 43, "program": "default_parameter7.ets" } } @@ -967,7 +967,7 @@ }, "end": { "line": 21, - "column": 45, + "column": 43, "program": "default_parameter7.ets" } } @@ -1087,7 +1087,7 @@ }, "end": { "line": 21, - "column": 45, + "column": 43, "program": "default_parameter7.ets" } } @@ -1100,7 +1100,7 @@ }, "end": { "line": 21, - "column": 45, + "column": 43, "program": "default_parameter7.ets" } } diff --git a/ets2panda/test/parser/ets/default_parameter9-expected.txt b/ets2panda/test/parser/ets/default_parameter9-expected.txt index bdfd77d5879..efabf1fb01f 100644 --- a/ets2panda/test/parser/ets/default_parameter9-expected.txt +++ b/ets2panda/test/parser/ets/default_parameter9-expected.txt @@ -462,7 +462,7 @@ }, "end": { "line": 16, - "column": 55, + "column": 54, "program": "default_parameter9.ets" } } @@ -475,7 +475,7 @@ }, "end": { "line": 16, - "column": 55, + "column": 54, "program": "default_parameter9.ets" } } @@ -489,7 +489,7 @@ }, "end": { "line": 16, - "column": 55, + "column": 54, "program": "default_parameter9.ets" } } @@ -502,7 +502,7 @@ }, "end": { "line": 16, - "column": 55, + "column": 54, "program": "default_parameter9.ets" } } 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 e4aaaa7a48e..8a540dbb766 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 @@ -213,7 +213,7 @@ }, "end": { "line": 16, - "column": 24, + "column": 23, "program": "default_parameter_implicitly_typed_return_void.ets" } } @@ -226,7 +226,7 @@ }, "end": { "line": 16, - "column": 24, + "column": 23, "program": "default_parameter_implicitly_typed_return_void.ets" } } @@ -240,7 +240,7 @@ }, "end": { "line": 16, - "column": 24, + "column": 23, "program": "default_parameter_implicitly_typed_return_void.ets" } } @@ -253,7 +253,7 @@ }, "end": { "line": 16, - "column": 24, + "column": 23, "program": "default_parameter_implicitly_typed_return_void.ets" } } @@ -292,7 +292,7 @@ }, "end": { "line": 16, - "column": 37, + "column": 35, "program": "default_parameter_implicitly_typed_return_void.ets" } } @@ -305,7 +305,7 @@ }, "end": { "line": 16, - "column": 37, + "column": 35, "program": "default_parameter_implicitly_typed_return_void.ets" } } @@ -371,7 +371,7 @@ }, "end": { "line": 16, - "column": 60, + "column": 58, "program": "default_parameter_implicitly_typed_return_void.ets" } } @@ -384,7 +384,7 @@ }, "end": { "line": 16, - "column": 60, + "column": 58, "program": "default_parameter_implicitly_typed_return_void.ets" } } @@ -457,7 +457,7 @@ }, "end": { "line": 16, - "column": 37, + "column": 35, "program": "default_parameter_implicitly_typed_return_void.ets" } } @@ -470,7 +470,7 @@ }, "end": { "line": 16, - "column": 37, + "column": 35, "program": "default_parameter_implicitly_typed_return_void.ets" } } @@ -484,7 +484,7 @@ }, "end": { "line": 16, - "column": 37, + "column": 35, "program": "default_parameter_implicitly_typed_return_void.ets" } } @@ -604,7 +604,7 @@ }, "end": { "line": 16, - "column": 37, + "column": 35, "program": "default_parameter_implicitly_typed_return_void.ets" } } @@ -617,7 +617,7 @@ }, "end": { "line": 16, - "column": 37, + "column": 35, "program": "default_parameter_implicitly_typed_return_void.ets" } } @@ -713,7 +713,7 @@ }, "end": { "line": 16, - "column": 60, + "column": 58, "program": "default_parameter_implicitly_typed_return_void.ets" } } @@ -726,7 +726,7 @@ }, "end": { "line": 16, - "column": 60, + "column": 58, "program": "default_parameter_implicitly_typed_return_void.ets" } } @@ -740,7 +740,7 @@ }, "end": { "line": 16, - "column": 60, + "column": 58, "program": "default_parameter_implicitly_typed_return_void.ets" } } @@ -860,7 +860,7 @@ }, "end": { "line": 16, - "column": 60, + "column": 58, "program": "default_parameter_implicitly_typed_return_void.ets" } } @@ -873,7 +873,7 @@ }, "end": { "line": 16, - "column": 60, + "column": 58, "program": "default_parameter_implicitly_typed_return_void.ets" } } 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 094e6f07e06..f8bfa08e5ed 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 @@ -483,7 +483,7 @@ }, "end": { "line": 21, - "column": 24, + "column": 23, "program": "dynamic_optional_decl.ets" } } @@ -496,7 +496,7 @@ }, "end": { "line": 21, - "column": 24, + "column": 23, "program": "dynamic_optional_decl.ets" } } @@ -580,7 +580,7 @@ }, "end": { "line": 21, - "column": 42, + "column": 41, "program": "dynamic_optional_decl.ets" } } @@ -593,7 +593,7 @@ }, "end": { "line": 21, - "column": 42, + "column": 41, "program": "dynamic_optional_decl.ets" } } @@ -705,7 +705,7 @@ }, "end": { "line": 22, - "column": 12, + "column": 11, "program": "dynamic_optional_decl.ets" } } @@ -718,7 +718,7 @@ }, "end": { "line": 22, - "column": 12, + "column": 11, "program": "dynamic_optional_decl.ets" } } @@ -867,7 +867,7 @@ }, "end": { "line": 23, - "column": 12, + "column": 11, "program": "dynamic_optional_decl.ets" } } @@ -880,7 +880,7 @@ }, "end": { "line": 23, - "column": 12, + "column": 11, "program": "dynamic_optional_decl.ets" } } diff --git a/ets2panda/test/parser/ets/dynamic_import_tests/modules/module-expected.txt b/ets2panda/test/parser/ets/dynamic_import_tests/modules/module-expected.txt index 70567ffdead..8e6226d91a7 100644 --- a/ets2panda/test/parser/ets/dynamic_import_tests/modules/module-expected.txt +++ b/ets2panda/test/parser/ets/dynamic_import_tests/modules/module-expected.txt @@ -78,7 +78,7 @@ }, "end": { "line": 19, - "column": 16, + "column": 15, "program": "module.ets" } } @@ -91,7 +91,7 @@ }, "end": { "line": 19, - "column": 16, + "column": 15, "program": "module.ets" } } @@ -106,7 +106,7 @@ }, "end": { "line": 19, - "column": 16, + "column": 15, "program": "module.ets" } } @@ -373,7 +373,7 @@ }, "end": { "line": 23, - "column": 40, + "column": 39, "program": "module.ets" } } @@ -386,7 +386,7 @@ }, "end": { "line": 23, - "column": 40, + "column": 39, "program": "module.ets" } } @@ -400,7 +400,7 @@ }, "end": { "line": 23, - "column": 40, + "column": 39, "program": "module.ets" } } @@ -413,7 +413,7 @@ }, "end": { "line": 23, - "column": 40, + "column": 39, "program": "module.ets" } } @@ -602,7 +602,7 @@ }, "end": { "line": 25, - "column": 28, + "column": 27, "program": "module.ets" } } @@ -615,7 +615,7 @@ }, "end": { "line": 25, - "column": 28, + "column": 27, "program": "module.ets" } } @@ -894,7 +894,7 @@ }, "end": { "line": 27, - "column": 38, + "column": 37, "program": "module.ets" } } @@ -907,7 +907,7 @@ }, "end": { "line": 27, - "column": 38, + "column": 37, "program": "module.ets" } } @@ -1215,8 +1215,8 @@ "program": "module.ets" }, "end": { - "line": 31, - "column": 7, + "line": 30, + "column": 13, "program": "module.ets" } } @@ -1228,8 +1228,8 @@ "program": "module.ets" }, "end": { - "line": 31, - "column": 7, + "line": 30, + "column": 13, "program": "module.ets" } } @@ -1241,8 +1241,8 @@ "program": "module.ets" }, "end": { - "line": 31, - "column": 7, + "line": 30, + "column": 13, "program": "module.ets" } } @@ -1254,8 +1254,8 @@ "program": "module.ets" }, "end": { - "line": 31, - "column": 7, + "line": 30, + "column": 13, "program": "module.ets" } } @@ -1343,8 +1343,8 @@ "program": "module.ets" }, "end": { - "line": 31, - "column": 7, + "line": 30, + "column": 13, "program": "module.ets" } } @@ -1356,8 +1356,8 @@ "program": "module.ets" }, "end": { - "line": 31, - "column": 7, + "line": 30, + "column": 13, "program": "module.ets" } } @@ -1397,8 +1397,8 @@ "program": "module.ets" }, "end": { - "line": 31, - "column": 7, + "line": 30, + "column": 13, "program": "module.ets" } } @@ -1410,8 +1410,8 @@ "program": "module.ets" }, "end": { - "line": 31, - "column": 7, + "line": 30, + "column": 13, "program": "module.ets" } } @@ -1425,8 +1425,8 @@ "program": "module.ets" }, "end": { - "line": 31, - "column": 7, + "line": 30, + "column": 13, "program": "module.ets" } } @@ -1440,8 +1440,8 @@ "program": "module.ets" }, "end": { - "line": 31, - "column": 7, + "line": 30, + "column": 13, "program": "module.ets" } } @@ -1529,7 +1529,7 @@ }, "end": { "line": 31, - "column": 18, + "column": 17, "program": "module.ets" } } @@ -1542,7 +1542,7 @@ }, "end": { "line": 31, - "column": 18, + "column": 17, "program": "module.ets" } } @@ -1556,7 +1556,7 @@ }, "end": { "line": 31, - "column": 18, + "column": 17, "program": "module.ets" } } @@ -1569,7 +1569,7 @@ }, "end": { "line": 31, - "column": 18, + "column": 17, "program": "module.ets" } } @@ -1758,7 +1758,7 @@ }, "end": { "line": 32, - "column": 27, + "column": 26, "program": "module.ets" } } @@ -1771,7 +1771,7 @@ }, "end": { "line": 32, - "column": 27, + "column": 26, "program": "module.ets" } } @@ -1785,7 +1785,7 @@ }, "end": { "line": 32, - "column": 27, + "column": 26, "program": "module.ets" } } @@ -1798,7 +1798,7 @@ }, "end": { "line": 32, - "column": 27, + "column": 26, "program": "module.ets" } } @@ -1857,8 +1857,8 @@ "program": "module.ets" }, "end": { - "line": 35, - "column": 7, + "line": 33, + "column": 2, "program": "module.ets" } } @@ -2200,8 +2200,8 @@ "program": "module.ets" }, "end": { - "line": 41, - "column": 2, + "line": 40, + "column": 13, "program": "module.ets" } } @@ -2213,8 +2213,8 @@ "program": "module.ets" }, "end": { - "line": 41, - "column": 2, + "line": 40, + "column": 13, "program": "module.ets" } } @@ -2228,8 +2228,8 @@ "program": "module.ets" }, "end": { - "line": 41, - "column": 2, + "line": 40, + "column": 13, "program": "module.ets" } } @@ -2438,7 +2438,7 @@ }, "end": { "line": 43, - "column": 44, + "column": 43, "program": "module.ets" } } @@ -2451,7 +2451,7 @@ }, "end": { "line": 43, - "column": 44, + "column": 43, "program": "module.ets" } } @@ -2615,7 +2615,7 @@ }, "end": { "line": 16, - "column": 34, + "column": 33, "program": "module.ets" } } @@ -2628,7 +2628,7 @@ }, "end": { "line": 16, - "column": 34, + "column": 33, "program": "module.ets" } } @@ -2642,7 +2642,7 @@ }, "end": { "line": 16, - "column": 34, + "column": 33, "program": "module.ets" } } @@ -2655,7 +2655,7 @@ }, "end": { "line": 16, - "column": 34, + "column": 33, "program": "module.ets" } } @@ -2801,7 +2801,7 @@ }, "end": { "line": 17, - "column": 44, + "column": 43, "program": "module.ets" } } @@ -2814,7 +2814,7 @@ }, "end": { "line": 17, - "column": 44, + "column": 43, "program": "module.ets" } } @@ -2828,7 +2828,7 @@ }, "end": { "line": 17, - "column": 44, + "column": 43, "program": "module.ets" } } @@ -2841,7 +2841,7 @@ }, "end": { "line": 17, - "column": 44, + "column": 43, "program": "module.ets" } } diff --git a/ets2panda/test/parser/ets/exports-expected.txt b/ets2panda/test/parser/ets/exports-expected.txt index 115ec532d38..970424f5c0d 100644 --- a/ets2panda/test/parser/ets/exports-expected.txt +++ b/ets2panda/test/parser/ets/exports-expected.txt @@ -44,8 +44,8 @@ "program": "exports.ets" }, "end": { - "line": 22, - "column": 7, + "line": 21, + "column": 22, "program": "exports.ets" } } 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 6062aa7e883..d3d8c633b84 100644 --- a/ets2panda/test/parser/ets/external_cyclic_constructor_check-expected.txt +++ b/ets2panda/test/parser/ets/external_cyclic_constructor_check-expected.txt @@ -250,7 +250,7 @@ }, "end": { "line": 17, - "column": 29, + "column": 28, "program": "external_cyclic_constructor_check.ets" } } @@ -263,7 +263,7 @@ }, "end": { "line": 17, - "column": 29, + "column": 28, "program": "external_cyclic_constructor_check.ets" } } diff --git a/ets2panda/test/parser/ets/for_of-expected.txt b/ets2panda/test/parser/ets/for_of-expected.txt index 4b94ee693ee..14d19e60513 100644 --- a/ets2panda/test/parser/ets/for_of-expected.txt +++ b/ets2panda/test/parser/ets/for_of-expected.txt @@ -1009,7 +1009,7 @@ }, "end": { "line": 28, - "column": 28, + "column": 26, "program": "for_of.ets" } } @@ -1022,7 +1022,7 @@ }, "end": { "line": 28, - "column": 28, + "column": 26, "program": "for_of.ets" } } diff --git a/ets2panda/test/parser/ets/forofUnboxing-expected.txt b/ets2panda/test/parser/ets/forofUnboxing-expected.txt index cdbdae00b3d..a03e16acba5 100644 --- a/ets2panda/test/parser/ets/forofUnboxing-expected.txt +++ b/ets2panda/test/parser/ets/forofUnboxing-expected.txt @@ -430,7 +430,7 @@ }, "end": { "line": 18, - "column": 33, + "column": 32, "program": "forofUnboxing.ets" } } @@ -443,7 +443,7 @@ }, "end": { "line": 18, - "column": 33, + "column": 32, "program": "forofUnboxing.ets" } } @@ -540,7 +540,7 @@ }, "end": { "line": 18, - "column": 55, + "column": 54, "program": "forofUnboxing.ets" } } @@ -553,7 +553,7 @@ }, "end": { "line": 18, - "column": 55, + "column": 54, "program": "forofUnboxing.ets" } } @@ -650,7 +650,7 @@ }, "end": { "line": 18, - "column": 77, + "column": 76, "program": "forofUnboxing.ets" } } @@ -663,7 +663,7 @@ }, "end": { "line": 18, - "column": 77, + "column": 76, "program": "forofUnboxing.ets" } } diff --git a/ets2panda/test/parser/ets/funcParamWithOptionalParam-expected.txt b/ets2panda/test/parser/ets/funcParamWithOptionalParam-expected.txt index bebea4af249..ae3287ad263 100644 --- a/ets2panda/test/parser/ets/funcParamWithOptionalParam-expected.txt +++ b/ets2panda/test/parser/ets/funcParamWithOptionalParam-expected.txt @@ -262,8 +262,8 @@ "program": "funcParamWithOptionalParam.ets" }, "end": { - "line": 19, - "column": 1, + "line": 18, + "column": 2, "program": "funcParamWithOptionalParam.ets" } } diff --git a/ets2panda/test/parser/ets/function-expected.txt b/ets2panda/test/parser/ets/function-expected.txt index 47f01ee73d0..2b90f731ca2 100644 --- a/ets2panda/test/parser/ets/function-expected.txt +++ b/ets2panda/test/parser/ets/function-expected.txt @@ -290,7 +290,7 @@ }, "end": { "line": 34, - "column": 54, + "column": 51, "program": "function.ets" } } @@ -303,7 +303,7 @@ }, "end": { "line": 34, - "column": 54, + "column": 51, "program": "function.ets" } } @@ -546,7 +546,7 @@ }, "end": { "line": 17, - "column": 28, + "column": 27, "program": "function.ets" } } @@ -559,7 +559,7 @@ }, "end": { "line": 17, - "column": 28, + "column": 27, "program": "function.ets" } } @@ -573,7 +573,7 @@ }, "end": { "line": 17, - "column": 28, + "column": 27, "program": "function.ets" } } @@ -586,7 +586,7 @@ }, "end": { "line": 17, - "column": 28, + "column": 27, "program": "function.ets" } } @@ -621,7 +621,7 @@ }, "end": { "line": 17, - "column": 38, + "column": 36, "program": "function.ets" } } @@ -634,7 +634,7 @@ }, "end": { "line": 17, - "column": 38, + "column": 36, "program": "function.ets" } } @@ -797,7 +797,7 @@ }, "end": { "line": 21, - "column": 28, + "column": 27, "program": "function.ets" } } @@ -810,7 +810,7 @@ }, "end": { "line": 21, - "column": 28, + "column": 27, "program": "function.ets" } } @@ -824,7 +824,7 @@ }, "end": { "line": 21, - "column": 28, + "column": 27, "program": "function.ets" } } @@ -837,7 +837,7 @@ }, "end": { "line": 21, - "column": 28, + "column": 27, "program": "function.ets" } } @@ -876,7 +876,7 @@ }, "end": { "line": 21, - "column": 43, + "column": 42, "program": "function.ets" } } @@ -889,7 +889,7 @@ }, "end": { "line": 21, - "column": 43, + "column": 42, "program": "function.ets" } } @@ -903,7 +903,7 @@ }, "end": { "line": 21, - "column": 43, + "column": 42, "program": "function.ets" } } @@ -916,7 +916,7 @@ }, "end": { "line": 21, - "column": 43, + "column": 42, "program": "function.ets" } } @@ -1109,7 +1109,7 @@ }, "end": { "line": 25, - "column": 27, + "column": 26, "program": "function.ets" } } @@ -1122,7 +1122,7 @@ }, "end": { "line": 25, - "column": 27, + "column": 26, "program": "function.ets" } } @@ -1136,7 +1136,7 @@ }, "end": { "line": 25, - "column": 27, + "column": 26, "program": "function.ets" } } @@ -1149,7 +1149,7 @@ }, "end": { "line": 25, - "column": 27, + "column": 26, "program": "function.ets" } } @@ -1342,7 +1342,7 @@ }, "end": { "line": 29, - "column": 33, + "column": 32, "program": "function.ets" } } @@ -1355,7 +1355,7 @@ }, "end": { "line": 29, - "column": 33, + "column": 32, "program": "function.ets" } } @@ -1369,7 +1369,7 @@ }, "end": { "line": 29, - "column": 33, + "column": 32, "program": "function.ets" } } @@ -1382,7 +1382,7 @@ }, "end": { "line": 29, - "column": 33, + "column": 32, "program": "function.ets" } } @@ -1421,7 +1421,7 @@ }, "end": { "line": 29, - "column": 48, + "column": 47, "program": "function.ets" } } @@ -1434,7 +1434,7 @@ }, "end": { "line": 29, - "column": 48, + "column": 47, "program": "function.ets" } } @@ -1448,7 +1448,7 @@ }, "end": { "line": 29, - "column": 48, + "column": 47, "program": "function.ets" } } @@ -1461,7 +1461,7 @@ }, "end": { "line": 29, - "column": 48, + "column": 47, "program": "function.ets" } } @@ -1496,7 +1496,7 @@ }, "end": { "line": 29, - "column": 58, + "column": 56, "program": "function.ets" } } @@ -1509,7 +1509,7 @@ }, "end": { "line": 29, - "column": 58, + "column": 56, "program": "function.ets" } } @@ -1550,7 +1550,7 @@ }, "end": { "line": 30, - "column": 21, + "column": 20, "program": "function.ets" } } @@ -1563,7 +1563,7 @@ }, "end": { "line": 30, - "column": 21, + "column": 20, "program": "function.ets" } } @@ -1770,7 +1770,7 @@ }, "end": { "line": 34, - "column": 34, + "column": 32, "program": "function.ets" } } @@ -1783,7 +1783,7 @@ }, "end": { "line": 34, - "column": 34, + "column": 32, "program": "function.ets" } } @@ -1796,7 +1796,7 @@ }, "end": { "line": 34, - "column": 34, + "column": 32, "program": "function.ets" } } 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 0962ccef9ce..3f4706de4a8 100644 --- a/ets2panda/test/parser/ets/function_implicit_return_type8-expected.txt +++ b/ets2panda/test/parser/ets/function_implicit_return_type8-expected.txt @@ -1099,7 +1099,7 @@ }, "end": { "line": 38, - "column": 27, + "column": 26, "program": "function_implicit_return_type8.ets" } } @@ -1112,7 +1112,7 @@ }, "end": { "line": 38, - "column": 27, + "column": 26, "program": "function_implicit_return_type8.ets" } } 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 66d7eac0586..e5393a8751c 100644 --- a/ets2panda/test/parser/ets/function_implicit_return_type9-expected.txt +++ b/ets2panda/test/parser/ets/function_implicit_return_type9-expected.txt @@ -102,7 +102,7 @@ }, "end": { "line": 18, - "column": 39, + "column": 37, "program": "function_implicit_return_type9.ets" } } @@ -115,7 +115,7 @@ }, "end": { "line": 18, - "column": 39, + "column": 37, "program": "function_implicit_return_type9.ets" } } @@ -977,8 +977,8 @@ "program": "function_implicit_return_type9.ets" }, "end": { - "line": 34, - "column": 2, + "line": 33, + "column": 13, "program": "function_implicit_return_type9.ets" } } @@ -990,8 +990,8 @@ "program": "function_implicit_return_type9.ets" }, "end": { - "line": 34, - "column": 2, + "line": 33, + "column": 13, "program": "function_implicit_return_type9.ets" } } @@ -1486,7 +1486,7 @@ }, "end": { "line": 42, - "column": 27, + "column": 26, "program": "function_implicit_return_type9.ets" } } @@ -1499,7 +1499,7 @@ }, "end": { "line": 42, - "column": 27, + "column": 26, "program": "function_implicit_return_type9.ets" } } diff --git a/ets2panda/test/parser/ets/genericDefaultParam_1-expected.txt b/ets2panda/test/parser/ets/genericDefaultParam_1-expected.txt index 96a72b4e642..022219faa31 100644 --- a/ets2panda/test/parser/ets/genericDefaultParam_1-expected.txt +++ b/ets2panda/test/parser/ets/genericDefaultParam_1-expected.txt @@ -243,7 +243,7 @@ }, "end": { "line": 25, - "column": 36, + "column": 35, "program": "genericDefaultParam_1.ets" } } @@ -256,7 +256,7 @@ }, "end": { "line": 25, - "column": 36, + "column": 35, "program": "genericDefaultParam_1.ets" } } @@ -295,8 +295,8 @@ "program": "genericDefaultParam_1.ets" }, "end": { - "line": 26, - "column": 6, + "line": 25, + "column": 40, "program": "genericDefaultParam_1.ets" } } @@ -372,7 +372,7 @@ }, "end": { "line": 26, - "column": 27, + "column": 26, "program": "genericDefaultParam_1.ets" } } @@ -385,7 +385,7 @@ }, "end": { "line": 26, - "column": 27, + "column": 26, "program": "genericDefaultParam_1.ets" } } @@ -601,7 +601,7 @@ }, "end": { "line": 27, - "column": 39, + "column": 28, "program": "genericDefaultParam_1.ets" } } @@ -614,7 +614,7 @@ }, "end": { "line": 27, - "column": 39, + "column": 28, "program": "genericDefaultParam_1.ets" } } @@ -651,7 +651,7 @@ }, "end": { "line": 27, - "column": 51, + "column": 49, "program": "genericDefaultParam_1.ets" } } @@ -664,7 +664,7 @@ }, "end": { "line": 27, - "column": 51, + "column": 49, "program": "genericDefaultParam_1.ets" } } @@ -889,7 +889,7 @@ }, "end": { "line": 28, - "column": 38, + "column": 37, "program": "genericDefaultParam_1.ets" } } @@ -902,7 +902,7 @@ }, "end": { "line": 28, - "column": 38, + "column": 37, "program": "genericDefaultParam_1.ets" } } @@ -929,7 +929,7 @@ }, "end": { "line": 28, - "column": 49, + "column": 38, "program": "genericDefaultParam_1.ets" } } @@ -942,7 +942,7 @@ }, "end": { "line": 28, - "column": 49, + "column": 38, "program": "genericDefaultParam_1.ets" } } @@ -1003,7 +1003,7 @@ }, "end": { "line": 28, - "column": 69, + "column": 68, "program": "genericDefaultParam_1.ets" } } @@ -1016,7 +1016,7 @@ }, "end": { "line": 28, - "column": 69, + "column": 68, "program": "genericDefaultParam_1.ets" } } @@ -1043,7 +1043,7 @@ }, "end": { "line": 28, - "column": 71, + "column": 69, "program": "genericDefaultParam_1.ets" } } @@ -1056,7 +1056,7 @@ }, "end": { "line": 28, - "column": 71, + "column": 69, "program": "genericDefaultParam_1.ets" } } @@ -1311,7 +1311,7 @@ }, "end": { "line": 30, - "column": 27, + "column": 26, "program": "genericDefaultParam_1.ets" } } @@ -1324,7 +1324,7 @@ }, "end": { "line": 30, - "column": 27, + "column": 26, "program": "genericDefaultParam_1.ets" } } @@ -1390,7 +1390,7 @@ }, "end": { "line": 30, - "column": 40, + "column": 39, "program": "genericDefaultParam_1.ets" } } @@ -1403,7 +1403,7 @@ }, "end": { "line": 30, - "column": 40, + "column": 39, "program": "genericDefaultParam_1.ets" } } @@ -1820,7 +1820,7 @@ }, "end": { "line": 20, - "column": 18, + "column": 17, "program": "genericDefaultParam_1.ets" } } @@ -1833,7 +1833,7 @@ }, "end": { "line": 20, - "column": 18, + "column": 17, "program": "genericDefaultParam_1.ets" } } @@ -1948,7 +1948,7 @@ }, "end": { "line": 21, - "column": 26, + "column": 25, "program": "genericDefaultParam_1.ets" } } @@ -1961,7 +1961,7 @@ }, "end": { "line": 21, - "column": 26, + "column": 25, "program": "genericDefaultParam_1.ets" } } @@ -2013,7 +2013,7 @@ }, "end": { "line": 21, - "column": 13, + "column": 12, "program": "genericDefaultParam_1.ets" } } @@ -2026,7 +2026,7 @@ }, "end": { "line": 21, - "column": 13, + "column": 12, "program": "genericDefaultParam_1.ets" } } @@ -2143,7 +2143,7 @@ }, "end": { "line": 22, - "column": 13, + "column": 12, "program": "genericDefaultParam_1.ets" } } @@ -2156,7 +2156,7 @@ }, "end": { "line": 22, - "column": 13, + "column": 12, "program": "genericDefaultParam_1.ets" } } @@ -2278,7 +2278,7 @@ }, "end": { "line": 31, - "column": 24, + "column": 23, "program": "genericDefaultParam_1.ets" } } @@ -2291,7 +2291,7 @@ }, "end": { "line": 31, - "column": 24, + "column": 23, "program": "genericDefaultParam_1.ets" } } @@ -2317,8 +2317,8 @@ "program": "genericDefaultParam_1.ets" }, "end": { - "line": 32, - "column": 4, + "line": 31, + "column": 24, "program": "genericDefaultParam_1.ets" } } @@ -2330,8 +2330,8 @@ "program": "genericDefaultParam_1.ets" }, "end": { - "line": 32, - "column": 4, + "line": 31, + "column": 24, "program": "genericDefaultParam_1.ets" } } @@ -2453,7 +2453,7 @@ }, "end": { "line": 32, - "column": 24, + "column": 23, "program": "genericDefaultParam_1.ets" } } @@ -2466,7 +2466,7 @@ }, "end": { "line": 32, - "column": 24, + "column": 23, "program": "genericDefaultParam_1.ets" } } @@ -2500,7 +2500,7 @@ }, "end": { "line": 32, - "column": 32, + "column": 31, "program": "genericDefaultParam_1.ets" } } @@ -2513,7 +2513,7 @@ }, "end": { "line": 32, - "column": 32, + "column": 31, "program": "genericDefaultParam_1.ets" } } @@ -2539,8 +2539,8 @@ "program": "genericDefaultParam_1.ets" }, "end": { - "line": 33, - "column": 4, + "line": 32, + "column": 32, "program": "genericDefaultParam_1.ets" } } @@ -2552,8 +2552,8 @@ "program": "genericDefaultParam_1.ets" }, "end": { - "line": 33, - "column": 4, + "line": 32, + "column": 32, "program": "genericDefaultParam_1.ets" } } @@ -2675,7 +2675,7 @@ }, "end": { "line": 33, - "column": 24, + "column": 23, "program": "genericDefaultParam_1.ets" } } @@ -2688,7 +2688,7 @@ }, "end": { "line": 33, - "column": 24, + "column": 23, "program": "genericDefaultParam_1.ets" } } @@ -2722,7 +2722,7 @@ }, "end": { "line": 33, - "column": 32, + "column": 31, "program": "genericDefaultParam_1.ets" } } @@ -2735,7 +2735,7 @@ }, "end": { "line": 33, - "column": 32, + "column": 31, "program": "genericDefaultParam_1.ets" } } @@ -2769,7 +2769,7 @@ }, "end": { "line": 33, - "column": 40, + "column": 39, "program": "genericDefaultParam_1.ets" } } @@ -2782,7 +2782,7 @@ }, "end": { "line": 33, - "column": 40, + "column": 39, "program": "genericDefaultParam_1.ets" } } @@ -2808,8 +2808,8 @@ "program": "genericDefaultParam_1.ets" }, "end": { - "line": 34, - "column": 1, + "line": 33, + "column": 40, "program": "genericDefaultParam_1.ets" } } @@ -2821,8 +2821,8 @@ "program": "genericDefaultParam_1.ets" }, "end": { - "line": 34, - "column": 1, + "line": 33, + "column": 40, "program": "genericDefaultParam_1.ets" } } @@ -3005,7 +3005,7 @@ }, "end": { "line": 16, - "column": 37, + "column": 36, "program": "genericDefaultParam_1.ets" } } @@ -3018,7 +3018,7 @@ }, "end": { "line": 16, - "column": 37, + "column": 36, "program": "genericDefaultParam_1.ets" } } @@ -3032,7 +3032,7 @@ }, "end": { "line": 16, - "column": 37, + "column": 36, "program": "genericDefaultParam_1.ets" } } @@ -3045,7 +3045,7 @@ }, "end": { "line": 16, - "column": 37, + "column": 36, "program": "genericDefaultParam_1.ets" } } @@ -3080,7 +3080,7 @@ }, "end": { "line": 16, - "column": 42, + "column": 40, "program": "genericDefaultParam_1.ets" } } @@ -3093,7 +3093,7 @@ }, "end": { "line": 16, - "column": 42, + "column": 40, "program": "genericDefaultParam_1.ets" } } @@ -3149,7 +3149,7 @@ }, "end": { "line": 16, - "column": 26, + "column": 25, "program": "genericDefaultParam_1.ets" } } @@ -3162,7 +3162,7 @@ }, "end": { "line": 16, - "column": 26, + "column": 25, "program": "genericDefaultParam_1.ets" } } @@ -3358,7 +3358,7 @@ }, "end": { "line": 31, - "column": 24, + "column": 23, "program": "genericDefaultParam_1.ets" } } @@ -3371,7 +3371,7 @@ }, "end": { "line": 31, - "column": 24, + "column": 23, "program": "genericDefaultParam_1.ets" } } @@ -3397,8 +3397,8 @@ "program": "genericDefaultParam_1.ets" }, "end": { - "line": 32, - "column": 4, + "line": 31, + "column": 24, "program": "genericDefaultParam_1.ets" } } @@ -3410,8 +3410,8 @@ "program": "genericDefaultParam_1.ets" }, "end": { - "line": 32, - "column": 4, + "line": 31, + "column": 24, "program": "genericDefaultParam_1.ets" } } @@ -3525,7 +3525,7 @@ }, "end": { "line": 32, - "column": 24, + "column": 23, "program": "genericDefaultParam_1.ets" } } @@ -3538,7 +3538,7 @@ }, "end": { "line": 32, - "column": 24, + "column": 23, "program": "genericDefaultParam_1.ets" } } @@ -3572,7 +3572,7 @@ }, "end": { "line": 32, - "column": 32, + "column": 31, "program": "genericDefaultParam_1.ets" } } @@ -3585,7 +3585,7 @@ }, "end": { "line": 32, - "column": 32, + "column": 31, "program": "genericDefaultParam_1.ets" } } @@ -3611,8 +3611,8 @@ "program": "genericDefaultParam_1.ets" }, "end": { - "line": 33, - "column": 4, + "line": 32, + "column": 32, "program": "genericDefaultParam_1.ets" } } @@ -3624,8 +3624,8 @@ "program": "genericDefaultParam_1.ets" }, "end": { - "line": 33, - "column": 4, + "line": 32, + "column": 32, "program": "genericDefaultParam_1.ets" } } @@ -3739,7 +3739,7 @@ }, "end": { "line": 33, - "column": 24, + "column": 23, "program": "genericDefaultParam_1.ets" } } @@ -3752,7 +3752,7 @@ }, "end": { "line": 33, - "column": 24, + "column": 23, "program": "genericDefaultParam_1.ets" } } @@ -3786,7 +3786,7 @@ }, "end": { "line": 33, - "column": 32, + "column": 31, "program": "genericDefaultParam_1.ets" } } @@ -3799,7 +3799,7 @@ }, "end": { "line": 33, - "column": 32, + "column": 31, "program": "genericDefaultParam_1.ets" } } @@ -3833,7 +3833,7 @@ }, "end": { "line": 33, - "column": 40, + "column": 39, "program": "genericDefaultParam_1.ets" } } @@ -3846,7 +3846,7 @@ }, "end": { "line": 33, - "column": 40, + "column": 39, "program": "genericDefaultParam_1.ets" } } @@ -3872,8 +3872,8 @@ "program": "genericDefaultParam_1.ets" }, "end": { - "line": 34, - "column": 1, + "line": 33, + "column": 40, "program": "genericDefaultParam_1.ets" } } @@ -3885,8 +3885,8 @@ "program": "genericDefaultParam_1.ets" }, "end": { - "line": 34, - "column": 1, + "line": 33, + "column": 40, "program": "genericDefaultParam_1.ets" } } diff --git a/ets2panda/test/parser/ets/genericDefaultParam_3-expected.txt b/ets2panda/test/parser/ets/genericDefaultParam_3-expected.txt index e5fc0bf4fc8..9fa6b86ddb2 100644 --- a/ets2panda/test/parser/ets/genericDefaultParam_3-expected.txt +++ b/ets2panda/test/parser/ets/genericDefaultParam_3-expected.txt @@ -386,7 +386,7 @@ }, "end": { "line": 16, - "column": 37, + "column": 36, "program": "genericDefaultParam_3.ets" } } @@ -399,7 +399,7 @@ }, "end": { "line": 16, - "column": 37, + "column": 36, "program": "genericDefaultParam_3.ets" } } @@ -413,7 +413,7 @@ }, "end": { "line": 16, - "column": 37, + "column": 36, "program": "genericDefaultParam_3.ets" } } @@ -426,7 +426,7 @@ }, "end": { "line": 16, - "column": 37, + "column": 36, "program": "genericDefaultParam_3.ets" } } @@ -461,7 +461,7 @@ }, "end": { "line": 16, - "column": 42, + "column": 40, "program": "genericDefaultParam_3.ets" } } @@ -474,7 +474,7 @@ }, "end": { "line": 16, - "column": 42, + "column": 40, "program": "genericDefaultParam_3.ets" } } @@ -530,7 +530,7 @@ }, "end": { "line": 16, - "column": 26, + "column": 25, "program": "genericDefaultParam_3.ets" } } @@ -543,7 +543,7 @@ }, "end": { "line": 16, - "column": 26, + "column": 25, "program": "genericDefaultParam_3.ets" } } diff --git a/ets2panda/test/parser/ets/generic_function-expected.txt b/ets2panda/test/parser/ets/generic_function-expected.txt index e71bef29a18..ccea9a3d4dc 100644 --- a/ets2panda/test/parser/ets/generic_function-expected.txt +++ b/ets2panda/test/parser/ets/generic_function-expected.txt @@ -92,7 +92,7 @@ }, "end": { "line": 17, - "column": 31, + "column": 30, "program": "generic_function.ets" } } @@ -105,7 +105,7 @@ }, "end": { "line": 17, - "column": 31, + "column": 30, "program": "generic_function.ets" } } @@ -262,8 +262,8 @@ "program": "generic_function.ets" }, "end": { - "line": 20, - "column": 9, + "line": 18, + "column": 2, "program": "generic_function.ets" } } @@ -589,7 +589,7 @@ }, "end": { "line": 20, - "column": 46, + "column": 45, "program": "generic_function.ets" } } @@ -602,7 +602,7 @@ }, "end": { "line": 20, - "column": 46, + "column": 45, "program": "generic_function.ets" } } @@ -700,7 +700,7 @@ }, "end": { "line": 20, - "column": 57, + "column": 56, "program": "generic_function.ets" } } @@ -713,7 +713,7 @@ }, "end": { "line": 20, - "column": 57, + "column": 56, "program": "generic_function.ets" } } @@ -841,7 +841,7 @@ }, "end": { "line": 20, - "column": 40, + "column": 39, "program": "generic_function.ets" } } @@ -854,7 +854,7 @@ }, "end": { "line": 20, - "column": 40, + "column": 39, "program": "generic_function.ets" } } diff --git a/ets2panda/test/parser/ets/generic_resolve-expected.txt b/ets2panda/test/parser/ets/generic_resolve-expected.txt index 9f9dad8744d..e0eed0fdd54 100644 --- a/ets2panda/test/parser/ets/generic_resolve-expected.txt +++ b/ets2panda/test/parser/ets/generic_resolve-expected.txt @@ -265,7 +265,7 @@ }, "end": { "line": 20, - "column": 34, + "column": 33, "program": "generic_resolve.ets" } } @@ -278,7 +278,7 @@ }, "end": { "line": 20, - "column": 34, + "column": 33, "program": "generic_resolve.ets" } } @@ -291,7 +291,7 @@ }, "end": { "line": 20, - "column": 34, + "column": 33, "program": "generic_resolve.ets" } } @@ -305,7 +305,7 @@ }, "end": { "line": 20, - "column": 34, + "column": 33, "program": "generic_resolve.ets" } } @@ -318,7 +318,7 @@ }, "end": { "line": 20, - "column": 34, + "column": 33, "program": "generic_resolve.ets" } } @@ -377,7 +377,7 @@ }, "end": { "line": 20, - "column": 42, + "column": 41, "program": "generic_resolve.ets" } } @@ -390,7 +390,7 @@ }, "end": { "line": 20, - "column": 42, + "column": 41, "program": "generic_resolve.ets" } } @@ -417,7 +417,7 @@ }, "end": { "line": 20, - "column": 44, + "column": 42, "program": "generic_resolve.ets" } } @@ -430,7 +430,7 @@ }, "end": { "line": 20, - "column": 44, + "column": 42, "program": "generic_resolve.ets" } } @@ -564,7 +564,7 @@ }, "end": { "line": 21, - "column": 33, + "column": 32, "program": "generic_resolve.ets" } } @@ -577,7 +577,7 @@ }, "end": { "line": 21, - "column": 33, + "column": 32, "program": "generic_resolve.ets" } } @@ -604,7 +604,7 @@ }, "end": { "line": 21, - "column": 34, + "column": 33, "program": "generic_resolve.ets" } } @@ -617,7 +617,7 @@ }, "end": { "line": 21, - "column": 34, + "column": 33, "program": "generic_resolve.ets" } } @@ -781,7 +781,7 @@ }, "end": { "line": 23, - "column": 25, + "column": 23, "program": "generic_resolve.ets" } } @@ -794,7 +794,7 @@ }, "end": { "line": 23, - "column": 25, + "column": 23, "program": "generic_resolve.ets" } } @@ -1214,7 +1214,7 @@ }, "end": { "line": 29, - "column": 37, + "column": 36, "program": "generic_resolve.ets" } } @@ -1227,7 +1227,7 @@ }, "end": { "line": 29, - "column": 37, + "column": 36, "program": "generic_resolve.ets" } } @@ -1241,7 +1241,7 @@ }, "end": { "line": 29, - "column": 37, + "column": 36, "program": "generic_resolve.ets" } } @@ -1254,7 +1254,7 @@ }, "end": { "line": 29, - "column": 37, + "column": 36, "program": "generic_resolve.ets" } } diff --git a/ets2panda/test/parser/ets/generics_2-expected.txt b/ets2panda/test/parser/ets/generics_2-expected.txt index f7a4fc92f11..5cdfec04356 100644 --- a/ets2panda/test/parser/ets/generics_2-expected.txt +++ b/ets2panda/test/parser/ets/generics_2-expected.txt @@ -108,7 +108,7 @@ }, "end": { "line": 17, - "column": 21, + "column": 20, "program": "generics_2.ets" } } @@ -121,7 +121,7 @@ }, "end": { "line": 17, - "column": 21, + "column": 20, "program": "generics_2.ets" } } @@ -148,7 +148,7 @@ }, "end": { "line": 17, - "column": 22, + "column": 21, "program": "generics_2.ets" } } @@ -161,7 +161,7 @@ }, "end": { "line": 17, - "column": 22, + "column": 21, "program": "generics_2.ets" } } @@ -174,7 +174,7 @@ }, "end": { "line": 17, - "column": 22, + "column": 21, "program": "generics_2.ets" } } @@ -187,7 +187,7 @@ }, "end": { "line": 17, - "column": 22, + "column": 21, "program": "generics_2.ets" } } @@ -309,7 +309,7 @@ }, "end": { "line": 18, - "column": 21, + "column": 20, "program": "generics_2.ets" } } @@ -322,7 +322,7 @@ }, "end": { "line": 18, - "column": 21, + "column": 20, "program": "generics_2.ets" } } @@ -349,7 +349,7 @@ }, "end": { "line": 18, - "column": 22, + "column": 21, "program": "generics_2.ets" } } @@ -362,7 +362,7 @@ }, "end": { "line": 18, - "column": 22, + "column": 21, "program": "generics_2.ets" } } @@ -375,7 +375,7 @@ }, "end": { "line": 18, - "column": 22, + "column": 21, "program": "generics_2.ets" } } @@ -388,7 +388,7 @@ }, "end": { "line": 18, - "column": 22, + "column": 21, "program": "generics_2.ets" } } @@ -496,8 +496,8 @@ "program": "generics_2.ets" }, "end": { - "line": 21, - "column": 6, + "line": 19, + "column": 2, "program": "generics_2.ets" } } @@ -628,7 +628,7 @@ }, "end": { "line": 21, - "column": 41, + "column": 40, "program": "generics_2.ets" } } @@ -641,7 +641,7 @@ }, "end": { "line": 21, - "column": 41, + "column": 40, "program": "generics_2.ets" } } @@ -668,7 +668,7 @@ }, "end": { "line": 21, - "column": 43, + "column": 41, "program": "generics_2.ets" } } @@ -681,7 +681,7 @@ }, "end": { "line": 21, - "column": 43, + "column": 41, "program": "generics_2.ets" } } @@ -803,7 +803,7 @@ }, "end": { "line": 22, - "column": 30, + "column": 29, "program": "generics_2.ets" } } @@ -816,7 +816,7 @@ }, "end": { "line": 22, - "column": 30, + "column": 29, "program": "generics_2.ets" } } @@ -843,7 +843,7 @@ }, "end": { "line": 22, - "column": 32, + "column": 30, "program": "generics_2.ets" } } @@ -856,7 +856,7 @@ }, "end": { "line": 22, - "column": 32, + "column": 30, "program": "generics_2.ets" } } @@ -1051,7 +1051,7 @@ }, "end": { "line": 25, - "column": 30, + "column": 29, "program": "generics_2.ets" } } @@ -1064,7 +1064,7 @@ }, "end": { "line": 25, - "column": 30, + "column": 29, "program": "generics_2.ets" } } @@ -1091,7 +1091,7 @@ }, "end": { "line": 25, - "column": 32, + "column": 30, "program": "generics_2.ets" } } @@ -1104,7 +1104,7 @@ }, "end": { "line": 25, - "column": 32, + "column": 30, "program": "generics_2.ets" } } @@ -1184,7 +1184,7 @@ }, "end": { "line": 26, - "column": 33, + "column": 32, "program": "generics_2.ets" } } @@ -1197,7 +1197,7 @@ }, "end": { "line": 26, - "column": 33, + "column": 32, "program": "generics_2.ets" } } @@ -1224,7 +1224,7 @@ }, "end": { "line": 26, - "column": 34, + "column": 33, "program": "generics_2.ets" } } @@ -1237,7 +1237,7 @@ }, "end": { "line": 26, - "column": 34, + "column": 33, "program": "generics_2.ets" } } diff --git a/ets2panda/test/parser/ets/generics_3-expected.txt b/ets2panda/test/parser/ets/generics_3-expected.txt index 49f6186bb1b..b0d5cd0252f 100644 --- a/ets2panda/test/parser/ets/generics_3-expected.txt +++ b/ets2panda/test/parser/ets/generics_3-expected.txt @@ -452,7 +452,7 @@ }, "end": { "line": 16, - "column": 28, + "column": 27, "program": "generics_3.ets" } } @@ -465,7 +465,7 @@ }, "end": { "line": 16, - "column": 28, + "column": 27, "program": "generics_3.ets" } } @@ -478,7 +478,7 @@ }, "end": { "line": 16, - "column": 28, + "column": 27, "program": "generics_3.ets" } } @@ -492,7 +492,7 @@ }, "end": { "line": 16, - "column": 28, + "column": 27, "program": "generics_3.ets" } } @@ -505,7 +505,7 @@ }, "end": { "line": 16, - "column": 28, + "column": 27, "program": "generics_3.ets" } } @@ -783,7 +783,7 @@ }, "end": { "line": 19, - "column": 43, + "column": 42, "program": "generics_3.ets" } } @@ -796,7 +796,7 @@ }, "end": { "line": 19, - "column": 43, + "column": 42, "program": "generics_3.ets" } } @@ -830,7 +830,7 @@ }, "end": { "line": 19, - "column": 51, + "column": 50, "program": "generics_3.ets" } } @@ -843,7 +843,7 @@ }, "end": { "line": 19, - "column": 51, + "column": 50, "program": "generics_3.ets" } } @@ -870,7 +870,7 @@ }, "end": { "line": 19, - "column": 54, + "column": 51, "program": "generics_3.ets" } } @@ -883,7 +883,7 @@ }, "end": { "line": 19, - "column": 54, + "column": 51, "program": "generics_3.ets" } } @@ -924,7 +924,7 @@ }, "end": { "line": 19, - "column": 73, + "column": 72, "program": "generics_3.ets" } } @@ -937,7 +937,7 @@ }, "end": { "line": 19, - "column": 73, + "column": 72, "program": "generics_3.ets" } } @@ -1067,7 +1067,7 @@ }, "end": { "line": 19, - "column": 18, + "column": 17, "program": "generics_3.ets" } } @@ -1080,7 +1080,7 @@ }, "end": { "line": 19, - "column": 18, + "column": 17, "program": "generics_3.ets" } } @@ -1114,7 +1114,7 @@ }, "end": { "line": 19, - "column": 27, + "column": 25, "program": "generics_3.ets" } } @@ -1127,7 +1127,7 @@ }, "end": { "line": 19, - "column": 27, + "column": 25, "program": "generics_3.ets" } } diff --git a/ets2panda/test/parser/ets/generics_4-expected.txt b/ets2panda/test/parser/ets/generics_4-expected.txt index 130c4a1f942..9d105c2638e 100644 --- a/ets2panda/test/parser/ets/generics_4-expected.txt +++ b/ets2panda/test/parser/ets/generics_4-expected.txt @@ -484,7 +484,7 @@ }, "end": { "line": 16, - "column": 28, + "column": 27, "program": "generics_4.ets" } } @@ -497,7 +497,7 @@ }, "end": { "line": 16, - "column": 28, + "column": 27, "program": "generics_4.ets" } } @@ -510,7 +510,7 @@ }, "end": { "line": 16, - "column": 28, + "column": 27, "program": "generics_4.ets" } } @@ -524,7 +524,7 @@ }, "end": { "line": 16, - "column": 28, + "column": 27, "program": "generics_4.ets" } } @@ -537,7 +537,7 @@ }, "end": { "line": 16, - "column": 28, + "column": 27, "program": "generics_4.ets" } } @@ -815,7 +815,7 @@ }, "end": { "line": 19, - "column": 51, + "column": 50, "program": "generics_4.ets" } } @@ -828,7 +828,7 @@ }, "end": { "line": 19, - "column": 51, + "column": 50, "program": "generics_4.ets" } } @@ -862,7 +862,7 @@ }, "end": { "line": 19, - "column": 59, + "column": 58, "program": "generics_4.ets" } } @@ -875,7 +875,7 @@ }, "end": { "line": 19, - "column": 59, + "column": 58, "program": "generics_4.ets" } } @@ -909,7 +909,7 @@ }, "end": { "line": 19, - "column": 67, + "column": 66, "program": "generics_4.ets" } } @@ -922,7 +922,7 @@ }, "end": { "line": 19, - "column": 67, + "column": 66, "program": "generics_4.ets" } } @@ -949,7 +949,7 @@ }, "end": { "line": 19, - "column": 70, + "column": 67, "program": "generics_4.ets" } } @@ -962,7 +962,7 @@ }, "end": { "line": 19, - "column": 70, + "column": 67, "program": "generics_4.ets" } } @@ -1003,7 +1003,7 @@ }, "end": { "line": 19, - "column": 89, + "column": 88, "program": "generics_4.ets" } } @@ -1016,7 +1016,7 @@ }, "end": { "line": 19, - "column": 89, + "column": 88, "program": "generics_4.ets" } } @@ -1146,7 +1146,7 @@ }, "end": { "line": 19, - "column": 18, + "column": 17, "program": "generics_4.ets" } } @@ -1159,7 +1159,7 @@ }, "end": { "line": 19, - "column": 18, + "column": 17, "program": "generics_4.ets" } } @@ -1193,7 +1193,7 @@ }, "end": { "line": 19, - "column": 26, + "column": 25, "program": "generics_4.ets" } } @@ -1206,7 +1206,7 @@ }, "end": { "line": 19, - "column": 26, + "column": 25, "program": "generics_4.ets" } } @@ -1240,7 +1240,7 @@ }, "end": { "line": 19, - "column": 35, + "column": 33, "program": "generics_4.ets" } } @@ -1253,7 +1253,7 @@ }, "end": { "line": 19, - "column": 35, + "column": 33, "program": "generics_4.ets" } } diff --git a/ets2panda/test/parser/ets/generics_5-expected.txt b/ets2panda/test/parser/ets/generics_5-expected.txt index c9ec195c163..f115af832bf 100644 --- a/ets2panda/test/parser/ets/generics_5-expected.txt +++ b/ets2panda/test/parser/ets/generics_5-expected.txt @@ -420,7 +420,7 @@ }, "end": { "line": 16, - "column": 28, + "column": 27, "program": "generics_5.ets" } } @@ -433,7 +433,7 @@ }, "end": { "line": 16, - "column": 28, + "column": 27, "program": "generics_5.ets" } } @@ -446,7 +446,7 @@ }, "end": { "line": 16, - "column": 28, + "column": 27, "program": "generics_5.ets" } } @@ -460,7 +460,7 @@ }, "end": { "line": 16, - "column": 28, + "column": 27, "program": "generics_5.ets" } } @@ -473,7 +473,7 @@ }, "end": { "line": 16, - "column": 28, + "column": 27, "program": "generics_5.ets" } } @@ -751,7 +751,7 @@ }, "end": { "line": 19, - "column": 35, + "column": 34, "program": "generics_5.ets" } } @@ -764,7 +764,7 @@ }, "end": { "line": 19, - "column": 35, + "column": 34, "program": "generics_5.ets" } } @@ -791,7 +791,7 @@ }, "end": { "line": 19, - "column": 38, + "column": 35, "program": "generics_5.ets" } } @@ -804,7 +804,7 @@ }, "end": { "line": 19, - "column": 38, + "column": 35, "program": "generics_5.ets" } } @@ -845,7 +845,7 @@ }, "end": { "line": 19, - "column": 57, + "column": 56, "program": "generics_5.ets" } } @@ -858,7 +858,7 @@ }, "end": { "line": 19, - "column": 57, + "column": 56, "program": "generics_5.ets" } } @@ -988,7 +988,7 @@ }, "end": { "line": 19, - "column": 19, + "column": 17, "program": "generics_5.ets" } } @@ -1001,7 +1001,7 @@ }, "end": { "line": 19, - "column": 19, + "column": 17, "program": "generics_5.ets" } } diff --git a/ets2panda/test/parser/ets/generics_6-expected.txt b/ets2panda/test/parser/ets/generics_6-expected.txt index 0f2f38d5030..dbd36d722dd 100644 --- a/ets2panda/test/parser/ets/generics_6-expected.txt +++ b/ets2panda/test/parser/ets/generics_6-expected.txt @@ -656,7 +656,7 @@ }, "end": { "line": 16, - "column": 28, + "column": 27, "program": "generics_6.ets" } } @@ -669,7 +669,7 @@ }, "end": { "line": 16, - "column": 28, + "column": 27, "program": "generics_6.ets" } } @@ -682,7 +682,7 @@ }, "end": { "line": 16, - "column": 28, + "column": 27, "program": "generics_6.ets" } } @@ -696,7 +696,7 @@ }, "end": { "line": 16, - "column": 28, + "column": 27, "program": "generics_6.ets" } } @@ -709,7 +709,7 @@ }, "end": { "line": 16, - "column": 28, + "column": 27, "program": "generics_6.ets" } } @@ -987,7 +987,7 @@ }, "end": { "line": 22, - "column": 49, + "column": 48, "program": "generics_6.ets" } } @@ -1000,7 +1000,7 @@ }, "end": { "line": 22, - "column": 49, + "column": 48, "program": "generics_6.ets" } } @@ -1058,7 +1058,7 @@ }, "end": { "line": 22, - "column": 63, + "column": 61, "program": "generics_6.ets" } } @@ -1071,7 +1071,7 @@ }, "end": { "line": 22, - "column": 63, + "column": 61, "program": "generics_6.ets" } } @@ -1138,7 +1138,7 @@ }, "end": { "line": 22, - "column": 66, + "column": 63, "program": "generics_6.ets" } } @@ -1151,7 +1151,7 @@ }, "end": { "line": 22, - "column": 66, + "column": 63, "program": "generics_6.ets" } } @@ -1192,7 +1192,7 @@ }, "end": { "line": 22, - "column": 85, + "column": 84, "program": "generics_6.ets" } } @@ -1205,7 +1205,7 @@ }, "end": { "line": 22, - "column": 85, + "column": 84, "program": "generics_6.ets" } } @@ -1335,7 +1335,7 @@ }, "end": { "line": 22, - "column": 18, + "column": 17, "program": "generics_6.ets" } } @@ -1348,7 +1348,7 @@ }, "end": { "line": 22, - "column": 18, + "column": 17, "program": "generics_6.ets" } } @@ -1406,7 +1406,7 @@ }, "end": { "line": 22, - "column": 33, + "column": 30, "program": "generics_6.ets" } } @@ -1419,7 +1419,7 @@ }, "end": { "line": 22, - "column": 33, + "column": 30, "program": "generics_6.ets" } } diff --git a/ets2panda/test/parser/ets/generics_7-expected.txt b/ets2panda/test/parser/ets/generics_7-expected.txt index 42af81815f7..ddb4cb95c10 100644 --- a/ets2panda/test/parser/ets/generics_7-expected.txt +++ b/ets2panda/test/parser/ets/generics_7-expected.txt @@ -656,7 +656,7 @@ }, "end": { "line": 16, - "column": 28, + "column": 27, "program": "generics_7.ets" } } @@ -669,7 +669,7 @@ }, "end": { "line": 16, - "column": 28, + "column": 27, "program": "generics_7.ets" } } @@ -682,7 +682,7 @@ }, "end": { "line": 16, - "column": 28, + "column": 27, "program": "generics_7.ets" } } @@ -696,7 +696,7 @@ }, "end": { "line": 16, - "column": 28, + "column": 27, "program": "generics_7.ets" } } @@ -709,7 +709,7 @@ }, "end": { "line": 16, - "column": 28, + "column": 27, "program": "generics_7.ets" } } @@ -987,7 +987,7 @@ }, "end": { "line": 22, - "column": 75, + "column": 74, "program": "generics_7.ets" } } @@ -1000,7 +1000,7 @@ }, "end": { "line": 22, - "column": 75, + "column": 74, "program": "generics_7.ets" } } @@ -1058,7 +1058,7 @@ }, "end": { "line": 22, - "column": 87, + "column": 86, "program": "generics_7.ets" } } @@ -1071,7 +1071,7 @@ }, "end": { "line": 22, - "column": 87, + "column": 86, "program": "generics_7.ets" } } @@ -1129,7 +1129,7 @@ }, "end": { "line": 22, - "column": 99, + "column": 98, "program": "generics_7.ets" } } @@ -1142,7 +1142,7 @@ }, "end": { "line": 22, - "column": 99, + "column": 98, "program": "generics_7.ets" } } @@ -1200,7 +1200,7 @@ }, "end": { "line": 22, - "column": 114, + "column": 111, "program": "generics_7.ets" } } @@ -1213,7 +1213,7 @@ }, "end": { "line": 22, - "column": 114, + "column": 111, "program": "generics_7.ets" } } @@ -1240,7 +1240,7 @@ }, "end": { "line": 22, - "column": 115, + "column": 114, "program": "generics_7.ets" } } @@ -1253,7 +1253,7 @@ }, "end": { "line": 22, - "column": 115, + "column": 114, "program": "generics_7.ets" } } @@ -1360,7 +1360,7 @@ }, "end": { "line": 22, - "column": 118, + "column": 115, "program": "generics_7.ets" } } @@ -1373,7 +1373,7 @@ }, "end": { "line": 22, - "column": 118, + "column": 115, "program": "generics_7.ets" } } @@ -1414,7 +1414,7 @@ }, "end": { "line": 22, - "column": 137, + "column": 136, "program": "generics_7.ets" } } @@ -1427,7 +1427,7 @@ }, "end": { "line": 22, - "column": 137, + "column": 136, "program": "generics_7.ets" } } @@ -1557,7 +1557,7 @@ }, "end": { "line": 22, - "column": 18, + "column": 17, "program": "generics_7.ets" } } @@ -1570,7 +1570,7 @@ }, "end": { "line": 22, - "column": 18, + "column": 17, "program": "generics_7.ets" } } @@ -1628,7 +1628,7 @@ }, "end": { "line": 22, - "column": 30, + "column": 29, "program": "generics_7.ets" } } @@ -1641,7 +1641,7 @@ }, "end": { "line": 22, - "column": 30, + "column": 29, "program": "generics_7.ets" } } @@ -1699,7 +1699,7 @@ }, "end": { "line": 22, - "column": 42, + "column": 41, "program": "generics_7.ets" } } @@ -1712,7 +1712,7 @@ }, "end": { "line": 22, - "column": 42, + "column": 41, "program": "generics_7.ets" } } @@ -1770,7 +1770,7 @@ }, "end": { "line": 22, - "column": 57, + "column": 54, "program": "generics_7.ets" } } @@ -1783,7 +1783,7 @@ }, "end": { "line": 22, - "column": 57, + "column": 54, "program": "generics_7.ets" } } @@ -1810,7 +1810,7 @@ }, "end": { "line": 22, - "column": 58, + "column": 57, "program": "generics_7.ets" } } @@ -1823,7 +1823,7 @@ }, "end": { "line": 22, - "column": 58, + "column": 57, "program": "generics_7.ets" } } @@ -1850,7 +1850,7 @@ }, "end": { "line": 22, - "column": 59, + "column": 58, "program": "generics_7.ets" } } @@ -1863,7 +1863,7 @@ }, "end": { "line": 22, - "column": 59, + "column": 58, "program": "generics_7.ets" } } diff --git a/ets2panda/test/parser/ets/generics_recursive-expected.txt b/ets2panda/test/parser/ets/generics_recursive-expected.txt index 2be78e851bb..0fc5eff23ac 100644 --- a/ets2panda/test/parser/ets/generics_recursive-expected.txt +++ b/ets2panda/test/parser/ets/generics_recursive-expected.txt @@ -123,7 +123,7 @@ }, "end": { "line": 16, - "column": 26, + "column": 25, "program": "generics_recursive.ets" } } @@ -136,7 +136,7 @@ }, "end": { "line": 16, - "column": 26, + "column": 25, "program": "generics_recursive.ets" } } @@ -163,7 +163,7 @@ }, "end": { "line": 16, - "column": 28, + "column": 26, "program": "generics_recursive.ets" } } @@ -176,7 +176,7 @@ }, "end": { "line": 16, - "column": 28, + "column": 26, "program": "generics_recursive.ets" } } @@ -600,7 +600,7 @@ }, "end": { "line": 20, - "column": 15, + "column": 14, "program": "generics_recursive.ets" } } @@ -613,7 +613,7 @@ }, "end": { "line": 20, - "column": 15, + "column": 14, "program": "generics_recursive.ets" } } @@ -640,7 +640,7 @@ }, "end": { "line": 20, - "column": 16, + "column": 15, "program": "generics_recursive.ets" } } @@ -653,7 +653,7 @@ }, "end": { "line": 20, - "column": 16, + "column": 15, "program": "generics_recursive.ets" } } @@ -667,7 +667,7 @@ }, "end": { "line": 20, - "column": 16, + "column": 15, "program": "generics_recursive.ets" } } @@ -680,7 +680,7 @@ }, "end": { "line": 20, - "column": 16, + "column": 15, "program": "generics_recursive.ets" } } @@ -1176,7 +1176,7 @@ }, "end": { "line": 26, - "column": 36, + "column": 35, "program": "generics_recursive.ets" } } @@ -1189,7 +1189,7 @@ }, "end": { "line": 26, - "column": 36, + "column": 35, "program": "generics_recursive.ets" } } @@ -1223,7 +1223,7 @@ }, "end": { "line": 26, - "column": 39, + "column": 38, "program": "generics_recursive.ets" } } @@ -1236,7 +1236,7 @@ }, "end": { "line": 26, - "column": 39, + "column": 38, "program": "generics_recursive.ets" } } @@ -1277,7 +1277,7 @@ }, "end": { "line": 26, - "column": 42, + "column": 40, "program": "generics_recursive.ets" } } @@ -1290,7 +1290,7 @@ }, "end": { "line": 26, - "column": 42, + "column": 40, "program": "generics_recursive.ets" } } @@ -1351,7 +1351,7 @@ }, "end": { "line": 26, - "column": 55, + "column": 54, "program": "generics_recursive.ets" } } @@ -1364,7 +1364,7 @@ }, "end": { "line": 26, - "column": 55, + "column": 54, "program": "generics_recursive.ets" } } @@ -1398,7 +1398,7 @@ }, "end": { "line": 26, - "column": 58, + "column": 57, "program": "generics_recursive.ets" } } @@ -1411,7 +1411,7 @@ }, "end": { "line": 26, - "column": 58, + "column": 57, "program": "generics_recursive.ets" } } @@ -1452,7 +1452,7 @@ }, "end": { "line": 26, - "column": 60, + "column": 59, "program": "generics_recursive.ets" } } @@ -1465,7 +1465,7 @@ }, "end": { "line": 26, - "column": 60, + "column": 59, "program": "generics_recursive.ets" } } @@ -1479,7 +1479,7 @@ }, "end": { "line": 26, - "column": 60, + "column": 59, "program": "generics_recursive.ets" } } @@ -1493,7 +1493,7 @@ }, "end": { "line": 26, - "column": 60, + "column": 59, "program": "generics_recursive.ets" } } @@ -1506,7 +1506,7 @@ }, "end": { "line": 26, - "column": 60, + "column": 59, "program": "generics_recursive.ets" } } @@ -1625,7 +1625,7 @@ }, "end": { "line": 27, - "column": 23, + "column": 22, "program": "generics_recursive.ets" } } @@ -1638,7 +1638,7 @@ }, "end": { "line": 27, - "column": 23, + "column": 22, "program": "generics_recursive.ets" } } @@ -1672,7 +1672,7 @@ }, "end": { "line": 27, - "column": 26, + "column": 25, "program": "generics_recursive.ets" } } @@ -1685,7 +1685,7 @@ }, "end": { "line": 27, - "column": 26, + "column": 25, "program": "generics_recursive.ets" } } @@ -2239,7 +2239,7 @@ }, "end": { "line": 38, - "column": 16, + "column": 15, "program": "generics_recursive.ets" } } @@ -2252,7 +2252,7 @@ }, "end": { "line": 38, - "column": 16, + "column": 15, "program": "generics_recursive.ets" } } @@ -2286,7 +2286,7 @@ }, "end": { "line": 38, - "column": 19, + "column": 18, "program": "generics_recursive.ets" } } @@ -2299,7 +2299,7 @@ }, "end": { "line": 38, - "column": 19, + "column": 18, "program": "generics_recursive.ets" } } @@ -2340,7 +2340,7 @@ }, "end": { "line": 38, - "column": 22, + "column": 20, "program": "generics_recursive.ets" } } @@ -2353,7 +2353,7 @@ }, "end": { "line": 38, - "column": 22, + "column": 20, "program": "generics_recursive.ets" } } @@ -2602,7 +2602,7 @@ }, "end": { "line": 41, - "column": 17, + "column": 16, "program": "generics_recursive.ets" } } @@ -2615,7 +2615,7 @@ }, "end": { "line": 41, - "column": 17, + "column": 16, "program": "generics_recursive.ets" } } @@ -2649,7 +2649,7 @@ }, "end": { "line": 41, - "column": 20, + "column": 19, "program": "generics_recursive.ets" } } @@ -2662,7 +2662,7 @@ }, "end": { "line": 41, - "column": 20, + "column": 19, "program": "generics_recursive.ets" } } @@ -2703,7 +2703,7 @@ }, "end": { "line": 41, - "column": 23, + "column": 21, "program": "generics_recursive.ets" } } @@ -2716,7 +2716,7 @@ }, "end": { "line": 41, - "column": 23, + "column": 21, "program": "generics_recursive.ets" } } @@ -2782,7 +2782,7 @@ }, "end": { "line": 42, - "column": 22, + "column": 21, "program": "generics_recursive.ets" } } @@ -2795,7 +2795,7 @@ }, "end": { "line": 42, - "column": 22, + "column": 21, "program": "generics_recursive.ets" } } @@ -2829,7 +2829,7 @@ }, "end": { "line": 42, - "column": 25, + "column": 24, "program": "generics_recursive.ets" } } @@ -2842,7 +2842,7 @@ }, "end": { "line": 42, - "column": 25, + "column": 24, "program": "generics_recursive.ets" } } @@ -3425,7 +3425,7 @@ }, "end": { "line": 33, - "column": 23, + "column": 22, "program": "generics_recursive.ets" } } @@ -3438,7 +3438,7 @@ }, "end": { "line": 33, - "column": 23, + "column": 22, "program": "generics_recursive.ets" } } @@ -3465,7 +3465,7 @@ }, "end": { "line": 33, - "column": 25, + "column": 23, "program": "generics_recursive.ets" } } @@ -3478,7 +3478,7 @@ }, "end": { "line": 33, - "column": 25, + "column": 23, "program": "generics_recursive.ets" } } @@ -3592,7 +3592,7 @@ }, "end": { "line": 34, - "column": 20, + "column": 19, "program": "generics_recursive.ets" } } @@ -3605,7 +3605,7 @@ }, "end": { "line": 34, - "column": 20, + "column": 19, "program": "generics_recursive.ets" } } @@ -3632,7 +3632,7 @@ }, "end": { "line": 34, - "column": 21, + "column": 20, "program": "generics_recursive.ets" } } @@ -3645,7 +3645,7 @@ }, "end": { "line": 34, - "column": 21, + "column": 20, "program": "generics_recursive.ets" } } 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 71d04ce4580..333f0168158 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 @@ -96,7 +96,7 @@ }, "end": { "line": 17, - "column": 34, + "column": 32, "program": "generics_type_param_constraint_1.ets" } } @@ -109,7 +109,7 @@ }, "end": { "line": 17, - "column": 34, + "column": 32, "program": "generics_type_param_constraint_1.ets" } } 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 786a63eb29e..1b3c6d7f57a 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 @@ -213,7 +213,7 @@ }, "end": { "line": 17, - "column": 44, + "column": 43, "program": "generics_type_param_constraint_10.ets" } } @@ -226,7 +226,7 @@ }, "end": { "line": 17, - "column": 44, + "column": 43, "program": "generics_type_param_constraint_10.ets" } } @@ -240,7 +240,7 @@ }, "end": { "line": 17, - "column": 44, + "column": 43, "program": "generics_type_param_constraint_10.ets" } } @@ -253,7 +253,7 @@ }, "end": { "line": 17, - "column": 44, + "column": 43, "program": "generics_type_param_constraint_10.ets" } } @@ -288,7 +288,7 @@ }, "end": { "line": 17, - "column": 49, + "column": 47, "program": "generics_type_param_constraint_10.ets" } } @@ -301,7 +301,7 @@ }, "end": { "line": 17, - "column": 49, + "column": 47, "program": "generics_type_param_constraint_10.ets" } } @@ -381,7 +381,7 @@ }, "end": { "line": 17, - "column": 38, + "column": 36, "program": "generics_type_param_constraint_10.ets" } } @@ -394,7 +394,7 @@ }, "end": { "line": 17, - "column": 38, + "column": 36, "program": "generics_type_param_constraint_10.ets" } } @@ -695,7 +695,7 @@ }, "end": { "line": 22, - "column": 16, + "column": 15, "program": "generics_type_param_constraint_10.ets" } } @@ -708,7 +708,7 @@ }, "end": { "line": 22, - "column": 16, + "column": 15, "program": "generics_type_param_constraint_10.ets" } } 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 f9da1689fbb..fd28ce034b4 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 @@ -156,7 +156,7 @@ }, "end": { "line": 16, - "column": 13, + "column": 12, "program": "generics_type_param_constraint_11.ets" } } @@ -169,7 +169,7 @@ }, "end": { "line": 16, - "column": 13, + "column": 12, "program": "generics_type_param_constraint_11.ets" } } @@ -183,7 +183,7 @@ }, "end": { "line": 16, - "column": 13, + "column": 12, "program": "generics_type_param_constraint_11.ets" } } @@ -196,7 +196,7 @@ }, "end": { "line": 16, - "column": 13, + "column": 12, "program": "generics_type_param_constraint_11.ets" } } @@ -352,7 +352,7 @@ }, "end": { "line": 17, - "column": 18, + "column": 17, "program": "generics_type_param_constraint_11.ets" } } @@ -365,7 +365,7 @@ }, "end": { "line": 17, - "column": 18, + "column": 17, "program": "generics_type_param_constraint_11.ets" } } @@ -392,7 +392,7 @@ }, "end": { "line": 17, - "column": 19, + "column": 18, "program": "generics_type_param_constraint_11.ets" } } @@ -405,7 +405,7 @@ }, "end": { "line": 17, - "column": 19, + "column": 18, "program": "generics_type_param_constraint_11.ets" } } @@ -419,7 +419,7 @@ }, "end": { "line": 17, - "column": 19, + "column": 18, "program": "generics_type_param_constraint_11.ets" } } @@ -432,7 +432,7 @@ }, "end": { "line": 17, - "column": 19, + "column": 18, "program": "generics_type_param_constraint_11.ets" } } @@ -578,7 +578,7 @@ }, "end": { "line": 18, - "column": 19, + "column": 18, "program": "generics_type_param_constraint_11.ets" } } @@ -591,7 +591,7 @@ }, "end": { "line": 18, - "column": 19, + "column": 18, "program": "generics_type_param_constraint_11.ets" } } @@ -605,7 +605,7 @@ }, "end": { "line": 18, - "column": 19, + "column": 18, "program": "generics_type_param_constraint_11.ets" } } @@ -618,7 +618,7 @@ }, "end": { "line": 18, - "column": 19, + "column": 18, "program": "generics_type_param_constraint_11.ets" } } @@ -901,7 +901,7 @@ }, "end": { "line": 20, - "column": 35, + "column": 34, "program": "generics_type_param_constraint_11.ets" } } @@ -914,7 +914,7 @@ }, "end": { "line": 20, - "column": 35, + "column": 34, "program": "generics_type_param_constraint_11.ets" } } @@ -941,7 +941,7 @@ }, "end": { "line": 20, - "column": 37, + "column": 35, "program": "generics_type_param_constraint_11.ets" } } @@ -954,7 +954,7 @@ }, "end": { "line": 20, - "column": 37, + "column": 35, "program": "generics_type_param_constraint_11.ets" } } 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 de3ba5217b9..ba2d015fa3a 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 @@ -84,7 +84,7 @@ }, "end": { "line": 17, - "column": 20, + "column": 19, "program": "generics_type_param_constraint_12.ets" } } @@ -97,7 +97,7 @@ }, "end": { "line": 17, - "column": 20, + "column": 19, "program": "generics_type_param_constraint_12.ets" } } @@ -110,7 +110,7 @@ }, "end": { "line": 17, - "column": 20, + "column": 19, "program": "generics_type_param_constraint_12.ets" } } @@ -123,7 +123,7 @@ }, "end": { "line": 17, - "column": 20, + "column": 19, "program": "generics_type_param_constraint_12.ets" } } @@ -231,8 +231,8 @@ "program": "generics_type_param_constraint_12.ets" }, "end": { - "line": 20, - "column": 6, + "line": 18, + "column": 2, "program": "generics_type_param_constraint_12.ets" } } @@ -363,7 +363,7 @@ }, "end": { "line": 20, - "column": 39, + "column": 38, "program": "generics_type_param_constraint_12.ets" } } @@ -376,7 +376,7 @@ }, "end": { "line": 20, - "column": 39, + "column": 38, "program": "generics_type_param_constraint_12.ets" } } @@ -403,7 +403,7 @@ }, "end": { "line": 20, - "column": 41, + "column": 39, "program": "generics_type_param_constraint_12.ets" } } @@ -416,7 +416,7 @@ }, "end": { "line": 20, - "column": 41, + "column": 39, "program": "generics_type_param_constraint_12.ets" } } @@ -490,7 +490,7 @@ }, "end": { "line": 21, - "column": 16, + "column": 15, "program": "generics_type_param_constraint_12.ets" } } @@ -503,7 +503,7 @@ }, "end": { "line": 21, - "column": 16, + "column": 15, "program": "generics_type_param_constraint_12.ets" } } @@ -518,7 +518,7 @@ }, "end": { "line": 21, - "column": 16, + "column": 15, "program": "generics_type_param_constraint_12.ets" } } @@ -606,7 +606,7 @@ }, "end": { "line": 23, - "column": 27, + "column": 26, "program": "generics_type_param_constraint_12.ets" } } @@ -619,7 +619,7 @@ }, "end": { "line": 23, - "column": 27, + "column": 26, "program": "generics_type_param_constraint_12.ets" } } @@ -633,7 +633,7 @@ }, "end": { "line": 23, - "column": 27, + "column": 26, "program": "generics_type_param_constraint_12.ets" } } @@ -646,7 +646,7 @@ }, "end": { "line": 23, - "column": 27, + "column": 26, "program": "generics_type_param_constraint_12.ets" } } @@ -885,7 +885,7 @@ }, "end": { "line": 27, - "column": 28, + "column": 26, "program": "generics_type_param_constraint_12.ets" } } @@ -898,7 +898,7 @@ }, "end": { "line": 27, - "column": 28, + "column": 26, "program": "generics_type_param_constraint_12.ets" } } @@ -1394,7 +1394,7 @@ }, "end": { "line": 32, - "column": 40, + "column": 39, "program": "generics_type_param_constraint_12.ets" } } @@ -1407,7 +1407,7 @@ }, "end": { "line": 32, - "column": 40, + "column": 39, "program": "generics_type_param_constraint_12.ets" } } @@ -1434,7 +1434,7 @@ }, "end": { "line": 32, - "column": 41, + "column": 40, "program": "generics_type_param_constraint_12.ets" } } @@ -1447,7 +1447,7 @@ }, "end": { "line": 32, - "column": 41, + "column": 40, "program": "generics_type_param_constraint_12.ets" } } @@ -1461,7 +1461,7 @@ }, "end": { "line": 32, - "column": 41, + "column": 40, "program": "generics_type_param_constraint_12.ets" } } @@ -1474,7 +1474,7 @@ }, "end": { "line": 32, - "column": 41, + "column": 40, "program": "generics_type_param_constraint_12.ets" } } @@ -1884,7 +1884,7 @@ }, "end": { "line": 37, - "column": 32, + "column": 31, "program": "generics_type_param_constraint_12.ets" } } @@ -1897,7 +1897,7 @@ }, "end": { "line": 37, - "column": 32, + "column": 31, "program": "generics_type_param_constraint_12.ets" } } @@ -1924,7 +1924,7 @@ }, "end": { "line": 37, - "column": 33, + "column": 32, "program": "generics_type_param_constraint_12.ets" } } @@ -1937,7 +1937,7 @@ }, "end": { "line": 37, - "column": 33, + "column": 32, "program": "generics_type_param_constraint_12.ets" } } @@ -2145,7 +2145,7 @@ }, "end": { "line": 39, - "column": 32, + "column": 31, "program": "generics_type_param_constraint_12.ets" } } @@ -2158,7 +2158,7 @@ }, "end": { "line": 39, - "column": 32, + "column": 31, "program": "generics_type_param_constraint_12.ets" } } @@ -2185,7 +2185,7 @@ }, "end": { "line": 39, - "column": 33, + "column": 32, "program": "generics_type_param_constraint_12.ets" } } @@ -2198,7 +2198,7 @@ }, "end": { "line": 39, - "column": 33, + "column": 32, "program": "generics_type_param_constraint_12.ets" } } 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 a0fa5c44246..a4c3da731f4 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 @@ -112,7 +112,7 @@ }, "end": { "line": 17, - "column": 38, + "column": 36, "program": "generics_type_param_constraint_2.ets" } } @@ -125,7 +125,7 @@ }, "end": { "line": 17, - "column": 38, + "column": 36, "program": "generics_type_param_constraint_2.ets" } } @@ -204,8 +204,8 @@ "program": "generics_type_param_constraint_2.ets" }, "end": { - "line": 18, - "column": 1, + "line": 17, + "column": 41, "program": "generics_type_param_constraint_2.ets" } } 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 296a7f0dd78..f9aed84a600 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 @@ -319,7 +319,7 @@ }, "end": { "line": 17, - "column": 47, + "column": 46, "program": "generics_type_param_constraint_3.ets" } } @@ -332,7 +332,7 @@ }, "end": { "line": 17, - "column": 47, + "column": 46, "program": "generics_type_param_constraint_3.ets" } } @@ -346,7 +346,7 @@ }, "end": { "line": 17, - "column": 47, + "column": 46, "program": "generics_type_param_constraint_3.ets" } } @@ -359,7 +359,7 @@ }, "end": { "line": 17, - "column": 47, + "column": 46, "program": "generics_type_param_constraint_3.ets" } } @@ -394,7 +394,7 @@ }, "end": { "line": 17, - "column": 53, + "column": 51, "program": "generics_type_param_constraint_3.ets" } } @@ -407,7 +407,7 @@ }, "end": { "line": 17, - "column": 53, + "column": 51, "program": "generics_type_param_constraint_3.ets" } } @@ -487,7 +487,7 @@ }, "end": { "line": 17, - "column": 37, + "column": 35, "program": "generics_type_param_constraint_3.ets" } } @@ -500,7 +500,7 @@ }, "end": { "line": 17, - "column": 37, + "column": 35, "program": "generics_type_param_constraint_3.ets" } } 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 b1d6295cfb9..45d199d5a9e 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 @@ -89,7 +89,7 @@ }, "end": { "line": 18, - "column": 16, + "column": 15, "program": "generics_type_param_constraint_4.ets" } } @@ -102,7 +102,7 @@ }, "end": { "line": 18, - "column": 16, + "column": 15, "program": "generics_type_param_constraint_4.ets" } } @@ -116,7 +116,7 @@ }, "end": { "line": 18, - "column": 16, + "column": 15, "program": "generics_type_param_constraint_4.ets" } } @@ -129,7 +129,7 @@ }, "end": { "line": 18, - "column": 16, + "column": 15, "program": "generics_type_param_constraint_4.ets" } } @@ -279,8 +279,8 @@ "program": "generics_type_param_constraint_4.ets" }, "end": { - "line": 20, - "column": 6, + "line": 19, + "column": 2, "program": "generics_type_param_constraint_4.ets" } } @@ -380,7 +380,7 @@ }, "end": { "line": 20, - "column": 28, + "column": 26, "program": "generics_type_param_constraint_4.ets" } } @@ -393,7 +393,7 @@ }, "end": { "line": 20, - "column": 28, + "column": 26, "program": "generics_type_param_constraint_4.ets" } } 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 babbbd84dec..cfb6c64761f 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 @@ -89,7 +89,7 @@ }, "end": { "line": 18, - "column": 17, + "column": 16, "program": "generics_type_param_constraint_5.ets" } } @@ -102,7 +102,7 @@ }, "end": { "line": 18, - "column": 17, + "column": 16, "program": "generics_type_param_constraint_5.ets" } } @@ -116,7 +116,7 @@ }, "end": { "line": 18, - "column": 17, + "column": 16, "program": "generics_type_param_constraint_5.ets" } } @@ -129,7 +129,7 @@ }, "end": { "line": 18, - "column": 17, + "column": 16, "program": "generics_type_param_constraint_5.ets" } } @@ -274,7 +274,7 @@ }, "end": { "line": 19, - "column": 17, + "column": 16, "program": "generics_type_param_constraint_5.ets" } } @@ -287,7 +287,7 @@ }, "end": { "line": 19, - "column": 17, + "column": 16, "program": "generics_type_param_constraint_5.ets" } } @@ -301,7 +301,7 @@ }, "end": { "line": 19, - "column": 17, + "column": 16, "program": "generics_type_param_constraint_5.ets" } } @@ -314,7 +314,7 @@ }, "end": { "line": 19, - "column": 17, + "column": 16, "program": "generics_type_param_constraint_5.ets" } } @@ -496,8 +496,8 @@ "program": "generics_type_param_constraint_5.ets" }, "end": { - "line": 21, - "column": 6, + "line": 20, + "column": 2, "program": "generics_type_param_constraint_5.ets" } } @@ -629,7 +629,7 @@ }, "end": { "line": 21, - "column": 29, + "column": 28, "program": "generics_type_param_constraint_5.ets" } } @@ -642,7 +642,7 @@ }, "end": { "line": 21, - "column": 29, + "column": 28, "program": "generics_type_param_constraint_5.ets" } } @@ -676,7 +676,7 @@ }, "end": { "line": 21, - "column": 32, + "column": 30, "program": "generics_type_param_constraint_5.ets" } } @@ -689,7 +689,7 @@ }, "end": { "line": 21, - "column": 32, + "column": 30, "program": "generics_type_param_constraint_5.ets" } } 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 9b38405bea0..fefb297c1ab 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 @@ -96,7 +96,7 @@ }, "end": { "line": 17, - "column": 33, + "column": 32, "program": "generics_type_param_constraint_6.ets" } } @@ -109,7 +109,7 @@ }, "end": { "line": 17, - "column": 33, + "column": 32, "program": "generics_type_param_constraint_6.ets" } } @@ -136,7 +136,7 @@ }, "end": { "line": 17, - "column": 34, + "column": 33, "program": "generics_type_param_constraint_6.ets" } } @@ -149,7 +149,7 @@ }, "end": { "line": 17, - "column": 34, + "column": 33, "program": "generics_type_param_constraint_6.ets" } } 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 9018e47953a..d52948dcba9 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 @@ -96,7 +96,7 @@ }, "end": { "line": 17, - "column": 34, + "column": 32, "program": "generics_type_param_constraint_7.ets" } } @@ -109,7 +109,7 @@ }, "end": { "line": 17, - "column": 34, + "column": 32, "program": "generics_type_param_constraint_7.ets" } } @@ -574,7 +574,7 @@ }, "end": { "line": 19, - "column": 36, + "column": 35, "program": "generics_type_param_constraint_7.ets" } } @@ -587,7 +587,7 @@ }, "end": { "line": 19, - "column": 36, + "column": 35, "program": "generics_type_param_constraint_7.ets" } } @@ -614,7 +614,7 @@ }, "end": { "line": 19, - "column": 37, + "column": 36, "program": "generics_type_param_constraint_7.ets" } } @@ -627,7 +627,7 @@ }, "end": { "line": 19, - "column": 37, + "column": 36, "program": "generics_type_param_constraint_7.ets" } } 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 188cabf31a1..8fc8f90a720 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 @@ -278,7 +278,7 @@ }, "end": { "line": 18, - "column": 36, + "column": 35, "program": "generics_type_param_constraint_9.ets" } } @@ -291,7 +291,7 @@ }, "end": { "line": 18, - "column": 36, + "column": 35, "program": "generics_type_param_constraint_9.ets" } } @@ -318,7 +318,7 @@ }, "end": { "line": 18, - "column": 38, + "column": 36, "program": "generics_type_param_constraint_9.ets" } } @@ -331,7 +331,7 @@ }, "end": { "line": 18, - "column": 38, + "column": 36, "program": "generics_type_param_constraint_9.ets" } } @@ -565,7 +565,7 @@ }, "end": { "line": 19, - "column": 27, + "column": 25, "program": "generics_type_param_constraint_9.ets" } } @@ -578,7 +578,7 @@ }, "end": { "line": 19, - "column": 27, + "column": 25, "program": "generics_type_param_constraint_9.ets" } } @@ -1027,7 +1027,7 @@ }, "end": { "line": 21, - "column": 22, + "column": 21, "program": "generics_type_param_constraint_9.ets" } } @@ -1040,7 +1040,7 @@ }, "end": { "line": 21, - "column": 22, + "column": 21, "program": "generics_type_param_constraint_9.ets" } } @@ -1066,8 +1066,8 @@ "program": "generics_type_param_constraint_9.ets" }, "end": { - "line": 22, - "column": 2, + "line": 21, + "column": 22, "program": "generics_type_param_constraint_9.ets" } } @@ -1079,8 +1079,8 @@ "program": "generics_type_param_constraint_9.ets" }, "end": { - "line": 22, - "column": 2, + "line": 21, + "column": 22, "program": "generics_type_param_constraint_9.ets" } } diff --git a/ets2panda/test/parser/ets/getterOverride-expected.txt b/ets2panda/test/parser/ets/getterOverride-expected.txt index f0a3f223783..b25e62b3f72 100644 --- a/ets2panda/test/parser/ets/getterOverride-expected.txt +++ b/ets2panda/test/parser/ets/getterOverride-expected.txt @@ -84,7 +84,7 @@ }, "end": { "line": 18, - "column": 26, + "column": 25, "program": "getterOverride.ets" } } @@ -97,7 +97,7 @@ }, "end": { "line": 18, - "column": 26, + "column": 25, "program": "getterOverride.ets" } } @@ -110,7 +110,7 @@ }, "end": { "line": 18, - "column": 26, + "column": 25, "program": "getterOverride.ets" } } @@ -123,7 +123,7 @@ }, "end": { "line": 18, - "column": 26, + "column": 25, "program": "getterOverride.ets" } } @@ -182,8 +182,8 @@ "program": "getterOverride.ets" }, "end": { - "line": 21, - "column": 6, + "line": 19, + "column": 2, "program": "getterOverride.ets" } } @@ -241,7 +241,7 @@ }, "end": { "line": 21, - "column": 27, + "column": 25, "program": "getterOverride.ets" } } @@ -254,7 +254,7 @@ }, "end": { "line": 21, - "column": 27, + "column": 25, "program": "getterOverride.ets" } } @@ -352,7 +352,7 @@ }, "end": { "line": 22, - "column": 36, + "column": 34, "program": "getterOverride.ets" } } @@ -365,7 +365,7 @@ }, "end": { "line": 22, - "column": 36, + "column": 34, "program": "getterOverride.ets" } } 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 844ee1f9c1e..2576db551e1 100644 --- a/ets2panda/test/parser/ets/getter_setter_access_modifiers-expected.txt +++ b/ets2panda/test/parser/ets/getter_setter_access_modifiers-expected.txt @@ -803,7 +803,7 @@ }, "end": { "line": 26, - "column": 41, + "column": 39, "program": "getter_setter_access_modifiers.ets" } } @@ -816,7 +816,7 @@ }, "end": { "line": 26, - "column": 41, + "column": 39, "program": "getter_setter_access_modifiers.ets" } } diff --git a/ets2panda/test/parser/ets/globalVarInLambdaInStatic-expected.txt b/ets2panda/test/parser/ets/globalVarInLambdaInStatic-expected.txt index 3d009e987b6..bf93a8f322e 100644 --- a/ets2panda/test/parser/ets/globalVarInLambdaInStatic-expected.txt +++ b/ets2panda/test/parser/ets/globalVarInLambdaInStatic-expected.txt @@ -107,7 +107,7 @@ }, "end": { "line": 22, - "column": 30, + "column": 29, "program": "globalVarInLambdaInStatic.ets" } } @@ -120,7 +120,7 @@ }, "end": { "line": 22, - "column": 30, + "column": 29, "program": "globalVarInLambdaInStatic.ets" } } @@ -134,7 +134,7 @@ }, "end": { "line": 22, - "column": 30, + "column": 29, "program": "globalVarInLambdaInStatic.ets" } } @@ -147,7 +147,7 @@ }, "end": { "line": 22, - "column": 30, + "column": 29, "program": "globalVarInLambdaInStatic.ets" } } @@ -497,7 +497,7 @@ }, "end": { "line": 31, - "column": 37, + "column": 36, "program": "globalVarInLambdaInStatic.ets" } } @@ -510,7 +510,7 @@ }, "end": { "line": 31, - "column": 37, + "column": 36, "program": "globalVarInLambdaInStatic.ets" } } @@ -524,7 +524,7 @@ }, "end": { "line": 31, - "column": 37, + "column": 36, "program": "globalVarInLambdaInStatic.ets" } } @@ -537,7 +537,7 @@ }, "end": { "line": 31, - "column": 37, + "column": 36, "program": "globalVarInLambdaInStatic.ets" } } @@ -1260,7 +1260,7 @@ }, "end": { "line": 16, - "column": 44, + "column": 43, "program": "globalVarInLambdaInStatic.ets" } } @@ -1273,7 +1273,7 @@ }, "end": { "line": 16, - "column": 44, + "column": 43, "program": "globalVarInLambdaInStatic.ets" } } @@ -1287,7 +1287,7 @@ }, "end": { "line": 16, - "column": 44, + "column": 43, "program": "globalVarInLambdaInStatic.ets" } } @@ -1300,7 +1300,7 @@ }, "end": { "line": 16, - "column": 44, + "column": 43, "program": "globalVarInLambdaInStatic.ets" } } @@ -1402,7 +1402,7 @@ }, "end": { "line": 17, - "column": 25, + "column": 23, "program": "globalVarInLambdaInStatic.ets" } } @@ -1415,7 +1415,7 @@ }, "end": { "line": 17, - "column": 25, + "column": 23, "program": "globalVarInLambdaInStatic.ets" } } @@ -1678,7 +1678,7 @@ }, "end": { "line": 25, - "column": 40, + "column": 38, "program": "globalVarInLambdaInStatic.ets" } } @@ -1691,7 +1691,7 @@ }, "end": { "line": 25, - "column": 40, + "column": 38, "program": "globalVarInLambdaInStatic.ets" } } @@ -1732,7 +1732,7 @@ }, "end": { "line": 26, - "column": 29, + "column": 28, "program": "globalVarInLambdaInStatic.ets" } } @@ -1745,7 +1745,7 @@ }, "end": { "line": 26, - "column": 29, + "column": 28, "program": "globalVarInLambdaInStatic.ets" } } diff --git a/ets2panda/test/parser/ets/global_const_vars3-expected.txt b/ets2panda/test/parser/ets/global_const_vars3-expected.txt index 43fea067a2d..76848df978b 100644 --- a/ets2panda/test/parser/ets/global_const_vars3-expected.txt +++ b/ets2panda/test/parser/ets/global_const_vars3-expected.txt @@ -78,7 +78,7 @@ }, "end": { "line": 20, - "column": 32, + "column": 31, "program": "global_const_vars3.ets" } } @@ -91,7 +91,7 @@ }, "end": { "line": 20, - "column": 32, + "column": 31, "program": "global_const_vars3.ets" } } @@ -106,7 +106,7 @@ }, "end": { "line": 20, - "column": 32, + "column": 31, "program": "global_const_vars3.ets" } } @@ -248,7 +248,7 @@ }, "end": { "line": 23, - "column": 30, + "column": 29, "program": "global_const_vars3.ets" } } @@ -261,7 +261,7 @@ }, "end": { "line": 23, - "column": 30, + "column": 29, "program": "global_const_vars3.ets" } } @@ -865,7 +865,7 @@ }, "end": { "line": 17, - "column": 28, + "column": 27, "program": "global_const_vars3.ets" } } @@ -878,7 +878,7 @@ }, "end": { "line": 17, - "column": 28, + "column": 27, "program": "global_const_vars3.ets" } } @@ -932,7 +932,7 @@ }, "end": { "line": 17, - "column": 18, + "column": 16, "program": "global_const_vars3.ets" } } @@ -945,7 +945,7 @@ }, "end": { "line": 17, - "column": 18, + "column": 16, "program": "global_const_vars3.ets" } } 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 f7a571b3537..68c51daa2bd 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 @@ -284,7 +284,7 @@ }, "end": { "line": 19, - "column": 39, + "column": 37, "program": "check_exported_default_class.ets" } } @@ -297,7 +297,7 @@ }, "end": { "line": 19, - "column": 39, + "column": 37, "program": "check_exported_default_class.ets" } } @@ -347,7 +347,7 @@ }, "end": { "line": 19, - "column": 63, + "column": 62, "program": "check_exported_default_class.ets" } } @@ -360,7 +360,7 @@ }, "end": { "line": 19, - "column": 63, + "column": 62, "program": "check_exported_default_class.ets" } } 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 50233e3a7d4..e05af7af1d0 100644 --- a/ets2panda/test/parser/ets/import_tests/duplicated/extdef-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/duplicated/extdef-expected.txt @@ -407,7 +407,7 @@ }, "end": { "line": 19, - "column": 19, + "column": 17, "program": "extdef.ets" } } @@ -420,7 +420,7 @@ }, "end": { "line": 19, - "column": 19, + "column": 17, "program": "extdef.ets" } } @@ -470,7 +470,7 @@ }, "end": { "line": 19, - "column": 29, + "column": 28, "program": "extdef.ets" } } @@ -483,7 +483,7 @@ }, "end": { "line": 19, - "column": 29, + "column": 28, "program": "extdef.ets" } } 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 1434bcf65de..3f0b5d034f6 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 @@ -251,7 +251,7 @@ }, "end": { "line": 19, - "column": 36, + "column": 35, "program": "export_type_alias.ets" } } @@ -264,7 +264,7 @@ }, "end": { "line": 19, - "column": 36, + "column": 35, "program": "export_type_alias.ets" } } 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 9eac1209f57..58efe48c2ac 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 @@ -399,7 +399,7 @@ }, "end": { "line": 20, - "column": 13, + "column": 12, "program": "import_diff_paths.ets" } } @@ -412,7 +412,7 @@ }, "end": { "line": 20, - "column": 13, + "column": 12, "program": "import_diff_paths.ets" } } 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 9f694dad623..9a3ebda8dd9 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 @@ -218,7 +218,7 @@ }, "end": { "line": 19, - "column": 42, + "column": 40, "program": "import_interface_test.ets" } } @@ -231,7 +231,7 @@ }, "end": { "line": 19, - "column": 42, + "column": 40, "program": "import_interface_test.ets" } } @@ -770,7 +770,7 @@ }, "end": { "line": 26, - "column": 34, + "column": 33, "program": "import_interface_test.ets" } } @@ -783,7 +783,7 @@ }, "end": { "line": 26, - "column": 34, + "column": 33, "program": "import_interface_test.ets" } } @@ -883,7 +883,7 @@ }, "end": { "line": 27, - "column": 35, + "column": 34, "program": "import_interface_test.ets" } } @@ -896,7 +896,7 @@ }, "end": { "line": 27, - "column": 35, + "column": 34, "program": "import_interface_test.ets" } } 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 9aabe9aaffd..fc12b10e0b8 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 @@ -150,8 +150,8 @@ "program": "import_interface_test_1.ets" }, "end": { - "line": 19, - "column": 1, + "line": 18, + "column": 2, "program": "import_interface_test_1.ets" } } 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 593631d9cab..98e3bedec26 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 @@ -136,7 +136,7 @@ }, "end": { "line": 18, - "column": 48, + "column": 46, "program": "import_interface_test_2.ets" } } @@ -149,7 +149,7 @@ }, "end": { "line": 18, - "column": 48, + "column": 46, "program": "import_interface_test_2.ets" } } diff --git a/ets2panda/test/parser/ets/import_tests/internals-expected.txt b/ets2panda/test/parser/ets/import_tests/internals-expected.txt index 66ac046cdce..5aeb5eca1f8 100644 --- a/ets2panda/test/parser/ets/import_tests/internals-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/internals-expected.txt @@ -49,7 +49,7 @@ }, "end": { "line": 16, - "column": 40, + "column": 39, "program": "internals.ets" } } @@ -62,7 +62,7 @@ }, "end": { "line": 16, - "column": 40, + "column": 39, "program": "internals.ets" } } @@ -128,7 +128,7 @@ }, "end": { "line": 17, - "column": 30, + "column": 29, "program": "internals.ets" } } @@ -141,7 +141,7 @@ }, "end": { "line": 17, - "column": 30, + "column": 29, "program": "internals.ets" } } @@ -242,7 +242,7 @@ }, "end": { "line": 20, - "column": 19, + "column": 18, "program": "internals.ets" } } @@ -255,7 +255,7 @@ }, "end": { "line": 20, - "column": 19, + "column": 18, "program": "internals.ets" } } @@ -268,7 +268,7 @@ }, "end": { "line": 20, - "column": 19, + "column": 18, "program": "internals.ets" } } @@ -281,7 +281,7 @@ }, "end": { "line": 20, - "column": 19, + "column": 18, "program": "internals.ets" } } @@ -370,7 +370,7 @@ }, "end": { "line": 20, - "column": 19, + "column": 18, "program": "internals.ets" } } @@ -383,7 +383,7 @@ }, "end": { "line": 20, - "column": 19, + "column": 18, "program": "internals.ets" } } @@ -424,7 +424,7 @@ }, "end": { "line": 20, - "column": 19, + "column": 18, "program": "internals.ets" } } @@ -437,7 +437,7 @@ }, "end": { "line": 20, - "column": 19, + "column": 18, "program": "internals.ets" } } @@ -452,7 +452,7 @@ }, "end": { "line": 20, - "column": 19, + "column": 18, "program": "internals.ets" } } @@ -467,7 +467,7 @@ }, "end": { "line": 20, - "column": 19, + "column": 18, "program": "internals.ets" } } @@ -511,8 +511,8 @@ "program": "internals.ets" }, "end": { - "line": 22, - "column": 1, + "line": 21, + "column": 2, "program": "internals.ets" } } diff --git a/ets2panda/test/parser/ets/import_tests/modules/module1/src/export_file-expected.txt b/ets2panda/test/parser/ets/import_tests/modules/module1/src/export_file-expected.txt index 51dad8f55e1..f818b10de84 100644 --- a/ets2panda/test/parser/ets/import_tests/modules/module1/src/export_file-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/modules/module1/src/export_file-expected.txt @@ -48,8 +48,8 @@ "program": "export_file.ets" }, "end": { - "line": 17, - "column": 1, + "line": 16, + "column": 25, "program": "export_file.ets" } } @@ -61,8 +61,8 @@ "program": "export_file.ets" }, "end": { - "line": 17, - "column": 1, + "line": 16, + "column": 25, "program": "export_file.ets" } } 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 82ef58e5f92..97aac6ad83e 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 @@ -401,7 +401,7 @@ }, "end": { "line": 17, - "column": 24, + "column": 23, "program": "test_lib2.ets" } } @@ -414,7 +414,7 @@ }, "end": { "line": 17, - "column": 24, + "column": 23, "program": "test_lib2.ets" } } @@ -428,7 +428,7 @@ }, "end": { "line": 17, - "column": 24, + "column": 23, "program": "test_lib2.ets" } } @@ -441,7 +441,7 @@ }, "end": { "line": 17, - "column": 24, + "column": 23, "program": "test_lib2.ets" } } 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 3f008d9aa28..553edfedd90 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 @@ -309,7 +309,7 @@ }, "end": { "line": 18, - "column": 31, + "column": 30, "program": "package_module_1.ets" } } @@ -322,7 +322,7 @@ }, "end": { "line": 18, - "column": 31, + "column": 30, "program": "package_module_1.ets" } } @@ -336,7 +336,7 @@ }, "end": { "line": 18, - "column": 31, + "column": 30, "program": "package_module_1.ets" } } @@ -349,7 +349,7 @@ }, "end": { "line": 18, - "column": 31, + "column": 30, "program": "package_module_1.ets" } } @@ -384,7 +384,7 @@ }, "end": { "line": 18, - "column": 41, + "column": 39, "program": "package_module_1.ets" } } @@ -397,7 +397,7 @@ }, "end": { "line": 18, - "column": 41, + "column": 39, "program": "package_module_1.ets" } } 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 b19bfadc565..84d7af505e6 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 @@ -409,7 +409,7 @@ }, "end": { "line": 19, - "column": 23, + "column": 21, "program": "subpackage_module_1.ets" } } @@ -422,7 +422,7 @@ }, "end": { "line": 19, - "column": 23, + "column": 21, "program": "subpackage_module_1.ets" } } @@ -496,7 +496,7 @@ }, "end": { "line": 19, - "column": 23, + "column": 21, "program": "subpackage_module_2.ets" } } @@ -509,7 +509,7 @@ }, "end": { "line": 19, - "column": 23, + "column": 21, "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 9f29a276aba..dd6e5693b36 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 @@ -409,7 +409,7 @@ }, "end": { "line": 19, - "column": 23, + "column": 21, "program": "subpackage_module_2.ets" } } @@ -422,7 +422,7 @@ }, "end": { "line": 19, - "column": 23, + "column": 21, "program": "subpackage_module_2.ets" } } @@ -496,7 +496,7 @@ }, "end": { "line": 19, - "column": 23, + "column": 21, "program": "subpackage_module_1.ets" } } @@ -509,7 +509,7 @@ }, "end": { "line": 19, - "column": 23, + "column": 21, "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 19d6041d325..e1ae09ce8d0 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 @@ -160,7 +160,7 @@ }, "end": { "line": 19, - "column": 18, + "column": 17, "program": "Line.ets" } } @@ -173,7 +173,7 @@ }, "end": { "line": 19, - "column": 18, + "column": 17, "program": "Line.ets" } } @@ -188,7 +188,7 @@ }, "end": { "line": 19, - "column": 18, + "column": 17, "program": "Line.ets" } } @@ -247,7 +247,7 @@ }, "end": { "line": 20, - "column": 16, + "column": 15, "program": "Line.ets" } } @@ -260,7 +260,7 @@ }, "end": { "line": 20, - "column": 16, + "column": 15, "program": "Line.ets" } } @@ -275,7 +275,7 @@ }, "end": { "line": 20, - "column": 16, + "column": 15, "program": "Line.ets" } } @@ -363,7 +363,7 @@ }, "end": { "line": 22, - "column": 30, + "column": 29, "program": "Line.ets" } } @@ -376,7 +376,7 @@ }, "end": { "line": 22, - "column": 30, + "column": 29, "program": "Line.ets" } } @@ -390,7 +390,7 @@ }, "end": { "line": 22, - "column": 30, + "column": 29, "program": "Line.ets" } } @@ -403,7 +403,7 @@ }, "end": { "line": 22, - "column": 30, + "column": 29, "program": "Line.ets" } } @@ -442,7 +442,7 @@ }, "end": { "line": 22, - "column": 42, + "column": 41, "program": "Line.ets" } } @@ -455,7 +455,7 @@ }, "end": { "line": 22, - "column": 42, + "column": 41, "program": "Line.ets" } } @@ -469,7 +469,7 @@ }, "end": { "line": 22, - "column": 42, + "column": 41, "program": "Line.ets" } } @@ -482,7 +482,7 @@ }, "end": { "line": 22, - "column": 42, + "column": 41, "program": "Line.ets" } } diff --git a/ets2panda/test/parser/ets/import_tests/repeat-expected.txt b/ets2panda/test/parser/ets/import_tests/repeat-expected.txt index 222c2edcea0..323c2a8d370 100644 --- a/ets2panda/test/parser/ets/import_tests/repeat-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/repeat-expected.txt @@ -248,7 +248,7 @@ }, "end": { "line": 20, - "column": 19, + "column": 18, "program": "repeat.ets" } } @@ -261,7 +261,7 @@ }, "end": { "line": 20, - "column": 19, + "column": 18, "program": "repeat.ets" } } @@ -274,7 +274,7 @@ }, "end": { "line": 20, - "column": 19, + "column": 18, "program": "repeat.ets" } } @@ -287,7 +287,7 @@ }, "end": { "line": 20, - "column": 19, + "column": 18, "program": "repeat.ets" } } @@ -376,7 +376,7 @@ }, "end": { "line": 20, - "column": 19, + "column": 18, "program": "repeat.ets" } } @@ -389,7 +389,7 @@ }, "end": { "line": 20, - "column": 19, + "column": 18, "program": "repeat.ets" } } @@ -430,7 +430,7 @@ }, "end": { "line": 20, - "column": 19, + "column": 18, "program": "repeat.ets" } } @@ -443,7 +443,7 @@ }, "end": { "line": 20, - "column": 19, + "column": 18, "program": "repeat.ets" } } @@ -458,7 +458,7 @@ }, "end": { "line": 20, - "column": 19, + "column": 18, "program": "repeat.ets" } } @@ -473,7 +473,7 @@ }, "end": { "line": 20, - "column": 19, + "column": 18, "program": "repeat.ets" } } @@ -517,8 +517,8 @@ "program": "repeat.ets" }, "end": { - "line": 22, - "column": 1, + "line": 21, + "column": 2, "program": "repeat.ets" } } 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 ca446caa965..cc13f0c26b2 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 @@ -102,7 +102,7 @@ }, "end": { "line": 17, - "column": 31, + "column": 30, "program": "infer_overriding_method_return_type.ets" } } @@ -115,7 +115,7 @@ }, "end": { "line": 17, - "column": 31, + "column": 30, "program": "infer_overriding_method_return_type.ets" } } @@ -342,7 +342,7 @@ }, "end": { "line": 20, - "column": 29, + "column": 27, "program": "infer_overriding_method_return_type.ets" } } @@ -355,7 +355,7 @@ }, "end": { "line": 20, - "column": 29, + "column": 27, "program": "infer_overriding_method_return_type.ets" } } diff --git a/ets2panda/test/parser/ets/inheritance-expected.txt b/ets2panda/test/parser/ets/inheritance-expected.txt index 69cb334eff0..35807519680 100644 --- a/ets2panda/test/parser/ets/inheritance-expected.txt +++ b/ets2panda/test/parser/ets/inheritance-expected.txt @@ -44,8 +44,8 @@ "program": "inheritance.ets" }, "end": { - "line": 19, - "column": 10, + "line": 17, + "column": 2, "program": "inheritance.ets" } } @@ -93,8 +93,8 @@ "program": "inheritance.ets" }, "end": { - "line": 22, - "column": 6, + "line": 20, + "column": 2, "program": "inheritance.ets" } } @@ -303,7 +303,7 @@ }, "end": { "line": 25, - "column": 49, + "column": 38, "program": "inheritance.ets" } } @@ -316,7 +316,7 @@ }, "end": { "line": 25, - "column": 49, + "column": 38, "program": "inheritance.ets" } } @@ -353,7 +353,7 @@ }, "end": { "line": 25, - "column": 62, + "column": 61, "program": "inheritance.ets" } } @@ -366,7 +366,7 @@ }, "end": { "line": 25, - "column": 62, + "column": 61, "program": "inheritance.ets" } } @@ -415,7 +415,7 @@ }, "end": { "line": 25, - "column": 77, + "column": 74, "program": "inheritance.ets" } } @@ -428,7 +428,7 @@ }, "end": { "line": 25, - "column": 77, + "column": 74, "program": "inheritance.ets" } } @@ -629,7 +629,7 @@ }, "end": { "line": 28, - "column": 40, + "column": 37, "program": "inheritance.ets" } } @@ -642,7 +642,7 @@ }, "end": { "line": 28, - "column": 40, + "column": 37, "program": "inheritance.ets" } } @@ -830,7 +830,7 @@ }, "end": { "line": 31, - "column": 60, + "column": 49, "program": "inheritance.ets" } } @@ -843,7 +843,7 @@ }, "end": { "line": 31, - "column": 60, + "column": 49, "program": "inheritance.ets" } } @@ -880,7 +880,7 @@ }, "end": { "line": 31, - "column": 75, + "column": 72, "program": "inheritance.ets" } } @@ -893,7 +893,7 @@ }, "end": { "line": 31, - "column": 75, + "column": 72, "program": "inheritance.ets" } } @@ -1094,7 +1094,7 @@ }, "end": { "line": 34, - "column": 47, + "column": 44, "program": "inheritance.ets" } } @@ -1107,7 +1107,7 @@ }, "end": { "line": 34, - "column": 47, + "column": 44, "program": "inheritance.ets" } } diff --git a/ets2panda/test/parser/ets/inheritance2-expected.txt b/ets2panda/test/parser/ets/inheritance2-expected.txt index 4c8c56e2b4e..8cac93e10ae 100644 --- a/ets2panda/test/parser/ets/inheritance2-expected.txt +++ b/ets2panda/test/parser/ets/inheritance2-expected.txt @@ -205,7 +205,7 @@ }, "end": { "line": 17, - "column": 20, + "column": 18, "program": "inheritance2.ets" } } @@ -218,7 +218,7 @@ }, "end": { "line": 17, - "column": 20, + "column": 18, "program": "inheritance2.ets" } } @@ -406,7 +406,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 18, "program": "inheritance2.ets" } } @@ -419,7 +419,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 18, "program": "inheritance2.ets" } } @@ -607,7 +607,7 @@ }, "end": { "line": 19, - "column": 20, + "column": 18, "program": "inheritance2.ets" } } @@ -620,7 +620,7 @@ }, "end": { "line": 19, - "column": 20, + "column": 18, "program": "inheritance2.ets" } } @@ -992,7 +992,7 @@ }, "end": { "line": 22, - "column": 16, + "column": 14, "program": "inheritance2.ets" } } @@ -1005,7 +1005,7 @@ }, "end": { "line": 22, - "column": 16, + "column": 14, "program": "inheritance2.ets" } } @@ -1055,7 +1055,7 @@ }, "end": { "line": 22, - "column": 23, + "column": 22, "program": "inheritance2.ets" } } @@ -1068,7 +1068,7 @@ }, "end": { "line": 22, - "column": 23, + "column": 22, "program": "inheritance2.ets" } } @@ -1152,7 +1152,7 @@ }, "end": { "line": 23, - "column": 16, + "column": 14, "program": "inheritance2.ets" } } @@ -1165,7 +1165,7 @@ }, "end": { "line": 23, - "column": 16, + "column": 14, "program": "inheritance2.ets" } } @@ -1266,7 +1266,7 @@ }, "end": { "line": 24, - "column": 16, + "column": 14, "program": "inheritance2.ets" } } @@ -1279,7 +1279,7 @@ }, "end": { "line": 24, - "column": 16, + "column": 14, "program": "inheritance2.ets" } } @@ -1380,7 +1380,7 @@ }, "end": { "line": 25, - "column": 16, + "column": 14, "program": "inheritance2.ets" } } @@ -1393,7 +1393,7 @@ }, "end": { "line": 25, - "column": 16, + "column": 14, "program": "inheritance2.ets" } } @@ -1494,7 +1494,7 @@ }, "end": { "line": 26, - "column": 21, + "column": 19, "program": "inheritance2.ets" } } @@ -1507,7 +1507,7 @@ }, "end": { "line": 26, - "column": 21, + "column": 19, "program": "inheritance2.ets" } } diff --git a/ets2panda/test/parser/ets/instanceof-expected.txt b/ets2panda/test/parser/ets/instanceof-expected.txt index 965bcf0e21e..c3275656e5f 100644 --- a/ets2panda/test/parser/ets/instanceof-expected.txt +++ b/ets2panda/test/parser/ets/instanceof-expected.txt @@ -319,7 +319,7 @@ }, "end": { "line": 16, - "column": 22, + "column": 21, "program": "instanceof.ets" } } @@ -332,7 +332,7 @@ }, "end": { "line": 16, - "column": 22, + "column": 21, "program": "instanceof.ets" } } @@ -346,7 +346,7 @@ }, "end": { "line": 16, - "column": 22, + "column": 21, "program": "instanceof.ets" } } @@ -359,7 +359,7 @@ }, "end": { "line": 16, - "column": 22, + "column": 21, "program": "instanceof.ets" } } @@ -434,7 +434,7 @@ }, "end": { "line": 17, - "column": 27, + "column": 26, "program": "instanceof.ets" } } @@ -447,7 +447,7 @@ }, "end": { "line": 17, - "column": 27, + "column": 26, "program": "instanceof.ets" } } @@ -460,7 +460,7 @@ }, "end": { "line": 17, - "column": 27, + "column": 26, "program": "instanceof.ets" } } diff --git a/ets2panda/test/parser/ets/interfaceMethodWithOptional-expected.txt b/ets2panda/test/parser/ets/interfaceMethodWithOptional-expected.txt index eaa6f0cc5c7..2231e020c87 100644 --- a/ets2panda/test/parser/ets/interfaceMethodWithOptional-expected.txt +++ b/ets2panda/test/parser/ets/interfaceMethodWithOptional-expected.txt @@ -89,7 +89,7 @@ }, "end": { "line": 17, - "column": 18, + "column": 17, "program": "interfaceMethodWithOptional.ets" } } @@ -102,7 +102,7 @@ }, "end": { "line": 17, - "column": 18, + "column": 17, "program": "interfaceMethodWithOptional.ets" } } @@ -116,7 +116,7 @@ }, "end": { "line": 17, - "column": 18, + "column": 17, "program": "interfaceMethodWithOptional.ets" } } @@ -129,7 +129,7 @@ }, "end": { "line": 17, - "column": 18, + "column": 17, "program": "interfaceMethodWithOptional.ets" } } @@ -383,8 +383,8 @@ "program": "interfaceMethodWithOptional.ets" }, "end": { - "line": 19, - "column": 1, + "line": 18, + "column": 2, "program": "interfaceMethodWithOptional.ets" } } 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 10dd605a018..41d17fc97a2 100644 --- a/ets2panda/test/parser/ets/interface_abstract_noreturn_function-expected.txt +++ b/ets2panda/test/parser/ets/interface_abstract_noreturn_function-expected.txt @@ -135,8 +135,8 @@ "program": "interface_abstract_noreturn_function.ets" }, "end": { - "line": 19, - "column": 1, + "line": 18, + "column": 2, "program": "interface_abstract_noreturn_function.ets" } } 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 e10d00f2da2..9ac31fdf23d 100644 --- a/ets2panda/test/parser/ets/interface_method_default_body-expected.txt +++ b/ets2panda/test/parser/ets/interface_method_default_body-expected.txt @@ -150,8 +150,8 @@ "program": "interface_method_default_body.ets" }, "end": { - "line": 20, - "column": 10, + "line": 18, + "column": 2, "program": "interface_method_default_body.ets" } } @@ -450,7 +450,7 @@ }, "end": { "line": 20, - "column": 26, + "column": 24, "program": "interface_method_default_body.ets" } } @@ -463,7 +463,7 @@ }, "end": { "line": 20, - "column": 26, + "column": 24, "program": "interface_method_default_body.ets" } } @@ -476,7 +476,7 @@ }, "end": { "line": 20, - "column": 26, + "column": 24, "program": "interface_method_default_body.ets" } } @@ -489,8 +489,8 @@ "program": "interface_method_default_body.ets" }, "end": { - "line": 25, - "column": 6, + "line": 23, + "column": 2, "program": "interface_method_default_body.ets" } } @@ -548,7 +548,7 @@ }, "end": { "line": 25, - "column": 24, + "column": 22, "program": "interface_method_default_body.ets" } } @@ -561,7 +561,7 @@ }, "end": { "line": 25, - "column": 24, + "column": 22, "program": "interface_method_default_body.ets" } } diff --git a/ets2panda/test/parser/ets/interfaces-expected.txt b/ets2panda/test/parser/ets/interfaces-expected.txt index 3c1e5e6d94d..7f302f46c14 100644 --- a/ets2panda/test/parser/ets/interfaces-expected.txt +++ b/ets2panda/test/parser/ets/interfaces-expected.txt @@ -78,7 +78,7 @@ }, "end": { "line": 17, - "column": 12, + "column": 11, "program": "interfaces.ets" } } @@ -91,7 +91,7 @@ }, "end": { "line": 17, - "column": 12, + "column": 11, "program": "interfaces.ets" } } @@ -202,7 +202,7 @@ }, "end": { "line": 17, - "column": 12, + "column": 11, "program": "interfaces.ets" } } @@ -215,7 +215,7 @@ }, "end": { "line": 17, - "column": 12, + "column": 11, "program": "interfaces.ets" } } @@ -230,7 +230,7 @@ }, "end": { "line": 17, - "column": 12, + "column": 11, "program": "interfaces.ets" } } @@ -245,7 +245,7 @@ }, "end": { "line": 17, - "column": 12, + "column": 11, "program": "interfaces.ets" } } @@ -322,7 +322,7 @@ }, "end": { "line": 18, - "column": 12, + "column": 11, "program": "interfaces.ets" } } @@ -335,7 +335,7 @@ }, "end": { "line": 18, - "column": 12, + "column": 11, "program": "interfaces.ets" } } @@ -446,7 +446,7 @@ }, "end": { "line": 18, - "column": 12, + "column": 11, "program": "interfaces.ets" } } @@ -459,7 +459,7 @@ }, "end": { "line": 18, - "column": 12, + "column": 11, "program": "interfaces.ets" } } @@ -474,7 +474,7 @@ }, "end": { "line": 18, - "column": 12, + "column": 11, "program": "interfaces.ets" } } @@ -489,7 +489,7 @@ }, "end": { "line": 18, - "column": 12, + "column": 11, "program": "interfaces.ets" } } @@ -533,8 +533,8 @@ "program": "interfaces.ets" }, "end": { - "line": 21, - "column": 10, + "line": 19, + "column": 2, "program": "interfaces.ets" } } @@ -1030,8 +1030,8 @@ "program": "interfaces.ets" }, "end": { - "line": 27, - "column": 10, + "line": 25, + "column": 2, "program": "interfaces.ets" } } @@ -1103,7 +1103,7 @@ }, "end": { "line": 27, - "column": 24, + "column": 23, "program": "interfaces.ets" } } @@ -1116,7 +1116,7 @@ }, "end": { "line": 27, - "column": 24, + "column": 23, "program": "interfaces.ets" } } @@ -1129,7 +1129,7 @@ }, "end": { "line": 27, - "column": 24, + "column": 23, "program": "interfaces.ets" } } @@ -1165,7 +1165,7 @@ }, "end": { "line": 27, - "column": 29, + "column": 27, "program": "interfaces.ets" } } @@ -1178,7 +1178,7 @@ }, "end": { "line": 27, - "column": 29, + "column": 27, "program": "interfaces.ets" } } @@ -1191,7 +1191,7 @@ }, "end": { "line": 27, - "column": 29, + "column": 27, "program": "interfaces.ets" } } @@ -1204,8 +1204,8 @@ "program": "interfaces.ets" }, "end": { - "line": 31, - "column": 1, + "line": 28, + "column": 2, "program": "interfaces.ets" } } diff --git a/ets2panda/test/parser/ets/internalParsing-expected.txt b/ets2panda/test/parser/ets/internalParsing-expected.txt index 696c137336a..d1ae054f435 100644 --- a/ets2panda/test/parser/ets/internalParsing-expected.txt +++ b/ets2panda/test/parser/ets/internalParsing-expected.txt @@ -911,7 +911,7 @@ }, "end": { "line": 29, - "column": 21, + "column": 19, "program": "internalParsing.ets" } } @@ -924,7 +924,7 @@ }, "end": { "line": 29, - "column": 21, + "column": 19, "program": "internalParsing.ets" } } @@ -974,7 +974,7 @@ }, "end": { "line": 29, - "column": 28, + "column": 27, "program": "internalParsing.ets" } } @@ -987,7 +987,7 @@ }, "end": { "line": 29, - "column": 28, + "column": 27, "program": "internalParsing.ets" } } diff --git a/ets2panda/test/parser/ets/internalProtectedParsing-expected.txt b/ets2panda/test/parser/ets/internalProtectedParsing-expected.txt index 30c57b773bc..950aaa7285a 100644 --- a/ets2panda/test/parser/ets/internalProtectedParsing-expected.txt +++ b/ets2panda/test/parser/ets/internalProtectedParsing-expected.txt @@ -1148,7 +1148,7 @@ }, "end": { "line": 33, - "column": 21, + "column": 19, "program": "internalProtectedParsing.ets" } } @@ -1161,7 +1161,7 @@ }, "end": { "line": 33, - "column": 21, + "column": 19, "program": "internalProtectedParsing.ets" } } @@ -1211,7 +1211,7 @@ }, "end": { "line": 33, - "column": 28, + "column": 27, "program": "internalProtectedParsing.ets" } } @@ -1224,7 +1224,7 @@ }, "end": { "line": 33, - "column": 28, + "column": 27, "program": "internalProtectedParsing.ets" } } diff --git a/ets2panda/test/parser/ets/lambda-expected.txt b/ets2panda/test/parser/ets/lambda-expected.txt index 8c34609e1db..0e78b381527 100644 --- a/ets2panda/test/parser/ets/lambda-expected.txt +++ b/ets2panda/test/parser/ets/lambda-expected.txt @@ -221,7 +221,7 @@ }, "end": { "line": 16, - "column": 37, + "column": 36, "program": "lambda.ets" } } @@ -234,7 +234,7 @@ }, "end": { "line": 16, - "column": 37, + "column": 36, "program": "lambda.ets" } } @@ -248,7 +248,7 @@ }, "end": { "line": 16, - "column": 37, + "column": 36, "program": "lambda.ets" } } @@ -261,7 +261,7 @@ }, "end": { "line": 16, - "column": 37, + "column": 36, "program": "lambda.ets" } } @@ -594,7 +594,7 @@ }, "end": { "line": 21, - "column": 22, + "column": 21, "program": "lambda.ets" } } @@ -607,7 +607,7 @@ }, "end": { "line": 21, - "column": 22, + "column": 21, "program": "lambda.ets" } } @@ -621,7 +621,7 @@ }, "end": { "line": 21, - "column": 22, + "column": 21, "program": "lambda.ets" } } @@ -634,7 +634,7 @@ }, "end": { "line": 21, - "column": 22, + "column": 21, "program": "lambda.ets" } } 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 57d9f461f6f..7a623b9e183 100644 --- a/ets2panda/test/parser/ets/lambda-type-inference-alias-expected.txt +++ b/ets2panda/test/parser/ets/lambda-type-inference-alias-expected.txt @@ -160,7 +160,7 @@ }, "end": { "line": 17, - "column": 23, + "column": 22, "program": "lambda-type-inference-alias.ets" } } @@ -173,7 +173,7 @@ }, "end": { "line": 17, - "column": 23, + "column": 22, "program": "lambda-type-inference-alias.ets" } } @@ -403,7 +403,7 @@ }, "end": { "line": 19, - "column": 32, + "column": 31, "program": "lambda-type-inference-alias.ets" } } @@ -416,7 +416,7 @@ }, "end": { "line": 19, - "column": 32, + "column": 31, "program": "lambda-type-inference-alias.ets" } } @@ -430,7 +430,7 @@ }, "end": { "line": 19, - "column": 32, + "column": 31, "program": "lambda-type-inference-alias.ets" } } @@ -443,7 +443,7 @@ }, "end": { "line": 19, - "column": 32, + "column": 31, "program": "lambda-type-inference-alias.ets" } } 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 9bd55797c75..57e563c0b44 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 @@ -268,7 +268,7 @@ }, "end": { "line": 16, - "column": 43, + "column": 42, "program": "lambda-type-inference-arg-no-type.ets" } } @@ -281,7 +281,7 @@ }, "end": { "line": 16, - "column": 43, + "column": 42, "program": "lambda-type-inference-arg-no-type.ets" } } @@ -295,7 +295,7 @@ }, "end": { "line": 16, - "column": 43, + "column": 42, "program": "lambda-type-inference-arg-no-type.ets" } } @@ -308,7 +308,7 @@ }, "end": { "line": 16, - "column": 43, + "column": 42, "program": "lambda-type-inference-arg-no-type.ets" } } diff --git a/ets2panda/test/parser/ets/lambda-type-inference-expected.txt b/ets2panda/test/parser/ets/lambda-type-inference-expected.txt index d25ca49fb4b..84633d12dfe 100644 --- a/ets2panda/test/parser/ets/lambda-type-inference-expected.txt +++ b/ets2panda/test/parser/ets/lambda-type-inference-expected.txt @@ -788,7 +788,7 @@ }, "end": { "line": 24, - "column": 61, + "column": 60, "program": "lambda-type-inference.ets" } } @@ -801,7 +801,7 @@ }, "end": { "line": 24, - "column": 61, + "column": 60, "program": "lambda-type-inference.ets" } } @@ -815,7 +815,7 @@ }, "end": { "line": 24, - "column": 61, + "column": 60, "program": "lambda-type-inference.ets" } } @@ -828,7 +828,7 @@ }, "end": { "line": 24, - "column": 61, + "column": 60, "program": "lambda-type-inference.ets" } } @@ -1669,7 +1669,7 @@ }, "end": { "line": 37, - "column": 28, + "column": 27, "program": "lambda-type-inference.ets" } } @@ -1682,7 +1682,7 @@ }, "end": { "line": 37, - "column": 28, + "column": 27, "program": "lambda-type-inference.ets" } } @@ -1951,7 +1951,7 @@ }, "end": { "line": 40, - "column": 28, + "column": 27, "program": "lambda-type-inference.ets" } } @@ -1964,7 +1964,7 @@ }, "end": { "line": 40, - "column": 28, + "column": 27, "program": "lambda-type-inference.ets" } } @@ -2272,7 +2272,7 @@ }, "end": { "line": 43, - "column": 46, + "column": 45, "program": "lambda-type-inference.ets" } } @@ -2285,7 +2285,7 @@ }, "end": { "line": 43, - "column": 46, + "column": 45, "program": "lambda-type-inference.ets" } } @@ -2299,7 +2299,7 @@ }, "end": { "line": 43, - "column": 46, + "column": 45, "program": "lambda-type-inference.ets" } } @@ -2312,7 +2312,7 @@ }, "end": { "line": 43, - "column": 46, + "column": 45, "program": "lambda-type-inference.ets" } } 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 5c5a6f6e0d7..cd84c0e1c0d 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 @@ -268,7 +268,7 @@ }, "end": { "line": 16, - "column": 43, + "column": 42, "program": "lambda-type-inference-no-ret-type.ets" } } @@ -281,7 +281,7 @@ }, "end": { "line": 16, - "column": 43, + "column": 42, "program": "lambda-type-inference-no-ret-type.ets" } } @@ -295,7 +295,7 @@ }, "end": { "line": 16, - "column": 43, + "column": 42, "program": "lambda-type-inference-no-ret-type.ets" } } @@ -308,7 +308,7 @@ }, "end": { "line": 16, - "column": 43, + "column": 42, "program": "lambda-type-inference-no-ret-type.ets" } } @@ -754,7 +754,7 @@ }, "end": { "line": 21, - "column": 28, + "column": 27, "program": "lambda-type-inference-no-ret-type.ets" } } @@ -767,7 +767,7 @@ }, "end": { "line": 21, - "column": 28, + "column": 27, "program": "lambda-type-inference-no-ret-type.ets" } } @@ -781,7 +781,7 @@ }, "end": { "line": 21, - "column": 28, + "column": 27, "program": "lambda-type-inference-no-ret-type.ets" } } @@ -794,7 +794,7 @@ }, "end": { "line": 21, - "column": 28, + "column": 27, "program": "lambda-type-inference-no-ret-type.ets" } } 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 5553b71d0c2..f67cc61f64a 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 @@ -438,7 +438,7 @@ }, "end": { "line": 21, - "column": 29, + "column": 27, "program": "lambda-type-inference-overloaded-3.ets" } } @@ -451,7 +451,7 @@ }, "end": { "line": 21, - "column": 29, + "column": 27, "program": "lambda-type-inference-overloaded-3.ets" } } diff --git a/ets2panda/test/parser/ets/lambdaAsFunctionParam-expected.txt b/ets2panda/test/parser/ets/lambdaAsFunctionParam-expected.txt index 6911e73854c..5d3b852fd46 100644 --- a/ets2panda/test/parser/ets/lambdaAsFunctionParam-expected.txt +++ b/ets2panda/test/parser/ets/lambdaAsFunctionParam-expected.txt @@ -164,7 +164,7 @@ }, "end": { "line": 17, - "column": 17, + "column": 16, "program": "lambdaAsFunctionParam.ets" } } @@ -177,7 +177,7 @@ }, "end": { "line": 17, - "column": 17, + "column": 16, "program": "lambdaAsFunctionParam.ets" } } @@ -191,7 +191,7 @@ }, "end": { "line": 17, - "column": 17, + "column": 16, "program": "lambdaAsFunctionParam.ets" } } @@ -204,7 +204,7 @@ }, "end": { "line": 17, - "column": 17, + "column": 16, "program": "lambdaAsFunctionParam.ets" } } @@ -243,7 +243,7 @@ }, "end": { "line": 17, - "column": 23, + "column": 22, "program": "lambdaAsFunctionParam.ets" } } @@ -256,7 +256,7 @@ }, "end": { "line": 17, - "column": 23, + "column": 22, "program": "lambdaAsFunctionParam.ets" } } @@ -270,7 +270,7 @@ }, "end": { "line": 17, - "column": 23, + "column": 22, "program": "lambdaAsFunctionParam.ets" } } @@ -283,7 +283,7 @@ }, "end": { "line": 17, - "column": 23, + "column": 22, "program": "lambdaAsFunctionParam.ets" } } @@ -318,7 +318,7 @@ }, "end": { "line": 17, - "column": 34, + "column": 33, "program": "lambdaAsFunctionParam.ets" } } @@ -331,7 +331,7 @@ }, "end": { "line": 17, - "column": 34, + "column": 33, "program": "lambdaAsFunctionParam.ets" } } @@ -344,7 +344,7 @@ }, "end": { "line": 17, - "column": 34, + "column": 33, "program": "lambdaAsFunctionParam.ets" } } @@ -358,7 +358,7 @@ }, "end": { "line": 17, - "column": 34, + "column": 33, "program": "lambdaAsFunctionParam.ets" } } @@ -371,7 +371,7 @@ }, "end": { "line": 17, - "column": 34, + "column": 33, "program": "lambdaAsFunctionParam.ets" } } @@ -1037,7 +1037,7 @@ }, "end": { "line": 23, - "column": 26, + "column": 25, "program": "lambdaAsFunctionParam.ets" } } @@ -1050,7 +1050,7 @@ }, "end": { "line": 23, - "column": 26, + "column": 25, "program": "lambdaAsFunctionParam.ets" } } @@ -1077,7 +1077,7 @@ }, "end": { "line": 23, - "column": 27, + "column": 26, "program": "lambdaAsFunctionParam.ets" } } @@ -1090,7 +1090,7 @@ }, "end": { "line": 23, - "column": 27, + "column": 26, "program": "lambdaAsFunctionParam.ets" } } @@ -1236,7 +1236,7 @@ }, "end": { "line": 24, - "column": 20, + "column": 19, "program": "lambdaAsFunctionParam.ets" } } @@ -1249,7 +1249,7 @@ }, "end": { "line": 24, - "column": 20, + "column": 19, "program": "lambdaAsFunctionParam.ets" } } @@ -1263,7 +1263,7 @@ }, "end": { "line": 24, - "column": 20, + "column": 19, "program": "lambdaAsFunctionParam.ets" } } @@ -1276,7 +1276,7 @@ }, "end": { "line": 24, - "column": 20, + "column": 19, "program": "lambdaAsFunctionParam.ets" } } @@ -1315,7 +1315,7 @@ }, "end": { "line": 24, - "column": 31, + "column": 30, "program": "lambdaAsFunctionParam.ets" } } @@ -1328,7 +1328,7 @@ }, "end": { "line": 24, - "column": 31, + "column": 30, "program": "lambdaAsFunctionParam.ets" } } @@ -1342,7 +1342,7 @@ }, "end": { "line": 24, - "column": 31, + "column": 30, "program": "lambdaAsFunctionParam.ets" } } @@ -1355,7 +1355,7 @@ }, "end": { "line": 24, - "column": 31, + "column": 30, "program": "lambdaAsFunctionParam.ets" } } @@ -1390,7 +1390,7 @@ }, "end": { "line": 24, - "column": 42, + "column": 39, "program": "lambdaAsFunctionParam.ets" } } @@ -1403,7 +1403,7 @@ }, "end": { "line": 24, - "column": 42, + "column": 39, "program": "lambdaAsFunctionParam.ets" } } 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 a2c4abe493b..1b62bff898a 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 @@ -569,7 +569,7 @@ }, "end": { "line": 18, - "column": 30, + "column": 28, "program": "lambda_import_alias_1-2.ets" } } @@ -582,7 +582,7 @@ }, "end": { "line": 18, - "column": 30, + "column": 28, "program": "lambda_import_alias_1-2.ets" } } @@ -595,7 +595,7 @@ }, "end": { "line": 18, - "column": 30, + "column": 28, "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 c1be66990a3..e54f96ccfad 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 @@ -469,7 +469,7 @@ }, "end": { "line": 17, - "column": 31, + "column": 29, "program": "lambda_import_alias_1-3.ets" } } @@ -482,7 +482,7 @@ }, "end": { "line": 17, - "column": 31, + "column": 29, "program": "lambda_import_alias_1-3.ets" } } @@ -523,7 +523,7 @@ }, "end": { "line": 17, - "column": 45, + "column": 44, "program": "lambda_import_alias_1-3.ets" } } @@ -536,7 +536,7 @@ }, "end": { "line": 17, - "column": 45, + "column": 44, "program": "lambda_import_alias_1-3.ets" } } 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 0707e523d50..83244026aba 100644 --- a/ets2panda/test/parser/ets/lambda_optional_param_1-expected.txt +++ b/ets2panda/test/parser/ets/lambda_optional_param_1-expected.txt @@ -89,7 +89,7 @@ }, "end": { "line": 17, - "column": 21, + "column": 20, "program": "lambda_optional_param_1.ets" } } @@ -102,7 +102,7 @@ }, "end": { "line": 17, - "column": 21, + "column": 20, "program": "lambda_optional_param_1.ets" } } @@ -116,7 +116,7 @@ }, "end": { "line": 17, - "column": 21, + "column": 20, "program": "lambda_optional_param_1.ets" } } @@ -129,7 +129,7 @@ }, "end": { "line": 17, - "column": 21, + "column": 20, "program": "lambda_optional_param_1.ets" } } @@ -176,7 +176,7 @@ }, "end": { "line": 17, - "column": 42, + "column": 41, "program": "lambda_optional_param_1.ets" } } @@ -189,7 +189,7 @@ }, "end": { "line": 17, - "column": 42, + "column": 41, "program": "lambda_optional_param_1.ets" } } @@ -203,7 +203,7 @@ }, "end": { "line": 17, - "column": 42, + "column": 41, "program": "lambda_optional_param_1.ets" } } @@ -216,7 +216,7 @@ }, "end": { "line": 17, - "column": 42, + "column": 41, "program": "lambda_optional_param_1.ets" } } @@ -251,7 +251,7 @@ }, "end": { "line": 17, - "column": 51, + "column": 50, "program": "lambda_optional_param_1.ets" } } @@ -264,7 +264,7 @@ }, "end": { "line": 17, - "column": 51, + "column": 50, "program": "lambda_optional_param_1.ets" } } @@ -277,7 +277,7 @@ }, "end": { "line": 17, - "column": 51, + "column": 50, "program": "lambda_optional_param_1.ets" } } @@ -291,7 +291,7 @@ }, "end": { "line": 17, - "column": 51, + "column": 50, "program": "lambda_optional_param_1.ets" } } @@ -304,7 +304,7 @@ }, "end": { "line": 17, - "column": 51, + "column": 50, "program": "lambda_optional_param_1.ets" } } diff --git a/ets2panda/test/parser/ets/launch-expected.txt b/ets2panda/test/parser/ets/launch-expected.txt index 98f6cb3e8d7..c9008b00891 100755 --- a/ets2panda/test/parser/ets/launch-expected.txt +++ b/ets2panda/test/parser/ets/launch-expected.txt @@ -266,7 +266,7 @@ }, "end": { "line": 20, - "column": 37, + "column": 35, "program": "launch.ets" } } @@ -279,7 +279,7 @@ }, "end": { "line": 20, - "column": 37, + "column": 35, "program": "launch.ets" } } @@ -320,7 +320,7 @@ }, "end": { "line": 21, - "column": 27, + "column": 26, "program": "launch.ets" } } @@ -333,7 +333,7 @@ }, "end": { "line": 21, - "column": 27, + "column": 26, "program": "launch.ets" } } @@ -498,7 +498,7 @@ }, "end": { "line": 24, - "column": 34, + "column": 32, "program": "launch.ets" } } @@ -511,7 +511,7 @@ }, "end": { "line": 24, - "column": 34, + "column": 32, "program": "launch.ets" } } @@ -552,7 +552,7 @@ }, "end": { "line": 25, - "column": 27, + "column": 26, "program": "launch.ets" } } @@ -565,7 +565,7 @@ }, "end": { "line": 25, - "column": 27, + "column": 26, "program": "launch.ets" } } @@ -1086,7 +1086,7 @@ }, "end": { "line": 29, - "column": 41, + "column": 39, "program": "launch.ets" } } @@ -1099,7 +1099,7 @@ }, "end": { "line": 29, - "column": 41, + "column": 39, "program": "launch.ets" } } @@ -1140,7 +1140,7 @@ }, "end": { "line": 30, - "column": 21, + "column": 20, "program": "launch.ets" } } @@ -1153,7 +1153,7 @@ }, "end": { "line": 30, - "column": 21, + "column": 20, "program": "launch.ets" } } @@ -1366,7 +1366,7 @@ }, "end": { "line": 33, - "column": 31, + "column": 29, "program": "launch.ets" } } @@ -1379,7 +1379,7 @@ }, "end": { "line": 33, - "column": 31, + "column": 29, "program": "launch.ets" } } @@ -1493,7 +1493,7 @@ }, "end": { "line": 34, - "column": 17, + "column": 16, "program": "launch.ets" } } @@ -1506,7 +1506,7 @@ }, "end": { "line": 34, - "column": 17, + "column": 16, "program": "launch.ets" } } @@ -1638,7 +1638,7 @@ }, "end": { "line": 34, - "column": 42, + "column": 41, "program": "launch.ets" } } @@ -1651,7 +1651,7 @@ }, "end": { "line": 34, - "column": 42, + "column": 41, "program": "launch.ets" } } @@ -1664,7 +1664,7 @@ }, "end": { "line": 34, - "column": 42, + "column": 41, "program": "launch.ets" } } @@ -1742,7 +1742,7 @@ }, "end": { "line": 35, - "column": 21, + "column": 20, "program": "launch.ets" } } @@ -1755,7 +1755,7 @@ }, "end": { "line": 35, - "column": 21, + "column": 20, "program": "launch.ets" } } @@ -1970,7 +1970,7 @@ }, "end": { "line": 39, - "column": 21, + "column": 20, "program": "launch.ets" } } @@ -1983,7 +1983,7 @@ }, "end": { "line": 39, - "column": 21, + "column": 20, "program": "launch.ets" } } @@ -2010,7 +2010,7 @@ }, "end": { "line": 39, - "column": 22, + "column": 21, "program": "launch.ets" } } @@ -2023,7 +2023,7 @@ }, "end": { "line": 39, - "column": 22, + "column": 21, "program": "launch.ets" } } @@ -2180,7 +2180,7 @@ }, "end": { "line": 40, - "column": 21, + "column": 20, "program": "launch.ets" } } @@ -2193,7 +2193,7 @@ }, "end": { "line": 40, - "column": 21, + "column": 20, "program": "launch.ets" } } @@ -2278,7 +2278,7 @@ }, "end": { "line": 40, - "column": 40, + "column": 39, "program": "launch.ets" } } @@ -2291,7 +2291,7 @@ }, "end": { "line": 40, - "column": 40, + "column": 39, "program": "launch.ets" } } @@ -2304,7 +2304,7 @@ }, "end": { "line": 40, - "column": 40, + "column": 39, "program": "launch.ets" } } @@ -2489,7 +2489,7 @@ }, "end": { "line": 41, - "column": 21, + "column": 20, "program": "launch.ets" } } @@ -2502,7 +2502,7 @@ }, "end": { "line": 41, - "column": 21, + "column": 20, "program": "launch.ets" } } @@ -2539,7 +2539,7 @@ }, "end": { "line": 41, - "column": 35, + "column": 34, "program": "launch.ets" } } @@ -2552,7 +2552,7 @@ }, "end": { "line": 41, - "column": 35, + "column": 34, "program": "launch.ets" } } @@ -2565,7 +2565,7 @@ }, "end": { "line": 41, - "column": 35, + "column": 34, "program": "launch.ets" } } @@ -2750,7 +2750,7 @@ }, "end": { "line": 42, - "column": 21, + "column": 20, "program": "launch.ets" } } @@ -2763,7 +2763,7 @@ }, "end": { "line": 42, - "column": 21, + "column": 20, "program": "launch.ets" } } @@ -2800,7 +2800,7 @@ }, "end": { "line": 42, - "column": 35, + "column": 34, "program": "launch.ets" } } @@ -2813,7 +2813,7 @@ }, "end": { "line": 42, - "column": 35, + "column": 34, "program": "launch.ets" } } @@ -2826,7 +2826,7 @@ }, "end": { "line": 42, - "column": 35, + "column": 34, "program": "launch.ets" } } @@ -3011,7 +3011,7 @@ }, "end": { "line": 43, - "column": 21, + "column": 20, "program": "launch.ets" } } @@ -3024,7 +3024,7 @@ }, "end": { "line": 43, - "column": 21, + "column": 20, "program": "launch.ets" } } @@ -3061,7 +3061,7 @@ }, "end": { "line": 43, - "column": 35, + "column": 34, "program": "launch.ets" } } @@ -3074,7 +3074,7 @@ }, "end": { "line": 43, - "column": 35, + "column": 34, "program": "launch.ets" } } @@ -3087,7 +3087,7 @@ }, "end": { "line": 43, - "column": 35, + "column": 34, "program": "launch.ets" } } @@ -3233,7 +3233,7 @@ }, "end": { "line": 44, - "column": 36, + "column": 34, "program": "launch.ets" } } @@ -3246,7 +3246,7 @@ }, "end": { "line": 44, - "column": 36, + "column": 34, "program": "launch.ets" } } @@ -3259,7 +3259,7 @@ }, "end": { "line": 44, - "column": 36, + "column": 34, "program": "launch.ets" } } @@ -3432,7 +3432,7 @@ }, "end": { "line": 45, - "column": 21, + "column": 20, "program": "launch.ets" } } @@ -3445,7 +3445,7 @@ }, "end": { "line": 45, - "column": 21, + "column": 20, "program": "launch.ets" } } @@ -3530,7 +3530,7 @@ }, "end": { "line": 45, - "column": 40, + "column": 39, "program": "launch.ets" } } @@ -3543,7 +3543,7 @@ }, "end": { "line": 45, - "column": 40, + "column": 39, "program": "launch.ets" } } @@ -3556,7 +3556,7 @@ }, "end": { "line": 45, - "column": 40, + "column": 39, "program": "launch.ets" } } 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 2bfacd37998..072c424d63b 100644 --- a/ets2panda/test/parser/ets/launch_function_returning_void-expected.txt +++ b/ets2panda/test/parser/ets/launch_function_returning_void-expected.txt @@ -521,7 +521,7 @@ }, "end": { "line": 22, - "column": 23, + "column": 21, "program": "launch_function_returning_void.ets" } } @@ -534,7 +534,7 @@ }, "end": { "line": 22, - "column": 23, + "column": 21, "program": "launch_function_returning_void.ets" } } diff --git a/ets2panda/test/parser/ets/launch_ret-expected.txt b/ets2panda/test/parser/ets/launch_ret-expected.txt index 6ad64454496..95123a1f98d 100644 --- a/ets2panda/test/parser/ets/launch_ret-expected.txt +++ b/ets2panda/test/parser/ets/launch_ret-expected.txt @@ -583,7 +583,7 @@ }, "end": { "line": 24, - "column": 22, + "column": 20, "program": "launch_ret.ets" } } @@ -596,7 +596,7 @@ }, "end": { "line": 24, - "column": 22, + "column": 20, "program": "launch_ret.ets" } } diff --git a/ets2panda/test/parser/ets/launch_super-expected.txt b/ets2panda/test/parser/ets/launch_super-expected.txt index 960994031d1..c23ea9fa110 100755 --- a/ets2panda/test/parser/ets/launch_super-expected.txt +++ b/ets2panda/test/parser/ets/launch_super-expected.txt @@ -408,7 +408,7 @@ }, "end": { "line": 22, - "column": 29, + "column": 27, "program": "launch_super.ets" } } @@ -421,7 +421,7 @@ }, "end": { "line": 22, - "column": 29, + "column": 27, "program": "launch_super.ets" } } diff --git a/ets2panda/test/parser/ets/launch_this_callee-expected.txt b/ets2panda/test/parser/ets/launch_this_callee-expected.txt index f4c5f717d45..7d7c1372363 100755 --- a/ets2panda/test/parser/ets/launch_this_callee-expected.txt +++ b/ets2panda/test/parser/ets/launch_this_callee-expected.txt @@ -290,7 +290,7 @@ }, "end": { "line": 20, - "column": 26, + "column": 25, "program": "launch_this_callee.ets" } } @@ -303,7 +303,7 @@ }, "end": { "line": 20, - "column": 26, + "column": 25, "program": "launch_this_callee.ets" } } @@ -330,7 +330,7 @@ }, "end": { "line": 20, - "column": 28, + "column": 26, "program": "launch_this_callee.ets" } } @@ -343,7 +343,7 @@ }, "end": { "line": 20, - "column": 28, + "column": 26, "program": "launch_this_callee.ets" } } @@ -471,7 +471,7 @@ }, "end": { "line": 21, - "column": 23, + "column": 22, "program": "launch_this_callee.ets" } } @@ -484,7 +484,7 @@ }, "end": { "line": 21, - "column": 23, + "column": 22, "program": "launch_this_callee.ets" } } @@ -526,7 +526,7 @@ }, "end": { "line": 21, - "column": 32, + "column": 31, "program": "launch_this_callee.ets" } } @@ -539,7 +539,7 @@ }, "end": { "line": 21, - "column": 32, + "column": 31, "program": "launch_this_callee.ets" } } @@ -553,7 +553,7 @@ }, "end": { "line": 21, - "column": 32, + "column": 31, "program": "launch_this_callee.ets" } } @@ -566,7 +566,7 @@ }, "end": { "line": 21, - "column": 32, + "column": 31, "program": "launch_this_callee.ets" } } @@ -601,7 +601,7 @@ }, "end": { "line": 21, - "column": 40, + "column": 39, "program": "launch_this_callee.ets" } } @@ -614,7 +614,7 @@ }, "end": { "line": 21, - "column": 40, + "column": 39, "program": "launch_this_callee.ets" } } @@ -627,7 +627,7 @@ }, "end": { "line": 21, - "column": 40, + "column": 39, "program": "launch_this_callee.ets" } } @@ -810,7 +810,7 @@ }, "end": { "line": 24, - "column": 22, + "column": 21, "program": "launch_this_callee.ets" } } @@ -823,7 +823,7 @@ }, "end": { "line": 24, - "column": 22, + "column": 21, "program": "launch_this_callee.ets" } } @@ -837,7 +837,7 @@ }, "end": { "line": 24, - "column": 22, + "column": 21, "program": "launch_this_callee.ets" } } @@ -850,7 +850,7 @@ }, "end": { "line": 24, - "column": 22, + "column": 21, "program": "launch_this_callee.ets" } } @@ -885,7 +885,7 @@ }, "end": { "line": 24, - "column": 29, + "column": 27, "program": "launch_this_callee.ets" } } @@ -898,7 +898,7 @@ }, "end": { "line": 24, - "column": 29, + "column": 27, "program": "launch_this_callee.ets" } } @@ -1095,7 +1095,7 @@ }, "end": { "line": 28, - "column": 27, + "column": 26, "program": "launch_this_callee.ets" } } @@ -1108,7 +1108,7 @@ }, "end": { "line": 28, - "column": 27, + "column": 26, "program": "launch_this_callee.ets" } } @@ -1135,7 +1135,7 @@ }, "end": { "line": 28, - "column": 29, + "column": 27, "program": "launch_this_callee.ets" } } @@ -1148,7 +1148,7 @@ }, "end": { "line": 28, - "column": 29, + "column": 27, "program": "launch_this_callee.ets" } } @@ -1292,7 +1292,7 @@ }, "end": { "line": 29, - "column": 23, + "column": 22, "program": "launch_this_callee.ets" } } @@ -1305,7 +1305,7 @@ }, "end": { "line": 29, - "column": 23, + "column": 22, "program": "launch_this_callee.ets" } } @@ -1347,7 +1347,7 @@ }, "end": { "line": 29, - "column": 32, + "column": 31, "program": "launch_this_callee.ets" } } @@ -1360,7 +1360,7 @@ }, "end": { "line": 29, - "column": 32, + "column": 31, "program": "launch_this_callee.ets" } } @@ -1374,7 +1374,7 @@ }, "end": { "line": 29, - "column": 32, + "column": 31, "program": "launch_this_callee.ets" } } @@ -1387,7 +1387,7 @@ }, "end": { "line": 29, - "column": 32, + "column": 31, "program": "launch_this_callee.ets" } } @@ -1469,7 +1469,7 @@ }, "end": { "line": 29, - "column": 48, + "column": 47, "program": "launch_this_callee.ets" } } @@ -1482,7 +1482,7 @@ }, "end": { "line": 29, - "column": 48, + "column": 47, "program": "launch_this_callee.ets" } } @@ -1495,7 +1495,7 @@ }, "end": { "line": 29, - "column": 48, + "column": 47, "program": "launch_this_callee.ets" } } @@ -1678,7 +1678,7 @@ }, "end": { "line": 32, - "column": 23, + "column": 22, "program": "launch_this_callee.ets" } } @@ -1691,7 +1691,7 @@ }, "end": { "line": 32, - "column": 23, + "column": 22, "program": "launch_this_callee.ets" } } @@ -1705,7 +1705,7 @@ }, "end": { "line": 32, - "column": 23, + "column": 22, "program": "launch_this_callee.ets" } } @@ -1718,7 +1718,7 @@ }, "end": { "line": 32, - "column": 23, + "column": 22, "program": "launch_this_callee.ets" } } @@ -1800,7 +1800,7 @@ }, "end": { "line": 32, - "column": 38, + "column": 36, "program": "launch_this_callee.ets" } } @@ -1813,7 +1813,7 @@ }, "end": { "line": 32, - "column": 38, + "column": 36, "program": "launch_this_callee.ets" } } diff --git a/ets2panda/test/parser/ets/local-interface-expected.txt b/ets2panda/test/parser/ets/local-interface-expected.txt index f9c416f770d..7013095cf93 100644 --- a/ets2panda/test/parser/ets/local-interface-expected.txt +++ b/ets2panda/test/parser/ets/local-interface-expected.txt @@ -240,8 +240,8 @@ "program": "local-interface.ets" }, "end": { - "line": 19, - "column": 11, + "line": 18, + "column": 33, "program": "local-interface.ets" } } diff --git a/ets2panda/test/parser/ets/localTypeAlias-expected.txt b/ets2panda/test/parser/ets/localTypeAlias-expected.txt index 5a63a7ed34a..bae56b34be8 100644 --- a/ets2panda/test/parser/ets/localTypeAlias-expected.txt +++ b/ets2panda/test/parser/ets/localTypeAlias-expected.txt @@ -234,7 +234,7 @@ }, "end": { "line": 17, - "column": 18, + "column": 17, "program": "localTypeAlias.ets" } } @@ -247,7 +247,7 @@ }, "end": { "line": 17, - "column": 18, + "column": 17, "program": "localTypeAlias.ets" } } @@ -343,7 +343,7 @@ }, "end": { "line": 19, - "column": 21, + "column": 20, "program": "localTypeAlias.ets" } } @@ -356,7 +356,7 @@ }, "end": { "line": 19, - "column": 21, + "column": 20, "program": "localTypeAlias.ets" } } @@ -426,7 +426,7 @@ }, "end": { "line": 21, - "column": 15, + "column": 14, "program": "localTypeAlias.ets" } } @@ -439,7 +439,7 @@ }, "end": { "line": 21, - "column": 15, + "column": 14, "program": "localTypeAlias.ets" } } @@ -744,7 +744,7 @@ }, "end": { "line": 30, - "column": 31, + "column": 30, "program": "localTypeAlias.ets" } } @@ -757,7 +757,7 @@ }, "end": { "line": 30, - "column": 31, + "column": 30, "program": "localTypeAlias.ets" } } @@ -827,7 +827,7 @@ }, "end": { "line": 31, - "column": 27, + "column": 26, "program": "localTypeAlias.ets" } } @@ -840,7 +840,7 @@ }, "end": { "line": 31, - "column": 27, + "column": 26, "program": "localTypeAlias.ets" } } @@ -974,7 +974,7 @@ }, "end": { "line": 34, - "column": 26, + "column": 25, "program": "localTypeAlias.ets" } } @@ -987,7 +987,7 @@ }, "end": { "line": 34, - "column": 26, + "column": 25, "program": "localTypeAlias.ets" } } @@ -1117,7 +1117,7 @@ }, "end": { "line": 37, - "column": 31, + "column": 30, "program": "localTypeAlias.ets" } } @@ -1130,7 +1130,7 @@ }, "end": { "line": 37, - "column": 31, + "column": 30, "program": "localTypeAlias.ets" } } @@ -1231,7 +1231,7 @@ }, "end": { "line": 41, - "column": 23, + "column": 22, "program": "localTypeAlias.ets" } } @@ -1244,7 +1244,7 @@ }, "end": { "line": 41, - "column": 23, + "column": 22, "program": "localTypeAlias.ets" } } @@ -1340,7 +1340,7 @@ }, "end": { "line": 42, - "column": 27, + "column": 26, "program": "localTypeAlias.ets" } } @@ -1353,7 +1353,7 @@ }, "end": { "line": 42, - "column": 27, + "column": 26, "program": "localTypeAlias.ets" } } @@ -1434,7 +1434,7 @@ }, "end": { "line": 43, - "column": 27, + "column": 26, "program": "localTypeAlias.ets" } } @@ -1447,7 +1447,7 @@ }, "end": { "line": 43, - "column": 27, + "column": 26, "program": "localTypeAlias.ets" } } @@ -1517,7 +1517,7 @@ }, "end": { "line": 44, - "column": 23, + "column": 22, "program": "localTypeAlias.ets" } } @@ -1530,7 +1530,7 @@ }, "end": { "line": 44, - "column": 23, + "column": 22, "program": "localTypeAlias.ets" } } @@ -1650,7 +1650,7 @@ }, "end": { "line": 48, - "column": 23, + "column": 22, "program": "localTypeAlias.ets" } } @@ -1663,7 +1663,7 @@ }, "end": { "line": 48, - "column": 23, + "column": 22, "program": "localTypeAlias.ets" } } @@ -1759,7 +1759,7 @@ }, "end": { "line": 49, - "column": 27, + "column": 26, "program": "localTypeAlias.ets" } } @@ -1772,7 +1772,7 @@ }, "end": { "line": 49, - "column": 27, + "column": 26, "program": "localTypeAlias.ets" } } @@ -1853,7 +1853,7 @@ }, "end": { "line": 50, - "column": 27, + "column": 26, "program": "localTypeAlias.ets" } } @@ -1866,7 +1866,7 @@ }, "end": { "line": 50, - "column": 27, + "column": 26, "program": "localTypeAlias.ets" } } @@ -1936,7 +1936,7 @@ }, "end": { "line": 51, - "column": 23, + "column": 22, "program": "localTypeAlias.ets" } } @@ -1949,7 +1949,7 @@ }, "end": { "line": 51, - "column": 23, + "column": 22, "program": "localTypeAlias.ets" } } @@ -2246,7 +2246,7 @@ }, "end": { "line": 56, - "column": 23, + "column": 22, "program": "localTypeAlias.ets" } } @@ -2259,7 +2259,7 @@ }, "end": { "line": 56, - "column": 23, + "column": 22, "program": "localTypeAlias.ets" } } @@ -2355,7 +2355,7 @@ }, "end": { "line": 57, - "column": 27, + "column": 26, "program": "localTypeAlias.ets" } } @@ -2368,7 +2368,7 @@ }, "end": { "line": 57, - "column": 27, + "column": 26, "program": "localTypeAlias.ets" } } @@ -2449,7 +2449,7 @@ }, "end": { "line": 59, - "column": 27, + "column": 26, "program": "localTypeAlias.ets" } } @@ -2462,7 +2462,7 @@ }, "end": { "line": 59, - "column": 27, + "column": 26, "program": "localTypeAlias.ets" } } @@ -2532,7 +2532,7 @@ }, "end": { "line": 60, - "column": 23, + "column": 22, "program": "localTypeAlias.ets" } } @@ -2545,7 +2545,7 @@ }, "end": { "line": 60, - "column": 23, + "column": 22, "program": "localTypeAlias.ets" } } @@ -2662,7 +2662,7 @@ }, "end": { "line": 64, - "column": 23, + "column": 22, "program": "localTypeAlias.ets" } } @@ -2675,7 +2675,7 @@ }, "end": { "line": 64, - "column": 23, + "column": 22, "program": "localTypeAlias.ets" } } @@ -2771,7 +2771,7 @@ }, "end": { "line": 65, - "column": 27, + "column": 26, "program": "localTypeAlias.ets" } } @@ -2784,7 +2784,7 @@ }, "end": { "line": 65, - "column": 27, + "column": 26, "program": "localTypeAlias.ets" } } @@ -2865,7 +2865,7 @@ }, "end": { "line": 67, - "column": 27, + "column": 26, "program": "localTypeAlias.ets" } } @@ -2878,7 +2878,7 @@ }, "end": { "line": 67, - "column": 27, + "column": 26, "program": "localTypeAlias.ets" } } @@ -2948,7 +2948,7 @@ }, "end": { "line": 68, - "column": 23, + "column": 22, "program": "localTypeAlias.ets" } } @@ -2961,7 +2961,7 @@ }, "end": { "line": 68, - "column": 23, + "column": 22, "program": "localTypeAlias.ets" } } @@ -3066,7 +3066,7 @@ }, "end": { "line": 70, - "column": 23, + "column": 22, "program": "localTypeAlias.ets" } } @@ -3079,7 +3079,7 @@ }, "end": { "line": 70, - "column": 23, + "column": 22, "program": "localTypeAlias.ets" } } @@ -3175,7 +3175,7 @@ }, "end": { "line": 71, - "column": 27, + "column": 26, "program": "localTypeAlias.ets" } } @@ -3188,7 +3188,7 @@ }, "end": { "line": 71, - "column": 27, + "column": 26, "program": "localTypeAlias.ets" } } @@ -3269,7 +3269,7 @@ }, "end": { "line": 73, - "column": 27, + "column": 26, "program": "localTypeAlias.ets" } } @@ -3282,7 +3282,7 @@ }, "end": { "line": 73, - "column": 27, + "column": 26, "program": "localTypeAlias.ets" } } @@ -3352,7 +3352,7 @@ }, "end": { "line": 74, - "column": 23, + "column": 22, "program": "localTypeAlias.ets" } } @@ -3365,7 +3365,7 @@ }, "end": { "line": 74, - "column": 23, + "column": 22, "program": "localTypeAlias.ets" } } 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 e439d324dca..ae300152d7e 100644 --- a/ets2panda/test/parser/ets/main_entry_point_6-expected.txt +++ b/ets2panda/test/parser/ets/main_entry_point_6-expected.txt @@ -237,7 +237,7 @@ }, "end": { "line": 16, - "column": 37, + "column": 36, "program": "main_entry_point_6.ets" } } @@ -250,7 +250,7 @@ }, "end": { "line": 16, - "column": 37, + "column": 36, "program": "main_entry_point_6.ets" } } @@ -277,7 +277,7 @@ }, "end": { "line": 16, - "column": 38, + "column": 37, "program": "main_entry_point_6.ets" } } @@ -290,7 +290,7 @@ }, "end": { "line": 16, - "column": 38, + "column": 37, "program": "main_entry_point_6.ets" } } @@ -304,7 +304,7 @@ }, "end": { "line": 16, - "column": 38, + "column": 37, "program": "main_entry_point_6.ets" } } @@ -317,7 +317,7 @@ }, "end": { "line": 16, - "column": 38, + "column": 37, "program": "main_entry_point_6.ets" } } 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 cda558b8dc0..b177e54e507 100644 --- a/ets2panda/test/parser/ets/main_entry_point_7-expected.txt +++ b/ets2panda/test/parser/ets/main_entry_point_7-expected.txt @@ -102,7 +102,7 @@ }, "end": { "line": 21, - "column": 21, + "column": 19, "program": "main_entry_point_7.ets" } } @@ -115,7 +115,7 @@ }, "end": { "line": 21, - "column": 21, + "column": 19, "program": "main_entry_point_7.ets" } } 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 7311fff7cce..756551d4a7b 100644 --- a/ets2panda/test/parser/ets/main_entry_point_8-expected.txt +++ b/ets2panda/test/parser/ets/main_entry_point_8-expected.txt @@ -49,7 +49,7 @@ }, "end": { "line": 16, - "column": 19, + "column": 18, "program": "main_entry_point_8.ets" } } @@ -62,7 +62,7 @@ }, "end": { "line": 16, - "column": 19, + "column": 18, "program": "main_entry_point_8.ets" } } @@ -316,7 +316,7 @@ }, "end": { "line": 18, - "column": 34, + "column": 33, "program": "main_entry_point_8.ets" } } @@ -329,7 +329,7 @@ }, "end": { "line": 18, - "column": 34, + "column": 33, "program": "main_entry_point_8.ets" } } @@ -356,7 +356,7 @@ }, "end": { "line": 18, - "column": 35, + "column": 34, "program": "main_entry_point_8.ets" } } @@ -369,7 +369,7 @@ }, "end": { "line": 18, - "column": 35, + "column": 34, "program": "main_entry_point_8.ets" } } @@ -383,7 +383,7 @@ }, "end": { "line": 18, - "column": 35, + "column": 34, "program": "main_entry_point_8.ets" } } @@ -396,7 +396,7 @@ }, "end": { "line": 18, - "column": 35, + "column": 34, "program": "main_entry_point_8.ets" } } 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 e85777b7132..c5ec3248d51 100644 --- a/ets2panda/test/parser/ets/main_entry_point_9-expected.txt +++ b/ets2panda/test/parser/ets/main_entry_point_9-expected.txt @@ -73,7 +73,7 @@ }, "end": { "line": 16, - "column": 30, + "column": 29, "program": "main_entry_point_9.ets" } } @@ -86,7 +86,7 @@ }, "end": { "line": 16, - "column": 30, + "column": 29, "program": "main_entry_point_9.ets" } } @@ -113,7 +113,7 @@ }, "end": { "line": 16, - "column": 31, + "column": 30, "program": "main_entry_point_9.ets" } } @@ -126,7 +126,7 @@ }, "end": { "line": 16, - "column": 31, + "column": 30, "program": "main_entry_point_9.ets" } } @@ -356,7 +356,7 @@ }, "end": { "line": 18, - "column": 23, + "column": 22, "program": "main_entry_point_9.ets" } } @@ -369,7 +369,7 @@ }, "end": { "line": 18, - "column": 23, + "column": 22, "program": "main_entry_point_9.ets" } } @@ -383,7 +383,7 @@ }, "end": { "line": 18, - "column": 23, + "column": 22, "program": "main_entry_point_9.ets" } } @@ -396,7 +396,7 @@ }, "end": { "line": 18, - "column": 23, + "column": 22, "program": "main_entry_point_9.ets" } } diff --git a/ets2panda/test/parser/ets/new_expressions-expected.txt b/ets2panda/test/parser/ets/new_expressions-expected.txt index 1f42372e3e0..c379f4f0f29 100644 --- a/ets2panda/test/parser/ets/new_expressions-expected.txt +++ b/ets2panda/test/parser/ets/new_expressions-expected.txt @@ -406,7 +406,7 @@ }, "end": { "line": 25, - "column": 20, + "column": 19, "program": "new_expressions.ets" } } @@ -419,7 +419,7 @@ }, "end": { "line": 25, - "column": 20, + "column": 19, "program": "new_expressions.ets" } } diff --git a/ets2panda/test/parser/ets/new_object_3-expected.txt b/ets2panda/test/parser/ets/new_object_3-expected.txt index 645a973ec72..114a616ad30 100644 --- a/ets2panda/test/parser/ets/new_object_3-expected.txt +++ b/ets2panda/test/parser/ets/new_object_3-expected.txt @@ -234,7 +234,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 18, "program": "new_object_3.ets" } } @@ -247,7 +247,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 18, "program": "new_object_3.ets" } } @@ -297,7 +297,7 @@ }, "end": { "line": 18, - "column": 33, + "column": 32, "program": "new_object_3.ets" } } @@ -310,7 +310,7 @@ }, "end": { "line": 18, - "column": 33, + "column": 32, "program": "new_object_3.ets" } } diff --git a/ets2panda/test/parser/ets/null-expected.txt b/ets2panda/test/parser/ets/null-expected.txt index 9364cf0b91e..6eeafa544d6 100644 --- a/ets2panda/test/parser/ets/null-expected.txt +++ b/ets2panda/test/parser/ets/null-expected.txt @@ -348,7 +348,7 @@ }, "end": { "line": 19, - "column": 23, + "column": 22, "program": "null.ets" } } @@ -361,7 +361,7 @@ }, "end": { "line": 19, - "column": 23, + "column": 22, "program": "null.ets" } } @@ -518,7 +518,7 @@ }, "end": { "line": 18, - "column": 14, + "column": 12, "program": "null.ets" } } @@ -531,7 +531,7 @@ }, "end": { "line": 18, - "column": 14, + "column": 12, "program": "null.ets" } } @@ -634,7 +634,7 @@ }, "end": { "line": 19, - "column": 14, + "column": 12, "program": "null.ets" } } @@ -647,7 +647,7 @@ }, "end": { "line": 19, - "column": 14, + "column": 12, "program": "null.ets" } } @@ -753,7 +753,7 @@ }, "end": { "line": 21, - "column": 24, + "column": 22, "program": "null.ets" } } @@ -766,7 +766,7 @@ }, "end": { "line": 21, - "column": 24, + "column": 22, "program": "null.ets" } } @@ -1141,7 +1141,7 @@ }, "end": { "line": 28, - "column": 18, + "column": 16, "program": "null.ets" } } @@ -1154,7 +1154,7 @@ }, "end": { "line": 28, - "column": 18, + "column": 16, "program": "null.ets" } } @@ -1283,7 +1283,7 @@ }, "end": { "line": 29, - "column": 18, + "column": 16, "program": "null.ets" } } @@ -1296,7 +1296,7 @@ }, "end": { "line": 29, - "column": 18, + "column": 16, "program": "null.ets" } } @@ -1346,7 +1346,7 @@ }, "end": { "line": 29, - "column": 27, + "column": 26, "program": "null.ets" } } @@ -1359,7 +1359,7 @@ }, "end": { "line": 29, - "column": 27, + "column": 26, "program": "null.ets" } } @@ -1659,7 +1659,7 @@ }, "end": { "line": 35, - "column": 17, + "column": 16, "program": "null.ets" } } @@ -1672,7 +1672,7 @@ }, "end": { "line": 35, - "column": 17, + "column": 16, "program": "null.ets" } } diff --git a/ets2panda/test/parser/ets/null_valid-expected.txt b/ets2panda/test/parser/ets/null_valid-expected.txt index 91668132123..f9093189af3 100644 --- a/ets2panda/test/parser/ets/null_valid-expected.txt +++ b/ets2panda/test/parser/ets/null_valid-expected.txt @@ -415,7 +415,7 @@ }, "end": { "line": 17, - "column": 17, + "column": 15, "program": "null_valid.ets" } } @@ -428,7 +428,7 @@ }, "end": { "line": 17, - "column": 17, + "column": 15, "program": "null_valid.ets" } } diff --git a/ets2panda/test/parser/ets/nullableGenericSignature-expected.txt b/ets2panda/test/parser/ets/nullableGenericSignature-expected.txt index ccbb04f900f..3e9cf689001 100644 --- a/ets2panda/test/parser/ets/nullableGenericSignature-expected.txt +++ b/ets2panda/test/parser/ets/nullableGenericSignature-expected.txt @@ -164,7 +164,7 @@ }, "end": { "line": 17, - "column": 19, + "column": 18, "program": "nullableGenericSignature.ets" } } @@ -177,7 +177,7 @@ }, "end": { "line": 17, - "column": 19, + "column": 18, "program": "nullableGenericSignature.ets" } } @@ -191,7 +191,7 @@ }, "end": { "line": 17, - "column": 19, + "column": 18, "program": "nullableGenericSignature.ets" } } @@ -204,7 +204,7 @@ }, "end": { "line": 17, - "column": 19, + "column": 18, "program": "nullableGenericSignature.ets" } } @@ -475,7 +475,7 @@ }, "end": { "line": 21, - "column": 23, + "column": 21, "program": "nullableGenericSignature.ets" } } @@ -488,7 +488,7 @@ }, "end": { "line": 21, - "column": 23, + "column": 21, "program": "nullableGenericSignature.ets" } } @@ -544,7 +544,7 @@ }, "end": { "line": 21, - "column": 31, + "column": 29, "program": "nullableGenericSignature.ets" } } @@ -557,7 +557,7 @@ }, "end": { "line": 21, - "column": 31, + "column": 29, "program": "nullableGenericSignature.ets" } } @@ -598,7 +598,7 @@ }, "end": { "line": 22, - "column": 21, + "column": 20, "program": "nullableGenericSignature.ets" } } @@ -611,7 +611,7 @@ }, "end": { "line": 22, - "column": 21, + "column": 20, "program": "nullableGenericSignature.ets" } } @@ -1172,7 +1172,7 @@ }, "end": { "line": 26, - "column": 29, + "column": 28, "program": "nullableGenericSignature.ets" } } @@ -1185,7 +1185,7 @@ }, "end": { "line": 26, - "column": 29, + "column": 28, "program": "nullableGenericSignature.ets" } } @@ -1212,7 +1212,7 @@ }, "end": { "line": 26, - "column": 30, + "column": 29, "program": "nullableGenericSignature.ets" } } @@ -1225,7 +1225,7 @@ }, "end": { "line": 26, - "column": 30, + "column": 29, "program": "nullableGenericSignature.ets" } } @@ -1239,7 +1239,7 @@ }, "end": { "line": 26, - "column": 30, + "column": 29, "program": "nullableGenericSignature.ets" } } @@ -1252,7 +1252,7 @@ }, "end": { "line": 26, - "column": 30, + "column": 29, "program": "nullableGenericSignature.ets" } } @@ -1375,7 +1375,7 @@ }, "end": { "line": 27, - "column": 32, + "column": 31, "program": "nullableGenericSignature.ets" } } @@ -1388,7 +1388,7 @@ }, "end": { "line": 27, - "column": 32, + "column": 31, "program": "nullableGenericSignature.ets" } } @@ -1402,7 +1402,7 @@ }, "end": { "line": 27, - "column": 32, + "column": 31, "program": "nullableGenericSignature.ets" } } @@ -1415,7 +1415,7 @@ }, "end": { "line": 27, - "column": 32, + "column": 31, "program": "nullableGenericSignature.ets" } } diff --git a/ets2panda/test/parser/ets/object-expected.txt b/ets2panda/test/parser/ets/object-expected.txt index d1dd4a74341..9b546f2a1de 100644 --- a/ets2panda/test/parser/ets/object-expected.txt +++ b/ets2panda/test/parser/ets/object-expected.txt @@ -290,7 +290,7 @@ }, "end": { "line": 16, - "column": 15, + "column": 14, "program": "object.ets" } } @@ -303,7 +303,7 @@ }, "end": { "line": 16, - "column": 15, + "column": 14, "program": "object.ets" } } diff --git a/ets2panda/test/parser/ets/optional_field_class-expected.txt b/ets2panda/test/parser/ets/optional_field_class-expected.txt index 884726ec67f..7269fb04922 100644 --- a/ets2panda/test/parser/ets/optional_field_class-expected.txt +++ b/ets2panda/test/parser/ets/optional_field_class-expected.txt @@ -81,7 +81,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 19, "program": "optional_field_class.ets" } } @@ -94,7 +94,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 19, "program": "optional_field_class.ets" } } @@ -109,7 +109,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 19, "program": "optional_field_class.ets" } } @@ -123,7 +123,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 19, "program": "optional_field_class.ets" } } @@ -138,7 +138,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 19, "program": "optional_field_class.ets" } } @@ -200,7 +200,7 @@ }, "end": { "line": 19, - "column": 28, + "column": 27, "program": "optional_field_class.ets" } } @@ -213,7 +213,7 @@ }, "end": { "line": 19, - "column": 28, + "column": 27, "program": "optional_field_class.ets" } } @@ -228,7 +228,7 @@ }, "end": { "line": 19, - "column": 28, + "column": 27, "program": "optional_field_class.ets" } } @@ -242,7 +242,7 @@ }, "end": { "line": 19, - "column": 28, + "column": 27, "program": "optional_field_class.ets" } } @@ -257,7 +257,7 @@ }, "end": { "line": 19, - "column": 28, + "column": 27, "program": "optional_field_class.ets" } } diff --git a/ets2panda/test/parser/ets/optional_field_interface-expected.txt b/ets2panda/test/parser/ets/optional_field_interface-expected.txt index 1efdb7e3d41..ae3f19fbe3d 100644 --- a/ets2panda/test/parser/ets/optional_field_interface-expected.txt +++ b/ets2panda/test/parser/ets/optional_field_interface-expected.txt @@ -87,7 +87,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 19, "program": "optional_field_interface.ets" } } @@ -100,7 +100,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 19, "program": "optional_field_interface.ets" } } @@ -142,7 +142,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 19, "program": "optional_field_interface.ets" } } @@ -155,7 +155,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 19, "program": "optional_field_interface.ets" } } @@ -247,7 +247,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 19, "program": "optional_field_interface.ets" } } @@ -260,7 +260,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 19, "program": "optional_field_interface.ets" } } @@ -330,7 +330,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 19, "program": "optional_field_interface.ets" } } @@ -343,7 +343,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 19, "program": "optional_field_interface.ets" } } @@ -358,7 +358,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 19, "program": "optional_field_interface.ets" } } @@ -373,7 +373,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 19, "program": "optional_field_interface.ets" } } @@ -417,8 +417,8 @@ "program": "optional_field_interface.ets" }, "end": { - "line": 21, - "column": 6, + "line": 19, + "column": 2, "program": "optional_field_interface.ets" } } @@ -475,8 +475,8 @@ "program": "optional_field_interface.ets" }, "end": { - "line": 22, - "column": 2, + "line": 21, + "column": 21, "program": "optional_field_interface.ets" } } @@ -488,8 +488,8 @@ "program": "optional_field_interface.ets" }, "end": { - "line": 22, - "column": 2, + "line": 21, + "column": 21, "program": "optional_field_interface.ets" } } @@ -566,7 +566,7 @@ }, "end": { "line": 23, - "column": 21, + "column": 20, "program": "optional_field_interface.ets" } } @@ -579,7 +579,7 @@ }, "end": { "line": 23, - "column": 21, + "column": 20, "program": "optional_field_interface.ets" } } @@ -594,7 +594,7 @@ }, "end": { "line": 23, - "column": 21, + "column": 20, "program": "optional_field_interface.ets" } } @@ -608,7 +608,7 @@ }, "end": { "line": 23, - "column": 21, + "column": 20, "program": "optional_field_interface.ets" } } @@ -623,7 +623,7 @@ }, "end": { "line": 23, - "column": 21, + "column": 20, "program": "optional_field_interface.ets" } } @@ -709,7 +709,7 @@ }, "end": { "line": 25, - "column": 26, + "column": 24, "program": "optional_field_interface.ets" } } @@ -722,7 +722,7 @@ }, "end": { "line": 25, - "column": 26, + "column": 24, "program": "optional_field_interface.ets" } } @@ -950,7 +950,7 @@ }, "end": { "line": 29, - "column": 26, + "column": 24, "program": "optional_field_interface.ets" } } @@ -963,7 +963,7 @@ }, "end": { "line": 29, - "column": 26, + "column": 24, "program": "optional_field_interface.ets" } } diff --git a/ets2panda/test/parser/ets/optional_field_interfaceUnion-expected.txt b/ets2panda/test/parser/ets/optional_field_interfaceUnion-expected.txt index d31078a31ef..2759698ca8a 100644 --- a/ets2panda/test/parser/ets/optional_field_interfaceUnion-expected.txt +++ b/ets2panda/test/parser/ets/optional_field_interfaceUnion-expected.txt @@ -90,7 +90,7 @@ }, "end": { "line": 18, - "column": 21, + "column": 19, "program": "optional_field_interfaceUnion.ets" } } @@ -103,7 +103,7 @@ }, "end": { "line": 18, - "column": 21, + "column": 19, "program": "optional_field_interfaceUnion.ets" } } @@ -137,7 +137,7 @@ }, "end": { "line": 18, - "column": 30, + "column": 28, "program": "optional_field_interfaceUnion.ets" } } @@ -150,7 +150,7 @@ }, "end": { "line": 18, - "column": 30, + "column": 28, "program": "optional_field_interfaceUnion.ets" } } @@ -184,7 +184,7 @@ }, "end": { "line": 18, - "column": 38, + "column": 37, "program": "optional_field_interfaceUnion.ets" } } @@ -197,7 +197,7 @@ }, "end": { "line": 18, - "column": 38, + "column": 37, "program": "optional_field_interfaceUnion.ets" } } @@ -211,7 +211,7 @@ }, "end": { "line": 18, - "column": 38, + "column": 37, "program": "optional_field_interfaceUnion.ets" } } @@ -253,7 +253,7 @@ }, "end": { "line": 18, - "column": 38, + "column": 37, "program": "optional_field_interfaceUnion.ets" } } @@ -266,7 +266,7 @@ }, "end": { "line": 18, - "column": 38, + "column": 37, "program": "optional_field_interfaceUnion.ets" } } @@ -361,7 +361,7 @@ }, "end": { "line": 18, - "column": 21, + "column": 19, "program": "optional_field_interfaceUnion.ets" } } @@ -374,7 +374,7 @@ }, "end": { "line": 18, - "column": 21, + "column": 19, "program": "optional_field_interfaceUnion.ets" } } @@ -408,7 +408,7 @@ }, "end": { "line": 18, - "column": 30, + "column": 28, "program": "optional_field_interfaceUnion.ets" } } @@ -421,7 +421,7 @@ }, "end": { "line": 18, - "column": 30, + "column": 28, "program": "optional_field_interfaceUnion.ets" } } @@ -455,7 +455,7 @@ }, "end": { "line": 18, - "column": 38, + "column": 37, "program": "optional_field_interfaceUnion.ets" } } @@ -468,7 +468,7 @@ }, "end": { "line": 18, - "column": 38, + "column": 37, "program": "optional_field_interfaceUnion.ets" } } @@ -482,7 +482,7 @@ }, "end": { "line": 18, - "column": 38, + "column": 37, "program": "optional_field_interfaceUnion.ets" } } @@ -552,7 +552,7 @@ }, "end": { "line": 18, - "column": 38, + "column": 37, "program": "optional_field_interfaceUnion.ets" } } @@ -565,7 +565,7 @@ }, "end": { "line": 18, - "column": 38, + "column": 37, "program": "optional_field_interfaceUnion.ets" } } @@ -580,7 +580,7 @@ }, "end": { "line": 18, - "column": 38, + "column": 37, "program": "optional_field_interfaceUnion.ets" } } @@ -595,7 +595,7 @@ }, "end": { "line": 18, - "column": 38, + "column": 37, "program": "optional_field_interfaceUnion.ets" } } @@ -639,8 +639,8 @@ "program": "optional_field_interfaceUnion.ets" }, "end": { - "line": 21, - "column": 6, + "line": 19, + "column": 2, "program": "optional_field_interfaceUnion.ets" } } @@ -697,8 +697,8 @@ "program": "optional_field_interfaceUnion.ets" }, "end": { - "line": 22, - "column": 2, + "line": 21, + "column": 21, "program": "optional_field_interfaceUnion.ets" } } @@ -710,8 +710,8 @@ "program": "optional_field_interfaceUnion.ets" }, "end": { - "line": 22, - "column": 2, + "line": 21, + "column": 21, "program": "optional_field_interfaceUnion.ets" } } @@ -788,7 +788,7 @@ }, "end": { "line": 23, - "column": 22, + "column": 20, "program": "optional_field_interfaceUnion.ets" } } @@ -801,7 +801,7 @@ }, "end": { "line": 23, - "column": 22, + "column": 20, "program": "optional_field_interfaceUnion.ets" } } @@ -835,7 +835,7 @@ }, "end": { "line": 23, - "column": 30, + "column": 29, "program": "optional_field_interfaceUnion.ets" } } @@ -848,7 +848,7 @@ }, "end": { "line": 23, - "column": 30, + "column": 29, "program": "optional_field_interfaceUnion.ets" } } @@ -863,7 +863,7 @@ }, "end": { "line": 23, - "column": 30, + "column": 29, "program": "optional_field_interfaceUnion.ets" } } @@ -877,7 +877,7 @@ }, "end": { "line": 23, - "column": 30, + "column": 29, "program": "optional_field_interfaceUnion.ets" } } @@ -892,7 +892,7 @@ }, "end": { "line": 23, - "column": 30, + "column": 29, "program": "optional_field_interfaceUnion.ets" } } @@ -978,7 +978,7 @@ }, "end": { "line": 25, - "column": 26, + "column": 24, "program": "optional_field_interfaceUnion.ets" } } @@ -991,7 +991,7 @@ }, "end": { "line": 25, - "column": 26, + "column": 24, "program": "optional_field_interfaceUnion.ets" } } @@ -1025,7 +1025,7 @@ }, "end": { "line": 25, - "column": 35, + "column": 33, "program": "optional_field_interfaceUnion.ets" } } @@ -1038,7 +1038,7 @@ }, "end": { "line": 25, - "column": 35, + "column": 33, "program": "optional_field_interfaceUnion.ets" } } @@ -1266,7 +1266,7 @@ }, "end": { "line": 29, - "column": 26, + "column": 24, "program": "optional_field_interfaceUnion.ets" } } @@ -1279,7 +1279,7 @@ }, "end": { "line": 29, - "column": 26, + "column": 24, "program": "optional_field_interfaceUnion.ets" } } @@ -1313,7 +1313,7 @@ }, "end": { "line": 29, - "column": 35, + "column": 33, "program": "optional_field_interfaceUnion.ets" } } @@ -1326,7 +1326,7 @@ }, "end": { "line": 29, - "column": 35, + "column": 33, "program": "optional_field_interfaceUnion.ets" } } diff --git a/ets2panda/test/parser/ets/optional_union_paramter-expected.txt b/ets2panda/test/parser/ets/optional_union_paramter-expected.txt index 27cb8be9b14..2e763877c5f 100644 --- a/ets2panda/test/parser/ets/optional_union_paramter-expected.txt +++ b/ets2panda/test/parser/ets/optional_union_paramter-expected.txt @@ -110,7 +110,7 @@ }, "end": { "line": 17, - "column": 38, + "column": 36, "program": "optional_union_paramter.ets" } } @@ -123,7 +123,7 @@ }, "end": { "line": 17, - "column": 38, + "column": 36, "program": "optional_union_paramter.ets" } } @@ -157,7 +157,7 @@ }, "end": { "line": 17, - "column": 43, + "column": 42, "program": "optional_union_paramter.ets" } } @@ -170,7 +170,7 @@ }, "end": { "line": 17, - "column": 43, + "column": 42, "program": "optional_union_paramter.ets" } } @@ -184,7 +184,7 @@ }, "end": { "line": 17, - "column": 43, + "column": 42, "program": "optional_union_paramter.ets" } } @@ -198,7 +198,7 @@ }, "end": { "line": 17, - "column": 43, + "column": 42, "program": "optional_union_paramter.ets" } } @@ -211,7 +211,7 @@ }, "end": { "line": 17, - "column": 43, + "column": 42, "program": "optional_union_paramter.ets" } } @@ -250,7 +250,7 @@ }, "end": { "line": 17, - "column": 59, + "column": 58, "program": "optional_union_paramter.ets" } } @@ -263,7 +263,7 @@ }, "end": { "line": 17, - "column": 59, + "column": 58, "program": "optional_union_paramter.ets" } } @@ -277,7 +277,7 @@ }, "end": { "line": 17, - "column": 59, + "column": 58, "program": "optional_union_paramter.ets" } } @@ -290,7 +290,7 @@ }, "end": { "line": 17, - "column": 59, + "column": 58, "program": "optional_union_paramter.ets" } } diff --git a/ets2panda/test/parser/ets/override-expected.txt b/ets2panda/test/parser/ets/override-expected.txt index 5f5fa18a95a..63519658661 100644 --- a/ets2panda/test/parser/ets/override-expected.txt +++ b/ets2panda/test/parser/ets/override-expected.txt @@ -156,7 +156,7 @@ }, "end": { "line": 17, - "column": 12, + "column": 11, "program": "override.ets" } } @@ -169,7 +169,7 @@ }, "end": { "line": 17, - "column": 12, + "column": 11, "program": "override.ets" } } @@ -183,7 +183,7 @@ }, "end": { "line": 17, - "column": 12, + "column": 11, "program": "override.ets" } } @@ -196,7 +196,7 @@ }, "end": { "line": 17, - "column": 12, + "column": 11, "program": "override.ets" } } @@ -235,7 +235,7 @@ }, "end": { "line": 17, - "column": 20, + "column": 19, "program": "override.ets" } } @@ -248,7 +248,7 @@ }, "end": { "line": 17, - "column": 20, + "column": 19, "program": "override.ets" } } @@ -262,7 +262,7 @@ }, "end": { "line": 17, - "column": 20, + "column": 19, "program": "override.ets" } } @@ -275,7 +275,7 @@ }, "end": { "line": 17, - "column": 20, + "column": 19, "program": "override.ets" } } @@ -310,7 +310,7 @@ }, "end": { "line": 17, - "column": 25, + "column": 23, "program": "override.ets" } } @@ -323,7 +323,7 @@ }, "end": { "line": 17, - "column": 25, + "column": 23, "program": "override.ets" } } @@ -824,7 +824,7 @@ }, "end": { "line": 19, - "column": 24, + "column": 23, "program": "override.ets" } } @@ -837,7 +837,7 @@ }, "end": { "line": 19, - "column": 24, + "column": 23, "program": "override.ets" } } @@ -864,7 +864,7 @@ }, "end": { "line": 19, - "column": 26, + "column": 24, "program": "override.ets" } } @@ -877,7 +877,7 @@ }, "end": { "line": 19, - "column": 26, + "column": 24, "program": "override.ets" } } @@ -967,7 +967,7 @@ }, "end": { "line": 20, - "column": 21, + "column": 20, "program": "override.ets" } } @@ -980,7 +980,7 @@ }, "end": { "line": 20, - "column": 21, + "column": 20, "program": "override.ets" } } @@ -994,7 +994,7 @@ }, "end": { "line": 20, - "column": 21, + "column": 20, "program": "override.ets" } } @@ -1007,7 +1007,7 @@ }, "end": { "line": 20, - "column": 21, + "column": 20, "program": "override.ets" } } @@ -1046,7 +1046,7 @@ }, "end": { "line": 20, - "column": 29, + "column": 28, "program": "override.ets" } } @@ -1059,7 +1059,7 @@ }, "end": { "line": 20, - "column": 29, + "column": 28, "program": "override.ets" } } @@ -1073,7 +1073,7 @@ }, "end": { "line": 20, - "column": 29, + "column": 28, "program": "override.ets" } } @@ -1086,7 +1086,7 @@ }, "end": { "line": 20, - "column": 29, + "column": 28, "program": "override.ets" } } @@ -1121,7 +1121,7 @@ }, "end": { "line": 20, - "column": 34, + "column": 32, "program": "override.ets" } } @@ -1134,7 +1134,7 @@ }, "end": { "line": 20, - "column": 34, + "column": 32, "program": "override.ets" } } diff --git a/ets2panda/test/parser/ets/overrideStaticFunc-expected.txt b/ets2panda/test/parser/ets/overrideStaticFunc-expected.txt index 01d3b387bae..17f88feab83 100644 --- a/ets2panda/test/parser/ets/overrideStaticFunc-expected.txt +++ b/ets2panda/test/parser/ets/overrideStaticFunc-expected.txt @@ -326,7 +326,7 @@ }, "end": { "line": 20, - "column": 24, + "column": 22, "program": "overrideStaticFunc.ets" } } @@ -339,7 +339,7 @@ }, "end": { "line": 20, - "column": 24, + "column": 22, "program": "overrideStaticFunc.ets" } } @@ -764,8 +764,8 @@ "program": "overrideStaticFunc.ets" }, "end": { - "line": 27, - "column": 1, + "line": 26, + "column": 2, "program": "overrideStaticFunc.ets" } } diff --git a/ets2panda/test/parser/ets/promiseCasting-expected.txt b/ets2panda/test/parser/ets/promiseCasting-expected.txt index 88fe68f0e75..0e73a6591c2 100644 --- a/ets2panda/test/parser/ets/promiseCasting-expected.txt +++ b/ets2panda/test/parser/ets/promiseCasting-expected.txt @@ -747,7 +747,7 @@ }, "end": { "line": 23, - "column": 27, + "column": 25, "program": "promiseCasting.ets" } } @@ -760,7 +760,7 @@ }, "end": { "line": 23, - "column": 27, + "column": 25, "program": "promiseCasting.ets" } } @@ -2960,7 +2960,7 @@ }, "end": { "line": 42, - "column": 35, + "column": 34, "program": "promiseCasting.ets" } } @@ -2973,7 +2973,7 @@ }, "end": { "line": 42, - "column": 35, + "column": 34, "program": "promiseCasting.ets" } } @@ -3333,7 +3333,7 @@ }, "end": { "line": 44, - "column": 27, + "column": 26, "program": "promiseCasting.ets" } } @@ -3346,7 +3346,7 @@ }, "end": { "line": 44, - "column": 27, + "column": 26, "program": "promiseCasting.ets" } } @@ -3431,7 +3431,7 @@ }, "end": { "line": 44, - "column": 43, + "column": 42, "program": "promiseCasting.ets" } } @@ -3444,7 +3444,7 @@ }, "end": { "line": 44, - "column": 43, + "column": 42, "program": "promiseCasting.ets" } } @@ -3457,7 +3457,7 @@ }, "end": { "line": 44, - "column": 43, + "column": 42, "program": "promiseCasting.ets" } } @@ -3896,7 +3896,7 @@ }, "end": { "line": 49, - "column": 34, + "column": 33, "program": "promiseCasting.ets" } } @@ -3909,7 +3909,7 @@ }, "end": { "line": 49, - "column": 34, + "column": 33, "program": "promiseCasting.ets" } } @@ -3936,7 +3936,7 @@ }, "end": { "line": 49, - "column": 35, + "column": 34, "program": "promiseCasting.ets" } } @@ -3949,7 +3949,7 @@ }, "end": { "line": 49, - "column": 35, + "column": 34, "program": "promiseCasting.ets" } } diff --git a/ets2panda/test/parser/ets/proxyVoidGeneration-expected.txt b/ets2panda/test/parser/ets/proxyVoidGeneration-expected.txt index 8e802f9dc06..1649a66b5b7 100644 --- a/ets2panda/test/parser/ets/proxyVoidGeneration-expected.txt +++ b/ets2panda/test/parser/ets/proxyVoidGeneration-expected.txt @@ -110,7 +110,7 @@ }, "end": { "line": 17, - "column": 24, + "column": 23, "program": "proxyVoidGeneration.ets" } } @@ -123,7 +123,7 @@ }, "end": { "line": 17, - "column": 24, + "column": 23, "program": "proxyVoidGeneration.ets" } } @@ -243,7 +243,7 @@ }, "end": { "line": 17, - "column": 24, + "column": 23, "program": "proxyVoidGeneration.ets" } } @@ -256,7 +256,7 @@ }, "end": { "line": 17, - "column": 24, + "column": 23, "program": "proxyVoidGeneration.ets" } } @@ -422,7 +422,7 @@ }, "end": { "line": 17, - "column": 24, + "column": 23, "program": "proxyVoidGeneration.ets" } } @@ -435,7 +435,7 @@ }, "end": { "line": 17, - "column": 24, + "column": 23, "program": "proxyVoidGeneration.ets" } } @@ -813,7 +813,7 @@ }, "end": { "line": 18, - "column": 27, + "column": 26, "program": "proxyVoidGeneration.ets" } } @@ -826,7 +826,7 @@ }, "end": { "line": 18, - "column": 27, + "column": 26, "program": "proxyVoidGeneration.ets" } } @@ -840,7 +840,7 @@ }, "end": { "line": 18, - "column": 27, + "column": 26, "program": "proxyVoidGeneration.ets" } } @@ -853,7 +853,7 @@ }, "end": { "line": 18, - "column": 27, + "column": 26, "program": "proxyVoidGeneration.ets" } } diff --git a/ets2panda/test/parser/ets/proxy_method-expected.txt b/ets2panda/test/parser/ets/proxy_method-expected.txt index 390eb558a4c..53ab7e7d040 100644 --- a/ets2panda/test/parser/ets/proxy_method-expected.txt +++ b/ets2panda/test/parser/ets/proxy_method-expected.txt @@ -107,7 +107,7 @@ }, "end": { "line": 17, - "column": 19, + "column": 18, "program": "proxy_method.ets" } } @@ -120,7 +120,7 @@ }, "end": { "line": 17, - "column": 19, + "column": 18, "program": "proxy_method.ets" } } @@ -134,7 +134,7 @@ }, "end": { "line": 17, - "column": 19, + "column": 18, "program": "proxy_method.ets" } } @@ -147,7 +147,7 @@ }, "end": { "line": 17, - "column": 19, + "column": 18, "program": "proxy_method.ets" } } @@ -186,7 +186,7 @@ }, "end": { "line": 17, - "column": 31, + "column": 30, "program": "proxy_method.ets" } } @@ -199,7 +199,7 @@ }, "end": { "line": 17, - "column": 31, + "column": 30, "program": "proxy_method.ets" } } @@ -213,7 +213,7 @@ }, "end": { "line": 17, - "column": 31, + "column": 30, "program": "proxy_method.ets" } } @@ -226,7 +226,7 @@ }, "end": { "line": 17, - "column": 31, + "column": 30, "program": "proxy_method.ets" } } @@ -925,7 +925,7 @@ }, "end": { "line": 23, - "column": 11, + "column": 10, "program": "proxy_method.ets" } } @@ -938,7 +938,7 @@ }, "end": { "line": 23, - "column": 11, + "column": 10, "program": "proxy_method.ets" } } 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 2fca16dd7e7..ce40b8d6429 100644 --- a/ets2panda/test/parser/ets/re_export/diamond/A-expected.txt +++ b/ets2panda/test/parser/ets/re_export/diamond/A-expected.txt @@ -355,7 +355,7 @@ }, "end": { "line": 16, - "column": 25, + "column": 23, "program": "A.ets" } } @@ -368,7 +368,7 @@ }, "end": { "line": 16, - "column": 25, + "column": 23, "program": "A.ets" } } 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 ce641d8b5c8..ad704e60b9a 100644 --- a/ets2panda/test/parser/ets/re_export/folderIndex2/key-expected.txt +++ b/ets2panda/test/parser/ets/re_export/folderIndex2/key-expected.txt @@ -94,7 +94,7 @@ }, "end": { "line": 17, - "column": 18, + "column": 16, "program": "key.ets" } } @@ -107,7 +107,7 @@ }, "end": { "line": 17, - "column": 18, + "column": 16, "program": "key.ets" } } @@ -352,7 +352,7 @@ }, "end": { "line": 20, - "column": 18, + "column": 16, "program": "key.ets" } } @@ -365,7 +365,7 @@ }, "end": { "line": 20, - "column": 18, + "column": 16, "program": "key.ets" } } diff --git a/ets2panda/test/parser/ets/re_export/folderIndex2/type-expected.txt b/ets2panda/test/parser/ets/re_export/folderIndex2/type-expected.txt index 57718788652..2a14c9734cd 100644 --- a/ets2panda/test/parser/ets/re_export/folderIndex2/type-expected.txt +++ b/ets2panda/test/parser/ets/re_export/folderIndex2/type-expected.txt @@ -48,8 +48,8 @@ "program": "type.ets" }, "end": { - "line": 17, - "column": 1, + "line": 16, + "column": 27, "program": "type.ets" } } @@ -61,8 +61,8 @@ "program": "type.ets" }, "end": { - "line": 17, - "column": 1, + "line": 16, + "column": 27, "program": "type.ets" } } 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 0f1eaa4f325..9161ff1accd 100644 --- a/ets2panda/test/parser/ets/regression-target-type-context-expected.txt +++ b/ets2panda/test/parser/ets/regression-target-type-context-expected.txt @@ -1802,7 +1802,7 @@ }, "end": { "line": 33, - "column": 24, + "column": 22, "program": "regression-target-type-context.ets" } } @@ -1815,7 +1815,7 @@ }, "end": { "line": 33, - "column": 24, + "column": 22, "program": "regression-target-type-context.ets" } } @@ -1856,7 +1856,7 @@ }, "end": { "line": 34, - "column": 18, + "column": 17, "program": "regression-target-type-context.ets" } } @@ -1869,7 +1869,7 @@ }, "end": { "line": 34, - "column": 18, + "column": 17, "program": "regression-target-type-context.ets" } } @@ -2254,7 +2254,7 @@ }, "end": { "line": 39, - "column": 26, + "column": 24, "program": "regression-target-type-context.ets" } } @@ -2267,7 +2267,7 @@ }, "end": { "line": 39, - "column": 26, + "column": 24, "program": "regression-target-type-context.ets" } } @@ -2317,7 +2317,7 @@ }, "end": { "line": 39, - "column": 35, + "column": 34, "program": "regression-target-type-context.ets" } } @@ -2330,7 +2330,7 @@ }, "end": { "line": 39, - "column": 35, + "column": 34, "program": "regression-target-type-context.ets" } } diff --git a/ets2panda/test/parser/ets/returnNullableFromFunction-expected.txt b/ets2panda/test/parser/ets/returnNullableFromFunction-expected.txt index 09900e0a938..b3d70cafe6b 100644 --- a/ets2panda/test/parser/ets/returnNullableFromFunction-expected.txt +++ b/ets2panda/test/parser/ets/returnNullableFromFunction-expected.txt @@ -469,7 +469,7 @@ }, "end": { "line": 18, - "column": 21, + "column": 19, "program": "returnNullableFromFunction.ets" } } @@ -482,7 +482,7 @@ }, "end": { "line": 18, - "column": 21, + "column": 19, "program": "returnNullableFromFunction.ets" } } @@ -530,7 +530,7 @@ }, "end": { "line": 19, - "column": 17, + "column": 15, "program": "returnNullableFromFunction.ets" } } @@ -543,7 +543,7 @@ }, "end": { "line": 19, - "column": 17, + "column": 15, "program": "returnNullableFromFunction.ets" } } @@ -622,7 +622,7 @@ }, "end": { "line": 19, - "column": 31, + "column": 30, "program": "returnNullableFromFunction.ets" } } @@ -635,7 +635,7 @@ }, "end": { "line": 19, - "column": 31, + "column": 30, "program": "returnNullableFromFunction.ets" } } diff --git a/ets2panda/test/parser/ets/returnNullableFromMethod-expected.txt b/ets2panda/test/parser/ets/returnNullableFromMethod-expected.txt index 2daf1fa1abb..ecf7fce930d 100644 --- a/ets2panda/test/parser/ets/returnNullableFromMethod-expected.txt +++ b/ets2panda/test/parser/ets/returnNullableFromMethod-expected.txt @@ -102,7 +102,7 @@ }, "end": { "line": 17, - "column": 16, + "column": 14, "program": "returnNullableFromMethod.ets" } } @@ -115,7 +115,7 @@ }, "end": { "line": 17, - "column": 16, + "column": 14, "program": "returnNullableFromMethod.ets" } } @@ -163,7 +163,7 @@ }, "end": { "line": 18, - "column": 21, + "column": 19, "program": "returnNullableFromMethod.ets" } } @@ -176,7 +176,7 @@ }, "end": { "line": 18, - "column": 21, + "column": 19, "program": "returnNullableFromMethod.ets" } } @@ -255,7 +255,7 @@ }, "end": { "line": 18, - "column": 35, + "column": 34, "program": "returnNullableFromMethod.ets" } } @@ -268,7 +268,7 @@ }, "end": { "line": 18, - "column": 35, + "column": 34, "program": "returnNullableFromMethod.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 967c5d9a6ab..ee28cd5722f 100644 --- a/ets2panda/test/parser/ets/static_function_override_1-expected.txt +++ b/ets2panda/test/parser/ets/static_function_override_1-expected.txt @@ -326,7 +326,7 @@ }, "end": { "line": 20, - "column": 30, + "column": 28, "program": "static_function_override_1.ets" } } @@ -339,7 +339,7 @@ }, "end": { "line": 20, - "column": 30, + "column": 28, "program": "static_function_override_1.ets" } } 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 754bc9aedad..984303723e6 100644 --- a/ets2panda/test/parser/ets/static_function_override_2-expected.txt +++ b/ets2panda/test/parser/ets/static_function_override_2-expected.txt @@ -326,7 +326,7 @@ }, "end": { "line": 20, - "column": 30, + "column": 28, "program": "static_function_override_2.ets" } } @@ -339,7 +339,7 @@ }, "end": { "line": 20, - "column": 30, + "column": 28, "program": "static_function_override_2.ets" } } 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 7b7a04aceaa..dc1ba36f83c 100644 --- a/ets2panda/test/parser/ets/static_function_override_3-expected.txt +++ b/ets2panda/test/parser/ets/static_function_override_3-expected.txt @@ -326,7 +326,7 @@ }, "end": { "line": 20, - "column": 30, + "column": 28, "program": "static_function_override_3.ets" } } @@ -339,7 +339,7 @@ }, "end": { "line": 20, - "column": 30, + "column": 28, "program": "static_function_override_3.ets" } } diff --git a/ets2panda/test/parser/ets/string-expected.txt b/ets2panda/test/parser/ets/string-expected.txt index dfd562defe4..af0026148ed 100644 --- a/ets2panda/test/parser/ets/string-expected.txt +++ b/ets2panda/test/parser/ets/string-expected.txt @@ -419,7 +419,7 @@ }, "end": { "line": 16, - "column": 16, + "column": 14, "program": "string.ets" } } @@ -432,7 +432,7 @@ }, "end": { "line": 16, - "column": 16, + "column": 14, "program": "string.ets" } } @@ -506,7 +506,7 @@ }, "end": { "line": 17, - "column": 16, + "column": 14, "program": "string.ets" } } @@ -519,7 +519,7 @@ }, "end": { "line": 17, - "column": 16, + "column": 14, "program": "string.ets" } } diff --git a/ets2panda/test/parser/ets/switch-expected.txt b/ets2panda/test/parser/ets/switch-expected.txt index a0f6801d625..b5c108708d6 100644 --- a/ets2panda/test/parser/ets/switch-expected.txt +++ b/ets2panda/test/parser/ets/switch-expected.txt @@ -234,7 +234,7 @@ }, "end": { "line": 18, - "column": 21, + "column": 19, "program": "switch.ets" } } @@ -247,7 +247,7 @@ }, "end": { "line": 18, - "column": 21, + "column": 19, "program": "switch.ets" } } @@ -347,7 +347,7 @@ }, "end": { "line": 19, - "column": 21, + "column": 20, "program": "switch.ets" } } @@ -360,7 +360,7 @@ }, "end": { "line": 19, - "column": 21, + "column": 20, "program": "switch.ets" } } 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 061cc69b2d4..8d201c05fbf 100644 --- a/ets2panda/test/parser/ets/test-type-alias-call1-expected.txt +++ b/ets2panda/test/parser/ets/test-type-alias-call1-expected.txt @@ -320,7 +320,7 @@ }, "end": { "line": 18, - "column": 32, + "column": 30, "program": "test-type-alias-call1.ets" } } @@ -333,7 +333,7 @@ }, "end": { "line": 18, - "column": 32, + "column": 30, "program": "test-type-alias-call1.ets" } } 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 7803685eb2d..676a454c5cf 100644 --- a/ets2panda/test/parser/ets/test-type-alias-call2-expected.txt +++ b/ets2panda/test/parser/ets/test-type-alias-call2-expected.txt @@ -159,8 +159,8 @@ "program": "test-type-alias-call2.ets" }, "end": { - "line": 18, - "column": 5, + "line": 17, + "column": 20, "program": "test-type-alias-call2.ets" } } @@ -172,8 +172,8 @@ "program": "test-type-alias-call2.ets" }, "end": { - "line": 18, - "column": 5, + "line": 17, + "column": 20, "program": "test-type-alias-call2.ets" } } @@ -238,8 +238,8 @@ "program": "test-type-alias-call2.ets" }, "end": { - "line": 19, - "column": 6, + "line": 18, + "column": 23, "program": "test-type-alias-call2.ets" } } @@ -251,8 +251,8 @@ "program": "test-type-alias-call2.ets" }, "end": { - "line": 19, - "column": 6, + "line": 18, + "column": 23, "program": "test-type-alias-call2.ets" } } @@ -478,7 +478,7 @@ }, "end": { "line": 20, - "column": 32, + "column": 30, "program": "test-type-alias-call2.ets" } } @@ -491,7 +491,7 @@ }, "end": { "line": 20, - "column": 32, + "column": 30, "program": "test-type-alias-call2.ets" } } 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 9fa5ef92a94..2ac7a431a22 100644 --- a/ets2panda/test/parser/ets/test-type-alias-call3-expected.txt +++ b/ets2panda/test/parser/ets/test-type-alias-call3-expected.txt @@ -320,7 +320,7 @@ }, "end": { "line": 18, - "column": 39, + "column": 37, "program": "test-type-alias-call3.ets" } } @@ -333,7 +333,7 @@ }, "end": { "line": 18, - "column": 39, + "column": 37, "program": "test-type-alias-call3.ets" } } 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 ec2d94e349c..aff79b879e4 100644 --- a/ets2panda/test/parser/ets/test-type-alias-call4-expected.txt +++ b/ets2panda/test/parser/ets/test-type-alias-call4-expected.txt @@ -320,7 +320,7 @@ }, "end": { "line": 18, - "column": 39, + "column": 37, "program": "test-type-alias-call4.ets" } } @@ -333,7 +333,7 @@ }, "end": { "line": 18, - "column": 39, + "column": 37, "program": "test-type-alias-call4.ets" } } 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 3df93834026..e92ec1841d9 100644 --- a/ets2panda/test/parser/ets/test-type-alias-call5-expected.txt +++ b/ets2panda/test/parser/ets/test-type-alias-call5-expected.txt @@ -159,8 +159,8 @@ "program": "test-type-alias-call5.ets" }, "end": { - "line": 18, - "column": 5, + "line": 17, + "column": 20, "program": "test-type-alias-call5.ets" } } @@ -172,8 +172,8 @@ "program": "test-type-alias-call5.ets" }, "end": { - "line": 18, - "column": 5, + "line": 17, + "column": 20, "program": "test-type-alias-call5.ets" } } @@ -242,7 +242,7 @@ }, "end": { "line": 18, - "column": 24, + "column": 22, "program": "test-type-alias-call5.ets" } } @@ -255,7 +255,7 @@ }, "end": { "line": 18, - "column": 24, + "column": 22, "program": "test-type-alias-call5.ets" } } @@ -289,7 +289,7 @@ }, "end": { "line": 18, - "column": 32, + "column": 31, "program": "test-type-alias-call5.ets" } } @@ -302,7 +302,7 @@ }, "end": { "line": 18, - "column": 32, + "column": 31, "program": "test-type-alias-call5.ets" } } @@ -316,7 +316,7 @@ }, "end": { "line": 18, - "column": 32, + "column": 31, "program": "test-type-alias-call5.ets" } } @@ -542,7 +542,7 @@ }, "end": { "line": 21, - "column": 32, + "column": 30, "program": "test-type-alias-call5.ets" } } @@ -555,7 +555,7 @@ }, "end": { "line": 21, - "column": 32, + "column": 30, "program": "test-type-alias-call5.ets" } } 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 5c7aeb17320..10b2e7ed98e 100644 --- a/ets2panda/test/parser/ets/test-type-alias-call6-expected.txt +++ b/ets2panda/test/parser/ets/test-type-alias-call6-expected.txt @@ -160,7 +160,7 @@ }, "end": { "line": 17, - "column": 21, + "column": 20, "program": "test-type-alias-call6.ets" } } @@ -173,7 +173,7 @@ }, "end": { "line": 17, - "column": 21, + "column": 20, "program": "test-type-alias-call6.ets" } } @@ -242,7 +242,7 @@ }, "end": { "line": 18, - "column": 21, + "column": 19, "program": "test-type-alias-call6.ets" } } @@ -255,7 +255,7 @@ }, "end": { "line": 18, - "column": 21, + "column": 19, "program": "test-type-alias-call6.ets" } } @@ -289,7 +289,7 @@ }, "end": { "line": 18, - "column": 29, + "column": 28, "program": "test-type-alias-call6.ets" } } @@ -302,7 +302,7 @@ }, "end": { "line": 18, - "column": 29, + "column": 28, "program": "test-type-alias-call6.ets" } } @@ -316,7 +316,7 @@ }, "end": { "line": 18, - "column": 29, + "column": 28, "program": "test-type-alias-call6.ets" } } @@ -382,7 +382,7 @@ }, "end": { "line": 19, - "column": 23, + "column": 22, "program": "test-type-alias-call6.ets" } } @@ -395,7 +395,7 @@ }, "end": { "line": 19, - "column": 23, + "column": 22, "program": "test-type-alias-call6.ets" } } @@ -621,7 +621,7 @@ }, "end": { "line": 22, - "column": 32, + "column": 30, "program": "test-type-alias-call6.ets" } } @@ -634,7 +634,7 @@ }, "end": { "line": 22, - "column": 32, + "column": 30, "program": "test-type-alias-call6.ets" } } 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 1a69254b098..bba9fd66af7 100644 --- a/ets2panda/test/parser/ets/test-type-alias-call8-expected.txt +++ b/ets2panda/test/parser/ets/test-type-alias-call8-expected.txt @@ -291,7 +291,7 @@ }, "end": { "line": 19, - "column": 32, + "column": 30, "program": "test-type-alias-call8.ets" } } @@ -304,7 +304,7 @@ }, "end": { "line": 19, - "column": 32, + "column": 30, "program": "test-type-alias-call8.ets" } } diff --git a/ets2panda/test/parser/ets/test_interface-expected.txt b/ets2panda/test/parser/ets/test_interface-expected.txt index 468c8379b81..e47cff979a5 100644 --- a/ets2panda/test/parser/ets/test_interface-expected.txt +++ b/ets2panda/test/parser/ets/test_interface-expected.txt @@ -78,7 +78,7 @@ }, "end": { "line": 19, - "column": 13, + "column": 12, "program": "test_interface.ets" } } @@ -91,7 +91,7 @@ }, "end": { "line": 19, - "column": 13, + "column": 12, "program": "test_interface.ets" } } @@ -202,7 +202,7 @@ }, "end": { "line": 19, - "column": 13, + "column": 12, "program": "test_interface.ets" } } @@ -215,7 +215,7 @@ }, "end": { "line": 19, - "column": 13, + "column": 12, "program": "test_interface.ets" } } @@ -230,7 +230,7 @@ }, "end": { "line": 19, - "column": 13, + "column": 12, "program": "test_interface.ets" } } @@ -245,7 +245,7 @@ }, "end": { "line": 19, - "column": 13, + "column": 12, "program": "test_interface.ets" } } @@ -322,7 +322,7 @@ }, "end": { "line": 20, - "column": 17, + "column": 16, "program": "test_interface.ets" } } @@ -335,7 +335,7 @@ }, "end": { "line": 20, - "column": 17, + "column": 16, "program": "test_interface.ets" } } @@ -446,7 +446,7 @@ }, "end": { "line": 20, - "column": 17, + "column": 16, "program": "test_interface.ets" } } @@ -459,7 +459,7 @@ }, "end": { "line": 20, - "column": 17, + "column": 16, "program": "test_interface.ets" } } @@ -474,7 +474,7 @@ }, "end": { "line": 20, - "column": 17, + "column": 16, "program": "test_interface.ets" } } @@ -489,7 +489,7 @@ }, "end": { "line": 20, - "column": 17, + "column": 16, "program": "test_interface.ets" } } @@ -977,8 +977,8 @@ "program": "test_interface.ets" }, "end": { - "line": 27, - "column": 1, + "line": 26, + "column": 2, "program": "test_interface.ets" } } diff --git a/ets2panda/test/parser/ets/test_jsvalue-expected.txt b/ets2panda/test/parser/ets/test_jsvalue-expected.txt index 11a038c8238..8c7f12f1933 100644 --- a/ets2panda/test/parser/ets/test_jsvalue-expected.txt +++ b/ets2panda/test/parser/ets/test_jsvalue-expected.txt @@ -290,7 +290,7 @@ }, "end": { "line": 16, - "column": 16, + "column": 15, "program": "test_jsvalue.ets" } } @@ -303,7 +303,7 @@ }, "end": { "line": 16, - "column": 16, + "column": 15, "program": "test_jsvalue.ets" } } diff --git a/ets2panda/test/parser/ets/test_type_alias8-expected.txt b/ets2panda/test/parser/ets/test_type_alias8-expected.txt index d9f05d631b9..aead5804535 100644 --- a/ets2panda/test/parser/ets/test_type_alias8-expected.txt +++ b/ets2panda/test/parser/ets/test_type_alias8-expected.txt @@ -49,7 +49,7 @@ }, "end": { "line": 16, - "column": 20, + "column": 19, "program": "test_type_alias8.ets" } } @@ -62,7 +62,7 @@ }, "end": { "line": 16, - "column": 20, + "column": 19, "program": "test_type_alias8.ets" } } @@ -292,7 +292,7 @@ }, "end": { "line": 18, - "column": 24, + "column": 23, "program": "test_type_alias8.ets" } } @@ -305,7 +305,7 @@ }, "end": { "line": 18, - "column": 24, + "column": 23, "program": "test_type_alias8.ets" } } @@ -319,7 +319,7 @@ }, "end": { "line": 18, - "column": 24, + "column": 23, "program": "test_type_alias8.ets" } } @@ -332,7 +332,7 @@ }, "end": { "line": 18, - "column": 24, + "column": 23, "program": "test_type_alias8.ets" } } @@ -493,7 +493,7 @@ }, "end": { "line": 21, - "column": 22, + "column": 21, "program": "test_type_alias8.ets" } } @@ -506,7 +506,7 @@ }, "end": { "line": 21, - "column": 22, + "column": 21, "program": "test_type_alias8.ets" } } @@ -520,7 +520,7 @@ }, "end": { "line": 21, - "column": 22, + "column": 21, "program": "test_type_alias8.ets" } } @@ -533,7 +533,7 @@ }, "end": { "line": 21, - "column": 22, + "column": 21, "program": "test_type_alias8.ets" } } @@ -715,7 +715,7 @@ }, "end": { "line": 25, - "column": 18, + "column": 16, "program": "test_type_alias8.ets" } } @@ -728,7 +728,7 @@ }, "end": { "line": 25, - "column": 18, + "column": 16, "program": "test_type_alias8.ets" } } @@ -828,7 +828,7 @@ }, "end": { "line": 26, - "column": 20, + "column": 18, "program": "test_type_alias8.ets" } } @@ -841,7 +841,7 @@ }, "end": { "line": 26, - "column": 20, + "column": 18, "program": "test_type_alias8.ets" } } diff --git a/ets2panda/test/parser/ets/test_type_alias9-expected.txt b/ets2panda/test/parser/ets/test_type_alias9-expected.txt index f400a943746..16f592d9f0e 100644 --- a/ets2panda/test/parser/ets/test_type_alias9-expected.txt +++ b/ets2panda/test/parser/ets/test_type_alias9-expected.txt @@ -772,7 +772,7 @@ }, "end": { "line": 19, - "column": 13, + "column": 11, "program": "test_type_alias9.ets" } } @@ -785,7 +785,7 @@ }, "end": { "line": 19, - "column": 13, + "column": 11, "program": "test_type_alias9.ets" } } @@ -859,7 +859,7 @@ }, "end": { "line": 20, - "column": 16, + "column": 14, "program": "test_type_alias9.ets" } } @@ -872,7 +872,7 @@ }, "end": { "line": 20, - "column": 16, + "column": 14, "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 73f868f452f..b9fe8475723 100644 --- a/ets2panda/test/parser/ets/this_callee-expected.txt +++ b/ets2panda/test/parser/ets/this_callee-expected.txt @@ -102,7 +102,7 @@ }, "end": { "line": 17, - "column": 22, + "column": 20, "program": "this_callee.ets" } } @@ -115,7 +115,7 @@ }, "end": { "line": 17, - "column": 22, + "column": 20, "program": "this_callee.ets" } } @@ -358,7 +358,7 @@ }, "end": { "line": 21, - "column": 21, + "column": 20, "program": "this_callee.ets" } } @@ -371,7 +371,7 @@ }, "end": { "line": 21, - "column": 21, + "column": 20, "program": "this_callee.ets" } } @@ -385,7 +385,7 @@ }, "end": { "line": 21, - "column": 21, + "column": 20, "program": "this_callee.ets" } } @@ -398,7 +398,7 @@ }, "end": { "line": 21, - "column": 21, + "column": 20, "program": "this_callee.ets" } } @@ -433,7 +433,7 @@ }, "end": { "line": 21, - "column": 28, + "column": 26, "program": "this_callee.ets" } } @@ -446,7 +446,7 @@ }, "end": { "line": 21, - "column": 28, + "column": 26, "program": "this_callee.ets" } } @@ -619,7 +619,7 @@ }, "end": { "line": 25, - "column": 23, + "column": 21, "program": "this_callee.ets" } } @@ -632,7 +632,7 @@ }, "end": { "line": 25, - "column": 23, + "column": 21, "program": "this_callee.ets" } } @@ -891,7 +891,7 @@ }, "end": { "line": 29, - "column": 22, + "column": 21, "program": "this_callee.ets" } } @@ -904,7 +904,7 @@ }, "end": { "line": 29, - "column": 22, + "column": 21, "program": "this_callee.ets" } } @@ -918,7 +918,7 @@ }, "end": { "line": 29, - "column": 22, + "column": 21, "program": "this_callee.ets" } } @@ -931,7 +931,7 @@ }, "end": { "line": 29, - "column": 22, + "column": 21, "program": "this_callee.ets" } } @@ -1013,7 +1013,7 @@ }, "end": { "line": 29, - "column": 37, + "column": 35, "program": "this_callee.ets" } } @@ -1026,7 +1026,7 @@ }, "end": { "line": 29, - "column": 37, + "column": 35, "program": "this_callee.ets" } } diff --git a/ets2panda/test/parser/ets/this_cmp_object-expected.txt b/ets2panda/test/parser/ets/this_cmp_object-expected.txt index a4284a90a5d..38f5b46dd94 100644 --- a/ets2panda/test/parser/ets/this_cmp_object-expected.txt +++ b/ets2panda/test/parser/ets/this_cmp_object-expected.txt @@ -128,7 +128,7 @@ }, "end": { "line": 18, - "column": 25, + "column": 23, "program": "this_cmp_object.ets" } } @@ -141,7 +141,7 @@ }, "end": { "line": 18, - "column": 25, + "column": 23, "program": "this_cmp_object.ets" } } 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 b5301d33980..84531f90b2f 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 @@ -221,7 +221,7 @@ }, "end": { "line": 16, - "column": 29, + "column": 28, "program": "trailing_lambda_overload_1.ets" } } @@ -234,7 +234,7 @@ }, "end": { "line": 16, - "column": 29, + "column": 28, "program": "trailing_lambda_overload_1.ets" } } @@ -248,7 +248,7 @@ }, "end": { "line": 16, - "column": 29, + "column": 28, "program": "trailing_lambda_overload_1.ets" } } @@ -261,7 +261,7 @@ }, "end": { "line": 16, - "column": 29, + "column": 28, "program": "trailing_lambda_overload_1.ets" } } 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 975d122ed43..f566ff434f2 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 @@ -276,7 +276,7 @@ }, "end": { "line": 18, - "column": 23, + "column": 22, "program": "trailing_lambda_type_alias.ets" } } @@ -289,7 +289,7 @@ }, "end": { "line": 18, - "column": 23, + "column": 22, "program": "trailing_lambda_type_alias.ets" } } @@ -303,7 +303,7 @@ }, "end": { "line": 18, - "column": 23, + "column": 22, "program": "trailing_lambda_type_alias.ets" } } @@ -316,7 +316,7 @@ }, "end": { "line": 18, - "column": 23, + "column": 22, "program": "trailing_lambda_type_alias.ets" } } diff --git a/ets2panda/test/parser/ets/tupleAsTypeParam1-expected.txt b/ets2panda/test/parser/ets/tupleAsTypeParam1-expected.txt index 9d0c979f2ca..389237f5c8f 100644 --- a/ets2panda/test/parser/ets/tupleAsTypeParam1-expected.txt +++ b/ets2panda/test/parser/ets/tupleAsTypeParam1-expected.txt @@ -427,7 +427,7 @@ }, "end": { "line": 17, - "column": 16, + "column": 14, "program": "tupleAsTypeParam1.ets" } } @@ -440,7 +440,7 @@ }, "end": { "line": 17, - "column": 16, + "column": 14, "program": "tupleAsTypeParam1.ets" } } @@ -684,7 +684,7 @@ }, "end": { "line": 21, - "column": 23, + "column": 22, "program": "tupleAsTypeParam1.ets" } } @@ -697,7 +697,7 @@ }, "end": { "line": 21, - "column": 23, + "column": 22, "program": "tupleAsTypeParam1.ets" } } @@ -731,7 +731,7 @@ }, "end": { "line": 21, - "column": 31, + "column": 30, "program": "tupleAsTypeParam1.ets" } } @@ -744,7 +744,7 @@ }, "end": { "line": 21, - "column": 31, + "column": 30, "program": "tupleAsTypeParam1.ets" } } @@ -894,7 +894,7 @@ }, "end": { "line": 22, - "column": 24, + "column": 23, "program": "tupleAsTypeParam1.ets" } } @@ -907,7 +907,7 @@ }, "end": { "line": 22, - "column": 24, + "column": 23, "program": "tupleAsTypeParam1.ets" } } @@ -941,7 +941,7 @@ }, "end": { "line": 22, - "column": 32, + "column": 31, "program": "tupleAsTypeParam1.ets" } } @@ -954,7 +954,7 @@ }, "end": { "line": 22, - "column": 32, + "column": 31, "program": "tupleAsTypeParam1.ets" } } @@ -1174,7 +1174,7 @@ }, "end": { "line": 23, - "column": 17, + "column": 16, "program": "tupleAsTypeParam1.ets" } } @@ -1187,7 +1187,7 @@ }, "end": { "line": 23, - "column": 17, + "column": 16, "program": "tupleAsTypeParam1.ets" } } @@ -1221,7 +1221,7 @@ }, "end": { "line": 23, - "column": 25, + "column": 24, "program": "tupleAsTypeParam1.ets" } } @@ -1234,7 +1234,7 @@ }, "end": { "line": 23, - "column": 25, + "column": 24, "program": "tupleAsTypeParam1.ets" } } diff --git a/ets2panda/test/parser/ets/tupleAsTypeParam2-expected.txt b/ets2panda/test/parser/ets/tupleAsTypeParam2-expected.txt index 0b6ee5fa979..d635716289d 100644 --- a/ets2panda/test/parser/ets/tupleAsTypeParam2-expected.txt +++ b/ets2panda/test/parser/ets/tupleAsTypeParam2-expected.txt @@ -820,7 +820,7 @@ }, "end": { "line": 24, - "column": 23, + "column": 22, "program": "tupleAsTypeParam2.ets" } } @@ -833,7 +833,7 @@ }, "end": { "line": 24, - "column": 23, + "column": 22, "program": "tupleAsTypeParam2.ets" } } @@ -867,7 +867,7 @@ }, "end": { "line": 24, - "column": 31, + "column": 30, "program": "tupleAsTypeParam2.ets" } } @@ -880,7 +880,7 @@ }, "end": { "line": 24, - "column": 31, + "column": 30, "program": "tupleAsTypeParam2.ets" } } @@ -1030,7 +1030,7 @@ }, "end": { "line": 25, - "column": 24, + "column": 23, "program": "tupleAsTypeParam2.ets" } } @@ -1043,7 +1043,7 @@ }, "end": { "line": 25, - "column": 24, + "column": 23, "program": "tupleAsTypeParam2.ets" } } @@ -1077,7 +1077,7 @@ }, "end": { "line": 25, - "column": 32, + "column": 31, "program": "tupleAsTypeParam2.ets" } } @@ -1090,7 +1090,7 @@ }, "end": { "line": 25, - "column": 32, + "column": 31, "program": "tupleAsTypeParam2.ets" } } @@ -1280,7 +1280,7 @@ }, "end": { "line": 26, - "column": 27, + "column": 26, "program": "tupleAsTypeParam2.ets" } } @@ -1293,7 +1293,7 @@ }, "end": { "line": 26, - "column": 27, + "column": 26, "program": "tupleAsTypeParam2.ets" } } @@ -1327,7 +1327,7 @@ }, "end": { "line": 26, - "column": 35, + "column": 34, "program": "tupleAsTypeParam2.ets" } } @@ -1340,7 +1340,7 @@ }, "end": { "line": 26, - "column": 35, + "column": 34, "program": "tupleAsTypeParam2.ets" } } @@ -1381,7 +1381,7 @@ }, "end": { "line": 26, - "column": 37, + "column": 36, "program": "tupleAsTypeParam2.ets" } } @@ -1394,7 +1394,7 @@ }, "end": { "line": 26, - "column": 37, + "column": 36, "program": "tupleAsTypeParam2.ets" } } diff --git a/ets2panda/test/parser/ets/tupleIndexWithNumbers-expected.txt b/ets2panda/test/parser/ets/tupleIndexWithNumbers-expected.txt index f8561bc609d..aab3c5af767 100644 --- a/ets2panda/test/parser/ets/tupleIndexWithNumbers-expected.txt +++ b/ets2panda/test/parser/ets/tupleIndexWithNumbers-expected.txt @@ -379,7 +379,7 @@ }, "end": { "line": 20, - "column": 22, + "column": 21, "program": "tupleIndexWithNumbers.ets" } } @@ -392,7 +392,7 @@ }, "end": { "line": 20, - "column": 22, + "column": 21, "program": "tupleIndexWithNumbers.ets" } } @@ -426,7 +426,7 @@ }, "end": { "line": 20, - "column": 30, + "column": 29, "program": "tupleIndexWithNumbers.ets" } } @@ -439,7 +439,7 @@ }, "end": { "line": 20, - "column": 30, + "column": 29, "program": "tupleIndexWithNumbers.ets" } } diff --git a/ets2panda/test/parser/ets/type_alias_1-expected.txt b/ets2panda/test/parser/ets/type_alias_1-expected.txt index 454187bc1b0..7997bdfa5df 100644 --- a/ets2panda/test/parser/ets/type_alias_1-expected.txt +++ b/ets2panda/test/parser/ets/type_alias_1-expected.txt @@ -464,8 +464,8 @@ "program": "type_alias_1.ets" }, "end": { - "line": 19, - "column": 1, + "line": 18, + "column": 19, "program": "type_alias_1.ets" } } @@ -477,8 +477,8 @@ "program": "type_alias_1.ets" }, "end": { - "line": 19, - "column": 1, + "line": 18, + "column": 19, "program": "type_alias_1.ets" } } diff --git a/ets2panda/test/parser/ets/type_variance1-expected.txt b/ets2panda/test/parser/ets/type_variance1-expected.txt index 464a81ec90f..3ec232b6b86 100644 --- a/ets2panda/test/parser/ets/type_variance1-expected.txt +++ b/ets2panda/test/parser/ets/type_variance1-expected.txt @@ -157,7 +157,7 @@ }, "end": { "line": 17, - "column": 14, + "column": 13, "program": "type_variance1.ets" } } @@ -170,7 +170,7 @@ }, "end": { "line": 17, - "column": 14, + "column": 13, "program": "type_variance1.ets" } } @@ -184,7 +184,7 @@ }, "end": { "line": 17, - "column": 14, + "column": 13, "program": "type_variance1.ets" } } @@ -197,7 +197,7 @@ }, "end": { "line": 17, - "column": 14, + "column": 13, "program": "type_variance1.ets" } } @@ -495,7 +495,7 @@ }, "end": { "line": 23, - "column": 17, + "column": 16, "program": "type_variance1.ets" } } @@ -508,7 +508,7 @@ }, "end": { "line": 23, - "column": 17, + "column": 16, "program": "type_variance1.ets" } } @@ -522,7 +522,7 @@ }, "end": { "line": 23, - "column": 17, + "column": 16, "program": "type_variance1.ets" } } @@ -535,7 +535,7 @@ }, "end": { "line": 23, - "column": 17, + "column": 16, "program": "type_variance1.ets" } } @@ -675,7 +675,7 @@ }, "end": { "line": 24, - "column": 18, + "column": 17, "program": "type_variance1.ets" } } @@ -688,7 +688,7 @@ }, "end": { "line": 24, - "column": 18, + "column": 17, "program": "type_variance1.ets" } } @@ -701,7 +701,7 @@ }, "end": { "line": 24, - "column": 18, + "column": 17, "program": "type_variance1.ets" } } @@ -714,7 +714,7 @@ }, "end": { "line": 24, - "column": 18, + "column": 17, "program": "type_variance1.ets" } } @@ -856,8 +856,8 @@ "program": "type_variance1.ets" }, "end": { - "line": 27, - "column": 6, + "line": 25, + "column": 2, "program": "type_variance1.ets" } } @@ -1094,7 +1094,7 @@ }, "end": { "line": 29, - "column": 60, + "column": 59, "program": "type_variance1.ets" } } @@ -1107,7 +1107,7 @@ }, "end": { "line": 29, - "column": 60, + "column": 59, "program": "type_variance1.ets" } } @@ -1141,7 +1141,7 @@ }, "end": { "line": 29, - "column": 63, + "column": 62, "program": "type_variance1.ets" } } @@ -1154,7 +1154,7 @@ }, "end": { "line": 29, - "column": 63, + "column": 62, "program": "type_variance1.ets" } } @@ -1181,7 +1181,7 @@ }, "end": { "line": 29, - "column": 65, + "column": 63, "program": "type_variance1.ets" } } @@ -1194,7 +1194,7 @@ }, "end": { "line": 29, - "column": 65, + "column": 63, "program": "type_variance1.ets" } } @@ -1297,7 +1297,7 @@ }, "end": { "line": 30, - "column": 23, + "column": 22, "program": "type_variance1.ets" } } @@ -1310,7 +1310,7 @@ }, "end": { "line": 30, - "column": 23, + "column": 22, "program": "type_variance1.ets" } } @@ -1324,7 +1324,7 @@ }, "end": { "line": 30, - "column": 23, + "column": 22, "program": "type_variance1.ets" } } @@ -1337,7 +1337,7 @@ }, "end": { "line": 30, - "column": 23, + "column": 22, "program": "type_variance1.ets" } } @@ -1493,7 +1493,7 @@ }, "end": { "line": 31, - "column": 24, + "column": 22, "program": "type_variance1.ets" } } @@ -1506,7 +1506,7 @@ }, "end": { "line": 31, - "column": 24, + "column": 22, "program": "type_variance1.ets" } } @@ -1547,7 +1547,7 @@ }, "end": { "line": 32, - "column": 22, + "column": 21, "program": "type_variance1.ets" } } @@ -1560,7 +1560,7 @@ }, "end": { "line": 32, - "column": 22, + "column": 21, "program": "type_variance1.ets" } } @@ -2396,7 +2396,7 @@ }, "end": { "line": 20, - "column": 47, + "column": 46, "program": "type_variance1.ets" } } @@ -2409,7 +2409,7 @@ }, "end": { "line": 20, - "column": 47, + "column": 46, "program": "type_variance1.ets" } } @@ -2591,7 +2591,7 @@ }, "end": { "line": 20, - "column": 30, + "column": 28, "program": "type_variance1.ets" } } @@ -2604,7 +2604,7 @@ }, "end": { "line": 20, - "column": 30, + "column": 28, "program": "type_variance1.ets" } } @@ -2752,7 +2752,7 @@ }, "end": { "line": 39, - "column": 24, + "column": 23, "program": "type_variance1.ets" } } @@ -2765,7 +2765,7 @@ }, "end": { "line": 39, - "column": 24, + "column": 23, "program": "type_variance1.ets" } } @@ -2792,7 +2792,7 @@ }, "end": { "line": 39, - "column": 26, + "column": 24, "program": "type_variance1.ets" } } @@ -2805,7 +2805,7 @@ }, "end": { "line": 39, - "column": 26, + "column": 24, "program": "type_variance1.ets" } } @@ -2879,7 +2879,7 @@ }, "end": { "line": 39, - "column": 41, + "column": 40, "program": "type_variance1.ets" } } @@ -2892,7 +2892,7 @@ }, "end": { "line": 39, - "column": 41, + "column": 40, "program": "type_variance1.ets" } } @@ -2919,7 +2919,7 @@ }, "end": { "line": 39, - "column": 42, + "column": 41, "program": "type_variance1.ets" } } @@ -2932,7 +2932,7 @@ }, "end": { "line": 39, - "column": 42, + "column": 41, "program": "type_variance1.ets" } } @@ -3144,7 +3144,7 @@ }, "end": { "line": 40, - "column": 29, + "column": 27, "program": "type_variance1.ets" } } @@ -3157,7 +3157,7 @@ }, "end": { "line": 40, - "column": 29, + "column": 27, "program": "type_variance1.ets" } } @@ -3335,7 +3335,7 @@ }, "end": { "line": 40, - "column": 47, + "column": 46, "program": "type_variance1.ets" } } @@ -3348,7 +3348,7 @@ }, "end": { "line": 40, - "column": 47, + "column": 46, "program": "type_variance1.ets" } } diff --git a/ets2panda/test/parser/ets/undefinedNullObjectTypeAnnotation-expected.txt b/ets2panda/test/parser/ets/undefinedNullObjectTypeAnnotation-expected.txt index 40880a3dc8b..369e0b2918f 100644 --- a/ets2panda/test/parser/ets/undefinedNullObjectTypeAnnotation-expected.txt +++ b/ets2panda/test/parser/ets/undefinedNullObjectTypeAnnotation-expected.txt @@ -252,7 +252,7 @@ }, "end": { "line": 17, - "column": 41, + "column": 40, "program": "undefinedNullObjectTypeAnnotation.ets" } } @@ -265,7 +265,7 @@ }, "end": { "line": 17, - "column": 41, + "column": 40, "program": "undefinedNullObjectTypeAnnotation.ets" } } @@ -279,7 +279,7 @@ }, "end": { "line": 17, - "column": 41, + "column": 40, "program": "undefinedNullObjectTypeAnnotation.ets" } } @@ -508,7 +508,7 @@ }, "end": { "line": 20, - "column": 22, + "column": 21, "program": "undefinedNullObjectTypeAnnotation.ets" } } @@ -521,7 +521,7 @@ }, "end": { "line": 20, - "column": 22, + "column": 21, "program": "undefinedNullObjectTypeAnnotation.ets" } } 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 c44d4ec5519..c7b44b5d8a0 100644 --- a/ets2panda/test/parser/ets/union_lowering_common_property-expected.txt +++ b/ets2panda/test/parser/ets/union_lowering_common_property-expected.txt @@ -94,7 +94,7 @@ }, "end": { "line": 17, - "column": 21, + "column": 19, "program": "union_lowering_common_property.ets" } } @@ -107,7 +107,7 @@ }, "end": { "line": 17, - "column": 21, + "column": 19, "program": "union_lowering_common_property.ets" } } @@ -352,7 +352,7 @@ }, "end": { "line": 21, - "column": 21, + "column": 19, "program": "union_lowering_common_property.ets" } } @@ -365,7 +365,7 @@ }, "end": { "line": 21, - "column": 21, + "column": 19, "program": "union_lowering_common_property.ets" } } @@ -568,7 +568,7 @@ }, "end": { "line": 24, - "column": 17, + "column": 15, "program": "union_lowering_common_property.ets" } } @@ -581,7 +581,7 @@ }, "end": { "line": 24, - "column": 17, + "column": 15, "program": "union_lowering_common_property.ets" } } @@ -615,7 +615,7 @@ }, "end": { "line": 24, - "column": 20, + "column": 19, "program": "union_lowering_common_property.ets" } } @@ -628,7 +628,7 @@ }, "end": { "line": 24, - "column": 20, + "column": 19, "program": "union_lowering_common_property.ets" } } @@ -642,7 +642,7 @@ }, "end": { "line": 24, - "column": 20, + "column": 19, "program": "union_lowering_common_property.ets" } } @@ -1027,7 +1027,7 @@ }, "end": { "line": 27, - "column": 29, + "column": 28, "program": "union_lowering_common_property.ets" } } @@ -1040,7 +1040,7 @@ }, "end": { "line": 27, - "column": 29, + "column": 28, "program": "union_lowering_common_property.ets" } } @@ -1054,7 +1054,7 @@ }, "end": { "line": 27, - "column": 29, + "column": 28, "program": "union_lowering_common_property.ets" } } @@ -1067,7 +1067,7 @@ }, "end": { "line": 27, - "column": 29, + "column": 28, "program": "union_lowering_common_property.ets" } } @@ -1102,7 +1102,7 @@ }, "end": { "line": 27, - "column": 41, + "column": 38, "program": "union_lowering_common_property.ets" } } @@ -1115,7 +1115,7 @@ }, "end": { "line": 27, - "column": 41, + "column": 38, "program": "union_lowering_common_property.ets" } } diff --git a/ets2panda/test/parser/ets/user_defined_22-expected.txt b/ets2panda/test/parser/ets/user_defined_22-expected.txt index 75ff8d54310..b62ff44fcc4 100644 --- a/ets2panda/test/parser/ets/user_defined_22-expected.txt +++ b/ets2panda/test/parser/ets/user_defined_22-expected.txt @@ -94,7 +94,7 @@ }, "end": { "line": 17, - "column": 17, + "column": 15, "program": "user_defined_22.ets" } } @@ -107,7 +107,7 @@ }, "end": { "line": 17, - "column": 17, + "column": 15, "program": "user_defined_22.ets" } } @@ -306,8 +306,8 @@ "program": "user_defined_22.ets" }, "end": { - "line": 20, - "column": 4, + "line": 19, + "column": 16, "program": "user_defined_22.ets" } } @@ -319,8 +319,8 @@ "program": "user_defined_22.ets" }, "end": { - "line": 20, - "column": 4, + "line": 19, + "column": 16, "program": "user_defined_22.ets" } } @@ -571,8 +571,8 @@ "program": "user_defined_22.ets" }, "end": { - "line": 21, - "column": 2, + "line": 20, + "column": 14, "program": "user_defined_22.ets" } } @@ -584,8 +584,8 @@ "program": "user_defined_22.ets" }, "end": { - "line": 21, - "column": 2, + "line": 20, + "column": 14, "program": "user_defined_22.ets" } } @@ -864,8 +864,8 @@ "program": "user_defined_22.ets" }, "end": { - "line": 21, - "column": 2, + "line": 20, + "column": 14, "program": "user_defined_22.ets" } } @@ -877,8 +877,8 @@ "program": "user_defined_22.ets" }, "end": { - "line": 21, - "column": 2, + "line": 20, + "column": 14, "program": "user_defined_22.ets" } } @@ -972,7 +972,7 @@ }, "end": { "line": 22, - "column": 11, + "column": 9, "program": "user_defined_22.ets" } } @@ -985,7 +985,7 @@ }, "end": { "line": 22, - "column": 11, + "column": 9, "program": "user_defined_22.ets" } } diff --git a/ets2panda/test/unit/lsp/class_hierarchys_test.cpp b/ets2panda/test/unit/lsp/class_hierarchys_test.cpp index ac83082e082..5d796331b13 100644 --- a/ets2panda/test/unit/lsp/class_hierarchys_test.cpp +++ b/ets2panda/test/unit/lsp/class_hierarchys_test.cpp @@ -166,8 +166,8 @@ TEST_F(LspClassHierarchiesTests, GetClassHierarchiesImpl_002) TEST_F(LspClassHierarchiesTests, GetClassHierarchiesImpl_003) { - constexpr size_t expectedInfoCount = 12; - constexpr size_t tokenOffset = 100; + constexpr size_t expectedInfoCount = 7; + constexpr size_t tokenOffset = 101; // Note: here will get interface decl: `Iaaa` std::vector fileNames = {"GetClassHierarchiesImpl_003_file1.ets"}; diff --git a/ets2panda/test/unit/lsp/get_class_property_info_test.cpp b/ets2panda/test/unit/lsp/get_class_property_info_test.cpp index 039281bfc6d..4e540e60a0e 100644 --- a/ets2panda/test/unit/lsp/get_class_property_info_test.cpp +++ b/ets2panda/test/unit/lsp/get_class_property_info_test.cpp @@ -558,7 +558,7 @@ TEST_F(LspGetClassPropertyInfoTests, GetClassPropertyInfoMethod3) } std::vector>> expectedResult4 = { - {"pop", 107, 119, "classField", {"public"}}}; + {"pop", 107, 117, "classField", {"public"}}}; TEST_F(LspGetClassPropertyInfoTests, GetClassPropertyInfoMethod4) { @@ -595,7 +595,7 @@ TEST_F(LspGetClassPropertyInfoTests, GetClassPropertyInfoMethod4) } std::vector>> expectedResult5 = { - {"jkk", 64, 76, "classField", {"public"}}}; + {"jkk", 64, 75, "classField", {"public"}}}; TEST_F(LspGetClassPropertyInfoTests, GetClassPropertyInfoMethod5) { @@ -632,7 +632,7 @@ TEST_F(LspGetClassPropertyInfoTests, GetClassPropertyInfoMethod5) } std::vector>> expectedResult6 = { - {"jkk", 195, 207, "classField", {"public"}}, {"wwa", 210, 222, "classField", {"public"}}}; + {"jkk", 195, 206, "classField", {"public"}}, {"wwa", 210, 221, "classField", {"public"}}}; TEST_F(LspGetClassPropertyInfoTests, GetClassPropertyInfoMethod6) { @@ -669,7 +669,7 @@ TEST_F(LspGetClassPropertyInfoTests, GetClassPropertyInfoMethod6) } std::vector>> expectedResult7 = { - {"test", 14, 27, "classField", {"public"}}}; + {"test", 14, 26, "classField", {"public"}}}; TEST_F(LspGetClassPropertyInfoTests, GetClassPropertyInfoMethod7) { @@ -780,7 +780,7 @@ TEST_F(LspGetClassPropertyInfoTests, GetClassPropertyInfoMethod9) } std::vector>> expectedResult10 = { - {"a", 17, 34, "classField", {"public"}}}; + {"a", 17, 33, "classField", {"public"}}}; TEST_F(LspGetClassPropertyInfoTests, GetClassPropertyInfoMethod10) { @@ -817,7 +817,7 @@ TEST_F(LspGetClassPropertyInfoTests, GetClassPropertyInfoMethod10) } std::vector>> expectedResult11 = { - {"a", 32, 49, "classField", {"public"}}}; + {"a", 32, 48, "classField", {"public"}}}; TEST_F(LspGetClassPropertyInfoTests, GetClassPropertyInfoMethod11) { @@ -893,7 +893,7 @@ TEST_F(LspGetClassPropertyInfoTests, GetClassPropertyInfoMethod12) } std::vector>> expectedResult13 = { - {"aa", 216, 227, "classField", {"public"}}}; + {"aa", 216, 226, "classField", {"public"}}}; TEST_F(LspGetClassPropertyInfoTests, GetClassPropertyInfoMethod13) { @@ -930,7 +930,7 @@ TEST_F(LspGetClassPropertyInfoTests, GetClassPropertyInfoMethod13) } std::vector>> expectedResult14 = { - {"subscriber", 144, 210, "classField", {"public"}}, {"subscribeInfo", 221, 254, "classField", {"public"}}}; + {"subscriber", 144, 210, "classField", {"public"}}, {"subscribeInfo", 221, 253, "classField", {"public"}}}; TEST_F(LspGetClassPropertyInfoTests, GetClassPropertyInfoMethod14) { diff --git a/ets2panda/test/unit/lsp/inlay_hints_test.cpp b/ets2panda/test/unit/lsp/inlay_hints_test.cpp index dbea5dad245..de404eae342 100644 --- a/ets2panda/test/unit/lsp/inlay_hints_test.cpp +++ b/ets2panda/test/unit/lsp/inlay_hints_test.cpp @@ -162,10 +162,10 @@ TEST_F(LSPInlayHintsTests, VisitFunctionLikeForParameterTypeTest) const std::string voidString = "void"; const std::string numberString = "number"; const std::string stdString = "string"; - const size_t index1 = 32; - const size_t index2 = 43; - const size_t index3 = 127; - const size_t index4 = 140; + const size_t index1 = 31; + const size_t index2 = 42; + const size_t index3 = 126; + const size_t index4 = 139; const size_t i0 = 0; const size_t i1 = 1; const size_t i2 = 2; diff --git a/ets2panda/test/unit/plugin/CMakeLists.txt b/ets2panda/test/unit/plugin/CMakeLists.txt index 477c1a61e2c..924f4a35510 100644 --- a/ets2panda/test/unit/plugin/CMakeLists.txt +++ b/ets2panda/test/unit/plugin/CMakeLists.txt @@ -107,6 +107,7 @@ set(PLUGIN_TESTS "plugin_proceed_to_state_log_diagnostic_with_suggestion compile.ets ${COMPILE_MODE} cpp ${EXECUTABLE_PLUGIN}" "use_plugin_to_test_column_number compile.ets ${COMPILE_MODE} cpp ${EXECUTABLE_PLUGIN}" "plugin_proceed_to_state_check_jsdoc compile.ets ${EXPECTED_MODE} cpp ${EXECUTABLE_PLUGIN}" + "plugin_proceed_to_state_parse_and_verifier_position compile.ets ${COMPILE_MODE} cpp ${EXECUTABLE_PLUGIN}" "plugin_proceed_to_state_check_recheck_trailinglambda compile.ets ${COMPILE_MODE} cpp ${EXECUTABLE_PLUGIN}" "plugin_proceed_to_state_test_global_func_call_dump compile.ets ${COMPILE_MODE} cpp ${EXECUTABLE_PLUGIN}" "plugin_proceed_to_state_test_interface_duplicate_setter compile.ets ${COMPILE_MODE} cpp ${EXECUTABLE_PLUGIN}" diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_parse_and_verifier_position.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_parse_and_verifier_position.cpp new file mode 100644 index 00000000000..664bd9ab176 --- /dev/null +++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_parse_and_verifier_position.cpp @@ -0,0 +1,560 @@ +/** + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include +#include "public/es2panda_lib.h" +#include "util.h" + +// NOLINTBEGIN +static std::string source = R"( +import { PI, E } from "std/math" + +export declare @interface exportAnno {} + +export declare enum EM1 { + em1Prop1 = 1, + + em1Prop2 = 2 +} + +namespace NS { + export interface innerInterface { + + interfaceFoo1():Array + + interfaceFoo2():void + + private interfaceProp1:number + + interfaceProp2:number | string[] + } + + export class innerClass { + classFoo1():void {} + + private classProp1:number = 0; + } + + namespace InnerNS {} +} + +export declare interface InterfaceOutside { + private interfaceFoo3():number | string[] + + interfaceProp3:number + + interfaceFoo4():void + + interfaceProp4:Array +} + +export class ClassOutside { + build(p3: number) {} + + classFoo2():void {} + + classFoo3():void {} + + public classProp2:number = 0; + + classProp3:number = 0; +} + +function foo( + fooP1: number, + fooP2: string): void {} + +let val:string = "ssss" + +export { ClassOutside, val, foo } + +export { PI, E } from "std/math" + +export NS +)"; + +constexpr size_t NS_START_LINE = 11; +constexpr size_t INNERNS_START_LINE = 29; +constexpr size_t EXPORT_NAMED_DECL_START_LINE = 60; +constexpr size_t EXPORT_SINGLE_NAMED_DECL_START_LINE = 64; +constexpr size_t RE_EXPORT_DECL_START_LINE = 62; +constexpr size_t IMPORT_DECL_START_LINE = 1; +constexpr size_t INNER_INTERFACE_START_LINE = 12; +constexpr size_t INTERFACE_OUTSIDE_START_LINE = 32; +constexpr size_t CLASS_OUTSIDE_START_LINE = 42; +constexpr size_t INNER_CLASS_START_LINE = 23; +constexpr size_t CLASS_PROP1_START_LINE = 26; +constexpr size_t CLASS_PROP2_START_LINE = 49; +constexpr size_t CLASS_PROP3_START_LINE = 51; +constexpr size_t CLASS_FOO1_START_LINE = 24; +constexpr size_t CLASS_FOO2_START_LINE = 45; +constexpr size_t CLASS_FOO3_START_LINE = 47; +constexpr size_t INTERFACE_PROP1_START_LINE = 18; +constexpr size_t INTERFACE_PROP2_START_LINE = 20; +constexpr size_t INTERFACE_PROP3_START_LINE = 35; +constexpr size_t INTERFACE_PROP4_START_LINE = 39; +constexpr size_t INTERFACE_FOO1_START_LINE = 14; +constexpr size_t INTERFACE_FOO2_START_LINE = 16; +constexpr size_t INTERFACE_FOO3_START_LINE = 33; +constexpr size_t INTERFACE_FOO4_START_LINE = 37; +constexpr size_t FUNCTION_PARAM1_START_LINE = 55; +constexpr size_t FUNCTION_PARAM2_START_LINE = 56; +constexpr size_t FUNCTION_PARAM3_START_LINE = 43; + +constexpr size_t NS_END_LINE = 30; +constexpr size_t INNERNS_END_LINE = 29; +constexpr size_t EXPORT_NAMED_DECL_END_LINE = 60; +constexpr size_t EXPORT_SINGLE_NAMED_DECL_END_LINE = 64; +constexpr size_t RE_EXPORT_DECL_END_LINE = 62; +constexpr size_t IMPORT_DECL_END_LINE = 1; +constexpr size_t INNER_INTERFACE_END_LINE = 21; +constexpr size_t INTERFACE_OUTSIDE_END_LINE = 40; +constexpr size_t CLASS_OUTSIDE_END_LINE = 54; +constexpr size_t INNER_CLASS_END_LINE = 29; +constexpr size_t CLASS_PROP1_END_LINE = 26; +constexpr size_t CLASS_PROP2_END_LINE = 49; +constexpr size_t CLASS_PROP3_END_LINE = 51; +constexpr size_t CLASS_FOO1_END_LINE = 24; +constexpr size_t CLASS_FOO2_END_LINE = 45; +constexpr size_t CLASS_FOO3_END_LINE = 47; +constexpr size_t INTERFACE_PROP1_END_LINE = 18; +constexpr size_t INTERFACE_PROP2_END_LINE = 20; +constexpr size_t INTERFACE_PROP3_END_LINE = 35; +constexpr size_t INTERFACE_PROP4_END_LINE = 39; +constexpr size_t INTERFACE_FOO1_END_LINE = 14; +constexpr size_t INTERFACE_FOO2_END_LINE = 16; +constexpr size_t INTERFACE_FOO3_END_LINE = 33; +constexpr size_t INTERFACE_FOO4_END_LINE = 37; +constexpr size_t FUNCTION_PARAM1_END_LINE = 55; +constexpr size_t FUNCTION_PARAM2_END_LINE = 56; +constexpr size_t FUNCTION_PARAM3_END_LINE = 43; + +constexpr size_t NS_START_COL = 1; +constexpr size_t INNERNS_START_COL = 3; +constexpr size_t EXPORT_NAMED_DECL_START_COL = 8; +constexpr size_t EXPORT_SINGLE_NAMED_DECL_START_COL = 8; +constexpr size_t RE_EXPORT_DECL_START_COL = 8; +constexpr size_t IMPORT_DECL_START_COL = 1; +constexpr size_t INNER_INTERFACE_START_COL = 10; +constexpr size_t INTERFACE_OUTSIDE_START_COL = 16; +constexpr size_t CLASS_OUTSIDE_START_COL = 8; +constexpr size_t INNER_CLASS_START_COL = 10; +constexpr size_t CLASS_PROP1_START_COL = 13; +constexpr size_t CLASS_PROP2_START_COL = 12; +constexpr size_t CLASS_PROP3_START_COL = 5; +constexpr size_t CLASS_FOO1_START_COL = 5; +constexpr size_t CLASS_FOO2_START_COL = 5; +constexpr size_t CLASS_FOO3_START_COL = 5; +constexpr size_t INTERFACE_PROP1_START_COL = 13; +constexpr size_t INTERFACE_PROP2_START_COL = 5; +constexpr size_t INTERFACE_PROP3_START_COL = 5; +constexpr size_t INTERFACE_PROP4_START_COL = 5; +constexpr size_t INTERFACE_FOO1_START_COL = 5; +constexpr size_t INTERFACE_FOO2_START_COL = 5; +constexpr size_t INTERFACE_FOO3_START_COL = 13; +constexpr size_t INTERFACE_FOO4_START_COL = 5; +constexpr size_t FUNCTION_PARAM1_START_COL = 3; +constexpr size_t FUNCTION_PARAM2_START_COL = 3; +constexpr size_t FUNCTION_PARAM3_START_COL = 11; + +constexpr size_t NS_END_COL = 2; +constexpr size_t INNERNS_END_COL = 23; +constexpr size_t EXPORT_NAMED_DECL_END_COL = 32; +constexpr size_t EXPORT_SINGLE_NAMED_DECL_END_COL = 10; +constexpr size_t RE_EXPORT_DECL_END_COL = 33; +constexpr size_t IMPORT_DECL_END_COL = 33; +constexpr size_t INNER_INTERFACE_END_COL = 4; +constexpr size_t INTERFACE_OUTSIDE_END_COL = 2; +constexpr size_t CLASS_OUTSIDE_END_COL = 9; +constexpr size_t INNER_CLASS_END_COL = 12; +constexpr size_t CLASS_PROP1_END_COL = 34; +constexpr size_t CLASS_PROP2_END_COL = 33; +constexpr size_t CLASS_PROP3_END_COL = 26; +constexpr size_t CLASS_FOO1_END_COL = 24; +constexpr size_t CLASS_FOO2_END_COL = 24; +constexpr size_t CLASS_FOO3_END_COL = 24; +constexpr size_t INTERFACE_PROP1_END_COL = 34; +constexpr size_t INTERFACE_PROP2_END_COL = 37; +constexpr size_t INTERFACE_PROP3_END_COL = 26; +constexpr size_t INTERFACE_PROP4_END_COL = 33; +constexpr size_t INTERFACE_FOO1_END_COL = 43; +constexpr size_t INTERFACE_FOO2_END_COL = 25; +constexpr size_t INTERFACE_FOO3_END_COL = 46; +constexpr size_t INTERFACE_FOO4_END_COL = 25; +constexpr size_t FUNCTION_PARAM1_END_COL = 16; +constexpr size_t FUNCTION_PARAM2_END_COL = 16; +constexpr size_t FUNCTION_PARAM3_END_COL = 21; + +static std::map startLineMap = {{"exportNamedDecl", EXPORT_NAMED_DECL_START_LINE}, + {"exportSingleNamedDecl", EXPORT_SINGLE_NAMED_DECL_START_LINE}, + {"reExportedDecl", RE_EXPORT_DECL_START_LINE}, + {"importDecl", IMPORT_DECL_START_LINE}, + {"NS", NS_START_LINE}, + {"InnerNS", INNERNS_START_LINE}, + {"InterfaceOutside", INTERFACE_OUTSIDE_START_LINE}, + {"innerInterface", INNER_INTERFACE_START_LINE}, + {"ClassOutside", CLASS_OUTSIDE_START_LINE}, + {"innerClass", INNER_CLASS_START_LINE}, + {"classProp1", CLASS_PROP1_START_LINE}, + {"classProp2", CLASS_PROP2_START_LINE}, + {"classProp3", CLASS_PROP3_START_LINE}, + {"interfaceProp1", INTERFACE_PROP1_START_LINE}, + {"interfaceProp2", INTERFACE_PROP2_START_LINE}, + {"interfaceProp3", INTERFACE_PROP3_START_LINE}, + {"interfaceProp4", INTERFACE_PROP4_START_LINE}, + {"classFoo1", CLASS_FOO1_START_LINE}, + {"classFoo2", CLASS_FOO2_START_LINE}, + {"classFoo3", CLASS_FOO3_START_LINE}, + {"interfaceFoo1", INTERFACE_FOO1_START_LINE}, + {"interfaceFoo2", INTERFACE_FOO2_START_LINE}, + {"interfaceFoo3", INTERFACE_FOO3_START_LINE}, + {"interfaceFoo4", INTERFACE_FOO4_START_LINE}, + {"fooP1", FUNCTION_PARAM1_START_LINE}, + {"fooP2", FUNCTION_PARAM2_START_LINE}, + {"p3", FUNCTION_PARAM3_START_LINE}}; + +static std::map startColMap = {{"exportNamedDecl", EXPORT_NAMED_DECL_START_COL}, + {"exportSingleNamedDecl", EXPORT_SINGLE_NAMED_DECL_START_COL}, + {"reExportedDecl", RE_EXPORT_DECL_START_COL}, + {"importDecl", IMPORT_DECL_START_COL}, + {"NS", NS_START_COL}, + {"InnerNS", INNERNS_START_COL}, + {"InterfaceOutside", INTERFACE_OUTSIDE_START_COL}, + {"innerInterface", INNER_INTERFACE_START_COL}, + {"ClassOutside", CLASS_OUTSIDE_START_COL}, + {"innerClass", INNER_CLASS_START_COL}, + {"classProp1", CLASS_PROP1_START_COL}, + {"classProp2", CLASS_PROP2_START_COL}, + {"classProp3", CLASS_PROP3_START_COL}, + {"interfaceProp1", INTERFACE_PROP1_START_COL}, + {"interfaceProp2", INTERFACE_PROP2_START_COL}, + {"interfaceProp3", INTERFACE_PROP3_START_COL}, + {"interfaceProp4", INTERFACE_PROP4_START_COL}, + {"classFoo1", CLASS_FOO1_START_COL}, + {"classFoo2", CLASS_FOO2_START_COL}, + {"classFoo3", CLASS_FOO3_START_COL}, + {"interfaceFoo1", INTERFACE_FOO1_START_COL}, + {"interfaceFoo2", INTERFACE_FOO2_START_COL}, + {"interfaceFoo3", INTERFACE_FOO3_START_COL}, + {"interfaceFoo4", INTERFACE_FOO4_START_COL}, + {"fooP1", FUNCTION_PARAM1_START_COL}, + {"fooP2", FUNCTION_PARAM2_START_COL}, + {"p3", FUNCTION_PARAM3_START_COL}}; + +static std::map endLineMap = {{"exportNamedDecl", EXPORT_NAMED_DECL_END_LINE}, + {"exportSingleNamedDecl", EXPORT_SINGLE_NAMED_DECL_END_LINE}, + {"reExportedDecl", RE_EXPORT_DECL_END_LINE}, + {"importDecl", IMPORT_DECL_END_LINE}, + {"NS", NS_END_LINE}, + {"InnerNS", INNERNS_END_LINE}, + {"InterfaceOutside", INTERFACE_OUTSIDE_END_LINE}, + {"innerInterface", INNER_INTERFACE_END_LINE}, + {"ClassOutside", CLASS_OUTSIDE_END_LINE}, + {"innerClass", INNER_CLASS_END_LINE}, + {"classProp1", CLASS_PROP1_END_LINE}, + {"classProp2", CLASS_PROP2_END_LINE}, + {"classProp3", CLASS_PROP3_END_LINE}, + {"interfaceProp1", INTERFACE_PROP1_END_LINE}, + {"interfaceProp2", INTERFACE_PROP2_END_LINE}, + {"interfaceProp3", INTERFACE_PROP3_END_LINE}, + {"interfaceProp4", INTERFACE_PROP4_END_LINE}, + {"classFoo1", CLASS_FOO1_END_LINE}, + {"classFoo2", CLASS_FOO2_END_LINE}, + {"classFoo3", CLASS_FOO3_END_LINE}, + {"interfaceFoo1", INTERFACE_FOO1_END_LINE}, + {"interfaceFoo2", INTERFACE_FOO2_END_LINE}, + {"interfaceFoo3", INTERFACE_FOO3_END_LINE}, + {"interfaceFoo4", INTERFACE_FOO4_END_LINE}, + {"fooP1", FUNCTION_PARAM1_END_LINE}, + {"fooP2", FUNCTION_PARAM2_END_LINE}, + {"p3", FUNCTION_PARAM3_END_LINE}}; + +static std::map endColMap = {{"exportNamedDecl", EXPORT_NAMED_DECL_END_COL}, + {"exportSingleNamedDecl", EXPORT_SINGLE_NAMED_DECL_END_COL}, + {"reExportedDecl", RE_EXPORT_DECL_END_COL}, + {"importDecl", IMPORT_DECL_END_COL}, + {"NS", NS_END_COL}, + {"InnerNS", INNERNS_END_COL}, + {"InterfaceOutside", INTERFACE_OUTSIDE_END_COL}, + {"innerInterface", INNER_INTERFACE_END_COL}, + {"ClassOutside", CLASS_OUTSIDE_END_COL}, + {"innerClass", INNER_CLASS_END_COL}, + {"classProp1", CLASS_PROP1_END_COL}, + {"classProp2", CLASS_PROP2_END_COL}, + {"classProp3", CLASS_PROP3_END_COL}, + {"interfaceProp1", INTERFACE_PROP1_END_COL}, + {"interfaceProp2", INTERFACE_PROP2_END_COL}, + {"interfaceProp3", INTERFACE_PROP3_END_COL}, + {"interfaceProp4", INTERFACE_PROP4_END_COL}, + {"classFoo1", CLASS_FOO1_END_COL}, + {"classFoo2", CLASS_FOO2_END_COL}, + {"classFoo3", CLASS_FOO3_END_COL}, + {"interfaceFoo1", INTERFACE_FOO1_END_COL}, + {"interfaceFoo2", INTERFACE_FOO2_END_COL}, + {"interfaceFoo3", INTERFACE_FOO3_END_COL}, + {"interfaceFoo4", INTERFACE_FOO4_END_COL}, + {"fooP1", FUNCTION_PARAM1_END_COL}, + {"fooP2", FUNCTION_PARAM2_END_COL}, + {"p3", FUNCTION_PARAM3_END_COL}}; + +static es2panda_Impl *impl = nullptr; +es2panda_Context *context = nullptr; +es2panda_AstNode *fooDecl = nullptr; + +static std::map namespaceDecl = {{"NS", nullptr}, {"InnerNS", nullptr}}; +static void FindNamespaceDecl(es2panda_AstNode *ast, [[maybe_unused]] void *ctx) +{ + if (!impl->IsETSModule(ast) || !impl->ETSModuleIsNamespaceConst(context, ast)) { + return; + } + auto *ident = impl->ETSModuleIdent(context, ast); + if (ident == nullptr) { + return; + } + auto name = std::string(impl->IdentifierName(context, ident)); + if (namespaceDecl.find(name) != namespaceDecl.end()) { + namespaceDecl[name] = ast; + } +} + +static es2panda_AstNode *exportNamedDecl = nullptr; +static es2panda_AstNode *exportSingleNamedDecl = nullptr; +static es2panda_AstNode *reExportedDecl = nullptr; +static es2panda_AstNode *importDecl = nullptr; +static void FindImportExportSpecifier(es2panda_AstNode *ast, [[maybe_unused]] void *ctx) +{ + if (impl->IsExportNamedDeclaration(ast)) { + size_t len = 0; + impl->ExportNamedDeclarationSpecifiersConst(context, ast, &len); + if (len == 1) { + exportSingleNamedDecl = ast; + } else { + exportNamedDecl = ast; + } + } + + if (impl->IsETSReExportDeclaration(ast)) { + reExportedDecl = ast; + } + + if (impl->IsETSImportDeclaration(ast)) { + importDecl = ast; + } +} + +static std::map interfaceMap = {{"innerInterface", nullptr}, + {"InterfaceOutside", nullptr}}; +static void FindInterface(es2panda_AstNode *ast, [[maybe_unused]] void *ctx) +{ + if (!impl->IsTSInterfaceDeclaration(ast)) { + return; + } + auto *ident = impl->TSInterfaceDeclarationId(context, ast); + if (ident == nullptr) { + return; + } + auto name = std::string(impl->IdentifierName(context, ident)); + if (interfaceMap.find(name) != interfaceMap.end()) { + interfaceMap[name] = ast; + } +} + +static std::map classMap = {{"ClassOutside", nullptr}, {"innerClass", nullptr}}; +static void FindClass(es2panda_AstNode *ast, [[maybe_unused]] void *ctx) +{ + if (!impl->IsClassDeclaration(ast)) { + return; + } + auto *ident = impl->ClassDefinitionIdent(context, impl->ClassDeclarationDefinition(context, ast)); + if (ident == nullptr) { + return; + } + auto name = std::string(impl->IdentifierName(context, ident)); + if (classMap.find(name) != classMap.end()) { + classMap[name] = ast; + } +} + +static std::map propertyMap = { + {"classProp1", nullptr}, {"classProp2", nullptr}, {"classProp3", nullptr}, {"interfaceProp1", nullptr}, + {"interfaceProp2", nullptr}, {"interfaceProp3", nullptr}, {"interfaceProp4", nullptr}}; +static void FindClassElement(es2panda_AstNode *ast, [[maybe_unused]] void *ctx) +{ + if (!impl->IsClassProperty(ast)) { + return; + } + auto *ident = impl->ClassElementId(context, ast); + if (ident == nullptr) { + return; + } + + auto name = std::string(impl->IdentifierName(context, ident)); + if (propertyMap.find(name) != propertyMap.end()) { + propertyMap[name] = ast; + } +} + +static std::map enumMemberMap = {{"em1Prop1", nullptr}, {"em1Prop2", nullptr}}; +static void FindEnumMember(es2panda_AstNode *ast, [[maybe_unused]] void *ctx) +{ + if (!impl->IsTSEnumMember(ast)) { + return; + } + auto *ident = impl->TSEnumMemberKey(context, ast); + if (ident == nullptr || impl->IsIdentifier(ident)) { + return; + } + + auto name = std::string(impl->IdentifierName(context, ident)); + if (enumMemberMap.find(name) != enumMemberMap.end()) { + enumMemberMap[name] = ast; + } +} + +static std::map methodMap = { + {"interfaceFoo1", nullptr}, {"interfaceFoo2", nullptr}, {"interfaceFoo3", nullptr}, {"interfaceFoo4", nullptr}, + {"classFoo1", nullptr}, {"classFoo2", nullptr}, {"classFoo3", nullptr}}; +static void FindMethodDef(es2panda_AstNode *ast, [[maybe_unused]] void *ctx) +{ + if (!impl->IsMethodDefinition(ast)) { + return; + } + auto *function = impl->MethodDefinitionFunction(context, ast); + if (function == nullptr) { + return; + } + + auto *ident = impl->ScriptFunctionId(context, function); + if (ident == nullptr) { + return; + } + auto name = std::string(impl->IdentifierName(context, ident)); + if (methodMap.find(name) != methodMap.end()) { + methodMap[name] = ast; + } +} + +static std::map etsParamsMap = { + {"fooP1", nullptr}, {"fooP2", nullptr}, {"p3", nullptr}}; +static void FindETSParamDecl(es2panda_AstNode *ast, [[maybe_unused]] void *ctx) +{ + if (!impl->IsETSParameterExpression(ast)) { + return; + } + auto *ident = impl->ETSParameterExpressionIdent(context, ast); + if (ident == nullptr) { + return; + } + auto name = std::string(impl->IdentifierName(context, ident)); + if (etsParamsMap.find(name) != etsParamsMap.end()) { + etsParamsMap[name] = ast; + } +} + +static void FindTargetAst(es2panda_AstNode *ast, [[maybe_unused]] void *ctx) +{ + impl->AstNodeForEach(ast, FindNamespaceDecl, context); + impl->AstNodeForEach(ast, FindImportExportSpecifier, context); + impl->AstNodeForEach(ast, FindInterface, context); + impl->AstNodeForEach(ast, FindClass, context); + impl->AstNodeForEach(ast, FindClassElement, context); + impl->AstNodeForEach(ast, FindMethodDef, context); + impl->AstNodeForEach(ast, FindETSParamDecl, context); + impl->AstNodeForEach(ast, FindEnumMember, context); +} + +static bool CheckLineAndCol(es2panda_AstNode *ast, std::string name) +{ + auto start = impl->AstNodeStartConst(context, ast); + auto end = impl->AstNodeEndConst(context, ast); + auto res = startLineMap[name] == impl->SourcePositionLine(context, start); + ASSERT(startLineMap[name] == impl->SourcePositionLine(context, start)); + + res &= startColMap[name] == impl->SourcePositionCol(context, start); + ASSERT(startColMap[name] == impl->SourcePositionCol(context, start)); + + res &= endLineMap[name] == impl->SourcePositionLine(context, end); + ASSERT(endLineMap[name] == impl->SourcePositionLine(context, end)); + + res &= endColMap[name] == impl->SourcePositionCol(context, end); + ASSERT(endColMap[name] == impl->SourcePositionCol(context, end)); + return res; +} + +static bool CheckAllNode() +{ + bool res = CheckLineAndCol(exportNamedDecl, "exportNamedDecl"); + res &= CheckLineAndCol(exportSingleNamedDecl, "exportSingleNamedDecl"); + res &= CheckLineAndCol(reExportedDecl, "reExportedDecl"); + res &= CheckLineAndCol(importDecl, "importDecl"); + for (const auto &[name, targetAst] : namespaceDecl) { + res &= CheckLineAndCol(targetAst, name); + } + + for (const auto &[name, targetAst] : interfaceMap) { + res &= CheckLineAndCol(targetAst, name); + } + + for (const auto &[name, targetAst] : classMap) { + res &= CheckLineAndCol(targetAst, name); + } + + for (const auto &[name, targetAst] : propertyMap) { + res &= CheckLineAndCol(targetAst, name); + } + + for (const auto &[name, targetAst] : methodMap) { + res &= CheckLineAndCol(targetAst, name); + } + + for (const auto &[name, targetAst] : etsParamsMap) { + res &= CheckLineAndCol(targetAst, name); + } + return res; +} + +int main(int argc, char **argv) +{ + if (argc < MIN_ARGC) { + return INVALID_ARGC_ERROR_CODE; + } + + if (GetImpl() == nullptr) { + return NULLPTR_IMPL_ERROR_CODE; + } + impl = GetImpl(); + + const char **args = const_cast(&(argv[1])); + auto config = impl->CreateConfig(argc - 1, args); + context = impl->CreateContextFromString(config, source.data(), argv[argc - 1]); + if (context == nullptr) { + return NULLPTR_CONTEXT_ERROR_CODE; + } + impl->ProceedToState(context, ES2PANDA_STATE_PARSED); + CheckForErrors("PARSED", context); + + auto *program = impl->ContextProgram(context); + es2panda_AstNode *programNode = impl->ProgramAst(context, program); + FindTargetAst(programNode, context); + if (!CheckAllNode()) { + return TEST_ERROR_CODE; + impl->DestroyConfig(config); + } + impl->DestroyConfig(config); + return 0; +} +// NOLINTEND \ No newline at end of file -- Gitee