From f0a9225f4cc25c42033b8844fc0a16a2d42c7d81 Mon Sep 17 00:00:00 2001 From: Robert Sipka Date: Tue, 19 Dec 2023 17:02:57 +0100 Subject: [PATCH] Revert the implementation of the builtin void type Change-Id: I155b9235c324f419e830c3c030c02df262072575 Signed-off-by: Gergo Torok Signed-off-by: Robert Sipka --- ets2panda/checker/ETSAnalyzer.cpp | 33 +- ets2panda/checker/ETSchecker.cpp | 22 +- ets2panda/checker/ETSchecker.h | 3 +- ets2panda/checker/ets/aliveAnalyzer.cpp | 4 +- ets2panda/checker/ets/dynamic.cpp | 2 +- ets2panda/checker/ets/function.cpp | 27 +- ets2panda/checker/ets/helpers.cpp | 14 +- ets2panda/checker/ets/typeCreation.cpp | 2 - ets2panda/checker/ets/typeRelationContext.cpp | 5 + ets2panda/checker/types/ets/etsObjectType.cpp | 2 +- ets2panda/checker/types/ets/etsVoidType.cpp | 13 +- ets2panda/checker/types/ets/etsVoidType.h | 1 + ets2panda/checker/types/globalTypesHolder.cpp | 6 - ets2panda/checker/types/globalTypesHolder.h | 2 - ets2panda/checker/types/typeFlag.h | 2 +- ets2panda/compiler/core/ETSCompiler.cpp | 40 +- ets2panda/compiler/core/ETSGen.cpp | 57 +- ets2panda/compiler/core/ETSGen.h | 22 +- ets2panda/compiler/core/ETSfunction.cpp | 122 ++-- ets2panda/compiler/core/ETSfunction.h | 3 + ets2panda/compiler/core/dynamicContext.cpp | 93 +-- ets2panda/compiler/core/dynamicContext.h | 1 + .../compiler/lowering/ets/lambdaLowering.cpp | 12 +- .../compiler/lowering/ets/promiseVoid.cpp | 11 +- ets2panda/compiler/scripts/signatures.yaml | 71 ++- ets2panda/ir/ets/etsPrimitiveType.cpp | 4 + ets2panda/ir/ets/etsTypeReferencePart.cpp | 15 +- ets2panda/lexer/scripts/keywords.yaml | 1 + ets2panda/lexer/token/token.cpp | 1 + ets2panda/parser/ETSparser.cpp | 40 ++ ets2panda/parser/ETSparser.h | 1 + .../compiler/ets/FunctionType1-expected.txt | 68 +-- .../compiler/ets/FunctionType2-expected.txt | 64 +- .../compiler/ets/FunctionType3-expected.txt | 102 +--- .../compiler/ets/FunctionType4-expected.txt | 32 +- .../compiler/ets/FunctionType6-expected.txt | 32 +- .../compiler/ets/FunctionType7-expected.txt | 64 +- .../compiler/ets/FunctionType8-expected.txt | 164 +---- .../compiler/ets/FunctionType9-expected.txt | 98 +-- .../compiler/ets/StructTest1-expected.txt | 32 +- .../compiler/ets/StructTest2-expected.txt | 32 +- ...ctMethodDeclaredInParentClass-expected.txt | 296 +-------- ...actNewClassInstanceExpression-expected.txt | 64 +- .../ets/arrowFunctionCapture-expected.txt | 130 +--- .../ets/boxingConversion1-expected.txt | 32 +- .../ets/boxingConversion2-expected.txt | 32 +- .../ets/boxingConversion3-expected.txt | 64 +- .../ets/boxingConversion4-expected.txt | 64 +- .../boxingUnboxingExpressions-expected.txt | 576 ++---------------- .../ets/catch-soft-keyword-expected.txt | 64 +- .../compiler/ets/catchParamScope-expected.txt | 130 +--- .../ets/conversion-w-ASExpr-expected.txt | 32 +- ...rsion_Double-to-Int_typeerror-expected.txt | 32 +- ...le-to-Int_w_try_stmt_typerror-expected.txt | 32 +- ...rsion_Int-to-Double_typeerror-expected.txt | 32 +- ...ntext_Int-to-Double_typeerror-expected.txt | 32 +- .../ets/conversion_w_functions-expected.txt | 32 +- ...rsion_w_functions_w_try-stmts-expected.txt | 32 +- .../test/compiler/ets/forUpdate-expected.txt | 32 +- .../ets/forUpdateCharType-expected.txt | 32 +- .../for_of_missing_iterator_type-expected.txt | 64 +- .../ets/from-soft-keyword-0-expected.txt | 64 +- .../ets/from-soft-keyword-1-expected.txt | 98 +-- .../ets/from-soft-keyword-2-expected.txt | 32 +- .../ets/from-soft-keyword-3-expected.txt | 32 +- .../ets/functionPointerArray-expected.txt | 98 +-- .../ets/functionTypeToObject-expected.txt | 68 +-- .../ets/generic_arrayaslist-expected.txt | 264 +------- .../generic_class_getter_setter-expected.txt | 64 +- .../ets/generic_deadlock-expected.txt | 32 +- .../ets/generic_function_call_1-expected.txt | 32 +- .../ets/generic_function_call_2-expected.txt | 32 +- .../ets/generic_function_call_3-expected.txt | 32 +- .../ets/generic_function_call_4-expected.txt | 32 +- .../ets/generic_function_call_5-expected.txt | 146 +---- .../ets/generic_function_call_7-expected.txt | 32 +- .../ets/generic_typealias_1-expected.txt | 32 +- .../ets/generic_typealias_2_neg-expected.txt | 32 +- .../ets/generic_typealias_3_neg-expected.txt | 32 +- .../ets/generic_typealias_4_neg-expected.txt | 32 +- .../ets/generic_typealias_5_neg-expected.txt | 32 +- .../ets/generic_typealias_6-expected.txt | 32 +- .../ets/generic_typealias_7_neg-expected.txt | 32 +- .../ets/generic_typealias_8-expected.txt | 32 +- .../ets/generic_typealias_9-expected.txt | 32 +- ...nerics_class_recursive_type_1-expected.txt | 104 +--- .../generics_implicit_lambda1-expected.txt | 76 +-- .../ets/generics_instantiation_1-expected.txt | 64 +- .../ets/generics_instantiation_2-expected.txt | 32 +- .../ets/generics_instantiation_3-expected.txt | 32 +- .../ets/generics_instantiation_4-expected.txt | 32 +- .../generics_interface_bounds_1-expected.txt | 68 +-- ...nerics_primitive_type_param_1-expected.txt | 64 +- ...cs_primitive_type_param_neg_1-expected.txt | 32 +- ...cs_primitive_type_param_neg_2-expected.txt | 32 +- .../ets/identifierReference10-expected.txt | 32 +- .../ets/identifierReference11-expected.txt | 32 +- .../ets/identifierReference12-expected.txt | 32 +- .../ets/identifierReference13-expected.txt | 64 +- .../ets/identifierReference14-expected.txt | 128 +--- .../ets/identifierReference2-expected.txt | 34 +- .../ets/identifierReference3-expected.txt | 32 +- .../ets/identifierReference4-expected.txt | 32 +- .../ets/identifierReference5-expected.txt | 132 +--- .../ets/identifierReference8-expected.txt | 64 +- .../ets/identifierReference9-expected.txt | 64 +- .../ets/implicit-conversion-expected.txt | 32 +- .../interfaceMethodNotOverridden-expected.txt | 68 +-- .../ets/invalidCallInstruction-expected.txt | 66 +- ...dIndirectInheritanceFromClass-expected.txt | 32 +- ...irectInheritanceFromInterface-expected.txt | 32 +- .../ets/invalidInheritance1-expected.txt | 32 +- .../ets/invalidInheritance3-expected.txt | 36 +- .../invalidInheritanceFromClass-expected.txt | 32 +- ...validInheritanceFromInterface-expected.txt | 32 +- ...anceFromInterfaceStaticMethod-expected.txt | 32 +- ...rExpressionFromStaticContext1-expected.txt | 96 +-- ...rExpressionFromStaticContext2-expected.txt | 96 +-- ...rExpressionFromStaticContext3-expected.txt | 96 +-- ...rExpressionFromStaticContext4-expected.txt | 96 +-- ...rExpressionFromStaticContext5-expected.txt | 96 +-- ...rExpressionFromStaticContext6-expected.txt | 96 +-- ...rExpressionFromStaticContext7-expected.txt | 96 +-- ...rExpressionFromStaticContext8-expected.txt | 96 +-- .../ets/invalidPrivateAccess1-expected.txt | 32 +- .../ets/invalidPrivateAccess2-expected.txt | 32 +- .../ets/invalidPrivateAccess3-expected.txt | 96 +-- .../ets/invalidProtectedAccess1-expected.txt | 32 +- .../ets/invalidProtectedAccess2-expected.txt | 32 +- .../ets/invalidProtectedAccess3-expected.txt | 96 +-- ...utBlockStatementDifferentType-expected.txt | 32 +- ...tementDifferentTypeInfunction-expected.txt | 32 +- .../compiler/ets/lambdaFunction1-expected.txt | 32 +- .../compiler/ets/lambdaFunction3-expected.txt | 98 +-- .../compiler/ets/lambdaFunction4-expected.txt | 66 +- .../compiler/ets/lambdaFunction5-expected.txt | 32 +- .../lambda_infer_type-expected.txt | 34 +- ...bda_infer_type_return_lambda1-expected.txt | 36 +- ...type_return_lambda_expression-expected.txt | 36 +- .../ets/lambda_unresolved_ref_1-expected.txt | 496 ++------------- .../ets/launch_expression-expected.txt | 32 +- .../ets/loopWithinLambda-expected.txt | 38 +- .../ets/manyLocalsParamRegUsage-expected.txt | 32 +- .../ets/memberExprInLambda-expected.txt | 70 +-- ...erExpressionFromStaticContext-expected.txt | 288 +-------- ...odOverrideCovariantReturnType-expected.txt | 68 +-- ...hodOverrideDifferentSignature-expected.txt | 228 +------ ...methodOverrideWithoutModifier-expected.txt | 64 +- .../ets/mostSpecificMethod1-expected.txt | 96 +-- .../ets/mostSpecificMethod2-expected.txt | 96 +-- .../ets/multipleMethodOverride-expected.txt | 96 +-- ...ullableTypeParamToNonNullable-expected.txt | 32 +- ...n_ensureNotNullArgNotNullable-expected.txt | 64 +- ...ensureNotNullLocalNotNullable-expected.txt | 32 +- ...nsureNotNullReturnNotNullable-expected.txt | 32 +- .../n_nullableTypeInArgNotRef-expected.txt | 32 +- .../n_nullableTypeInReturnNotRef-expected.txt | 32 +- .../ets/n_nullableTypeNotRef-expected.txt | 32 +- .../non-const-lambda-with-scopes-expected.txt | 34 +- .../null_coalescing_generic_1-expected.txt | 32 +- .../compiler/ets/nullableTuple-expected.txt | 32 +- .../ets/optionalLambdaParameter-expected.txt | 130 +--- .../test/compiler/ets/override-expected.txt | 32 +- .../test/compiler/ets/override11-expected.txt | 32 +- .../test/compiler/ets/override18-expected.txt | 32 +- .../test/compiler/ets/override19-expected.txt | 32 +- .../test/compiler/ets/override7-expected.txt | 36 +- .../ets/parenthesizedType-expected.txt | 32 +- .../ets/privateMethodOverride-expected.txt | 64 +- ...eferenceEqualityNotCastable_n-expected.txt | 32 +- ...ferenceEqualityNotReference_n-expected.txt | 32 +- .../ets/rethrowingCheck1-expected.txt | 38 +- .../ets/rethrowingCheck2-expected.txt | 38 +- .../ets/rethrowingCheck3-expected.txt | 38 +- .../ets/rethrowingCheck4-expected.txt | 76 +-- .../ets/rethrowingCheck5-expected.txt | 76 +-- .../rethrowingConstructorCheck1-expected.txt | 102 +--- .../rethrowingConstructorCheck2-expected.txt | 102 +--- .../rethrowingConstructorCheck3-expected.txt | 102 +--- .../ets/rethrowingFunctionCheck1-expected.txt | 134 +--- .../ets/rethrowingFunctionCheck2-expected.txt | 134 +--- .../ets/rethrowingFunctionCheck3-expected.txt | 134 +--- .../ets/rethrowingMethodCheck1-expected.txt | 134 +--- .../ets/rethrowingMethodCheck2-expected.txt | 134 +--- .../ets/rethrowingMethodCheck3-expected.txt | 134 +--- .../ets/return_missing_argument-expected.txt | 32 +- .../compiler/ets/setArrayLength1-expected.txt | 32 +- .../compiler/ets/setArrayLength2-expected.txt | 32 +- .../compiler/ets/setArrayLength3-expected.txt | 32 +- ...tchStatementCorrectConversion-expected.txt | 32 +- .../switchStatementWrongBoxing-expected.txt | 32 +- .../ets/throwInCatchClause1-expected.txt | 32 +- .../ets/throwInCatchClause2-expected.txt | 32 +- .../ets/throwInCatchClause3-expected.txt | 32 +- .../ets/throwInFinallyBlock-expected.txt | 32 +- .../ets/throwInFinallyBlock1-expected.txt | 32 +- .../ets/throwInFinallyBlock2-expected.txt | 32 +- .../throwInRethrowingFunction-expected.txt | 70 +-- .../throwInRethrowingFunction2-expected.txt | 38 +- .../ets/throwInThrowingFunction-expected.txt | 32 +- .../ets/throwInTryStatement-expected.txt | 32 +- .../ets/throwWithoutTryCatch-expected.txt | 32 +- .../throwingConstructorCheck1-expected.txt | 32 +- .../throwingConstructorCheck2-expected.txt | 32 +- .../throwingFunctionAsParameter1-expected.txt | 140 +---- .../throwingFunctionAsParameter2-expected.txt | 70 +-- .../ets/throwingFunctionCheck1-expected.txt | 32 +- .../ets/throwingFunctionCheck2-expected.txt | 64 +- .../ets/throwingFunctionCheck3-expected.txt | 96 +-- .../ets/throwingFunctionCheck4-expected.txt | 64 +- .../ets/throwingFunctionCheck5-expected.txt | 64 +- .../ets/throwingFunctionCheck6-expected.txt | 96 +-- .../ets/throwingFunctionType1-expected.txt | 98 +-- .../ets/throwingFunctionType2-expected.txt | 98 +-- .../ets/throwingMethodCheck1-expected.txt | 64 +- .../ets/throwingMethodCheck2-expected.txt | 64 +- .../ets/tryCatchErrorFlow-expected.txt | 32 +- ...yCatchErrorIncorrectParamType-expected.txt | 32 +- ...tryCatchErrorMissingParamType-expected.txt | 32 +- .../compiler/ets/tryCatchFlow-expected.txt | 32 +- .../tryCatchIncorrectParamType-expected.txt | 32 +- .../ets/tryCatchMissingParamType-expected.txt | 32 +- .../ets/tryDefaultCatches-expected.txt | 32 +- .../compiler/ets/tuple_types_1-expected.txt | 32 +- .../ets/tuple_types_10_neg-expected.txt | 32 +- .../ets/tuple_types_11_neg-expected.txt | 32 +- .../compiler/ets/tuple_types_12-expected.txt | 32 +- .../compiler/ets/tuple_types_14-expected.txt | 64 +- .../compiler/ets/tuple_types_15-expected.txt | 32 +- .../compiler/ets/tuple_types_16-expected.txt | 104 +--- .../compiler/ets/tuple_types_17-expected.txt | 32 +- .../compiler/ets/tuple_types_18-expected.txt | 32 +- .../ets/tuple_types_2_neg-expected.txt | 32 +- .../ets/tuple_types_3_neg-expected.txt | 32 +- .../ets/tuple_types_4_neg-expected.txt | 32 +- .../ets/tuple_types_5_neg-expected.txt | 32 +- .../ets/tuple_types_6_neg-expected.txt | 32 +- .../compiler/ets/tuple_types_7-expected.txt | 32 +- .../compiler/ets/tuple_types_8-expected.txt | 32 +- .../ets/tuple_types_9_neg-expected.txt | 32 +- .../compiler/ets/union_types_5-expected.txt | 32 +- ...e_signatures_throw_type_error-expected.txt | 32 +- ...s_throw_type_error_more_param-expected.txt | 32 +- .../voidTypeInBinaryOperation-expected.txt | 66 +- .../parser/ets/AccessBinaryTrees-expected.txt | 64 +- .../parser/ets/AccessFannkuch-expected.txt | 64 +- .../test/parser/ets/AccessNBody-expected.txt | 96 +-- .../test/parser/ets/AccessNSieve-expected.txt | 96 +-- .../ets/Bitops3BitBitsInByte-expected.txt | 64 +- .../parser/ets/BitopsBitsInByte-expected.txt | 64 +- .../parser/ets/BitopsBitwiseAnd-expected.txt | 64 +- .../parser/ets/BitopsNSieveBits-expected.txt | 96 +-- .../parser/ets/Boolean_bitwise-expected.txt | 32 +- .../ets/ControlFlowRecursive-expected.txt | 64 +- .../parser/ets/Dollar_dollar_2-expected.txt | 64 +- .../test/parser/ets/FunctionType-expected.txt | 74 +-- .../FunctionalTypeAsTypeArgument-expected.txt | 34 +- .../ets/InterfacePrivateMethod-expected.txt | 32 +- .../test/parser/ets/MathCordic-expected.txt | 64 +- .../parser/ets/MathPartialSums-expected.txt | 64 +- .../parser/ets/MathSpectralNorm-expected.txt | 160 +---- .../test/parser/ets/Morph3d-expected.txt | 128 +--- .../test/parser/ets/StringBase64-expected.txt | 64 +- .../parser/ets/access_modifier_2-expected.txt | 32 +- .../parser/ets/accessor_call-expected.txt | 32 +- .../parser/ets/accessor_void-expected.txt | 32 +- .../parser/ets/ambiguous_call_1-expected.txt | 96 +-- .../parser/ets/ambiguous_call_2-expected.txt | 128 +--- .../parser/ets/ambiguous_call_3-expected.txt | 96 +-- .../parser/ets/anonymous_class-expected.txt | 32 +- ets2panda/test/parser/ets/array-expected.txt | 96 +-- .../ets/arrayHoldingNullValue-expected.txt | 32 +- .../array_creation_expression-expected.txt | 32 +- ...sion_implicit_cast_assignment-expected.txt | 32 +- .../test/parser/ets/array_new-expected.txt | 32 +- .../parser/ets/array_new_failed-expected.txt | 32 +- .../test/parser/ets/array_type-expected.txt | 32 +- ets2panda/test/parser/ets/assert-expected.txt | 32 +- ets2panda/test/parser/ets/assign-expected.txt | 32 +- .../test/parser/ets/assign-func-expected.txt | 74 +-- .../test/parser/ets/assignments-expected.txt | 32 +- .../parser/ets/async_overload-expected.txt | 32 +- .../parser/ets/async_with_lambda-expected.txt | 136 +---- .../parser/ets/await_keyword-expected.txt | 98 +-- .../test/parser/ets/boolean_cond-expected.txt | 32 +- .../parser/ets/boolean_default-expected.txt | 32 +- ets2panda/test/parser/ets/break-expected.txt | 32 +- .../calling_superclass_methods-expected.txt | 32 +- ets2panda/test/parser/ets/calls-expected.txt | 32 +- .../parser/ets/cast_expressions-expected.txt | 288 +-------- .../ets/cast_expressions10-expected.txt | 32 +- .../parser/ets/cast_expressions2-expected.txt | 32 +- .../parser/ets/cast_expressions3-expected.txt | 32 +- .../parser/ets/cast_expressions4-expected.txt | 32 +- .../parser/ets/cast_expressions5-expected.txt | 32 +- .../parser/ets/cast_expressions6-expected.txt | 32 +- .../parser/ets/cast_expressions7-expected.txt | 32 +- .../parser/ets/cast_expressions8-expected.txt | 32 +- .../parser/ets/cast_expressions9-expected.txt | 32 +- .../parser/ets/class_composite_1-expected.txt | 32 +- .../conditionalExpressionType-expected.txt | 128 +--- .../test/parser/ets/continue-expected.txt | 32 +- .../parser/ets/declare_class-expected.txt | 34 +- .../ets/declare_class_bad_2-expected.txt | 32 +- .../ets/declare_class_bad_4-expected.txt | 32 +- .../test/parser/ets/declare_func-expected.txt | 32 +- .../parser/ets/declare_func_bad-expected.txt | 32 +- .../parser/ets/declare_iface-expected.txt | 36 +- .../ets/declare_namespace_2-expected.txt | 32 +- .../ets/default_parameter1-expected.txt | 34 +- .../ets/default_parameter2-expected.txt | 34 +- .../ets/default_parameter4-expected.txt | 34 +- .../ets/default_parameter5-expected.txt | 34 +- ..._implicitly_typed_return_void-expected.txt | 32 +- .../modules/module-expected.txt | 32 +- .../parser/ets/empty_statement-expected.txt | 64 +- ets2panda/test/parser/ets/enum-expected.txt | 32 +- ets2panda/test/parser/ets/enum10-expected.txt | 32 +- ets2panda/test/parser/ets/enum11-expected.txt | 32 +- ets2panda/test/parser/ets/enum12-expected.txt | 64 +- ets2panda/test/parser/ets/enum13-expected.txt | 64 +- ets2panda/test/parser/ets/enum14-expected.txt | 32 +- ets2panda/test/parser/ets/enum20-expected.txt | 32 +- ets2panda/test/parser/ets/enum6-expected.txt | 32 +- ets2panda/test/parser/ets/enum7-expected.txt | 32 +- ets2panda/test/parser/ets/enum8-expected.txt | 32 +- ets2panda/test/parser/ets/enum9-expected.txt | 32 +- .../test/parser/ets/exports-expected.txt | 32 +- ets2panda/test/parser/ets/for_of-expected.txt | 32 +- .../test/parser/ets/for_of_02-expected.txt | 32 +- .../parser/ets/for_with_break-expected.txt | 32 +- .../ets/functionThrowsRethrows-expected.txt | 64 +- ...unction_implicit_return_type4-expected.txt | 32 +- .../parser/ets/generic_error-expected.txt | 32 +- .../parser/ets/generic_resolve-expected.txt | 98 +-- .../test/parser/ets/generics_1-expected.txt | 32 +- ...rics_type_param_constraint_10-expected.txt | 32 +- ...erics_type_param_constraint_4-expected.txt | 36 +- ...erics_type_param_constraint_5-expected.txt | 72 +-- ...etter_setter_access_modifiers-expected.txt | 64 +- ...ter_setter_access_modifiers_2-expected.txt | 64 +- .../ets/global_const_vars3-expected.txt | 32 +- .../ets/global_const_vars4-expected.txt | 64 +- ets2panda/test/parser/ets/if-expected.txt | 32 +- .../check_exported_1-expected.txt | 32 +- .../import_tests/default_import-expected.txt | 32 +- .../import_alias/export-expected.txt | 64 +- .../import_alias/import_alias_1-expected.txt | 32 +- .../import_alias/import_alias_2-expected.txt | 32 +- .../import_alias/import_alias_3-expected.txt | 32 +- .../import_alias/import_alias_4-expected.txt | 32 +- ...ort_alias_and_without_alias_1-expected.txt | 32 +- ...ort_alias_and_without_alias_2-expected.txt | 32 +- ...ort_alias_and_without_alias_3-expected.txt | 32 +- .../import_tests/import_all_2-expected.txt | 32 +- .../import_tests/import_all_3-expected.txt | 32 +- .../import_max_as_alias-expected.txt | 32 +- .../import_tests/import_ts_file-expected.txt | 32 +- .../modules/default_export-expected.txt | 64 +- .../missing_default_export-expected.txt | 32 +- .../relative_import/Point-expected.txt | 32 +- .../relative_import/alias2-expected.txt | 32 +- .../test/parser/ets/inheritance2-expected.txt | 32 +- .../interface_static_function_1-expected.txt | 32 +- .../interface_static_function_2-expected.txt | 32 +- .../test/parser/ets/interfaces-expected.txt | 96 +-- .../parser/ets/internalParsing-expected.txt | 64 +- .../ets/internalProtectedParsing-expected.txt | 64 +- .../ets/labeledDoWhileStatement-expected.txt | 32 +- .../ets/labeledForStatement-expected.txt | 32 +- .../ets/labeledSwitchStatement-expected.txt | 64 +- .../ets/labeledWhileStatement-expected.txt | 32 +- ets2panda/test/parser/ets/lambda-expected.txt | 134 +--- .../parser/ets/lambda-lambda-expected.txt | 210 +------ .../lambda-type-inference-alias-expected.txt | 130 +--- ...da-type-inference-arg-no-type-expected.txt | 64 +- .../ets/lambda-type-inference-expected.txt | 198 +----- .../lambda-type-inference-neg-expected.txt | 172 +----- .../lambda-type-inference-neg2-expected.txt | 64 +- ...da-type-inference-no-ret-type-expected.txt | 64 +- ...a-type-inference-overloaded-1-expected.txt | 96 +-- ...a-type-inference-overloaded-2-expected.txt | 134 +--- ...a-type-inference-overloaded-3-expected.txt | 204 +------ ...bda-type-inference-overloaded-expected.txt | 166 +---- ...pressionWithoutBlockStatement-expected.txt | 32 +- ...ockStatementCallAVoidFunction-expected.txt | 134 +--- ...sionWithoutBlockStatementVoid-expected.txt | 102 +--- ...atementWithFunctionParameters-expected.txt | 32 +- .../ets/lambdaThrowsRethrows-expected.txt | 132 +--- ets2panda/test/parser/ets/launch-expected.txt | 98 +-- .../test/parser/ets/launch_ret-expected.txt | 32 +- .../test/parser/ets/launch_super-expected.txt | 64 +- .../parser/ets/launch_unresolved-expected.txt | 32 +- ets2panda/test/parser/ets/loops-expected.txt | 160 +---- .../ets/main_entry_point_1-expected.txt | 32 +- .../ets/main_entry_point_3-expected.txt | 32 +- .../ets/main_entry_point_4-expected.txt | 32 +- .../ets/main_entry_point_6-expected.txt | 32 +- .../ets/main_entry_point_7-expected.txt | 32 +- .../ets/main_entry_point_8-expected.txt | 32 +- .../ets/main_entry_point_9-expected.txt | 32 +- .../ets/methodThrowsRethrows-expected.txt | 64 +- .../test/parser/ets/method_empty-expected.txt | 96 +-- .../test/parser/ets/method_full-expected.txt | 32 +- .../ets/method_modifier_check_1-expected.txt | 32 +- .../ets/method_modifier_check_10-expected.txt | 32 +- .../ets/method_modifier_check_11-expected.txt | 32 +- .../ets/method_modifier_check_12-expected.txt | 32 +- .../ets/method_modifier_check_13-expected.txt | 32 +- .../ets/method_modifier_check_14-expected.txt | 32 +- .../ets/method_modifier_check_15-expected.txt | 32 +- .../ets/method_modifier_check_16-expected.txt | 32 +- .../ets/method_modifier_check_2-expected.txt | 32 +- .../ets/method_modifier_check_3-expected.txt | 32 +- .../ets/method_modifier_check_4-expected.txt | 32 +- .../ets/method_modifier_check_5-expected.txt | 32 +- .../ets/method_modifier_check_6-expected.txt | 32 +- .../ets/method_modifier_check_7-expected.txt | 32 +- .../ets/method_modifier_check_8-expected.txt | 32 +- .../ets/method_modifier_check_9-expected.txt | 32 +- .../ets/method_override_throw_1-expected.txt | 548 ++--------------- .../ets/method_override_throw_2-expected.txt | 68 +-- .../ets/method_override_throw_3-expected.txt | 144 +---- .../ets/method_override_throw_4-expected.txt | 140 +---- .../ets/method_override_throw_5-expected.txt | 64 +- .../ets/method_override_throw_6-expected.txt | 64 +- .../test/parser/ets/methods-expected.txt | 352 +---------- .../ets/n_arrayHoldingNullValue-expected.txt | 32 +- ...ableFromFunctionToNonNullable-expected.txt | 32 +- ...ableFromMethodToNullableParam-expected.txt | 32 +- ...n_assignNullableToNonNullable-expected.txt | 32 +- ...ignNullableToNonNullableArray-expected.txt | 32 +- ...ullableToNonNullableTypeAlias-expected.txt | 32 +- ...callFunctionWithNullableParam-expected.txt | 64 +- ...erfaceMethodWithNullableParam-expected.txt | 100 +-- ...n_callMethodWithNullableParam-expected.txt | 64 +- ...ive_function_with_return_type-expected.txt | 64 +- ..._function_without_return_type-expected.txt | 32 +- .../parser/ets/new_expressions-expected.txt | 32 +- .../test/parser/ets/new_object_3-expected.txt | 34 +- .../parser/ets/nonIntegralIndex-expected.txt | 32 +- ets2panda/test/parser/ets/null-expected.txt | 64 +- .../test/parser/ets/nullableType-expected.txt | 160 +---- .../ets/nullable_union_array-expected.txt | 32 +- .../ets/optional_union_paramter-expected.txt | 32 +- .../parentheses_expression_value-expected.txt | 32 +- .../ets/property-access-method-1-expected.txt | 64 +- .../ets/property-access-method-2-expected.txt | 64 +- .../ets/proxyVoidGeneration-expected.txt | 124 +--- .../parser/ets/re_export/export-expected.txt | 34 +- .../ets/re_export/export_2-expected.txt | 34 +- .../ets/re_export/folder/export-expected.txt | 34 +- .../folder/folder2/export-expected.txt | 34 +- .../parser/ets/re_export/import-expected.txt | 34 +- .../ets/re_export/import_2-expected.txt | 34 +- .../ets/re_export/import_3-expected.txt | 34 +- .../ets/re_export/import_4-expected.txt | 34 +- .../ets/re_export/import_5-expected.txt | 34 +- .../ets/re_export/import_6-expected.txt | 34 +- .../ets/re_export/import_7-expected.txt | 34 +- .../ets/re_export/import_8-expected.txt | 34 +- ...egression-target-type-context-expected.txt | 32 +- .../parser/ets/rethrow-func-1-expected.txt | 98 +-- ets2panda/test/parser/ets/return-expected.txt | 32 +- .../test/parser/ets/scoped_decl-expected.txt | 32 +- .../selective_export/import_1-expected.txt | 34 +- .../selective_export/import_2-expected.txt | 34 +- .../selective_export/import_3-expected.txt | 34 +- .../selective_export/import_4-expected.txt | 34 +- .../parser/ets/setter_native-expected.txt | 32 +- .../ets/setter_with_non_void-expected.txt | 32 +- .../test/parser/ets/simple_types-expected.txt | 34 +- .../ets/static_function_hide_1-expected.txt | 64 +- .../ets/static_function_hide_2-expected.txt | 64 +- .../ets/static_function_hide_3-expected.txt | 64 +- .../ets/static_function_hide_4-expected.txt | 64 +- ...c_invoke_mismatch_signature_2-expected.txt | 32 +- .../parser/ets/string_template-expected.txt | 32 +- .../parser/ets/struct_templete-expected.txt | 32 +- ets2panda/test/parser/ets/switch-expected.txt | 32 +- .../test/parser/ets/switch2-expected.txt | 32 +- .../test/parser/ets/switch_enum-expected.txt | 32 +- .../test/parser/ets/switch_enum2-expected.txt | 32 +- .../parser/ets/test_interface-expected.txt | 101 +-- .../ets/test_jsvalue_set_double-expected.txt | 32 +- .../test_jsvalue_set_property_1-expected.txt | 32 +- .../test_jsvalue_set_property_2-expected.txt | 32 +- .../parser/ets/test_type_alias5-expected.txt | 223 ++++++- .../parser/ets/test_type_alias7-expected.txt | 32 +- .../parser/ets/test_type_alias8-expected.txt | 96 +-- .../throwsRethrowsAsVariables-expected.txt | 102 +--- ..._lambda_define_lambda_in_body-expected.txt | 102 +--- ...bda_mismatch_lambda_signature-expected.txt | 38 +- ...a_mismatch_lambda_signature_1-expected.txt | 38 +- ...ot_transform_trailing_block_1-expected.txt | 38 +- ...ot_transform_trailing_block_2-expected.txt | 38 +- ...ot_transform_trailing_block_3-expected.txt | 70 +-- ...ot_transform_trailing_block_4-expected.txt | 70 +-- .../trailing_lambda_overload-expected.txt | 38 +- .../trailing_lambda_overload_1-expected.txt | 114 +--- ...mbda_transform_trailing_block-expected.txt | 38 +- .../trailing_lambda_type_alias-expected.txt | 102 +--- .../trailing_lambda_with_throw-expected.txt | 76 +-- .../parser/ets/type_variance1-expected.txt | 168 +---- .../ets/undefinedNullNotObject-expected.txt | 432 +++++++++++++ .../ets/undefinedNullNotObject.ets} | 42 +- ...finedNullObjectTypeAnnotation-expected.txt | 543 +++++++++++++++++ .../ets/undefinedNullObjectTypeAnnotation.ets | 21 + .../ets/undefinedNullTypeAlias-expected.txt | 532 ++++++++++++++++ .../parser/ets/undefinedNullTypeAlias.ets | 21 + .../test/parser/ets/var_declare-expected.txt | 32 +- .../variable_throw_function_1-expected.txt | 306 +--------- .../variable_throw_function_2-expected.txt | 98 +-- ets2panda/test/parser/ets/void-expected.txt | 32 +- .../test-lists/parser/parser-js-ignored.txt | 4 + ets2panda/varbinder/ETSBinder.cpp | 3 + 516 files changed, 4247 insertions(+), 26919 deletions(-) create mode 100644 ets2panda/test/parser/ets/undefinedNullNotObject-expected.txt rename ets2panda/test/{runtime/ets/voidInstanceReturn.ets => parser/ets/undefinedNullNotObject.ets} (46%) create mode 100644 ets2panda/test/parser/ets/undefinedNullObjectTypeAnnotation-expected.txt create mode 100644 ets2panda/test/parser/ets/undefinedNullObjectTypeAnnotation.ets create mode 100644 ets2panda/test/parser/ets/undefinedNullTypeAlias-expected.txt create mode 100644 ets2panda/test/parser/ets/undefinedNullTypeAlias.ets diff --git a/ets2panda/checker/ETSAnalyzer.cpp b/ets2panda/checker/ETSAnalyzer.cpp index 1b70952a619..8d19962a4a3 100644 --- a/ets2panda/checker/ETSAnalyzer.cpp +++ b/ets2panda/checker/ETSAnalyzer.cpp @@ -232,23 +232,23 @@ void DoBodyTypeChecking(ETSChecker *checker, ir::MethodDefinition *node, ir::Scr void CheckGetterSetterTypeConstrains(ETSChecker *checker, ir::ScriptFunction *scriptFunc) { - if (scriptFunc->IsSetter() && (scriptFunc->Signature()->ReturnType() != checker->GlobalBuiltinVoidType())) { + if (scriptFunc->IsSetter() && (scriptFunc->Signature()->ReturnType() != checker->GlobalVoidType())) { checker->ThrowTypeError("Setter must have void return type", scriptFunc->Start()); } - if (scriptFunc->IsGetter() && (scriptFunc->Signature()->ReturnType() == checker->GlobalBuiltinVoidType())) { + if (scriptFunc->IsGetter() && (scriptFunc->Signature()->ReturnType() == checker->GlobalVoidType())) { checker->ThrowTypeError("Getter must return a value", scriptFunc->Start()); } auto const name = scriptFunc->Id()->Name(); if (name.Is(compiler::Signatures::GET_INDEX_METHOD)) { - if (scriptFunc->Signature()->ReturnType() == checker->GlobalBuiltinVoidType()) { + if (scriptFunc->Signature()->ReturnType() == checker->GlobalVoidType()) { checker->ThrowTypeError(std::string {ir::INDEX_ACCESS_ERROR_1} + std::string {name.Utf8()} + std::string {"' shouldn't have void return type."}, scriptFunc->Start()); } } else if (name.Is(compiler::Signatures::SET_INDEX_METHOD)) { - if (scriptFunc->Signature()->ReturnType() != checker->GlobalBuiltinVoidType()) { + if (scriptFunc->Signature()->ReturnType() != checker->GlobalVoidType()) { checker->ThrowTypeError(std::string {ir::INDEX_ACCESS_ERROR_1} + std::string {name.Utf8()} + std::string {"' should have void return type."}, scriptFunc->Start()); @@ -2151,9 +2151,7 @@ void CheckArgumentVoidType(checker::Type *&funcReturnType, ETSChecker *checker, ir::ReturnStatement *st) { if (name.find(compiler::Signatures::ETS_MAIN_WITH_MANGLE_BEGIN) != std::string::npos) { - if (funcReturnType == checker->GlobalBuiltinVoidType()) { - funcReturnType = checker->GlobalVoidType(); - } else if (!funcReturnType->IsETSVoidType() && !funcReturnType->IsIntType()) { + if (!funcReturnType->IsETSVoidType() && !funcReturnType->IsIntType()) { checker->ThrowTypeError("Bad return type, main enable only void or int type.", st->Start()); } } @@ -2162,8 +2160,8 @@ void CheckArgumentVoidType(checker::Type *&funcReturnType, ETSChecker *checker, void CheckReturnType(ETSChecker *checker, checker::Type *funcReturnType, checker::Type *argumentType, ir::Expression *stArgument) { - if (funcReturnType->IsETSVoidType() || funcReturnType == checker->GlobalBuiltinVoidType()) { - if (argumentType != checker->GlobalVoidType() && argumentType != checker->GlobalBuiltinVoidType()) { + if (funcReturnType->IsETSVoidType() || funcReturnType == checker->GlobalVoidType()) { + if (argumentType != checker->GlobalVoidType()) { checker->ThrowTypeError("Unexpected return value, enclosing method return type is void.", stArgument->Start()); } @@ -2182,9 +2180,7 @@ void InferReturnType(ETSChecker *checker, ir::ScriptFunction *containingFunc, ch ir::Expression *stArgument) { // First (or single) return statement in the function: - funcReturnType = stArgument == nullptr - ? containingFunc->IsEntryPoint() ? checker->GlobalVoidType() : checker->GlobalBuiltinVoidType() - : stArgument->Check(checker); + funcReturnType = stArgument == nullptr ? checker->GlobalVoidType() : stArgument->Check(checker); if (funcReturnType->HasTypeFlag(checker::TypeFlag::CONSTANT)) { // remove CONSTANT type modifier if exists funcReturnType = @@ -2227,22 +2223,20 @@ void ProcessReturnStatements(ETSChecker *checker, ir::ScriptFunction *containing if (stArgument == nullptr) { // previous return statement(s) have value - if (!funcReturnType->IsETSVoidType() && funcReturnType != checker->GlobalBuiltinVoidType()) { + if (!funcReturnType->IsETSVoidType() && funcReturnType != checker->GlobalVoidType()) { checker->ThrowTypeError("All return statements in the function should be empty or have a value.", st->Start()); } } else { // previous return statement(s) don't have any value - if (funcReturnType->IsETSVoidType() || funcReturnType == checker->GlobalBuiltinVoidType()) { + if (funcReturnType->IsETSVoidType() || funcReturnType == checker->GlobalVoidType()) { checker->ThrowTypeError("All return statements in the function should be empty or have a value.", stArgument->Start()); } const auto name = containingFunc->Scope()->InternalName().Mutf8(); if (name.find(compiler::Signatures::ETS_MAIN_WITH_MANGLE_BEGIN) != std::string::npos) { - if (funcReturnType == checker->GlobalBuiltinVoidType()) { - funcReturnType = checker->GlobalVoidType(); - } else if (!funcReturnType->IsETSVoidType() && !funcReturnType->IsIntType()) { + if (!funcReturnType->IsETSVoidType() && !funcReturnType->IsIntType()) { checker->ThrowTypeError("Bad return type, main enable only void or int type.", st->Start()); } } @@ -2293,11 +2287,10 @@ checker::Type *ETSAnalyzer::GetFunctionReturnType(ir::ReturnStatement *st, ir::S funcReturnType = checker->GetTypeFromTypeAnnotation(returnTypeAnnotation); if (st->argument_ == nullptr) { - if (!funcReturnType->IsETSVoidType() && funcReturnType != checker->GlobalBuiltinVoidType()) { + if (!funcReturnType->IsETSVoidType() && funcReturnType != checker->GlobalVoidType()) { checker->ThrowTypeError("Missing return value.", st->Start()); } - funcReturnType = - containingFunc->IsEntryPoint() ? checker->GlobalVoidType() : checker->GlobalBuiltinVoidType(); + funcReturnType = checker->GlobalVoidType(); } else { const auto name = containingFunc->Scope()->InternalName().Mutf8(); CheckArgumentVoidType(funcReturnType, checker, name, st); diff --git a/ets2panda/checker/ETSchecker.cpp b/ets2panda/checker/ETSchecker.cpp index 6d31c35189d..fb957f142b2 100644 --- a/ets2panda/checker/ETSchecker.cpp +++ b/ets2panda/checker/ETSchecker.cpp @@ -37,20 +37,13 @@ void ETSChecker::InitializeBuiltins(varbinder::ETSBinder *varbinder) const auto varMap = varbinder->TopScope()->Bindings(); - auto initBuiltin = [varMap](ETSChecker *checker, std::string_view signature) -> util::StringView { - const auto iterator = varMap.find(signature); - ASSERT(iterator != varMap.end()); - checker->GetGlobalTypesHolder()->InitializeBuiltin( - iterator->first, - checker->BuildClassProperties(iterator->second->Declaration()->Node()->AsClassDefinition())); - return iterator->first; - }; - - auto const objectName = initBuiltin(this, compiler::Signatures::BUILTIN_OBJECT_CLASS); - auto const voidName = initBuiltin(this, compiler::Signatures::BUILTIN_VOID_CLASS); + const auto object = varMap.find("Object"); + ASSERT(object != varMap.end()); + GetGlobalTypesHolder()->InitializeBuiltin( + object->first, BuildClassProperties(object->second->Declaration()->Node()->AsClassDefinition())); for (const auto &[name, var] : varMap) { - if (name == objectName || name == voidName) { + if (name == object->first) { continue; } @@ -291,11 +284,6 @@ ETSObjectType *ETSChecker::GlobalBuiltinJSValueType() const return AsETSObjectType(&GlobalTypesHolder::GlobalJSValueBuiltinType); } -ETSObjectType *ETSChecker::GlobalBuiltinVoidType() const -{ - return AsETSObjectType(&GlobalTypesHolder::GlobalBuiltinVoidType); -} - ETSObjectType *ETSChecker::GlobalBuiltinDynamicType(Language lang) const { if (lang.GetId() == Language::Id::JS) { diff --git a/ets2panda/checker/ETSchecker.h b/ets2panda/checker/ETSchecker.h index bf0543ae026..5e417d91c25 100644 --- a/ets2panda/checker/ETSchecker.h +++ b/ets2panda/checker/ETSchecker.h @@ -116,7 +116,6 @@ public: ETSObjectType *GlobalBuiltinJSRuntimeType() const; ETSObjectType *GlobalBuiltinJSValueType() const; ETSObjectType *GlobalBuiltinBoxType(const Type *contents) const; - ETSObjectType *GlobalBuiltinVoidType() const; ETSObjectType *GlobalBuiltinDynamicType(Language lang) const; @@ -344,7 +343,7 @@ public: void CheckObjectLiteralArguments(Signature *sig, ArenaVector const &arguments); Signature *ComposeSignature(ir::ScriptFunction *func, SignatureInfo *signatureInfo, Type *returnType, varbinder::Variable *nameVar); - Type *ComposeReturnType(ir::ScriptFunction *func, util::StringView funcName, bool isConstructSig); + Type *ComposeReturnType(ir::ScriptFunction *func); SignatureInfo *ComposeSignatureInfo(ir::ScriptFunction *func); void ValidateMainSignature(ir::ScriptFunction *func); checker::ETSFunctionType *BuildFunctionSignature(ir::ScriptFunction *func, bool isConstructSig = false); diff --git a/ets2panda/checker/ets/aliveAnalyzer.cpp b/ets2panda/checker/ets/aliveAnalyzer.cpp index b12ca4caff2..85805e0b48b 100644 --- a/ets2panda/checker/ets/aliveAnalyzer.cpp +++ b/ets2panda/checker/ets/aliveAnalyzer.cpp @@ -274,13 +274,13 @@ void AliveAnalyzer::AnalyzeMethodDef(const ir::MethodDefinition *methodDef) AnalyzeStat(func->Body()); ASSERT(methodDef->TsType() && methodDef->TsType()->IsETSFunctionType()); const auto *returnType = methodDef->TsType()->AsETSFunctionType()->FindSignature(func)->ReturnType(); - const auto isVoid = returnType->IsETSVoidType() || returnType == checker_->GlobalBuiltinVoidType(); + const auto isVoid = returnType->IsETSVoidType() || returnType == checker_->GlobalVoidType(); auto isPromiseVoid = false; if (returnType->IsETSAsyncFuncReturnType()) { const auto *asAsync = returnType->AsETSAsyncFuncReturnType(); - isPromiseVoid = asAsync->GetPromiseTypeArg() == checker_->GlobalBuiltinVoidType(); + isPromiseVoid = asAsync->GetPromiseTypeArg() == checker_->GlobalETSUndefinedType(); } if (status_ == LivenessStatus::ALIVE && !isVoid && !isPromiseVoid) { diff --git a/ets2panda/checker/ets/dynamic.cpp b/ets2panda/checker/ets/dynamic.cpp index c72d8eff47f..ded416e9d74 100644 --- a/ets2panda/checker/ets/dynamic.cpp +++ b/ets2panda/checker/ets/dynamic.cpp @@ -499,7 +499,7 @@ ir::MethodDefinition *ETSChecker::CreateDynamicModuleClassInitMethod(varbinder:: [this]([[maybe_unused]] varbinder::FunctionScope *scope, [[maybe_unused]] ArenaVector *statements, [[maybe_unused]] ArenaVector *params, - Type **returnType) { *returnType = GlobalBuiltinVoidType(); }); + Type **returnType) { *returnType = GlobalVoidType(); }); } ir::MethodDefinition *ETSChecker::CreateLambdaObjectClassInvokeMethod(varbinder::ClassScope *classScope, diff --git a/ets2panda/checker/ets/function.cpp b/ets2panda/checker/ets/function.cpp index 825208c82e7..14bf4256ba3 100644 --- a/ets2panda/checker/ets/function.cpp +++ b/ets2panda/checker/ets/function.cpp @@ -853,28 +853,14 @@ Signature *ETSChecker::ComposeSignature(ir::ScriptFunction *func, SignatureInfo return signature; } -Type *ETSChecker::ComposeReturnType(ir::ScriptFunction *func, util::StringView funcName, bool isConstructSig) +Type *ETSChecker::ComposeReturnType(ir::ScriptFunction *func) { auto *const returnTypeAnnotation = func->ReturnTypeAnnotation(); checker::Type *returnType {}; if (returnTypeAnnotation == nullptr) { // implicit void return type - returnType = isConstructSig || func->IsEntryPoint() || funcName.Is(compiler::Signatures::CCTOR) - ? GlobalVoidType() - : GlobalBuiltinVoidType(); - - if (returnType == nullptr) { - const auto varMap = VarBinder()->TopScope()->Bindings(); - - const auto builtinVoid = varMap.find(compiler::Signatures::BUILTIN_VOID_CLASS); - ASSERT(builtinVoid != varMap.end()); - - BuildClassProperties(builtinVoid->second->Declaration()->Node()->AsClassDefinition()); - - ASSERT(GlobalBuiltinVoidType() != nullptr); - returnType = GlobalBuiltinVoidType(); - } + returnType = GlobalVoidType(); if (func->IsAsyncFunc()) { auto implicitPromiseVoid = [this]() { @@ -883,13 +869,13 @@ Type *ETSChecker::ComposeReturnType(ir::ScriptFunction *func, util::StringView f promiseGlobal->Instantiate(Allocator(), Relation(), GetGlobalTypesHolder())->AsETSObjectType(); promiseType->AddTypeFlag(checker::TypeFlag::GENERIC); promiseType->TypeArguments().clear(); - promiseType->TypeArguments().emplace_back(GlobalBuiltinVoidType()); + promiseType->TypeArguments().emplace_back(GlobalVoidType()); return promiseType; }; returnType = implicitPromiseVoid(); } - } else if (func->IsEntryPoint() && returnTypeAnnotation->GetType(this) == GlobalBuiltinVoidType()) { + } else if (func->IsEntryPoint() && returnTypeAnnotation->GetType(this) == GlobalVoidType()) { returnType = GlobalVoidType(); } else { returnType = GetTypeFromTypeAnnotation(returnTypeAnnotation); @@ -983,7 +969,7 @@ checker::ETSFunctionType *ETSChecker::BuildFunctionSignature(ir::ScriptFunction ValidateMainSignature(func); } - auto *returnType = ComposeReturnType(func, funcName, isConstructSig); + auto *returnType = ComposeReturnType(func); auto *signature = ComposeSignature(func, signatureInfo, returnType, nameVar); if (isConstructSig) { signature->AddSignatureFlag(SignatureFlags::CONSTRUCT); @@ -2620,7 +2606,8 @@ bool ETSChecker::IsReturnTypeSubstitutable(Signature *const s1, Signature *const // - If R1 is a reference type then R1, adapted to the type parameters of d2 (link to generic methods), is a // subtype of R2. - ASSERT(r1->HasTypeFlag(TypeFlag::ETS_ARRAY_OR_OBJECT) || r1->IsETSTypeParameter()); + ASSERT(r1->HasTypeFlag(TypeFlag::ETS_ARRAY_OR_OBJECT) || r1->IsETSTypeParameter() || + r1->HasTypeFlag(TypeFlag::ETS_VOID)); return Relation()->IsSupertypeOf(r2, r1); } diff --git a/ets2panda/checker/ets/helpers.cpp b/ets2panda/checker/ets/helpers.cpp index 1e1874cb65f..c259fc2882f 100644 --- a/ets2panda/checker/ets/helpers.cpp +++ b/ets2panda/checker/ets/helpers.cpp @@ -81,7 +81,7 @@ void ETSChecker::CheckTruthinessOfType(ir::Expression *expr) ThrowTypeError("Condition must be of possible condition type", expr->Start()); } - if (unboxedType == GlobalBuiltinVoidType() || unboxedType->IsETSVoidType()) { + if (unboxedType == GlobalVoidType() || unboxedType->IsETSVoidType()) { ThrowTypeError("An expression of type 'void' cannot be tested for truthiness", expr->Start()); } @@ -114,7 +114,7 @@ Type *ETSChecker::CreateNullishType(Type *type, checker::TypeFlag nullishFlags, nullish->AsETSObjectType()->SetAssemblerName(GlobalETSObjectType()->AssemblerName()); } } - ASSERT(!nullish->HasTypeFlag(TypeFlag::ETS_PRIMITIVE)); + ASSERT(!nullish->HasTypeFlag(TypeFlag::ETS_PRIMITIVE) || nullish->IsETSVoidType()); return nullish; } @@ -161,9 +161,13 @@ const Type *ETSChecker::GetNonNullishType(const Type *type) const Type *ETSChecker::CreateOptionalResultType(Type *type) { if (type->HasTypeFlag(checker::TypeFlag::ETS_PRIMITIVE)) { - type = PrimitiveTypeAsETSBuiltinType(type); - ASSERT(type->IsETSObjectType()); - Relation()->GetNode()->AddBoxingUnboxingFlags(GetBoxingFlag(type)); + if (type->IsETSVoidType()) { + type = GlobalETSUndefinedType(); + } else { + type = PrimitiveTypeAsETSBuiltinType(type); + ASSERT(type->IsETSObjectType()); + Relation()->GetNode()->AddBoxingUnboxingFlags(GetBoxingFlag(type)); + } } return CreateNullishType(type, checker::TypeFlag::UNDEFINED, Allocator(), Relation(), GetGlobalTypesHolder()); diff --git a/ets2panda/checker/ets/typeCreation.cpp b/ets2panda/checker/ets/typeCreation.cpp index bde29373c79..8055a219a33 100644 --- a/ets2panda/checker/ets/typeCreation.cpp +++ b/ets2panda/checker/ets/typeCreation.cpp @@ -232,7 +232,6 @@ std::map &GetNameToTypeIdMap() {compiler::Signatures::BUILTIN_LONG_BOX_CLASS, GlobalTypeId::ETS_LONG_BOX_BUILTIN}, {compiler::Signatures::BUILTIN_FLOAT_BOX_CLASS, GlobalTypeId::ETS_FLOAT_BOX_BUILTIN}, {compiler::Signatures::BUILTIN_DOUBLE_BOX_CLASS, GlobalTypeId::ETS_DOUBLE_BOX_BUILTIN}, - {compiler::Signatures::BUILTIN_VOID_CLASS, GlobalTypeId::ETS_VOID_BUILTIN}, }; return nameToTypeId; @@ -248,7 +247,6 @@ std::map> & {compiler::Signatures::BUILTIN_ERROR_CLASS, &ETSChecker::GlobalBuiltinErrorType}, {compiler::Signatures::BUILTIN_TYPE_CLASS, &ETSChecker::GlobalBuiltinTypeType}, {compiler::Signatures::BUILTIN_PROMISE_CLASS, &ETSChecker::GlobalBuiltinPromiseType}, - {compiler::Signatures::BUILTIN_VOID_CLASS, &ETSChecker::GlobalBuiltinVoidType}, }; return nameToGlobalType; diff --git a/ets2panda/checker/ets/typeRelationContext.cpp b/ets2panda/checker/ets/typeRelationContext.cpp index 1e4197d98c4..dc9ccaa3c22 100644 --- a/ets2panda/checker/ets/typeRelationContext.cpp +++ b/ets2panda/checker/ets/typeRelationContext.cpp @@ -121,12 +121,17 @@ void InstantiationContext::InstantiateType(ETSObjectType *type, ir::TSTypeParame if (paramType->HasTypeFlag(TypeFlag::ETS_PRIMITIVE)) { checker_->Relation()->SetNode(it); + auto *const boxedTypeArg = checker_->PrimitiveTypeAsETSBuiltinType(paramType); ASSERT(boxedTypeArg); paramType = boxedTypeArg->Instantiate(checker_->Allocator(), checker_->Relation(), checker_->GetGlobalTypesHolder()); } + if (paramType->IsETSVoidType()) { + paramType = checker_->GlobalETSUndefinedType(); + } + typeArgTypes.push_back(paramType); } } diff --git a/ets2panda/checker/types/ets/etsObjectType.cpp b/ets2panda/checker/types/ets/etsObjectType.cpp index 1c72ad3ff6b..c83be3f00e5 100644 --- a/ets2panda/checker/types/ets/etsObjectType.cpp +++ b/ets2panda/checker/types/ets/etsObjectType.cpp @@ -636,7 +636,7 @@ bool ETSObjectType::DefaultObjectTypeChecks(const ETSChecker *const etsChecker, if (!source->IsETSObjectType() || !source->AsETSObjectType()->HasObjectFlag(ETSObjectFlags::CLASS | ETSObjectFlags::INTERFACE | - ETSObjectFlags::NULL_TYPE)) { + ETSObjectFlags::NULL_TYPE | ETSObjectFlags::UNDEFINED_TYPE)) { return true; } diff --git a/ets2panda/checker/types/ets/etsVoidType.cpp b/ets2panda/checker/types/ets/etsVoidType.cpp index 344b02d4180..01e1255facd 100644 --- a/ets2panda/checker/types/ets/etsVoidType.cpp +++ b/ets2panda/checker/types/ets/etsVoidType.cpp @@ -18,11 +18,22 @@ namespace ark::es2panda::checker { void ETSVoidType::Identical(TypeRelation *relation, Type *other) { - if (other->IsETSVoidType()) { + if (other->IsETSVoidType() || other->IsETSUndefinedType()) { relation->Result(true); } } +bool ETSVoidType::AssignmentSource(TypeRelation *relation, Type *target) +{ + Identical(relation, target); + + if (target->ContainsUndefined()) { + relation->Result(true); + } + + return relation->IsTrue(); +} + void ETSVoidType::AssignmentTarget([[maybe_unused]] TypeRelation *relation, [[maybe_unused]] Type *source) {} Type *ETSVoidType::Instantiate([[maybe_unused]] ArenaAllocator *allocator, [[maybe_unused]] TypeRelation *relation, diff --git a/ets2panda/checker/types/ets/etsVoidType.h b/ets2panda/checker/types/ets/etsVoidType.h index f8d0975a7aa..7f98a919fd7 100644 --- a/ets2panda/checker/types/ets/etsVoidType.h +++ b/ets2panda/checker/types/ets/etsVoidType.h @@ -25,6 +25,7 @@ public: void Identical(TypeRelation *relation, Type *other) override; void AssignmentTarget(TypeRelation *relation, Type *source) override; + bool AssignmentSource(TypeRelation *relation, Type *target) override; Type *Instantiate(ArenaAllocator *allocator, TypeRelation *relation, GlobalTypesHolder *globalTypes) override; void ToString(std::stringstream &ss) const override diff --git a/ets2panda/checker/types/globalTypesHolder.cpp b/ets2panda/checker/types/globalTypesHolder.cpp index 8159ca6bf0e..f8de36a38af 100644 --- a/ets2panda/checker/types/globalTypesHolder.cpp +++ b/ets2panda/checker/types/globalTypesHolder.cpp @@ -141,7 +141,6 @@ GlobalTypesHolder::GlobalTypesHolder(ArenaAllocator *allocator) : builtinNameMap builtinNameMappings_.emplace("LongBox", GlobalTypeId::ETS_LONG_BOX_BUILTIN); builtinNameMappings_.emplace("FloatBox", GlobalTypeId::ETS_FLOAT_BOX_BUILTIN); builtinNameMappings_.emplace("DoubleBox", GlobalTypeId::ETS_DOUBLE_BOX_BUILTIN); - builtinNameMappings_.emplace("void", GlobalTypeId::ETS_VOID_BUILTIN); builtinNameMappings_.emplace("never", GlobalTypeId::ETS_NEVER_BUILTIN); // ETS escompat layer @@ -328,11 +327,6 @@ Type *GlobalTypesHolder::GlobalETSVoidType() return globalTypes_.at(static_cast(GlobalTypeId::ETS_VOID)); } -Type *GlobalTypesHolder::GlobalBuiltinVoidType() -{ - return globalTypes_.at(static_cast(GlobalTypeId::ETS_VOID_BUILTIN)); -} - Type *GlobalTypesHolder::GlobalETSObjectType() { return globalTypes_.at(static_cast(GlobalTypeId::ETS_OBJECT_BUILTIN)); diff --git a/ets2panda/checker/types/globalTypesHolder.h b/ets2panda/checker/types/globalTypesHolder.h index 6dc0440d4c9..ab0cdae7d95 100644 --- a/ets2panda/checker/types/globalTypesHolder.h +++ b/ets2panda/checker/types/globalTypesHolder.h @@ -53,7 +53,6 @@ enum class GlobalTypeId { ETS_BOOLEAN, ETS_STRING, ETS_VOID, - ETS_VOID_BUILTIN, ETS_OBJECT_BUILTIN, ETS_NULL, ETS_UNDEFINED, @@ -128,7 +127,6 @@ public: Type *GlobalStringType(); Type *GlobalBooleanType(); Type *GlobalVoidType(); - Type *GlobalBuiltinVoidType(); Type *GlobalNullType(); Type *GlobalUndefinedType(); Type *GlobalUnknownType(); diff --git a/ets2panda/checker/types/typeFlag.h b/ets2panda/checker/types/typeFlag.h index e071056e422..754c7790ecf 100644 --- a/ets2panda/checker/types/typeFlag.h +++ b/ets2panda/checker/types/typeFlag.h @@ -85,7 +85,7 @@ enum class TypeFlag : uint64_t { ETS_DYNAMIC_FUNCTION_TYPE = FUNCTION | ETS_DYNAMIC_FLAG, ETS_TYPE = BYTE | SHORT | INT | LONG | FLOAT | DOUBLE | CHAR | ETS_BOOLEAN | ETS_VOID | ETS_OBJECT | ETS_ARRAY | WILDCARD | ETS_TYPE_PARAMETER | ETS_ENUM | ETS_STRING_ENUM | ETS_DYNAMIC_TYPE | ETS_UNION, - ETS_PRIMITIVE = BYTE | SHORT | INT | LONG | FLOAT | DOUBLE | CHAR | ETS_BOOLEAN | ETS_VOID, + ETS_PRIMITIVE = BYTE | SHORT | INT | LONG | FLOAT | DOUBLE | CHAR | ETS_BOOLEAN, ETS_PRIMITIVE_RETURN = BYTE | SHORT | INT | LONG | FLOAT | DOUBLE | CHAR | ETS_BOOLEAN | ETS_ENUM, ETS_ARRAY_INDEX = BYTE | SHORT | INT, ETS_INTEGRAL = BYTE | CHAR | SHORT | INT | LONG, diff --git a/ets2panda/compiler/core/ETSCompiler.cpp b/ets2panda/compiler/core/ETSCompiler.cpp index 1cbdb9ff545..d30f8041523 100644 --- a/ets2panda/compiler/core/ETSCompiler.cpp +++ b/ets2panda/compiler/core/ETSCompiler.cpp @@ -1633,29 +1633,35 @@ void ETSCompiler::Compile(const ir::ReturnStatement *st) const { ETSGen *etsg = GetETSGen(); if (st->Argument() == nullptr) { - if (st->ReturnType() == nullptr || st->ReturnType()->IsETSVoidType()) { - if (etsg->ExtendWithFinalizer(st->parent_, st)) { - return; - } - - if (etsg->CheckControlFlowChange()) { - etsg->ControlFlowChangeBreak(); - } - etsg->EmitReturnVoid(st); + if (etsg->ExtendWithFinalizer(st->parent_, st)) { return; } - etsg->LoadBuiltinVoid(st); - } else { - auto ttctx = compiler::TargetTypeContext(etsg, etsg->ReturnType()); - - if (!etsg->TryLoadConstantExpression(st->Argument())) { - st->Argument()->Compile(etsg); + if (etsg->CheckControlFlowChange()) { + etsg->ControlFlowChangeBreak(); } - etsg->ApplyConversion(st->Argument(), nullptr); - etsg->ApplyConversion(st->Argument(), st->ReturnType()); + + etsg->EmitReturnVoid(st); + + return; } + if (st->Argument()->IsCallExpression() && + st->Argument()->AsCallExpression()->Signature()->ReturnType()->IsETSVoidType()) { + st->Argument()->Compile(etsg); + etsg->EmitReturnVoid(st); + return; + } + + auto ttctx = compiler::TargetTypeContext(etsg, etsg->ReturnType()); + + if (!etsg->TryLoadConstantExpression(st->Argument())) { + st->Argument()->Compile(etsg); + } + + etsg->ApplyConversion(st->Argument(), nullptr); + etsg->ApplyConversion(st->Argument(), st->ReturnType()); + if (etsg->ExtendWithFinalizer(st->parent_, st)) { return; } diff --git a/ets2panda/compiler/core/ETSGen.cpp b/ets2panda/compiler/core/ETSGen.cpp index fab421d44ba..1b4557fa294 100644 --- a/ets2panda/compiler/core/ETSGen.cpp +++ b/ets2panda/compiler/core/ETSGen.cpp @@ -41,6 +41,7 @@ #include "checker/ETSchecker.h" #include "checker/ets/boxingConverter.h" #include "checker/types/ets/etsObjectType.h" +#include "checker/types/ets/etsAsyncFuncReturnType.h" #include "checker/types/ets/types.h" #include "parser/program/program.h" @@ -712,11 +713,20 @@ VReg ETSGen::GetThisReg() const void ETSGen::LoadDefaultValue([[maybe_unused]] const ir::AstNode *node, [[maybe_unused]] const checker::Type *type) { + if (type->IsETSAsyncFuncReturnType()) { + LoadDefaultValue(node, type->AsETSAsyncFuncReturnType()->GetPromiseTypeArg()); + return; + } + if (type->IsETSUnionType()) { type = Checker()->GetGlobalTypesHolder()->GlobalETSObjectType(); } if (type->IsETSObjectType() || type->IsETSArrayType() || type->IsETSTypeParameter()) { - LoadAccumulatorNull(node, type); + if (type->IsETSUndefinedType()) { + LoadAccumulatorUndefined(node); + } else { + LoadAccumulatorNull(node, type); + } } else if (type->IsETSBooleanType()) { LoadAccumulatorBoolean(node, type->AsETSBooleanType()->GetValue()); } else { @@ -730,12 +740,6 @@ void ETSGen::EmitReturnVoid(const ir::AstNode *node) Sa().Emit(node); } -void ETSGen::LoadBuiltinVoid(const ir::AstNode *node) -{ - LoadStaticProperty(node, Checker()->GlobalBuiltinVoidType(), - FormClassPropReference(Checker()->GlobalBuiltinVoidType(), "void_instance")); -} - void ETSGen::ReturnAcc(const ir::AstNode *node) { const auto *const accType = GetAccumulatorType(); @@ -839,10 +843,11 @@ void ETSGen::InternalCheckCast(const ir::AstNode *node, const es2panda::checker: void ETSGen::CheckedReferenceNarrowing(const ir::AstNode *node, const checker::Type *target) { - ASSERT(target->HasTypeFlag(TYPE_FLAG_BYTECODE_REF) && !target->IsETSNullLike()); + ASSERT(target->HasTypeFlag(TYPE_FLAG_BYTECODE_REF)); + // NOTE(vpukhov): implement for nulllike and union targets - if (target == Checker()->GlobalETSNullishObjectType()) { - SetAccumulatorType(target); + if (target->IsETSNullLike()) { + EmitCheckCastToNullOrUndefined(node, target); return; } @@ -2741,4 +2746,36 @@ util::StringView ETSGen::ToAssemblerType(const es2panda::checker::Type *type) co return util::UString(ss.str(), Allocator()).View(); } +void ETSGen::EmitCheckCastToNullOrUndefined(const ir::AstNode *node, const checker::Type *target) +{ + ASSERT(target->IsETSNullLike()); + + compiler::RegScope rs(this); + compiler::VReg res = AllocReg(); + + StoreAccumulator(node, res); + + Label *ifTrue = AllocLabel(); + + if (target->IsETSNullType()) { + BranchIfNull(node, ifTrue); + LoadAccumulatorString(node, "Value cannot be casted to Null"); + } else { + BranchIfUndefined(node, ifTrue); + LoadAccumulatorString(node, "Value cannot be casted to Undefined"); + } + + StoreAccumulator(node, res); + + const auto error = AllocReg(); + NewObject(node, error, compiler::Signatures::BUILTIN_CLASS_CAST_EXCEPTION); + CallThisStatic1(node, error, compiler::Signatures::BUILTIN_CLASS_CAST_EXCEPTION_CTOR, res); + EmitThrow(node, error); + + SetLabel(node, ifTrue); + + SetAccumulatorType(target); + LoadAccumulator(node, res); +} + } // namespace ark::es2panda::compiler diff --git a/ets2panda/compiler/core/ETSGen.h b/ets2panda/compiler/core/ETSGen.h index 97c9d7ca3bd..d6de3a7c568 100644 --- a/ets2panda/compiler/core/ETSGen.h +++ b/ets2panda/compiler/core/ETSGen.h @@ -88,7 +88,6 @@ public: void LoadDefaultValue(const ir::AstNode *node, const checker::Type *type); void EmitReturnVoid(const ir::AstNode *node); - void LoadBuiltinVoid(const ir::AstNode *node); void ReturnAcc(const ir::AstNode *node); void EmitIsInstance(const ir::AstNode *node, VReg objReg); @@ -279,6 +278,26 @@ public: Sa().Emit(node, ifNull); } + void BranchIfUndefined([[maybe_unused]] const ir::AstNode *node, [[maybe_unused]] Label *ifUndefined) + { +#ifdef PANDA_WITH_ETS + Sa().Emit(node); + Sa().Emit(node, ifUndefined); +#else + UNREACHABLE(); +#endif // PANDA_WITH_ETS + } + + void BranchIfNotUndefined([[maybe_unused]] const ir::AstNode *node, [[maybe_unused]] Label *ifUndefined) + { +#ifdef PANDA_WITH_ETS + Sa().Emit(node); + Sa().Emit(node, ifUndefined); +#else + UNREACHABLE(); +#endif // PANDA_WITH_ETS + } + void BranchIfNotNull(const ir::AstNode *node, Label *ifNotNull) { Sa().Emit(node, ifNotNull); @@ -666,6 +685,7 @@ private: const VReg dummyReg_ = VReg::RegStart(); void EmitIsInstanceNonNullish(const ir::AstNode *node, VReg objReg, checker::ETSObjectType const *clsType); + void EmitCheckCastToNullOrUndefined(const ir::AstNode *node, const checker::Type *target); void EmitUnboxedCall(const ir::AstNode *node, std::string_view signatureFlag, const checker::Type *targetType, const checker::Type *boxedType); diff --git a/ets2panda/compiler/core/ETSfunction.cpp b/ets2panda/compiler/core/ETSfunction.cpp index c264d09d521..effca3433a4 100644 --- a/ets2panda/compiler/core/ETSfunction.cpp +++ b/ets2panda/compiler/core/ETSfunction.cpp @@ -57,68 +57,21 @@ void ETSFunction::CallImplicitCtor(ETSGen *etsg) void ETSFunction::CompileSourceBlock(ETSGen *etsg, const ir::BlockStatement *block) { - auto const checkInitializer = [](ArenaVector const &nodes) -> bool { - for (auto const *const node : nodes) { - if (node->IsMethodDefinition() && node->AsClassElement()->Key()->IsIdentifier()) { - if (node->AsClassElement()->Id()->Name() == compiler::Signatures::INIT_METHOD) { - return false; - } - } - } - return true; - }; - auto *scriptFunc = etsg->RootNode()->AsScriptFunction(); if (scriptFunc->IsEnum()) { // NOTE: add enum methods } else if (scriptFunc->IsStaticBlock()) { - const auto *classDef = etsg->ContainingObjectType()->GetDeclNode()->AsClassDefinition(); - - // Check if it is the Global class static constructor and the special '_$init$_" method exists - bool const compileInitializer = classDef->IsGlobal() ? checkInitializer(classDef->Body()) : true; - - for (const auto *prop : classDef->Body()) { - if (!prop->IsClassProperty() || !prop->IsStatic()) { - continue; - } - - // Don't compile variable initializers if they present in '_$init$_" method - auto *const item = prop->AsClassProperty(); - auto *const value = item->Value(); - if (value != nullptr && (compileInitializer || item->IsConst() || value->IsArrowFunctionExpression())) { - item->Compile(etsg); - } - } + CompileAsStaticBlock(etsg); } else if (scriptFunc->IsConstructor()) { - if (scriptFunc->IsImplicitSuperCallNeeded()) { - CallImplicitCtor(etsg); - } - - const auto *classDef = etsg->ContainingObjectType()->GetDeclNode()->AsClassDefinition(); - - for (const auto *prop : classDef->Body()) { - if (!prop->IsClassProperty() || prop->IsStatic()) { - continue; - } - - prop->AsClassProperty()->Compile(etsg); - } + CompileAsConstructor(etsg, scriptFunc); } const auto &statements = block->Statements(); if (statements.empty()) { etsg->SetFirstStmt(block); - if (scriptFunc->IsConstructor() || scriptFunc->IsStaticBlock() || scriptFunc->IsEntryPoint()) { - ASSERT(etsg->ReturnType() != etsg->Checker()->GlobalBuiltinVoidType()); - etsg->EmitReturnVoid(block); - } else { - ASSERT(!etsg->ReturnType()->IsETSVoidType()); - etsg->LoadBuiltinVoid(block); - etsg->ReturnAcc(block); - } - + ExtendWithDefaultReturn(etsg, block, scriptFunc); return; } @@ -127,20 +80,69 @@ void ETSFunction::CompileSourceBlock(ETSGen *etsg, const ir::BlockStatement *blo etsg->CompileStatements(statements); if (!statements.back()->IsReturnStatement()) { - if (scriptFunc->IsConstructor() || scriptFunc->IsStaticBlock() || scriptFunc->IsEntryPoint()) { - ASSERT(etsg->ReturnType() != etsg->Checker()->GlobalBuiltinVoidType()); - etsg->EmitReturnVoid(statements.back()); - return; + ExtendWithDefaultReturn(etsg, statements.back(), scriptFunc); + } +} + +void ETSFunction::ExtendWithDefaultReturn(ETSGen *etsg, const ir::AstNode *node, const ir::ScriptFunction *scriptFunc) +{ + if (etsg->ReturnType()->IsETSVoidType()) { + etsg->EmitReturnVoid(node); + return; + } + + if (scriptFunc->ReturnTypeAnnotation() != nullptr && scriptFunc->ReturnTypeAnnotation()->TsType() != nullptr && + scriptFunc->ReturnTypeAnnotation()->TsType()->IsETSAsyncFuncReturnType()) { + etsg->LoadDefaultValue(node, scriptFunc->ReturnTypeAnnotation()->TsType()); + } else { + etsg->LoadDefaultValue(node, scriptFunc->Signature()->ReturnType()); + } + etsg->ReturnAcc(node); +} + +void ETSFunction::CompileAsStaticBlock(ETSGen *etsg) +{ + const auto *classDef = etsg->ContainingObjectType()->GetDeclNode()->AsClassDefinition(); + + auto const checkInitializer = [](ArenaVector const &nodes) -> bool { + for (auto const *const node : nodes) { + if (node->IsMethodDefinition() && node->AsClassElement()->Key()->IsIdentifier() && + node->AsClassElement()->Id()->Name() == compiler::Signatures::INIT_METHOD) { + return false; + } } + return true; + }; + + // Check if it is the Global class static constructor and the special '_$init$_" method exists + bool const compileInitializer = classDef->IsGlobal() ? checkInitializer(classDef->Body()) : true; + + for (const auto *prop : classDef->Body()) { + if (!prop->IsClassProperty() || !prop->IsStatic()) { + continue; + } + + // Don't compile variable initializers if they present in '_$init$_" method + auto *const item = prop->AsClassProperty(); + if (item->Value() != nullptr && + (compileInitializer || item->IsConst() || item->Value()->IsArrowFunctionExpression())) { + item->Compile(etsg); + } + } +} + +void ETSFunction::CompileAsConstructor(ETSGen *etsg, const ir::ScriptFunction *scriptFunc) +{ + if (scriptFunc->IsImplicitSuperCallNeeded()) { + CallImplicitCtor(etsg); + } - ASSERT(!etsg->ReturnType()->IsETSVoidType()); + const auto *classDef = etsg->ContainingObjectType()->GetDeclNode()->AsClassDefinition(); - if (scriptFunc->Signature()->ReturnType() == etsg->Checker()->GlobalBuiltinVoidType()) { - etsg->LoadBuiltinVoid(statements.back()); - } else { - etsg->LoadDefaultValue(statements.back(), scriptFunc->Signature()->ReturnType()); + for (const auto *prop : classDef->Body()) { + if (prop->IsClassProperty() && !prop->IsStatic()) { + prop->AsClassProperty()->Compile(etsg); } - etsg->ReturnAcc(statements.back()); } } diff --git a/ets2panda/compiler/core/ETSfunction.h b/ets2panda/compiler/core/ETSfunction.h index 312ccea6a74..edfbc5ea4c9 100644 --- a/ets2panda/compiler/core/ETSfunction.h +++ b/ets2panda/compiler/core/ETSfunction.h @@ -36,8 +36,11 @@ private: static void GenerateEnumMembers(ETSGen *etsg, const ir::AstNode *node, VReg arrayObj, const ir::TSEnumMember *enumMember, int32_t index); static void CompileSourceBlock(ETSGen *etsg, const ir::BlockStatement *block); + static void CompileAsStaticBlock(ETSGen *etsg); + static void CompileAsConstructor(ETSGen *etsg, const ir::ScriptFunction *scriptFunc); static void CompileFunction(ETSGen *etsg); static void CallImplicitCtor(ETSGen *etsg); + static void ExtendWithDefaultReturn(ETSGen *etsg, const ir::AstNode *node, const ir::ScriptFunction *scriptFunc); }; } // namespace ark::es2panda::compiler diff --git a/ets2panda/compiler/core/dynamicContext.cpp b/ets2panda/compiler/core/dynamicContext.cpp index d1d3179c841..b387ee4d715 100644 --- a/ets2panda/compiler/core/dynamicContext.cpp +++ b/ets2panda/compiler/core/dynamicContext.cpp @@ -225,52 +225,7 @@ void ETSTryContext::EmitFinalizer( etsg->Branch(tryStmt_, finalizerTable->LabelSet().CatchEnd()); for (std::pair insertion : finalizerInsertions) { - etsg->SetLabel(tryStmt_, insertion.first.Begin()); - - ASSERT(insertion.second != nullptr); - bool isReturn = insertion.second->IsReturnStatement(); - - compiler::RegScope rs(etsg); - compiler::VReg res = etsg->AllocReg(); - - if (isReturn) { - etsg->SetAccumulatorType(insertion.second->AsReturnStatement()->ReturnType()); - etsg->StoreAccumulator(tryStmt_, res); - etsg->SetVRegType(res, insertion.second->AsReturnStatement()->ReturnType()); - } - - // Second compile of the finaly clause, executed if the statement executed normally, but abrupted by - // return, break, or continue statements. - tryStmt_->FinallyBlock()->Compile(etsg); - - if (isReturn) { - etsg->SetAccumulatorType(insertion.second->AsReturnStatement()->ReturnType()); - etsg->LoadAccumulator(tryStmt_, res); - } - - if (insertion.first.End() != nullptr) { - etsg->Branch(tryStmt_, insertion.first.End()); - } else if (isReturn) { - if (etsg->CheckControlFlowChange()) { - etsg->StoreAccumulator(tryStmt_, res); - etsg->ControlFlowChangeBreak(); - etsg->LoadAccumulator(tryStmt_, res); - } - - if (insertion.second->AsReturnStatement()->ReturnType()->IsETSVoidType()) { - etsg->EmitReturnVoid(tryStmt_); - } else { - etsg->ReturnAcc(tryStmt_); - } - } else if (insertion.second->IsBreakStatement()) { - compiler::Label *target = etsg->ControlFlowChangeBreak(insertion.second->AsBreakStatement()->Ident()); - etsg->Branch(tryStmt_, target); - } else if (insertion.second->IsContinueStatement()) { - compiler::Label *target = etsg->ControlFlowChangeContinue(insertion.second->AsContinueStatement()->Ident()); - etsg->Branch(tryStmt_, target); - } else { - UNREACHABLE(); - } + EmitFinalizerInsertion(etsg, insertion.first, insertion.second); } etsg->SetLabel(tryStmt_, finalizerTable->LabelSet().CatchBegin()); @@ -285,4 +240,50 @@ void ETSTryContext::EmitFinalizer( etsg->SetLabel(tryStmt_, finalizerTable->LabelSet().CatchEnd()); } +void ETSTryContext::EmitFinalizerInsertion(ETSGen *etsg, compiler::LabelPair labelPair, const ir::Statement *statement) +{ + etsg->SetLabel(tryStmt_, labelPair.Begin()); + + ASSERT(statement != nullptr); + bool isReturn = statement->IsReturnStatement(); + + compiler::RegScope rs(etsg); + compiler::VReg res = etsg->AllocReg(); + + if (isReturn) { + etsg->SetAccumulatorType(statement->AsReturnStatement()->ReturnType()); + etsg->StoreAccumulator(tryStmt_, res); + etsg->SetVRegType(res, statement->AsReturnStatement()->ReturnType()); + } + + // Second compile of the finaly clause, executed if the statement executed normally, but abrupted by + // return, break, or continue statements. + tryStmt_->FinallyBlock()->Compile(etsg); + + if (isReturn) { + etsg->SetAccumulatorType(statement->AsReturnStatement()->ReturnType()); + etsg->LoadAccumulator(tryStmt_, res); + } + + if (labelPair.End() != nullptr) { + etsg->Branch(tryStmt_, labelPair.End()); + } else if (isReturn) { + if (etsg->CheckControlFlowChange()) { + etsg->StoreAccumulator(tryStmt_, res); + etsg->ControlFlowChangeBreak(); + etsg->LoadAccumulator(tryStmt_, res); + } + + etsg->ReturnAcc(tryStmt_); + } else if (statement->IsBreakStatement()) { + compiler::Label *target = etsg->ControlFlowChangeBreak(statement->AsBreakStatement()->Ident()); + etsg->Branch(tryStmt_, target); + } else if (statement->IsContinueStatement()) { + compiler::Label *target = etsg->ControlFlowChangeContinue(statement->AsContinueStatement()->Ident()); + etsg->Branch(tryStmt_, target); + } else { + UNREACHABLE(); + } +} + } // namespace ark::es2panda::compiler diff --git a/ets2panda/compiler/core/dynamicContext.h b/ets2panda/compiler/core/dynamicContext.h index 4216c348beb..9e9f156adea 100644 --- a/ets2panda/compiler/core/dynamicContext.h +++ b/ets2panda/compiler/core/dynamicContext.h @@ -287,6 +287,7 @@ public: void EmitFinalizer(LabelPair trycatchLabelPair, const ArenaVector> &finalizerInsertions); + void EmitFinalizerInsertion(ETSGen *etsg, compiler::LabelPair labelPair, const ir::Statement *statement); private: const ir::TryStatement *tryStmt_ {}; diff --git a/ets2panda/compiler/lowering/ets/lambdaLowering.cpp b/ets2panda/compiler/lowering/ets/lambdaLowering.cpp index cb8cf507c3d..d3eae59018c 100644 --- a/ets2panda/compiler/lowering/ets/lambdaLowering.cpp +++ b/ets2panda/compiler/lowering/ets/lambdaLowering.cpp @@ -27,13 +27,21 @@ static ir::AstNode *ConvertExpression(checker::ETSChecker *const checker, ir::Ar auto *const expr = function->Body()->AsExpression(); ArenaVector statements(checker->Allocator()->Adapter()); - statements.emplace_back(checker->AllocNode(expr)); + + if ((function->ReturnTypeAnnotation() != nullptr && function->ReturnTypeAnnotation()->IsETSPrimitiveType() && + function->ReturnTypeAnnotation()->AsETSPrimitiveType()->GetPrimitiveType() == ir::PrimitiveType::VOID)) { + statements.emplace_back(checker->AllocNode(expr)); + } else { + statements.emplace_back(checker->AllocNode(expr)); + function->AddFlag(ir::ScriptFunctionFlags::HAS_RETURN); + } + auto *const block = checker->AllocNode(checker->Allocator(), std::move(statements)); + block->SetScope(scope); block->SetParent(function); function->SetBody(block); - function->AddFlag(ir::ScriptFunctionFlags::HAS_RETURN); return arrow; } diff --git a/ets2panda/compiler/lowering/ets/promiseVoid.cpp b/ets2panda/compiler/lowering/ets/promiseVoid.cpp index 990d0183cc1..be6913e87c6 100644 --- a/ets2panda/compiler/lowering/ets/promiseVoid.cpp +++ b/ets2panda/compiler/lowering/ets/promiseVoid.cpp @@ -41,7 +41,7 @@ static ir::BlockStatement *HandleAsyncScriptFunctionBody(checker::ETSChecker *ch const auto *arg = returnStmt->Argument(); if (arg == nullptr) { auto *voidId = - checker->AllocNode(compiler::Signatures::VOID_OBJECT, checker->Allocator()); + checker->AllocNode(compiler::Signatures::UNDEFINED, checker->Allocator()); const auto &returnLoc = returnStmt->Range(); voidId->SetRange({returnLoc.end, returnLoc.end}); returnStmt->SetArgument(voidId); @@ -65,8 +65,7 @@ static ir::TypeNode *CreatePromiseVoidType(checker::ETSChecker *checker, const l { auto *voidParam = [checker]() { auto paramsVector = ArenaVector(checker->Allocator()->Adapter()); - auto *voidId = - checker->AllocNode(compiler::Signatures::BUILTIN_VOID_CLASS, checker->Allocator()); + auto *voidId = checker->AllocNode(compiler::Signatures::UNDEFINED, checker->Allocator()); voidId->SetReference(); auto *part = checker->AllocNode(voidId); paramsVector.push_back(checker->AllocNode(part)); @@ -117,7 +116,7 @@ static bool CheckForPromiseVoid(const ir::TypeNode *type) } const auto isTypePromise = typePart->Name()->AsIdentifier()->Name() == compiler::Signatures::BUILTIN_PROMISE_CLASS; - const auto isParamVoid = paramPart->Name()->AsIdentifier()->Name() == compiler::Signatures::BUILTIN_VOID_CLASS; + const auto isParamVoid = paramPart->Name()->AsIdentifier()->Name() == compiler::Signatures::UNDEFINED; return isTypePromise && isParamVoid; } @@ -206,9 +205,7 @@ bool PromiseVoidInferencePhase::Postcondition(public_lib::Context *ctx, const pa } const auto *id = arg->AsIdentifier(); - return id->Name() == compiler::Signatures::VOID_OBJECT; - - return true; + return id->Name() == compiler::Signatures::UNDEFINED; }; auto isOk = true; diff --git a/ets2panda/compiler/scripts/signatures.yaml b/ets2panda/compiler/scripts/signatures.yaml index c0797950622..ac689b30bda 100644 --- a/ets2panda/compiler/scripts/signatures.yaml +++ b/ets2panda/compiler/scripts/signatures.yaml @@ -118,8 +118,10 @@ defines: ref: STATIC_INVOKE_METHOD - name: instantiate ref: STATIC_INSTANTIATE_METHOD - - name: Void - ref: VOID_OBJECT + - name: undefined + ref: UNDEFINED + - name: 'null' + ref: NULL_LITERAL packages: - name: 'std.core' @@ -203,9 +205,6 @@ builtins: - name: Object package: PKG_STD_CORE ref: BUILTIN_OBJECT - - name: void - package: PKG_STD_CORE - ref: BUILTIN_VOID - name: String package: PKG_STD_CORE ref: BUILTIN_STRING @@ -845,61 +844,61 @@ signatures: - callee: BUILTIN_JSRUNTIME method_name: setPropertyBoolean params: [BUILTIN_JSVALUE, BUILTIN_STRING, PRIMITIVE_BOOLEAN] - return_type: BUILTIN_VOID + return_type: PRIMITIVE_VOID ref: BUILTIN_JSRUNTIME_SET_PROPERTY_BOOLEAN - callee: BUILTIN_JSRUNTIME method_name: setPropertyByte params: [BUILTIN_JSVALUE, BUILTIN_STRING, PRIMITIVE_BYTE] - return_type: BUILTIN_VOID + return_type: PRIMITIVE_VOID ref: BUILTIN_JSRUNTIME_SET_PROPERTY_BYTE - callee: BUILTIN_JSRUNTIME method_name: setPropertyChar params: [BUILTIN_JSVALUE, BUILTIN_STRING, PRIMITIVE_CHAR] - return_type: BUILTIN_VOID + return_type: PRIMITIVE_VOID ref: BUILTIN_JSRUNTIME_SET_PROPERTY_CHAR - callee: BUILTIN_JSRUNTIME method_name: setPropertyShort params: [BUILTIN_JSVALUE, BUILTIN_STRING, PRIMITIVE_SHORT] - return_type: BUILTIN_VOID + return_type: PRIMITIVE_VOID ref: BUILTIN_JSRUNTIME_SET_PROPERTY_SHORT - callee: BUILTIN_JSRUNTIME method_name: setPropertyInt params: [BUILTIN_JSVALUE, BUILTIN_STRING, PRIMITIVE_INT] - return_type: BUILTIN_VOID + return_type: PRIMITIVE_VOID ref: BUILTIN_JSRUNTIME_SET_PROPERTY_INT - callee: BUILTIN_JSRUNTIME method_name: setPropertyLong params: [BUILTIN_JSVALUE, BUILTIN_STRING, PRIMITIVE_LONG] - return_type: BUILTIN_VOID + return_type: PRIMITIVE_VOID ref: BUILTIN_JSRUNTIME_SET_PROPERTY_LONG - callee: BUILTIN_JSRUNTIME method_name: setPropertyFloat params: [BUILTIN_JSVALUE, BUILTIN_STRING, PRIMITIVE_FLOAT] - return_type: BUILTIN_VOID + return_type: PRIMITIVE_VOID ref: BUILTIN_JSRUNTIME_SET_PROPERTY_FLOAT - callee: BUILTIN_JSRUNTIME method_name: setPropertyDouble params: [BUILTIN_JSVALUE, BUILTIN_STRING, PRIMITIVE_DOUBLE] - return_type: BUILTIN_VOID + return_type: PRIMITIVE_VOID ref: BUILTIN_JSRUNTIME_SET_PROPERTY_DOUBLE - callee: BUILTIN_JSRUNTIME method_name: setPropertyString params: [BUILTIN_JSVALUE, BUILTIN_STRING, BUILTIN_STRING] - return_type: BUILTIN_VOID + return_type: PRIMITIVE_VOID ref: BUILTIN_JSRUNTIME_SET_PROPERTY_STRING - callee: BUILTIN_JSRUNTIME method_name: setPropertyJSValue params: [BUILTIN_JSVALUE, BUILTIN_STRING, BUILTIN_JSVALUE] - return_type: BUILTIN_VOID + return_type: PRIMITIVE_VOID ref: BUILTIN_JSRUNTIME_SET_PROPERTY_JSVALUE - callee: BUILTIN_PROMISE @@ -967,67 +966,67 @@ signatures: - callee: BUILTIN_JSRUNTIME method_name: setElementBoolean params: [BUILTIN_JSVALUE, PRIMITIVE_INT, PRIMITIVE_BOOLEAN] - return_type: BUILTIN_VOID + return_type: PRIMITIVE_VOID ref: BUILTIN_JSRUNTIME_SET_ELEMENT_BOOLEAN - callee: BUILTIN_JSRUNTIME method_name: setElementByte params: [BUILTIN_JSVALUE, PRIMITIVE_INT, PRIMITIVE_BYTE] - return_type: BUILTIN_VOID + return_type: PRIMITIVE_VOID ref: BUILTIN_JSRUNTIME_SET_ELEMENT_BYTE - callee: BUILTIN_JSRUNTIME method_name: setElementChar params: [BUILTIN_JSVALUE, PRIMITIVE_INT, PRIMITIVE_CHAR] - return_type: BUILTIN_VOID + return_type: PRIMITIVE_VOID ref: BUILTIN_JSRUNTIME_SET_ELEMENT_CHAR - callee: BUILTIN_JSRUNTIME method_name: setElementShort params: [BUILTIN_JSVALUE, PRIMITIVE_INT, PRIMITIVE_SHORT] - return_type: BUILTIN_VOID + return_type: PRIMITIVE_VOID ref: BUILTIN_JSRUNTIME_SET_ELEMENT_SHORT - callee: BUILTIN_JSRUNTIME method_name: setElementInt params: [BUILTIN_JSVALUE, PRIMITIVE_INT, PRIMITIVE_INT] - return_type: BUILTIN_VOID + return_type: PRIMITIVE_VOID ref: BUILTIN_JSRUNTIME_SET_ELEMENT_INT - callee: BUILTIN_JSRUNTIME method_name: setElementLong params: [BUILTIN_JSVALUE, PRIMITIVE_INT, PRIMITIVE_LONG] - return_type: BUILTIN_VOID + return_type: PRIMITIVE_VOID ref: BUILTIN_JSRUNTIME_SET_ELEMENT_LONG - callee: BUILTIN_JSRUNTIME method_name: setElementFloat params: [BUILTIN_JSVALUE, PRIMITIVE_INT, PRIMITIVE_FLOAT] - return_type: BUILTIN_VOID + return_type: PRIMITIVE_VOID ref: BUILTIN_JSRUNTIME_SET_ELEMENT_FLOAT - callee: BUILTIN_JSRUNTIME method_name: setElementDouble params: [BUILTIN_JSVALUE, PRIMITIVE_INT, PRIMITIVE_DOUBLE] - return_type: BUILTIN_VOID + return_type: PRIMITIVE_VOID ref: BUILTIN_JSRUNTIME_SET_ELEMENT_DOUBLE - callee: BUILTIN_JSRUNTIME method_name: setElementJSValue params: [BUILTIN_JSVALUE, PRIMITIVE_INT, BUILTIN_JSVALUE] - return_type: BUILTIN_VOID + return_type: PRIMITIVE_VOID ref: BUILTIN_JSRUNTIME_SET_ELEMENT_JSVALUE - callee: BUILTIN_JSRUNTIME method_name: __initJSCallClass params: [BUILTIN_STRING] - return_type: BUILTIN_VOID + return_type: PRIMITIVE_VOID ref: BUILTIN_JSRUNTIME_INIT_DYNAMIC_CALL_CLASS - callee: BUILTIN_JSRUNTIME method_name: __initJSNewClass params: [BUILTIN_STRING] - return_type: BUILTIN_VOID + return_type: PRIMITIVE_VOID ref: BUILTIN_JSRUNTIME_INIT_DYNAMIC_NEW_CLASS - callee: BUILTIN_JSRUNTIME @@ -1039,7 +1038,7 @@ signatures: - callee: BUILTIN_JSRUNTIME method_name: loadModule params: [BUILTIN_STRING] - return_type: BUILTIN_VOID + return_type: PRIMITIVE_VOID ref: BUILTIN_JSRUNTIME_LOAD_MODULE - callee: BUILTIN_JSRUNTIME @@ -1075,7 +1074,7 @@ signatures: - callee: BUILTIN_BOX method_name: set params: [BUILTIN_OBJECT] - return_type: BUILTIN_VOID + return_type: PRIMITIVE_VOID ref: BUILTIN_BOX_SET - callee: BUILTIN_BOOLEAN_BOX @@ -1093,7 +1092,7 @@ signatures: - callee: BUILTIN_BOOLEAN_BOX method_name: set params: [PRIMITIVE_BOOLEAN] - return_type: BUILTIN_VOID + return_type: PRIMITIVE_VOID ref: BUILTIN_BOOLEAN_BOX_SET - callee: BUILTIN_BYTE_BOX @@ -1111,7 +1110,7 @@ signatures: - callee: BUILTIN_BYTE_BOX method_name: set params: [PRIMITIVE_BYTE] - return_type: BUILTIN_VOID + return_type: PRIMITIVE_VOID ref: BUILTIN_BYTE_BOX_SET - callee: BUILTIN_CHAR_BOX @@ -1129,7 +1128,7 @@ signatures: - callee: BUILTIN_CHAR_BOX method_name: set params: [PRIMITIVE_CHAR] - return_type: BUILTIN_VOID + return_type: PRIMITIVE_VOID ref: BUILTIN_CHAR_BOX_SET - callee: BUILTIN_SHORT_BOX @@ -1147,7 +1146,7 @@ signatures: - callee: BUILTIN_SHORT_BOX method_name: set params: [PRIMITIVE_SHORT] - return_type: BUILTIN_VOID + return_type: PRIMITIVE_VOID ref: BUILTIN_SHORT_BOX_SET - callee: BUILTIN_INT_BOX @@ -1165,7 +1164,7 @@ signatures: - callee: BUILTIN_INT_BOX method_name: set params: [PRIMITIVE_INT] - return_type: BUILTIN_VOID + return_type: PRIMITIVE_VOID ref: BUILTIN_INT_BOX_SET - callee: BUILTIN_LONG_BOX @@ -1183,7 +1182,7 @@ signatures: - callee: BUILTIN_LONG_BOX method_name: set params: [PRIMITIVE_LONG] - return_type: BUILTIN_VOID + return_type: PRIMITIVE_VOID ref: BUILTIN_LONG_BOX_SET - callee: BUILTIN_FLOAT_BOX @@ -1201,7 +1200,7 @@ signatures: - callee: BUILTIN_FLOAT_BOX method_name: set params: [PRIMITIVE_FLOAT] - return_type: BUILTIN_VOID + return_type: PRIMITIVE_VOID ref: BUILTIN_FLOAT_BOX_SET - callee: BUILTIN_DOUBLE_BOX @@ -1219,7 +1218,7 @@ signatures: - callee: BUILTIN_DOUBLE_BOX method_name: set params: [PRIMITIVE_DOUBLE] - return_type: BUILTIN_VOID + return_type: PRIMITIVE_VOID ref: BUILTIN_DOUBLE_BOX_SET - callee: BUILTIN_JSRUNTIME diff --git a/ets2panda/ir/ets/etsPrimitiveType.cpp b/ets2panda/ir/ets/etsPrimitiveType.cpp index 736f5bcd92b..b26cf4f46f9 100644 --- a/ets2panda/ir/ets/etsPrimitiveType.cpp +++ b/ets2panda/ir/ets/etsPrimitiveType.cpp @@ -126,6 +126,10 @@ checker::Type *ETSPrimitiveType::GetType([[maybe_unused]] checker::ETSChecker *c SetTsType(checker->GlobalCharType()); return TsType(); } + case PrimitiveType::VOID: { + SetTsType(checker->GlobalVoidType()); + return TsType(); + } default: { UNREACHABLE(); } diff --git a/ets2panda/ir/ets/etsTypeReferencePart.cpp b/ets2panda/ir/ets/etsTypeReferencePart.cpp index b79c49ae581..d6f1354b811 100644 --- a/ets2panda/ir/ets/etsTypeReferencePart.cpp +++ b/ets2panda/ir/ets/etsTypeReferencePart.cpp @@ -90,9 +90,18 @@ checker::Type *ETSTypeReferencePart::Check(checker::ETSChecker *checker) checker::Type *ETSTypeReferencePart::GetType(checker::ETSChecker *checker) { if (prev_ == nullptr) { - if ((name_->IsIdentifier()) && (name_->AsIdentifier()->Variable() != nullptr) && - (name_->AsIdentifier()->Variable()->Declaration()->IsTypeAliasDecl())) { - return checker->HandleTypeAlias(name_, typeParams_); + if (name_->IsIdentifier()) { + if ((name_->AsIdentifier()->Variable() != nullptr) && + (name_->AsIdentifier()->Variable()->Declaration()->IsTypeAliasDecl())) { + return checker->HandleTypeAlias(name_, typeParams_); + } + if (name_->AsIdentifier()->Name() == compiler::Signatures::UNDEFINED) { + return checker->GlobalETSUndefinedType(); + } + + if (name_->AsIdentifier()->Name() == compiler::Signatures::NULL_LITERAL) { + return checker->GlobalETSNullType(); + } } checker::Type *baseType = checker->GetReferencedTypeBase(name_); diff --git a/ets2panda/lexer/scripts/keywords.yaml b/ets2panda/lexer/scripts/keywords.yaml index e89b4ed2fba..9a09b235cdb 100644 --- a/ets2panda/lexer/scripts/keywords.yaml +++ b/ets2panda/lexer/scripts/keywords.yaml @@ -476,6 +476,7 @@ keywords: - name: 'void' token: KEYW_VOID keyword: [as, js, ts] + keyword_like: [ets] - name: 'while' token: KEYW_WHILE diff --git a/ets2panda/lexer/token/token.cpp b/ets2panda/lexer/token/token.cpp index 218f76987a9..9fd44ee81fd 100644 --- a/ets2panda/lexer/token/token.cpp +++ b/ets2panda/lexer/token/token.cpp @@ -113,6 +113,7 @@ bool Token::IsDefinableTypeName() const case TokenType::KEYW_STRING: case TokenType::KEYW_NUMBER: case TokenType::KEYW_BIGINT: + case TokenType::KEYW_VOID: return true; default: return false; diff --git a/ets2panda/parser/ETSparser.cpp b/ets2panda/parser/ETSparser.cpp index a8f79c4290a..6c7fd22c29d 100644 --- a/ets2panda/parser/ETSparser.cpp +++ b/ets2panda/parser/ETSparser.cpp @@ -2559,6 +2559,34 @@ std::tuple ETSParser::Pars return {typeName, typeParamInst}; } +ir::TypeNode *ETSParser::ParseNullUndefinedAsTypeAnnotation(TypeAnnotationParsingOptions *options) +{ + ir::Expression *expr = AllocNode(Lexer()->GetToken().Ident(), Allocator()); + expr->AsIdentifier()->SetReference(); + expr->SetRange(Lexer()->GetToken().Loc()); + + auto *typeRefPart = AllocNode(expr, nullptr, nullptr); + + auto *typeReference = AllocNode(typeRefPart); + typeReference->SetRange({Lexer()->GetToken().Start(), Lexer()->GetToken().End()}); + + auto nullishFlag = Lexer()->GetToken().Type() == lexer::TokenType::LITERAL_NULL + ? ir::ModifierFlags::NULL_ASSIGNABLE + : ir::ModifierFlags::UNDEFINED_ASSIGNABLE; + + ir::TypeNode *typeAnnotation = typeReference; + + Lexer()->NextToken(); + if (((*options) & TypeAnnotationParsingOptions::DISALLOW_UNION) == 0 && + Lexer()->GetToken().Type() == lexer::TokenType::PUNCTUATOR_BITWISE_OR) { + Lexer()->NextToken(); + typeAnnotation = ParseTypeAnnotation(options); + } + + typeAnnotation->AddModifier(nullishFlag); + return typeAnnotation; +} + ir::TypeNode *ETSParser::ParseTypeReference(TypeAnnotationParsingOptions *options) { auto startPos = Lexer()->GetToken().Start(); @@ -2736,6 +2764,9 @@ ir::TypeNode *ETSParser::GetTypeAnnotationOfPrimitiveType([[maybe_unused]] lexer case lexer::TokenType::KEYW_LONG: typeAnnotation = ParsePrimitiveType(options, ir::PrimitiveType::LONG); break; + case lexer::TokenType::KEYW_VOID: + typeAnnotation = ParsePrimitiveType(options, ir::PrimitiveType::VOID); + break; default: typeAnnotation = ParseTypeReference(options); break; @@ -2871,6 +2902,15 @@ std::pair ETSParser::GetTypeAnnotationFromToken(TypeAnnota } break; } + case lexer::TokenType::KEYW_VOID: { + typeAnnotation = ParsePrimitiveType(options, ir::PrimitiveType::VOID); + break; + } + case lexer::TokenType::LITERAL_NULL: + case lexer::TokenType::KEYW_UNDEFINED: { + typeAnnotation = ParseNullUndefinedAsTypeAnnotation(options); + break; + } case lexer::TokenType::KEYW_BOOLEAN: { typeAnnotation = ParsePrimitiveType(options, ir::PrimitiveType::BOOLEAN); break; diff --git a/ets2panda/parser/ETSparser.h b/ets2panda/parser/ETSparser.h index e835291f8df..951cbab0525 100644 --- a/ets2panda/parser/ETSparser.h +++ b/ets2panda/parser/ETSparser.h @@ -184,6 +184,7 @@ private: ir::TypeNode *typeAnnotation); std::tuple ParseTypeReferencePart( TypeAnnotationParsingOptions *options); + ir::TypeNode *ParseNullUndefinedAsTypeAnnotation(TypeAnnotationParsingOptions *options); ir::TypeNode *ParseTypeReference(TypeAnnotationParsingOptions *options); ir::TypeNode *ParseBaseTypeReference(TypeAnnotationParsingOptions *options); ir::TypeNode *ParsePrimitiveType(TypeAnnotationParsingOptions *options, ir::PrimitiveType type); diff --git a/ets2panda/test/compiler/ets/FunctionType1-expected.txt b/ets2panda/test/compiler/ets/FunctionType1-expected.txt index eb64020f40e..198d23dd269 100644 --- a/ets2panda/test/compiler/ets/FunctionType1-expected.txt +++ b/ets2panda/test/compiler/ets/FunctionType1-expected.txt @@ -539,35 +539,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 30 - }, - "end": { - "line": 16, - "column": 34 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 30 - }, - "end": { - "line": 16, - "column": 35 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -575,7 +547,7 @@ }, "end": { "line": 16, - "column": 35 + "column": 34 } } }, @@ -586,7 +558,7 @@ }, "end": { "line": 16, - "column": 35 + "column": 34 } } }, @@ -599,7 +571,7 @@ }, "end": { "line": 16, - "column": 35 + "column": 34 } } }, @@ -649,35 +621,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -685,7 +629,7 @@ }, "end": { "line": 22, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/FunctionType2-expected.txt b/ets2panda/test/compiler/ets/FunctionType2-expected.txt index 1dcaa7ce18c..cebe2305749 100644 --- a/ets2panda/test/compiler/ets/FunctionType2-expected.txt +++ b/ets2panda/test/compiler/ets/FunctionType2-expected.txt @@ -447,35 +447,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 48 - }, - "end": { - "line": 18, - "column": 52 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 48 - }, - "end": { - "line": 18, - "column": 54 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -483,7 +455,7 @@ }, "end": { "line": 18, - "column": 54 + "column": 52 } } }, @@ -582,35 +554,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -618,7 +562,7 @@ }, "end": { "line": 22, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/FunctionType3-expected.txt b/ets2panda/test/compiler/ets/FunctionType3-expected.txt index bbb4c6e27b1..ff2007a4838 100644 --- a/ets2panda/test/compiler/ets/FunctionType3-expected.txt +++ b/ets2panda/test/compiler/ets/FunctionType3-expected.txt @@ -226,35 +226,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 31 - }, - "end": { - "line": 16, - "column": 35 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 31 - }, - "end": { - "line": 16, - "column": 36 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -262,7 +234,7 @@ }, "end": { "line": 16, - "column": 36 + "column": 35 } } }, @@ -273,7 +245,7 @@ }, "end": { "line": 16, - "column": 36 + "column": 35 } } }, @@ -286,7 +258,7 @@ }, "end": { "line": 16, - "column": 36 + "column": 35 } } }, @@ -422,35 +394,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 39 - }, - "end": { - "line": 18, - "column": 43 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 39 - }, - "end": { - "line": 18, - "column": 45 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -458,7 +402,7 @@ }, "end": { "line": 18, - "column": 45 + "column": 43 } } }, @@ -469,7 +413,7 @@ }, "end": { "line": 18, - "column": 45 + "column": 43 } } }, @@ -597,35 +541,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -633,7 +549,7 @@ }, "end": { "line": 22, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/FunctionType4-expected.txt b/ets2panda/test/compiler/ets/FunctionType4-expected.txt index 8927a880696..fc04e6d7dbb 100644 --- a/ets2panda/test/compiler/ets/FunctionType4-expected.txt +++ b/ets2panda/test/compiler/ets/FunctionType4-expected.txt @@ -790,35 +790,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 30, - "column": 18 - }, - "end": { - "line": 30, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 30, - "column": 18 - }, - "end": { - "line": 30, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 30, @@ -826,7 +798,7 @@ }, "end": { "line": 30, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/FunctionType6-expected.txt b/ets2panda/test/compiler/ets/FunctionType6-expected.txt index 909ce83c37a..8f3f7841215 100644 --- a/ets2panda/test/compiler/ets/FunctionType6-expected.txt +++ b/ets2panda/test/compiler/ets/FunctionType6-expected.txt @@ -110,35 +110,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 16 - }, - "end": { - "line": 17, - "column": 20 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 16 - }, - "end": { - "line": 17, - "column": 22 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -146,7 +118,7 @@ }, "end": { "line": 17, - "column": 22 + "column": 20 } } }, diff --git a/ets2panda/test/compiler/ets/FunctionType7-expected.txt b/ets2panda/test/compiler/ets/FunctionType7-expected.txt index f249b8d2014..7da21e6c03d 100644 --- a/ets2panda/test/compiler/ets/FunctionType7-expected.txt +++ b/ets2panda/test/compiler/ets/FunctionType7-expected.txt @@ -110,35 +110,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 16 - }, - "end": { - "line": 17, - "column": 20 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 16 - }, - "end": { - "line": 17, - "column": 22 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -146,7 +118,7 @@ }, "end": { "line": 17, - "column": 22 + "column": 20 } } }, @@ -476,35 +448,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -512,7 +456,7 @@ }, "end": { "line": 22, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/FunctionType8-expected.txt b/ets2panda/test/compiler/ets/FunctionType8-expected.txt index 24672008818..899a7907595 100644 --- a/ets2panda/test/compiler/ets/FunctionType8-expected.txt +++ b/ets2panda/test/compiler/ets/FunctionType8-expected.txt @@ -151,35 +151,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 23 - }, - "end": { - "line": 18, - "column": 27 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 23 - }, - "end": { - "line": 18, - "column": 29 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -187,7 +159,7 @@ }, "end": { "line": 18, - "column": 29 + "column": 27 } } }, @@ -393,35 +365,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 27 - }, - "end": { - "line": 22, - "column": 31 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 27 - }, - "end": { - "line": 22, - "column": 33 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -429,7 +373,7 @@ }, "end": { "line": 22, - "column": 33 + "column": 31 } } }, @@ -440,7 +384,7 @@ }, "end": { "line": 22, - "column": 33 + "column": 31 } } }, @@ -722,35 +666,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 26, - "column": 16 - }, - "end": { - "line": 26, - "column": 20 - } - } - }, - "loc": { - "start": { - "line": 26, - "column": 16 - }, - "end": { - "line": 26, - "column": 22 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 26, @@ -758,7 +674,7 @@ }, "end": { "line": 26, - "column": 22 + "column": 20 } } }, @@ -923,35 +839,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 30, - "column": 19 - }, - "end": { - "line": 30, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 30, - "column": 19 - }, - "end": { - "line": 30, - "column": 25 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 30, @@ -959,7 +847,7 @@ }, "end": { "line": 30, - "column": 25 + "column": 23 } } }, @@ -970,7 +858,7 @@ }, "end": { "line": 30, - "column": 25 + "column": 23 } } }, @@ -1264,35 +1152,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 33, - "column": 18 - }, - "end": { - "line": 33, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 33, - "column": 18 - }, - "end": { - "line": 33, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 33, @@ -1300,7 +1160,7 @@ }, "end": { "line": 33, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/FunctionType9-expected.txt b/ets2panda/test/compiler/ets/FunctionType9-expected.txt index e6dafbd1aed..89ae3bf0cf0 100644 --- a/ets2panda/test/compiler/ets/FunctionType9-expected.txt +++ b/ets2panda/test/compiler/ets/FunctionType9-expected.txt @@ -110,35 +110,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 16 - }, - "end": { - "line": 18, - "column": 20 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 16 - }, - "end": { - "line": 18, - "column": 22 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -146,7 +118,7 @@ }, "end": { "line": 18, - "column": 22 + "column": 20 } } }, @@ -283,35 +255,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 27 - }, - "end": { - "line": 22, - "column": 31 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 27 - }, - "end": { - "line": 22, - "column": 33 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -319,7 +263,7 @@ }, "end": { "line": 22, - "column": 33 + "column": 31 } } }, @@ -330,7 +274,7 @@ }, "end": { "line": 22, - "column": 33 + "column": 31 } } }, @@ -624,35 +568,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 25, - "column": 18 - }, - "end": { - "line": 25, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 25, - "column": 18 - }, - "end": { - "line": 25, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 25, @@ -660,7 +576,7 @@ }, "end": { "line": 25, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/StructTest1-expected.txt b/ets2panda/test/compiler/ets/StructTest1-expected.txt index 50b26e47666..591b083f381 100644 --- a/ets2panda/test/compiler/ets/StructTest1-expected.txt +++ b/ets2panda/test/compiler/ets/StructTest1-expected.txt @@ -949,35 +949,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 27, - "column": 18 - }, - "end": { - "line": 27, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 27, - "column": 18 - }, - "end": { - "line": 27, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 27, @@ -985,7 +957,7 @@ }, "end": { "line": 27, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/StructTest2-expected.txt b/ets2panda/test/compiler/ets/StructTest2-expected.txt index 5e9b0511ba8..10873cd404f 100644 --- a/ets2panda/test/compiler/ets/StructTest2-expected.txt +++ b/ets2panda/test/compiler/ets/StructTest2-expected.txt @@ -1034,35 +1034,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 27, - "column": 18 - }, - "end": { - "line": 27, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 27, - "column": 18 - }, - "end": { - "line": 27, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 27, @@ -1070,7 +1042,7 @@ }, "end": { "line": 27, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/abstractMethodDeclaredInParentClass-expected.txt b/ets2panda/test/compiler/ets/abstractMethodDeclaredInParentClass-expected.txt index 6410ff6e469..d6f185f73fa 100644 --- a/ets2panda/test/compiler/ets/abstractMethodDeclaredInParentClass-expected.txt +++ b/ets2panda/test/compiler/ets/abstractMethodDeclaredInParentClass-expected.txt @@ -205,35 +205,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -241,7 +213,7 @@ }, "end": { "line": 17, - "column": 24 + "column": 22 } } }, @@ -560,35 +532,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 31 - }, - "end": { - "line": 20, - "column": 35 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 31 - }, - "end": { - "line": 20, - "column": 36 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -596,7 +540,7 @@ }, "end": { "line": 20, - "column": 36 + "column": 35 } } }, @@ -723,35 +667,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 28 - }, - "end": { - "line": 24, - "column": 32 - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 28 - }, - "end": { - "line": 24, - "column": 34 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -759,7 +675,7 @@ }, "end": { "line": 24, - "column": 34 + "column": 32 } } }, @@ -1242,35 +1158,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 34, - "column": 29 - }, - "end": { - "line": 34, - "column": 33 - } - } - }, - "loc": { - "start": { - "line": 34, - "column": 29 - }, - "end": { - "line": 34, - "column": 34 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 34, @@ -1278,7 +1166,7 @@ }, "end": { "line": 34, - "column": 34 + "column": 33 } } }, @@ -1290,7 +1178,7 @@ }, "end": { "line": 34, - "column": 34 + "column": 33 } } }, @@ -1301,7 +1189,7 @@ }, "end": { "line": 34, - "column": 34 + "column": 33 } } }, @@ -1466,35 +1354,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 38, - "column": 28 - }, - "end": { - "line": 38, - "column": 32 - } - } - }, - "loc": { - "start": { - "line": 38, - "column": 28 - }, - "end": { - "line": 38, - "column": 33 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 38, @@ -1502,7 +1362,7 @@ }, "end": { "line": 38, - "column": 33 + "column": 32 } } }, @@ -1629,35 +1489,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 39, - "column": 19 - }, - "end": { - "line": 39, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 39, - "column": 19 - }, - "end": { - "line": 39, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 39, @@ -1665,7 +1497,7 @@ }, "end": { "line": 39, - "column": 24 + "column": 23 } } }, @@ -2024,35 +1856,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 45, - "column": 29 - }, - "end": { - "line": 45, - "column": 33 - } - } - }, - "loc": { - "start": { - "line": 45, - "column": 29 - }, - "end": { - "line": 45, - "column": 34 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 45, @@ -2060,7 +1864,7 @@ }, "end": { "line": 45, - "column": 34 + "column": 33 } } }, @@ -2322,35 +2126,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 51, - "column": 19 - }, - "end": { - "line": 51, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 51, - "column": 19 - }, - "end": { - "line": 51, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 51, @@ -2358,7 +2134,7 @@ }, "end": { "line": 51, - "column": 24 + "column": 23 } } }, @@ -2370,7 +2146,7 @@ }, "end": { "line": 51, - "column": 24 + "column": 23 } } }, @@ -2381,7 +2157,7 @@ }, "end": { "line": 51, - "column": 24 + "column": 23 } } }, @@ -2695,35 +2471,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 55, - "column": 31 - }, - "end": { - "line": 55, - "column": 35 - } - } - }, - "loc": { - "start": { - "line": 55, - "column": 31 - }, - "end": { - "line": 55, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 55, @@ -2731,7 +2479,7 @@ }, "end": { "line": 55, - "column": 37 + "column": 35 } } }, diff --git a/ets2panda/test/compiler/ets/abstractNewClassInstanceExpression-expected.txt b/ets2panda/test/compiler/ets/abstractNewClassInstanceExpression-expected.txt index d2a660f61fd..6ec840ffe76 100644 --- a/ets2panda/test/compiler/ets/abstractNewClassInstanceExpression-expected.txt +++ b/ets2panda/test/compiler/ets/abstractNewClassInstanceExpression-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 21 - }, - "end": { - "line": 17, - "column": 25 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 21 - }, - "end": { - "line": 17, - "column": 26 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 26 + "column": 25 } } }, @@ -583,35 +555,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 26, - "column": 25 - }, - "end": { - "line": 26, - "column": 29 - } - } - }, - "loc": { - "start": { - "line": 26, - "column": 25 - }, - "end": { - "line": 26, - "column": 31 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 26, @@ -619,7 +563,7 @@ }, "end": { "line": 26, - "column": 31 + "column": 29 } } }, diff --git a/ets2panda/test/compiler/ets/arrowFunctionCapture-expected.txt b/ets2panda/test/compiler/ets/arrowFunctionCapture-expected.txt index 59ec0095266..f5299a0b136 100644 --- a/ets2panda/test/compiler/ets/arrowFunctionCapture-expected.txt +++ b/ets2panda/test/compiler/ets/arrowFunctionCapture-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 12 - }, - "end": { - "line": 17, - "column": 16 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 12 - }, - "end": { - "line": 17, - "column": 17 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 17 + "column": 16 } } }, @@ -245,35 +217,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 19 - }, - "end": { - "line": 18, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 19 - }, - "end": { - "line": 18, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -281,7 +225,7 @@ }, "end": { "line": 18, - "column": 24 + "column": 23 } } }, @@ -342,35 +286,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 32 - }, - "end": { - "line": 19, - "column": 36 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 32 - }, - "end": { - "line": 19, - "column": 38 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -378,7 +294,7 @@ }, "end": { "line": 19, - "column": 38 + "column": 36 } } }, @@ -389,7 +305,7 @@ }, "end": { "line": 19, - "column": 38 + "column": 36 } } }, @@ -457,35 +373,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 50 - }, - "end": { - "line": 19, - "column": 54 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 50 - }, - "end": { - "line": 19, - "column": 57 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -493,7 +381,7 @@ }, "end": { "line": 19, - "column": 57 + "column": 54 } } }, diff --git a/ets2panda/test/compiler/ets/boxingConversion1-expected.txt b/ets2panda/test/compiler/ets/boxingConversion1-expected.txt index bf84cbaee19..243da03902d 100644 --- a/ets2panda/test/compiler/ets/boxingConversion1-expected.txt +++ b/ets2panda/test/compiler/ets/boxingConversion1-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 19 - }, - "end": { - "line": 16, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 19 - }, - "end": { - "line": 16, - "column": 25 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 25 + "column": 23 } } }, diff --git a/ets2panda/test/compiler/ets/boxingConversion2-expected.txt b/ets2panda/test/compiler/ets/boxingConversion2-expected.txt index 910dc2a60eb..eb781cd47de 100644 --- a/ets2panda/test/compiler/ets/boxingConversion2-expected.txt +++ b/ets2panda/test/compiler/ets/boxingConversion2-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 19 - }, - "end": { - "line": 16, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 19 - }, - "end": { - "line": 16, - "column": 25 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 25 + "column": 23 } } }, diff --git a/ets2panda/test/compiler/ets/boxingConversion3-expected.txt b/ets2panda/test/compiler/ets/boxingConversion3-expected.txt index a018b02b0bf..95995a81688 100644 --- a/ets2panda/test/compiler/ets/boxingConversion3-expected.txt +++ b/ets2panda/test/compiler/ets/boxingConversion3-expected.txt @@ -204,35 +204,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 27 - }, - "end": { - "line": 16, - "column": 31 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 27 - }, - "end": { - "line": 16, - "column": 33 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -240,7 +212,7 @@ }, "end": { "line": 16, - "column": 33 + "column": 31 } } }, @@ -601,35 +573,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 18 - }, - "end": { - "line": 24, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 18 - }, - "end": { - "line": 24, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -637,7 +581,7 @@ }, "end": { "line": 24, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/boxingConversion4-expected.txt b/ets2panda/test/compiler/ets/boxingConversion4-expected.txt index f102d6aa27c..350be7c55e6 100644 --- a/ets2panda/test/compiler/ets/boxingConversion4-expected.txt +++ b/ets2panda/test/compiler/ets/boxingConversion4-expected.txt @@ -232,35 +232,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 26 - }, - "end": { - "line": 16, - "column": 30 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 26 - }, - "end": { - "line": 16, - "column": 32 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -268,7 +240,7 @@ }, "end": { "line": 16, - "column": 32 + "column": 30 } } }, @@ -367,35 +339,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 19 - }, - "end": { - "line": 18, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 19 - }, - "end": { - "line": 18, - "column": 25 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -403,7 +347,7 @@ }, "end": { "line": 18, - "column": 25 + "column": 23 } } }, diff --git a/ets2panda/test/compiler/ets/boxingUnboxingExpressions-expected.txt b/ets2panda/test/compiler/ets/boxingUnboxingExpressions-expected.txt index 8d1bfab3969..2d9aac6a3e1 100644 --- a/ets2panda/test/compiler/ets/boxingUnboxingExpressions-expected.txt +++ b/ets2panda/test/compiler/ets/boxingUnboxingExpressions-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 12 - }, - "end": { - "line": 17, - "column": 16 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 12 - }, - "end": { - "line": 17, - "column": 17 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 17 + "column": 16 } } }, @@ -2568,35 +2540,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 42, - "column": 35 - }, - "end": { - "line": 42, - "column": 39 - } - } - }, - "loc": { - "start": { - "line": 42, - "column": 35 - }, - "end": { - "line": 42, - "column": 41 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 42, @@ -2604,7 +2548,7 @@ }, "end": { "line": 42, - "column": 41 + "column": 39 } } }, @@ -2773,35 +2717,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 43, - "column": 35 - }, - "end": { - "line": 43, - "column": 39 - } - } - }, - "loc": { - "start": { - "line": 43, - "column": 35 - }, - "end": { - "line": 43, - "column": 41 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 43, @@ -2809,7 +2725,7 @@ }, "end": { "line": 43, - "column": 41 + "column": 39 } } }, @@ -2950,35 +2866,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 44, - "column": 29 - }, - "end": { - "line": 44, - "column": 33 - } - } - }, - "loc": { - "start": { - "line": 44, - "column": 29 - }, - "end": { - "line": 44, - "column": 35 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 44, @@ -2986,7 +2874,7 @@ }, "end": { "line": 44, - "column": 35 + "column": 33 } } }, @@ -3155,35 +3043,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 45, - "column": 29 - }, - "end": { - "line": 45, - "column": 33 - } - } - }, - "loc": { - "start": { - "line": 45, - "column": 29 - }, - "end": { - "line": 45, - "column": 35 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 45, @@ -3191,7 +3051,7 @@ }, "end": { "line": 45, - "column": 35 + "column": 33 } } }, @@ -3332,35 +3192,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 46, - "column": 31 - }, - "end": { - "line": 46, - "column": 35 - } - } - }, - "loc": { - "start": { - "line": 46, - "column": 31 - }, - "end": { - "line": 46, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 46, @@ -3368,7 +3200,7 @@ }, "end": { "line": 46, - "column": 37 + "column": 35 } } }, @@ -3537,35 +3369,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 47, - "column": 31 - }, - "end": { - "line": 47, - "column": 35 - } - } - }, - "loc": { - "start": { - "line": 47, - "column": 31 - }, - "end": { - "line": 47, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 47, @@ -3573,7 +3377,7 @@ }, "end": { "line": 47, - "column": 37 + "column": 35 } } }, @@ -3714,35 +3518,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 48, - "column": 29 - }, - "end": { - "line": 48, - "column": 33 - } - } - }, - "loc": { - "start": { - "line": 48, - "column": 29 - }, - "end": { - "line": 48, - "column": 35 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 48, @@ -3750,7 +3526,7 @@ }, "end": { "line": 48, - "column": 35 + "column": 33 } } }, @@ -3919,35 +3695,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 49, - "column": 29 - }, - "end": { - "line": 49, - "column": 33 - } - } - }, - "loc": { - "start": { - "line": 49, - "column": 29 - }, - "end": { - "line": 49, - "column": 35 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 49, @@ -3955,7 +3703,7 @@ }, "end": { "line": 49, - "column": 35 + "column": 33 } } }, @@ -4096,35 +3844,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 50, - "column": 31 - }, - "end": { - "line": 50, - "column": 35 - } - } - }, - "loc": { - "start": { - "line": 50, - "column": 31 - }, - "end": { - "line": 50, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 50, @@ -4132,7 +3852,7 @@ }, "end": { "line": 50, - "column": 37 + "column": 35 } } }, @@ -4301,35 +4021,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 51, - "column": 31 - }, - "end": { - "line": 51, - "column": 35 - } - } - }, - "loc": { - "start": { - "line": 51, - "column": 31 - }, - "end": { - "line": 51, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 51, @@ -4337,7 +4029,7 @@ }, "end": { "line": 51, - "column": 37 + "column": 35 } } }, @@ -4478,35 +4170,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 52, - "column": 29 - }, - "end": { - "line": 52, - "column": 33 - } - } - }, - "loc": { - "start": { - "line": 52, - "column": 29 - }, - "end": { - "line": 52, - "column": 35 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 52, @@ -4514,7 +4178,7 @@ }, "end": { "line": 52, - "column": 35 + "column": 33 } } }, @@ -4683,35 +4347,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 53, - "column": 29 - }, - "end": { - "line": 53, - "column": 33 - } - } - }, - "loc": { - "start": { - "line": 53, - "column": 29 - }, - "end": { - "line": 53, - "column": 35 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 53, @@ -4719,7 +4355,7 @@ }, "end": { "line": 53, - "column": 35 + "column": 33 } } }, @@ -4860,35 +4496,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 54, - "column": 31 - }, - "end": { - "line": 54, - "column": 35 - } - } - }, - "loc": { - "start": { - "line": 54, - "column": 31 - }, - "end": { - "line": 54, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 54, @@ -4896,7 +4504,7 @@ }, "end": { "line": 54, - "column": 37 + "column": 35 } } }, @@ -5065,35 +4673,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 55, - "column": 31 - }, - "end": { - "line": 55, - "column": 35 - } - } - }, - "loc": { - "start": { - "line": 55, - "column": 31 - }, - "end": { - "line": 55, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 55, @@ -5101,7 +4681,7 @@ }, "end": { "line": 55, - "column": 37 + "column": 35 } } }, @@ -5242,35 +4822,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 56, - "column": 33 - }, - "end": { - "line": 56, - "column": 37 - } - } - }, - "loc": { - "start": { - "line": 56, - "column": 33 - }, - "end": { - "line": 56, - "column": 39 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 56, @@ -5278,7 +4830,7 @@ }, "end": { "line": 56, - "column": 39 + "column": 37 } } }, @@ -5447,35 +4999,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 57, - "column": 33 - }, - "end": { - "line": 57, - "column": 37 - } - } - }, - "loc": { - "start": { - "line": 57, - "column": 33 - }, - "end": { - "line": 57, - "column": 39 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 57, @@ -5483,7 +5007,7 @@ }, "end": { "line": 57, - "column": 39 + "column": 37 } } }, @@ -5582,35 +5106,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 59, - "column": 16 - }, - "end": { - "line": 59, - "column": 20 - } - } - }, - "loc": { - "start": { - "line": 59, - "column": 16 - }, - "end": { - "line": 59, - "column": 22 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 59, @@ -5618,7 +5114,7 @@ }, "end": { "line": 59, - "column": 22 + "column": 20 } } }, diff --git a/ets2panda/test/compiler/ets/catch-soft-keyword-expected.txt b/ets2panda/test/compiler/ets/catch-soft-keyword-expected.txt index 0e009bbbadc..c08235ad17e 100644 --- a/ets2panda/test/compiler/ets/catch-soft-keyword-expected.txt +++ b/ets2panda/test/compiler/ets/catch-soft-keyword-expected.txt @@ -205,35 +205,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 12 - }, - "end": { - "line": 20, - "column": 16 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 12 - }, - "end": { - "line": 20, - "column": 18 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -241,7 +213,7 @@ }, "end": { "line": 20, - "column": 18 + "column": 16 } } }, @@ -571,35 +543,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 17 - }, - "end": { - "line": 23, - "column": 21 - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 17 - }, - "end": { - "line": 23, - "column": 23 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -607,7 +551,7 @@ }, "end": { "line": 23, - "column": 23 + "column": 21 } } }, diff --git a/ets2panda/test/compiler/ets/catchParamScope-expected.txt b/ets2panda/test/compiler/ets/catchParamScope-expected.txt index 76eb7133ca5..482075c4b5c 100644 --- a/ets2panda/test/compiler/ets/catchParamScope-expected.txt +++ b/ets2panda/test/compiler/ets/catchParamScope-expected.txt @@ -232,35 +232,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 33 - }, - "end": { - "line": 16, - "column": 37 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 33 - }, - "end": { - "line": 16, - "column": 39 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -268,7 +240,7 @@ }, "end": { "line": 16, - "column": 39 + "column": 37 } } }, @@ -367,35 +339,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 18 - }, - "end": { - "line": 19, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 18 - }, - "end": { - "line": 19, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -403,7 +347,7 @@ }, "end": { "line": 19, - "column": 24 + "column": 22 } } }, @@ -422,35 +366,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 19 - }, - "end": { - "line": 20, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 19 - }, - "end": { - "line": 20, - "column": 25 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -458,7 +374,7 @@ }, "end": { "line": 20, - "column": 25 + "column": 23 } } }, @@ -469,7 +385,7 @@ }, "end": { "line": 20, - "column": 25 + "column": 23 } } }, @@ -495,35 +411,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 30 - }, - "end": { - "line": 20, - "column": 34 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 30 - }, - "end": { - "line": 20, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -531,7 +419,7 @@ }, "end": { "line": 20, - "column": 37 + "column": 34 } } }, diff --git a/ets2panda/test/compiler/ets/conversion-w-ASExpr-expected.txt b/ets2panda/test/compiler/ets/conversion-w-ASExpr-expected.txt index 29be34d68b1..db7fce781e0 100644 --- a/ets2panda/test/compiler/ets/conversion-w-ASExpr-expected.txt +++ b/ets2panda/test/compiler/ets/conversion-w-ASExpr-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/conversion_Double-to-Int_typeerror-expected.txt b/ets2panda/test/compiler/ets/conversion_Double-to-Int_typeerror-expected.txt index b4bf32c6330..ed428dd340e 100644 --- a/ets2panda/test/compiler/ets/conversion_Double-to-Int_typeerror-expected.txt +++ b/ets2panda/test/compiler/ets/conversion_Double-to-Int_typeerror-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/conversion_Double-to-Int_w_try_stmt_typerror-expected.txt b/ets2panda/test/compiler/ets/conversion_Double-to-Int_w_try_stmt_typerror-expected.txt index 34209cbf2af..8fb5fafeb25 100644 --- a/ets2panda/test/compiler/ets/conversion_Double-to-Int_w_try_stmt_typerror-expected.txt +++ b/ets2panda/test/compiler/ets/conversion_Double-to-Int_w_try_stmt_typerror-expected.txt @@ -594,35 +594,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -630,7 +602,7 @@ }, "end": { "line": 22, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/conversion_Int-to-Double_typeerror-expected.txt b/ets2panda/test/compiler/ets/conversion_Int-to-Double_typeerror-expected.txt index af949c27061..50e5de56a88 100644 --- a/ets2panda/test/compiler/ets/conversion_Int-to-Double_typeerror-expected.txt +++ b/ets2panda/test/compiler/ets/conversion_Int-to-Double_typeerror-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/conversion_call-context_Int-to-Double_typeerror-expected.txt b/ets2panda/test/compiler/ets/conversion_call-context_Int-to-Double_typeerror-expected.txt index b811e85e80a..0bbc7d401bf 100644 --- a/ets2panda/test/compiler/ets/conversion_call-context_Int-to-Double_typeerror-expected.txt +++ b/ets2panda/test/compiler/ets/conversion_call-context_Int-to-Double_typeerror-expected.txt @@ -326,35 +326,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -362,7 +334,7 @@ }, "end": { "line": 18, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/conversion_w_functions-expected.txt b/ets2panda/test/compiler/ets/conversion_w_functions-expected.txt index aa6b186a078..6aa13d2cd9b 100644 --- a/ets2panda/test/compiler/ets/conversion_w_functions-expected.txt +++ b/ets2panda/test/compiler/ets/conversion_w_functions-expected.txt @@ -3378,35 +3378,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 76, - "column": 18 - }, - "end": { - "line": 76, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 76, - "column": 18 - }, - "end": { - "line": 76, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 76, @@ -3414,7 +3386,7 @@ }, "end": { "line": 76, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/conversion_w_functions_w_try-stmts-expected.txt b/ets2panda/test/compiler/ets/conversion_w_functions_w_try-stmts-expected.txt index 9e783ed3102..2a4e55b60d4 100644 --- a/ets2panda/test/compiler/ets/conversion_w_functions_w_try-stmts-expected.txt +++ b/ets2panda/test/compiler/ets/conversion_w_functions_w_try-stmts-expected.txt @@ -469,35 +469,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 80, - "column": 18 - }, - "end": { - "line": 80, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 80, - "column": 18 - }, - "end": { - "line": 80, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 80, @@ -505,7 +477,7 @@ }, "end": { "line": 80, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/forUpdate-expected.txt b/ets2panda/test/compiler/ets/forUpdate-expected.txt index ac8cf73a20f..d5967be06ed 100644 --- a/ets2panda/test/compiler/ets/forUpdate-expected.txt +++ b/ets2panda/test/compiler/ets/forUpdate-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -198,7 +170,7 @@ }, "end": { "line": 17, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/forUpdateCharType-expected.txt b/ets2panda/test/compiler/ets/forUpdateCharType-expected.txt index f7d82fe267e..842beaa2d92 100644 --- a/ets2panda/test/compiler/ets/forUpdateCharType-expected.txt +++ b/ets2panda/test/compiler/ets/forUpdateCharType-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/for_of_missing_iterator_type-expected.txt b/ets2panda/test/compiler/ets/for_of_missing_iterator_type-expected.txt index e2347bad084..134fb9bdd56 100644 --- a/ets2panda/test/compiler/ets/for_of_missing_iterator_type-expected.txt +++ b/ets2panda/test/compiler/ets/for_of_missing_iterator_type-expected.txt @@ -159,35 +159,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 16 - }, - "end": { - "line": 20, - "column": 20 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 16 - }, - "end": { - "line": 20, - "column": 22 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -195,7 +167,7 @@ }, "end": { "line": 20, - "column": 22 + "column": 20 } } }, @@ -829,35 +801,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 28, - "column": 18 - }, - "end": { - "line": 28, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 28, - "column": 18 - }, - "end": { - "line": 28, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 28, @@ -865,7 +809,7 @@ }, "end": { "line": 28, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/from-soft-keyword-0-expected.txt b/ets2panda/test/compiler/ets/from-soft-keyword-0-expected.txt index 3bbcd11e33e..5ceff9ec7fd 100644 --- a/ets2panda/test/compiler/ets/from-soft-keyword-0-expected.txt +++ b/ets2panda/test/compiler/ets/from-soft-keyword-0-expected.txt @@ -311,35 +311,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 13 - }, - "end": { - "line": 23, - "column": 17 - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 13 - }, - "end": { - "line": 23, - "column": 19 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -347,7 +319,7 @@ }, "end": { "line": 23, - "column": 19 + "column": 17 } } }, @@ -677,35 +649,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 26, - "column": 18 - }, - "end": { - "line": 26, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 26, - "column": 18 - }, - "end": { - "line": 26, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 26, @@ -713,7 +657,7 @@ }, "end": { "line": 26, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/from-soft-keyword-1-expected.txt b/ets2panda/test/compiler/ets/from-soft-keyword-1-expected.txt index b4fdc70d8e2..1ca8f280433 100644 --- a/ets2panda/test/compiler/ets/from-soft-keyword-1-expected.txt +++ b/ets2panda/test/compiler/ets/from-soft-keyword-1-expected.txt @@ -261,35 +261,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 27 - }, - "end": { - "line": 18, - "column": 31 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 27 - }, - "end": { - "line": 18, - "column": 33 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -297,7 +269,7 @@ }, "end": { "line": 18, - "column": 33 + "column": 31 } } }, @@ -396,35 +368,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -432,7 +376,7 @@ }, "end": { "line": 20, - "column": 24 + "column": 22 } } }, @@ -493,35 +437,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 31 - }, - "end": { - "line": 21, - "column": 35 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 31 - }, - "end": { - "line": 21, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -529,7 +445,7 @@ }, "end": { "line": 21, - "column": 37 + "column": 35 } } }, @@ -540,7 +456,7 @@ }, "end": { "line": 21, - "column": 37 + "column": 35 } } }, 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 c57f16ebaf2..c384a09df25 100644 --- a/ets2panda/test/compiler/ets/from-soft-keyword-2-expected.txt +++ b/ets2panda/test/compiler/ets/from-soft-keyword-2-expected.txt @@ -399,35 +399,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -435,7 +407,7 @@ }, "end": { "line": 22, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/from-soft-keyword-3-expected.txt b/ets2panda/test/compiler/ets/from-soft-keyword-3-expected.txt index 5e31d540789..1f361300c34 100644 --- a/ets2panda/test/compiler/ets/from-soft-keyword-3-expected.txt +++ b/ets2panda/test/compiler/ets/from-soft-keyword-3-expected.txt @@ -376,35 +376,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -412,7 +384,7 @@ }, "end": { "line": 20, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/functionPointerArray-expected.txt b/ets2panda/test/compiler/ets/functionPointerArray-expected.txt index ad7907de18e..dbddfece604 100644 --- a/ets2panda/test/compiler/ets/functionPointerArray-expected.txt +++ b/ets2panda/test/compiler/ets/functionPointerArray-expected.txt @@ -22,35 +22,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 24 - }, - "end": { - "line": 16, - "column": 28 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 24 - }, - "end": { - "line": 16, - "column": 29 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -58,7 +30,7 @@ }, "end": { "line": 16, - "column": 29 + "column": 28 } } }, @@ -69,7 +41,7 @@ }, "end": { "line": 16, - "column": 29 + "column": 28 } } }, @@ -245,35 +217,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -281,7 +225,7 @@ }, "end": { "line": 18, - "column": 24 + "column": 22 } } }, @@ -642,35 +586,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 18 - }, - "end": { - "line": 24, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 18 - }, - "end": { - "line": 24, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -678,7 +594,7 @@ }, "end": { "line": 24, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/functionTypeToObject-expected.txt b/ets2panda/test/compiler/ets/functionTypeToObject-expected.txt index 9ab44f07043..2003cc8a840 100644 --- a/ets2panda/test/compiler/ets/functionTypeToObject-expected.txt +++ b/ets2panda/test/compiler/ets/functionTypeToObject-expected.txt @@ -447,35 +447,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 19 - }, - "end": { - "line": 20, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 19 - }, - "end": { - "line": 20, - "column": 25 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -483,7 +455,7 @@ }, "end": { "line": 20, - "column": 25 + "column": 23 } } }, @@ -494,7 +466,7 @@ }, "end": { "line": 20, - "column": 25 + "column": 23 } } }, @@ -644,35 +616,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 34 - }, - "end": { - "line": 21, - "column": 38 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 34 - }, - "end": { - "line": 21, - "column": 40 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -680,7 +624,7 @@ }, "end": { "line": 21, - "column": 40 + "column": 38 } } }, @@ -691,7 +635,7 @@ }, "end": { "line": 21, - "column": 40 + "column": 38 } } }, diff --git a/ets2panda/test/compiler/ets/generic_arrayaslist-expected.txt b/ets2panda/test/compiler/ets/generic_arrayaslist-expected.txt index 426576fd858..cd6a3e5bb4f 100644 --- a/ets2panda/test/compiler/ets/generic_arrayaslist-expected.txt +++ b/ets2panda/test/compiler/ets/generic_arrayaslist-expected.txt @@ -122,35 +122,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 22 - }, - "end": { - "line": 20, - "column": 26 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 22 - }, - "end": { - "line": 20, - "column": 27 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -158,7 +130,7 @@ }, "end": { "line": 20, - "column": 27 + "column": 26 } } }, @@ -170,7 +142,7 @@ }, "end": { "line": 20, - "column": 27 + "column": 26 } } }, @@ -181,7 +153,7 @@ }, "end": { "line": 20, - "column": 27 + "column": 26 } } }, @@ -436,35 +408,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 21 - }, - "end": { - "line": 22, - "column": 25 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 21 - }, - "end": { - "line": 22, - "column": 26 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -472,7 +416,7 @@ }, "end": { "line": 22, - "column": 26 + "column": 25 } } }, @@ -484,7 +428,7 @@ }, "end": { "line": 22, - "column": 26 + "column": 25 } } }, @@ -495,7 +439,7 @@ }, "end": { "line": 22, - "column": 26 + "column": 25 } } }, @@ -3656,35 +3600,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 39, - "column": 49 - }, - "end": { - "line": 39, - "column": 53 - } - } - }, - "loc": { - "start": { - "line": 39, - "column": 49 - }, - "end": { - "line": 39, - "column": 55 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 39, @@ -3692,7 +3608,7 @@ }, "end": { "line": 39, - "column": 55 + "column": 53 } } }, @@ -5017,35 +4933,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 58, - "column": 36 - }, - "end": { - "line": 58, - "column": 40 - } - } - }, - "loc": { - "start": { - "line": 58, - "column": 36 - }, - "end": { - "line": 58, - "column": 42 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 58, @@ -5053,7 +4941,7 @@ }, "end": { "line": 58, - "column": 42 + "column": 40 } } }, @@ -6408,35 +6296,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 79, - "column": 38 - }, - "end": { - "line": 79, - "column": 42 - } - } - }, - "loc": { - "start": { - "line": 79, - "column": 38 - }, - "end": { - "line": 79, - "column": 44 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 79, @@ -6444,7 +6304,7 @@ }, "end": { "line": 79, - "column": 44 + "column": 42 } } }, @@ -8598,35 +8458,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 102, - "column": 37 - }, - "end": { - "line": 102, - "column": 41 - } - } - }, - "loc": { - "start": { - "line": 102, - "column": 37 - }, - "end": { - "line": 102, - "column": 43 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 102, @@ -8634,7 +8466,7 @@ }, "end": { "line": 102, - "column": 43 + "column": 41 } } }, @@ -17741,35 +17573,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 203, - "column": 97 - }, - "end": { - "line": 203, - "column": 101 - } - } - }, - "loc": { - "start": { - "line": 203, - "column": 97 - }, - "end": { - "line": 203, - "column": 103 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 203, @@ -17777,7 +17581,7 @@ }, "end": { "line": 203, - "column": 103 + "column": 101 } } }, @@ -19987,35 +19791,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 225, - "column": 99 - }, - "end": { - "line": 225, - "column": 103 - } - } - }, - "loc": { - "start": { - "line": 225, - "column": 99 - }, - "end": { - "line": 225, - "column": 105 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 225, @@ -20023,7 +19799,7 @@ }, "end": { "line": 225, - "column": 105 + "column": 103 } } }, 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 aa42a014854..efe229c1d50 100644 --- a/ets2panda/test/compiler/ets/generic_class_getter_setter-expected.txt +++ b/ets2panda/test/compiler/ets/generic_class_getter_setter-expected.txt @@ -332,35 +332,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 27 - }, - "end": { - "line": 18, - "column": 31 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 27 - }, - "end": { - "line": 18, - "column": 33 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -368,7 +340,7 @@ }, "end": { "line": 18, - "column": 33 + "column": 31 } } }, @@ -711,35 +683,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 18 - }, - "end": { - "line": 21, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 18 - }, - "end": { - "line": 21, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -747,7 +691,7 @@ }, "end": { "line": 21, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/generic_deadlock-expected.txt b/ets2panda/test/compiler/ets/generic_deadlock-expected.txt index 13ab0857acc..e0976184356 100644 --- a/ets2panda/test/compiler/ets/generic_deadlock-expected.txt +++ b/ets2panda/test/compiler/ets/generic_deadlock-expected.txt @@ -915,35 +915,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 25, - "column": 18 - }, - "end": { - "line": 25, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 25, - "column": 18 - }, - "end": { - "line": 25, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 25, @@ -951,7 +923,7 @@ }, "end": { "line": 25, - "column": 24 + "column": 22 } } }, 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 3f59e363d56..e649c890a5c 100644 --- a/ets2panda/test/compiler/ets/generic_function_call_1-expected.txt +++ b/ets2panda/test/compiler/ets/generic_function_call_1-expected.txt @@ -506,35 +506,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 19 - }, - "end": { - "line": 20, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 19 - }, - "end": { - "line": 20, - "column": 25 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -542,7 +514,7 @@ }, "end": { "line": 20, - "column": 25 + "column": 23 } } }, diff --git a/ets2panda/test/compiler/ets/generic_function_call_2-expected.txt b/ets2panda/test/compiler/ets/generic_function_call_2-expected.txt index 40b5c23fb50..729713e216a 100644 --- a/ets2panda/test/compiler/ets/generic_function_call_2-expected.txt +++ b/ets2panda/test/compiler/ets/generic_function_call_2-expected.txt @@ -643,35 +643,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 19 - }, - "end": { - "line": 21, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 19 - }, - "end": { - "line": 21, - "column": 25 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -679,7 +651,7 @@ }, "end": { "line": 21, - "column": 25 + "column": 23 } } }, 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 9202914ca8a..dae3a96db75 100644 --- a/ets2panda/test/compiler/ets/generic_function_call_3-expected.txt +++ b/ets2panda/test/compiler/ets/generic_function_call_3-expected.txt @@ -683,35 +683,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 19 - }, - "end": { - "line": 21, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 19 - }, - "end": { - "line": 21, - "column": 25 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -719,7 +691,7 @@ }, "end": { "line": 21, - "column": 25 + "column": 23 } } }, 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 73ff374fd49..e4431c97704 100644 --- a/ets2panda/test/compiler/ets/generic_function_call_4-expected.txt +++ b/ets2panda/test/compiler/ets/generic_function_call_4-expected.txt @@ -1677,35 +1677,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 29, - "column": 18 - }, - "end": { - "line": 29, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 29, - "column": 18 - }, - "end": { - "line": 29, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 29, @@ -1713,7 +1685,7 @@ }, "end": { "line": 29, - "column": 24 + "column": 22 } } }, 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 42dbbefc7b1..df5c348a72b 100644 --- a/ets2panda/test/compiler/ets/generic_function_call_5-expected.txt +++ b/ets2panda/test/compiler/ets/generic_function_call_5-expected.txt @@ -197,35 +197,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 51 - }, - "end": { - "line": 17, - "column": 55 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 51 - }, - "end": { - "line": 17, - "column": 56 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -233,7 +205,7 @@ }, "end": { "line": 17, - "column": 56 + "column": 55 } } }, @@ -244,7 +216,7 @@ }, "end": { "line": 17, - "column": 56 + "column": 55 } } }, @@ -256,7 +228,7 @@ }, "end": { "line": 17, - "column": 56 + "column": 55 } } }, @@ -267,41 +239,13 @@ }, "end": { "line": 17, - "column": 56 + "column": 55 } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 60 - }, - "end": { - "line": 17, - "column": 64 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 60 - }, - "end": { - "line": 17, - "column": 71 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -309,7 +253,7 @@ }, "end": { "line": 17, - "column": 71 + "column": 64 } } } @@ -321,7 +265,7 @@ }, "end": { "line": 17, - "column": 71 + "column": 64 } } }, @@ -333,7 +277,7 @@ }, "end": { "line": 17, - "column": 71 + "column": 64 } } }, @@ -344,7 +288,7 @@ }, "end": { "line": 17, - "column": 71 + "column": 64 } } } @@ -948,35 +892,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 53 - }, - "end": { - "line": 24, - "column": 57 - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 53 - }, - "end": { - "line": 24, - "column": 58 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -984,7 +900,7 @@ }, "end": { "line": 24, - "column": 58 + "column": 57 } } }, @@ -995,7 +911,7 @@ }, "end": { "line": 24, - "column": 58 + "column": 57 } } }, @@ -1007,7 +923,7 @@ }, "end": { "line": 24, - "column": 58 + "column": 57 } } }, @@ -1018,41 +934,13 @@ }, "end": { "line": 24, - "column": 58 + "column": 57 } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 60 - }, - "end": { - "line": 24, - "column": 64 - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 60 - }, - "end": { - "line": 24, - "column": 67 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -1060,7 +948,7 @@ }, "end": { "line": 24, - "column": 67 + "column": 64 } } }, 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 ee92a4e9315..7706d9d16dc 100644 --- a/ets2panda/test/compiler/ets/generic_function_call_7-expected.txt +++ b/ets2panda/test/compiler/ets/generic_function_call_7-expected.txt @@ -439,35 +439,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -475,7 +447,7 @@ }, "end": { "line": 20, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/generic_typealias_1-expected.txt b/ets2panda/test/compiler/ets/generic_typealias_1-expected.txt index 8e27fca50e5..d9c188072b7 100644 --- a/ets2panda/test/compiler/ets/generic_typealias_1-expected.txt +++ b/ets2panda/test/compiler/ets/generic_typealias_1-expected.txt @@ -691,35 +691,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -727,7 +699,7 @@ }, "end": { "line": 22, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/generic_typealias_2_neg-expected.txt b/ets2panda/test/compiler/ets/generic_typealias_2_neg-expected.txt index b62ce00490f..5ea41e878f0 100644 --- a/ets2panda/test/compiler/ets/generic_typealias_2_neg-expected.txt +++ b/ets2panda/test/compiler/ets/generic_typealias_2_neg-expected.txt @@ -274,35 +274,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 18 - }, - "end": { - "line": 19, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 18 - }, - "end": { - "line": 19, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -310,7 +282,7 @@ }, "end": { "line": 19, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/generic_typealias_3_neg-expected.txt b/ets2panda/test/compiler/ets/generic_typealias_3_neg-expected.txt index b02e59012d8..b867e8eff96 100644 --- a/ets2panda/test/compiler/ets/generic_typealias_3_neg-expected.txt +++ b/ets2panda/test/compiler/ets/generic_typealias_3_neg-expected.txt @@ -231,35 +231,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 18 - }, - "end": { - "line": 19, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 18 - }, - "end": { - "line": 19, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -267,7 +239,7 @@ }, "end": { "line": 19, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/generic_typealias_4_neg-expected.txt b/ets2panda/test/compiler/ets/generic_typealias_4_neg-expected.txt index 9be51ba2887..d45b98d6990 100644 --- a/ets2panda/test/compiler/ets/generic_typealias_4_neg-expected.txt +++ b/ets2panda/test/compiler/ets/generic_typealias_4_neg-expected.txt @@ -274,35 +274,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 18 - }, - "end": { - "line": 19, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 18 - }, - "end": { - "line": 19, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -310,7 +282,7 @@ }, "end": { "line": 19, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/generic_typealias_5_neg-expected.txt b/ets2panda/test/compiler/ets/generic_typealias_5_neg-expected.txt index 3d97f850663..0f0cea59cf9 100644 --- a/ets2panda/test/compiler/ets/generic_typealias_5_neg-expected.txt +++ b/ets2panda/test/compiler/ets/generic_typealias_5_neg-expected.txt @@ -744,35 +744,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 18 - }, - "end": { - "line": 21, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 18 - }, - "end": { - "line": 21, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -780,7 +752,7 @@ }, "end": { "line": 21, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/generic_typealias_6-expected.txt b/ets2panda/test/compiler/ets/generic_typealias_6-expected.txt index 116b3cb4838..956de2330f3 100644 --- a/ets2panda/test/compiler/ets/generic_typealias_6-expected.txt +++ b/ets2panda/test/compiler/ets/generic_typealias_6-expected.txt @@ -607,35 +607,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -643,7 +615,7 @@ }, "end": { "line": 20, - "column": 24 + "column": 22 } } }, 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 cb253be2b73..ac7857c8a3b 100644 --- a/ets2panda/test/compiler/ets/generic_typealias_7_neg-expected.txt +++ b/ets2panda/test/compiler/ets/generic_typealias_7_neg-expected.txt @@ -274,35 +274,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -310,7 +282,7 @@ }, "end": { "line": 17, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/generic_typealias_8-expected.txt b/ets2panda/test/compiler/ets/generic_typealias_8-expected.txt index c91e3d2dd93..4a416ed51f4 100644 --- a/ets2panda/test/compiler/ets/generic_typealias_8-expected.txt +++ b/ets2panda/test/compiler/ets/generic_typealias_8-expected.txt @@ -411,35 +411,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -447,7 +419,7 @@ }, "end": { "line": 18, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/generic_typealias_9-expected.txt b/ets2panda/test/compiler/ets/generic_typealias_9-expected.txt index 12338275bc2..425f798ad63 100644 --- a/ets2panda/test/compiler/ets/generic_typealias_9-expected.txt +++ b/ets2panda/test/compiler/ets/generic_typealias_9-expected.txt @@ -330,35 +330,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -366,7 +338,7 @@ }, "end": { "line": 17, - "column": 24 + "column": 22 } } }, 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 8c18f48d2d5..743d0838fa6 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 @@ -1917,35 +1917,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 39, - "column": 22 - }, - "end": { - "line": 39, - "column": 26 - } - } - }, - "loc": { - "start": { - "line": 39, - "column": 22 - }, - "end": { - "line": 39, - "column": 27 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 39, @@ -1953,7 +1925,7 @@ }, "end": { "line": 39, - "column": 27 + "column": 26 } } }, @@ -1965,7 +1937,7 @@ }, "end": { "line": 39, - "column": 27 + "column": 26 } } }, @@ -1976,7 +1948,7 @@ }, "end": { "line": 39, - "column": 27 + "column": 26 } } }, @@ -2231,35 +2203,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 41, - "column": 21 - }, - "end": { - "line": 41, - "column": 25 - } - } - }, - "loc": { - "start": { - "line": 41, - "column": 21 - }, - "end": { - "line": 41, - "column": 26 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 41, @@ -2267,7 +2211,7 @@ }, "end": { "line": 41, - "column": 26 + "column": 25 } } }, @@ -2279,7 +2223,7 @@ }, "end": { "line": 41, - "column": 26 + "column": 25 } } }, @@ -2290,7 +2234,7 @@ }, "end": { "line": 41, - "column": 26 + "column": 25 } } }, @@ -6084,35 +6028,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 61, - "column": 13 - }, - "end": { - "line": 61, - "column": 17 - } - } - }, - "loc": { - "start": { - "line": 61, - "column": 13 - }, - "end": { - "line": 61, - "column": 18 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 61, @@ -6120,7 +6036,7 @@ }, "end": { "line": 61, - "column": 18 + "column": 17 } } }, diff --git a/ets2panda/test/compiler/ets/generics_implicit_lambda1-expected.txt b/ets2panda/test/compiler/ets/generics_implicit_lambda1-expected.txt index 7fc151e937e..1a4800f2736 100644 --- a/ets2panda/test/compiler/ets/generics_implicit_lambda1-expected.txt +++ b/ets2panda/test/compiler/ets/generics_implicit_lambda1-expected.txt @@ -159,35 +159,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 49 - }, - "end": { - "line": 22, - "column": 53 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 49 - }, - "end": { - "line": 22, - "column": 54 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -195,7 +167,7 @@ }, "end": { "line": 22, - "column": 54 + "column": 53 } } }, @@ -206,7 +178,7 @@ }, "end": { "line": 22, - "column": 54 + "column": 53 } } }, @@ -218,7 +190,7 @@ }, "end": { "line": 22, - "column": 54 + "column": 53 } } }, @@ -229,7 +201,7 @@ }, "end": { "line": 22, - "column": 54 + "column": 53 } } } @@ -650,35 +622,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 28, - "column": 52 - }, - "end": { - "line": 28, - "column": 56 - } - } - }, - "loc": { - "start": { - "line": 28, - "column": 52 - }, - "end": { - "line": 28, - "column": 57 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 28, @@ -686,7 +630,7 @@ }, "end": { "line": 28, - "column": 57 + "column": 56 } } }, @@ -697,7 +641,7 @@ }, "end": { "line": 28, - "column": 57 + "column": 56 } } }, @@ -709,7 +653,7 @@ }, "end": { "line": 28, - "column": 57 + "column": 56 } } }, @@ -720,7 +664,7 @@ }, "end": { "line": 28, - "column": 57 + "column": 56 } } } diff --git a/ets2panda/test/compiler/ets/generics_instantiation_1-expected.txt b/ets2panda/test/compiler/ets/generics_instantiation_1-expected.txt index 826c0e80a2a..fa0eef0c283 100644 --- a/ets2panda/test/compiler/ets/generics_instantiation_1-expected.txt +++ b/ets2panda/test/compiler/ets/generics_instantiation_1-expected.txt @@ -628,35 +628,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 33 - }, - "end": { - "line": 24, - "column": 37 - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 33 - }, - "end": { - "line": 24, - "column": 39 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -664,7 +636,7 @@ }, "end": { "line": 24, - "column": 39 + "column": 37 } } }, @@ -1073,35 +1045,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 27, - "column": 21 - }, - "end": { - "line": 27, - "column": 25 - } - } - }, - "loc": { - "start": { - "line": 27, - "column": 21 - }, - "end": { - "line": 27, - "column": 27 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 27, @@ -1109,7 +1053,7 @@ }, "end": { "line": 27, - "column": 27 + "column": 25 } } }, diff --git a/ets2panda/test/compiler/ets/generics_instantiation_2-expected.txt b/ets2panda/test/compiler/ets/generics_instantiation_2-expected.txt index 2e60845699d..0abf3a0ff43 100644 --- a/ets2panda/test/compiler/ets/generics_instantiation_2-expected.txt +++ b/ets2panda/test/compiler/ets/generics_instantiation_2-expected.txt @@ -1425,35 +1425,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 34, - "column": 31 - }, - "end": { - "line": 34, - "column": 35 - } - } - }, - "loc": { - "start": { - "line": 34, - "column": 31 - }, - "end": { - "line": 34, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 34, @@ -1461,7 +1433,7 @@ }, "end": { "line": 34, - "column": 37 + "column": 35 } } }, diff --git a/ets2panda/test/compiler/ets/generics_instantiation_3-expected.txt b/ets2panda/test/compiler/ets/generics_instantiation_3-expected.txt index 7e2cc15cd5c..757b511447b 100644 --- a/ets2panda/test/compiler/ets/generics_instantiation_3-expected.txt +++ b/ets2panda/test/compiler/ets/generics_instantiation_3-expected.txt @@ -222,35 +222,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 23 - }, - "end": { - "line": 17, - "column": 27 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 23 - }, - "end": { - "line": 17, - "column": 29 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -258,7 +230,7 @@ }, "end": { "line": 17, - "column": 29 + "column": 27 } } }, diff --git a/ets2panda/test/compiler/ets/generics_instantiation_4-expected.txt b/ets2panda/test/compiler/ets/generics_instantiation_4-expected.txt index 58ac0be4cfa..db5bb1d7412 100644 --- a/ets2panda/test/compiler/ets/generics_instantiation_4-expected.txt +++ b/ets2panda/test/compiler/ets/generics_instantiation_4-expected.txt @@ -2364,35 +2364,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 44, - "column": 29 - }, - "end": { - "line": 44, - "column": 33 - } - } - }, - "loc": { - "start": { - "line": 44, - "column": 29 - }, - "end": { - "line": 44, - "column": 35 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 44, @@ -2400,7 +2372,7 @@ }, "end": { "line": 44, - "column": 35 + "column": 33 } } }, 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 618aaf0ee73..366732cf5ee 100644 --- a/ets2panda/test/compiler/ets/generics_interface_bounds_1-expected.txt +++ b/ets2panda/test/compiler/ets/generics_interface_bounds_1-expected.txt @@ -122,35 +122,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 17 - }, - "end": { - "line": 17, - "column": 21 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 17 - }, - "end": { - "line": 17, - "column": 22 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -158,7 +130,7 @@ }, "end": { "line": 17, - "column": 22 + "column": 21 } } }, @@ -170,7 +142,7 @@ }, "end": { "line": 17, - "column": 22 + "column": 21 } } }, @@ -181,7 +153,7 @@ }, "end": { "line": 17, - "column": 22 + "column": 21 } } }, @@ -564,35 +536,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 12 - }, - "end": { - "line": 23, - "column": 16 - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 12 - }, - "end": { - "line": 23, - "column": 18 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -600,7 +544,7 @@ }, "end": { "line": 23, - "column": 18 + "column": 16 } } }, 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 beeda0916cc..617fe539c2d 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 @@ -524,35 +524,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 24 - }, - "end": { - "line": 21, - "column": 28 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 24 - }, - "end": { - "line": 21, - "column": 30 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -560,7 +532,7 @@ }, "end": { "line": 21, - "column": 30 + "column": 28 } } }, @@ -659,35 +631,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 18 - }, - "end": { - "line": 23, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 18 - }, - "end": { - "line": 23, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -695,7 +639,7 @@ }, "end": { "line": 23, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/generics_primitive_type_param_neg_1-expected.txt b/ets2panda/test/compiler/ets/generics_primitive_type_param_neg_1-expected.txt index 6fac876a48b..2ba95b46d84 100644 --- a/ets2panda/test/compiler/ets/generics_primitive_type_param_neg_1-expected.txt +++ b/ets2panda/test/compiler/ets/generics_primitive_type_param_neg_1-expected.txt @@ -419,35 +419,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -455,7 +427,7 @@ }, "end": { "line": 20, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/generics_primitive_type_param_neg_2-expected.txt b/ets2panda/test/compiler/ets/generics_primitive_type_param_neg_2-expected.txt index cb01550c5cf..f7ef7e3ec70 100644 --- a/ets2panda/test/compiler/ets/generics_primitive_type_param_neg_2-expected.txt +++ b/ets2panda/test/compiler/ets/generics_primitive_type_param_neg_2-expected.txt @@ -556,35 +556,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -592,7 +564,7 @@ }, "end": { "line": 22, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/identifierReference10-expected.txt b/ets2panda/test/compiler/ets/identifierReference10-expected.txt index ac3b7839e92..aba0da58979 100644 --- a/ets2panda/test/compiler/ets/identifierReference10-expected.txt +++ b/ets2panda/test/compiler/ets/identifierReference10-expected.txt @@ -400,35 +400,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 10 - }, - "end": { - "line": 23, - "column": 14 - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 10 - }, - "end": { - "line": 23, - "column": 16 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -436,7 +408,7 @@ }, "end": { "line": 23, - "column": 16 + "column": 14 } } }, diff --git a/ets2panda/test/compiler/ets/identifierReference11-expected.txt b/ets2panda/test/compiler/ets/identifierReference11-expected.txt index f0d60124105..1365fa17d6d 100644 --- a/ets2panda/test/compiler/ets/identifierReference11-expected.txt +++ b/ets2panda/test/compiler/ets/identifierReference11-expected.txt @@ -268,35 +268,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 10 - }, - "end": { - "line": 21, - "column": 14 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 10 - }, - "end": { - "line": 21, - "column": 16 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -304,7 +276,7 @@ }, "end": { "line": 21, - "column": 16 + "column": 14 } } }, diff --git a/ets2panda/test/compiler/ets/identifierReference12-expected.txt b/ets2panda/test/compiler/ets/identifierReference12-expected.txt index c41ed2bceb1..8491cf6b453 100644 --- a/ets2panda/test/compiler/ets/identifierReference12-expected.txt +++ b/ets2panda/test/compiler/ets/identifierReference12-expected.txt @@ -400,35 +400,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 10 - }, - "end": { - "line": 23, - "column": 14 - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 10 - }, - "end": { - "line": 23, - "column": 16 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -436,7 +408,7 @@ }, "end": { "line": 23, - "column": 16 + "column": 14 } } }, diff --git a/ets2panda/test/compiler/ets/identifierReference13-expected.txt b/ets2panda/test/compiler/ets/identifierReference13-expected.txt index b9a14ad2ffc..e79b13c7adc 100644 --- a/ets2panda/test/compiler/ets/identifierReference13-expected.txt +++ b/ets2panda/test/compiler/ets/identifierReference13-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 10 - }, - "end": { - "line": 17, - "column": 14 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 10 - }, - "end": { - "line": 17, - "column": 16 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 16 + "column": 14 } } }, @@ -472,35 +444,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 10 - }, - "end": { - "line": 23, - "column": 14 - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 10 - }, - "end": { - "line": 23, - "column": 16 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -508,7 +452,7 @@ }, "end": { "line": 23, - "column": 16 + "column": 14 } } }, diff --git a/ets2panda/test/compiler/ets/identifierReference14-expected.txt b/ets2panda/test/compiler/ets/identifierReference14-expected.txt index eac46b8ad2f..f1ea709d8e8 100644 --- a/ets2panda/test/compiler/ets/identifierReference14-expected.txt +++ b/ets2panda/test/compiler/ets/identifierReference14-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 10 - }, - "end": { - "line": 22, - "column": 14 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 10 - }, - "end": { - "line": 22, - "column": 16 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -104,7 +76,7 @@ }, "end": { "line": 22, - "column": 16 + "column": 14 } } }, @@ -463,35 +435,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 28, - "column": 24 - }, - "end": { - "line": 28, - "column": 28 - } - } - }, - "loc": { - "start": { - "line": 28, - "column": 24 - }, - "end": { - "line": 28, - "column": 30 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 28, @@ -499,7 +443,7 @@ }, "end": { "line": 28, - "column": 30 + "column": 28 } } }, @@ -598,35 +542,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 32, - "column": 10 - }, - "end": { - "line": 32, - "column": 14 - } - } - }, - "loc": { - "start": { - "line": 32, - "column": 10 - }, - "end": { - "line": 32, - "column": 16 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 32, @@ -634,7 +550,7 @@ }, "end": { "line": 32, - "column": 16 + "column": 14 } } }, @@ -1065,35 +981,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 23 - }, - "end": { - "line": 17, - "column": 27 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 23 - }, - "end": { - "line": 17, - "column": 29 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -1101,7 +989,7 @@ }, "end": { "line": 17, - "column": 29 + "column": 27 } } }, diff --git a/ets2panda/test/compiler/ets/identifierReference2-expected.txt b/ets2panda/test/compiler/ets/identifierReference2-expected.txt index c0fb2875eaa..ea8c6190f38 100644 --- a/ets2panda/test/compiler/ets/identifierReference2-expected.txt +++ b/ets2panda/test/compiler/ets/identifierReference2-expected.txt @@ -299,35 +299,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 27 - }, - "end": { - "line": 16, - "column": 31 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 27 - }, - "end": { - "line": 16, - "column": 33 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -335,7 +307,7 @@ }, "end": { "line": 16, - "column": 33 + "column": 31 } } }, @@ -346,7 +318,7 @@ }, "end": { "line": 16, - "column": 33 + "column": 31 } } }, diff --git a/ets2panda/test/compiler/ets/identifierReference3-expected.txt b/ets2panda/test/compiler/ets/identifierReference3-expected.txt index f5c375d18a7..04579e18c56 100644 --- a/ets2panda/test/compiler/ets/identifierReference3-expected.txt +++ b/ets2panda/test/compiler/ets/identifierReference3-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 10 - }, - "end": { - "line": 19, - "column": 14 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 10 - }, - "end": { - "line": 19, - "column": 16 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -104,7 +76,7 @@ }, "end": { "line": 19, - "column": 16 + "column": 14 } } }, diff --git a/ets2panda/test/compiler/ets/identifierReference4-expected.txt b/ets2panda/test/compiler/ets/identifierReference4-expected.txt index beb0f9de571..4268497fd7a 100644 --- a/ets2panda/test/compiler/ets/identifierReference4-expected.txt +++ b/ets2panda/test/compiler/ets/identifierReference4-expected.txt @@ -322,35 +322,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 10 - }, - "end": { - "line": 23, - "column": 14 - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 10 - }, - "end": { - "line": 23, - "column": 16 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -358,7 +330,7 @@ }, "end": { "line": 23, - "column": 16 + "column": 14 } } }, diff --git a/ets2panda/test/compiler/ets/identifierReference5-expected.txt b/ets2panda/test/compiler/ets/identifierReference5-expected.txt index ebaa3df0392..ab93cc2a3c7 100644 --- a/ets2panda/test/compiler/ets/identifierReference5-expected.txt +++ b/ets2panda/test/compiler/ets/identifierReference5-expected.txt @@ -154,35 +154,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 23 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -190,7 +162,7 @@ }, "end": { "line": 22, - "column": 23 + "column": 22 } } }, @@ -201,7 +173,7 @@ }, "end": { "line": 22, - "column": 23 + "column": 22 } } }, @@ -214,7 +186,7 @@ }, "end": { "line": 22, - "column": 23 + "column": 22 } } }, @@ -441,35 +413,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 26, - "column": 10 - }, - "end": { - "line": 26, - "column": 14 - } - } - }, - "loc": { - "start": { - "line": 26, - "column": 10 - }, - "end": { - "line": 26, - "column": 16 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 26, @@ -477,7 +421,7 @@ }, "end": { "line": 26, - "column": 16 + "column": 14 } } }, @@ -661,35 +605,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 30, - "column": 17 - }, - "end": { - "line": 30, - "column": 21 - } - } - }, - "loc": { - "start": { - "line": 30, - "column": 17 - }, - "end": { - "line": 30, - "column": 23 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 30, @@ -697,7 +613,7 @@ }, "end": { "line": 30, - "column": 23 + "column": 21 } } }, @@ -1155,35 +1071,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 23 - }, - "end": { - "line": 16, - "column": 27 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 23 - }, - "end": { - "line": 16, - "column": 29 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -1191,7 +1079,7 @@ }, "end": { "line": 16, - "column": 29 + "column": 27 } } }, diff --git a/ets2panda/test/compiler/ets/identifierReference8-expected.txt b/ets2panda/test/compiler/ets/identifierReference8-expected.txt index 83755755a33..e024f140055 100644 --- a/ets2panda/test/compiler/ets/identifierReference8-expected.txt +++ b/ets2panda/test/compiler/ets/identifierReference8-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 10 - }, - "end": { - "line": 19, - "column": 14 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 10 - }, - "end": { - "line": 19, - "column": 16 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -104,7 +76,7 @@ }, "end": { "line": 19, - "column": 16 + "column": 14 } } }, @@ -203,35 +175,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 10 - }, - "end": { - "line": 23, - "column": 14 - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 10 - }, - "end": { - "line": 23, - "column": 16 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -239,7 +183,7 @@ }, "end": { "line": 23, - "column": 16 + "column": 14 } } }, diff --git a/ets2panda/test/compiler/ets/identifierReference9-expected.txt b/ets2panda/test/compiler/ets/identifierReference9-expected.txt index 353fdd49ca7..9821c82b36c 100644 --- a/ets2panda/test/compiler/ets/identifierReference9-expected.txt +++ b/ets2panda/test/compiler/ets/identifierReference9-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 10 - }, - "end": { - "line": 19, - "column": 14 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 10 - }, - "end": { - "line": 19, - "column": 16 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -104,7 +76,7 @@ }, "end": { "line": 19, - "column": 16 + "column": 14 } } }, @@ -203,35 +175,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 10 - }, - "end": { - "line": 23, - "column": 14 - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 10 - }, - "end": { - "line": 23, - "column": 16 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -239,7 +183,7 @@ }, "end": { "line": 23, - "column": 16 + "column": 14 } } }, diff --git a/ets2panda/test/compiler/ets/implicit-conversion-expected.txt b/ets2panda/test/compiler/ets/implicit-conversion-expected.txt index c45fd0e9db9..43583c7c2ab 100644 --- a/ets2panda/test/compiler/ets/implicit-conversion-expected.txt +++ b/ets2panda/test/compiler/ets/implicit-conversion-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/interfaceMethodNotOverridden-expected.txt b/ets2panda/test/compiler/ets/interfaceMethodNotOverridden-expected.txt index 5ffb88ab4ac..2fa070f0f3c 100644 --- a/ets2panda/test/compiler/ets/interfaceMethodNotOverridden-expected.txt +++ b/ets2panda/test/compiler/ets/interfaceMethodNotOverridden-expected.txt @@ -52,35 +52,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 12 - }, - "end": { - "line": 17, - "column": 16 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 12 - }, - "end": { - "line": 17, - "column": 17 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -88,7 +60,7 @@ }, "end": { "line": 17, - "column": 17 + "column": 16 } } }, @@ -100,7 +72,7 @@ }, "end": { "line": 17, - "column": 17 + "column": 16 } } }, @@ -111,7 +83,7 @@ }, "end": { "line": 17, - "column": 17 + "column": 16 } } }, @@ -331,35 +303,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 25 - }, - "end": { - "line": 21, - "column": 29 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 25 - }, - "end": { - "line": 21, - "column": 31 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -367,7 +311,7 @@ }, "end": { "line": 21, - "column": 31 + "column": 29 } } }, diff --git a/ets2panda/test/compiler/ets/invalidCallInstruction-expected.txt b/ets2panda/test/compiler/ets/invalidCallInstruction-expected.txt index 5a6ea0bffa1..881273d21b7 100644 --- a/ets2panda/test/compiler/ets/invalidCallInstruction-expected.txt +++ b/ets2panda/test/compiler/ets/invalidCallInstruction-expected.txt @@ -1117,35 +1117,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 35, - "column": 17 - }, - "end": { - "line": 35, - "column": 21 - } - } - }, - "loc": { - "start": { - "line": 35, - "column": 17 - }, - "end": { - "line": 35, - "column": 23 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 35, @@ -1153,7 +1125,7 @@ }, "end": { "line": 35, - "column": 23 + "column": 21 } } }, @@ -1164,7 +1136,7 @@ }, "end": { "line": 35, - "column": 23 + "column": 21 } } }, @@ -1190,35 +1162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 35, - "column": 29 - }, - "end": { - "line": 35, - "column": 33 - } - } - }, - "loc": { - "start": { - "line": 35, - "column": 29 - }, - "end": { - "line": 35, - "column": 36 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 35, @@ -1226,7 +1170,7 @@ }, "end": { "line": 35, - "column": 36 + "column": 33 } } }, diff --git a/ets2panda/test/compiler/ets/invalidIndirectInheritanceFromClass-expected.txt b/ets2panda/test/compiler/ets/invalidIndirectInheritanceFromClass-expected.txt index 33cb453b9b6..ec301c1952c 100644 --- a/ets2panda/test/compiler/ets/invalidIndirectInheritanceFromClass-expected.txt +++ b/ets2panda/test/compiler/ets/invalidIndirectInheritanceFromClass-expected.txt @@ -1016,35 +1016,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 32, - "column": 18 - }, - "end": { - "line": 32, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 32, - "column": 18 - }, - "end": { - "line": 32, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 32, @@ -1052,7 +1024,7 @@ }, "end": { "line": 32, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/invalidIndirectInheritanceFromInterface-expected.txt b/ets2panda/test/compiler/ets/invalidIndirectInheritanceFromInterface-expected.txt index e6a9aa7fd9c..d248ed025a6 100644 --- a/ets2panda/test/compiler/ets/invalidIndirectInheritanceFromInterface-expected.txt +++ b/ets2panda/test/compiler/ets/invalidIndirectInheritanceFromInterface-expected.txt @@ -939,35 +939,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 32, - "column": 18 - }, - "end": { - "line": 32, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 32, - "column": 18 - }, - "end": { - "line": 32, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 32, @@ -975,7 +947,7 @@ }, "end": { "line": 32, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/invalidInheritance1-expected.txt b/ets2panda/test/compiler/ets/invalidInheritance1-expected.txt index 035dd5dd21c..6612b6701bc 100644 --- a/ets2panda/test/compiler/ets/invalidInheritance1-expected.txt +++ b/ets2panda/test/compiler/ets/invalidInheritance1-expected.txt @@ -350,35 +350,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 16 - }, - "end": { - "line": 21, - "column": 20 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 16 - }, - "end": { - "line": 21, - "column": 22 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -386,7 +358,7 @@ }, "end": { "line": 21, - "column": 22 + "column": 20 } } }, diff --git a/ets2panda/test/compiler/ets/invalidInheritance3-expected.txt b/ets2panda/test/compiler/ets/invalidInheritance3-expected.txt index bb1005989a0..f3a397503a6 100644 --- a/ets2panda/test/compiler/ets/invalidInheritance3-expected.txt +++ b/ets2panda/test/compiler/ets/invalidInheritance3-expected.txt @@ -132,35 +132,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 28 - }, - "end": { - "line": 17, - "column": 32 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 28 - }, - "end": { - "line": 17, - "column": 33 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -168,7 +140,7 @@ }, "end": { "line": 17, - "column": 33 + "column": 32 } } }, @@ -179,7 +151,7 @@ }, "end": { "line": 17, - "column": 33 + "column": 32 } } }, @@ -192,7 +164,7 @@ }, "end": { "line": 17, - "column": 33 + "column": 32 } } }, diff --git a/ets2panda/test/compiler/ets/invalidInheritanceFromClass-expected.txt b/ets2panda/test/compiler/ets/invalidInheritanceFromClass-expected.txt index 13e1ac543f4..b0ef26a98ce 100644 --- a/ets2panda/test/compiler/ets/invalidInheritanceFromClass-expected.txt +++ b/ets2panda/test/compiler/ets/invalidInheritanceFromClass-expected.txt @@ -839,35 +839,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 29, - "column": 18 - }, - "end": { - "line": 29, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 29, - "column": 18 - }, - "end": { - "line": 29, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 29, @@ -875,7 +847,7 @@ }, "end": { "line": 29, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/invalidInheritanceFromInterface-expected.txt b/ets2panda/test/compiler/ets/invalidInheritanceFromInterface-expected.txt index e91b4302b34..9e9c1c964e2 100644 --- a/ets2panda/test/compiler/ets/invalidInheritanceFromInterface-expected.txt +++ b/ets2panda/test/compiler/ets/invalidInheritanceFromInterface-expected.txt @@ -762,35 +762,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 29, - "column": 18 - }, - "end": { - "line": 29, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 29, - "column": 18 - }, - "end": { - "line": 29, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 29, @@ -798,7 +770,7 @@ }, "end": { "line": 29, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/invalidInheritanceFromInterfaceStaticMethod-expected.txt b/ets2panda/test/compiler/ets/invalidInheritanceFromInterfaceStaticMethod-expected.txt index c5e6ef86508..aadbca07d2a 100644 --- a/ets2panda/test/compiler/ets/invalidInheritanceFromInterfaceStaticMethod-expected.txt +++ b/ets2panda/test/compiler/ets/invalidInheritanceFromInterfaceStaticMethod-expected.txt @@ -764,35 +764,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 29, - "column": 18 - }, - "end": { - "line": 29, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 29, - "column": 18 - }, - "end": { - "line": 29, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 29, @@ -800,7 +772,7 @@ }, "end": { "line": 29, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext1-expected.txt b/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext1-expected.txt index e5000ca2bf9..c94d58895aa 100644 --- a/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext1-expected.txt +++ b/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext1-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 24 - }, - "end": { - "line": 17, - "column": 28 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 24 - }, - "end": { - "line": 17, - "column": 30 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 30 + "column": 28 } } }, @@ -203,35 +175,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 32 - }, - "end": { - "line": 18, - "column": 36 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 32 - }, - "end": { - "line": 18, - "column": 38 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -239,7 +183,7 @@ }, "end": { "line": 18, - "column": 38 + "column": 36 } } }, @@ -408,35 +352,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 31 - }, - "end": { - "line": 20, - "column": 35 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 31 - }, - "end": { - "line": 20, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -444,7 +360,7 @@ }, "end": { "line": 20, - "column": 37 + "column": 35 } } }, diff --git a/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext2-expected.txt b/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext2-expected.txt index ea3316db26c..17f54da2233 100644 --- a/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext2-expected.txt +++ b/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext2-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 24 - }, - "end": { - "line": 17, - "column": 28 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 24 - }, - "end": { - "line": 17, - "column": 30 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 30 + "column": 28 } } }, @@ -203,35 +175,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 32 - }, - "end": { - "line": 18, - "column": 36 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 32 - }, - "end": { - "line": 18, - "column": 38 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -239,7 +183,7 @@ }, "end": { "line": 18, - "column": 38 + "column": 36 } } }, @@ -408,35 +352,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 31 - }, - "end": { - "line": 20, - "column": 35 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 31 - }, - "end": { - "line": 20, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -444,7 +360,7 @@ }, "end": { "line": 20, - "column": 37 + "column": 35 } } }, diff --git a/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext3-expected.txt b/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext3-expected.txt index 71aed74035a..bba617a0503 100644 --- a/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext3-expected.txt +++ b/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext3-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 24 - }, - "end": { - "line": 17, - "column": 28 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 24 - }, - "end": { - "line": 17, - "column": 30 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 30 + "column": 28 } } }, @@ -203,35 +175,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 32 - }, - "end": { - "line": 18, - "column": 36 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 32 - }, - "end": { - "line": 18, - "column": 38 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -239,7 +183,7 @@ }, "end": { "line": 18, - "column": 38 + "column": 36 } } }, @@ -408,35 +352,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 31 - }, - "end": { - "line": 20, - "column": 35 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 31 - }, - "end": { - "line": 20, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -444,7 +360,7 @@ }, "end": { "line": 20, - "column": 37 + "column": 35 } } }, diff --git a/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext4-expected.txt b/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext4-expected.txt index 6a39955b55c..bf951e79da6 100644 --- a/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext4-expected.txt +++ b/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext4-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 24 - }, - "end": { - "line": 17, - "column": 28 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 24 - }, - "end": { - "line": 17, - "column": 30 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 30 + "column": 28 } } }, @@ -203,35 +175,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 32 - }, - "end": { - "line": 18, - "column": 36 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 32 - }, - "end": { - "line": 18, - "column": 38 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -239,7 +183,7 @@ }, "end": { "line": 18, - "column": 38 + "column": 36 } } }, @@ -475,35 +419,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 25 - }, - "end": { - "line": 22, - "column": 29 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 25 - }, - "end": { - "line": 22, - "column": 31 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -511,7 +427,7 @@ }, "end": { "line": 22, - "column": 31 + "column": 29 } } }, diff --git a/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext5-expected.txt b/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext5-expected.txt index b5521406026..c5809fe4281 100644 --- a/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext5-expected.txt +++ b/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext5-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 24 - }, - "end": { - "line": 17, - "column": 28 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 24 - }, - "end": { - "line": 17, - "column": 30 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 30 + "column": 28 } } }, @@ -203,35 +175,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 32 - }, - "end": { - "line": 18, - "column": 36 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 32 - }, - "end": { - "line": 18, - "column": 38 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -239,7 +183,7 @@ }, "end": { "line": 18, - "column": 38 + "column": 36 } } }, @@ -515,35 +459,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 25 - }, - "end": { - "line": 22, - "column": 29 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 25 - }, - "end": { - "line": 22, - "column": 31 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -551,7 +467,7 @@ }, "end": { "line": 22, - "column": 31 + "column": 29 } } }, diff --git a/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext6-expected.txt b/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext6-expected.txt index a038226fee0..5a0f9e58378 100644 --- a/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext6-expected.txt +++ b/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext6-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 24 - }, - "end": { - "line": 17, - "column": 28 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 24 - }, - "end": { - "line": 17, - "column": 30 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 30 + "column": 28 } } }, @@ -203,35 +175,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 32 - }, - "end": { - "line": 18, - "column": 36 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 32 - }, - "end": { - "line": 18, - "column": 38 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -239,7 +183,7 @@ }, "end": { "line": 18, - "column": 38 + "column": 36 } } }, @@ -515,35 +459,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 25 - }, - "end": { - "line": 22, - "column": 29 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 25 - }, - "end": { - "line": 22, - "column": 31 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -551,7 +467,7 @@ }, "end": { "line": 22, - "column": 31 + "column": 29 } } }, diff --git a/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext7-expected.txt b/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext7-expected.txt index 76d81db4cf7..69a7dcee3d4 100644 --- a/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext7-expected.txt +++ b/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext7-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 24 - }, - "end": { - "line": 17, - "column": 28 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 24 - }, - "end": { - "line": 17, - "column": 30 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 30 + "column": 28 } } }, @@ -203,35 +175,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 32 - }, - "end": { - "line": 18, - "column": 36 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 32 - }, - "end": { - "line": 18, - "column": 38 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -239,7 +183,7 @@ }, "end": { "line": 18, - "column": 38 + "column": 36 } } }, @@ -515,35 +459,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 25 - }, - "end": { - "line": 22, - "column": 29 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 25 - }, - "end": { - "line": 22, - "column": 31 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -551,7 +467,7 @@ }, "end": { "line": 22, - "column": 31 + "column": 29 } } }, diff --git a/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext8-expected.txt b/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext8-expected.txt index de535537443..aad6f38d22e 100644 --- a/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext8-expected.txt +++ b/ets2panda/test/compiler/ets/invalidMemberExpressionFromStaticContext8-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 24 - }, - "end": { - "line": 17, - "column": 28 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 24 - }, - "end": { - "line": 17, - "column": 30 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 30 + "column": 28 } } }, @@ -203,35 +175,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 32 - }, - "end": { - "line": 18, - "column": 36 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 32 - }, - "end": { - "line": 18, - "column": 38 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -239,7 +183,7 @@ }, "end": { "line": 18, - "column": 38 + "column": 36 } } }, @@ -515,35 +459,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 25 - }, - "end": { - "line": 22, - "column": 29 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 25 - }, - "end": { - "line": 22, - "column": 31 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -551,7 +467,7 @@ }, "end": { "line": 22, - "column": 31 + "column": 29 } } }, diff --git a/ets2panda/test/compiler/ets/invalidPrivateAccess1-expected.txt b/ets2panda/test/compiler/ets/invalidPrivateAccess1-expected.txt index f902846d033..327677bd8f5 100644 --- a/ets2panda/test/compiler/ets/invalidPrivateAccess1-expected.txt +++ b/ets2panda/test/compiler/ets/invalidPrivateAccess1-expected.txt @@ -425,35 +425,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 18 - }, - "end": { - "line": 21, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 18 - }, - "end": { - "line": 21, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -461,7 +433,7 @@ }, "end": { "line": 21, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/invalidPrivateAccess2-expected.txt b/ets2panda/test/compiler/ets/invalidPrivateAccess2-expected.txt index 37596af9b04..cc9be67f4a8 100644 --- a/ets2panda/test/compiler/ets/invalidPrivateAccess2-expected.txt +++ b/ets2panda/test/compiler/ets/invalidPrivateAccess2-expected.txt @@ -448,35 +448,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 18 - }, - "end": { - "line": 24, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 18 - }, - "end": { - "line": 24, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -484,7 +456,7 @@ }, "end": { "line": 24, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/invalidPrivateAccess3-expected.txt b/ets2panda/test/compiler/ets/invalidPrivateAccess3-expected.txt index 7a5181e8f83..37bbc972ccc 100644 --- a/ets2panda/test/compiler/ets/invalidPrivateAccess3-expected.txt +++ b/ets2panda/test/compiler/ets/invalidPrivateAccess3-expected.txt @@ -310,35 +310,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 20 - }, - "end": { - "line": 23, - "column": 24 - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 20 - }, - "end": { - "line": 23, - "column": 26 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -346,7 +318,7 @@ }, "end": { "line": 23, - "column": 26 + "column": 24 } } }, @@ -475,35 +447,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 27, - "column": 25 - }, - "end": { - "line": 27, - "column": 29 - } - } - }, - "loc": { - "start": { - "line": 27, - "column": 25 - }, - "end": { - "line": 27, - "column": 31 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 27, @@ -511,7 +455,7 @@ }, "end": { "line": 27, - "column": 31 + "column": 29 } } }, @@ -761,35 +705,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 32, - "column": 18 - }, - "end": { - "line": 32, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 32, - "column": 18 - }, - "end": { - "line": 32, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 32, @@ -797,7 +713,7 @@ }, "end": { "line": 32, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/invalidProtectedAccess1-expected.txt b/ets2panda/test/compiler/ets/invalidProtectedAccess1-expected.txt index 013fcfafc44..a31539a9250 100644 --- a/ets2panda/test/compiler/ets/invalidProtectedAccess1-expected.txt +++ b/ets2panda/test/compiler/ets/invalidProtectedAccess1-expected.txt @@ -425,35 +425,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 18 - }, - "end": { - "line": 21, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 18 - }, - "end": { - "line": 21, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -461,7 +433,7 @@ }, "end": { "line": 21, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/invalidProtectedAccess2-expected.txt b/ets2panda/test/compiler/ets/invalidProtectedAccess2-expected.txt index e7356eb49ac..6b70de3ff26 100644 --- a/ets2panda/test/compiler/ets/invalidProtectedAccess2-expected.txt +++ b/ets2panda/test/compiler/ets/invalidProtectedAccess2-expected.txt @@ -448,35 +448,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 18 - }, - "end": { - "line": 24, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 18 - }, - "end": { - "line": 24, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -484,7 +456,7 @@ }, "end": { "line": 24, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/invalidProtectedAccess3-expected.txt b/ets2panda/test/compiler/ets/invalidProtectedAccess3-expected.txt index fa41a9e7db8..d231f2fd3f7 100644 --- a/ets2panda/test/compiler/ets/invalidProtectedAccess3-expected.txt +++ b/ets2panda/test/compiler/ets/invalidProtectedAccess3-expected.txt @@ -310,35 +310,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 22 - }, - "end": { - "line": 23, - "column": 26 - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 22 - }, - "end": { - "line": 23, - "column": 28 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -346,7 +318,7 @@ }, "end": { "line": 23, - "column": 28 + "column": 26 } } }, @@ -475,35 +447,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 27, - "column": 26 - }, - "end": { - "line": 27, - "column": 30 - } - } - }, - "loc": { - "start": { - "line": 27, - "column": 26 - }, - "end": { - "line": 27, - "column": 32 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 27, @@ -511,7 +455,7 @@ }, "end": { "line": 27, - "column": 32 + "column": 30 } } }, @@ -761,35 +705,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 32, - "column": 18 - }, - "end": { - "line": 32, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 32, - "column": 18 - }, - "end": { - "line": 32, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 32, @@ -797,7 +713,7 @@ }, "end": { "line": 32, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/lambdaExpressionWithoutBlockStatementDifferentType-expected.txt b/ets2panda/test/compiler/ets/lambdaExpressionWithoutBlockStatementDifferentType-expected.txt index a17df28bb33..e5daef378c3 100644 --- a/ets2panda/test/compiler/ets/lambdaExpressionWithoutBlockStatementDifferentType-expected.txt +++ b/ets2panda/test/compiler/ets/lambdaExpressionWithoutBlockStatementDifferentType-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/lambdaExpressionWithoutBlockStatementDifferentTypeInfunction-expected.txt b/ets2panda/test/compiler/ets/lambdaExpressionWithoutBlockStatementDifferentTypeInfunction-expected.txt index c35a6a6a7b7..53e4a799ded 100644 --- a/ets2panda/test/compiler/ets/lambdaExpressionWithoutBlockStatementDifferentTypeInfunction-expected.txt +++ b/ets2panda/test/compiler/ets/lambdaExpressionWithoutBlockStatementDifferentTypeInfunction-expected.txt @@ -325,35 +325,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -361,7 +333,7 @@ }, "end": { "line": 20, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/lambdaFunction1-expected.txt b/ets2panda/test/compiler/ets/lambdaFunction1-expected.txt index 132a58cca84..56a885c6f14 100644 --- a/ets2panda/test/compiler/ets/lambdaFunction1-expected.txt +++ b/ets2panda/test/compiler/ets/lambdaFunction1-expected.txt @@ -1559,35 +1559,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 39, - "column": 18 - }, - "end": { - "line": 39, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 39, - "column": 18 - }, - "end": { - "line": 39, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 39, @@ -1595,7 +1567,7 @@ }, "end": { "line": 39, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/lambdaFunction3-expected.txt b/ets2panda/test/compiler/ets/lambdaFunction3-expected.txt index 22b2a3c2f29..8251e3c4ae9 100644 --- a/ets2panda/test/compiler/ets/lambdaFunction3-expected.txt +++ b/ets2panda/test/compiler/ets/lambdaFunction3-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 17 - }, - "end": { - "line": 16, - "column": 21 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 17 - }, - "end": { - "line": 16, - "column": 23 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 23 + "column": 21 } } }, @@ -345,35 +317,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 32 - }, - "end": { - "line": 18, - "column": 36 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 32 - }, - "end": { - "line": 18, - "column": 38 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -381,7 +325,7 @@ }, "end": { "line": 18, - "column": 38 + "column": 36 } } }, @@ -392,7 +336,7 @@ }, "end": { "line": 18, - "column": 38 + "column": 36 } } }, @@ -460,35 +404,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 49 - }, - "end": { - "line": 18, - "column": 53 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 49 - }, - "end": { - "line": 18, - "column": 56 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -496,7 +412,7 @@ }, "end": { "line": 18, - "column": 56 + "column": 53 } } }, diff --git a/ets2panda/test/compiler/ets/lambdaFunction4-expected.txt b/ets2panda/test/compiler/ets/lambdaFunction4-expected.txt index 581964183a2..5b92c309d01 100644 --- a/ets2panda/test/compiler/ets/lambdaFunction4-expected.txt +++ b/ets2panda/test/compiler/ets/lambdaFunction4-expected.txt @@ -140,35 +140,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 25 - }, - "end": { - "line": 19, - "column": 29 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 25 - }, - "end": { - "line": 19, - "column": 32 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -176,7 +148,7 @@ }, "end": { "line": 19, - "column": 32 + "column": 29 } } }, @@ -298,35 +270,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 14 - }, - "end": { - "line": 19, - "column": 18 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 14 - }, - "end": { - "line": 19, - "column": 20 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -334,7 +278,7 @@ }, "end": { "line": 19, - "column": 20 + "column": 18 } } }, @@ -345,7 +289,7 @@ }, "end": { "line": 19, - "column": 20 + "column": 18 } } }, diff --git a/ets2panda/test/compiler/ets/lambdaFunction5-expected.txt b/ets2panda/test/compiler/ets/lambdaFunction5-expected.txt index 5737ced2b4e..e26552735aa 100644 --- a/ets2panda/test/compiler/ets/lambdaFunction5-expected.txt +++ b/ets2panda/test/compiler/ets/lambdaFunction5-expected.txt @@ -1232,35 +1232,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 32, - "column": 18 - }, - "end": { - "line": 32, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 32, - "column": 18 - }, - "end": { - "line": 32, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 32, @@ -1268,7 +1240,7 @@ }, "end": { "line": 32, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type-expected.txt index 1fa2395cb8c..1bf9ff1ba39 100644 --- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type-expected.txt +++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type-expected.txt @@ -265,35 +265,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 26 - }, - "end": { - "line": 18, - "column": 30 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 26 - }, - "end": { - "line": 18, - "column": 32 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -301,7 +273,7 @@ }, "end": { "line": 18, - "column": 32 + "column": 30 } } }, @@ -312,7 +284,7 @@ }, "end": { "line": 18, - "column": 32 + "column": 30 } } }, diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda1-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda1-expected.txt index 9aef2f59fa4..20a12a04a57 100644 --- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda1-expected.txt +++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda1-expected.txt @@ -327,35 +327,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 32 - }, - "end": { - "line": 18, - "column": 36 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 32 - }, - "end": { - "line": 18, - "column": 38 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -363,7 +335,7 @@ }, "end": { "line": 18, - "column": 38 + "column": 36 } } }, @@ -374,7 +346,7 @@ }, "end": { "line": 18, - "column": 38 + "column": 36 } } }, @@ -385,7 +357,7 @@ }, "end": { "line": 18, - "column": 38 + "column": 36 } } }, diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda_expression-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda_expression-expected.txt index 2237eae3ae1..b8abac3389f 100644 --- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda_expression-expected.txt +++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_lambda_expression-expected.txt @@ -461,35 +461,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 28 - }, - "end": { - "line": 23, - "column": 32 - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 28 - }, - "end": { - "line": 23, - "column": 34 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -497,7 +469,7 @@ }, "end": { "line": 23, - "column": 34 + "column": 32 } } }, @@ -508,7 +480,7 @@ }, "end": { "line": 23, - "column": 34 + "column": 32 } } }, @@ -519,7 +491,7 @@ }, "end": { "line": 23, - "column": 34 + "column": 32 } } }, diff --git a/ets2panda/test/compiler/ets/lambda_unresolved_ref_1-expected.txt b/ets2panda/test/compiler/ets/lambda_unresolved_ref_1-expected.txt index 8588d0e5bb7..1d193fa51dd 100644 --- a/ets2panda/test/compiler/ets/lambda_unresolved_ref_1-expected.txt +++ b/ets2panda/test/compiler/ets/lambda_unresolved_ref_1-expected.txt @@ -76,35 +76,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 26 - }, - "end": { - "line": 17, - "column": 30 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 26 - }, - "end": { - "line": 17, - "column": 31 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -112,7 +84,7 @@ }, "end": { "line": 17, - "column": 31 + "column": 30 } } }, @@ -123,7 +95,7 @@ }, "end": { "line": 17, - "column": 31 + "column": 30 } } }, @@ -135,7 +107,7 @@ }, "end": { "line": 17, - "column": 31 + "column": 30 } } }, @@ -146,41 +118,13 @@ }, "end": { "line": 17, - "column": 31 + "column": 30 } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 33 - }, - "end": { - "line": 17, - "column": 37 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 33 - }, - "end": { - "line": 17, - "column": 39 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -188,7 +132,7 @@ }, "end": { "line": 17, - "column": 39 + "column": 37 } } }, @@ -207,35 +151,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 25 - }, - "end": { - "line": 18, - "column": 29 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 25 - }, - "end": { - "line": 18, - "column": 31 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -243,7 +159,7 @@ }, "end": { "line": 18, - "column": 31 + "column": 29 } } }, @@ -254,7 +170,7 @@ }, "end": { "line": 18, - "column": 31 + "column": 29 } } }, @@ -280,35 +196,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 36 - }, - "end": { - "line": 18, - "column": 40 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 36 - }, - "end": { - "line": 18, - "column": 43 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -316,7 +204,7 @@ }, "end": { "line": 18, - "column": 43 + "column": 40 } } }, @@ -989,35 +877,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 30 - }, - "end": { - "line": 23, - "column": 34 - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 30 - }, - "end": { - "line": 23, - "column": 36 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -1025,7 +885,7 @@ }, "end": { "line": 23, - "column": 36 + "column": 34 } } }, @@ -1044,35 +904,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 20 - }, - "end": { - "line": 24, - "column": 24 - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 20 - }, - "end": { - "line": 24, - "column": 26 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -1080,7 +912,7 @@ }, "end": { "line": 24, - "column": 26 + "column": 24 } } }, @@ -1091,7 +923,7 @@ }, "end": { "line": 24, - "column": 26 + "column": 24 } } }, @@ -1117,35 +949,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 31 - }, - "end": { - "line": 24, - "column": 35 - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 31 - }, - "end": { - "line": 24, - "column": 38 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -1153,7 +957,7 @@ }, "end": { "line": 24, - "column": 38 + "column": 35 } } }, @@ -1641,35 +1445,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 30, - "column": 31 - }, - "end": { - "line": 30, - "column": 35 - } - } - }, - "loc": { - "start": { - "line": 30, - "column": 31 - }, - "end": { - "line": 30, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 30, @@ -1677,7 +1453,7 @@ }, "end": { "line": 30, - "column": 37 + "column": 35 } } }, @@ -1696,35 +1472,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 31, - "column": 20 - }, - "end": { - "line": 31, - "column": 24 - } - } - }, - "loc": { - "start": { - "line": 31, - "column": 20 - }, - "end": { - "line": 31, - "column": 26 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 31, @@ -1732,7 +1480,7 @@ }, "end": { "line": 31, - "column": 26 + "column": 24 } } }, @@ -1743,7 +1491,7 @@ }, "end": { "line": 31, - "column": 26 + "column": 24 } } }, @@ -1769,35 +1517,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 31, - "column": 31 - }, - "end": { - "line": 31, - "column": 35 - } - } - }, - "loc": { - "start": { - "line": 31, - "column": 31 - }, - "end": { - "line": 31, - "column": 38 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 31, @@ -1805,7 +1525,7 @@ }, "end": { "line": 31, - "column": 38 + "column": 35 } } }, @@ -2268,35 +1988,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 39, - "column": 17 - }, - "end": { - "line": 39, - "column": 21 - } - } - }, - "loc": { - "start": { - "line": 39, - "column": 17 - }, - "end": { - "line": 39, - "column": 23 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 39, @@ -2304,7 +1996,7 @@ }, "end": { "line": 39, - "column": 23 + "column": 21 } } }, @@ -2506,35 +2198,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 41, - "column": 27 - }, - "end": { - "line": 41, - "column": 31 - } - } - }, - "loc": { - "start": { - "line": 41, - "column": 27 - }, - "end": { - "line": 41, - "column": 33 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 41, @@ -2542,7 +2206,7 @@ }, "end": { "line": 41, - "column": 33 + "column": 31 } } }, @@ -2553,7 +2217,7 @@ }, "end": { "line": 41, - "column": 33 + "column": 31 } } }, @@ -2621,35 +2285,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 41, - "column": 46 - }, - "end": { - "line": 41, - "column": 50 - } - } - }, - "loc": { - "start": { - "line": 41, - "column": 46 - }, - "end": { - "line": 41, - "column": 53 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 41, @@ -2657,7 +2293,7 @@ }, "end": { "line": 41, - "column": 53 + "column": 50 } } }, @@ -3381,35 +3017,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 52, - "column": 27 - }, - "end": { - "line": 52, - "column": 31 - } - } - }, - "loc": { - "start": { - "line": 52, - "column": 27 - }, - "end": { - "line": 52, - "column": 33 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 52, @@ -3417,7 +3025,7 @@ }, "end": { "line": 52, - "column": 33 + "column": 31 } } }, @@ -3428,7 +3036,7 @@ }, "end": { "line": 52, - "column": 33 + "column": 31 } } }, @@ -3496,35 +3104,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 52, - "column": 46 - }, - "end": { - "line": 52, - "column": 50 - } - } - }, - "loc": { - "start": { - "line": 52, - "column": 46 - }, - "end": { - "line": 52, - "column": 53 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 52, @@ -3532,7 +3112,7 @@ }, "end": { "line": 52, - "column": 53 + "column": 50 } } }, diff --git a/ets2panda/test/compiler/ets/launch_expression-expected.txt b/ets2panda/test/compiler/ets/launch_expression-expected.txt index e0578ae1619..80498b48341 100644 --- a/ets2panda/test/compiler/ets/launch_expression-expected.txt +++ b/ets2panda/test/compiler/ets/launch_expression-expected.txt @@ -873,35 +873,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 47 - }, - "end": { - "line": 21, - "column": 51 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 47 - }, - "end": { - "line": 21, - "column": 53 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -909,7 +881,7 @@ }, "end": { "line": 21, - "column": 53 + "column": 51 } } }, diff --git a/ets2panda/test/compiler/ets/loopWithinLambda-expected.txt b/ets2panda/test/compiler/ets/loopWithinLambda-expected.txt index 520b7c45cc2..379d7e6cedd 100644 --- a/ets2panda/test/compiler/ets/loopWithinLambda-expected.txt +++ b/ets2panda/test/compiler/ets/loopWithinLambda-expected.txt @@ -64,43 +64,15 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 24 - }, - "end": { - "line": 16, - "column": 28 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 24 - }, - "end": { - "line": 17, - "column": 5 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, "column": 24 }, "end": { - "line": 17, - "column": 5 + "line": 16, + "column": 28 } } }, @@ -110,8 +82,8 @@ "column": 12 }, "end": { - "line": 17, - "column": 5 + "line": 16, + "column": 28 } } }, diff --git a/ets2panda/test/compiler/ets/manyLocalsParamRegUsage-expected.txt b/ets2panda/test/compiler/ets/manyLocalsParamRegUsage-expected.txt index 9c8d5790d23..4ce29d80363 100644 --- a/ets2panda/test/compiler/ets/manyLocalsParamRegUsage-expected.txt +++ b/ets2panda/test/compiler/ets/manyLocalsParamRegUsage-expected.txt @@ -31096,35 +31096,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 277, - "column": 18 - }, - "end": { - "line": 277, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 277, - "column": 18 - }, - "end": { - "line": 277, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 277, @@ -31132,7 +31104,7 @@ }, "end": { "line": 277, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/memberExprInLambda-expected.txt b/ets2panda/test/compiler/ets/memberExprInLambda-expected.txt index 5ffa599cc2e..63f199135e9 100644 --- a/ets2panda/test/compiler/ets/memberExprInLambda-expected.txt +++ b/ets2panda/test/compiler/ets/memberExprInLambda-expected.txt @@ -22,43 +22,15 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 28 - }, - "end": { - "line": 16, - "column": 32 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 28 - }, - "end": { - "line": 18, - "column": 9 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, "column": 28 }, "end": { - "line": 18, - "column": 9 + "line": 16, + "column": 32 } } }, @@ -68,8 +40,8 @@ "column": 22 }, "end": { - "line": 18, - "column": 9 + "line": 16, + "column": 32 } } }, @@ -245,35 +217,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 39 - }, - "end": { - "line": 18, - "column": 43 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 39 - }, - "end": { - "line": 18, - "column": 45 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -281,7 +225,7 @@ }, "end": { "line": 18, - "column": 45 + "column": 43 } } }, diff --git a/ets2panda/test/compiler/ets/memberExpressionFromStaticContext-expected.txt b/ets2panda/test/compiler/ets/memberExpressionFromStaticContext-expected.txt index 235443a3f39..ecf979a735e 100644 --- a/ets2panda/test/compiler/ets/memberExpressionFromStaticContext-expected.txt +++ b/ets2panda/test/compiler/ets/memberExpressionFromStaticContext-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 24 + "column": 22 } } }, @@ -203,35 +175,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 32 - }, - "end": { - "line": 18, - "column": 36 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 32 - }, - "end": { - "line": 18, - "column": 38 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -239,7 +183,7 @@ }, "end": { "line": 18, - "column": 38 + "column": 36 } } }, @@ -408,35 +352,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 31 - }, - "end": { - "line": 20, - "column": 35 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 31 - }, - "end": { - "line": 20, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -444,7 +360,7 @@ }, "end": { "line": 20, - "column": 37 + "column": 35 } } }, @@ -827,35 +743,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 27, - "column": 18 - }, - "end": { - "line": 27, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 27, - "column": 18 - }, - "end": { - "line": 27, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 27, @@ -863,7 +751,7 @@ }, "end": { "line": 27, - "column": 24 + "column": 22 } } }, @@ -962,35 +850,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 28, - "column": 32 - }, - "end": { - "line": 28, - "column": 36 - } - } - }, - "loc": { - "start": { - "line": 28, - "column": 32 - }, - "end": { - "line": 28, - "column": 38 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 28, @@ -998,7 +858,7 @@ }, "end": { "line": 28, - "column": 38 + "column": 36 } } }, @@ -1167,35 +1027,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 30, - "column": 31 - }, - "end": { - "line": 30, - "column": 35 - } - } - }, - "loc": { - "start": { - "line": 30, - "column": 31 - }, - "end": { - "line": 30, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 30, @@ -1203,7 +1035,7 @@ }, "end": { "line": 30, - "column": 37 + "column": 35 } } }, @@ -1871,35 +1703,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 41, - "column": 18 - }, - "end": { - "line": 41, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 41, - "column": 18 - }, - "end": { - "line": 41, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 41, @@ -1907,7 +1711,7 @@ }, "end": { "line": 41, - "column": 24 + "column": 22 } } }, @@ -2006,35 +1810,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 42, - "column": 32 - }, - "end": { - "line": 42, - "column": 36 - } - } - }, - "loc": { - "start": { - "line": 42, - "column": 32 - }, - "end": { - "line": 42, - "column": 38 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 42, @@ -2042,7 +1818,7 @@ }, "end": { "line": 42, - "column": 38 + "column": 36 } } }, @@ -2211,35 +1987,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 44, - "column": 31 - }, - "end": { - "line": 44, - "column": 35 - } - } - }, - "loc": { - "start": { - "line": 44, - "column": 31 - }, - "end": { - "line": 44, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 44, @@ -2247,7 +1995,7 @@ }, "end": { "line": 44, - "column": 37 + "column": 35 } } }, diff --git a/ets2panda/test/compiler/ets/methodOverrideCovariantReturnType-expected.txt b/ets2panda/test/compiler/ets/methodOverrideCovariantReturnType-expected.txt index 186fa4c3714..e720473d116 100644 --- a/ets2panda/test/compiler/ets/methodOverrideCovariantReturnType-expected.txt +++ b/ets2panda/test/compiler/ets/methodOverrideCovariantReturnType-expected.txt @@ -310,35 +310,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 12 - }, - "end": { - "line": 21, - "column": 16 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 12 - }, - "end": { - "line": 21, - "column": 17 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -346,7 +318,7 @@ }, "end": { "line": 21, - "column": 17 + "column": 16 } } }, @@ -358,7 +330,7 @@ }, "end": { "line": 21, - "column": 17 + "column": 16 } } }, @@ -369,7 +341,7 @@ }, "end": { "line": 21, - "column": 17 + "column": 16 } } }, @@ -749,35 +721,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 28, - "column": 21 - }, - "end": { - "line": 28, - "column": 25 - } - } - }, - "loc": { - "start": { - "line": 28, - "column": 21 - }, - "end": { - "line": 28, - "column": 27 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 28, @@ -785,7 +729,7 @@ }, "end": { "line": 28, - "column": 27 + "column": 25 } } }, diff --git a/ets2panda/test/compiler/ets/methodOverrideDifferentSignature-expected.txt b/ets2panda/test/compiler/ets/methodOverrideDifferentSignature-expected.txt index 87cc2b20e2a..368e2ab824f 100644 --- a/ets2panda/test/compiler/ets/methodOverrideDifferentSignature-expected.txt +++ b/ets2panda/test/compiler/ets/methodOverrideDifferentSignature-expected.txt @@ -52,35 +52,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 12 - }, - "end": { - "line": 17, - "column": 16 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 12 - }, - "end": { - "line": 17, - "column": 17 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -88,7 +60,7 @@ }, "end": { "line": 17, - "column": 17 + "column": 16 } } }, @@ -100,7 +72,7 @@ }, "end": { "line": 17, - "column": 17 + "column": 16 } } }, @@ -111,7 +83,7 @@ }, "end": { "line": 17, - "column": 17 + "column": 16 } } }, @@ -289,35 +261,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 21 - }, - "end": { - "line": 21, - "column": 25 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 21 - }, - "end": { - "line": 21, - "column": 26 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -325,7 +269,7 @@ }, "end": { "line": 21, - "column": 26 + "column": 25 } } }, @@ -424,35 +368,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 21 - }, - "end": { - "line": 24, - "column": 25 - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 21 - }, - "end": { - "line": 24, - "column": 26 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -460,7 +376,7 @@ }, "end": { "line": 24, - "column": 26 + "column": 25 } } }, @@ -575,35 +491,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 25, - "column": 27 - }, - "end": { - "line": 25, - "column": 31 - } - } - }, - "loc": { - "start": { - "line": 25, - "column": 27 - }, - "end": { - "line": 25, - "column": 32 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 25, @@ -611,7 +499,7 @@ }, "end": { "line": 25, - "column": 32 + "column": 31 } } }, @@ -738,35 +626,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 26, - "column": 21 - }, - "end": { - "line": 26, - "column": 25 - } - } - }, - "loc": { - "start": { - "line": 26, - "column": 21 - }, - "end": { - "line": 26, - "column": 26 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 26, @@ -774,7 +634,7 @@ }, "end": { "line": 26, - "column": 26 + "column": 25 } } }, @@ -1063,35 +923,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 32, - "column": 21 - }, - "end": { - "line": 32, - "column": 25 - } - } - }, - "loc": { - "start": { - "line": 32, - "column": 21 - }, - "end": { - "line": 32, - "column": 27 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 32, @@ -1099,7 +931,7 @@ }, "end": { "line": 32, - "column": 27 + "column": 25 } } }, @@ -1228,35 +1060,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 35, - "column": 27 - }, - "end": { - "line": 35, - "column": 31 - } - } - }, - "loc": { - "start": { - "line": 35, - "column": 27 - }, - "end": { - "line": 35, - "column": 33 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 35, @@ -1264,7 +1068,7 @@ }, "end": { "line": 35, - "column": 33 + "column": 31 } } }, diff --git a/ets2panda/test/compiler/ets/methodOverrideWithoutModifier-expected.txt b/ets2panda/test/compiler/ets/methodOverrideWithoutModifier-expected.txt index ee9fd7f3da6..1ebdcf5cf1d 100644 --- a/ets2panda/test/compiler/ets/methodOverrideWithoutModifier-expected.txt +++ b/ets2panda/test/compiler/ets/methodOverrideWithoutModifier-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 19 - }, - "end": { - "line": 17, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 19 - }, - "end": { - "line": 17, - "column": 25 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 25 + "column": 23 } } }, @@ -380,35 +352,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 19 - }, - "end": { - "line": 23, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 19 - }, - "end": { - "line": 23, - "column": 25 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -416,7 +360,7 @@ }, "end": { "line": 23, - "column": 25 + "column": 23 } } }, diff --git a/ets2panda/test/compiler/ets/mostSpecificMethod1-expected.txt b/ets2panda/test/compiler/ets/mostSpecificMethod1-expected.txt index 092cdcfa488..f7536c676de 100644 --- a/ets2panda/test/compiler/ets/mostSpecificMethod1-expected.txt +++ b/ets2panda/test/compiler/ets/mostSpecificMethod1-expected.txt @@ -438,35 +438,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 33 - }, - "end": { - "line": 18, - "column": 37 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 33 - }, - "end": { - "line": 18, - "column": 39 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -474,7 +446,7 @@ }, "end": { "line": 18, - "column": 39 + "column": 37 } } }, @@ -700,35 +672,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 33 - }, - "end": { - "line": 19, - "column": 37 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 33 - }, - "end": { - "line": 19, - "column": 39 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -736,7 +680,7 @@ }, "end": { "line": 19, - "column": 39 + "column": 37 } } }, @@ -848,35 +792,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 19 - }, - "end": { - "line": 21, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 19 - }, - "end": { - "line": 21, - "column": 25 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -884,7 +800,7 @@ }, "end": { "line": 21, - "column": 25 + "column": 23 } } }, diff --git a/ets2panda/test/compiler/ets/mostSpecificMethod2-expected.txt b/ets2panda/test/compiler/ets/mostSpecificMethod2-expected.txt index a20cd28451c..f03bd4f954b 100644 --- a/ets2panda/test/compiler/ets/mostSpecificMethod2-expected.txt +++ b/ets2panda/test/compiler/ets/mostSpecificMethod2-expected.txt @@ -344,35 +344,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 35 - }, - "end": { - "line": 19, - "column": 39 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 35 - }, - "end": { - "line": 19, - "column": 41 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -380,7 +352,7 @@ }, "end": { "line": 19, - "column": 41 + "column": 39 } } }, @@ -795,35 +767,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 35 - }, - "end": { - "line": 23, - "column": 39 - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 35 - }, - "end": { - "line": 23, - "column": 41 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -831,7 +775,7 @@ }, "end": { "line": 23, - "column": 41 + "column": 39 } } }, @@ -1161,35 +1105,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 26, - "column": 19 - }, - "end": { - "line": 26, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 26, - "column": 19 - }, - "end": { - "line": 26, - "column": 25 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 26, @@ -1197,7 +1113,7 @@ }, "end": { "line": 26, - "column": 25 + "column": 23 } } }, diff --git a/ets2panda/test/compiler/ets/multipleMethodOverride-expected.txt b/ets2panda/test/compiler/ets/multipleMethodOverride-expected.txt index f4a594d5c50..bd23a6c98aa 100644 --- a/ets2panda/test/compiler/ets/multipleMethodOverride-expected.txt +++ b/ets2panda/test/compiler/ets/multipleMethodOverride-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 20 - }, - "end": { - "line": 17, - "column": 24 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 20 - }, - "end": { - "line": 17, - "column": 26 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 26 + "column": 24 } } }, @@ -380,35 +352,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 28 - }, - "end": { - "line": 23, - "column": 32 - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 28 - }, - "end": { - "line": 23, - "column": 33 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -416,7 +360,7 @@ }, "end": { "line": 23, - "column": 33 + "column": 32 } } }, @@ -869,35 +813,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 34, - "column": 28 - }, - "end": { - "line": 34, - "column": 32 - } - } - }, - "loc": { - "start": { - "line": 34, - "column": 28 - }, - "end": { - "line": 34, - "column": 34 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 34, @@ -905,7 +821,7 @@ }, "end": { "line": 34, - "column": 34 + "column": 32 } } }, diff --git a/ets2panda/test/compiler/ets/n_assignGenericWithNullableTypeParamToNonNullable-expected.txt b/ets2panda/test/compiler/ets/n_assignGenericWithNullableTypeParamToNonNullable-expected.txt index 218cfffdcb3..3e309edc7de 100644 --- a/ets2panda/test/compiler/ets/n_assignGenericWithNullableTypeParamToNonNullable-expected.txt +++ b/ets2panda/test/compiler/ets/n_assignGenericWithNullableTypeParamToNonNullable-expected.txt @@ -479,35 +479,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 18 - }, - "end": { - "line": 19, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 18 - }, - "end": { - "line": 19, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -515,7 +487,7 @@ }, "end": { "line": 19, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/n_ensureNotNullArgNotNullable-expected.txt b/ets2panda/test/compiler/ets/n_ensureNotNullArgNotNullable-expected.txt index 91ecb22a02e..5cad4b3869c 100644 --- a/ets2panda/test/compiler/ets/n_ensureNotNullArgNotNullable-expected.txt +++ b/ets2panda/test/compiler/ets/n_ensureNotNullArgNotNullable-expected.txt @@ -301,35 +301,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 25 - }, - "end": { - "line": 18, - "column": 29 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 25 - }, - "end": { - "line": 18, - "column": 31 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -337,7 +309,7 @@ }, "end": { "line": 18, - "column": 31 + "column": 29 } } }, @@ -478,35 +450,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 19 - }, - "end": { - "line": 22, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 19 - }, - "end": { - "line": 22, - "column": 25 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -514,7 +458,7 @@ }, "end": { "line": 22, - "column": 25 + "column": 23 } } }, diff --git a/ets2panda/test/compiler/ets/n_ensureNotNullLocalNotNullable-expected.txt b/ets2panda/test/compiler/ets/n_ensureNotNullLocalNotNullable-expected.txt index 694d785f8fa..2f8abc4deea 100644 --- a/ets2panda/test/compiler/ets/n_ensureNotNullLocalNotNullable-expected.txt +++ b/ets2panda/test/compiler/ets/n_ensureNotNullLocalNotNullable-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 19 - }, - "end": { - "line": 16, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 19 - }, - "end": { - "line": 16, - "column": 25 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 25 + "column": 23 } } }, diff --git a/ets2panda/test/compiler/ets/n_ensureNotNullReturnNotNullable-expected.txt b/ets2panda/test/compiler/ets/n_ensureNotNullReturnNotNullable-expected.txt index 40646700590..c2eb96050fa 100644 --- a/ets2panda/test/compiler/ets/n_ensureNotNullReturnNotNullable-expected.txt +++ b/ets2panda/test/compiler/ets/n_ensureNotNullReturnNotNullable-expected.txt @@ -366,35 +366,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 19 - }, - "end": { - "line": 20, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 19 - }, - "end": { - "line": 20, - "column": 25 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -402,7 +374,7 @@ }, "end": { "line": 20, - "column": 25 + "column": 23 } } }, diff --git a/ets2panda/test/compiler/ets/n_nullableTypeInArgNotRef-expected.txt b/ets2panda/test/compiler/ets/n_nullableTypeInArgNotRef-expected.txt index 4a7b6839493..c3af20f28ee 100644 --- a/ets2panda/test/compiler/ets/n_nullableTypeInArgNotRef-expected.txt +++ b/ets2panda/test/compiler/ets/n_nullableTypeInArgNotRef-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 19 - }, - "end": { - "line": 16, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 19 - }, - "end": { - "line": 16, - "column": 25 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 25 + "column": 23 } } }, diff --git a/ets2panda/test/compiler/ets/n_nullableTypeInReturnNotRef-expected.txt b/ets2panda/test/compiler/ets/n_nullableTypeInReturnNotRef-expected.txt index 0bf5ccb540c..47319178150 100644 --- a/ets2panda/test/compiler/ets/n_nullableTypeInReturnNotRef-expected.txt +++ b/ets2panda/test/compiler/ets/n_nullableTypeInReturnNotRef-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 19 - }, - "end": { - "line": 16, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 19 - }, - "end": { - "line": 16, - "column": 25 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 25 + "column": 23 } } }, diff --git a/ets2panda/test/compiler/ets/n_nullableTypeNotRef-expected.txt b/ets2panda/test/compiler/ets/n_nullableTypeNotRef-expected.txt index c7344bfab70..19c41c77fe7 100644 --- a/ets2panda/test/compiler/ets/n_nullableTypeNotRef-expected.txt +++ b/ets2panda/test/compiler/ets/n_nullableTypeNotRef-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/non-const-lambda-with-scopes-expected.txt b/ets2panda/test/compiler/ets/non-const-lambda-with-scopes-expected.txt index 805ca37c91e..545a47975d1 100644 --- a/ets2panda/test/compiler/ets/non-const-lambda-with-scopes-expected.txt +++ b/ets2panda/test/compiler/ets/non-const-lambda-with-scopes-expected.txt @@ -234,35 +234,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -270,7 +242,7 @@ }, "end": { "line": 17, - "column": 24 + "column": 22 } } }, @@ -281,7 +253,7 @@ }, "end": { "line": 17, - "column": 24 + "column": 22 } } }, 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 f309c045031..9b711484195 100644 --- a/ets2panda/test/compiler/ets/null_coalescing_generic_1-expected.txt +++ b/ets2panda/test/compiler/ets/null_coalescing_generic_1-expected.txt @@ -927,35 +927,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 39 - }, - "end": { - "line": 24, - "column": 43 - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 39 - }, - "end": { - "line": 24, - "column": 45 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -963,7 +935,7 @@ }, "end": { "line": 24, - "column": 45 + "column": 43 } } }, diff --git a/ets2panda/test/compiler/ets/nullableTuple-expected.txt b/ets2panda/test/compiler/ets/nullableTuple-expected.txt index 6cd2174f4a8..ae6508298aa 100644 --- a/ets2panda/test/compiler/ets/nullableTuple-expected.txt +++ b/ets2panda/test/compiler/ets/nullableTuple-expected.txt @@ -357,35 +357,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 18 - }, - "end": { - "line": 19, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 18 - }, - "end": { - "line": 19, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -393,7 +365,7 @@ }, "end": { "line": 19, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/optionalLambdaParameter-expected.txt b/ets2panda/test/compiler/ets/optionalLambdaParameter-expected.txt index 9924e957d69..94711f44e17 100644 --- a/ets2panda/test/compiler/ets/optionalLambdaParameter-expected.txt +++ b/ets2panda/test/compiler/ets/optionalLambdaParameter-expected.txt @@ -170,35 +170,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 27 - }, - "end": { - "line": 16, - "column": 31 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 27 - }, - "end": { - "line": 16, - "column": 32 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -206,7 +178,7 @@ }, "end": { "line": 16, - "column": 32 + "column": 31 } } }, @@ -217,7 +189,7 @@ }, "end": { "line": 16, - "column": 32 + "column": 31 } } }, @@ -229,7 +201,7 @@ }, "end": { "line": 16, - "column": 32 + "column": 31 } } }, @@ -254,41 +226,13 @@ }, "end": { "line": 16, - "column": 32 + "column": 31 } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 34 - }, - "end": { - "line": 16, - "column": 38 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 34 - }, - "end": { - "line": 16, - "column": 40 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -296,7 +240,7 @@ }, "end": { "line": 16, - "column": 40 + "column": 38 } } }, @@ -435,35 +379,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 3 - }, - "end": { - "line": 1, - "column": 3 - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 3 - }, - "end": { - "line": 1, - "column": 3 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 1, @@ -552,35 +468,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 3 - }, - "end": { - "line": 1, - "column": 3 - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 3 - }, - "end": { - "line": 1, - "column": 3 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 1, diff --git a/ets2panda/test/compiler/ets/override-expected.txt b/ets2panda/test/compiler/ets/override-expected.txt index ea0b9f42c74..5d9f9166d90 100644 --- a/ets2panda/test/compiler/ets/override-expected.txt +++ b/ets2panda/test/compiler/ets/override-expected.txt @@ -1648,35 +1648,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 30, - "column": 18 - }, - "end": { - "line": 30, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 30, - "column": 18 - }, - "end": { - "line": 30, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 30, @@ -1684,7 +1656,7 @@ }, "end": { "line": 30, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/override11-expected.txt b/ets2panda/test/compiler/ets/override11-expected.txt index fce7b048ca8..c8a4a3eceda 100644 --- a/ets2panda/test/compiler/ets/override11-expected.txt +++ b/ets2panda/test/compiler/ets/override11-expected.txt @@ -564,35 +564,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 24 - }, - "end": { - "line": 21, - "column": 28 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 24 - }, - "end": { - "line": 21, - "column": 30 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -600,7 +572,7 @@ }, "end": { "line": 21, - "column": 30 + "column": 28 } } }, diff --git a/ets2panda/test/compiler/ets/override18-expected.txt b/ets2panda/test/compiler/ets/override18-expected.txt index a3d01a0fb65..7a632e825f9 100644 --- a/ets2panda/test/compiler/ets/override18-expected.txt +++ b/ets2panda/test/compiler/ets/override18-expected.txt @@ -698,35 +698,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 28, - "column": 18 - }, - "end": { - "line": 28, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 28, - "column": 18 - }, - "end": { - "line": 28, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 28, @@ -734,7 +706,7 @@ }, "end": { "line": 28, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/override19-expected.txt b/ets2panda/test/compiler/ets/override19-expected.txt index c84d6058093..8de54e6fc9a 100644 --- a/ets2panda/test/compiler/ets/override19-expected.txt +++ b/ets2panda/test/compiler/ets/override19-expected.txt @@ -774,35 +774,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 28, - "column": 18 - }, - "end": { - "line": 28, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 28, - "column": 18 - }, - "end": { - "line": 28, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 28, @@ -810,7 +782,7 @@ }, "end": { "line": 28, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/override7-expected.txt b/ets2panda/test/compiler/ets/override7-expected.txt index 07454f6cbc3..23688d8c446 100644 --- a/ets2panda/test/compiler/ets/override7-expected.txt +++ b/ets2panda/test/compiler/ets/override7-expected.txt @@ -52,35 +52,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 9 - }, - "end": { - "line": 17, - "column": 13 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 9 - }, - "end": { - "line": 17, - "column": 14 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -88,7 +60,7 @@ }, "end": { "line": 17, - "column": 14 + "column": 13 } } }, @@ -100,7 +72,7 @@ }, "end": { "line": 17, - "column": 14 + "column": 13 } } }, @@ -111,7 +83,7 @@ }, "end": { "line": 17, - "column": 14 + "column": 13 } } }, diff --git a/ets2panda/test/compiler/ets/parenthesizedType-expected.txt b/ets2panda/test/compiler/ets/parenthesizedType-expected.txt index 66ec32d1373..46aee6f7dc9 100644 --- a/ets2panda/test/compiler/ets/parenthesizedType-expected.txt +++ b/ets2panda/test/compiler/ets/parenthesizedType-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/privateMethodOverride-expected.txt b/ets2panda/test/compiler/ets/privateMethodOverride-expected.txt index 1deee57fdca..a8ef1eed4de 100644 --- a/ets2panda/test/compiler/ets/privateMethodOverride-expected.txt +++ b/ets2panda/test/compiler/ets/privateMethodOverride-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 20 - }, - "end": { - "line": 17, - "column": 24 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 20 - }, - "end": { - "line": 17, - "column": 26 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 26 + "column": 24 } } }, @@ -380,35 +352,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 28 - }, - "end": { - "line": 22, - "column": 32 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 28 - }, - "end": { - "line": 22, - "column": 34 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -416,7 +360,7 @@ }, "end": { "line": 22, - "column": 34 + "column": 32 } } }, diff --git a/ets2panda/test/compiler/ets/referenceEqualityNotCastable_n-expected.txt b/ets2panda/test/compiler/ets/referenceEqualityNotCastable_n-expected.txt index 43de9aa5285..a0a3db302e3 100644 --- a/ets2panda/test/compiler/ets/referenceEqualityNotCastable_n-expected.txt +++ b/ets2panda/test/compiler/ets/referenceEqualityNotCastable_n-expected.txt @@ -436,35 +436,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 18 - }, - "end": { - "line": 19, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 18 - }, - "end": { - "line": 19, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -472,7 +444,7 @@ }, "end": { "line": 19, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/referenceEqualityNotReference_n-expected.txt b/ets2panda/test/compiler/ets/referenceEqualityNotReference_n-expected.txt index b3de43ef5ab..14209131644 100644 --- a/ets2panda/test/compiler/ets/referenceEqualityNotReference_n-expected.txt +++ b/ets2panda/test/compiler/ets/referenceEqualityNotReference_n-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/rethrowingCheck1-expected.txt b/ets2panda/test/compiler/ets/rethrowingCheck1-expected.txt index 97d9b27bee3..86a5b570f94 100644 --- a/ets2panda/test/compiler/ets/rethrowingCheck1-expected.txt +++ b/ets2panda/test/compiler/ets/rethrowingCheck1-expected.txt @@ -349,35 +349,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 23 - }, - "end": { - "line": 20, - "column": 27 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 23 - }, - "end": { - "line": 20, - "column": 34 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -385,7 +357,7 @@ }, "end": { "line": 20, - "column": 34 + "column": 27 } } } @@ -397,7 +369,7 @@ }, "end": { "line": 20, - "column": 34 + "column": 27 } } }, @@ -409,7 +381,7 @@ }, "end": { "line": 20, - "column": 34 + "column": 27 } } }, @@ -420,7 +392,7 @@ }, "end": { "line": 20, - "column": 34 + "column": 27 } } } diff --git a/ets2panda/test/compiler/ets/rethrowingCheck2-expected.txt b/ets2panda/test/compiler/ets/rethrowingCheck2-expected.txt index 9911d705dc7..a49a77a89ae 100644 --- a/ets2panda/test/compiler/ets/rethrowingCheck2-expected.txt +++ b/ets2panda/test/compiler/ets/rethrowingCheck2-expected.txt @@ -349,35 +349,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 23 - }, - "end": { - "line": 20, - "column": 27 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 23 - }, - "end": { - "line": 20, - "column": 34 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -385,7 +357,7 @@ }, "end": { "line": 20, - "column": 34 + "column": 27 } } } @@ -397,7 +369,7 @@ }, "end": { "line": 20, - "column": 34 + "column": 27 } } }, @@ -409,7 +381,7 @@ }, "end": { "line": 20, - "column": 34 + "column": 27 } } }, @@ -420,7 +392,7 @@ }, "end": { "line": 20, - "column": 34 + "column": 27 } } } diff --git a/ets2panda/test/compiler/ets/rethrowingCheck3-expected.txt b/ets2panda/test/compiler/ets/rethrowingCheck3-expected.txt index aaaecc25842..290cdd30e0d 100644 --- a/ets2panda/test/compiler/ets/rethrowingCheck3-expected.txt +++ b/ets2panda/test/compiler/ets/rethrowingCheck3-expected.txt @@ -486,35 +486,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 23 - }, - "end": { - "line": 22, - "column": 27 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 23 - }, - "end": { - "line": 22, - "column": 34 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -522,7 +494,7 @@ }, "end": { "line": 22, - "column": 34 + "column": 27 } } } @@ -534,7 +506,7 @@ }, "end": { "line": 22, - "column": 34 + "column": 27 } } }, @@ -546,7 +518,7 @@ }, "end": { "line": 22, - "column": 34 + "column": 27 } } }, @@ -557,7 +529,7 @@ }, "end": { "line": 22, - "column": 34 + "column": 27 } } } diff --git a/ets2panda/test/compiler/ets/rethrowingCheck4-expected.txt b/ets2panda/test/compiler/ets/rethrowingCheck4-expected.txt index afc253df988..5a6ce7d33da 100644 --- a/ets2panda/test/compiler/ets/rethrowingCheck4-expected.txt +++ b/ets2panda/test/compiler/ets/rethrowingCheck4-expected.txt @@ -170,35 +170,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 23 - }, - "end": { - "line": 16, - "column": 27 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 23 - }, - "end": { - "line": 16, - "column": 34 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -206,7 +178,7 @@ }, "end": { "line": 16, - "column": 34 + "column": 27 } } } @@ -218,7 +190,7 @@ }, "end": { "line": 16, - "column": 34 + "column": 27 } } }, @@ -230,7 +202,7 @@ }, "end": { "line": 16, - "column": 34 + "column": 27 } } }, @@ -241,7 +213,7 @@ }, "end": { "line": 16, - "column": 34 + "column": 27 } } } @@ -573,35 +545,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 23 - }, - "end": { - "line": 24, - "column": 27 - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 23 - }, - "end": { - "line": 24, - "column": 34 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -609,7 +553,7 @@ }, "end": { "line": 24, - "column": 34 + "column": 27 } } } @@ -621,7 +565,7 @@ }, "end": { "line": 24, - "column": 34 + "column": 27 } } }, @@ -633,7 +577,7 @@ }, "end": { "line": 24, - "column": 34 + "column": 27 } } }, @@ -644,7 +588,7 @@ }, "end": { "line": 24, - "column": 34 + "column": 27 } } } diff --git a/ets2panda/test/compiler/ets/rethrowingCheck5-expected.txt b/ets2panda/test/compiler/ets/rethrowingCheck5-expected.txt index 49ce2879b6b..8e2efb7703d 100644 --- a/ets2panda/test/compiler/ets/rethrowingCheck5-expected.txt +++ b/ets2panda/test/compiler/ets/rethrowingCheck5-expected.txt @@ -170,35 +170,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 23 - }, - "end": { - "line": 16, - "column": 27 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 23 - }, - "end": { - "line": 16, - "column": 34 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -206,7 +178,7 @@ }, "end": { "line": 16, - "column": 34 + "column": 27 } } } @@ -218,7 +190,7 @@ }, "end": { "line": 16, - "column": 34 + "column": 27 } } }, @@ -230,7 +202,7 @@ }, "end": { "line": 16, - "column": 34 + "column": 27 } } }, @@ -241,7 +213,7 @@ }, "end": { "line": 16, - "column": 34 + "column": 27 } } } @@ -752,35 +724,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 28, - "column": 23 - }, - "end": { - "line": 28, - "column": 27 - } - } - }, - "loc": { - "start": { - "line": 28, - "column": 23 - }, - "end": { - "line": 28, - "column": 34 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 28, @@ -788,7 +732,7 @@ }, "end": { "line": 28, - "column": 34 + "column": 27 } } } @@ -800,7 +744,7 @@ }, "end": { "line": 28, - "column": 34 + "column": 27 } } }, @@ -812,7 +756,7 @@ }, "end": { "line": 28, - "column": 34 + "column": 27 } } }, @@ -823,7 +767,7 @@ }, "end": { "line": 28, - "column": 34 + "column": 27 } } } diff --git a/ets2panda/test/compiler/ets/rethrowingConstructorCheck1-expected.txt b/ets2panda/test/compiler/ets/rethrowingConstructorCheck1-expected.txt index 5182f5da7a7..ce862a7ffb2 100644 --- a/ets2panda/test/compiler/ets/rethrowingConstructorCheck1-expected.txt +++ b/ets2panda/test/compiler/ets/rethrowingConstructorCheck1-expected.txt @@ -76,35 +76,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 24 - }, - "end": { - "line": 17, - "column": 28 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 24 - }, - "end": { - "line": 17, - "column": 35 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -112,7 +84,7 @@ }, "end": { "line": 17, - "column": 35 + "column": 28 } } } @@ -124,7 +96,7 @@ }, "end": { "line": 17, - "column": 35 + "column": 28 } } }, @@ -136,7 +108,7 @@ }, "end": { "line": 17, - "column": 35 + "column": 28 } } }, @@ -147,7 +119,7 @@ }, "end": { "line": 17, - "column": 35 + "column": 28 } } } @@ -386,35 +358,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 26 - }, - "end": { - "line": 20, - "column": 30 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 26 - }, - "end": { - "line": 20, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -422,7 +366,7 @@ }, "end": { "line": 20, - "column": 37 + "column": 30 } } }, @@ -522,35 +466,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -558,7 +474,7 @@ }, "end": { "line": 22, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/rethrowingConstructorCheck2-expected.txt b/ets2panda/test/compiler/ets/rethrowingConstructorCheck2-expected.txt index 3fc32efe476..47a35c73a54 100644 --- a/ets2panda/test/compiler/ets/rethrowingConstructorCheck2-expected.txt +++ b/ets2panda/test/compiler/ets/rethrowingConstructorCheck2-expected.txt @@ -76,35 +76,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 24 - }, - "end": { - "line": 17, - "column": 28 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 24 - }, - "end": { - "line": 17, - "column": 35 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -112,7 +84,7 @@ }, "end": { "line": 17, - "column": 35 + "column": 28 } } } @@ -124,7 +96,7 @@ }, "end": { "line": 17, - "column": 35 + "column": 28 } } }, @@ -136,7 +108,7 @@ }, "end": { "line": 17, - "column": 35 + "column": 28 } } }, @@ -147,7 +119,7 @@ }, "end": { "line": 17, - "column": 35 + "column": 28 } } } @@ -386,35 +358,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 26 - }, - "end": { - "line": 20, - "column": 30 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 26 - }, - "end": { - "line": 20, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -422,7 +366,7 @@ }, "end": { "line": 20, - "column": 37 + "column": 30 } } }, @@ -522,35 +466,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -558,7 +474,7 @@ }, "end": { "line": 22, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/rethrowingConstructorCheck3-expected.txt b/ets2panda/test/compiler/ets/rethrowingConstructorCheck3-expected.txt index ba9a7eb04d4..a634a58ce82 100644 --- a/ets2panda/test/compiler/ets/rethrowingConstructorCheck3-expected.txt +++ b/ets2panda/test/compiler/ets/rethrowingConstructorCheck3-expected.txt @@ -76,35 +76,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 24 - }, - "end": { - "line": 17, - "column": 28 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 24 - }, - "end": { - "line": 17, - "column": 35 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -112,7 +84,7 @@ }, "end": { "line": 17, - "column": 35 + "column": 28 } } } @@ -124,7 +96,7 @@ }, "end": { "line": 17, - "column": 35 + "column": 28 } } }, @@ -136,7 +108,7 @@ }, "end": { "line": 17, - "column": 35 + "column": 28 } } }, @@ -147,7 +119,7 @@ }, "end": { "line": 17, - "column": 35 + "column": 28 } } } @@ -386,35 +358,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 26 - }, - "end": { - "line": 20, - "column": 30 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 26 - }, - "end": { - "line": 20, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -422,7 +366,7 @@ }, "end": { "line": 20, - "column": 37 + "column": 30 } } }, @@ -522,35 +466,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -558,7 +474,7 @@ }, "end": { "line": 22, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/rethrowingFunctionCheck1-expected.txt b/ets2panda/test/compiler/ets/rethrowingFunctionCheck1-expected.txt index 0b5a41b6b2d..d262f89bdd7 100644 --- a/ets2panda/test/compiler/ets/rethrowingFunctionCheck1-expected.txt +++ b/ets2panda/test/compiler/ets/rethrowingFunctionCheck1-expected.txt @@ -170,35 +170,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 32 - }, - "end": { - "line": 16, - "column": 36 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 32 - }, - "end": { - "line": 16, - "column": 43 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -206,7 +178,7 @@ }, "end": { "line": 16, - "column": 43 + "column": 36 } } } @@ -218,7 +190,7 @@ }, "end": { "line": 16, - "column": 43 + "column": 36 } } }, @@ -230,7 +202,7 @@ }, "end": { "line": 16, - "column": 43 + "column": 36 } } }, @@ -241,41 +213,13 @@ }, "end": { "line": 16, - "column": 43 + "column": 36 } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 46 - }, - "end": { - "line": 16, - "column": 50 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 46 - }, - "end": { - "line": 16, - "column": 59 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -283,7 +227,7 @@ }, "end": { "line": 16, - "column": 59 + "column": 50 } } }, @@ -383,35 +327,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 29 - }, - "end": { - "line": 18, - "column": 33 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 29 - }, - "end": { - "line": 18, - "column": 40 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -419,7 +335,7 @@ }, "end": { "line": 18, - "column": 40 + "column": 33 } } }, @@ -519,35 +435,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -555,7 +443,7 @@ }, "end": { "line": 20, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/rethrowingFunctionCheck2-expected.txt b/ets2panda/test/compiler/ets/rethrowingFunctionCheck2-expected.txt index 3de23241231..df58330bd06 100644 --- a/ets2panda/test/compiler/ets/rethrowingFunctionCheck2-expected.txt +++ b/ets2panda/test/compiler/ets/rethrowingFunctionCheck2-expected.txt @@ -170,35 +170,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 32 - }, - "end": { - "line": 16, - "column": 36 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 32 - }, - "end": { - "line": 16, - "column": 43 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -206,7 +178,7 @@ }, "end": { "line": 16, - "column": 43 + "column": 36 } } } @@ -218,7 +190,7 @@ }, "end": { "line": 16, - "column": 43 + "column": 36 } } }, @@ -230,7 +202,7 @@ }, "end": { "line": 16, - "column": 43 + "column": 36 } } }, @@ -241,41 +213,13 @@ }, "end": { "line": 16, - "column": 43 + "column": 36 } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 46 - }, - "end": { - "line": 16, - "column": 50 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 46 - }, - "end": { - "line": 16, - "column": 59 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -283,7 +227,7 @@ }, "end": { "line": 16, - "column": 59 + "column": 50 } } }, @@ -383,35 +327,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 29 - }, - "end": { - "line": 18, - "column": 33 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 29 - }, - "end": { - "line": 18, - "column": 40 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -419,7 +335,7 @@ }, "end": { "line": 18, - "column": 40 + "column": 33 } } }, @@ -519,35 +435,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -555,7 +443,7 @@ }, "end": { "line": 20, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/rethrowingFunctionCheck3-expected.txt b/ets2panda/test/compiler/ets/rethrowingFunctionCheck3-expected.txt index 0ba38e9c454..0d0c29ab581 100644 --- a/ets2panda/test/compiler/ets/rethrowingFunctionCheck3-expected.txt +++ b/ets2panda/test/compiler/ets/rethrowingFunctionCheck3-expected.txt @@ -170,35 +170,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 32 - }, - "end": { - "line": 16, - "column": 36 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 32 - }, - "end": { - "line": 16, - "column": 43 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -206,7 +178,7 @@ }, "end": { "line": 16, - "column": 43 + "column": 36 } } } @@ -218,7 +190,7 @@ }, "end": { "line": 16, - "column": 43 + "column": 36 } } }, @@ -230,7 +202,7 @@ }, "end": { "line": 16, - "column": 43 + "column": 36 } } }, @@ -241,41 +213,13 @@ }, "end": { "line": 16, - "column": 43 + "column": 36 } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 46 - }, - "end": { - "line": 16, - "column": 50 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 46 - }, - "end": { - "line": 16, - "column": 59 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -283,7 +227,7 @@ }, "end": { "line": 16, - "column": 59 + "column": 50 } } }, @@ -383,35 +327,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 29 - }, - "end": { - "line": 18, - "column": 33 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 29 - }, - "end": { - "line": 18, - "column": 40 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -419,7 +335,7 @@ }, "end": { "line": 18, - "column": 40 + "column": 33 } } }, @@ -519,35 +435,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -555,7 +443,7 @@ }, "end": { "line": 20, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/rethrowingMethodCheck1-expected.txt b/ets2panda/test/compiler/ets/rethrowingMethodCheck1-expected.txt index 17c45c9a59b..c714e1824d0 100644 --- a/ets2panda/test/compiler/ets/rethrowingMethodCheck1-expected.txt +++ b/ets2panda/test/compiler/ets/rethrowingMethodCheck1-expected.txt @@ -76,35 +76,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 23 - }, - "end": { - "line": 17, - "column": 27 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 23 - }, - "end": { - "line": 17, - "column": 34 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -112,7 +84,7 @@ }, "end": { "line": 17, - "column": 34 + "column": 27 } } } @@ -124,7 +96,7 @@ }, "end": { "line": 17, - "column": 34 + "column": 27 } } }, @@ -136,7 +108,7 @@ }, "end": { "line": 17, - "column": 34 + "column": 27 } } }, @@ -147,41 +119,13 @@ }, "end": { "line": 17, - "column": 34 + "column": 27 } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 37 - }, - "end": { - "line": 17, - "column": 41 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 37 - }, - "end": { - "line": 17, - "column": 50 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -189,7 +133,7 @@ }, "end": { "line": 17, - "column": 50 + "column": 41 } } }, @@ -520,35 +464,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 26 - }, - "end": { - "line": 20, - "column": 30 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 26 - }, - "end": { - "line": 20, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -556,7 +472,7 @@ }, "end": { "line": 20, - "column": 37 + "column": 30 } } }, @@ -656,35 +572,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -692,7 +580,7 @@ }, "end": { "line": 22, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/rethrowingMethodCheck2-expected.txt b/ets2panda/test/compiler/ets/rethrowingMethodCheck2-expected.txt index 71d276a37d6..870bdb61a66 100644 --- a/ets2panda/test/compiler/ets/rethrowingMethodCheck2-expected.txt +++ b/ets2panda/test/compiler/ets/rethrowingMethodCheck2-expected.txt @@ -76,35 +76,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 23 - }, - "end": { - "line": 17, - "column": 27 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 23 - }, - "end": { - "line": 17, - "column": 34 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -112,7 +84,7 @@ }, "end": { "line": 17, - "column": 34 + "column": 27 } } } @@ -124,7 +96,7 @@ }, "end": { "line": 17, - "column": 34 + "column": 27 } } }, @@ -136,7 +108,7 @@ }, "end": { "line": 17, - "column": 34 + "column": 27 } } }, @@ -147,41 +119,13 @@ }, "end": { "line": 17, - "column": 34 + "column": 27 } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 37 - }, - "end": { - "line": 17, - "column": 41 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 37 - }, - "end": { - "line": 17, - "column": 50 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -189,7 +133,7 @@ }, "end": { "line": 17, - "column": 50 + "column": 41 } } }, @@ -520,35 +464,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 26 - }, - "end": { - "line": 20, - "column": 30 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 26 - }, - "end": { - "line": 20, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -556,7 +472,7 @@ }, "end": { "line": 20, - "column": 37 + "column": 30 } } }, @@ -656,35 +572,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -692,7 +580,7 @@ }, "end": { "line": 22, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/rethrowingMethodCheck3-expected.txt b/ets2panda/test/compiler/ets/rethrowingMethodCheck3-expected.txt index c555782cc15..4e6788abc0c 100644 --- a/ets2panda/test/compiler/ets/rethrowingMethodCheck3-expected.txt +++ b/ets2panda/test/compiler/ets/rethrowingMethodCheck3-expected.txt @@ -76,35 +76,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 23 - }, - "end": { - "line": 17, - "column": 27 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 23 - }, - "end": { - "line": 17, - "column": 34 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -112,7 +84,7 @@ }, "end": { "line": 17, - "column": 34 + "column": 27 } } } @@ -124,7 +96,7 @@ }, "end": { "line": 17, - "column": 34 + "column": 27 } } }, @@ -136,7 +108,7 @@ }, "end": { "line": 17, - "column": 34 + "column": 27 } } }, @@ -147,41 +119,13 @@ }, "end": { "line": 17, - "column": 34 + "column": 27 } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 37 - }, - "end": { - "line": 17, - "column": 41 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 37 - }, - "end": { - "line": 17, - "column": 50 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -189,7 +133,7 @@ }, "end": { "line": 17, - "column": 50 + "column": 41 } } }, @@ -520,35 +464,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 26 - }, - "end": { - "line": 20, - "column": 30 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 26 - }, - "end": { - "line": 20, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -556,7 +472,7 @@ }, "end": { "line": 20, - "column": 37 + "column": 30 } } }, @@ -656,35 +572,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -692,7 +580,7 @@ }, "end": { "line": 22, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/return_missing_argument-expected.txt b/ets2panda/test/compiler/ets/return_missing_argument-expected.txt index c1f2ba31728..4f04d2781bc 100644 --- a/ets2panda/test/compiler/ets/return_missing_argument-expected.txt +++ b/ets2panda/test/compiler/ets/return_missing_argument-expected.txt @@ -355,35 +355,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 18 - }, - "end": { - "line": 21, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 18 - }, - "end": { - "line": 21, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -391,7 +363,7 @@ }, "end": { "line": 21, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/setArrayLength1-expected.txt b/ets2panda/test/compiler/ets/setArrayLength1-expected.txt index df6abda8ada..00ab3e26617 100644 --- a/ets2panda/test/compiler/ets/setArrayLength1-expected.txt +++ b/ets2panda/test/compiler/ets/setArrayLength1-expected.txt @@ -418,35 +418,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -454,7 +426,7 @@ }, "end": { "line": 20, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/setArrayLength2-expected.txt b/ets2panda/test/compiler/ets/setArrayLength2-expected.txt index 318aa2a263a..c1e777fff08 100644 --- a/ets2panda/test/compiler/ets/setArrayLength2-expected.txt +++ b/ets2panda/test/compiler/ets/setArrayLength2-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/setArrayLength3-expected.txt b/ets2panda/test/compiler/ets/setArrayLength3-expected.txt index b5b23584d5e..ca0839dbc90 100644 --- a/ets2panda/test/compiler/ets/setArrayLength3-expected.txt +++ b/ets2panda/test/compiler/ets/setArrayLength3-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/switchStatementCorrectConversion-expected.txt b/ets2panda/test/compiler/ets/switchStatementCorrectConversion-expected.txt index f5a81fbd193..e45fe1d03d8 100644 --- a/ets2panda/test/compiler/ets/switchStatementCorrectConversion-expected.txt +++ b/ets2panda/test/compiler/ets/switchStatementCorrectConversion-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 12 - }, - "end": { - "line": 17, - "column": 16 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 12 - }, - "end": { - "line": 17, - "column": 17 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 17 + "column": 16 } } }, diff --git a/ets2panda/test/compiler/ets/switchStatementWrongBoxing-expected.txt b/ets2panda/test/compiler/ets/switchStatementWrongBoxing-expected.txt index f893cf2cf94..d6a5b59f35a 100644 --- a/ets2panda/test/compiler/ets/switchStatementWrongBoxing-expected.txt +++ b/ets2panda/test/compiler/ets/switchStatementWrongBoxing-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 12 - }, - "end": { - "line": 17, - "column": 16 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 12 - }, - "end": { - "line": 17, - "column": 17 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 17 + "column": 16 } } }, diff --git a/ets2panda/test/compiler/ets/throwInCatchClause1-expected.txt b/ets2panda/test/compiler/ets/throwInCatchClause1-expected.txt index fe84199b44a..0a7f3ca08ad 100644 --- a/ets2panda/test/compiler/ets/throwInCatchClause1-expected.txt +++ b/ets2panda/test/compiler/ets/throwInCatchClause1-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 22 - }, - "end": { - "line": 16, - "column": 26 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 22 - }, - "end": { - "line": 16, - "column": 28 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 28 + "column": 26 } } }, diff --git a/ets2panda/test/compiler/ets/throwInCatchClause2-expected.txt b/ets2panda/test/compiler/ets/throwInCatchClause2-expected.txt index 6e15c36e97f..8387dc20943 100644 --- a/ets2panda/test/compiler/ets/throwInCatchClause2-expected.txt +++ b/ets2panda/test/compiler/ets/throwInCatchClause2-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 22 - }, - "end": { - "line": 16, - "column": 26 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 22 - }, - "end": { - "line": 16, - "column": 28 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 28 + "column": 26 } } }, diff --git a/ets2panda/test/compiler/ets/throwInCatchClause3-expected.txt b/ets2panda/test/compiler/ets/throwInCatchClause3-expected.txt index 290f684c714..7fe1a942ece 100644 --- a/ets2panda/test/compiler/ets/throwInCatchClause3-expected.txt +++ b/ets2panda/test/compiler/ets/throwInCatchClause3-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 22 - }, - "end": { - "line": 16, - "column": 26 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 22 - }, - "end": { - "line": 16, - "column": 28 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 28 + "column": 26 } } }, diff --git a/ets2panda/test/compiler/ets/throwInFinallyBlock-expected.txt b/ets2panda/test/compiler/ets/throwInFinallyBlock-expected.txt index 58449249198..2a45d1d0ba1 100644 --- a/ets2panda/test/compiler/ets/throwInFinallyBlock-expected.txt +++ b/ets2panda/test/compiler/ets/throwInFinallyBlock-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/throwInFinallyBlock1-expected.txt b/ets2panda/test/compiler/ets/throwInFinallyBlock1-expected.txt index 87863e0ede8..65c952ed778 100644 --- a/ets2panda/test/compiler/ets/throwInFinallyBlock1-expected.txt +++ b/ets2panda/test/compiler/ets/throwInFinallyBlock1-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/throwInFinallyBlock2-expected.txt b/ets2panda/test/compiler/ets/throwInFinallyBlock2-expected.txt index ece49498846..5ec434063be 100644 --- a/ets2panda/test/compiler/ets/throwInFinallyBlock2-expected.txt +++ b/ets2panda/test/compiler/ets/throwInFinallyBlock2-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/throwInRethrowingFunction-expected.txt b/ets2panda/test/compiler/ets/throwInRethrowingFunction-expected.txt index 357c335845b..74da48242d3 100644 --- a/ets2panda/test/compiler/ets/throwInRethrowingFunction-expected.txt +++ b/ets2panda/test/compiler/ets/throwInRethrowingFunction-expected.txt @@ -170,35 +170,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 32 - }, - "end": { - "line": 16, - "column": 36 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 32 - }, - "end": { - "line": 16, - "column": 43 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -206,7 +178,7 @@ }, "end": { "line": 16, - "column": 43 + "column": 36 } } } @@ -218,7 +190,7 @@ }, "end": { "line": 16, - "column": 43 + "column": 36 } } }, @@ -230,7 +202,7 @@ }, "end": { "line": 16, - "column": 43 + "column": 36 } } }, @@ -241,41 +213,13 @@ }, "end": { "line": 16, - "column": 43 + "column": 36 } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 46 - }, - "end": { - "line": 16, - "column": 50 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 46 - }, - "end": { - "line": 16, - "column": 59 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -283,7 +227,7 @@ }, "end": { "line": 16, - "column": 59 + "column": 50 } } }, diff --git a/ets2panda/test/compiler/ets/throwInRethrowingFunction2-expected.txt b/ets2panda/test/compiler/ets/throwInRethrowingFunction2-expected.txt index 392812d426f..0be83ab7710 100644 --- a/ets2panda/test/compiler/ets/throwInRethrowingFunction2-expected.txt +++ b/ets2panda/test/compiler/ets/throwInRethrowingFunction2-expected.txt @@ -170,35 +170,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 34 - }, - "end": { - "line": 16, - "column": 38 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 34 - }, - "end": { - "line": 16, - "column": 45 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -206,7 +178,7 @@ }, "end": { "line": 16, - "column": 45 + "column": 38 } } } @@ -218,7 +190,7 @@ }, "end": { "line": 16, - "column": 45 + "column": 38 } } }, @@ -230,7 +202,7 @@ }, "end": { "line": 16, - "column": 45 + "column": 38 } } }, @@ -241,7 +213,7 @@ }, "end": { "line": 16, - "column": 45 + "column": 38 } } } diff --git a/ets2panda/test/compiler/ets/throwInThrowingFunction-expected.txt b/ets2panda/test/compiler/ets/throwInThrowingFunction-expected.txt index f84d9a6e840..44ba1f65ece 100644 --- a/ets2panda/test/compiler/ets/throwInThrowingFunction-expected.txt +++ b/ets2panda/test/compiler/ets/throwInThrowingFunction-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 26 - }, - "end": { - "line": 16, - "column": 30 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 26 - }, - "end": { - "line": 16, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 37 + "column": 30 } } }, diff --git a/ets2panda/test/compiler/ets/throwInTryStatement-expected.txt b/ets2panda/test/compiler/ets/throwInTryStatement-expected.txt index 5dee768bca2..5be3175f2f5 100644 --- a/ets2panda/test/compiler/ets/throwInTryStatement-expected.txt +++ b/ets2panda/test/compiler/ets/throwInTryStatement-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/throwWithoutTryCatch-expected.txt b/ets2panda/test/compiler/ets/throwWithoutTryCatch-expected.txt index 3d916950b58..e8897685d2a 100644 --- a/ets2panda/test/compiler/ets/throwWithoutTryCatch-expected.txt +++ b/ets2panda/test/compiler/ets/throwWithoutTryCatch-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/throwingConstructorCheck1-expected.txt b/ets2panda/test/compiler/ets/throwingConstructorCheck1-expected.txt index f03d10b7662..0ea7b524b7a 100644 --- a/ets2panda/test/compiler/ets/throwingConstructorCheck1-expected.txt +++ b/ets2panda/test/compiler/ets/throwingConstructorCheck1-expected.txt @@ -301,35 +301,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -337,7 +309,7 @@ }, "end": { "line": 20, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/throwingConstructorCheck2-expected.txt b/ets2panda/test/compiler/ets/throwingConstructorCheck2-expected.txt index f0c6ef0b953..319eca7bd14 100644 --- a/ets2panda/test/compiler/ets/throwingConstructorCheck2-expected.txt +++ b/ets2panda/test/compiler/ets/throwingConstructorCheck2-expected.txt @@ -301,35 +301,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -337,7 +309,7 @@ }, "end": { "line": 20, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/throwingFunctionAsParameter1-expected.txt b/ets2panda/test/compiler/ets/throwingFunctionAsParameter1-expected.txt index 46bd51fe792..ac0ee15676d 100644 --- a/ets2panda/test/compiler/ets/throwingFunctionAsParameter1-expected.txt +++ b/ets2panda/test/compiler/ets/throwingFunctionAsParameter1-expected.txt @@ -170,35 +170,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 37 - }, - "end": { - "line": 16, - "column": 41 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 37 - }, - "end": { - "line": 16, - "column": 48 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -206,7 +178,7 @@ }, "end": { "line": 16, - "column": 48 + "column": 41 } } } @@ -218,7 +190,7 @@ }, "end": { "line": 16, - "column": 48 + "column": 41 } } }, @@ -230,7 +202,7 @@ }, "end": { "line": 16, - "column": 48 + "column": 41 } } }, @@ -241,41 +213,13 @@ }, "end": { "line": 16, - "column": 48 + "column": 41 } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 51 - }, - "end": { - "line": 16, - "column": 55 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 51 - }, - "end": { - "line": 16, - "column": 64 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -283,7 +227,7 @@ }, "end": { "line": 16, - "column": 64 + "column": 55 } } }, @@ -435,35 +379,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 38 - }, - "end": { - "line": 20, - "column": 42 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 38 - }, - "end": { - "line": 20, - "column": 49 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -471,7 +387,7 @@ }, "end": { "line": 20, - "column": 49 + "column": 42 } } } @@ -483,7 +399,7 @@ }, "end": { "line": 20, - "column": 49 + "column": 42 } } }, @@ -495,7 +411,7 @@ }, "end": { "line": 20, - "column": 49 + "column": 42 } } }, @@ -506,41 +422,13 @@ }, "end": { "line": 20, - "column": 49 + "column": 42 } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 52 - }, - "end": { - "line": 20, - "column": 56 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 52 - }, - "end": { - "line": 20, - "column": 58 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -548,7 +436,7 @@ }, "end": { "line": 20, - "column": 58 + "column": 56 } } }, diff --git a/ets2panda/test/compiler/ets/throwingFunctionAsParameter2-expected.txt b/ets2panda/test/compiler/ets/throwingFunctionAsParameter2-expected.txt index 530cca0f11f..d1ec297ae9e 100644 --- a/ets2panda/test/compiler/ets/throwingFunctionAsParameter2-expected.txt +++ b/ets2panda/test/compiler/ets/throwingFunctionAsParameter2-expected.txt @@ -170,35 +170,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 38 - }, - "end": { - "line": 16, - "column": 42 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 38 - }, - "end": { - "line": 16, - "column": 49 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -206,7 +178,7 @@ }, "end": { "line": 16, - "column": 49 + "column": 42 } } } @@ -218,7 +190,7 @@ }, "end": { "line": 16, - "column": 49 + "column": 42 } } }, @@ -230,7 +202,7 @@ }, "end": { "line": 16, - "column": 49 + "column": 42 } } }, @@ -241,41 +213,13 @@ }, "end": { "line": 16, - "column": 49 + "column": 42 } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 52 - }, - "end": { - "line": 16, - "column": 56 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 52 - }, - "end": { - "line": 16, - "column": 58 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -283,7 +227,7 @@ }, "end": { "line": 16, - "column": 58 + "column": 56 } } }, diff --git a/ets2panda/test/compiler/ets/throwingFunctionCheck1-expected.txt b/ets2panda/test/compiler/ets/throwingFunctionCheck1-expected.txt index 14b1a16a405..ba795e8b7ca 100644 --- a/ets2panda/test/compiler/ets/throwingFunctionCheck1-expected.txt +++ b/ets2panda/test/compiler/ets/throwingFunctionCheck1-expected.txt @@ -235,35 +235,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 26 - }, - "end": { - "line": 16, - "column": 30 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 26 - }, - "end": { - "line": 16, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -271,7 +243,7 @@ }, "end": { "line": 16, - "column": 37 + "column": 30 } } }, diff --git a/ets2panda/test/compiler/ets/throwingFunctionCheck2-expected.txt b/ets2panda/test/compiler/ets/throwingFunctionCheck2-expected.txt index b021724c4cb..b92ba66ca1e 100644 --- a/ets2panda/test/compiler/ets/throwingFunctionCheck2-expected.txt +++ b/ets2panda/test/compiler/ets/throwingFunctionCheck2-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 26 - }, - "end": { - "line": 16, - "column": 30 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 26 - }, - "end": { - "line": 16, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 37 + "column": 30 } } }, @@ -298,35 +270,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -334,7 +278,7 @@ }, "end": { "line": 18, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/throwingFunctionCheck3-expected.txt b/ets2panda/test/compiler/ets/throwingFunctionCheck3-expected.txt index 3a20bd23e47..951c758e5b6 100644 --- a/ets2panda/test/compiler/ets/throwingFunctionCheck3-expected.txt +++ b/ets2panda/test/compiler/ets/throwingFunctionCheck3-expected.txt @@ -163,35 +163,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 19 - }, - "end": { - "line": 18, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 19 - }, - "end": { - "line": 18, - "column": 25 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -199,7 +171,7 @@ }, "end": { "line": 18, - "column": 25 + "column": 23 } } }, @@ -436,35 +408,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 26 - }, - "end": { - "line": 21, - "column": 30 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 26 - }, - "end": { - "line": 21, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -472,7 +416,7 @@ }, "end": { "line": 21, - "column": 37 + "column": 30 } } }, @@ -859,35 +803,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 29, - "column": 18 - }, - "end": { - "line": 29, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 29, - "column": 18 - }, - "end": { - "line": 29, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 29, @@ -895,7 +811,7 @@ }, "end": { "line": 29, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/throwingFunctionCheck4-expected.txt b/ets2panda/test/compiler/ets/throwingFunctionCheck4-expected.txt index 1a6d0916faa..7acb74c3d2b 100644 --- a/ets2panda/test/compiler/ets/throwingFunctionCheck4-expected.txt +++ b/ets2panda/test/compiler/ets/throwingFunctionCheck4-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 26 - }, - "end": { - "line": 16, - "column": 30 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 26 - }, - "end": { - "line": 16, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 37 + "column": 30 } } }, @@ -367,35 +339,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -403,7 +347,7 @@ }, "end": { "line": 20, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/throwingFunctionCheck5-expected.txt b/ets2panda/test/compiler/ets/throwingFunctionCheck5-expected.txt index 5ee1cbf0cee..5c30274410f 100644 --- a/ets2panda/test/compiler/ets/throwingFunctionCheck5-expected.txt +++ b/ets2panda/test/compiler/ets/throwingFunctionCheck5-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 26 - }, - "end": { - "line": 16, - "column": 30 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 26 - }, - "end": { - "line": 16, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 37 + "column": 30 } } }, @@ -367,35 +339,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -403,7 +347,7 @@ }, "end": { "line": 20, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/throwingFunctionCheck6-expected.txt b/ets2panda/test/compiler/ets/throwingFunctionCheck6-expected.txt index b4ef010fdc4..37826bef35a 100644 --- a/ets2panda/test/compiler/ets/throwingFunctionCheck6-expected.txt +++ b/ets2panda/test/compiler/ets/throwingFunctionCheck6-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 17 - }, - "end": { - "line": 21, - "column": 21 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 17 - }, - "end": { - "line": 21, - "column": 28 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -104,7 +76,7 @@ }, "end": { "line": 21, - "column": 28 + "column": 21 } } }, @@ -504,35 +476,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 26 - }, - "end": { - "line": 16, - "column": 30 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 26 - }, - "end": { - "line": 16, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -540,7 +484,7 @@ }, "end": { "line": 16, - "column": 37 + "column": 30 } } }, @@ -709,35 +653,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 26, - "column": 18 - }, - "end": { - "line": 26, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 26, - "column": 18 - }, - "end": { - "line": 26, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 26, @@ -745,7 +661,7 @@ }, "end": { "line": 26, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/throwingFunctionType1-expected.txt b/ets2panda/test/compiler/ets/throwingFunctionType1-expected.txt index f718f3201c9..8b43ed99ef5 100644 --- a/ets2panda/test/compiler/ets/throwingFunctionType1-expected.txt +++ b/ets2panda/test/compiler/ets/throwingFunctionType1-expected.txt @@ -22,35 +22,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 24 - }, - "end": { - "line": 16, - "column": 28 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 24 - }, - "end": { - "line": 16, - "column": 35 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -58,7 +30,7 @@ }, "end": { "line": 16, - "column": 35 + "column": 28 } } } @@ -70,7 +42,7 @@ }, "end": { "line": 16, - "column": 35 + "column": 28 } } }, @@ -246,35 +218,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -282,7 +226,7 @@ }, "end": { "line": 18, - "column": 24 + "column": 22 } } }, @@ -360,35 +304,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 26 - }, - "end": { - "line": 19, - "column": 30 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 26 - }, - "end": { - "line": 19, - "column": 33 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -396,7 +312,7 @@ }, "end": { "line": 19, - "column": 33 + "column": 30 } } }, diff --git a/ets2panda/test/compiler/ets/throwingFunctionType2-expected.txt b/ets2panda/test/compiler/ets/throwingFunctionType2-expected.txt index ce9c188d831..02dc5c60cf9 100644 --- a/ets2panda/test/compiler/ets/throwingFunctionType2-expected.txt +++ b/ets2panda/test/compiler/ets/throwingFunctionType2-expected.txt @@ -22,35 +22,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 24 - }, - "end": { - "line": 16, - "column": 28 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 24 - }, - "end": { - "line": 16, - "column": 35 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -58,7 +30,7 @@ }, "end": { "line": 16, - "column": 35 + "column": 28 } } } @@ -70,7 +42,7 @@ }, "end": { "line": 16, - "column": 35 + "column": 28 } } }, @@ -246,35 +218,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -282,7 +226,7 @@ }, "end": { "line": 18, - "column": 24 + "column": 22 } } }, @@ -360,35 +304,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 26 - }, - "end": { - "line": 19, - "column": 30 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 26 - }, - "end": { - "line": 19, - "column": 33 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -396,7 +312,7 @@ }, "end": { "line": 19, - "column": 33 + "column": 30 } } }, diff --git a/ets2panda/test/compiler/ets/throwingMethodCheck1-expected.txt b/ets2panda/test/compiler/ets/throwingMethodCheck1-expected.txt index fecebb45378..afd11f04997 100644 --- a/ets2panda/test/compiler/ets/throwingMethodCheck1-expected.txt +++ b/ets2panda/test/compiler/ets/throwingMethodCheck1-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 17 - }, - "end": { - "line": 17, - "column": 21 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 17 - }, - "end": { - "line": 17, - "column": 28 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 28 + "column": 21 } } }, @@ -504,35 +476,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -540,7 +484,7 @@ }, "end": { "line": 22, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/throwingMethodCheck2-expected.txt b/ets2panda/test/compiler/ets/throwingMethodCheck2-expected.txt index 19080137784..6928e531d7f 100644 --- a/ets2panda/test/compiler/ets/throwingMethodCheck2-expected.txt +++ b/ets2panda/test/compiler/ets/throwingMethodCheck2-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 17 - }, - "end": { - "line": 17, - "column": 21 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 17 - }, - "end": { - "line": 17, - "column": 28 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 28 + "column": 21 } } }, @@ -504,35 +476,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -540,7 +484,7 @@ }, "end": { "line": 22, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/tryCatchErrorFlow-expected.txt b/ets2panda/test/compiler/ets/tryCatchErrorFlow-expected.txt index 28e07c4b0f1..7484d7638f2 100644 --- a/ets2panda/test/compiler/ets/tryCatchErrorFlow-expected.txt +++ b/ets2panda/test/compiler/ets/tryCatchErrorFlow-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/tryCatchErrorIncorrectParamType-expected.txt b/ets2panda/test/compiler/ets/tryCatchErrorIncorrectParamType-expected.txt index c712b18652a..aa79e4f856e 100644 --- a/ets2panda/test/compiler/ets/tryCatchErrorIncorrectParamType-expected.txt +++ b/ets2panda/test/compiler/ets/tryCatchErrorIncorrectParamType-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/tryCatchErrorMissingParamType-expected.txt b/ets2panda/test/compiler/ets/tryCatchErrorMissingParamType-expected.txt index f683fe867d1..24c1a1ccf69 100644 --- a/ets2panda/test/compiler/ets/tryCatchErrorMissingParamType-expected.txt +++ b/ets2panda/test/compiler/ets/tryCatchErrorMissingParamType-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/tryCatchFlow-expected.txt b/ets2panda/test/compiler/ets/tryCatchFlow-expected.txt index 683edb16ab5..ba40f9c934c 100644 --- a/ets2panda/test/compiler/ets/tryCatchFlow-expected.txt +++ b/ets2panda/test/compiler/ets/tryCatchFlow-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/tryCatchIncorrectParamType-expected.txt b/ets2panda/test/compiler/ets/tryCatchIncorrectParamType-expected.txt index 435bd1ee067..a56345052cc 100644 --- a/ets2panda/test/compiler/ets/tryCatchIncorrectParamType-expected.txt +++ b/ets2panda/test/compiler/ets/tryCatchIncorrectParamType-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/tryCatchMissingParamType-expected.txt b/ets2panda/test/compiler/ets/tryCatchMissingParamType-expected.txt index 78765b552a1..dbcceae603d 100644 --- a/ets2panda/test/compiler/ets/tryCatchMissingParamType-expected.txt +++ b/ets2panda/test/compiler/ets/tryCatchMissingParamType-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/tryDefaultCatches-expected.txt b/ets2panda/test/compiler/ets/tryDefaultCatches-expected.txt index 4bc13bc8159..c1449726a7f 100644 --- a/ets2panda/test/compiler/ets/tryDefaultCatches-expected.txt +++ b/ets2panda/test/compiler/ets/tryDefaultCatches-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/tuple_types_1-expected.txt b/ets2panda/test/compiler/ets/tuple_types_1-expected.txt index 1fa7dad85cc..daf11b4c088 100644 --- a/ets2panda/test/compiler/ets/tuple_types_1-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_1-expected.txt @@ -1297,35 +1297,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 27, - "column": 18 - }, - "end": { - "line": 27, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 27, - "column": 18 - }, - "end": { - "line": 27, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 27, @@ -1333,7 +1305,7 @@ }, "end": { "line": 27, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/tuple_types_10_neg-expected.txt b/ets2panda/test/compiler/ets/tuple_types_10_neg-expected.txt index 7f3a1736aab..510b0a58e15 100644 --- a/ets2panda/test/compiler/ets/tuple_types_10_neg-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_10_neg-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -198,7 +170,7 @@ }, "end": { "line": 17, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/tuple_types_11_neg-expected.txt b/ets2panda/test/compiler/ets/tuple_types_11_neg-expected.txt index 999b175e3a0..d73ef6b2bf8 100644 --- a/ets2panda/test/compiler/ets/tuple_types_11_neg-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_11_neg-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -198,7 +170,7 @@ }, "end": { "line": 17, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/tuple_types_12-expected.txt b/ets2panda/test/compiler/ets/tuple_types_12-expected.txt index 19124a264bc..9f6b0f07de1 100644 --- a/ets2panda/test/compiler/ets/tuple_types_12-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_12-expected.txt @@ -762,35 +762,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 18 - }, - "end": { - "line": 21, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 18 - }, - "end": { - "line": 21, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -798,7 +770,7 @@ }, "end": { "line": 21, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/tuple_types_14-expected.txt b/ets2panda/test/compiler/ets/tuple_types_14-expected.txt index fa310986d8a..a6eabf66f6e 100644 --- a/ets2panda/test/compiler/ets/tuple_types_14-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_14-expected.txt @@ -258,35 +258,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 17 - }, - "end": { - "line": 18, - "column": 21 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 17 - }, - "end": { - "line": 18, - "column": 23 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -294,7 +266,7 @@ }, "end": { "line": 18, - "column": 23 + "column": 21 } } }, @@ -816,35 +788,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 18 - }, - "end": { - "line": 24, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 18 - }, - "end": { - "line": 24, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -852,7 +796,7 @@ }, "end": { "line": 24, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/tuple_types_15-expected.txt b/ets2panda/test/compiler/ets/tuple_types_15-expected.txt index 754f6acb255..ae5660de8c7 100644 --- a/ets2panda/test/compiler/ets/tuple_types_15-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_15-expected.txt @@ -666,35 +666,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 18 - }, - "end": { - "line": 23, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 18 - }, - "end": { - "line": 23, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -702,7 +674,7 @@ }, "end": { "line": 23, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/tuple_types_16-expected.txt b/ets2panda/test/compiler/ets/tuple_types_16-expected.txt index ed97776aece..97d11121c99 100644 --- a/ets2panda/test/compiler/ets/tuple_types_16-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_16-expected.txt @@ -92,43 +92,15 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 33 - }, - "end": { - "line": 16, - "column": 37 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 33 - }, - "end": { - "line": 17, - "column": 5 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, "column": 33 }, "end": { - "line": 17, - "column": 5 + "line": 16, + "column": 37 } } }, @@ -138,8 +110,8 @@ "column": 14 }, "end": { - "line": 17, - "column": 5 + "line": 16, + "column": 37 } } }, @@ -175,35 +147,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 20 - }, - "end": { - "line": 17, - "column": 24 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 20 - }, - "end": { - "line": 17, - "column": 25 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -211,7 +155,7 @@ }, "end": { "line": 17, - "column": 25 + "column": 24 } } }, @@ -222,7 +166,7 @@ }, "end": { "line": 17, - "column": 25 + "column": 24 } } }, @@ -691,35 +635,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 18 - }, - "end": { - "line": 21, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 18 - }, - "end": { - "line": 21, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -727,7 +643,7 @@ }, "end": { "line": 21, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/tuple_types_17-expected.txt b/ets2panda/test/compiler/ets/tuple_types_17-expected.txt index 9ed30ce235a..7ecd55257eb 100644 --- a/ets2panda/test/compiler/ets/tuple_types_17-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_17-expected.txt @@ -288,35 +288,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -324,7 +296,7 @@ }, "end": { "line": 17, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/tuple_types_18-expected.txt b/ets2panda/test/compiler/ets/tuple_types_18-expected.txt index ebe6fc8aab0..656b904c190 100644 --- a/ets2panda/test/compiler/ets/tuple_types_18-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_18-expected.txt @@ -330,35 +330,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -366,7 +338,7 @@ }, "end": { "line": 20, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/tuple_types_2_neg-expected.txt b/ets2panda/test/compiler/ets/tuple_types_2_neg-expected.txt index b32a3a2104a..d4d6044506a 100644 --- a/ets2panda/test/compiler/ets/tuple_types_2_neg-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_2_neg-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -198,7 +170,7 @@ }, "end": { "line": 17, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/tuple_types_3_neg-expected.txt b/ets2panda/test/compiler/ets/tuple_types_3_neg-expected.txt index cca4b7497d0..8618e5e3ec2 100644 --- a/ets2panda/test/compiler/ets/tuple_types_3_neg-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_3_neg-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -198,7 +170,7 @@ }, "end": { "line": 17, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/tuple_types_4_neg-expected.txt b/ets2panda/test/compiler/ets/tuple_types_4_neg-expected.txt index db9deb2371b..27731bd1cd4 100644 --- a/ets2panda/test/compiler/ets/tuple_types_4_neg-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_4_neg-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -198,7 +170,7 @@ }, "end": { "line": 17, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/tuple_types_5_neg-expected.txt b/ets2panda/test/compiler/ets/tuple_types_5_neg-expected.txt index c17eebbf4d3..421b533acb7 100644 --- a/ets2panda/test/compiler/ets/tuple_types_5_neg-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_5_neg-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -198,7 +170,7 @@ }, "end": { "line": 17, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/tuple_types_6_neg-expected.txt b/ets2panda/test/compiler/ets/tuple_types_6_neg-expected.txt index 01342b30431..2939326cc62 100644 --- a/ets2panda/test/compiler/ets/tuple_types_6_neg-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_6_neg-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -198,7 +170,7 @@ }, "end": { "line": 17, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/tuple_types_7-expected.txt b/ets2panda/test/compiler/ets/tuple_types_7-expected.txt index 1793aff6858..5bc97ab97c6 100644 --- a/ets2panda/test/compiler/ets/tuple_types_7-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_7-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -198,7 +170,7 @@ }, "end": { "line": 17, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/tuple_types_8-expected.txt b/ets2panda/test/compiler/ets/tuple_types_8-expected.txt index 5443c594f1e..faf1a223b80 100644 --- a/ets2panda/test/compiler/ets/tuple_types_8-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_8-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -198,7 +170,7 @@ }, "end": { "line": 17, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/tuple_types_9_neg-expected.txt b/ets2panda/test/compiler/ets/tuple_types_9_neg-expected.txt index 959d61e1011..d929cbbc51a 100644 --- a/ets2panda/test/compiler/ets/tuple_types_9_neg-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_9_neg-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -198,7 +170,7 @@ }, "end": { "line": 17, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/union_types_5-expected.txt b/ets2panda/test/compiler/ets/union_types_5-expected.txt index 3a041975ac7..718a439e686 100644 --- a/ets2panda/test/compiler/ets/union_types_5-expected.txt +++ b/ets2panda/test/compiler/ets/union_types_5-expected.txt @@ -2278,35 +2278,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 46, - "column": 18 - }, - "end": { - "line": 46, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 46, - "column": 18 - }, - "end": { - "line": 46, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 46, @@ -2314,7 +2286,7 @@ }, "end": { "line": 46, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/compiler/ets/validate_signatures_throw_type_error-expected.txt b/ets2panda/test/compiler/ets/validate_signatures_throw_type_error-expected.txt index ae620a89c87..2a10202db16 100644 --- a/ets2panda/test/compiler/ets/validate_signatures_throw_type_error-expected.txt +++ b/ets2panda/test/compiler/ets/validate_signatures_throw_type_error-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 19 - }, - "end": { - "line": 16, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 19 - }, - "end": { - "line": 16, - "column": 25 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 25 + "column": 23 } } }, diff --git a/ets2panda/test/compiler/ets/validate_signatures_throw_type_error_more_param-expected.txt b/ets2panda/test/compiler/ets/validate_signatures_throw_type_error_more_param-expected.txt index 1b7c8798937..a7d72663d67 100644 --- a/ets2panda/test/compiler/ets/validate_signatures_throw_type_error_more_param-expected.txt +++ b/ets2panda/test/compiler/ets/validate_signatures_throw_type_error_more_param-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 19 - }, - "end": { - "line": 16, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 19 - }, - "end": { - "line": 16, - "column": 25 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 25 + "column": 23 } } }, diff --git a/ets2panda/test/compiler/ets/voidTypeInBinaryOperation-expected.txt b/ets2panda/test/compiler/ets/voidTypeInBinaryOperation-expected.txt index b434ae012cb..f72919bbacf 100644 --- a/ets2panda/test/compiler/ets/voidTypeInBinaryOperation-expected.txt +++ b/ets2panda/test/compiler/ets/voidTypeInBinaryOperation-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 19 - }, - "end": { - "line": 16, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 19 - }, - "end": { - "line": 16, - "column": 25 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 25 + "column": 23 } } }, @@ -297,35 +269,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 18 - }, - "end": { - "line": 19, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 18 - }, - "end": { - "line": 19, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -333,7 +277,7 @@ }, "end": { "line": 19, - "column": 24 + "column": 22 } } }, @@ -494,4 +438,4 @@ } } } -TypeError: An expression of type 'void' cannot be tested for truthiness [voidTypeInBinaryOperation.ets:20:19] +TypeError: Bad operand type, the types of the operands must be of possible condition type. [voidTypeInBinaryOperation.ets:20:10] diff --git a/ets2panda/test/parser/ets/AccessBinaryTrees-expected.txt b/ets2panda/test/parser/ets/AccessBinaryTrees-expected.txt index d5501d37a78..fbec2a9034e 100644 --- a/ets2panda/test/parser/ets/AccessBinaryTrees-expected.txt +++ b/ets2panda/test/parser/ets/AccessBinaryTrees-expected.txt @@ -2327,35 +2327,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 51, - "column": 17 - }, - "end": { - "line": 51, - "column": 21 - } - } - }, - "loc": { - "start": { - "line": 51, - "column": 17 - }, - "end": { - "line": 51, - "column": 23 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 51, @@ -2363,7 +2335,7 @@ }, "end": { "line": 51, - "column": 23 + "column": 21 } } }, @@ -4808,35 +4780,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 79, - "column": 18 - }, - "end": { - "line": 79, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 79, - "column": 18 - }, - "end": { - "line": 79, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 79, @@ -4844,7 +4788,7 @@ }, "end": { "line": 79, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/AccessFannkuch-expected.txt b/ets2panda/test/parser/ets/AccessFannkuch-expected.txt index bf878c72fa0..8f73d986b7c 100644 --- a/ets2panda/test/parser/ets/AccessFannkuch-expected.txt +++ b/ets2panda/test/parser/ets/AccessFannkuch-expected.txt @@ -4825,35 +4825,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 84, - "column": 19 - }, - "end": { - "line": 84, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 84, - "column": 19 - }, - "end": { - "line": 84, - "column": 25 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 84, @@ -4861,7 +4833,7 @@ }, "end": { "line": 84, - "column": 25 + "column": 23 } } }, @@ -5346,35 +5318,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 90, - "column": 18 - }, - "end": { - "line": 90, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 90, - "column": 18 - }, - "end": { - "line": 90, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 90, @@ -5382,7 +5326,7 @@ }, "end": { "line": 90, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/AccessNBody-expected.txt b/ets2panda/test/parser/ets/AccessNBody-expected.txt index 068b84444be..02f26f44713 100644 --- a/ets2panda/test/parser/ets/AccessNBody-expected.txt +++ b/ets2panda/test/parser/ets/AccessNBody-expected.txt @@ -4078,35 +4078,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 64, - "column": 36 - }, - "end": { - "line": 64, - "column": 40 - } - } - }, - "loc": { - "start": { - "line": 64, - "column": 36 - }, - "end": { - "line": 64, - "column": 42 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 64, @@ -4114,7 +4086,7 @@ }, "end": { "line": 64, - "column": 42 + "column": 40 } } }, @@ -13606,35 +13578,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 140, - "column": 20 - }, - "end": { - "line": 140, - "column": 24 - } - } - }, - "loc": { - "start": { - "line": 140, - "column": 20 - }, - "end": { - "line": 140, - "column": 26 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 140, @@ -13642,7 +13586,7 @@ }, "end": { "line": 140, - "column": 26 + "column": 24 } } }, @@ -15407,35 +15351,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 156, - "column": 18 - }, - "end": { - "line": 156, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 156, - "column": 18 - }, - "end": { - "line": 156, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 156, @@ -15443,7 +15359,7 @@ }, "end": { "line": 156, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/AccessNSieve-expected.txt b/ets2panda/test/parser/ets/AccessNSieve-expected.txt index e9379ad0e68..7638c0a7f0b 100644 --- a/ets2panda/test/parser/ets/AccessNSieve-expected.txt +++ b/ets2panda/test/parser/ets/AccessNSieve-expected.txt @@ -319,35 +319,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 19 - }, - "end": { - "line": 22, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 19 - }, - "end": { - "line": 22, - "column": 25 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -355,7 +327,7 @@ }, "end": { "line": 22, - "column": 25 + "column": 23 } } }, @@ -2591,35 +2563,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 53, - "column": 17 - }, - "end": { - "line": 53, - "column": 21 - } - } - }, - "loc": { - "start": { - "line": 53, - "column": 17 - }, - "end": { - "line": 53, - "column": 23 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 53, @@ -2627,7 +2571,7 @@ }, "end": { "line": 53, - "column": 23 + "column": 21 } } }, @@ -3176,35 +3120,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 59, - "column": 18 - }, - "end": { - "line": 59, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 59, - "column": 18 - }, - "end": { - "line": 59, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 59, @@ -3212,7 +3128,7 @@ }, "end": { "line": 59, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/Bitops3BitBitsInByte-expected.txt b/ets2panda/test/parser/ets/Bitops3BitBitsInByte-expected.txt index a298f24c52b..f4aad7a9711 100644 --- a/ets2panda/test/parser/ets/Bitops3BitBitsInByte-expected.txt +++ b/ets2panda/test/parser/ets/Bitops3BitBitsInByte-expected.txt @@ -1074,35 +1074,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 30, - "column": 17 - }, - "end": { - "line": 30, - "column": 21 - } - } - }, - "loc": { - "start": { - "line": 30, - "column": 17 - }, - "end": { - "line": 30, - "column": 23 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 30, @@ -1110,7 +1082,7 @@ }, "end": { "line": 30, - "column": 23 + "column": 21 } } }, @@ -2133,35 +2105,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 41, - "column": 18 - }, - "end": { - "line": 41, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 41, - "column": 18 - }, - "end": { - "line": 41, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 41, @@ -2169,7 +2113,7 @@ }, "end": { "line": 41, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/BitopsBitsInByte-expected.txt b/ets2panda/test/parser/ets/BitopsBitsInByte-expected.txt index dd67845c624..215124ba275 100644 --- a/ets2panda/test/parser/ets/BitopsBitsInByte-expected.txt +++ b/ets2panda/test/parser/ets/BitopsBitsInByte-expected.txt @@ -848,35 +848,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 33, - "column": 17 - }, - "end": { - "line": 33, - "column": 21 - } - } - }, - "loc": { - "start": { - "line": 33, - "column": 17 - }, - "end": { - "line": 33, - "column": 23 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 33, @@ -884,7 +856,7 @@ }, "end": { "line": 33, - "column": 23 + "column": 21 } } }, @@ -1907,35 +1879,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 44, - "column": 18 - }, - "end": { - "line": 44, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 44, - "column": 18 - }, - "end": { - "line": 44, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 44, @@ -1943,7 +1887,7 @@ }, "end": { "line": 44, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/BitopsBitwiseAnd-expected.txt b/ets2panda/test/parser/ets/BitopsBitwiseAnd-expected.txt index d9d3f5b4cc9..d4747bb3108 100644 --- a/ets2panda/test/parser/ets/BitopsBitwiseAnd-expected.txt +++ b/ets2panda/test/parser/ets/BitopsBitwiseAnd-expected.txt @@ -194,35 +194,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 17 - }, - "end": { - "line": 20, - "column": 21 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 17 - }, - "end": { - "line": 20, - "column": 23 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -230,7 +202,7 @@ }, "end": { "line": 20, - "column": 23 + "column": 21 } } }, @@ -1020,35 +992,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 30, - "column": 18 - }, - "end": { - "line": 30, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 30, - "column": 18 - }, - "end": { - "line": 30, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 30, @@ -1056,7 +1000,7 @@ }, "end": { "line": 30, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/BitopsNSieveBits-expected.txt b/ets2panda/test/parser/ets/BitopsNSieveBits-expected.txt index 6e174ce74be..bd39afb2f68 100644 --- a/ets2panda/test/parser/ets/BitopsNSieveBits-expected.txt +++ b/ets2panda/test/parser/ets/BitopsNSieveBits-expected.txt @@ -205,35 +205,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 52 - }, - "end": { - "line": 17, - "column": 56 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 52 - }, - "end": { - "line": 17, - "column": 58 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -241,7 +213,7 @@ }, "end": { "line": 17, - "column": 58 + "column": 56 } } }, @@ -2388,35 +2360,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 46, - "column": 17 - }, - "end": { - "line": 46, - "column": 21 - } - } - }, - "loc": { - "start": { - "line": 46, - "column": 17 - }, - "end": { - "line": 46, - "column": 23 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 46, @@ -2424,7 +2368,7 @@ }, "end": { "line": 46, - "column": 23 + "column": 21 } } }, @@ -3434,35 +3378,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 57, - "column": 18 - }, - "end": { - "line": 57, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 57, - "column": 18 - }, - "end": { - "line": 57, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 57, @@ -3470,7 +3386,7 @@ }, "end": { "line": 57, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/Boolean_bitwise-expected.txt b/ets2panda/test/parser/ets/Boolean_bitwise-expected.txt index fc46c2282ba..069cc6d9a4b 100644 --- a/ets2panda/test/parser/ets/Boolean_bitwise-expected.txt +++ b/ets2panda/test/parser/ets/Boolean_bitwise-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/ControlFlowRecursive-expected.txt b/ets2panda/test/parser/ets/ControlFlowRecursive-expected.txt index 5a053da53e3..17ec672e2d6 100644 --- a/ets2panda/test/parser/ets/ControlFlowRecursive-expected.txt +++ b/ets2panda/test/parser/ets/ControlFlowRecursive-expected.txt @@ -2308,35 +2308,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 45, - "column": 24 - }, - "end": { - "line": 45, - "column": 28 - } - } - }, - "loc": { - "start": { - "line": 45, - "column": 24 - }, - "end": { - "line": 45, - "column": 30 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 45, @@ -2344,7 +2316,7 @@ }, "end": { "line": 45, - "column": 30 + "column": 28 } } }, @@ -3647,35 +3619,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 57, - "column": 18 - }, - "end": { - "line": 57, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 57, - "column": 18 - }, - "end": { - "line": 57, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 57, @@ -3683,7 +3627,7 @@ }, "end": { "line": 57, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/Dollar_dollar_2-expected.txt b/ets2panda/test/parser/ets/Dollar_dollar_2-expected.txt index 43188a188ab..340e758cc92 100644 --- a/ets2panda/test/parser/ets/Dollar_dollar_2-expected.txt +++ b/ets2panda/test/parser/ets/Dollar_dollar_2-expected.txt @@ -437,35 +437,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 55 - }, - "end": { - "line": 20, - "column": 59 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 55 - }, - "end": { - "line": 20, - "column": 61 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -473,7 +445,7 @@ }, "end": { "line": 20, - "column": 61 + "column": 59 } } }, @@ -572,35 +544,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 12 - }, - "end": { - "line": 21, - "column": 16 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 12 - }, - "end": { - "line": 21, - "column": 18 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -608,7 +552,7 @@ }, "end": { "line": 21, - "column": 18 + "column": 16 } } }, diff --git a/ets2panda/test/parser/ets/FunctionType-expected.txt b/ets2panda/test/parser/ets/FunctionType-expected.txt index 051ecf2aa9b..cc4114be803 100644 --- a/ets2panda/test/parser/ets/FunctionType-expected.txt +++ b/ets2panda/test/parser/ets/FunctionType-expected.txt @@ -132,35 +132,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 27 - }, - "end": { - "line": 24, - "column": 31 - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 27 - }, - "end": { - "line": 24, - "column": 32 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -168,7 +140,7 @@ }, "end": { "line": 24, - "column": 32 + "column": 31 } } }, @@ -179,7 +151,7 @@ }, "end": { "line": 24, - "column": 32 + "column": 31 } } }, @@ -192,7 +164,7 @@ }, "end": { "line": 24, - "column": 32 + "column": 31 } } }, @@ -732,35 +704,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 24 - }, - "end": { - "line": 19, - "column": 28 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 24 - }, - "end": { - "line": 19, - "column": 29 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -768,7 +712,7 @@ }, "end": { "line": 19, - "column": 29 + "column": 28 } } }, @@ -779,7 +723,7 @@ }, "end": { "line": 19, - "column": 29 + "column": 28 } } }, @@ -791,7 +735,7 @@ }, "end": { "line": 19, - "column": 29 + "column": 28 } } }, @@ -802,7 +746,7 @@ }, "end": { "line": 19, - "column": 29 + "column": 28 } } } diff --git a/ets2panda/test/parser/ets/FunctionalTypeAsTypeArgument-expected.txt b/ets2panda/test/parser/ets/FunctionalTypeAsTypeArgument-expected.txt index d9ec76360b1..fbbb1f55f09 100644 --- a/ets2panda/test/parser/ets/FunctionalTypeAsTypeArgument-expected.txt +++ b/ets2panda/test/parser/ets/FunctionalTypeAsTypeArgument-expected.txt @@ -231,35 +231,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 42 - }, - "end": { - "line": 16, - "column": 46 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 42 - }, - "end": { - "line": 16, - "column": 47 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -267,7 +239,7 @@ }, "end": { "line": 16, - "column": 47 + "column": 46 } } }, @@ -278,7 +250,7 @@ }, "end": { "line": 16, - "column": 47 + "column": 46 } } } diff --git a/ets2panda/test/parser/ets/InterfacePrivateMethod-expected.txt b/ets2panda/test/parser/ets/InterfacePrivateMethod-expected.txt index 95121089560..999094778ce 100644 --- a/ets2panda/test/parser/ets/InterfacePrivateMethod-expected.txt +++ b/ets2panda/test/parser/ets/InterfacePrivateMethod-expected.txt @@ -927,35 +927,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 28, - "column": 18 - }, - "end": { - "line": 28, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 28, - "column": 18 - }, - "end": { - "line": 28, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 28, @@ -963,7 +935,7 @@ }, "end": { "line": 28, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/MathCordic-expected.txt b/ets2panda/test/parser/ets/MathCordic-expected.txt index 56e1b883227..600f5588e2e 100644 --- a/ets2panda/test/parser/ets/MathCordic-expected.txt +++ b/ets2panda/test/parser/ets/MathCordic-expected.txt @@ -4688,35 +4688,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 70, - "column": 20 - }, - "end": { - "line": 70, - "column": 24 - } - } - }, - "loc": { - "start": { - "line": 70, - "column": 20 - }, - "end": { - "line": 70, - "column": 26 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 70, @@ -4724,7 +4696,7 @@ }, "end": { "line": 70, - "column": 26 + "column": 24 } } }, @@ -5401,35 +5373,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 78, - "column": 18 - }, - "end": { - "line": 78, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 78, - "column": 18 - }, - "end": { - "line": 78, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 78, @@ -5437,7 +5381,7 @@ }, "end": { "line": 78, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/MathPartialSums-expected.txt b/ets2panda/test/parser/ets/MathPartialSums-expected.txt index 23eb4fa4753..5203c78f1fd 100644 --- a/ets2panda/test/parser/ets/MathPartialSums-expected.txt +++ b/ets2panda/test/parser/ets/MathPartialSums-expected.txt @@ -3862,35 +3862,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 72, - "column": 24 - }, - "end": { - "line": 72, - "column": 28 - } - } - }, - "loc": { - "start": { - "line": 72, - "column": 24 - }, - "end": { - "line": 72, - "column": 30 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 72, @@ -3898,7 +3870,7 @@ }, "end": { "line": 72, - "column": 30 + "column": 28 } } }, @@ -4953,35 +4925,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 83, - "column": 18 - }, - "end": { - "line": 83, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 83, - "column": 18 - }, - "end": { - "line": 83, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 83, @@ -4989,7 +4933,7 @@ }, "end": { "line": 83, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/MathSpectralNorm-expected.txt b/ets2panda/test/parser/ets/MathSpectralNorm-expected.txt index 2c9560bd208..a5e9ad21486 100644 --- a/ets2panda/test/parser/ets/MathSpectralNorm-expected.txt +++ b/ets2panda/test/parser/ets/MathSpectralNorm-expected.txt @@ -624,35 +624,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 50 - }, - "end": { - "line": 21, - "column": 54 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 50 - }, - "end": { - "line": 21, - "column": 56 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -660,7 +632,7 @@ }, "end": { "line": 21, - "column": 56 + "column": 54 } } }, @@ -1625,35 +1597,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 31, - "column": 51 - }, - "end": { - "line": 31, - "column": 55 - } - } - }, - "loc": { - "start": { - "line": 31, - "column": 51 - }, - "end": { - "line": 31, - "column": 57 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 31, @@ -1661,7 +1605,7 @@ }, "end": { "line": 31, - "column": 57 + "column": 55 } } }, @@ -2680,35 +2624,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 41, - "column": 65 - }, - "end": { - "line": 41, - "column": 69 - } - } - }, - "loc": { - "start": { - "line": 41, - "column": 65 - }, - "end": { - "line": 41, - "column": 71 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 41, @@ -2716,7 +2632,7 @@ }, "end": { "line": 41, - "column": 71 + "column": 69 } } }, @@ -5179,35 +5095,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 80, - "column": 17 - }, - "end": { - "line": 80, - "column": 21 - } - } - }, - "loc": { - "start": { - "line": 80, - "column": 17 - }, - "end": { - "line": 80, - "column": 23 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 80, @@ -5215,7 +5103,7 @@ }, "end": { "line": 80, - "column": 23 + "column": 21 } } }, @@ -6079,35 +5967,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 91, - "column": 18 - }, - "end": { - "line": 91, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 91, - "column": 18 - }, - "end": { - "line": 91, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 91, @@ -6115,7 +5975,7 @@ }, "end": { "line": 91, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/Morph3d-expected.txt b/ets2panda/test/parser/ets/Morph3d-expected.txt index e5929d51a22..c9daaacefa3 100644 --- a/ets2panda/test/parser/ets/Morph3d-expected.txt +++ b/ets2panda/test/parser/ets/Morph3d-expected.txt @@ -328,35 +328,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 19 - }, - "end": { - "line": 24, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 19 - }, - "end": { - "line": 24, - "column": 25 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -364,7 +336,7 @@ }, "end": { "line": 24, - "column": 25 + "column": 23 } } }, @@ -1142,35 +1114,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 32, - "column": 29 - }, - "end": { - "line": 32, - "column": 33 - } - } - }, - "loc": { - "start": { - "line": 32, - "column": 29 - }, - "end": { - "line": 32, - "column": 35 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 32, @@ -1178,7 +1122,7 @@ }, "end": { "line": 32, - "column": 35 + "column": 33 } } }, @@ -2439,35 +2383,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 43, - "column": 17 - }, - "end": { - "line": 43, - "column": 21 - } - } - }, - "loc": { - "start": { - "line": 43, - "column": 17 - }, - "end": { - "line": 43, - "column": 23 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 43, @@ -2475,7 +2391,7 @@ }, "end": { "line": 43, - "column": 23 + "column": 21 } } }, @@ -3905,35 +3821,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 60, - "column": 18 - }, - "end": { - "line": 60, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 60, - "column": 18 - }, - "end": { - "line": 60, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 60, @@ -3941,7 +3829,7 @@ }, "end": { "line": 60, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/StringBase64-expected.txt b/ets2panda/test/parser/ets/StringBase64-expected.txt index c47c0dce320..8c46d0b051d 100644 --- a/ets2panda/test/parser/ets/StringBase64-expected.txt +++ b/ets2panda/test/parser/ets/StringBase64-expected.txt @@ -9471,35 +9471,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 72, - "column": 20 - }, - "end": { - "line": 72, - "column": 24 - } - } - }, - "loc": { - "start": { - "line": 72, - "column": 20 - }, - "end": { - "line": 72, - "column": 26 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 72, @@ -9507,7 +9479,7 @@ }, "end": { "line": 72, - "column": 26 + "column": 24 } } }, @@ -11029,35 +11001,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 88, - "column": 18 - }, - "end": { - "line": 88, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 88, - "column": 18 - }, - "end": { - "line": 88, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 88, @@ -11065,7 +11009,7 @@ }, "end": { "line": 88, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/access_modifier_2-expected.txt b/ets2panda/test/parser/ets/access_modifier_2-expected.txt index 4ac6fb77d9f..b7f4f5a19fd 100644 --- a/ets2panda/test/parser/ets/access_modifier_2-expected.txt +++ b/ets2panda/test/parser/ets/access_modifier_2-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 25 - }, - "end": { - "line": 17, - "column": 29 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 25 - }, - "end": { - "line": 17, - "column": 31 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 31 + "column": 29 } } }, diff --git a/ets2panda/test/parser/ets/accessor_call-expected.txt b/ets2panda/test/parser/ets/accessor_call-expected.txt index 9411c8d2ef9..2b34601e61d 100644 --- a/ets2panda/test/parser/ets/accessor_call-expected.txt +++ b/ets2panda/test/parser/ets/accessor_call-expected.txt @@ -434,35 +434,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -470,7 +442,7 @@ }, "end": { "line": 20, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/accessor_void-expected.txt b/ets2panda/test/parser/ets/accessor_void-expected.txt index e05bd5637eb..08b8eef39f6 100644 --- a/ets2panda/test/parser/ets/accessor_void-expected.txt +++ b/ets2panda/test/parser/ets/accessor_void-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 14 - }, - "end": { - "line": 17, - "column": 18 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 14 - }, - "end": { - "line": 17, - "column": 20 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 20 + "column": 18 } } }, diff --git a/ets2panda/test/parser/ets/ambiguous_call_1-expected.txt b/ets2panda/test/parser/ets/ambiguous_call_1-expected.txt index 6c87709fc0d..eceef76258c 100644 --- a/ets2panda/test/parser/ets/ambiguous_call_1-expected.txt +++ b/ets2panda/test/parser/ets/ambiguous_call_1-expected.txt @@ -564,35 +564,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 24 - }, - "end": { - "line": 16, - "column": 28 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 24 - }, - "end": { - "line": 16, - "column": 30 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -600,7 +572,7 @@ }, "end": { "line": 16, - "column": 30 + "column": 28 } } }, @@ -757,35 +729,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 24 - }, - "end": { - "line": 17, - "column": 28 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 24 - }, - "end": { - "line": 17, - "column": 30 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -793,7 +737,7 @@ }, "end": { "line": 17, - "column": 30 + "column": 28 } } }, @@ -905,35 +849,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 19 - }, - "end": { - "line": 22, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 19 - }, - "end": { - "line": 22, - "column": 25 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -941,7 +857,7 @@ }, "end": { "line": 22, - "column": 25 + "column": 23 } } }, diff --git a/ets2panda/test/parser/ets/ambiguous_call_2-expected.txt b/ets2panda/test/parser/ets/ambiguous_call_2-expected.txt index 6fb45ac9a58..69932c2159e 100644 --- a/ets2panda/test/parser/ets/ambiguous_call_2-expected.txt +++ b/ets2panda/test/parser/ets/ambiguous_call_2-expected.txt @@ -965,35 +965,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 43 - }, - "end": { - "line": 16, - "column": 47 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 43 - }, - "end": { - "line": 16, - "column": 49 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -1001,7 +973,7 @@ }, "end": { "line": 16, - "column": 49 + "column": 47 } } }, @@ -1268,35 +1240,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 43 - }, - "end": { - "line": 17, - "column": 47 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 43 - }, - "end": { - "line": 17, - "column": 49 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -1304,7 +1248,7 @@ }, "end": { "line": 17, - "column": 49 + "column": 47 } } }, @@ -1583,35 +1527,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 43 - }, - "end": { - "line": 18, - "column": 47 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 43 - }, - "end": { - "line": 18, - "column": 49 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -1619,7 +1535,7 @@ }, "end": { "line": 18, - "column": 49 + "column": 47 } } }, @@ -1731,35 +1647,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 26, - "column": 19 - }, - "end": { - "line": 26, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 26, - "column": 19 - }, - "end": { - "line": 26, - "column": 25 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 26, @@ -1767,7 +1655,7 @@ }, "end": { "line": 26, - "column": 25 + "column": 23 } } }, diff --git a/ets2panda/test/parser/ets/ambiguous_call_3-expected.txt b/ets2panda/test/parser/ets/ambiguous_call_3-expected.txt index eaca9b0b5c8..32f085a73b6 100644 --- a/ets2panda/test/parser/ets/ambiguous_call_3-expected.txt +++ b/ets2panda/test/parser/ets/ambiguous_call_3-expected.txt @@ -644,35 +644,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 24 - }, - "end": { - "line": 16, - "column": 28 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 24 - }, - "end": { - "line": 16, - "column": 30 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -680,7 +652,7 @@ }, "end": { "line": 16, - "column": 30 + "column": 28 } } }, @@ -837,35 +809,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 23 - }, - "end": { - "line": 17, - "column": 27 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 23 - }, - "end": { - "line": 17, - "column": 29 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -873,7 +817,7 @@ }, "end": { "line": 17, - "column": 29 + "column": 27 } } }, @@ -985,35 +929,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 19 - }, - "end": { - "line": 22, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 19 - }, - "end": { - "line": 22, - "column": 25 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -1021,7 +937,7 @@ }, "end": { "line": 22, - "column": 25 + "column": 23 } } }, diff --git a/ets2panda/test/parser/ets/anonymous_class-expected.txt b/ets2panda/test/parser/ets/anonymous_class-expected.txt index efcfb803c88..50ae27c56d9 100644 --- a/ets2panda/test/parser/ets/anonymous_class-expected.txt +++ b/ets2panda/test/parser/ets/anonymous_class-expected.txt @@ -251,35 +251,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 23 - }, - "end": { - "line": 19, - "column": 27 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 23 - }, - "end": { - "line": 19, - "column": 29 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -287,7 +259,7 @@ }, "end": { "line": 19, - "column": 29 + "column": 27 } } }, diff --git a/ets2panda/test/parser/ets/array-expected.txt b/ets2panda/test/parser/ets/array-expected.txt index 94a5bd22f3a..428cea1f9ae 100644 --- a/ets2panda/test/parser/ets/array-expected.txt +++ b/ets2panda/test/parser/ets/array-expected.txt @@ -568,35 +568,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 31 - }, - "end": { - "line": 19, - "column": 35 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 31 - }, - "end": { - "line": 19, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -604,7 +576,7 @@ }, "end": { "line": 19, - "column": 37 + "column": 35 } } }, @@ -703,35 +675,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 17 - }, - "end": { - "line": 21, - "column": 21 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 17 - }, - "end": { - "line": 21, - "column": 23 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -739,7 +683,7 @@ }, "end": { "line": 21, - "column": 23 + "column": 21 } } }, @@ -940,35 +884,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 25, - "column": 18 - }, - "end": { - "line": 25, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 25, - "column": 18 - }, - "end": { - "line": 25, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 25, @@ -976,7 +892,7 @@ }, "end": { "line": 25, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/arrayHoldingNullValue-expected.txt b/ets2panda/test/parser/ets/arrayHoldingNullValue-expected.txt index d9ff0c65bcc..002f0149078 100644 --- a/ets2panda/test/parser/ets/arrayHoldingNullValue-expected.txt +++ b/ets2panda/test/parser/ets/arrayHoldingNullValue-expected.txt @@ -545,35 +545,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -581,7 +553,7 @@ }, "end": { "line": 20, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/array_creation_expression-expected.txt b/ets2panda/test/parser/ets/array_creation_expression-expected.txt index 12151490301..6e0ab76f0c3 100644 --- a/ets2panda/test/parser/ets/array_creation_expression-expected.txt +++ b/ets2panda/test/parser/ets/array_creation_expression-expected.txt @@ -999,35 +999,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 31, - "column": 18 - }, - "end": { - "line": 31, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 31, - "column": 18 - }, - "end": { - "line": 31, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 31, @@ -1035,7 +1007,7 @@ }, "end": { "line": 31, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/array_expression_implicit_cast_assignment-expected.txt b/ets2panda/test/parser/ets/array_expression_implicit_cast_assignment-expected.txt index 8f90225009f..853ed01ea2b 100644 --- a/ets2panda/test/parser/ets/array_expression_implicit_cast_assignment-expected.txt +++ b/ets2panda/test/parser/ets/array_expression_implicit_cast_assignment-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 17 - }, - "end": { - "line": 16, - "column": 21 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 17 - }, - "end": { - "line": 16, - "column": 23 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 23 + "column": 21 } } }, diff --git a/ets2panda/test/parser/ets/array_new-expected.txt b/ets2panda/test/parser/ets/array_new-expected.txt index f67a81d3760..f2d8cc4e418 100644 --- a/ets2panda/test/parser/ets/array_new-expected.txt +++ b/ets2panda/test/parser/ets/array_new-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 17 - }, - "end": { - "line": 16, - "column": 21 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 17 - }, - "end": { - "line": 16, - "column": 23 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 23 + "column": 21 } } }, diff --git a/ets2panda/test/parser/ets/array_new_failed-expected.txt b/ets2panda/test/parser/ets/array_new_failed-expected.txt index 7a1d50898a8..da3dd01ef05 100644 --- a/ets2panda/test/parser/ets/array_new_failed-expected.txt +++ b/ets2panda/test/parser/ets/array_new_failed-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 17 - }, - "end": { - "line": 16, - "column": 21 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 17 - }, - "end": { - "line": 16, - "column": 23 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 23 + "column": 21 } } }, diff --git a/ets2panda/test/parser/ets/array_type-expected.txt b/ets2panda/test/parser/ets/array_type-expected.txt index d86b75cade3..9eda7bda03b 100644 --- a/ets2panda/test/parser/ets/array_type-expected.txt +++ b/ets2panda/test/parser/ets/array_type-expected.txt @@ -454,35 +454,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 34 - }, - "end": { - "line": 21, - "column": 38 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 34 - }, - "end": { - "line": 21, - "column": 40 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -490,7 +462,7 @@ }, "end": { "line": 21, - "column": 40 + "column": 38 } } }, diff --git a/ets2panda/test/parser/ets/assert-expected.txt b/ets2panda/test/parser/ets/assert-expected.txt index 62ea594235f..99761adc609 100644 --- a/ets2panda/test/parser/ets/assert-expected.txt +++ b/ets2panda/test/parser/ets/assert-expected.txt @@ -250,35 +250,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 20 - }, - "end": { - "line": 19, - "column": 24 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 20 - }, - "end": { - "line": 19, - "column": 26 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -286,7 +258,7 @@ }, "end": { "line": 19, - "column": 26 + "column": 24 } } }, diff --git a/ets2panda/test/parser/ets/assign-expected.txt b/ets2panda/test/parser/ets/assign-expected.txt index 89ce3dbfcaa..7a63b396404 100644 --- a/ets2panda/test/parser/ets/assign-expected.txt +++ b/ets2panda/test/parser/ets/assign-expected.txt @@ -319,35 +319,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 18 - }, - "end": { - "line": 19, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 18 - }, - "end": { - "line": 19, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -355,7 +327,7 @@ }, "end": { "line": 19, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/assign-func-expected.txt b/ets2panda/test/parser/ets/assign-func-expected.txt index 9acaaa71d7e..691b092973b 100644 --- a/ets2panda/test/parser/ets/assign-func-expected.txt +++ b/ets2panda/test/parser/ets/assign-func-expected.txt @@ -76,35 +76,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 27 - }, - "end": { - "line": 17, - "column": 31 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 27 - }, - "end": { - "line": 17, - "column": 32 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -112,7 +84,7 @@ }, "end": { "line": 17, - "column": 32 + "column": 31 } } }, @@ -123,7 +95,7 @@ }, "end": { "line": 17, - "column": 32 + "column": 31 } } }, @@ -135,7 +107,7 @@ }, "end": { "line": 17, - "column": 32 + "column": 31 } } }, @@ -146,7 +118,7 @@ }, "end": { "line": 17, - "column": 32 + "column": 31 } } } @@ -313,35 +285,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 29 - }, - "end": { - "line": 21, - "column": 33 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 29 - }, - "end": { - "line": 21, - "column": 34 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -349,7 +293,7 @@ }, "end": { "line": 21, - "column": 34 + "column": 33 } } }, @@ -360,7 +304,7 @@ }, "end": { "line": 21, - "column": 34 + "column": 33 } } }, @@ -373,7 +317,7 @@ }, "end": { "line": 21, - "column": 34 + "column": 33 } } } diff --git a/ets2panda/test/parser/ets/assignments-expected.txt b/ets2panda/test/parser/ets/assignments-expected.txt index a23e936e229..84ae73b5834 100644 --- a/ets2panda/test/parser/ets/assignments-expected.txt +++ b/ets2panda/test/parser/ets/assignments-expected.txt @@ -306,35 +306,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 21 - }, - "end": { - "line": 21, - "column": 25 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 21 - }, - "end": { - "line": 21, - "column": 27 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -342,7 +314,7 @@ }, "end": { "line": 21, - "column": 27 + "column": 25 } } }, diff --git a/ets2panda/test/parser/ets/async_overload-expected.txt b/ets2panda/test/parser/ets/async_overload-expected.txt index 5e103098465..05cccda3c67 100644 --- a/ets2panda/test/parser/ets/async_overload-expected.txt +++ b/ets2panda/test/parser/ets/async_overload-expected.txt @@ -1455,35 +1455,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 33, - "column": 18 - }, - "end": { - "line": 33, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 33, - "column": 18 - }, - "end": { - "line": 33, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 33, @@ -1491,7 +1463,7 @@ }, "end": { "line": 33, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/async_with_lambda-expected.txt b/ets2panda/test/parser/ets/async_with_lambda-expected.txt index 657afa17145..45aab316fa6 100644 --- a/ets2panda/test/parser/ets/async_with_lambda-expected.txt +++ b/ets2panda/test/parser/ets/async_with_lambda-expected.txt @@ -422,35 +422,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 23 - }, - "end": { - "line": 20, - "column": 27 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 23 - }, - "end": { - "line": 20, - "column": 29 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -458,7 +430,7 @@ }, "end": { "line": 20, - "column": 29 + "column": 27 } } }, @@ -469,7 +441,7 @@ }, "end": { "line": 20, - "column": 29 + "column": 27 } } }, @@ -495,35 +467,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 34 - }, - "end": { - "line": 20, - "column": 38 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 34 - }, - "end": { - "line": 20, - "column": 41 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -531,7 +475,7 @@ }, "end": { "line": 20, - "column": 41 + "column": 38 } } }, @@ -1635,35 +1579,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 34, - "column": 65 - }, - "end": { - "line": 34, - "column": 69 - } - } - }, - "loc": { - "start": { - "line": 34, - "column": 65 - }, - "end": { - "line": 34, - "column": 70 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 34, @@ -1671,7 +1587,7 @@ }, "end": { "line": 34, - "column": 70 + "column": 69 } } }, @@ -1682,7 +1598,7 @@ }, "end": { "line": 34, - "column": 70 + "column": 69 } } }, @@ -1694,7 +1610,7 @@ }, "end": { "line": 34, - "column": 70 + "column": 69 } } }, @@ -1705,41 +1621,13 @@ }, "end": { "line": 34, - "column": 70 + "column": 69 } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 34, - "column": 72 - }, - "end": { - "line": 34, - "column": 76 - } - } - }, - "loc": { - "start": { - "line": 34, - "column": 72 - }, - "end": { - "line": 34, - "column": 79 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 34, @@ -1747,7 +1635,7 @@ }, "end": { "line": 34, - "column": 79 + "column": 76 } } }, diff --git a/ets2panda/test/parser/ets/await_keyword-expected.txt b/ets2panda/test/parser/ets/await_keyword-expected.txt index 2159d4df660..3ce41d1cf30 100644 --- a/ets2panda/test/parser/ets/await_keyword-expected.txt +++ b/ets2panda/test/parser/ets/await_keyword-expected.txt @@ -1363,35 +1363,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 28, - "column": 17 - }, - "end": { - "line": 28, - "column": 21 - } - } - }, - "loc": { - "start": { - "line": 28, - "column": 17 - }, - "end": { - "line": 28, - "column": 23 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 28, @@ -1399,7 +1371,7 @@ }, "end": { "line": 28, - "column": 23 + "column": 21 } } }, @@ -1748,35 +1720,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 33, - "column": 30 - }, - "end": { - "line": 33, - "column": 34 - } - } - }, - "loc": { - "start": { - "line": 33, - "column": 30 - }, - "end": { - "line": 33, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 33, @@ -1784,7 +1728,7 @@ }, "end": { "line": 33, - "column": 37 + "column": 34 } } }, @@ -2103,35 +2047,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 33, - "column": 19 - }, - "end": { - "line": 33, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 33, - "column": 19 - }, - "end": { - "line": 33, - "column": 25 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 33, @@ -2139,7 +2055,7 @@ }, "end": { "line": 33, - "column": 25 + "column": 23 } } }, @@ -2150,7 +2066,7 @@ }, "end": { "line": 33, - "column": 25 + "column": 23 } } }, diff --git a/ets2panda/test/parser/ets/boolean_cond-expected.txt b/ets2panda/test/parser/ets/boolean_cond-expected.txt index c5e7a595431..a534335ef3a 100644 --- a/ets2panda/test/parser/ets/boolean_cond-expected.txt +++ b/ets2panda/test/parser/ets/boolean_cond-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/boolean_default-expected.txt b/ets2panda/test/parser/ets/boolean_default-expected.txt index b1317a2f770..8bb900f7425 100644 --- a/ets2panda/test/parser/ets/boolean_default-expected.txt +++ b/ets2panda/test/parser/ets/boolean_default-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/break-expected.txt b/ets2panda/test/parser/ets/break-expected.txt index c165861131c..ecdc110b447 100644 --- a/ets2panda/test/parser/ets/break-expected.txt +++ b/ets2panda/test/parser/ets/break-expected.txt @@ -324,35 +324,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -360,7 +332,7 @@ }, "end": { "line": 17, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/calling_superclass_methods-expected.txt b/ets2panda/test/parser/ets/calling_superclass_methods-expected.txt index 7e17bb58899..8145663cfbe 100644 --- a/ets2panda/test/parser/ets/calling_superclass_methods-expected.txt +++ b/ets2panda/test/parser/ets/calling_superclass_methods-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 20 - }, - "end": { - "line": 19, - "column": 24 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 20 - }, - "end": { - "line": 19, - "column": 26 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -104,7 +76,7 @@ }, "end": { "line": 19, - "column": 26 + "column": 24 } } }, diff --git a/ets2panda/test/parser/ets/calls-expected.txt b/ets2panda/test/parser/ets/calls-expected.txt index 58b7b644973..3e541366b0d 100644 --- a/ets2panda/test/parser/ets/calls-expected.txt +++ b/ets2panda/test/parser/ets/calls-expected.txt @@ -604,35 +604,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 18 - }, - "end": { - "line": 24, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 18 - }, - "end": { - "line": 24, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -640,7 +612,7 @@ }, "end": { "line": 24, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/cast_expressions-expected.txt b/ets2panda/test/parser/ets/cast_expressions-expected.txt index 9d787e3515c..18352943f5e 100644 --- a/ets2panda/test/parser/ets/cast_expressions-expected.txt +++ b/ets2panda/test/parser/ets/cast_expressions-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 23 - }, - "end": { - "line": 16, - "column": 27 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 23 - }, - "end": { - "line": 16, - "column": 29 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 29 + "column": 27 } } }, @@ -1194,35 +1166,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 27, - "column": 23 - }, - "end": { - "line": 27, - "column": 27 - } - } - }, - "loc": { - "start": { - "line": 27, - "column": 23 - }, - "end": { - "line": 27, - "column": 29 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 27, @@ -1230,7 +1174,7 @@ }, "end": { "line": 27, - "column": 29 + "column": 27 } } }, @@ -3056,35 +3000,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 57, - "column": 24 - }, - "end": { - "line": 57, - "column": 28 - } - } - }, - "loc": { - "start": { - "line": 57, - "column": 24 - }, - "end": { - "line": 57, - "column": 30 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 57, @@ -3092,7 +3008,7 @@ }, "end": { "line": 57, - "column": 30 + "column": 28 } } }, @@ -4833,35 +4749,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 86, - "column": 23 - }, - "end": { - "line": 86, - "column": 27 - } - } - }, - "loc": { - "start": { - "line": 86, - "column": 23 - }, - "end": { - "line": 86, - "column": 29 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 86, @@ -4869,7 +4757,7 @@ }, "end": { "line": 86, - "column": 29 + "column": 27 } } }, @@ -6610,35 +6498,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 115, - "column": 22 - }, - "end": { - "line": 115, - "column": 26 - } - } - }, - "loc": { - "start": { - "line": 115, - "column": 22 - }, - "end": { - "line": 115, - "column": 28 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 115, @@ -6646,7 +6506,7 @@ }, "end": { "line": 115, - "column": 28 + "column": 26 } } }, @@ -8302,35 +8162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 143, - "column": 23 - }, - "end": { - "line": 143, - "column": 27 - } - } - }, - "loc": { - "start": { - "line": 143, - "column": 23 - }, - "end": { - "line": 143, - "column": 29 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 143, @@ -8338,7 +8170,7 @@ }, "end": { "line": 143, - "column": 29 + "column": 27 } } }, @@ -9909,35 +9741,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 170, - "column": 24 - }, - "end": { - "line": 170, - "column": 28 - } - } - }, - "loc": { - "start": { - "line": 170, - "column": 24 - }, - "end": { - "line": 170, - "column": 30 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 170, @@ -9945,7 +9749,7 @@ }, "end": { "line": 170, - "column": 30 + "column": 28 } } }, @@ -11431,35 +11235,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 196, - "column": 25 - }, - "end": { - "line": 196, - "column": 29 - } - } - }, - "loc": { - "start": { - "line": 196, - "column": 25 - }, - "end": { - "line": 196, - "column": 31 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 196, @@ -11467,7 +11243,7 @@ }, "end": { "line": 196, - "column": 31 + "column": 29 } } }, @@ -12868,35 +12644,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 221, - "column": 26 - }, - "end": { - "line": 221, - "column": 30 - } - } - }, - "loc": { - "start": { - "line": 221, - "column": 26 - }, - "end": { - "line": 221, - "column": 32 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 221, @@ -12904,7 +12652,7 @@ }, "end": { "line": 221, - "column": 32 + "column": 30 } } }, diff --git a/ets2panda/test/parser/ets/cast_expressions10-expected.txt b/ets2panda/test/parser/ets/cast_expressions10-expected.txt index abe87272b57..675a2ef3ed8 100644 --- a/ets2panda/test/parser/ets/cast_expressions10-expected.txt +++ b/ets2panda/test/parser/ets/cast_expressions10-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/cast_expressions2-expected.txt b/ets2panda/test/parser/ets/cast_expressions2-expected.txt index 049b371ae5d..ce5e20b3485 100644 --- a/ets2panda/test/parser/ets/cast_expressions2-expected.txt +++ b/ets2panda/test/parser/ets/cast_expressions2-expected.txt @@ -436,35 +436,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 38 - }, - "end": { - "line": 19, - "column": 42 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 38 - }, - "end": { - "line": 19, - "column": 44 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -472,7 +444,7 @@ }, "end": { "line": 19, - "column": 44 + "column": 42 } } }, diff --git a/ets2panda/test/parser/ets/cast_expressions3-expected.txt b/ets2panda/test/parser/ets/cast_expressions3-expected.txt index f62c2b75486..7de2b73f5af 100644 --- a/ets2panda/test/parser/ets/cast_expressions3-expected.txt +++ b/ets2panda/test/parser/ets/cast_expressions3-expected.txt @@ -751,35 +751,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 37 - }, - "end": { - "line": 21, - "column": 41 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 37 - }, - "end": { - "line": 21, - "column": 43 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -787,7 +759,7 @@ }, "end": { "line": 21, - "column": 43 + "column": 41 } } }, diff --git a/ets2panda/test/parser/ets/cast_expressions4-expected.txt b/ets2panda/test/parser/ets/cast_expressions4-expected.txt index eae98bf4d81..5b61e4ac100 100644 --- a/ets2panda/test/parser/ets/cast_expressions4-expected.txt +++ b/ets2panda/test/parser/ets/cast_expressions4-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 33 - }, - "end": { - "line": 16, - "column": 37 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 33 - }, - "end": { - "line": 16, - "column": 39 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 39 + "column": 37 } } }, diff --git a/ets2panda/test/parser/ets/cast_expressions5-expected.txt b/ets2panda/test/parser/ets/cast_expressions5-expected.txt index d8a3a2b217d..fd910ffa41d 100644 --- a/ets2panda/test/parser/ets/cast_expressions5-expected.txt +++ b/ets2panda/test/parser/ets/cast_expressions5-expected.txt @@ -117,35 +117,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 25, - "column": 13 - }, - "end": { - "line": 25, - "column": 17 - } - } - }, - "loc": { - "start": { - "line": 25, - "column": 13 - }, - "end": { - "line": 25, - "column": 19 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 25, @@ -153,7 +125,7 @@ }, "end": { "line": 25, - "column": 19 + "column": 17 } } }, diff --git a/ets2panda/test/parser/ets/cast_expressions6-expected.txt b/ets2panda/test/parser/ets/cast_expressions6-expected.txt index 90118201406..4471c5fa6c5 100644 --- a/ets2panda/test/parser/ets/cast_expressions6-expected.txt +++ b/ets2panda/test/parser/ets/cast_expressions6-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/cast_expressions7-expected.txt b/ets2panda/test/parser/ets/cast_expressions7-expected.txt index 6fe26ccff26..dd9a166df45 100644 --- a/ets2panda/test/parser/ets/cast_expressions7-expected.txt +++ b/ets2panda/test/parser/ets/cast_expressions7-expected.txt @@ -476,35 +476,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 18 - }, - "end": { - "line": 19, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 18 - }, - "end": { - "line": 19, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -512,7 +484,7 @@ }, "end": { "line": 19, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/cast_expressions8-expected.txt b/ets2panda/test/parser/ets/cast_expressions8-expected.txt index 7ae471b150e..79c8c355039 100644 --- a/ets2panda/test/parser/ets/cast_expressions8-expected.txt +++ b/ets2panda/test/parser/ets/cast_expressions8-expected.txt @@ -476,35 +476,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 18 - }, - "end": { - "line": 19, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 18 - }, - "end": { - "line": 19, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -512,7 +484,7 @@ }, "end": { "line": 19, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/cast_expressions9-expected.txt b/ets2panda/test/parser/ets/cast_expressions9-expected.txt index 4eb28ca4f91..c19cf1255b3 100644 --- a/ets2panda/test/parser/ets/cast_expressions9-expected.txt +++ b/ets2panda/test/parser/ets/cast_expressions9-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/class_composite_1-expected.txt b/ets2panda/test/parser/ets/class_composite_1-expected.txt index f386c4a28e8..e7de54e8cf5 100644 --- a/ets2panda/test/parser/ets/class_composite_1-expected.txt +++ b/ets2panda/test/parser/ets/class_composite_1-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 19 - }, - "end": { - "line": 16, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 19 - }, - "end": { - "line": 16, - "column": 25 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 25 + "column": 23 } } }, diff --git a/ets2panda/test/parser/ets/conditionalExpressionType-expected.txt b/ets2panda/test/parser/ets/conditionalExpressionType-expected.txt index a3046e47c10..e692c9c1f4d 100644 --- a/ets2panda/test/parser/ets/conditionalExpressionType-expected.txt +++ b/ets2panda/test/parser/ets/conditionalExpressionType-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 27 - }, - "end": { - "line": 16, - "column": 31 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 27 - }, - "end": { - "line": 16, - "column": 32 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 32 + "column": 31 } } }, @@ -1551,35 +1523,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 39, - "column": 27 - }, - "end": { - "line": 39, - "column": 31 - } - } - }, - "loc": { - "start": { - "line": 39, - "column": 27 - }, - "end": { - "line": 39, - "column": 32 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 39, @@ -1587,7 +1531,7 @@ }, "end": { "line": 39, - "column": 32 + "column": 31 } } }, @@ -2229,35 +2173,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 49, - "column": 34 - }, - "end": { - "line": 49, - "column": 38 - } - } - }, - "loc": { - "start": { - "line": 49, - "column": 34 - }, - "end": { - "line": 49, - "column": 39 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 49, @@ -2265,7 +2181,7 @@ }, "end": { "line": 49, - "column": 39 + "column": 38 } } }, @@ -3496,35 +3412,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 66, - "column": 18 - }, - "end": { - "line": 66, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 66, - "column": 18 - }, - "end": { - "line": 66, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 66, @@ -3532,7 +3420,7 @@ }, "end": { "line": 66, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/continue-expected.txt b/ets2panda/test/parser/ets/continue-expected.txt index cd8cfe6fabf..072ccfbc335 100644 --- a/ets2panda/test/parser/ets/continue-expected.txt +++ b/ets2panda/test/parser/ets/continue-expected.txt @@ -324,35 +324,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -360,7 +332,7 @@ }, "end": { "line": 17, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/declare_class-expected.txt b/ets2panda/test/parser/ets/declare_class-expected.txt index 4e26b0f3450..315d1e681ab 100644 --- a/ets2panda/test/parser/ets/declare_class-expected.txt +++ b/ets2panda/test/parser/ets/declare_class-expected.txt @@ -399,43 +399,15 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 28 - }, - "end": { - "line": 20, - "column": 32 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 28 - }, - "end": { - "line": 21, - "column": 2 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, "column": 28 }, "end": { - "line": 21, - "column": 2 + "line": 20, + "column": 32 } } }, diff --git a/ets2panda/test/parser/ets/declare_class_bad_2-expected.txt b/ets2panda/test/parser/ets/declare_class_bad_2-expected.txt index 8fc27406b67..478bf5c3e02 100644 --- a/ets2panda/test/parser/ets/declare_class_bad_2-expected.txt +++ b/ets2panda/test/parser/ets/declare_class_bad_2-expected.txt @@ -215,35 +215,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 21 - }, - "end": { - "line": 18, - "column": 25 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 21 - }, - "end": { - "line": 18, - "column": 27 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -251,7 +223,7 @@ }, "end": { "line": 18, - "column": 27 + "column": 25 } } }, diff --git a/ets2panda/test/parser/ets/declare_class_bad_4-expected.txt b/ets2panda/test/parser/ets/declare_class_bad_4-expected.txt index beb867b7c5e..f39eb8db4d4 100644 --- a/ets2panda/test/parser/ets/declare_class_bad_4-expected.txt +++ b/ets2panda/test/parser/ets/declare_class_bad_4-expected.txt @@ -215,35 +215,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 28 - }, - "end": { - "line": 18, - "column": 32 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 28 - }, - "end": { - "line": 18, - "column": 34 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -251,7 +223,7 @@ }, "end": { "line": 18, - "column": 34 + "column": 32 } } }, diff --git a/ets2panda/test/parser/ets/declare_func-expected.txt b/ets2panda/test/parser/ets/declare_func-expected.txt index 69f6f0f38f3..1f61843eba7 100644 --- a/ets2panda/test/parser/ets/declare_func-expected.txt +++ b/ets2panda/test/parser/ets/declare_func-expected.txt @@ -232,35 +232,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 34 - }, - "end": { - "line": 16, - "column": 38 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 34 - }, - "end": { - "line": 16, - "column": 39 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -268,7 +240,7 @@ }, "end": { "line": 16, - "column": 39 + "column": 38 } } }, diff --git a/ets2panda/test/parser/ets/declare_func_bad-expected.txt b/ets2panda/test/parser/ets/declare_func_bad-expected.txt index a0e4a781ede..257a5d68b1f 100644 --- a/ets2panda/test/parser/ets/declare_func_bad-expected.txt +++ b/ets2panda/test/parser/ets/declare_func_bad-expected.txt @@ -232,35 +232,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 34 - }, - "end": { - "line": 16, - "column": 38 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 34 - }, - "end": { - "line": 16, - "column": 40 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -268,7 +240,7 @@ }, "end": { "line": 16, - "column": 40 + "column": 38 } } }, diff --git a/ets2panda/test/parser/ets/declare_iface-expected.txt b/ets2panda/test/parser/ets/declare_iface-expected.txt index db0f6ba96b6..22390e70af1 100644 --- a/ets2panda/test/parser/ets/declare_iface-expected.txt +++ b/ets2panda/test/parser/ets/declare_iface-expected.txt @@ -929,35 +929,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 28 - }, - "end": { - "line": 19, - "column": 32 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 28 - }, - "end": { - "line": 19, - "column": 33 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -965,7 +937,7 @@ }, "end": { "line": 19, - "column": 33 + "column": 32 } } }, @@ -977,7 +949,7 @@ }, "end": { "line": 19, - "column": 33 + "column": 32 } } }, @@ -988,7 +960,7 @@ }, "end": { "line": 19, - "column": 33 + "column": 32 } } }, diff --git a/ets2panda/test/parser/ets/declare_namespace_2-expected.txt b/ets2panda/test/parser/ets/declare_namespace_2-expected.txt index ef0198eda6f..727d59cfb77 100644 --- a/ets2panda/test/parser/ets/declare_namespace_2-expected.txt +++ b/ets2panda/test/parser/ets/declare_namespace_2-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 11 - }, - "end": { - "line": 17, - "column": 15 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 11 - }, - "end": { - "line": 17, - "column": 16 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 16 + "column": 15 } } }, diff --git a/ets2panda/test/parser/ets/default_parameter1-expected.txt b/ets2panda/test/parser/ets/default_parameter1-expected.txt index 41c4146c87d..d48d8aebb6c 100644 --- a/ets2panda/test/parser/ets/default_parameter1-expected.txt +++ b/ets2panda/test/parser/ets/default_parameter1-expected.txt @@ -162,43 +162,15 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 19 - }, - "end": { - "line": 16, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 19 - }, - "end": { - "line": 17, - "column": 2 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, "column": 19 }, "end": { - "line": 17, - "column": 2 + "line": 16, + "column": 23 } } }, diff --git a/ets2panda/test/parser/ets/default_parameter2-expected.txt b/ets2panda/test/parser/ets/default_parameter2-expected.txt index 1bc729dc189..a71ba0307b3 100644 --- a/ets2panda/test/parser/ets/default_parameter2-expected.txt +++ b/ets2panda/test/parser/ets/default_parameter2-expected.txt @@ -162,43 +162,15 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 19 - }, - "end": { - "line": 16, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 19 - }, - "end": { - "line": 17, - "column": 2 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, "column": 19 }, "end": { - "line": 17, - "column": 2 + "line": 16, + "column": 23 } } }, diff --git a/ets2panda/test/parser/ets/default_parameter4-expected.txt b/ets2panda/test/parser/ets/default_parameter4-expected.txt index 9ddd3595837..126cb8f63b3 100644 --- a/ets2panda/test/parser/ets/default_parameter4-expected.txt +++ b/ets2panda/test/parser/ets/default_parameter4-expected.txt @@ -162,43 +162,15 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 19 - }, - "end": { - "line": 16, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 19 - }, - "end": { - "line": 17, - "column": 2 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, "column": 19 }, "end": { - "line": 17, - "column": 2 + "line": 16, + "column": 23 } } }, diff --git a/ets2panda/test/parser/ets/default_parameter5-expected.txt b/ets2panda/test/parser/ets/default_parameter5-expected.txt index ab0a5a6760f..d15ef85a7e6 100644 --- a/ets2panda/test/parser/ets/default_parameter5-expected.txt +++ b/ets2panda/test/parser/ets/default_parameter5-expected.txt @@ -162,43 +162,15 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 19 - }, - "end": { - "line": 16, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 19 - }, - "end": { - "line": 17, - "column": 2 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, "column": 19 }, "end": { - "line": 17, - "column": 2 + "line": 16, + "column": 23 } } }, 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 bb716f90ae0..2c60213c3b1 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 @@ -1294,35 +1294,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 23 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -1330,7 +1302,7 @@ }, "end": { "line": 20, - "column": 23 + "column": 22 } } }, 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 63103e5c36e..9e690fd0d38 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 @@ -1221,35 +1221,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 36 - }, - "end": { - "line": 16, - "column": 40 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 36 - }, - "end": { - "line": 16, - "column": 41 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -1257,7 +1229,7 @@ }, "end": { "line": 16, - "column": 41 + "column": 40 } } }, diff --git a/ets2panda/test/parser/ets/empty_statement-expected.txt b/ets2panda/test/parser/ets/empty_statement-expected.txt index 2e225881a50..786d08768d0 100644 --- a/ets2panda/test/parser/ets/empty_statement-expected.txt +++ b/ets2panda/test/parser/ets/empty_statement-expected.txt @@ -257,35 +257,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 21 - }, - "end": { - "line": 20, - "column": 25 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 21 - }, - "end": { - "line": 20, - "column": 27 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -293,7 +265,7 @@ }, "end": { "line": 20, - "column": 27 + "column": 25 } } }, @@ -747,35 +719,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 31, - "column": 20 - }, - "end": { - "line": 31, - "column": 24 - } - } - }, - "loc": { - "start": { - "line": 31, - "column": 20 - }, - "end": { - "line": 31, - "column": 26 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 31, @@ -783,7 +727,7 @@ }, "end": { "line": 31, - "column": 26 + "column": 24 } } }, diff --git a/ets2panda/test/parser/ets/enum-expected.txt b/ets2panda/test/parser/ets/enum-expected.txt index edcd158548e..6d15e922e10 100644 --- a/ets2panda/test/parser/ets/enum-expected.txt +++ b/ets2panda/test/parser/ets/enum-expected.txt @@ -922,35 +922,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 29, - "column": 18 - }, - "end": { - "line": 29, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 29, - "column": 18 - }, - "end": { - "line": 29, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 29, @@ -958,7 +930,7 @@ }, "end": { "line": 29, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/enum10-expected.txt b/ets2panda/test/parser/ets/enum10-expected.txt index 1f526c797d8..fa67a817c64 100644 --- a/ets2panda/test/parser/ets/enum10-expected.txt +++ b/ets2panda/test/parser/ets/enum10-expected.txt @@ -235,35 +235,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -271,7 +243,7 @@ }, "end": { "line": 18, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/enum11-expected.txt b/ets2panda/test/parser/ets/enum11-expected.txt index 325edc48c2a..7e9ff8d5927 100644 --- a/ets2panda/test/parser/ets/enum11-expected.txt +++ b/ets2panda/test/parser/ets/enum11-expected.txt @@ -235,35 +235,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -271,7 +243,7 @@ }, "end": { "line": 18, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/enum12-expected.txt b/ets2panda/test/parser/ets/enum12-expected.txt index a3cb3a471aa..1a5cbc8ee22 100644 --- a/ets2panda/test/parser/ets/enum12-expected.txt +++ b/ets2panda/test/parser/ets/enum12-expected.txt @@ -305,35 +305,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 26 - }, - "end": { - "line": 18, - "column": 30 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 26 - }, - "end": { - "line": 18, - "column": 32 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -341,7 +313,7 @@ }, "end": { "line": 18, - "column": 32 + "column": 30 } } }, @@ -703,35 +675,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 18 - }, - "end": { - "line": 23, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 18 - }, - "end": { - "line": 23, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -739,7 +683,7 @@ }, "end": { "line": 23, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/enum13-expected.txt b/ets2panda/test/parser/ets/enum13-expected.txt index e9357392f78..440ba7ece94 100644 --- a/ets2panda/test/parser/ets/enum13-expected.txt +++ b/ets2panda/test/parser/ets/enum13-expected.txt @@ -305,35 +305,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 26 - }, - "end": { - "line": 18, - "column": 30 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 26 - }, - "end": { - "line": 18, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -341,7 +313,7 @@ }, "end": { "line": 18, - "column": 37 + "column": 30 } } }, @@ -762,35 +734,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 18 - }, - "end": { - "line": 23, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 18 - }, - "end": { - "line": 23, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -798,7 +742,7 @@ }, "end": { "line": 23, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/enum14-expected.txt b/ets2panda/test/parser/ets/enum14-expected.txt index 44f44c38cae..5be5600c5ac 100644 --- a/ets2panda/test/parser/ets/enum14-expected.txt +++ b/ets2panda/test/parser/ets/enum14-expected.txt @@ -319,35 +319,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -355,7 +327,7 @@ }, "end": { "line": 18, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/enum20-expected.txt b/ets2panda/test/parser/ets/enum20-expected.txt index ddbf6ffb3da..d698d023f3e 100644 --- a/ets2panda/test/parser/ets/enum20-expected.txt +++ b/ets2panda/test/parser/ets/enum20-expected.txt @@ -361,35 +361,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -397,7 +369,7 @@ }, "end": { "line": 18, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/enum6-expected.txt b/ets2panda/test/parser/ets/enum6-expected.txt index b8b1fb3a359..8065c262847 100644 --- a/ets2panda/test/parser/ets/enum6-expected.txt +++ b/ets2panda/test/parser/ets/enum6-expected.txt @@ -319,35 +319,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -355,7 +327,7 @@ }, "end": { "line": 22, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/enum7-expected.txt b/ets2panda/test/parser/ets/enum7-expected.txt index 1d1053bc244..e1126efa6a4 100644 --- a/ets2panda/test/parser/ets/enum7-expected.txt +++ b/ets2panda/test/parser/ets/enum7-expected.txt @@ -308,35 +308,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 18 - }, - "end": { - "line": 19, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 18 - }, - "end": { - "line": 19, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -344,7 +316,7 @@ }, "end": { "line": 19, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/enum8-expected.txt b/ets2panda/test/parser/ets/enum8-expected.txt index 150b136c75e..5efdb564d04 100644 --- a/ets2panda/test/parser/ets/enum8-expected.txt +++ b/ets2panda/test/parser/ets/enum8-expected.txt @@ -308,35 +308,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 18 - }, - "end": { - "line": 19, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 18 - }, - "end": { - "line": 19, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -344,7 +316,7 @@ }, "end": { "line": 19, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/enum9-expected.txt b/ets2panda/test/parser/ets/enum9-expected.txt index 30778307262..84e7b2d9062 100644 --- a/ets2panda/test/parser/ets/enum9-expected.txt +++ b/ets2panda/test/parser/ets/enum9-expected.txt @@ -235,35 +235,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -271,7 +243,7 @@ }, "end": { "line": 18, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/exports-expected.txt b/ets2panda/test/parser/ets/exports-expected.txt index aab03ca6223..1d646588e56 100644 --- a/ets2panda/test/parser/ets/exports-expected.txt +++ b/ets2panda/test/parser/ets/exports-expected.txt @@ -540,35 +540,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 22 - }, - "end": { - "line": 19, - "column": 26 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 22 - }, - "end": { - "line": 19, - "column": 28 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -576,7 +548,7 @@ }, "end": { "line": 19, - "column": 28 + "column": 26 } } }, diff --git a/ets2panda/test/parser/ets/for_of-expected.txt b/ets2panda/test/parser/ets/for_of-expected.txt index d3446be05ac..a7ec20b3c19 100644 --- a/ets2panda/test/parser/ets/for_of-expected.txt +++ b/ets2panda/test/parser/ets/for_of-expected.txt @@ -324,35 +324,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -360,7 +332,7 @@ }, "end": { "line": 18, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/for_of_02-expected.txt b/ets2panda/test/parser/ets/for_of_02-expected.txt index f7ae611379b..47593ed0606 100644 --- a/ets2panda/test/parser/ets/for_of_02-expected.txt +++ b/ets2panda/test/parser/ets/for_of_02-expected.txt @@ -588,35 +588,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 25, - "column": 18 - }, - "end": { - "line": 25, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 25, - "column": 18 - }, - "end": { - "line": 25, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 25, @@ -624,7 +596,7 @@ }, "end": { "line": 25, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/for_with_break-expected.txt b/ets2panda/test/parser/ets/for_with_break-expected.txt index ec654926a4c..14344437546 100644 --- a/ets2panda/test/parser/ets/for_with_break-expected.txt +++ b/ets2panda/test/parser/ets/for_with_break-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/functionThrowsRethrows-expected.txt b/ets2panda/test/parser/ets/functionThrowsRethrows-expected.txt index 58d47fb3f6c..2f1584bc251 100644 --- a/ets2panda/test/parser/ets/functionThrowsRethrows-expected.txt +++ b/ets2panda/test/parser/ets/functionThrowsRethrows-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 26 - }, - "end": { - "line": 16, - "column": 30 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 26 - }, - "end": { - "line": 16, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 37 + "column": 30 } } }, @@ -548,35 +520,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 75 - }, - "end": { - "line": 20, - "column": 79 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 75 - }, - "end": { - "line": 20, - "column": 88 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -584,7 +528,7 @@ }, "end": { "line": 20, - "column": 88 + "column": 79 } } }, diff --git a/ets2panda/test/parser/ets/function_implicit_return_type4-expected.txt b/ets2panda/test/parser/ets/function_implicit_return_type4-expected.txt index 371c602d96c..9630d641f0c 100644 --- a/ets2panda/test/parser/ets/function_implicit_return_type4-expected.txt +++ b/ets2panda/test/parser/ets/function_implicit_return_type4-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 17 - }, - "end": { - "line": 18, - "column": 21 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 17 - }, - "end": { - "line": 18, - "column": 23 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -104,7 +76,7 @@ }, "end": { "line": 18, - "column": 23 + "column": 21 } } }, diff --git a/ets2panda/test/parser/ets/generic_error-expected.txt b/ets2panda/test/parser/ets/generic_error-expected.txt index 11e1c94b0ed..b5b8f7d3893 100644 --- a/ets2panda/test/parser/ets/generic_error-expected.txt +++ b/ets2panda/test/parser/ets/generic_error-expected.txt @@ -605,35 +605,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -641,7 +613,7 @@ }, "end": { "line": 22, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/generic_resolve-expected.txt b/ets2panda/test/parser/ets/generic_resolve-expected.txt index ee62b20b1c7..11a66547e81 100644 --- a/ets2panda/test/parser/ets/generic_resolve-expected.txt +++ b/ets2panda/test/parser/ets/generic_resolve-expected.txt @@ -598,35 +598,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 23 - }, - "end": { - "line": 22, - "column": 27 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 23 - }, - "end": { - "line": 22, - "column": 29 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -634,7 +606,7 @@ }, "end": { "line": 22, - "column": 29 + "column": 27 } } }, @@ -645,7 +617,7 @@ }, "end": { "line": 22, - "column": 29 + "column": 27 } } }, @@ -671,35 +643,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 34 - }, - "end": { - "line": 22, - "column": 38 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 34 - }, - "end": { - "line": 22, - "column": 41 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -707,7 +651,7 @@ }, "end": { "line": 22, - "column": 41 + "column": 38 } } }, @@ -1167,35 +1111,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 29, - "column": 39 - }, - "end": { - "line": 29, - "column": 43 - } - } - }, - "loc": { - "start": { - "line": 29, - "column": 39 - }, - "end": { - "line": 29, - "column": 44 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 29, @@ -1203,7 +1119,7 @@ }, "end": { "line": 29, - "column": 44 + "column": 43 } } }, diff --git a/ets2panda/test/parser/ets/generics_1-expected.txt b/ets2panda/test/parser/ets/generics_1-expected.txt index d8e381e5d79..66c0a6a5979 100644 --- a/ets2panda/test/parser/ets/generics_1-expected.txt +++ b/ets2panda/test/parser/ets/generics_1-expected.txt @@ -932,35 +932,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 28, - "column": 18 - }, - "end": { - "line": 28, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 28, - "column": 18 - }, - "end": { - "line": 28, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 28, @@ -968,7 +940,7 @@ }, "end": { "line": 28, - "column": 24 + "column": 22 } } }, 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 5d2baa5275b..4e65fd62c65 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 @@ -536,35 +536,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 18 - }, - "end": { - "line": 21, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 18 - }, - "end": { - "line": 21, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -572,7 +544,7 @@ }, "end": { "line": 21, - "column": 24 + "column": 22 } } }, 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 c01abfe35c9..af0880a8523 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 @@ -122,35 +122,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 23 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -158,7 +130,7 @@ }, "end": { "line": 18, - "column": 23 + "column": 22 } } }, @@ -170,7 +142,7 @@ }, "end": { "line": 18, - "column": 23 + "column": 22 } } }, @@ -181,7 +153,7 @@ }, "end": { "line": 18, - "column": 23 + "column": 22 } } }, 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 fd54bd69e73..85dde51e855 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 @@ -122,35 +122,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 19 - }, - "end": { - "line": 18, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 19 - }, - "end": { - "line": 18, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -158,7 +130,7 @@ }, "end": { "line": 18, - "column": 24 + "column": 23 } } }, @@ -170,7 +142,7 @@ }, "end": { "line": 18, - "column": 24 + "column": 23 } } }, @@ -181,7 +153,7 @@ }, "end": { "line": 18, - "column": 24 + "column": 23 } } }, @@ -314,35 +286,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 19 - }, - "end": { - "line": 19, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 19 - }, - "end": { - "line": 19, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -350,7 +294,7 @@ }, "end": { "line": 19, - "column": 24 + "column": 23 } } }, @@ -362,7 +306,7 @@ }, "end": { "line": 19, - "column": 24 + "column": 23 } } }, @@ -373,7 +317,7 @@ }, "end": { "line": 19, - "column": 24 + "column": 23 } } }, 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 3412eacfea5..927d1eea457 100644 --- a/ets2panda/test/parser/ets/getter_setter_access_modifiers-expected.txt +++ b/ets2panda/test/parser/ets/getter_setter_access_modifiers-expected.txt @@ -1067,35 +1067,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 35, - "column": 31 - }, - "end": { - "line": 35, - "column": 35 - } - } - }, - "loc": { - "start": { - "line": 35, - "column": 31 - }, - "end": { - "line": 35, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 35, @@ -1103,7 +1075,7 @@ }, "end": { "line": 35, - "column": 37 + "column": 35 } } }, @@ -1343,35 +1315,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 39, - "column": 33 - }, - "end": { - "line": 39, - "column": 37 - } - } - }, - "loc": { - "start": { - "line": 39, - "column": 33 - }, - "end": { - "line": 39, - "column": 39 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 39, @@ -1379,7 +1323,7 @@ }, "end": { "line": 39, - "column": 39 + "column": 37 } } }, diff --git a/ets2panda/test/parser/ets/getter_setter_access_modifiers_2-expected.txt b/ets2panda/test/parser/ets/getter_setter_access_modifiers_2-expected.txt index ed873fe6929..0126b231676 100644 --- a/ets2panda/test/parser/ets/getter_setter_access_modifiers_2-expected.txt +++ b/ets2panda/test/parser/ets/getter_setter_access_modifiers_2-expected.txt @@ -360,35 +360,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 29 - }, - "end": { - "line": 24, - "column": 33 - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 29 - }, - "end": { - "line": 24, - "column": 35 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -396,7 +368,7 @@ }, "end": { "line": 24, - "column": 35 + "column": 33 } } }, @@ -911,35 +883,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 33, - "column": 32 - }, - "end": { - "line": 33, - "column": 36 - } - } - }, - "loc": { - "start": { - "line": 33, - "column": 32 - }, - "end": { - "line": 33, - "column": 38 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 33, @@ -947,7 +891,7 @@ }, "end": { "line": 33, - "column": 38 + "column": 36 } } }, diff --git a/ets2panda/test/parser/ets/global_const_vars3-expected.txt b/ets2panda/test/parser/ets/global_const_vars3-expected.txt index e2c12eaa497..04e9ad0cdb7 100644 --- a/ets2panda/test/parser/ets/global_const_vars3-expected.txt +++ b/ets2panda/test/parser/ets/global_const_vars3-expected.txt @@ -365,35 +365,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 26, - "column": 20 - }, - "end": { - "line": 26, - "column": 24 - } - } - }, - "loc": { - "start": { - "line": 26, - "column": 20 - }, - "end": { - "line": 26, - "column": 26 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 26, @@ -401,7 +373,7 @@ }, "end": { "line": 26, - "column": 26 + "column": 24 } } }, diff --git a/ets2panda/test/parser/ets/global_const_vars4-expected.txt b/ets2panda/test/parser/ets/global_const_vars4-expected.txt index 8d67d403e87..effa949d283 100644 --- a/ets2panda/test/parser/ets/global_const_vars4-expected.txt +++ b/ets2panda/test/parser/ets/global_const_vars4-expected.txt @@ -366,35 +366,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 21 - }, - "end": { - "line": 23, - "column": 25 - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 21 - }, - "end": { - "line": 23, - "column": 27 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -402,7 +374,7 @@ }, "end": { "line": 23, - "column": 27 + "column": 25 } } }, @@ -627,35 +599,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 27, - "column": 20 - }, - "end": { - "line": 27, - "column": 24 - } - } - }, - "loc": { - "start": { - "line": 27, - "column": 20 - }, - "end": { - "line": 27, - "column": 26 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 27, @@ -663,7 +607,7 @@ }, "end": { "line": 27, - "column": 26 + "column": 24 } } }, diff --git a/ets2panda/test/parser/ets/if-expected.txt b/ets2panda/test/parser/ets/if-expected.txt index affe2d1603b..fcf38d2ba65 100644 --- a/ets2panda/test/parser/ets/if-expected.txt +++ b/ets2panda/test/parser/ets/if-expected.txt @@ -208,35 +208,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 21 - }, - "end": { - "line": 19, - "column": 25 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 21 - }, - "end": { - "line": 19, - "column": 27 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -244,7 +216,7 @@ }, "end": { "line": 19, - "column": 27 + "column": 25 } } }, diff --git a/ets2panda/test/parser/ets/import_tests/check_exported_1-expected.txt b/ets2panda/test/parser/ets/import_tests/check_exported_1-expected.txt index 26d1fd8247e..c71aace2c72 100644 --- a/ets2panda/test/parser/ets/import_tests/check_exported_1-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/check_exported_1-expected.txt @@ -219,35 +219,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -255,7 +227,7 @@ }, "end": { "line": 18, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/import_tests/default_import-expected.txt b/ets2panda/test/parser/ets/import_tests/default_import-expected.txt index 8252c9d7ce9..5c8e3e5254e 100644 --- a/ets2panda/test/parser/ets/import_tests/default_import-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/default_import-expected.txt @@ -219,35 +219,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -255,7 +227,7 @@ }, "end": { "line": 18, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/import_tests/import_alias/export-expected.txt b/ets2panda/test/parser/ets/import_tests/import_alias/export-expected.txt index 6f65df04769..c4ed835aa2f 100644 --- a/ets2panda/test/parser/ets/import_tests/import_alias/export-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_alias/export-expected.txt @@ -737,35 +737,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 17 - }, - "end": { - "line": 24, - "column": 21 - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 17 - }, - "end": { - "line": 24, - "column": 22 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -773,7 +745,7 @@ }, "end": { "line": 24, - "column": 22 + "column": 21 } } }, @@ -872,35 +844,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 26, - "column": 24 - }, - "end": { - "line": 26, - "column": 28 - } - } - }, - "loc": { - "start": { - "line": 26, - "column": 24 - }, - "end": { - "line": 26, - "column": 29 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 26, @@ -908,7 +852,7 @@ }, "end": { "line": 26, - "column": 29 + "column": 28 } } }, diff --git a/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_1-expected.txt b/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_1-expected.txt index 0c9678eb433..5de026fa9a5 100644 --- a/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_1-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_1-expected.txt @@ -219,35 +219,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 17 - }, - "end": { - "line": 18, - "column": 21 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 17 - }, - "end": { - "line": 18, - "column": 22 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -255,7 +227,7 @@ }, "end": { "line": 18, - "column": 22 + "column": 21 } } }, diff --git a/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_2-expected.txt b/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_2-expected.txt index b93dcf3bac8..ebe97c1959d 100644 --- a/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_2-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_2-expected.txt @@ -219,35 +219,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 17 - }, - "end": { - "line": 18, - "column": 21 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 17 - }, - "end": { - "line": 18, - "column": 22 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -255,7 +227,7 @@ }, "end": { "line": 18, - "column": 22 + "column": 21 } } }, diff --git a/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_3-expected.txt b/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_3-expected.txt index 87472d20e31..547431415f0 100644 --- a/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_3-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_3-expected.txt @@ -219,35 +219,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 17 - }, - "end": { - "line": 18, - "column": 21 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 17 - }, - "end": { - "line": 18, - "column": 22 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -255,7 +227,7 @@ }, "end": { "line": 18, - "column": 22 + "column": 21 } } }, diff --git a/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_4-expected.txt b/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_4-expected.txt index 0f2f2abf890..d1c93f18547 100644 --- a/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_4-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_alias/import_alias_4-expected.txt @@ -219,35 +219,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 17 - }, - "end": { - "line": 18, - "column": 21 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 17 - }, - "end": { - "line": 18, - "column": 22 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -255,7 +227,7 @@ }, "end": { "line": 18, - "column": 22 + "column": 21 } } }, diff --git a/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_1-expected.txt b/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_1-expected.txt index 8c0b40cfd6a..c1757bd21cf 100644 --- a/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_1-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_1-expected.txt @@ -291,35 +291,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 17 - }, - "end": { - "line": 19, - "column": 21 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 17 - }, - "end": { - "line": 19, - "column": 22 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -327,7 +299,7 @@ }, "end": { "line": 19, - "column": 22 + "column": 21 } } }, diff --git a/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_2-expected.txt b/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_2-expected.txt index d5602c785eb..cfe800f574d 100644 --- a/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_2-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_2-expected.txt @@ -363,35 +363,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 17 - }, - "end": { - "line": 20, - "column": 21 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 17 - }, - "end": { - "line": 20, - "column": 22 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -399,7 +371,7 @@ }, "end": { "line": 20, - "column": 22 + "column": 21 } } }, diff --git a/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_3-expected.txt b/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_3-expected.txt index 4f64d581635..f4d8f9abdd3 100644 --- a/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_3-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_alias_and_without_alias_3-expected.txt @@ -363,35 +363,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 17 - }, - "end": { - "line": 20, - "column": 21 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 17 - }, - "end": { - "line": 20, - "column": 22 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -399,7 +371,7 @@ }, "end": { "line": 20, - "column": 22 + "column": 21 } } }, diff --git a/ets2panda/test/parser/ets/import_tests/import_all_2-expected.txt b/ets2panda/test/parser/ets/import_tests/import_all_2-expected.txt index ab855e1e6c1..71291eb448c 100644 --- a/ets2panda/test/parser/ets/import_tests/import_all_2-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_all_2-expected.txt @@ -219,35 +219,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -255,7 +227,7 @@ }, "end": { "line": 18, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/import_tests/import_all_3-expected.txt b/ets2panda/test/parser/ets/import_tests/import_all_3-expected.txt index 29061158abb..d2e2cc8352f 100644 --- a/ets2panda/test/parser/ets/import_tests/import_all_3-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_all_3-expected.txt @@ -219,35 +219,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -255,7 +227,7 @@ }, "end": { "line": 18, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/import_tests/import_max_as_alias-expected.txt b/ets2panda/test/parser/ets/import_tests/import_max_as_alias-expected.txt index 12beab65ee7..d7c4a9587b5 100644 --- a/ets2panda/test/parser/ets/import_tests/import_max_as_alias-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_max_as_alias-expected.txt @@ -234,35 +234,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -270,7 +242,7 @@ }, "end": { "line": 18, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/import_tests/import_ts_file-expected.txt b/ets2panda/test/parser/ets/import_tests/import_ts_file-expected.txt index 400aae202ad..cf617e0d5bb 100644 --- a/ets2panda/test/parser/ets/import_tests/import_ts_file-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/import_ts_file-expected.txt @@ -234,35 +234,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -270,7 +242,7 @@ }, "end": { "line": 18, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/import_tests/modules/default_export-expected.txt b/ets2panda/test/parser/ets/import_tests/modules/default_export-expected.txt index 7b52eccf539..4407e0da8df 100644 --- a/ets2panda/test/parser/ets/import_tests/modules/default_export-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/modules/default_export-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 48 - }, - "end": { - "line": 16, - "column": 52 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 48 - }, - "end": { - "line": 16, - "column": 54 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 54 + "column": 52 } } }, @@ -297,35 +269,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 43 - }, - "end": { - "line": 18, - "column": 47 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 43 - }, - "end": { - "line": 18, - "column": 49 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -333,7 +277,7 @@ }, "end": { "line": 18, - "column": 49 + "column": 47 } } }, diff --git a/ets2panda/test/parser/ets/import_tests/modules/missing_default_export-expected.txt b/ets2panda/test/parser/ets/import_tests/modules/missing_default_export-expected.txt index de79dcf4315..1cb362a46f4 100644 --- a/ets2panda/test/parser/ets/import_tests/modules/missing_default_export-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/modules/missing_default_export-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 29 - }, - "end": { - "line": 16, - "column": 33 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 29 - }, - "end": { - "line": 16, - "column": 35 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 35 + "column": 33 } } }, diff --git a/ets2panda/test/parser/ets/import_tests/relative_import/Point-expected.txt b/ets2panda/test/parser/ets/import_tests/relative_import/Point-expected.txt index db8f03c2be7..b6f39a45600 100644 --- a/ets2panda/test/parser/ets/import_tests/relative_import/Point-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/relative_import/Point-expected.txt @@ -597,35 +597,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 25, - "column": 32 - }, - "end": { - "line": 25, - "column": 36 - } - } - }, - "loc": { - "start": { - "line": 25, - "column": 32 - }, - "end": { - "line": 25, - "column": 38 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 25, @@ -633,7 +605,7 @@ }, "end": { "line": 25, - "column": 38 + "column": 36 } } }, diff --git a/ets2panda/test/parser/ets/import_tests/relative_import/alias2-expected.txt b/ets2panda/test/parser/ets/import_tests/relative_import/alias2-expected.txt index 78b1a6b2bbd..2035da6e46f 100644 --- a/ets2panda/test/parser/ets/import_tests/relative_import/alias2-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/relative_import/alias2-expected.txt @@ -500,35 +500,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 25 - }, - "end": { - "line": 18, - "column": 29 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 25 - }, - "end": { - "line": 18, - "column": 31 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -536,7 +508,7 @@ }, "end": { "line": 18, - "column": 31 + "column": 29 } } }, diff --git a/ets2panda/test/parser/ets/inheritance2-expected.txt b/ets2panda/test/parser/ets/inheritance2-expected.txt index b6c70a83def..36af7ac4f93 100644 --- a/ets2panda/test/parser/ets/inheritance2-expected.txt +++ b/ets2panda/test/parser/ets/inheritance2-expected.txt @@ -830,35 +830,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 18 - }, - "end": { - "line": 21, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 18 - }, - "end": { - "line": 21, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -866,7 +838,7 @@ }, "end": { "line": 21, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/interface_static_function_1-expected.txt b/ets2panda/test/parser/ets/interface_static_function_1-expected.txt index ed88c432e05..6d191560037 100644 --- a/ets2panda/test/parser/ets/interface_static_function_1-expected.txt +++ b/ets2panda/test/parser/ets/interface_static_function_1-expected.txt @@ -805,35 +805,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 32, - "column": 18 - }, - "end": { - "line": 32, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 32, - "column": 18 - }, - "end": { - "line": 32, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 32, @@ -841,7 +813,7 @@ }, "end": { "line": 32, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/interface_static_function_2-expected.txt b/ets2panda/test/parser/ets/interface_static_function_2-expected.txt index aaf46ac04d8..e344174ceb1 100644 --- a/ets2panda/test/parser/ets/interface_static_function_2-expected.txt +++ b/ets2panda/test/parser/ets/interface_static_function_2-expected.txt @@ -805,35 +805,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 32, - "column": 18 - }, - "end": { - "line": 32, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 32, - "column": 18 - }, - "end": { - "line": 32, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 32, @@ -841,7 +813,7 @@ }, "end": { "line": 32, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/interfaces-expected.txt b/ets2panda/test/parser/ets/interfaces-expected.txt index 5867d9032de..4c33267a111 100644 --- a/ets2panda/test/parser/ets/interfaces-expected.txt +++ b/ets2panda/test/parser/ets/interfaces-expected.txt @@ -934,35 +934,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -970,7 +942,7 @@ }, "end": { "line": 22, - "column": 24 + "column": 22 } } }, @@ -1144,35 +1116,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 20 - }, - "end": { - "line": 23, - "column": 24 - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 20 - }, - "end": { - "line": 23, - "column": 26 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -1180,7 +1124,7 @@ }, "end": { "line": 23, - "column": 26 + "column": 24 } } }, @@ -1280,35 +1224,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 16 - }, - "end": { - "line": 24, - "column": 20 - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 16 - }, - "end": { - "line": 24, - "column": 22 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -1316,7 +1232,7 @@ }, "end": { "line": 24, - "column": 22 + "column": 20 } } }, diff --git a/ets2panda/test/parser/ets/internalParsing-expected.txt b/ets2panda/test/parser/ets/internalParsing-expected.txt index a2fe1faccdd..91c3639a747 100644 --- a/ets2panda/test/parser/ets/internalParsing-expected.txt +++ b/ets2panda/test/parser/ets/internalParsing-expected.txt @@ -514,35 +514,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 25, - "column": 19 - }, - "end": { - "line": 25, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 25, - "column": 19 - }, - "end": { - "line": 25, - "column": 25 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 25, @@ -550,7 +522,7 @@ }, "end": { "line": 25, - "column": 25 + "column": 23 } } }, @@ -787,35 +759,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 28, - "column": 18 - }, - "end": { - "line": 28, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 28, - "column": 18 - }, - "end": { - "line": 28, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 28, @@ -823,7 +767,7 @@ }, "end": { "line": 28, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/internalProtectedParsing-expected.txt b/ets2panda/test/parser/ets/internalProtectedParsing-expected.txt index 9c8de543ac0..ceeee9e6f7b 100644 --- a/ets2panda/test/parser/ets/internalProtectedParsing-expected.txt +++ b/ets2panda/test/parser/ets/internalProtectedParsing-expected.txt @@ -723,35 +723,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 29, - "column": 29 - }, - "end": { - "line": 29, - "column": 33 - } - } - }, - "loc": { - "start": { - "line": 29, - "column": 29 - }, - "end": { - "line": 29, - "column": 35 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 29, @@ -759,7 +731,7 @@ }, "end": { "line": 29, - "column": 35 + "column": 33 } } }, @@ -996,35 +968,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 32, - "column": 18 - }, - "end": { - "line": 32, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 32, - "column": 18 - }, - "end": { - "line": 32, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 32, @@ -1032,7 +976,7 @@ }, "end": { "line": 32, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/labeledDoWhileStatement-expected.txt b/ets2panda/test/parser/ets/labeledDoWhileStatement-expected.txt index bac5b0dde57..07b3af4cc84 100644 --- a/ets2panda/test/parser/ets/labeledDoWhileStatement-expected.txt +++ b/ets2panda/test/parser/ets/labeledDoWhileStatement-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 34 - }, - "end": { - "line": 16, - "column": 38 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 34 - }, - "end": { - "line": 16, - "column": 40 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 40 + "column": 38 } } }, diff --git a/ets2panda/test/parser/ets/labeledForStatement-expected.txt b/ets2panda/test/parser/ets/labeledForStatement-expected.txt index cc597d92ce5..49245fba594 100644 --- a/ets2panda/test/parser/ets/labeledForStatement-expected.txt +++ b/ets2panda/test/parser/ets/labeledForStatement-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 30 - }, - "end": { - "line": 16, - "column": 34 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 30 - }, - "end": { - "line": 16, - "column": 36 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 36 + "column": 34 } } }, diff --git a/ets2panda/test/parser/ets/labeledSwitchStatement-expected.txt b/ets2panda/test/parser/ets/labeledSwitchStatement-expected.txt index a8ffaf63a76..3dd740a25fe 100644 --- a/ets2panda/test/parser/ets/labeledSwitchStatement-expected.txt +++ b/ets2panda/test/parser/ets/labeledSwitchStatement-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 33 - }, - "end": { - "line": 16, - "column": 37 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 33 - }, - "end": { - "line": 16, - "column": 39 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 39 + "column": 37 } } }, @@ -956,35 +928,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 36, - "column": 33 - }, - "end": { - "line": 36, - "column": 37 - } - } - }, - "loc": { - "start": { - "line": 36, - "column": 33 - }, - "end": { - "line": 36, - "column": 39 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 36, @@ -992,7 +936,7 @@ }, "end": { "line": 36, - "column": 39 + "column": 37 } } }, diff --git a/ets2panda/test/parser/ets/labeledWhileStatement-expected.txt b/ets2panda/test/parser/ets/labeledWhileStatement-expected.txt index c7ac60a0eaa..ed679bcd287 100644 --- a/ets2panda/test/parser/ets/labeledWhileStatement-expected.txt +++ b/ets2panda/test/parser/ets/labeledWhileStatement-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 32 - }, - "end": { - "line": 16, - "column": 36 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 32 - }, - "end": { - "line": 16, - "column": 38 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 38 + "column": 36 } } }, diff --git a/ets2panda/test/parser/ets/lambda-expected.txt b/ets2panda/test/parser/ets/lambda-expected.txt index 7110e936627..9bae6d8f2a9 100644 --- a/ets2panda/test/parser/ets/lambda-expected.txt +++ b/ets2panda/test/parser/ets/lambda-expected.txt @@ -240,35 +240,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 41 - }, - "end": { - "line": 16, - "column": 45 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 41 - }, - "end": { - "line": 16, - "column": 46 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -276,7 +248,7 @@ }, "end": { "line": 16, - "column": 46 + "column": 45 } } }, @@ -287,7 +259,7 @@ }, "end": { "line": 16, - "column": 46 + "column": 45 } } }, @@ -299,7 +271,7 @@ }, "end": { "line": 16, - "column": 46 + "column": 45 } } }, @@ -310,41 +282,13 @@ }, "end": { "line": 16, - "column": 46 + "column": 45 } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 48 - }, - "end": { - "line": 16, - "column": 52 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 48 - }, - "end": { - "line": 16, - "column": 54 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -352,7 +296,7 @@ }, "end": { "line": 16, - "column": 54 + "column": 52 } } }, @@ -510,35 +454,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -546,7 +462,7 @@ }, "end": { "line": 20, - "column": 24 + "column": 22 } } }, @@ -653,35 +569,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 24 - }, - "end": { - "line": 21, - "column": 28 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 24 - }, - "end": { - "line": 21, - "column": 31 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -689,7 +577,7 @@ }, "end": { "line": 21, - "column": 31 + "column": 28 } } }, diff --git a/ets2panda/test/parser/ets/lambda-lambda-expected.txt b/ets2panda/test/parser/ets/lambda-lambda-expected.txt index a6897819c13..715e50ec4be 100644 --- a/ets2panda/test/parser/ets/lambda-lambda-expected.txt +++ b/ets2panda/test/parser/ets/lambda-lambda-expected.txt @@ -220,35 +220,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 48 - }, - "end": { - "line": 16, - "column": 52 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 48 - }, - "end": { - "line": 16, - "column": 53 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -256,7 +228,7 @@ }, "end": { "line": 16, - "column": 53 + "column": 52 } } }, @@ -267,7 +239,7 @@ }, "end": { "line": 16, - "column": 53 + "column": 52 } } }, @@ -279,7 +251,7 @@ }, "end": { "line": 16, - "column": 53 + "column": 52 } } }, @@ -290,41 +262,13 @@ }, "end": { "line": 16, - "column": 53 + "column": 52 } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 57 - }, - "end": { - "line": 16, - "column": 61 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 57 - }, - "end": { - "line": 16, - "column": 62 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -332,7 +276,7 @@ }, "end": { "line": 16, - "column": 62 + "column": 61 } } }, @@ -343,7 +287,7 @@ }, "end": { "line": 16, - "column": 62 + "column": 61 } } }, @@ -355,7 +299,7 @@ }, "end": { "line": 16, - "column": 62 + "column": 61 } } }, @@ -366,41 +310,13 @@ }, "end": { "line": 16, - "column": 62 + "column": 61 } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 64 - }, - "end": { - "line": 16, - "column": 68 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 64 - }, - "end": { - "line": 16, - "column": 70 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -408,7 +324,7 @@ }, "end": { "line": 16, - "column": 70 + "column": 68 } } }, @@ -507,35 +423,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 18 - }, - "end": { - "line": 19, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 18 - }, - "end": { - "line": 19, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -543,7 +431,7 @@ }, "end": { "line": 19, - "column": 24 + "column": 22 } } }, @@ -630,35 +518,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 33 - }, - "end": { - "line": 20, - "column": 37 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 33 - }, - "end": { - "line": 20, - "column": 38 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -666,7 +526,7 @@ }, "end": { "line": 20, - "column": 38 + "column": 37 } } }, @@ -677,7 +537,7 @@ }, "end": { "line": 20, - "column": 38 + "column": 37 } } }, @@ -689,7 +549,7 @@ }, "end": { "line": 20, - "column": 38 + "column": 37 } } }, @@ -700,41 +560,13 @@ }, "end": { "line": 20, - "column": 38 + "column": 37 } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 40 - }, - "end": { - "line": 20, - "column": 44 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 40 - }, - "end": { - "line": 20, - "column": 47 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -742,7 +574,7 @@ }, "end": { "line": 20, - "column": 47 + "column": 44 } } }, 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 3ed65879e28..a9570ccb8c6 100644 --- a/ets2panda/test/parser/ets/lambda-type-inference-alias-expected.txt +++ b/ets2panda/test/parser/ets/lambda-type-inference-alias-expected.txt @@ -64,35 +64,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 27 - }, - "end": { - "line": 16, - "column": 31 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 27 - }, - "end": { - "line": 16, - "column": 32 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -100,7 +72,7 @@ }, "end": { "line": 16, - "column": 32 + "column": 31 } } }, @@ -111,7 +83,7 @@ }, "end": { "line": 16, - "column": 32 + "column": 31 } } }, @@ -426,35 +398,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 34 - }, - "end": { - "line": 19, - "column": 38 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 34 - }, - "end": { - "line": 19, - "column": 40 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -462,7 +406,7 @@ }, "end": { "line": 19, - "column": 40 + "column": 38 } } }, @@ -561,35 +505,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -597,7 +513,7 @@ }, "end": { "line": 22, - "column": 24 + "column": 22 } } }, @@ -663,35 +579,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 14 - }, - "end": { - "line": 23, - "column": 18 - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 14 - }, - "end": { - "line": 23, - "column": 21 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -699,7 +587,7 @@ }, "end": { "line": 23, - "column": 21 + "column": 18 } } }, 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 971a987aff4..d6834b671d5 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 @@ -329,35 +329,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 57 - }, - "end": { - "line": 16, - "column": 61 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 57 - }, - "end": { - "line": 16, - "column": 63 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -365,7 +337,7 @@ }, "end": { "line": 16, - "column": 63 + "column": 61 } } }, @@ -581,35 +553,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -617,7 +561,7 @@ }, "end": { "line": 20, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/lambda-type-inference-expected.txt b/ets2panda/test/parser/ets/lambda-type-inference-expected.txt index ca93a3e8cfa..32e3fc57cd7 100644 --- a/ets2panda/test/parser/ets/lambda-type-inference-expected.txt +++ b/ets2panda/test/parser/ets/lambda-type-inference-expected.txt @@ -170,35 +170,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 44 - }, - "end": { - "line": 16, - "column": 48 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 44 - }, - "end": { - "line": 16, - "column": 49 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -206,7 +178,7 @@ }, "end": { "line": 16, - "column": 49 + "column": 48 } } }, @@ -217,7 +189,7 @@ }, "end": { "line": 16, - "column": 49 + "column": 48 } } }, @@ -229,7 +201,7 @@ }, "end": { "line": 16, - "column": 49 + "column": 48 } } }, @@ -240,41 +212,13 @@ }, "end": { "line": 16, - "column": 49 + "column": 48 } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 51 - }, - "end": { - "line": 16, - "column": 55 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 51 - }, - "end": { - "line": 16, - "column": 57 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -282,7 +226,7 @@ }, "end": { "line": 16, - "column": 57 + "column": 55 } } }, @@ -481,35 +425,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 49 - }, - "end": { - "line": 20, - "column": 53 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 49 - }, - "end": { - "line": 20, - "column": 55 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -517,7 +433,7 @@ }, "end": { "line": 20, - "column": 55 + "column": 53 } } }, @@ -871,35 +787,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 75 - }, - "end": { - "line": 24, - "column": 79 - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 75 - }, - "end": { - "line": 24, - "column": 81 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -907,7 +795,7 @@ }, "end": { "line": 24, - "column": 81 + "column": 79 } } }, @@ -1123,35 +1011,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 28, - "column": 18 - }, - "end": { - "line": 28, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 28, - "column": 18 - }, - "end": { - "line": 28, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 28, @@ -1159,7 +1019,7 @@ }, "end": { "line": 28, - "column": 24 + "column": 22 } } }, @@ -1196,35 +1056,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 29, - "column": 27 - }, - "end": { - "line": 29, - "column": 31 - } - } - }, - "loc": { - "start": { - "line": 29, - "column": 27 - }, - "end": { - "line": 29, - "column": 34 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 29, @@ -1232,7 +1064,7 @@ }, "end": { "line": 29, - "column": 34 + "column": 31 } } }, diff --git a/ets2panda/test/parser/ets/lambda-type-inference-neg-expected.txt b/ets2panda/test/parser/ets/lambda-type-inference-neg-expected.txt index b814441ff1e..86779603cad 100644 --- a/ets2panda/test/parser/ets/lambda-type-inference-neg-expected.txt +++ b/ets2panda/test/parser/ets/lambda-type-inference-neg-expected.txt @@ -212,35 +212,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 40 - }, - "end": { - "line": 16, - "column": 44 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 40 - }, - "end": { - "line": 16, - "column": 45 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -248,7 +220,7 @@ }, "end": { "line": 16, - "column": 45 + "column": 44 } } }, @@ -259,7 +231,7 @@ }, "end": { "line": 16, - "column": 45 + "column": 44 } } }, @@ -271,7 +243,7 @@ }, "end": { "line": 16, - "column": 45 + "column": 44 } } }, @@ -282,41 +254,13 @@ }, "end": { "line": 16, - "column": 45 + "column": 44 } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 47 - }, - "end": { - "line": 16, - "column": 51 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 47 - }, - "end": { - "line": 16, - "column": 53 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -324,7 +268,7 @@ }, "end": { "line": 16, - "column": 53 + "column": 51 } } }, @@ -461,35 +405,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 36 - }, - "end": { - "line": 19, - "column": 40 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 36 - }, - "end": { - "line": 19, - "column": 41 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -497,7 +413,7 @@ }, "end": { "line": 19, - "column": 41 + "column": 40 } } }, @@ -508,7 +424,7 @@ }, "end": { "line": 19, - "column": 41 + "column": 40 } } }, @@ -520,7 +436,7 @@ }, "end": { "line": 19, - "column": 41 + "column": 40 } } }, @@ -531,41 +447,13 @@ }, "end": { "line": 19, - "column": 41 + "column": 40 } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 43 - }, - "end": { - "line": 19, - "column": 47 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 43 - }, - "end": { - "line": 19, - "column": 49 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -573,7 +461,7 @@ }, "end": { "line": 19, - "column": 49 + "column": 47 } } }, @@ -685,35 +573,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -721,7 +581,7 @@ }, "end": { "line": 22, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/lambda-type-inference-neg2-expected.txt b/ets2panda/test/parser/ets/lambda-type-inference-neg2-expected.txt index 84f195713e2..5a318e08709 100644 --- a/ets2panda/test/parser/ets/lambda-type-inference-neg2-expected.txt +++ b/ets2panda/test/parser/ets/lambda-type-inference-neg2-expected.txt @@ -301,35 +301,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 50 - }, - "end": { - "line": 16, - "column": 54 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 50 - }, - "end": { - "line": 16, - "column": 56 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -337,7 +309,7 @@ }, "end": { "line": 16, - "column": 56 + "column": 54 } } }, @@ -553,35 +525,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -589,7 +533,7 @@ }, "end": { "line": 20, - "column": 24 + "column": 22 } } }, 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 ae30c4f989e..5fb584ec375 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 @@ -329,35 +329,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 57 - }, - "end": { - "line": 16, - "column": 61 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 57 - }, - "end": { - "line": 16, - "column": 63 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -365,7 +337,7 @@ }, "end": { "line": 16, - "column": 63 + "column": 61 } } }, @@ -581,35 +553,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -617,7 +561,7 @@ }, "end": { "line": 20, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/lambda-type-inference-overloaded-1-expected.txt b/ets2panda/test/parser/ets/lambda-type-inference-overloaded-1-expected.txt index 5c3f1759fa7..e422dc6eb51 100644 --- a/ets2panda/test/parser/ets/lambda-type-inference-overloaded-1-expected.txt +++ b/ets2panda/test/parser/ets/lambda-type-inference-overloaded-1-expected.txt @@ -329,35 +329,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 57 - }, - "end": { - "line": 16, - "column": 61 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 57 - }, - "end": { - "line": 16, - "column": 63 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -365,7 +337,7 @@ }, "end": { "line": 16, - "column": 63 + "column": 61 } } }, @@ -736,35 +708,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 60 - }, - "end": { - "line": 20, - "column": 64 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 60 - }, - "end": { - "line": 20, - "column": 66 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -772,7 +716,7 @@ }, "end": { "line": 20, - "column": 66 + "column": 64 } } }, @@ -1001,35 +945,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 18 - }, - "end": { - "line": 24, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 18 - }, - "end": { - "line": 24, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -1037,7 +953,7 @@ }, "end": { "line": 24, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/lambda-type-inference-overloaded-2-expected.txt b/ets2panda/test/parser/ets/lambda-type-inference-overloaded-2-expected.txt index d87a2cfdb96..1a2cf395324 100644 --- a/ets2panda/test/parser/ets/lambda-type-inference-overloaded-2-expected.txt +++ b/ets2panda/test/parser/ets/lambda-type-inference-overloaded-2-expected.txt @@ -170,35 +170,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 30 - }, - "end": { - "line": 16, - "column": 34 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 30 - }, - "end": { - "line": 16, - "column": 35 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -206,7 +178,7 @@ }, "end": { "line": 16, - "column": 35 + "column": 34 } } }, @@ -217,7 +189,7 @@ }, "end": { "line": 16, - "column": 35 + "column": 34 } } }, @@ -229,7 +201,7 @@ }, "end": { "line": 16, - "column": 35 + "column": 34 } } }, @@ -240,7 +212,7 @@ }, "end": { "line": 16, - "column": 35 + "column": 34 } } }, @@ -287,35 +259,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 45 - }, - "end": { - "line": 16, - "column": 49 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 45 - }, - "end": { - "line": 16, - "column": 51 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -323,7 +267,7 @@ }, "end": { "line": 16, - "column": 51 + "column": 49 } } }, @@ -549,35 +493,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 58 - }, - "end": { - "line": 19, - "column": 62 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 58 - }, - "end": { - "line": 19, - "column": 64 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -585,7 +501,7 @@ }, "end": { "line": 19, - "column": 64 + "column": 62 } } }, @@ -697,35 +613,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -733,7 +621,7 @@ }, "end": { "line": 22, - "column": 24 + "column": 22 } } }, 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 c6cbd4d02bf..a3d4d031020 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 @@ -118,35 +118,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 31 - }, - "end": { - "line": 17, - "column": 35 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 31 - }, - "end": { - "line": 17, - "column": 36 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -154,7 +126,7 @@ }, "end": { "line": 17, - "column": 36 + "column": 35 } } }, @@ -165,7 +137,7 @@ }, "end": { "line": 17, - "column": 36 + "column": 35 } } }, @@ -177,7 +149,7 @@ }, "end": { "line": 17, - "column": 36 + "column": 35 } } }, @@ -188,41 +160,13 @@ }, "end": { "line": 17, - "column": 36 + "column": 35 } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 38 - }, - "end": { - "line": 17, - "column": 42 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 38 - }, - "end": { - "line": 17, - "column": 44 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -230,7 +174,7 @@ }, "end": { "line": 17, - "column": 44 + "column": 42 } } }, @@ -556,35 +500,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 34 - }, - "end": { - "line": 22, - "column": 38 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 34 - }, - "end": { - "line": 22, - "column": 39 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -592,7 +508,7 @@ }, "end": { "line": 22, - "column": 39 + "column": 38 } } }, @@ -603,7 +519,7 @@ }, "end": { "line": 22, - "column": 39 + "column": 38 } } }, @@ -615,7 +531,7 @@ }, "end": { "line": 22, - "column": 39 + "column": 38 } } }, @@ -626,41 +542,13 @@ }, "end": { "line": 22, - "column": 39 + "column": 38 } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 41 - }, - "end": { - "line": 22, - "column": 45 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 41 - }, - "end": { - "line": 22, - "column": 47 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -668,7 +556,7 @@ }, "end": { "line": 22, - "column": 47 + "column": 45 } } }, @@ -767,35 +655,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 25, - "column": 13 - }, - "end": { - "line": 25, - "column": 17 - } - } - }, - "loc": { - "start": { - "line": 25, - "column": 13 - }, - "end": { - "line": 25, - "column": 19 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 25, @@ -803,7 +663,7 @@ }, "end": { "line": 25, - "column": 19 + "column": 17 } } }, @@ -897,35 +757,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 26, - "column": 23 - }, - "end": { - "line": 26, - "column": 27 - } - } - }, - "loc": { - "start": { - "line": 26, - "column": 23 - }, - "end": { - "line": 26, - "column": 30 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 26, @@ -933,7 +765,7 @@ }, "end": { "line": 26, - "column": 30 + "column": 27 } } }, diff --git a/ets2panda/test/parser/ets/lambda-type-inference-overloaded-expected.txt b/ets2panda/test/parser/ets/lambda-type-inference-overloaded-expected.txt index f703a32a678..45b5ee1b40a 100644 --- a/ets2panda/test/parser/ets/lambda-type-inference-overloaded-expected.txt +++ b/ets2panda/test/parser/ets/lambda-type-inference-overloaded-expected.txt @@ -232,35 +232,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 23 - }, - "end": { - "line": 16, - "column": 27 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 23 - }, - "end": { - "line": 16, - "column": 29 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -268,7 +240,7 @@ }, "end": { "line": 16, - "column": 29 + "column": 27 } } }, @@ -363,35 +335,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 30 - }, - "end": { - "line": 19, - "column": 34 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 30 - }, - "end": { - "line": 19, - "column": 35 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -399,7 +343,7 @@ }, "end": { "line": 19, - "column": 35 + "column": 34 } } }, @@ -410,7 +354,7 @@ }, "end": { "line": 19, - "column": 35 + "column": 34 } } }, @@ -422,7 +366,7 @@ }, "end": { "line": 19, - "column": 35 + "column": 34 } } }, @@ -433,41 +377,13 @@ }, "end": { "line": 19, - "column": 35 + "column": 34 } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 37 - }, - "end": { - "line": 19, - "column": 41 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 37 - }, - "end": { - "line": 19, - "column": 43 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -475,7 +391,7 @@ }, "end": { "line": 19, - "column": 43 + "column": 41 } } }, @@ -785,35 +701,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 57 - }, - "end": { - "line": 23, - "column": 61 - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 57 - }, - "end": { - "line": 23, - "column": 63 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -821,7 +709,7 @@ }, "end": { "line": 23, - "column": 63 + "column": 61 } } }, @@ -1050,35 +938,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 27, - "column": 18 - }, - "end": { - "line": 27, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 27, - "column": 18 - }, - "end": { - "line": 27, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 27, @@ -1086,7 +946,7 @@ }, "end": { "line": 27, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatement-expected.txt b/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatement-expected.txt index 22c782deecc..da25446262f 100644 --- a/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatement-expected.txt +++ b/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatement-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementCallAVoidFunction-expected.txt b/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementCallAVoidFunction-expected.txt index abbbb1b2328..166cc499933 100644 --- a/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementCallAVoidFunction-expected.txt +++ b/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementCallAVoidFunction-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 23 - }, - "end": { - "line": 16, - "column": 27 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 23 - }, - "end": { - "line": 16, - "column": 29 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 29 + "column": 27 } } }, @@ -297,35 +269,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -333,7 +277,7 @@ }, "end": { "line": 18, - "column": 24 + "column": 22 } } }, @@ -352,35 +296,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 22 - }, - "end": { - "line": 19, - "column": 26 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 22 - }, - "end": { - "line": 19, - "column": 28 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -388,7 +304,7 @@ }, "end": { "line": 19, - "column": 28 + "column": 26 } } }, @@ -399,7 +315,7 @@ }, "end": { "line": 19, - "column": 28 + "column": 26 } } }, @@ -425,35 +341,7 @@ "expression": true, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 33 - }, - "end": { - "line": 19, - "column": 37 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 33 - }, - "end": { - "line": 19, - "column": 40 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -461,7 +349,7 @@ }, "end": { "line": 19, - "column": 40 + "column": 37 } } }, @@ -469,8 +357,8 @@ "type": "BlockStatement", "statements": [ { - "type": "ReturnStatement", - "argument": { + "type": "ExpressionStatement", + "expression": { "type": "CallExpression", "callee": { "type": "Identifier", diff --git a/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementVoid-expected.txt b/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementVoid-expected.txt index d1c490b6118..5f4bbd97633 100644 --- a/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementVoid-expected.txt +++ b/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementVoid-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, @@ -217,35 +189,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -253,7 +197,7 @@ }, "end": { "line": 17, - "column": 24 + "column": 22 } } }, @@ -264,7 +208,7 @@ }, "end": { "line": 17, - "column": 24 + "column": 22 } } }, @@ -290,35 +234,7 @@ "expression": true, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 29 - }, - "end": { - "line": 17, - "column": 33 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 29 - }, - "end": { - "line": 17, - "column": 36 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -326,7 +242,7 @@ }, "end": { "line": 17, - "column": 36 + "column": 33 } } }, @@ -334,8 +250,8 @@ "type": "BlockStatement", "statements": [ { - "type": "ReturnStatement", - "argument": { + "type": "ExpressionStatement", + "expression": { "type": "CallExpression", "callee": { "type": "MemberExpression", diff --git a/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementWithFunctionParameters-expected.txt b/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementWithFunctionParameters-expected.txt index 4198ef2defa..aaf24d3830b 100644 --- a/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementWithFunctionParameters-expected.txt +++ b/ets2panda/test/parser/ets/lambdaExpressionWithoutBlockStatementWithFunctionParameters-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/lambdaThrowsRethrows-expected.txt b/ets2panda/test/parser/ets/lambdaThrowsRethrows-expected.txt index bc9900bde93..eddc4d3a1fd 100644 --- a/ets2panda/test/parser/ets/lambdaThrowsRethrows-expected.txt +++ b/ets2panda/test/parser/ets/lambdaThrowsRethrows-expected.txt @@ -143,35 +143,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 37 - }, - "end": { - "line": 16, - "column": 41 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 37 - }, - "end": { - "line": 16, - "column": 48 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -179,7 +151,7 @@ }, "end": { "line": 16, - "column": 48 + "column": 41 } } }, @@ -230,35 +202,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 19 - }, - "end": { - "line": 16, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 19 - }, - "end": { - "line": 16, - "column": 30 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -266,7 +210,7 @@ }, "end": { "line": 16, - "column": 30 + "column": 23 } } } @@ -278,7 +222,7 @@ }, "end": { "line": 16, - "column": 30 + "column": 23 } } }, @@ -462,35 +406,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 114 - }, - "end": { - "line": 18, - "column": 118 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 114 - }, - "end": { - "line": 18, - "column": 127 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -498,7 +414,7 @@ }, "end": { "line": 18, - "column": 127 + "column": 118 } } }, @@ -689,35 +605,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 58 - }, - "end": { - "line": 18, - "column": 62 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 58 - }, - "end": { - "line": 18, - "column": 69 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -725,7 +613,7 @@ }, "end": { "line": 18, - "column": 69 + "column": 62 } } } @@ -737,7 +625,7 @@ }, "end": { "line": 18, - "column": 69 + "column": 62 } } }, diff --git a/ets2panda/test/parser/ets/launch-expected.txt b/ets2panda/test/parser/ets/launch-expected.txt index 69354243b1d..2abcf171d9d 100755 --- a/ets2panda/test/parser/ets/launch-expected.txt +++ b/ets2panda/test/parser/ets/launch-expected.txt @@ -1326,35 +1326,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 35, - "column": 18 - }, - "end": { - "line": 35, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 35, - "column": 18 - }, - "end": { - "line": 35, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 35, @@ -1362,7 +1334,7 @@ }, "end": { "line": 35, - "column": 24 + "column": 22 } } }, @@ -2363,35 +2335,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 44, - "column": 21 - }, - "end": { - "line": 44, - "column": 25 - } - } - }, - "loc": { - "start": { - "line": 44, - "column": 21 - }, - "end": { - "line": 44, - "column": 27 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 44, @@ -2399,7 +2343,7 @@ }, "end": { "line": 44, - "column": 27 + "column": 25 } } }, @@ -2410,7 +2354,7 @@ }, "end": { "line": 44, - "column": 27 + "column": 25 } } }, @@ -2436,35 +2380,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 44, - "column": 32 - }, - "end": { - "line": 44, - "column": 36 - } - } - }, - "loc": { - "start": { - "line": 44, - "column": 32 - }, - "end": { - "line": 44, - "column": 39 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 44, @@ -2472,7 +2388,7 @@ }, "end": { "line": 44, - "column": 39 + "column": 36 } } }, diff --git a/ets2panda/test/parser/ets/launch_ret-expected.txt b/ets2panda/test/parser/ets/launch_ret-expected.txt index 8c013e1a17a..e6a23877ca7 100644 --- a/ets2panda/test/parser/ets/launch_ret-expected.txt +++ b/ets2panda/test/parser/ets/launch_ret-expected.txt @@ -297,35 +297,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -333,7 +305,7 @@ }, "end": { "line": 20, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/launch_super-expected.txt b/ets2panda/test/parser/ets/launch_super-expected.txt index 740ef6c10d1..20aab1a4916 100755 --- a/ets2panda/test/parser/ets/launch_super-expected.txt +++ b/ets2panda/test/parser/ets/launch_super-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 20 - }, - "end": { - "line": 17, - "column": 24 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 20 - }, - "end": { - "line": 17, - "column": 26 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 26 + "column": 24 } } }, @@ -380,35 +352,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 21 - }, - "end": { - "line": 21, - "column": 25 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 21 - }, - "end": { - "line": 21, - "column": 27 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -416,7 +360,7 @@ }, "end": { "line": 21, - "column": 27 + "column": 25 } } }, diff --git a/ets2panda/test/parser/ets/launch_unresolved-expected.txt b/ets2panda/test/parser/ets/launch_unresolved-expected.txt index fbe801324ee..65f5bc0ae75 100755 --- a/ets2panda/test/parser/ets/launch_unresolved-expected.txt +++ b/ets2panda/test/parser/ets/launch_unresolved-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/loops-expected.txt b/ets2panda/test/parser/ets/loops-expected.txt index c30aa0c543d..1ea34dabb41 100644 --- a/ets2panda/test/parser/ets/loops-expected.txt +++ b/ets2panda/test/parser/ets/loops-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, @@ -915,35 +887,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 27, - "column": 20 - }, - "end": { - "line": 27, - "column": 24 - } - } - }, - "loc": { - "start": { - "line": 27, - "column": 20 - }, - "end": { - "line": 27, - "column": 26 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 27, @@ -951,7 +895,7 @@ }, "end": { "line": 27, - "column": 26 + "column": 24 } } }, @@ -1133,35 +1077,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 34, - "column": 22 - }, - "end": { - "line": 34, - "column": 26 - } - } - }, - "loc": { - "start": { - "line": 34, - "column": 22 - }, - "end": { - "line": 34, - "column": 28 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 34, @@ -1169,7 +1085,7 @@ }, "end": { "line": 34, - "column": 28 + "column": 26 } } }, @@ -1581,35 +1497,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 46, - "column": 26 - }, - "end": { - "line": 46, - "column": 30 - } - } - }, - "loc": { - "start": { - "line": 46, - "column": 26 - }, - "end": { - "line": 46, - "column": 32 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 46, @@ -1617,7 +1505,7 @@ }, "end": { "line": 46, - "column": 32 + "column": 30 } } }, @@ -2119,35 +2007,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 57, - "column": 29 - }, - "end": { - "line": 57, - "column": 33 - } - } - }, - "loc": { - "start": { - "line": 57, - "column": 29 - }, - "end": { - "line": 57, - "column": 35 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 57, @@ -2155,7 +2015,7 @@ }, "end": { "line": 57, - "column": 35 + "column": 33 } } }, diff --git a/ets2panda/test/parser/ets/main_entry_point_1-expected.txt b/ets2panda/test/parser/ets/main_entry_point_1-expected.txt index 66bc2887d31..0d70eb572e5 100644 --- a/ets2panda/test/parser/ets/main_entry_point_1-expected.txt +++ b/ets2panda/test/parser/ets/main_entry_point_1-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/main_entry_point_3-expected.txt b/ets2panda/test/parser/ets/main_entry_point_3-expected.txt index ce107284504..72cb9f1b8a7 100644 --- a/ets2panda/test/parser/ets/main_entry_point_3-expected.txt +++ b/ets2panda/test/parser/ets/main_entry_point_3-expected.txt @@ -217,35 +217,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 27 - }, - "end": { - "line": 16, - "column": 31 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 27 - }, - "end": { - "line": 16, - "column": 33 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -253,7 +225,7 @@ }, "end": { "line": 16, - "column": 33 + "column": 31 } } }, diff --git a/ets2panda/test/parser/ets/main_entry_point_4-expected.txt b/ets2panda/test/parser/ets/main_entry_point_4-expected.txt index 038926786eb..9a799098454 100644 --- a/ets2panda/test/parser/ets/main_entry_point_4-expected.txt +++ b/ets2panda/test/parser/ets/main_entry_point_4-expected.txt @@ -258,35 +258,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 37 - }, - "end": { - "line": 16, - "column": 41 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 37 - }, - "end": { - "line": 16, - "column": 43 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -294,7 +266,7 @@ }, "end": { "line": 16, - "column": 43 + "column": 41 } } }, 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 f1b23c2fdeb..093803aa4fe 100644 --- a/ets2panda/test/parser/ets/main_entry_point_6-expected.txt +++ b/ets2panda/test/parser/ets/main_entry_point_6-expected.txt @@ -245,35 +245,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 30 - }, - "end": { - "line": 16, - "column": 34 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 30 - }, - "end": { - "line": 16, - "column": 36 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -281,7 +253,7 @@ }, "end": { "line": 16, - "column": 36 + "column": 34 } } }, 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 4d502fcf3b1..2dc6b78535c 100644 --- a/ets2panda/test/parser/ets/main_entry_point_7-expected.txt +++ b/ets2panda/test/parser/ets/main_entry_point_7-expected.txt @@ -640,35 +640,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -676,7 +648,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, 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 406da83ac13..398b09b8b1b 100644 --- a/ets2panda/test/parser/ets/main_entry_point_8-expected.txt +++ b/ets2panda/test/parser/ets/main_entry_point_8-expected.txt @@ -314,35 +314,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 27 - }, - "end": { - "line": 18, - "column": 31 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 27 - }, - "end": { - "line": 18, - "column": 33 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -350,7 +322,7 @@ }, "end": { "line": 18, - "column": 33 + "column": 31 } } }, 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 8ab846bcea6..d4b95fa07d4 100644 --- a/ets2panda/test/parser/ets/main_entry_point_9-expected.txt +++ b/ets2panda/test/parser/ets/main_entry_point_9-expected.txt @@ -314,35 +314,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 25 - }, - "end": { - "line": 18, - "column": 29 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 25 - }, - "end": { - "line": 18, - "column": 31 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -350,7 +322,7 @@ }, "end": { "line": 18, - "column": 31 + "column": 29 } } }, diff --git a/ets2panda/test/parser/ets/methodThrowsRethrows-expected.txt b/ets2panda/test/parser/ets/methodThrowsRethrows-expected.txt index 385bd2bde77..612c4addfb4 100644 --- a/ets2panda/test/parser/ets/methodThrowsRethrows-expected.txt +++ b/ets2panda/test/parser/ets/methodThrowsRethrows-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 23 - }, - "end": { - "line": 17, - "column": 27 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 23 - }, - "end": { - "line": 17, - "column": 34 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 34 + "column": 27 } } }, @@ -344,35 +316,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 63 - }, - "end": { - "line": 19, - "column": 67 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 63 - }, - "end": { - "line": 19, - "column": 76 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -380,7 +324,7 @@ }, "end": { "line": 19, - "column": 76 + "column": 67 } } }, diff --git a/ets2panda/test/parser/ets/method_empty-expected.txt b/ets2panda/test/parser/ets/method_empty-expected.txt index 9b59904d9cb..f0f97178b4f 100644 --- a/ets2panda/test/parser/ets/method_empty-expected.txt +++ b/ets2panda/test/parser/ets/method_empty-expected.txt @@ -208,35 +208,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 20 - }, - "end": { - "line": 19, - "column": 24 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 20 - }, - "end": { - "line": 19, - "column": 26 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -244,7 +216,7 @@ }, "end": { "line": 19, - "column": 26 + "column": 24 } } }, @@ -373,35 +345,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 27 - }, - "end": { - "line": 21, - "column": 31 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 27 - }, - "end": { - "line": 21, - "column": 33 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -409,7 +353,7 @@ }, "end": { "line": 21, - "column": 33 + "column": 31 } } }, @@ -563,35 +507,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 29 - }, - "end": { - "line": 23, - "column": 33 - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 29 - }, - "end": { - "line": 23, - "column": 35 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -599,7 +515,7 @@ }, "end": { "line": 23, - "column": 35 + "column": 33 } } }, diff --git a/ets2panda/test/parser/ets/method_full-expected.txt b/ets2panda/test/parser/ets/method_full-expected.txt index 217d377aeb8..963b8b949b8 100644 --- a/ets2panda/test/parser/ets/method_full-expected.txt +++ b/ets2panda/test/parser/ets/method_full-expected.txt @@ -208,35 +208,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 12 - }, - "end": { - "line": 19, - "column": 16 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 12 - }, - "end": { - "line": 19, - "column": 18 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -244,7 +216,7 @@ }, "end": { "line": 19, - "column": 18 + "column": 16 } } }, diff --git a/ets2panda/test/parser/ets/method_modifier_check_1-expected.txt b/ets2panda/test/parser/ets/method_modifier_check_1-expected.txt index e3224b8f8f3..bfbe5b729d9 100644 --- a/ets2panda/test/parser/ets/method_modifier_check_1-expected.txt +++ b/ets2panda/test/parser/ets/method_modifier_check_1-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 28 - }, - "end": { - "line": 17, - "column": 32 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 28 - }, - "end": { - "line": 17, - "column": 34 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 34 + "column": 32 } } }, diff --git a/ets2panda/test/parser/ets/method_modifier_check_10-expected.txt b/ets2panda/test/parser/ets/method_modifier_check_10-expected.txt index 36c6d3daea0..53c6577011e 100644 --- a/ets2panda/test/parser/ets/method_modifier_check_10-expected.txt +++ b/ets2panda/test/parser/ets/method_modifier_check_10-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 26 - }, - "end": { - "line": 17, - "column": 30 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 26 - }, - "end": { - "line": 17, - "column": 32 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 32 + "column": 30 } } }, diff --git a/ets2panda/test/parser/ets/method_modifier_check_11-expected.txt b/ets2panda/test/parser/ets/method_modifier_check_11-expected.txt index 781cc3889a5..b69337a9f14 100644 --- a/ets2panda/test/parser/ets/method_modifier_check_11-expected.txt +++ b/ets2panda/test/parser/ets/method_modifier_check_11-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 28 - }, - "end": { - "line": 17, - "column": 32 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 28 - }, - "end": { - "line": 17, - "column": 34 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 34 + "column": 32 } } }, diff --git a/ets2panda/test/parser/ets/method_modifier_check_12-expected.txt b/ets2panda/test/parser/ets/method_modifier_check_12-expected.txt index 13dcd8b708b..ff3d4b77868 100644 --- a/ets2panda/test/parser/ets/method_modifier_check_12-expected.txt +++ b/ets2panda/test/parser/ets/method_modifier_check_12-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 26 - }, - "end": { - "line": 17, - "column": 30 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 26 - }, - "end": { - "line": 17, - "column": 32 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 32 + "column": 30 } } }, diff --git a/ets2panda/test/parser/ets/method_modifier_check_13-expected.txt b/ets2panda/test/parser/ets/method_modifier_check_13-expected.txt index 5b259a8453b..c927ad4f19d 100644 --- a/ets2panda/test/parser/ets/method_modifier_check_13-expected.txt +++ b/ets2panda/test/parser/ets/method_modifier_check_13-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 29 - }, - "end": { - "line": 17, - "column": 33 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 29 - }, - "end": { - "line": 17, - "column": 34 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 34 + "column": 33 } } }, diff --git a/ets2panda/test/parser/ets/method_modifier_check_14-expected.txt b/ets2panda/test/parser/ets/method_modifier_check_14-expected.txt index 7365c0e3977..6620974883b 100644 --- a/ets2panda/test/parser/ets/method_modifier_check_14-expected.txt +++ b/ets2panda/test/parser/ets/method_modifier_check_14-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 27 - }, - "end": { - "line": 17, - "column": 31 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 27 - }, - "end": { - "line": 17, - "column": 32 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 32 + "column": 31 } } }, diff --git a/ets2panda/test/parser/ets/method_modifier_check_15-expected.txt b/ets2panda/test/parser/ets/method_modifier_check_15-expected.txt index adf31a8145e..6529f2d7245 100644 --- a/ets2panda/test/parser/ets/method_modifier_check_15-expected.txt +++ b/ets2panda/test/parser/ets/method_modifier_check_15-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 26 - }, - "end": { - "line": 17, - "column": 30 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 26 - }, - "end": { - "line": 17, - "column": 31 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 31 + "column": 30 } } }, diff --git a/ets2panda/test/parser/ets/method_modifier_check_16-expected.txt b/ets2panda/test/parser/ets/method_modifier_check_16-expected.txt index f7aa11dedc2..c2dbfc46180 100644 --- a/ets2panda/test/parser/ets/method_modifier_check_16-expected.txt +++ b/ets2panda/test/parser/ets/method_modifier_check_16-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 29 - }, - "end": { - "line": 17, - "column": 33 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 29 - }, - "end": { - "line": 17, - "column": 34 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 34 + "column": 33 } } }, diff --git a/ets2panda/test/parser/ets/method_modifier_check_2-expected.txt b/ets2panda/test/parser/ets/method_modifier_check_2-expected.txt index de3b52cd120..dbf48ae86f7 100644 --- a/ets2panda/test/parser/ets/method_modifier_check_2-expected.txt +++ b/ets2panda/test/parser/ets/method_modifier_check_2-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 27 - }, - "end": { - "line": 17, - "column": 31 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 27 - }, - "end": { - "line": 17, - "column": 33 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 33 + "column": 31 } } }, diff --git a/ets2panda/test/parser/ets/method_modifier_check_3-expected.txt b/ets2panda/test/parser/ets/method_modifier_check_3-expected.txt index b29e6a461c2..deb246e3ec9 100644 --- a/ets2panda/test/parser/ets/method_modifier_check_3-expected.txt +++ b/ets2panda/test/parser/ets/method_modifier_check_3-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 30 - }, - "end": { - "line": 17, - "column": 34 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 30 - }, - "end": { - "line": 17, - "column": 36 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 36 + "column": 34 } } }, diff --git a/ets2panda/test/parser/ets/method_modifier_check_4-expected.txt b/ets2panda/test/parser/ets/method_modifier_check_4-expected.txt index 552012fcd15..530f0bd203a 100644 --- a/ets2panda/test/parser/ets/method_modifier_check_4-expected.txt +++ b/ets2panda/test/parser/ets/method_modifier_check_4-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 28 - }, - "end": { - "line": 17, - "column": 32 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 28 - }, - "end": { - "line": 17, - "column": 34 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 34 + "column": 32 } } }, diff --git a/ets2panda/test/parser/ets/method_modifier_check_5-expected.txt b/ets2panda/test/parser/ets/method_modifier_check_5-expected.txt index fc02f417b40..cbdd0544e88 100644 --- a/ets2panda/test/parser/ets/method_modifier_check_5-expected.txt +++ b/ets2panda/test/parser/ets/method_modifier_check_5-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 28 - }, - "end": { - "line": 17, - "column": 32 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 28 - }, - "end": { - "line": 17, - "column": 34 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 34 + "column": 32 } } }, diff --git a/ets2panda/test/parser/ets/method_modifier_check_6-expected.txt b/ets2panda/test/parser/ets/method_modifier_check_6-expected.txt index 8db996a9f03..06769206a40 100644 --- a/ets2panda/test/parser/ets/method_modifier_check_6-expected.txt +++ b/ets2panda/test/parser/ets/method_modifier_check_6-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 25 - }, - "end": { - "line": 17, - "column": 29 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 25 - }, - "end": { - "line": 17, - "column": 31 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 31 + "column": 29 } } }, diff --git a/ets2panda/test/parser/ets/method_modifier_check_7-expected.txt b/ets2panda/test/parser/ets/method_modifier_check_7-expected.txt index e8b4bbfc7ba..5f04dd8bb0f 100644 --- a/ets2panda/test/parser/ets/method_modifier_check_7-expected.txt +++ b/ets2panda/test/parser/ets/method_modifier_check_7-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 28 - }, - "end": { - "line": 17, - "column": 32 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 28 - }, - "end": { - "line": 17, - "column": 34 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 34 + "column": 32 } } }, diff --git a/ets2panda/test/parser/ets/method_modifier_check_8-expected.txt b/ets2panda/test/parser/ets/method_modifier_check_8-expected.txt index 7365c0e3977..6620974883b 100644 --- a/ets2panda/test/parser/ets/method_modifier_check_8-expected.txt +++ b/ets2panda/test/parser/ets/method_modifier_check_8-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 27 - }, - "end": { - "line": 17, - "column": 31 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 27 - }, - "end": { - "line": 17, - "column": 32 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 32 + "column": 31 } } }, diff --git a/ets2panda/test/parser/ets/method_modifier_check_9-expected.txt b/ets2panda/test/parser/ets/method_modifier_check_9-expected.txt index d3627937d05..8492bc53582 100644 --- a/ets2panda/test/parser/ets/method_modifier_check_9-expected.txt +++ b/ets2panda/test/parser/ets/method_modifier_check_9-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 28 - }, - "end": { - "line": 17, - "column": 32 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 28 - }, - "end": { - "line": 17, - "column": 33 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 33 + "column": 32 } } }, diff --git a/ets2panda/test/parser/ets/method_override_throw_1-expected.txt b/ets2panda/test/parser/ets/method_override_throw_1-expected.txt index 5e54b382c87..a8658464659 100644 --- a/ets2panda/test/parser/ets/method_override_throw_1-expected.txt +++ b/ets2panda/test/parser/ets/method_override_throw_1-expected.txt @@ -52,35 +52,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 13 - }, - "end": { - "line": 17, - "column": 17 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 13 - }, - "end": { - "line": 17, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -88,7 +60,7 @@ }, "end": { "line": 17, - "column": 24 + "column": 17 } } }, @@ -101,7 +73,7 @@ }, "end": { "line": 17, - "column": 24 + "column": 17 } } }, @@ -112,7 +84,7 @@ }, "end": { "line": 17, - "column": 24 + "column": 17 } } }, @@ -183,35 +155,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 23 - }, - "end": { - "line": 18, - "column": 27 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 23 - }, - "end": { - "line": 18, - "column": 34 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -219,7 +163,7 @@ }, "end": { "line": 18, - "column": 34 + "column": 27 } } } @@ -231,7 +175,7 @@ }, "end": { "line": 18, - "column": 34 + "column": 27 } } }, @@ -243,7 +187,7 @@ }, "end": { "line": 18, - "column": 34 + "column": 27 } } }, @@ -254,41 +198,13 @@ }, "end": { "line": 18, - "column": 34 + "column": 27 } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 37 - }, - "end": { - "line": 18, - "column": 41 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 37 - }, - "end": { - "line": 18, - "column": 50 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -296,7 +212,7 @@ }, "end": { "line": 18, - "column": 50 + "column": 41 } } }, @@ -309,7 +225,7 @@ }, "end": { "line": 18, - "column": 50 + "column": 41 } } }, @@ -320,7 +236,7 @@ }, "end": { "line": 18, - "column": 50 + "column": 41 } } }, @@ -383,35 +299,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 13 - }, - "end": { - "line": 19, - "column": 17 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 13 - }, - "end": { - "line": 19, - "column": 18 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -419,7 +307,7 @@ }, "end": { "line": 19, - "column": 18 + "column": 17 } } }, @@ -431,7 +319,7 @@ }, "end": { "line": 19, - "column": 18 + "column": 17 } } }, @@ -442,7 +330,7 @@ }, "end": { "line": 19, - "column": 18 + "column": 17 } } }, @@ -620,35 +508,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 22 - }, - "end": { - "line": 23, - "column": 26 - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 22 - }, - "end": { - "line": 23, - "column": 33 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -656,7 +516,7 @@ }, "end": { "line": 23, - "column": 33 + "column": 26 } } }, @@ -764,35 +624,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 32 - }, - "end": { - "line": 24, - "column": 36 - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 32 - }, - "end": { - "line": 24, - "column": 43 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -800,7 +632,7 @@ }, "end": { "line": 24, - "column": 43 + "column": 36 } } } @@ -812,7 +644,7 @@ }, "end": { "line": 24, - "column": 43 + "column": 36 } } }, @@ -824,7 +656,7 @@ }, "end": { "line": 24, - "column": 43 + "column": 36 } } }, @@ -835,41 +667,13 @@ }, "end": { "line": 24, - "column": 43 + "column": 36 } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 46 - }, - "end": { - "line": 24, - "column": 50 - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 46 - }, - "end": { - "line": 24, - "column": 59 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -877,7 +681,7 @@ }, "end": { "line": 24, - "column": 59 + "column": 50 } } }, @@ -977,35 +781,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 25, - "column": 22 - }, - "end": { - "line": 25, - "column": 26 - } - } - }, - "loc": { - "start": { - "line": 25, - "column": 22 - }, - "end": { - "line": 25, - "column": 28 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 25, @@ -1013,7 +789,7 @@ }, "end": { "line": 25, - "column": 28 + "column": 26 } } }, @@ -1249,35 +1025,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 29, - "column": 13 - }, - "end": { - "line": 29, - "column": 17 - } - } - }, - "loc": { - "start": { - "line": 29, - "column": 13 - }, - "end": { - "line": 29, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 29, @@ -1285,7 +1033,7 @@ }, "end": { "line": 29, - "column": 24 + "column": 17 } } }, @@ -1393,35 +1141,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 30, - "column": 23 - }, - "end": { - "line": 30, - "column": 27 - } - } - }, - "loc": { - "start": { - "line": 30, - "column": 23 - }, - "end": { - "line": 30, - "column": 34 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 30, @@ -1429,7 +1149,7 @@ }, "end": { "line": 30, - "column": 34 + "column": 27 } } } @@ -1441,7 +1161,7 @@ }, "end": { "line": 30, - "column": 34 + "column": 27 } } }, @@ -1453,7 +1173,7 @@ }, "end": { "line": 30, - "column": 34 + "column": 27 } } }, @@ -1464,41 +1184,13 @@ }, "end": { "line": 30, - "column": 34 + "column": 27 } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 30, - "column": 37 - }, - "end": { - "line": 30, - "column": 41 - } - } - }, - "loc": { - "start": { - "line": 30, - "column": 37 - }, - "end": { - "line": 30, - "column": 50 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 30, @@ -1506,7 +1198,7 @@ }, "end": { "line": 30, - "column": 50 + "column": 41 } } }, @@ -1606,35 +1298,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 31, - "column": 13 - }, - "end": { - "line": 31, - "column": 17 - } - } - }, - "loc": { - "start": { - "line": 31, - "column": 13 - }, - "end": { - "line": 31, - "column": 19 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 31, @@ -1642,7 +1306,7 @@ }, "end": { "line": 31, - "column": 19 + "column": 17 } } }, @@ -1918,35 +1582,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 35, - "column": 22 - }, - "end": { - "line": 35, - "column": 26 - } - } - }, - "loc": { - "start": { - "line": 35, - "column": 22 - }, - "end": { - "line": 35, - "column": 33 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 35, @@ -1954,7 +1590,7 @@ }, "end": { "line": 35, - "column": 33 + "column": 26 } } }, @@ -2062,35 +1698,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 36, - "column": 32 - }, - "end": { - "line": 36, - "column": 36 - } - } - }, - "loc": { - "start": { - "line": 36, - "column": 32 - }, - "end": { - "line": 36, - "column": 43 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 36, @@ -2098,7 +1706,7 @@ }, "end": { "line": 36, - "column": 43 + "column": 36 } } } @@ -2110,7 +1718,7 @@ }, "end": { "line": 36, - "column": 43 + "column": 36 } } }, @@ -2122,7 +1730,7 @@ }, "end": { "line": 36, - "column": 43 + "column": 36 } } }, @@ -2133,41 +1741,13 @@ }, "end": { "line": 36, - "column": 43 + "column": 36 } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 36, - "column": 46 - }, - "end": { - "line": 36, - "column": 50 - } - } - }, - "loc": { - "start": { - "line": 36, - "column": 46 - }, - "end": { - "line": 36, - "column": 59 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 36, @@ -2175,7 +1755,7 @@ }, "end": { "line": 36, - "column": 59 + "column": 50 } } }, @@ -2275,35 +1855,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 37, - "column": 22 - }, - "end": { - "line": 37, - "column": 26 - } - } - }, - "loc": { - "start": { - "line": 37, - "column": 22 - }, - "end": { - "line": 37, - "column": 28 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 37, @@ -2311,7 +1863,7 @@ }, "end": { "line": 37, - "column": 28 + "column": 26 } } }, diff --git a/ets2panda/test/parser/ets/method_override_throw_2-expected.txt b/ets2panda/test/parser/ets/method_override_throw_2-expected.txt index 4dcd12776b2..76adc106eb6 100644 --- a/ets2panda/test/parser/ets/method_override_throw_2-expected.txt +++ b/ets2panda/test/parser/ets/method_override_throw_2-expected.txt @@ -52,35 +52,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 12 - }, - "end": { - "line": 17, - "column": 16 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 12 - }, - "end": { - "line": 17, - "column": 23 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -88,7 +60,7 @@ }, "end": { "line": 17, - "column": 23 + "column": 16 } } }, @@ -101,7 +73,7 @@ }, "end": { "line": 17, - "column": 23 + "column": 16 } } }, @@ -112,7 +84,7 @@ }, "end": { "line": 17, - "column": 23 + "column": 16 } } }, @@ -290,35 +262,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 21 - }, - "end": { - "line": 21, - "column": 25 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 21 - }, - "end": { - "line": 21, - "column": 27 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -326,7 +270,7 @@ }, "end": { "line": 21, - "column": 27 + "column": 25 } } }, diff --git a/ets2panda/test/parser/ets/method_override_throw_3-expected.txt b/ets2panda/test/parser/ets/method_override_throw_3-expected.txt index e340f841238..55296515869 100644 --- a/ets2panda/test/parser/ets/method_override_throw_3-expected.txt +++ b/ets2panda/test/parser/ets/method_override_throw_3-expected.txt @@ -60,35 +60,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 22 - }, - "end": { - "line": 17, - "column": 26 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 22 - }, - "end": { - "line": 17, - "column": 33 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -96,7 +68,7 @@ }, "end": { "line": 17, - "column": 33 + "column": 26 } } } @@ -108,7 +80,7 @@ }, "end": { "line": 17, - "column": 33 + "column": 26 } } }, @@ -120,7 +92,7 @@ }, "end": { "line": 17, - "column": 33 + "column": 26 } } }, @@ -131,41 +103,13 @@ }, "end": { "line": 17, - "column": 33 + "column": 26 } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 36 - }, - "end": { - "line": 17, - "column": 40 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 36 - }, - "end": { - "line": 17, - "column": 49 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -173,7 +117,7 @@ }, "end": { "line": 17, - "column": 49 + "column": 40 } } }, @@ -186,7 +130,7 @@ }, "end": { "line": 17, - "column": 49 + "column": 40 } } }, @@ -197,7 +141,7 @@ }, "end": { "line": 17, - "column": 49 + "column": 40 } } }, @@ -383,35 +327,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 31 - }, - "end": { - "line": 21, - "column": 35 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 31 - }, - "end": { - "line": 21, - "column": 42 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -419,7 +335,7 @@ }, "end": { "line": 21, - "column": 42 + "column": 35 } } } @@ -431,7 +347,7 @@ }, "end": { "line": 21, - "column": 42 + "column": 35 } } }, @@ -443,7 +359,7 @@ }, "end": { "line": 21, - "column": 42 + "column": 35 } } }, @@ -454,41 +370,13 @@ }, "end": { "line": 21, - "column": 42 + "column": 35 } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 45 - }, - "end": { - "line": 21, - "column": 49 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 45 - }, - "end": { - "line": 21, - "column": 56 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -496,7 +384,7 @@ }, "end": { "line": 21, - "column": 56 + "column": 49 } } }, diff --git a/ets2panda/test/parser/ets/method_override_throw_4-expected.txt b/ets2panda/test/parser/ets/method_override_throw_4-expected.txt index 873680b1452..f9adc536202 100644 --- a/ets2panda/test/parser/ets/method_override_throw_4-expected.txt +++ b/ets2panda/test/parser/ets/method_override_throw_4-expected.txt @@ -76,35 +76,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 22 - }, - "end": { - "line": 17, - "column": 26 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 22 - }, - "end": { - "line": 17, - "column": 33 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -112,7 +84,7 @@ }, "end": { "line": 17, - "column": 33 + "column": 26 } } } @@ -124,7 +96,7 @@ }, "end": { "line": 17, - "column": 33 + "column": 26 } } }, @@ -136,7 +108,7 @@ }, "end": { "line": 17, - "column": 33 + "column": 26 } } }, @@ -147,41 +119,13 @@ }, "end": { "line": 17, - "column": 33 + "column": 26 } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 36 - }, - "end": { - "line": 17, - "column": 40 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 36 - }, - "end": { - "line": 17, - "column": 49 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -189,7 +133,7 @@ }, "end": { "line": 17, - "column": 49 + "column": 40 } } }, @@ -474,35 +418,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 31 - }, - "end": { - "line": 21, - "column": 35 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 31 - }, - "end": { - "line": 21, - "column": 42 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -510,7 +426,7 @@ }, "end": { "line": 21, - "column": 42 + "column": 35 } } } @@ -522,7 +438,7 @@ }, "end": { "line": 21, - "column": 42 + "column": 35 } } }, @@ -534,7 +450,7 @@ }, "end": { "line": 21, - "column": 42 + "column": 35 } } }, @@ -545,41 +461,13 @@ }, "end": { "line": 21, - "column": 42 + "column": 35 } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 45 - }, - "end": { - "line": 21, - "column": 49 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 45 - }, - "end": { - "line": 21, - "column": 51 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -587,7 +475,7 @@ }, "end": { "line": 21, - "column": 51 + "column": 49 } } }, diff --git a/ets2panda/test/parser/ets/method_override_throw_5-expected.txt b/ets2panda/test/parser/ets/method_override_throw_5-expected.txt index 1ad87dcfb41..9f006735a84 100644 --- a/ets2panda/test/parser/ets/method_override_throw_5-expected.txt +++ b/ets2panda/test/parser/ets/method_override_throw_5-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 12 - }, - "end": { - "line": 17, - "column": 16 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 12 - }, - "end": { - "line": 17, - "column": 23 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 23 + "column": 16 } } }, @@ -381,35 +353,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 21 - }, - "end": { - "line": 21, - "column": 25 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 21 - }, - "end": { - "line": 21, - "column": 34 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -417,7 +361,7 @@ }, "end": { "line": 21, - "column": 34 + "column": 25 } } }, diff --git a/ets2panda/test/parser/ets/method_override_throw_6-expected.txt b/ets2panda/test/parser/ets/method_override_throw_6-expected.txt index 90934c6a03f..bb00d0e8c39 100644 --- a/ets2panda/test/parser/ets/method_override_throw_6-expected.txt +++ b/ets2panda/test/parser/ets/method_override_throw_6-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 19 - }, - "end": { - "line": 17, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 19 - }, - "end": { - "line": 17, - "column": 30 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 30 + "column": 23 } } }, @@ -381,35 +353,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 19 - }, - "end": { - "line": 21, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 19 - }, - "end": { - "line": 21, - "column": 25 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -417,7 +361,7 @@ }, "end": { "line": 21, - "column": 25 + "column": 23 } } }, diff --git a/ets2panda/test/parser/ets/methods-expected.txt b/ets2panda/test/parser/ets/methods-expected.txt index c6795d18fd8..334e66e7c54 100644 --- a/ets2panda/test/parser/ets/methods-expected.txt +++ b/ets2panda/test/parser/ets/methods-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 8 - }, - "end": { - "line": 17, - "column": 12 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 8 - }, - "end": { - "line": 17, - "column": 14 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 14 + "column": 12 } } }, @@ -203,35 +175,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 15 - }, - "end": { - "line": 18, - "column": 19 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 15 - }, - "end": { - "line": 18, - "column": 21 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -239,7 +183,7 @@ }, "end": { "line": 18, - "column": 21 + "column": 19 } } }, @@ -338,35 +282,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 21 - }, - "end": { - "line": 19, - "column": 25 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 21 - }, - "end": { - "line": 19, - "column": 27 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -374,7 +290,7 @@ }, "end": { "line": 19, - "column": 27 + "column": 25 } } }, @@ -473,35 +389,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 22 - }, - "end": { - "line": 20, - "column": 26 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 22 - }, - "end": { - "line": 20, - "column": 28 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -509,7 +397,7 @@ }, "end": { "line": 20, - "column": 28 + "column": 26 } } }, @@ -608,35 +496,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 24 - }, - "end": { - "line": 21, - "column": 28 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 24 - }, - "end": { - "line": 21, - "column": 30 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -644,7 +504,7 @@ }, "end": { "line": 21, - "column": 30 + "column": 28 } } }, @@ -743,35 +603,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -779,7 +611,7 @@ }, "end": { "line": 22, - "column": 24 + "column": 22 } } }, @@ -878,35 +710,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 25 - }, - "end": { - "line": 23, - "column": 29 - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 25 - }, - "end": { - "line": 23, - "column": 31 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -914,7 +718,7 @@ }, "end": { "line": 23, - "column": 31 + "column": 29 } } }, @@ -1150,35 +954,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 28, - "column": 17 - }, - "end": { - "line": 28, - "column": 21 - } - } - }, - "loc": { - "start": { - "line": 28, - "column": 17 - }, - "end": { - "line": 28, - "column": 22 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 28, @@ -1186,7 +962,7 @@ }, "end": { "line": 28, - "column": 22 + "column": 21 } } }, @@ -1448,35 +1224,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 32, - "column": 17 - }, - "end": { - "line": 32, - "column": 21 - } - } - }, - "loc": { - "start": { - "line": 32, - "column": 17 - }, - "end": { - "line": 32, - "column": 23 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 32, @@ -1484,7 +1232,7 @@ }, "end": { "line": 32, - "column": 23 + "column": 21 } } }, @@ -1720,35 +1468,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 36, - "column": 8 - }, - "end": { - "line": 36, - "column": 12 - } - } - }, - "loc": { - "start": { - "line": 36, - "column": 8 - }, - "end": { - "line": 36, - "column": 13 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 36, @@ -1756,7 +1476,7 @@ }, "end": { "line": 36, - "column": 13 + "column": 12 } } }, @@ -2018,35 +1738,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 40, - "column": 17 - }, - "end": { - "line": 40, - "column": 21 - } - } - }, - "loc": { - "start": { - "line": 40, - "column": 17 - }, - "end": { - "line": 40, - "column": 23 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 40, @@ -2054,7 +1746,7 @@ }, "end": { "line": 40, - "column": 23 + "column": 21 } } }, diff --git a/ets2panda/test/parser/ets/n_arrayHoldingNullValue-expected.txt b/ets2panda/test/parser/ets/n_arrayHoldingNullValue-expected.txt index 10346aee633..f3afece1316 100644 --- a/ets2panda/test/parser/ets/n_arrayHoldingNullValue-expected.txt +++ b/ets2panda/test/parser/ets/n_arrayHoldingNullValue-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/n_assignNullableFromFunctionToNonNullable-expected.txt b/ets2panda/test/parser/ets/n_assignNullableFromFunctionToNonNullable-expected.txt index 57e9c0bfdea..7e8e2d13871 100644 --- a/ets2panda/test/parser/ets/n_assignNullableFromFunctionToNonNullable-expected.txt +++ b/ets2panda/test/parser/ets/n_assignNullableFromFunctionToNonNullable-expected.txt @@ -503,35 +503,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -539,7 +511,7 @@ }, "end": { "line": 22, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/n_assignNullableFromMethodToNullableParam-expected.txt b/ets2panda/test/parser/ets/n_assignNullableFromMethodToNullableParam-expected.txt index 5698d12fe67..092898e7873 100644 --- a/ets2panda/test/parser/ets/n_assignNullableFromMethodToNullableParam-expected.txt +++ b/ets2panda/test/parser/ets/n_assignNullableFromMethodToNullableParam-expected.txt @@ -503,35 +503,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -539,7 +511,7 @@ }, "end": { "line": 22, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/n_assignNullableToNonNullable-expected.txt b/ets2panda/test/parser/ets/n_assignNullableToNonNullable-expected.txt index ff8820fa74e..3e3a209b20c 100644 --- a/ets2panda/test/parser/ets/n_assignNullableToNonNullable-expected.txt +++ b/ets2panda/test/parser/ets/n_assignNullableToNonNullable-expected.txt @@ -299,35 +299,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -335,7 +307,7 @@ }, "end": { "line": 18, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/n_assignNullableToNonNullableArray-expected.txt b/ets2panda/test/parser/ets/n_assignNullableToNonNullableArray-expected.txt index c5df8b79393..3379a643869 100644 --- a/ets2panda/test/parser/ets/n_assignNullableToNonNullableArray-expected.txt +++ b/ets2panda/test/parser/ets/n_assignNullableToNonNullableArray-expected.txt @@ -299,35 +299,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -335,7 +307,7 @@ }, "end": { "line": 18, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/n_assignNullableToNonNullableTypeAlias-expected.txt b/ets2panda/test/parser/ets/n_assignNullableToNonNullableTypeAlias-expected.txt index 28ddeff4fb1..ebd9e4a09c2 100644 --- a/ets2panda/test/parser/ets/n_assignNullableToNonNullableTypeAlias-expected.txt +++ b/ets2panda/test/parser/ets/n_assignNullableToNonNullableTypeAlias-expected.txt @@ -368,35 +368,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -404,7 +376,7 @@ }, "end": { "line": 20, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/n_callFunctionWithNullableParam-expected.txt b/ets2panda/test/parser/ets/n_callFunctionWithNullableParam-expected.txt index 229bee6d941..55b9225a855 100644 --- a/ets2panda/test/parser/ets/n_callFunctionWithNullableParam-expected.txt +++ b/ets2panda/test/parser/ets/n_callFunctionWithNullableParam-expected.txt @@ -369,35 +369,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 23 - }, - "end": { - "line": 18, - "column": 27 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 23 - }, - "end": { - "line": 18, - "column": 29 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -405,7 +377,7 @@ }, "end": { "line": 18, - "column": 29 + "column": 27 } } }, @@ -504,35 +476,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -540,7 +484,7 @@ }, "end": { "line": 20, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/n_callInterfaceMethodWithNullableParam-expected.txt b/ets2panda/test/parser/ets/n_callInterfaceMethodWithNullableParam-expected.txt index 9e0b6dfba65..3b11585077f 100644 --- a/ets2panda/test/parser/ets/n_callInterfaceMethodWithNullableParam-expected.txt +++ b/ets2panda/test/parser/ets/n_callInterfaceMethodWithNullableParam-expected.txt @@ -122,35 +122,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 23 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -158,7 +130,7 @@ }, "end": { "line": 17, - "column": 23 + "column": 22 } } }, @@ -170,7 +142,7 @@ }, "end": { "line": 17, - "column": 23 + "column": 22 } } }, @@ -181,7 +153,7 @@ }, "end": { "line": 17, - "column": 23 + "column": 22 } } }, @@ -429,35 +401,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 18 - }, - "end": { - "line": 21, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 18 - }, - "end": { - "line": 21, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -465,7 +409,7 @@ }, "end": { "line": 21, - "column": 24 + "column": 22 } } }, @@ -795,35 +739,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 18 - }, - "end": { - "line": 24, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 18 - }, - "end": { - "line": 24, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -831,7 +747,7 @@ }, "end": { "line": 24, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/n_callMethodWithNullableParam-expected.txt b/ets2panda/test/parser/ets/n_callMethodWithNullableParam-expected.txt index d6718171262..e162fcbd20c 100644 --- a/ets2panda/test/parser/ets/n_callMethodWithNullableParam-expected.txt +++ b/ets2panda/test/parser/ets/n_callMethodWithNullableParam-expected.txt @@ -138,35 +138,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -174,7 +146,7 @@ }, "end": { "line": 17, - "column": 24 + "column": 22 } } }, @@ -504,35 +476,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -540,7 +484,7 @@ }, "end": { "line": 20, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/native_function_with_return_type-expected.txt b/ets2panda/test/parser/ets/native_function_with_return_type-expected.txt index 06d46c9314a..6b68f38ad1e 100644 --- a/ets2panda/test/parser/ets/native_function_with_return_type-expected.txt +++ b/ets2panda/test/parser/ets/native_function_with_return_type-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 24 - }, - "end": { - "line": 17, - "column": 28 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 24 - }, - "end": { - "line": 17, - "column": 29 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -198,7 +170,7 @@ }, "end": { "line": 17, - "column": 29 + "column": 28 } } }, @@ -283,35 +255,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 18 - }, - "end": { - "line": 19, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 18 - }, - "end": { - "line": 19, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -319,7 +263,7 @@ }, "end": { "line": 19, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/native_function_without_return_type-expected.txt b/ets2panda/test/parser/ets/native_function_without_return_type-expected.txt index 7f087614aca..433ebc942b0 100644 --- a/ets2panda/test/parser/ets/native_function_without_return_type-expected.txt +++ b/ets2panda/test/parser/ets/native_function_without_return_type-expected.txt @@ -242,35 +242,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -278,7 +250,7 @@ }, "end": { "line": 18, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/new_expressions-expected.txt b/ets2panda/test/parser/ets/new_expressions-expected.txt index df3ea624564..b4101bed1b8 100644 --- a/ets2panda/test/parser/ets/new_expressions-expected.txt +++ b/ets2panda/test/parser/ets/new_expressions-expected.txt @@ -300,35 +300,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 18 - }, - "end": { - "line": 24, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 18 - }, - "end": { - "line": 24, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -336,7 +308,7 @@ }, "end": { "line": 24, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/new_object_3-expected.txt b/ets2panda/test/parser/ets/new_object_3-expected.txt index 84dc0a7207c..bba00c3c4e0 100644 --- a/ets2panda/test/parser/ets/new_object_3-expected.txt +++ b/ets2panda/test/parser/ets/new_object_3-expected.txt @@ -162,43 +162,15 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 19 - }, - "end": { - "line": 16, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 19 - }, - "end": { - "line": 17, - "column": 2 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, "column": 19 }, "end": { - "line": 17, - "column": 2 + "line": 16, + "column": 23 } } }, diff --git a/ets2panda/test/parser/ets/nonIntegralIndex-expected.txt b/ets2panda/test/parser/ets/nonIntegralIndex-expected.txt index c714438db06..67646bd14f6 100644 --- a/ets2panda/test/parser/ets/nonIntegralIndex-expected.txt +++ b/ets2panda/test/parser/ets/nonIntegralIndex-expected.txt @@ -164,35 +164,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 46 - }, - "end": { - "line": 17, - "column": 50 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 46 - }, - "end": { - "line": 17, - "column": 52 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -200,7 +172,7 @@ }, "end": { "line": 17, - "column": 52 + "column": 50 } } }, diff --git a/ets2panda/test/parser/ets/null-expected.txt b/ets2panda/test/parser/ets/null-expected.txt index f069f5a6a67..b89c073b691 100644 --- a/ets2panda/test/parser/ets/null-expected.txt +++ b/ets2panda/test/parser/ets/null-expected.txt @@ -677,35 +677,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 33 - }, - "end": { - "line": 21, - "column": 37 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 33 - }, - "end": { - "line": 21, - "column": 39 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -713,7 +685,7 @@ }, "end": { "line": 21, - "column": 39 + "column": 37 } } }, @@ -812,35 +784,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 18 - }, - "end": { - "line": 24, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 18 - }, - "end": { - "line": 24, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -848,7 +792,7 @@ }, "end": { "line": 24, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/nullableType-expected.txt b/ets2panda/test/parser/ets/nullableType-expected.txt index ed0d5406851..1dac23b1402 100644 --- a/ets2panda/test/parser/ets/nullableType-expected.txt +++ b/ets2panda/test/parser/ets/nullableType-expected.txt @@ -1591,35 +1591,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 18 - }, - "end": { - "line": 24, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 18 - }, - "end": { - "line": 24, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -1627,7 +1599,7 @@ }, "end": { "line": 24, - "column": 24 + "column": 22 } } }, @@ -1856,35 +1828,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 30, - "column": 26 - }, - "end": { - "line": 30, - "column": 30 - } - } - }, - "loc": { - "start": { - "line": 30, - "column": 26 - }, - "end": { - "line": 30, - "column": 32 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 30, @@ -1892,7 +1836,7 @@ }, "end": { "line": 30, - "column": 32 + "column": 30 } } }, @@ -4473,35 +4417,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 65, - "column": 31 - }, - "end": { - "line": 65, - "column": 35 - } - } - }, - "loc": { - "start": { - "line": 65, - "column": 31 - }, - "end": { - "line": 65, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 65, @@ -4509,7 +4425,7 @@ }, "end": { "line": 65, - "column": 37 + "column": 35 } } }, @@ -4820,35 +4736,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 70, - "column": 31 - }, - "end": { - "line": 70, - "column": 35 - } - } - }, - "loc": { - "start": { - "line": 70, - "column": 31 - }, - "end": { - "line": 70, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 70, @@ -4856,7 +4744,7 @@ }, "end": { "line": 70, - "column": 37 + "column": 35 } } }, @@ -9296,35 +9184,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 144, - "column": 29 - }, - "end": { - "line": 144, - "column": 33 - } - } - }, - "loc": { - "start": { - "line": 144, - "column": 29 - }, - "end": { - "line": 144, - "column": 35 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 144, @@ -9332,7 +9192,7 @@ }, "end": { "line": 144, - "column": 35 + "column": 33 } } }, diff --git a/ets2panda/test/parser/ets/nullable_union_array-expected.txt b/ets2panda/test/parser/ets/nullable_union_array-expected.txt index 25904e3cab4..056f6ae37d3 100644 --- a/ets2panda/test/parser/ets/nullable_union_array-expected.txt +++ b/ets2panda/test/parser/ets/nullable_union_array-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/optional_union_paramter-expected.txt b/ets2panda/test/parser/ets/optional_union_paramter-expected.txt index a48d7291b63..0c7ecd5bd97 100644 --- a/ets2panda/test/parser/ets/optional_union_paramter-expected.txt +++ b/ets2panda/test/parser/ets/optional_union_paramter-expected.txt @@ -1371,35 +1371,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 20 - }, - "end": { - "line": 21, - "column": 24 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 20 - }, - "end": { - "line": 21, - "column": 26 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -1407,7 +1379,7 @@ }, "end": { "line": 21, - "column": 26 + "column": 24 } } }, diff --git a/ets2panda/test/parser/ets/parentheses_expression_value-expected.txt b/ets2panda/test/parser/ets/parentheses_expression_value-expected.txt index 32bc14b3a4b..0f1c91d2a81 100644 --- a/ets2panda/test/parser/ets/parentheses_expression_value-expected.txt +++ b/ets2panda/test/parser/ets/parentheses_expression_value-expected.txt @@ -589,35 +589,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 18 - }, - "end": { - "line": 21, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 18 - }, - "end": { - "line": 21, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -625,7 +597,7 @@ }, "end": { "line": 21, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/property-access-method-1-expected.txt b/ets2panda/test/parser/ets/property-access-method-1-expected.txt index 58a190143cb..3eeff6b372d 100644 --- a/ets2panda/test/parser/ets/property-access-method-1-expected.txt +++ b/ets2panda/test/parser/ets/property-access-method-1-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 19 - }, - "end": { - "line": 17, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 19 - }, - "end": { - "line": 17, - "column": 25 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 25 + "column": 23 } } }, @@ -203,35 +175,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 23 - }, - "end": { - "line": 19, - "column": 27 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 23 - }, - "end": { - "line": 19, - "column": 29 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -239,7 +183,7 @@ }, "end": { "line": 19, - "column": 29 + "column": 27 } } }, diff --git a/ets2panda/test/parser/ets/property-access-method-2-expected.txt b/ets2panda/test/parser/ets/property-access-method-2-expected.txt index 4e8f8735536..63383abaa13 100644 --- a/ets2panda/test/parser/ets/property-access-method-2-expected.txt +++ b/ets2panda/test/parser/ets/property-access-method-2-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 12 - }, - "end": { - "line": 18, - "column": 16 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 12 - }, - "end": { - "line": 18, - "column": 18 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -104,7 +76,7 @@ }, "end": { "line": 18, - "column": 18 + "column": 16 } } }, @@ -203,35 +175,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 23 - }, - "end": { - "line": 20, - "column": 27 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 23 - }, - "end": { - "line": 20, - "column": 29 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -239,7 +183,7 @@ }, "end": { "line": 20, - "column": 29 + "column": 27 } } }, diff --git a/ets2panda/test/parser/ets/proxyVoidGeneration-expected.txt b/ets2panda/test/parser/ets/proxyVoidGeneration-expected.txt index 20b3942afa9..8fdba8b8238 100644 --- a/ets2panda/test/parser/ets/proxyVoidGeneration-expected.txt +++ b/ets2panda/test/parser/ets/proxyVoidGeneration-expected.txt @@ -152,35 +152,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 38 - }, - "end": { - "line": 17, - "column": 42 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 38 - }, - "end": { - "line": 17, - "column": 44 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -188,7 +160,7 @@ }, "end": { "line": 17, - "column": 44 + "column": 42 } } }, @@ -386,35 +358,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 3 - }, - "end": { - "line": 1, - "column": 3 - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 3 - }, - "end": { - "line": 1, - "column": 3 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 1, @@ -890,35 +834,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 29 - }, - "end": { - "line": 18, - "column": 33 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 29 - }, - "end": { - "line": 18, - "column": 35 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -926,7 +842,7 @@ }, "end": { "line": 18, - "column": 35 + "column": 33 } } }, @@ -1124,35 +1040,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 3 - }, - "end": { - "line": 1, - "column": 3 - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 3 - }, - "end": { - "line": 1, - "column": 3 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 1, diff --git a/ets2panda/test/parser/ets/re_export/export-expected.txt b/ets2panda/test/parser/ets/re_export/export-expected.txt index ab233733e63..ff110370791 100644 --- a/ets2panda/test/parser/ets/re_export/export-expected.txt +++ b/ets2panda/test/parser/ets/re_export/export-expected.txt @@ -162,43 +162,15 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 23 - }, - "end": { - "line": 16, - "column": 27 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 23 - }, - "end": { - "line": 17, - "column": 2 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, "column": 23 }, "end": { - "line": 17, - "column": 2 + "line": 16, + "column": 27 } } }, diff --git a/ets2panda/test/parser/ets/re_export/export_2-expected.txt b/ets2panda/test/parser/ets/re_export/export_2-expected.txt index ab233733e63..ff110370791 100644 --- a/ets2panda/test/parser/ets/re_export/export_2-expected.txt +++ b/ets2panda/test/parser/ets/re_export/export_2-expected.txt @@ -162,43 +162,15 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 23 - }, - "end": { - "line": 16, - "column": 27 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 23 - }, - "end": { - "line": 17, - "column": 2 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, "column": 23 }, "end": { - "line": 17, - "column": 2 + "line": 16, + "column": 27 } } }, diff --git a/ets2panda/test/parser/ets/re_export/folder/export-expected.txt b/ets2panda/test/parser/ets/re_export/folder/export-expected.txt index ab233733e63..ff110370791 100644 --- a/ets2panda/test/parser/ets/re_export/folder/export-expected.txt +++ b/ets2panda/test/parser/ets/re_export/folder/export-expected.txt @@ -162,43 +162,15 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 23 - }, - "end": { - "line": 16, - "column": 27 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 23 - }, - "end": { - "line": 17, - "column": 2 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, "column": 23 }, "end": { - "line": 17, - "column": 2 + "line": 16, + "column": 27 } } }, diff --git a/ets2panda/test/parser/ets/re_export/folder/folder2/export-expected.txt b/ets2panda/test/parser/ets/re_export/folder/folder2/export-expected.txt index ab233733e63..ff110370791 100644 --- a/ets2panda/test/parser/ets/re_export/folder/folder2/export-expected.txt +++ b/ets2panda/test/parser/ets/re_export/folder/folder2/export-expected.txt @@ -162,43 +162,15 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 23 - }, - "end": { - "line": 16, - "column": 27 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 23 - }, - "end": { - "line": 17, - "column": 2 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, "column": 23 }, "end": { - "line": 17, - "column": 2 + "line": 16, + "column": 27 } } }, diff --git a/ets2panda/test/parser/ets/re_export/import-expected.txt b/ets2panda/test/parser/ets/re_export/import-expected.txt index 398ea0e512c..51e73c75809 100644 --- a/ets2panda/test/parser/ets/re_export/import-expected.txt +++ b/ets2panda/test/parser/ets/re_export/import-expected.txt @@ -219,43 +219,15 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 19 - }, - "end": { - "line": 18, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 19 - }, - "end": { - "line": 19, - "column": 2 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, "column": 19 }, "end": { - "line": 19, - "column": 2 + "line": 18, + "column": 23 } } }, diff --git a/ets2panda/test/parser/ets/re_export/import_2-expected.txt b/ets2panda/test/parser/ets/re_export/import_2-expected.txt index 6c96d8cb746..f77189776f9 100644 --- a/ets2panda/test/parser/ets/re_export/import_2-expected.txt +++ b/ets2panda/test/parser/ets/re_export/import_2-expected.txt @@ -219,43 +219,15 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 19 - }, - "end": { - "line": 18, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 19 - }, - "end": { - "line": 19, - "column": 2 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, "column": 19 }, "end": { - "line": 19, - "column": 2 + "line": 18, + "column": 23 } } }, diff --git a/ets2panda/test/parser/ets/re_export/import_3-expected.txt b/ets2panda/test/parser/ets/re_export/import_3-expected.txt index 90b1934eec6..e75b59874c7 100644 --- a/ets2panda/test/parser/ets/re_export/import_3-expected.txt +++ b/ets2panda/test/parser/ets/re_export/import_3-expected.txt @@ -234,43 +234,15 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 19 - }, - "end": { - "line": 18, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 19 - }, - "end": { - "line": 19, - "column": 2 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, "column": 19 }, "end": { - "line": 19, - "column": 2 + "line": 18, + "column": 23 } } }, diff --git a/ets2panda/test/parser/ets/re_export/import_4-expected.txt b/ets2panda/test/parser/ets/re_export/import_4-expected.txt index 7009eff8fed..7fd98dc2b7c 100644 --- a/ets2panda/test/parser/ets/re_export/import_4-expected.txt +++ b/ets2panda/test/parser/ets/re_export/import_4-expected.txt @@ -219,43 +219,15 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 19 - }, - "end": { - "line": 18, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 19 - }, - "end": { - "line": 19, - "column": 2 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, "column": 19 }, "end": { - "line": 19, - "column": 2 + "line": 18, + "column": 23 } } }, diff --git a/ets2panda/test/parser/ets/re_export/import_5-expected.txt b/ets2panda/test/parser/ets/re_export/import_5-expected.txt index 067ad6e2c95..bee49338b41 100644 --- a/ets2panda/test/parser/ets/re_export/import_5-expected.txt +++ b/ets2panda/test/parser/ets/re_export/import_5-expected.txt @@ -219,43 +219,15 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 19 - }, - "end": { - "line": 18, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 19 - }, - "end": { - "line": 19, - "column": 2 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, "column": 19 }, "end": { - "line": 19, - "column": 2 + "line": 18, + "column": 23 } } }, diff --git a/ets2panda/test/parser/ets/re_export/import_6-expected.txt b/ets2panda/test/parser/ets/re_export/import_6-expected.txt index be710cd3922..a98fb176e33 100644 --- a/ets2panda/test/parser/ets/re_export/import_6-expected.txt +++ b/ets2panda/test/parser/ets/re_export/import_6-expected.txt @@ -219,43 +219,15 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 19 - }, - "end": { - "line": 18, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 19 - }, - "end": { - "line": 19, - "column": 2 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, "column": 19 }, "end": { - "line": 19, - "column": 2 + "line": 18, + "column": 23 } } }, diff --git a/ets2panda/test/parser/ets/re_export/import_7-expected.txt b/ets2panda/test/parser/ets/re_export/import_7-expected.txt index 9fdb5dec901..39b4be1f1f6 100644 --- a/ets2panda/test/parser/ets/re_export/import_7-expected.txt +++ b/ets2panda/test/parser/ets/re_export/import_7-expected.txt @@ -219,43 +219,15 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 19 - }, - "end": { - "line": 18, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 19 - }, - "end": { - "line": 19, - "column": 2 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, "column": 19 }, "end": { - "line": 19, - "column": 2 + "line": 18, + "column": 23 } } }, diff --git a/ets2panda/test/parser/ets/re_export/import_8-expected.txt b/ets2panda/test/parser/ets/re_export/import_8-expected.txt index be710cd3922..a98fb176e33 100644 --- a/ets2panda/test/parser/ets/re_export/import_8-expected.txt +++ b/ets2panda/test/parser/ets/re_export/import_8-expected.txt @@ -219,43 +219,15 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 19 - }, - "end": { - "line": 18, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 19 - }, - "end": { - "line": 19, - "column": 2 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, "column": 19 }, "end": { - "line": 19, - "column": 2 + "line": 18, + "column": 23 } } }, 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 a287010dbf2..8c09e57e3f7 100644 --- a/ets2panda/test/parser/ets/regression-target-type-context-expected.txt +++ b/ets2panda/test/parser/ets/regression-target-type-context-expected.txt @@ -873,35 +873,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 14 - }, - "end": { - "line": 24, - "column": 18 - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 14 - }, - "end": { - "line": 24, - "column": 20 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -909,7 +881,7 @@ }, "end": { "line": 24, - "column": 20 + "column": 18 } } }, diff --git a/ets2panda/test/parser/ets/rethrow-func-1-expected.txt b/ets2panda/test/parser/ets/rethrow-func-1-expected.txt index 0427944a284..0d1ec375f8b 100644 --- a/ets2panda/test/parser/ets/rethrow-func-1-expected.txt +++ b/ets2panda/test/parser/ets/rethrow-func-1-expected.txt @@ -22,35 +22,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 24 - }, - "end": { - "line": 16, - "column": 28 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 24 - }, - "end": { - "line": 16, - "column": 35 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -58,7 +30,7 @@ }, "end": { "line": 16, - "column": 35 + "column": 28 } } } @@ -70,7 +42,7 @@ }, "end": { "line": 16, - "column": 35 + "column": 28 } } }, @@ -543,35 +515,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 18 - }, - "end": { - "line": 23, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 18 - }, - "end": { - "line": 23, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -579,7 +523,7 @@ }, "end": { "line": 23, - "column": 24 + "column": 22 } } }, @@ -657,35 +601,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 33 - }, - "end": { - "line": 24, - "column": 37 - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 33 - }, - "end": { - "line": 24, - "column": 40 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -693,7 +609,7 @@ }, "end": { "line": 24, - "column": 40 + "column": 37 } } }, diff --git a/ets2panda/test/parser/ets/return-expected.txt b/ets2panda/test/parser/ets/return-expected.txt index ee83fa85909..f1aa88b4641 100644 --- a/ets2panda/test/parser/ets/return-expected.txt +++ b/ets2panda/test/parser/ets/return-expected.txt @@ -324,35 +324,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -360,7 +332,7 @@ }, "end": { "line": 17, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/scoped_decl-expected.txt b/ets2panda/test/parser/ets/scoped_decl-expected.txt index eb61c9058d5..38c30b0af70 100644 --- a/ets2panda/test/parser/ets/scoped_decl-expected.txt +++ b/ets2panda/test/parser/ets/scoped_decl-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/selective_export/import_1-expected.txt b/ets2panda/test/parser/ets/selective_export/import_1-expected.txt index 4d08cca3d29..1b8f4f84850 100644 --- a/ets2panda/test/parser/ets/selective_export/import_1-expected.txt +++ b/ets2panda/test/parser/ets/selective_export/import_1-expected.txt @@ -219,43 +219,15 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 19 - }, - "end": { - "line": 18, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 19 - }, - "end": { - "line": 19, - "column": 2 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, "column": 19 }, "end": { - "line": 19, - "column": 2 + "line": 18, + "column": 23 } } }, diff --git a/ets2panda/test/parser/ets/selective_export/import_2-expected.txt b/ets2panda/test/parser/ets/selective_export/import_2-expected.txt index 4d08cca3d29..1b8f4f84850 100644 --- a/ets2panda/test/parser/ets/selective_export/import_2-expected.txt +++ b/ets2panda/test/parser/ets/selective_export/import_2-expected.txt @@ -219,43 +219,15 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 19 - }, - "end": { - "line": 18, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 19 - }, - "end": { - "line": 19, - "column": 2 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, "column": 19 }, "end": { - "line": 19, - "column": 2 + "line": 18, + "column": 23 } } }, diff --git a/ets2panda/test/parser/ets/selective_export/import_3-expected.txt b/ets2panda/test/parser/ets/selective_export/import_3-expected.txt index 4d08cca3d29..1b8f4f84850 100644 --- a/ets2panda/test/parser/ets/selective_export/import_3-expected.txt +++ b/ets2panda/test/parser/ets/selective_export/import_3-expected.txt @@ -219,43 +219,15 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 19 - }, - "end": { - "line": 18, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 19 - }, - "end": { - "line": 19, - "column": 2 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, "column": 19 }, "end": { - "line": 19, - "column": 2 + "line": 18, + "column": 23 } } }, diff --git a/ets2panda/test/parser/ets/selective_export/import_4-expected.txt b/ets2panda/test/parser/ets/selective_export/import_4-expected.txt index 271570dc980..4d69741abf8 100644 --- a/ets2panda/test/parser/ets/selective_export/import_4-expected.txt +++ b/ets2panda/test/parser/ets/selective_export/import_4-expected.txt @@ -219,43 +219,15 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 19 - }, - "end": { - "line": 18, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 19 - }, - "end": { - "line": 19, - "column": 2 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, "column": 19 }, "end": { - "line": 19, - "column": 2 + "line": 18, + "column": 23 } } }, diff --git a/ets2panda/test/parser/ets/setter_native-expected.txt b/ets2panda/test/parser/ets/setter_native-expected.txt index a36ac423148..10aa2e6d184 100644 --- a/ets2panda/test/parser/ets/setter_native-expected.txt +++ b/ets2panda/test/parser/ets/setter_native-expected.txt @@ -159,35 +159,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 30 - }, - "end": { - "line": 18, - "column": 34 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 30 - }, - "end": { - "line": 18, - "column": 36 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -195,7 +167,7 @@ }, "end": { "line": 18, - "column": 36 + "column": 34 } } }, diff --git a/ets2panda/test/parser/ets/setter_with_non_void-expected.txt b/ets2panda/test/parser/ets/setter_with_non_void-expected.txt index d346044787d..699eb1f4a7f 100644 --- a/ets2panda/test/parser/ets/setter_with_non_void-expected.txt +++ b/ets2panda/test/parser/ets/setter_with_non_void-expected.txt @@ -582,35 +582,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 18 - }, - "end": { - "line": 24, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 18 - }, - "end": { - "line": 24, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -618,7 +590,7 @@ }, "end": { "line": 24, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/simple_types-expected.txt b/ets2panda/test/parser/ets/simple_types-expected.txt index b75839eeb27..d6bf3fbed76 100644 --- a/ets2panda/test/parser/ets/simple_types-expected.txt +++ b/ets2panda/test/parser/ets/simple_types-expected.txt @@ -970,35 +970,7 @@ "optional": false, "computed": false, "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 8 - }, - "end": { - "line": 24, - "column": 12 - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 8 - }, - "end": { - "line": 24, - "column": 13 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -1006,7 +978,7 @@ }, "end": { "line": 24, - "column": 13 + "column": 12 } } }, @@ -1019,7 +991,7 @@ }, "end": { "line": 24, - "column": 13 + "column": 12 } } }, diff --git a/ets2panda/test/parser/ets/static_function_hide_1-expected.txt b/ets2panda/test/parser/ets/static_function_hide_1-expected.txt index 31301941e55..80a998c431a 100644 --- a/ets2panda/test/parser/ets/static_function_hide_1-expected.txt +++ b/ets2panda/test/parser/ets/static_function_hide_1-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 20 - }, - "end": { - "line": 17, - "column": 24 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 20 - }, - "end": { - "line": 17, - "column": 26 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 26 + "column": 24 } } }, @@ -380,35 +352,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 20 - }, - "end": { - "line": 21, - "column": 24 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 20 - }, - "end": { - "line": 21, - "column": 26 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -416,7 +360,7 @@ }, "end": { "line": 21, - "column": 26 + "column": 24 } } }, diff --git a/ets2panda/test/parser/ets/static_function_hide_2-expected.txt b/ets2panda/test/parser/ets/static_function_hide_2-expected.txt index f025fefb85e..f17a09b279b 100644 --- a/ets2panda/test/parser/ets/static_function_hide_2-expected.txt +++ b/ets2panda/test/parser/ets/static_function_hide_2-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 12 - }, - "end": { - "line": 17, - "column": 16 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 12 - }, - "end": { - "line": 17, - "column": 18 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 18 + "column": 16 } } }, @@ -380,35 +352,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 19 - }, - "end": { - "line": 21, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 19 - }, - "end": { - "line": 21, - "column": 25 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -416,7 +360,7 @@ }, "end": { "line": 21, - "column": 25 + "column": 23 } } }, diff --git a/ets2panda/test/parser/ets/static_function_hide_3-expected.txt b/ets2panda/test/parser/ets/static_function_hide_3-expected.txt index 6cb06f2cb9e..b3908655127 100644 --- a/ets2panda/test/parser/ets/static_function_hide_3-expected.txt +++ b/ets2panda/test/parser/ets/static_function_hide_3-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 19 - }, - "end": { - "line": 17, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 19 - }, - "end": { - "line": 17, - "column": 25 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 25 + "column": 23 } } }, @@ -380,35 +352,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 12 - }, - "end": { - "line": 21, - "column": 16 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 12 - }, - "end": { - "line": 21, - "column": 18 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -416,7 +360,7 @@ }, "end": { "line": 21, - "column": 18 + "column": 16 } } }, diff --git a/ets2panda/test/parser/ets/static_function_hide_4-expected.txt b/ets2panda/test/parser/ets/static_function_hide_4-expected.txt index 9ce1e68329c..2055275ab06 100644 --- a/ets2panda/test/parser/ets/static_function_hide_4-expected.txt +++ b/ets2panda/test/parser/ets/static_function_hide_4-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 19 - }, - "end": { - "line": 17, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 19 - }, - "end": { - "line": 17, - "column": 25 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 25 + "column": 23 } } }, @@ -380,35 +352,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 21 - }, - "end": { - "line": 21, - "column": 25 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 21 - }, - "end": { - "line": 21, - "column": 27 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -416,7 +360,7 @@ }, "end": { "line": 21, - "column": 27 + "column": 25 } } }, diff --git a/ets2panda/test/parser/ets/static_invoke_tests/static_invoke_mismatch_signature_2-expected.txt b/ets2panda/test/parser/ets/static_invoke_tests/static_invoke_mismatch_signature_2-expected.txt index f796f0d37d5..e127a150408 100644 --- a/ets2panda/test/parser/ets/static_invoke_tests/static_invoke_mismatch_signature_2-expected.txt +++ b/ets2panda/test/parser/ets/static_invoke_tests/static_invoke_mismatch_signature_2-expected.txt @@ -68,35 +68,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 27 - }, - "end": { - "line": 17, - "column": 31 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 27 - }, - "end": { - "line": 17, - "column": 33 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -104,7 +76,7 @@ }, "end": { "line": 17, - "column": 33 + "column": 31 } } }, diff --git a/ets2panda/test/parser/ets/string_template-expected.txt b/ets2panda/test/parser/ets/string_template-expected.txt index 3efbbd8bd5d..eb424db468d 100644 --- a/ets2panda/test/parser/ets/string_template-expected.txt +++ b/ets2panda/test/parser/ets/string_template-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/struct_templete-expected.txt b/ets2panda/test/parser/ets/struct_templete-expected.txt index 5060c2b73b2..387e53bcad0 100644 --- a/ets2panda/test/parser/ets/struct_templete-expected.txt +++ b/ets2panda/test/parser/ets/struct_templete-expected.txt @@ -932,35 +932,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 28, - "column": 18 - }, - "end": { - "line": 28, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 28, - "column": 18 - }, - "end": { - "line": 28, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 28, @@ -968,7 +940,7 @@ }, "end": { "line": 28, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/switch-expected.txt b/ets2panda/test/parser/ets/switch-expected.txt index bf956fcd086..27e4e9a9bca 100644 --- a/ets2panda/test/parser/ets/switch-expected.txt +++ b/ets2panda/test/parser/ets/switch-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -198,7 +170,7 @@ }, "end": { "line": 17, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/switch2-expected.txt b/ets2panda/test/parser/ets/switch2-expected.txt index 0f1939f693f..26d29e343c6 100644 --- a/ets2panda/test/parser/ets/switch2-expected.txt +++ b/ets2panda/test/parser/ets/switch2-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 18 - }, - "end": { - "line": 17, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -198,7 +170,7 @@ }, "end": { "line": 17, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/switch_enum-expected.txt b/ets2panda/test/parser/ets/switch_enum-expected.txt index f4d9debe2d3..d2722c344cf 100644 --- a/ets2panda/test/parser/ets/switch_enum-expected.txt +++ b/ets2panda/test/parser/ets/switch_enum-expected.txt @@ -319,35 +319,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -355,7 +327,7 @@ }, "end": { "line": 18, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/switch_enum2-expected.txt b/ets2panda/test/parser/ets/switch_enum2-expected.txt index 59ed0f5ca24..e54916e2ca8 100644 --- a/ets2panda/test/parser/ets/switch_enum2-expected.txt +++ b/ets2panda/test/parser/ets/switch_enum2-expected.txt @@ -319,35 +319,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -355,7 +327,7 @@ }, "end": { "line": 18, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/test_interface-expected.txt b/ets2panda/test/parser/ets/test_interface-expected.txt index 176f14aabfb..fb162f263a4 100644 --- a/ets2panda/test/parser/ets/test_interface-expected.txt +++ b/ets2panda/test/parser/ets/test_interface-expected.txt @@ -1030,35 +1030,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 12 - }, - "end": { - "line": 23, - "column": 16 - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 12 - }, - "end": { - "line": 23, - "column": 17 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -1067,6 +1039,7 @@ "end": { "line": 23, "column": 17 + "column": 16 } } }, @@ -1078,7 +1051,7 @@ }, "end": { "line": 23, - "column": 17 + "column": 16 } } }, @@ -1089,7 +1062,11 @@ }, "end": { "line": 23, +<<<<<<< HEAD "column": 17 +======= + "column": 16 +>>>>>>> Revert the implementation of the builtin void type } } }, @@ -1182,35 +1159,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 26, - "column": 31 - }, - "end": { - "line": 26, - "column": 35 - } - } - }, - "loc": { - "start": { - "line": 26, - "column": 31 - }, - "end": { - "line": 26, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 26, @@ -1218,7 +1167,7 @@ }, "end": { "line": 26, - "column": 37 + "column": 35 } } }, @@ -1373,35 +1322,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 26 - }, - "end": { - "line": 24, - "column": 30 - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 26 - }, - "end": { - "line": 24, - "column": 32 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -1409,7 +1330,7 @@ }, "end": { "line": 24, - "column": 32 + "column": 30 } } }, diff --git a/ets2panda/test/parser/ets/test_jsvalue_set_double-expected.txt b/ets2panda/test/parser/ets/test_jsvalue_set_double-expected.txt index 193072b36e2..28dc200fff1 100644 --- a/ets2panda/test/parser/ets/test_jsvalue_set_double-expected.txt +++ b/ets2panda/test/parser/ets/test_jsvalue_set_double-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 16 - }, - "end": { - "line": 16, - "column": 20 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 16 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 22 + "column": 20 } } }, diff --git a/ets2panda/test/parser/ets/test_jsvalue_set_property_1-expected.txt b/ets2panda/test/parser/ets/test_jsvalue_set_property_1-expected.txt index 48beaae2004..652817c1c23 100644 --- a/ets2panda/test/parser/ets/test_jsvalue_set_property_1-expected.txt +++ b/ets2panda/test/parser/ets/test_jsvalue_set_property_1-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 16 - }, - "end": { - "line": 16, - "column": 20 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 16 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 22 + "column": 20 } } }, diff --git a/ets2panda/test/parser/ets/test_jsvalue_set_property_2-expected.txt b/ets2panda/test/parser/ets/test_jsvalue_set_property_2-expected.txt index 286306f1acf..a4259c59b65 100644 --- a/ets2panda/test/parser/ets/test_jsvalue_set_property_2-expected.txt +++ b/ets2panda/test/parser/ets/test_jsvalue_set_property_2-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 16 - }, - "end": { - "line": 16, - "column": 20 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 16 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 22 + "column": 20 } } }, diff --git a/ets2panda/test/parser/ets/test_type_alias5-expected.txt b/ets2panda/test/parser/ets/test_type_alias5-expected.txt index baa2505ed61..03c3a6e0744 100644 --- a/ets2panda/test/parser/ets/test_type_alias5-expected.txt +++ b/ets2panda/test/parser/ets/test_type_alias5-expected.txt @@ -1 +1,222 @@ -SyntaxError: Invalid Type [test_type_alias5.ets:16:10] +{ + "type": "Program", + "statements": [ + { + "type": "TSTypeAliasDeclaration", + "id": { + "type": "Identifier", + "name": "x", + "decorators": [], + "loc": { + "start": { + "line": 16, + "column": 6 + }, + "end": { + "line": 16, + "column": 7 + } + } + }, + "typeAnnotation": { + "type": "ETSTypeReference", + "part": { + "type": "ETSTypeReferencePart", + "name": { + "type": "Identifier", + "name": "null", + "decorators": [], + "loc": { + "start": { + "line": 16, + "column": 10 + }, + "end": { + "line": 16, + "column": 14 + } + } + }, + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + }, + "loc": { + "start": { + "line": 16, + "column": 10 + }, + "end": { + "line": 16, + "column": 14 + } + } + }, + "loc": { + "start": { + "line": 16, + "column": 1 + }, + "end": { + "line": 16, + "column": 15 + } + } + }, + { + "type": "ClassDeclaration", + "definition": { + "id": { + "type": "Identifier", + "name": "ETSGLOBAL", + "decorators": [], + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + }, + "superClass": null, + "implements": [], + "body": [ + { + "type": "MethodDefinition", + "key": { + "type": "Identifier", + "name": "_$init$_", + "decorators": [], + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + }, + "kind": "method", + "accessibility": "public", + "static": true, + "optional": false, + "computed": false, + "value": { + "type": "FunctionExpression", + "function": { + "type": "ScriptFunction", + "id": { + "type": "Identifier", + "name": "_$init$_", + "decorators": [], + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + }, + "generator": false, + "async": false, + "expression": false, + "params": [], + "body": { + "type": "BlockStatement", + "statements": [], + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + }, + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + }, + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + }, + "overloads": [], + "decorators": [], + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + } + ], + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + }, + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + } + ], + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 17, + "column": 1 + } + } +} diff --git a/ets2panda/test/parser/ets/test_type_alias7-expected.txt b/ets2panda/test/parser/ets/test_type_alias7-expected.txt index bb931f984e2..b2edf1cc7bc 100644 --- a/ets2panda/test/parser/ets/test_type_alias7-expected.txt +++ b/ets2panda/test/parser/ets/test_type_alias7-expected.txt @@ -203,35 +203,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -239,7 +211,7 @@ }, "end": { "line": 18, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/test_type_alias8-expected.txt b/ets2panda/test/parser/ets/test_type_alias8-expected.txt index 58cd0b30d68..b0985d5d7ab 100644 --- a/ets2panda/test/parser/ets/test_type_alias8-expected.txt +++ b/ets2panda/test/parser/ets/test_type_alias8-expected.txt @@ -301,35 +301,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 26 - }, - "end": { - "line": 18, - "column": 30 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 26 - }, - "end": { - "line": 18, - "column": 32 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -337,7 +309,7 @@ }, "end": { "line": 18, - "column": 32 + "column": 30 } } }, @@ -506,35 +478,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 24 - }, - "end": { - "line": 21, - "column": 28 - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 24 - }, - "end": { - "line": 21, - "column": 30 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -542,7 +486,7 @@ }, "end": { "line": 21, - "column": 30 + "column": 28 } } }, @@ -641,35 +585,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 18 - }, - "end": { - "line": 24, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 18 - }, - "end": { - "line": 24, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -677,7 +593,7 @@ }, "end": { "line": 24, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/throwsRethrowsAsVariables-expected.txt b/ets2panda/test/parser/ets/throwsRethrowsAsVariables-expected.txt index 203a0147ad7..aabe3814f9b 100644 --- a/ets2panda/test/parser/ets/throwsRethrowsAsVariables-expected.txt +++ b/ets2panda/test/parser/ets/throwsRethrowsAsVariables-expected.txt @@ -375,35 +375,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 26 - }, - "end": { - "line": 19, - "column": 30 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 26 - }, - "end": { - "line": 19, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -411,7 +383,7 @@ }, "end": { "line": 19, - "column": 37 + "column": 30 } } }, @@ -519,35 +491,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 33 - }, - "end": { - "line": 20, - "column": 37 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 33 - }, - "end": { - "line": 20, - "column": 44 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -555,7 +499,7 @@ }, "end": { "line": 20, - "column": 44 + "column": 37 } } } @@ -567,7 +511,7 @@ }, "end": { "line": 20, - "column": 44 + "column": 37 } } }, @@ -579,7 +523,7 @@ }, "end": { "line": 20, - "column": 44 + "column": 37 } } }, @@ -590,41 +534,13 @@ }, "end": { "line": 20, - "column": 44 + "column": 37 } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 47 - }, - "end": { - "line": 20, - "column": 51 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 47 - }, - "end": { - "line": 20, - "column": 60 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -632,7 +548,7 @@ }, "end": { "line": 20, - "column": 60 + "column": 51 } } }, diff --git a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_define_lambda_in_body-expected.txt b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_define_lambda_in_body-expected.txt index 00650102366..40eef6db2bb 100644 --- a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_define_lambda_in_body-expected.txt +++ b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_define_lambda_in_body-expected.txt @@ -170,35 +170,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 24 - }, - "end": { - "line": 16, - "column": 28 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 24 - }, - "end": { - "line": 16, - "column": 29 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -206,7 +178,7 @@ }, "end": { "line": 16, - "column": 29 + "column": 28 } } }, @@ -217,7 +189,7 @@ }, "end": { "line": 16, - "column": 29 + "column": 28 } } }, @@ -229,7 +201,7 @@ }, "end": { "line": 16, - "column": 29 + "column": 28 } } }, @@ -240,41 +212,13 @@ }, "end": { "line": 16, - "column": 29 + "column": 28 } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 31 - }, - "end": { - "line": 16, - "column": 35 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 31 - }, - "end": { - "line": 16, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -282,7 +226,7 @@ }, "end": { "line": 16, - "column": 37 + "column": 35 } } }, @@ -425,35 +369,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 18 - }, - "end": { - "line": 20, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -461,7 +377,7 @@ }, "end": { "line": 20, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_mismatch_lambda_signature-expected.txt b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_mismatch_lambda_signature-expected.txt index fba13eb71c4..b1d8cae01bf 100644 --- a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_mismatch_lambda_signature-expected.txt +++ b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_mismatch_lambda_signature-expected.txt @@ -319,35 +319,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 25 - }, - "end": { - "line": 17, - "column": 29 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 25 - }, - "end": { - "line": 17, - "column": 30 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -355,7 +327,7 @@ }, "end": { "line": 17, - "column": 30 + "column": 29 } } }, @@ -366,7 +338,7 @@ }, "end": { "line": 17, - "column": 30 + "column": 29 } } }, @@ -378,7 +350,7 @@ }, "end": { "line": 17, - "column": 30 + "column": 29 } } }, @@ -389,7 +361,7 @@ }, "end": { "line": 17, - "column": 30 + "column": 29 } } } diff --git a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_mismatch_lambda_signature_1-expected.txt b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_mismatch_lambda_signature_1-expected.txt index d28a8d4b719..f5296dca4c5 100644 --- a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_mismatch_lambda_signature_1-expected.txt +++ b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_mismatch_lambda_signature_1-expected.txt @@ -170,35 +170,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 19 - }, - "end": { - "line": 16, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 19 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -206,7 +178,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 23 } } }, @@ -217,7 +189,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 23 } } }, @@ -229,7 +201,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 23 } } }, @@ -240,7 +212,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 23 } } } diff --git a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_not_transform_trailing_block_1-expected.txt b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_not_transform_trailing_block_1-expected.txt index 2b121252b42..99138c53253 100644 --- a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_not_transform_trailing_block_1-expected.txt +++ b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_not_transform_trailing_block_1-expected.txt @@ -260,35 +260,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 19 - }, - "end": { - "line": 16, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 19 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -296,7 +268,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 23 } } }, @@ -307,7 +279,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 23 } } }, @@ -319,7 +291,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 23 } } }, @@ -330,7 +302,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 23 } } } diff --git a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_not_transform_trailing_block_2-expected.txt b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_not_transform_trailing_block_2-expected.txt index 338dae3eb5e..5cf1da5e216 100644 --- a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_not_transform_trailing_block_2-expected.txt +++ b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_not_transform_trailing_block_2-expected.txt @@ -170,35 +170,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 19 - }, - "end": { - "line": 16, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 19 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -206,7 +178,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 23 } } }, @@ -217,7 +189,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 23 } } }, @@ -229,7 +201,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 23 } } }, @@ -240,7 +212,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 23 } } } diff --git a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_not_transform_trailing_block_3-expected.txt b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_not_transform_trailing_block_3-expected.txt index 848c68a958e..7a026932905 100644 --- a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_not_transform_trailing_block_3-expected.txt +++ b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_not_transform_trailing_block_3-expected.txt @@ -76,35 +76,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 28 - }, - "end": { - "line": 17, - "column": 32 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 28 - }, - "end": { - "line": 17, - "column": 33 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -112,7 +84,7 @@ }, "end": { "line": 17, - "column": 33 + "column": 32 } } }, @@ -123,7 +95,7 @@ }, "end": { "line": 17, - "column": 33 + "column": 32 } } }, @@ -135,7 +107,7 @@ }, "end": { "line": 17, - "column": 33 + "column": 32 } } }, @@ -146,7 +118,7 @@ }, "end": { "line": 17, - "column": 33 + "column": 32 } } } @@ -384,35 +356,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -420,7 +364,7 @@ }, "end": { "line": 22, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_not_transform_trailing_block_4-expected.txt b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_not_transform_trailing_block_4-expected.txt index 8b2aba34a54..d531519af8f 100644 --- a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_not_transform_trailing_block_4-expected.txt +++ b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_not_transform_trailing_block_4-expected.txt @@ -76,35 +76,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 28 - }, - "end": { - "line": 17, - "column": 32 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 28 - }, - "end": { - "line": 17, - "column": 33 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -112,7 +84,7 @@ }, "end": { "line": 17, - "column": 33 + "column": 32 } } }, @@ -123,7 +95,7 @@ }, "end": { "line": 17, - "column": 33 + "column": 32 } } }, @@ -135,7 +107,7 @@ }, "end": { "line": 17, - "column": 33 + "column": 32 } } }, @@ -146,7 +118,7 @@ }, "end": { "line": 17, - "column": 33 + "column": 32 } } } @@ -384,35 +356,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -420,7 +364,7 @@ }, "end": { "line": 22, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_overload-expected.txt b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_overload-expected.txt index efb009850fb..477129e0c76 100644 --- a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_overload-expected.txt +++ b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_overload-expected.txt @@ -211,35 +211,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 36 - }, - "end": { - "line": 16, - "column": 40 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 36 - }, - "end": { - "line": 16, - "column": 41 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -247,7 +219,7 @@ }, "end": { "line": 16, - "column": 41 + "column": 40 } } }, @@ -258,7 +230,7 @@ }, "end": { "line": 16, - "column": 41 + "column": 40 } } }, @@ -270,7 +242,7 @@ }, "end": { "line": 16, - "column": 41 + "column": 40 } } }, @@ -281,7 +253,7 @@ }, "end": { "line": 16, - "column": 41 + "column": 40 } } } 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 207b01ff017..d850e53e7a9 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 @@ -240,35 +240,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 31 - }, - "end": { - "line": 16, - "column": 35 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 31 - }, - "end": { - "line": 16, - "column": 36 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -276,7 +248,7 @@ }, "end": { "line": 16, - "column": 36 + "column": 35 } } }, @@ -287,7 +259,7 @@ }, "end": { "line": 16, - "column": 36 + "column": 35 } } }, @@ -299,7 +271,7 @@ }, "end": { "line": 16, - "column": 36 + "column": 35 } } }, @@ -310,7 +282,7 @@ }, "end": { "line": 16, - "column": 36 + "column": 35 } } }, @@ -323,35 +295,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 45 - }, - "end": { - "line": 16, - "column": 49 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 45 - }, - "end": { - "line": 16, - "column": 50 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -359,7 +303,7 @@ }, "end": { "line": 16, - "column": 50 + "column": 49 } } }, @@ -370,7 +314,7 @@ }, "end": { "line": 16, - "column": 50 + "column": 49 } } }, @@ -382,7 +326,7 @@ }, "end": { "line": 16, - "column": 50 + "column": 49 } } }, @@ -393,7 +337,7 @@ }, "end": { "line": 16, - "column": 50 + "column": 49 } } } @@ -531,35 +475,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 28 - }, - "end": { - "line": 18, - "column": 32 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 28 - }, - "end": { - "line": 18, - "column": 33 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -567,7 +483,7 @@ }, "end": { "line": 18, - "column": 33 + "column": 32 } } }, @@ -578,7 +494,7 @@ }, "end": { "line": 18, - "column": 33 + "column": 32 } } }, @@ -590,7 +506,7 @@ }, "end": { "line": 18, - "column": 33 + "column": 32 } } }, @@ -601,7 +517,7 @@ }, "end": { "line": 18, - "column": 33 + "column": 32 } } } diff --git a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_transform_trailing_block-expected.txt b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_transform_trailing_block-expected.txt index 957c812c6ea..5996f3b112f 100644 --- a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_transform_trailing_block-expected.txt +++ b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_transform_trailing_block-expected.txt @@ -170,35 +170,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 19 - }, - "end": { - "line": 16, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 19 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -206,7 +178,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 23 } } }, @@ -217,7 +189,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 23 } } }, @@ -229,7 +201,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 23 } } }, @@ -240,7 +212,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 23 } } } 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 99714c860fc..666f33da524 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 @@ -22,43 +22,15 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 20 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 20 - }, - "end": { - "line": 18, - "column": 9 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, "column": 20 }, "end": { - "line": 18, - "column": 9 + "line": 16, + "column": 24 } } }, @@ -68,8 +40,8 @@ "column": 14 }, "end": { - "line": 18, - "column": 9 + "line": 16, + "column": 24 } } }, @@ -315,35 +287,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 25 - }, - "end": { - "line": 18, - "column": 29 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 25 - }, - "end": { - "line": 18, - "column": 31 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -351,7 +295,7 @@ }, "end": { "line": 18, - "column": 31 + "column": 29 } } }, @@ -494,35 +438,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 18 - }, - "end": { - "line": 23, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 18 - }, - "end": { - "line": 23, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -530,7 +446,7 @@ }, "end": { "line": 23, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_with_throw-expected.txt b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_with_throw-expected.txt index 30bb12ad2ed..f02e6b5a18b 100644 --- a/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_with_throw-expected.txt +++ b/ets2panda/test/parser/ets/trailing_lambda_tests/trailing_lambda_with_throw-expected.txt @@ -170,35 +170,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 21 - }, - "end": { - "line": 16, - "column": 25 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 21 - }, - "end": { - "line": 16, - "column": 32 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -206,7 +178,7 @@ }, "end": { "line": 16, - "column": 32 + "column": 25 } } } @@ -218,7 +190,7 @@ }, "end": { "line": 16, - "column": 32 + "column": 25 } } }, @@ -230,7 +202,7 @@ }, "end": { "line": 16, - "column": 32 + "column": 25 } } }, @@ -241,7 +213,7 @@ }, "end": { "line": 16, - "column": 32 + "column": 25 } } } @@ -349,35 +321,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 22 - }, - "end": { - "line": 19, - "column": 26 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 22 - }, - "end": { - "line": 19, - "column": 27 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -385,7 +329,7 @@ }, "end": { "line": 19, - "column": 27 + "column": 26 } } }, @@ -396,7 +340,7 @@ }, "end": { "line": 19, - "column": 27 + "column": 26 } } }, @@ -408,7 +352,7 @@ }, "end": { "line": 19, - "column": 27 + "column": 26 } } }, @@ -419,7 +363,7 @@ }, "end": { "line": 19, - "column": 27 + "column": 26 } } } diff --git a/ets2panda/test/parser/ets/type_variance1-expected.txt b/ets2panda/test/parser/ets/type_variance1-expected.txt index 526d6a2a596..a877e97aa77 100644 --- a/ets2panda/test/parser/ets/type_variance1-expected.txt +++ b/ets2panda/test/parser/ets/type_variance1-expected.txt @@ -182,35 +182,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 16 - }, - "end": { - "line": 17, - "column": 20 - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 16 - }, - "end": { - "line": 17, - "column": 22 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -218,7 +190,7 @@ }, "end": { "line": 17, - "column": 22 + "column": 20 } } }, @@ -508,35 +480,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 19 - }, - "end": { - "line": 23, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 19 - }, - "end": { - "line": 23, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -544,7 +488,7 @@ }, "end": { "line": 23, - "column": 24 + "column": 23 } } }, @@ -556,7 +500,7 @@ }, "end": { "line": 23, - "column": 24 + "column": 23 } } }, @@ -567,7 +511,7 @@ }, "end": { "line": 23, - "column": 24 + "column": 23 } } }, @@ -939,35 +883,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 28, - "column": 19 - }, - "end": { - "line": 28, - "column": 23 - } - } - }, - "loc": { - "start": { - "line": 28, - "column": 19 - }, - "end": { - "line": 28, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 28, @@ -975,7 +891,7 @@ }, "end": { "line": 28, - "column": 24 + "column": 23 } } }, @@ -987,7 +903,7 @@ }, "end": { "line": 28, - "column": 24 + "column": 23 } } }, @@ -998,7 +914,7 @@ }, "end": { "line": 28, - "column": 24 + "column": 23 } } }, @@ -1673,35 +1589,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 35, - "column": 25 - }, - "end": { - "line": 35, - "column": 29 - } - } - }, - "loc": { - "start": { - "line": 35, - "column": 25 - }, - "end": { - "line": 35, - "column": 31 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 35, @@ -1709,7 +1597,7 @@ }, "end": { "line": 35, - "column": 31 + "column": 29 } } }, @@ -3300,35 +3188,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 57, - "column": 18 - }, - "end": { - "line": 57, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 57, - "column": 18 - }, - "end": { - "line": 57, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 57, @@ -3336,7 +3196,7 @@ }, "end": { "line": 57, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/parser/ets/undefinedNullNotObject-expected.txt b/ets2panda/test/parser/ets/undefinedNullNotObject-expected.txt new file mode 100644 index 00000000000..dae0a6c598a --- /dev/null +++ b/ets2panda/test/parser/ets/undefinedNullNotObject-expected.txt @@ -0,0 +1,432 @@ +{ + "type": "Program", + "statements": [ + { + "type": "ClassDeclaration", + "definition": { + "id": { + "type": "Identifier", + "name": "ETSGLOBAL", + "decorators": [], + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + }, + "superClass": null, + "implements": [], + "body": [ + { + "type": "MethodDefinition", + "key": { + "type": "Identifier", + "name": "_$init$_", + "decorators": [], + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + }, + "kind": "method", + "accessibility": "public", + "static": true, + "optional": false, + "computed": false, + "value": { + "type": "FunctionExpression", + "function": { + "type": "ScriptFunction", + "id": { + "type": "Identifier", + "name": "_$init$_", + "decorators": [], + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + }, + "generator": false, + "async": false, + "expression": false, + "params": [], + "body": { + "type": "BlockStatement", + "statements": [], + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + }, + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + }, + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + }, + "overloads": [], + "decorators": [], + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + }, + { + "type": "MethodDefinition", + "key": { + "type": "Identifier", + "name": "main", + "decorators": [], + "loc": { + "start": { + "line": 16, + "column": 10 + }, + "end": { + "line": 16, + "column": 14 + } + } + }, + "kind": "method", + "accessibility": "public", + "static": true, + "optional": false, + "computed": false, + "value": { + "type": "FunctionExpression", + "function": { + "type": "ScriptFunction", + "id": { + "type": "Identifier", + "name": "main", + "decorators": [], + "loc": { + "start": { + "line": 16, + "column": 10 + }, + "end": { + "line": 16, + "column": 14 + } + } + }, + "generator": false, + "async": false, + "expression": false, + "params": [], + "body": { + "type": "BlockStatement", + "statements": [ + { + "type": "VariableDeclaration", + "declarations": [ + { + "type": "VariableDeclarator", + "id": { + "type": "Identifier", + "name": "mix", + "typeAnnotation": { + "type": "ETSTypeReference", + "part": { + "type": "ETSTypeReferencePart", + "name": { + "type": "Identifier", + "name": "null", + "decorators": [], + "loc": { + "start": { + "line": 17, + "column": 27 + }, + "end": { + "line": 17, + "column": 31 + } + } + }, + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + }, + "loc": { + "start": { + "line": 17, + "column": 27 + }, + "end": { + "line": 17, + "column": 31 + } + } + }, + "decorators": [], + "loc": { + "start": { + "line": 17, + "column": 9 + }, + "end": { + "line": 17, + "column": 12 + } + } + }, + "init": null, + "loc": { + "start": { + "line": 17, + "column": 9 + }, + "end": { + "line": 17, + "column": 12 + } + } + } + ], + "kind": "let", + "loc": { + "start": { + "line": 17, + "column": 5 + }, + "end": { + "line": 17, + "column": 32 + } + } + }, + { + "type": "ExpressionStatement", + "expression": { + "type": "AssignmentExpression", + "operator": "=", + "left": { + "type": "Identifier", + "name": "mix", + "decorators": [], + "loc": { + "start": { + "line": 18, + "column": 5 + }, + "end": { + "line": 18, + "column": 8 + } + } + }, + "right": { + "type": "ETSNewClassInstanceExpression", + "typeReference": { + "type": "ETSTypeReference", + "part": { + "type": "ETSTypeReferencePart", + "name": { + "type": "Identifier", + "name": "Object", + "decorators": [], + "loc": { + "start": { + "line": 18, + "column": 15 + }, + "end": { + "line": 18, + "column": 21 + } + } + }, + "loc": { + "start": { + "line": 18, + "column": 15 + }, + "end": { + "line": 18, + "column": 22 + } + } + }, + "loc": { + "start": { + "line": 18, + "column": 15 + }, + "end": { + "line": 18, + "column": 22 + } + } + }, + "arguments": [], + "loc": { + "start": { + "line": 18, + "column": 11 + }, + "end": { + "line": 18, + "column": 24 + } + } + }, + "loc": { + "start": { + "line": 18, + "column": 5 + }, + "end": { + "line": 18, + "column": 24 + } + } + }, + "loc": { + "start": { + "line": 18, + "column": 5 + }, + "end": { + "line": 18, + "column": 24 + } + } + } + ], + "loc": { + "start": { + "line": 16, + "column": 16 + }, + "end": { + "line": 19, + "column": 2 + } + } + }, + "loc": { + "start": { + "line": 16, + "column": 14 + }, + "end": { + "line": 19, + "column": 2 + } + } + }, + "loc": { + "start": { + "line": 16, + "column": 14 + }, + "end": { + "line": 19, + "column": 2 + } + } + }, + "overloads": [], + "decorators": [], + "loc": { + "start": { + "line": 16, + "column": 1 + }, + "end": { + "line": 19, + "column": 2 + } + } + } + ], + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + }, + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + } + ], + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 20, + "column": 1 + } + } +} +TypeError: Type 'Object' cannot be assigned to type 'null' [undefinedNullNotObject.ets:18:11] diff --git a/ets2panda/test/runtime/ets/voidInstanceReturn.ets b/ets2panda/test/parser/ets/undefinedNullNotObject.ets similarity index 46% rename from ets2panda/test/runtime/ets/voidInstanceReturn.ets rename to ets2panda/test/parser/ets/undefinedNullNotObject.ets index 31fdf13cfaa..02ba02c2a36 100644 --- a/ets2panda/test/runtime/ets/voidInstanceReturn.ets +++ b/ets2panda/test/parser/ets/undefinedNullNotObject.ets @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2024 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 @@ -13,41 +13,7 @@ * limitations under the License. */ -let res: int -type F = () => void; - -function bar() :void { - return; -} - -function foo(f: F): void { - return Void; -} - -function emptyfoo(): void { -} - -function noreturnfoo(): void { - let a = 2; -} - -function main(): int { - - let instance = Void; - let static_field = void.void_instance; - - let a = foo(bar); - let b = bar(); - let c = console.print(""); - let d = emptyfoo(); - let e = noreturnfoo(); - - assert(instance === static_field); - assert(instance === a); - assert(instance === b); - assert(instance === c); - assert(instance === d); - assert(instance === e); - - return 0; +function main(){ + let mix : undefined | null; + mix = new Object(); } diff --git a/ets2panda/test/parser/ets/undefinedNullObjectTypeAnnotation-expected.txt b/ets2panda/test/parser/ets/undefinedNullObjectTypeAnnotation-expected.txt new file mode 100644 index 00000000000..452189063c9 --- /dev/null +++ b/ets2panda/test/parser/ets/undefinedNullObjectTypeAnnotation-expected.txt @@ -0,0 +1,543 @@ +{ + "type": "Program", + "statements": [ + { + "type": "ClassDeclaration", + "definition": { + "id": { + "type": "Identifier", + "name": "ETSGLOBAL", + "decorators": [], + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + }, + "superClass": null, + "implements": [], + "body": [ + { + "type": "MethodDefinition", + "key": { + "type": "Identifier", + "name": "_$init$_", + "decorators": [], + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + }, + "kind": "method", + "accessibility": "public", + "static": true, + "optional": false, + "computed": false, + "value": { + "type": "FunctionExpression", + "function": { + "type": "ScriptFunction", + "id": { + "type": "Identifier", + "name": "_$init$_", + "decorators": [], + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + }, + "generator": false, + "async": false, + "expression": false, + "params": [], + "body": { + "type": "BlockStatement", + "statements": [], + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + }, + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + }, + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + }, + "overloads": [], + "decorators": [], + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + }, + { + "type": "MethodDefinition", + "key": { + "type": "Identifier", + "name": "main", + "decorators": [], + "loc": { + "start": { + "line": 16, + "column": 10 + }, + "end": { + "line": 16, + "column": 14 + } + } + }, + "kind": "method", + "accessibility": "public", + "static": true, + "optional": false, + "computed": false, + "value": { + "type": "FunctionExpression", + "function": { + "type": "ScriptFunction", + "id": { + "type": "Identifier", + "name": "main", + "decorators": [], + "loc": { + "start": { + "line": 16, + "column": 10 + }, + "end": { + "line": 16, + "column": 14 + } + } + }, + "generator": false, + "async": false, + "expression": false, + "params": [], + "body": { + "type": "BlockStatement", + "statements": [ + { + "type": "VariableDeclaration", + "declarations": [ + { + "type": "VariableDeclarator", + "id": { + "type": "Identifier", + "name": "mix", + "typeAnnotation": { + "type": "ETSTypeReference", + "part": { + "type": "ETSTypeReferencePart", + "name": { + "type": "Identifier", + "name": "Object", + "decorators": [], + "loc": { + "start": { + "line": 17, + "column": 34 + }, + "end": { + "line": 17, + "column": 40 + } + } + }, + "loc": { + "start": { + "line": 17, + "column": 34 + }, + "end": { + "line": 17, + "column": 41 + } + } + }, + "loc": { + "start": { + "line": 17, + "column": 34 + }, + "end": { + "line": 17, + "column": 41 + } + } + }, + "decorators": [], + "loc": { + "start": { + "line": 17, + "column": 9 + }, + "end": { + "line": 17, + "column": 12 + } + } + }, + "init": null, + "loc": { + "start": { + "line": 17, + "column": 9 + }, + "end": { + "line": 17, + "column": 12 + } + } + } + ], + "kind": "let", + "loc": { + "start": { + "line": 17, + "column": 5 + }, + "end": { + "line": 17, + "column": 41 + } + } + }, + { + "type": "ExpressionStatement", + "expression": { + "type": "AssignmentExpression", + "operator": "=", + "left": { + "type": "Identifier", + "name": "mix", + "decorators": [], + "loc": { + "start": { + "line": 18, + "column": 5 + }, + "end": { + "line": 18, + "column": 8 + } + } + }, + "right": { + "type": "UndefinedLiteral", + "value": undefined, + "loc": { + "start": { + "line": 18, + "column": 11 + }, + "end": { + "line": 18, + "column": 20 + } + } + }, + "loc": { + "start": { + "line": 18, + "column": 5 + }, + "end": { + "line": 18, + "column": 20 + } + } + }, + "loc": { + "start": { + "line": 18, + "column": 5 + }, + "end": { + "line": 18, + "column": 21 + } + } + }, + { + "type": "ExpressionStatement", + "expression": { + "type": "AssignmentExpression", + "operator": "=", + "left": { + "type": "Identifier", + "name": "mix", + "decorators": [], + "loc": { + "start": { + "line": 19, + "column": 5 + }, + "end": { + "line": 19, + "column": 8 + } + } + }, + "right": { + "type": "NullLiteral", + "value": null, + "loc": { + "start": { + "line": 19, + "column": 11 + }, + "end": { + "line": 19, + "column": 15 + } + } + }, + "loc": { + "start": { + "line": 19, + "column": 5 + }, + "end": { + "line": 19, + "column": 15 + } + } + }, + "loc": { + "start": { + "line": 19, + "column": 5 + }, + "end": { + "line": 19, + "column": 16 + } + } + }, + { + "type": "ExpressionStatement", + "expression": { + "type": "AssignmentExpression", + "operator": "=", + "left": { + "type": "Identifier", + "name": "mix", + "decorators": [], + "loc": { + "start": { + "line": 20, + "column": 5 + }, + "end": { + "line": 20, + "column": 8 + } + } + }, + "right": { + "type": "ETSNewClassInstanceExpression", + "typeReference": { + "type": "ETSTypeReference", + "part": { + "type": "ETSTypeReferencePart", + "name": { + "type": "Identifier", + "name": "Object", + "decorators": [], + "loc": { + "start": { + "line": 20, + "column": 15 + }, + "end": { + "line": 20, + "column": 21 + } + } + }, + "loc": { + "start": { + "line": 20, + "column": 15 + }, + "end": { + "line": 20, + "column": 22 + } + } + }, + "loc": { + "start": { + "line": 20, + "column": 15 + }, + "end": { + "line": 20, + "column": 22 + } + } + }, + "arguments": [], + "loc": { + "start": { + "line": 20, + "column": 11 + }, + "end": { + "line": 20, + "column": 24 + } + } + }, + "loc": { + "start": { + "line": 20, + "column": 5 + }, + "end": { + "line": 20, + "column": 24 + } + } + }, + "loc": { + "start": { + "line": 20, + "column": 5 + }, + "end": { + "line": 20, + "column": 24 + } + } + } + ], + "loc": { + "start": { + "line": 16, + "column": 16 + }, + "end": { + "line": 21, + "column": 2 + } + } + }, + "loc": { + "start": { + "line": 16, + "column": 14 + }, + "end": { + "line": 21, + "column": 2 + } + } + }, + "loc": { + "start": { + "line": 16, + "column": 14 + }, + "end": { + "line": 21, + "column": 2 + } + } + }, + "overloads": [], + "decorators": [], + "loc": { + "start": { + "line": 16, + "column": 1 + }, + "end": { + "line": 21, + "column": 2 + } + } + } + ], + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + }, + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + } + ], + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 22, + "column": 1 + } + } +} diff --git a/ets2panda/test/parser/ets/undefinedNullObjectTypeAnnotation.ets b/ets2panda/test/parser/ets/undefinedNullObjectTypeAnnotation.ets new file mode 100644 index 00000000000..8d370cc35e9 --- /dev/null +++ b/ets2panda/test/parser/ets/undefinedNullObjectTypeAnnotation.ets @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2024 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. + */ + +function main(){ + let mix : undefined | null | Object; + mix = undefined; + mix = null; + mix = new Object(); +} diff --git a/ets2panda/test/parser/ets/undefinedNullTypeAlias-expected.txt b/ets2panda/test/parser/ets/undefinedNullTypeAlias-expected.txt new file mode 100644 index 00000000000..c1e0d86116a --- /dev/null +++ b/ets2panda/test/parser/ets/undefinedNullTypeAlias-expected.txt @@ -0,0 +1,532 @@ +{ + "type": "Program", + "statements": [ + { + "type": "ClassDeclaration", + "definition": { + "id": { + "type": "Identifier", + "name": "ETSGLOBAL", + "decorators": [], + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + }, + "superClass": null, + "implements": [], + "body": [ + { + "type": "MethodDefinition", + "key": { + "type": "Identifier", + "name": "_$init$_", + "decorators": [], + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + }, + "kind": "method", + "accessibility": "public", + "static": true, + "optional": false, + "computed": false, + "value": { + "type": "FunctionExpression", + "function": { + "type": "ScriptFunction", + "id": { + "type": "Identifier", + "name": "_$init$_", + "decorators": [], + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + }, + "generator": false, + "async": false, + "expression": false, + "params": [], + "body": { + "type": "BlockStatement", + "statements": [], + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + }, + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + }, + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + }, + "overloads": [], + "decorators": [], + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + }, + { + "type": "MethodDefinition", + "key": { + "type": "Identifier", + "name": "main", + "decorators": [], + "loc": { + "start": { + "line": 16, + "column": 10 + }, + "end": { + "line": 16, + "column": 14 + } + } + }, + "kind": "method", + "accessibility": "public", + "static": true, + "optional": false, + "computed": false, + "value": { + "type": "FunctionExpression", + "function": { + "type": "ScriptFunction", + "id": { + "type": "Identifier", + "name": "main", + "decorators": [], + "loc": { + "start": { + "line": 16, + "column": 10 + }, + "end": { + "line": 16, + "column": 14 + } + } + }, + "generator": false, + "async": false, + "expression": false, + "params": [], + "body": { + "type": "BlockStatement", + "statements": [ + { + "type": "VariableDeclaration", + "declarations": [ + { + "type": "VariableDeclarator", + "id": { + "type": "Identifier", + "name": "und", + "typeAnnotation": { + "type": "ETSTypeReference", + "part": { + "type": "ETSTypeReferencePart", + "name": { + "type": "Identifier", + "name": "undefined", + "decorators": [], + "loc": { + "start": { + "line": 17, + "column": 15 + }, + "end": { + "line": 17, + "column": 24 + } + } + }, + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + }, + "loc": { + "start": { + "line": 17, + "column": 15 + }, + "end": { + "line": 17, + "column": 24 + } + } + }, + "decorators": [], + "loc": { + "start": { + "line": 17, + "column": 9 + }, + "end": { + "line": 17, + "column": 12 + } + } + }, + "init": null, + "loc": { + "start": { + "line": 17, + "column": 9 + }, + "end": { + "line": 17, + "column": 12 + } + } + } + ], + "kind": "let", + "loc": { + "start": { + "line": 17, + "column": 5 + }, + "end": { + "line": 17, + "column": 25 + } + } + }, + { + "type": "VariableDeclaration", + "declarations": [ + { + "type": "VariableDeclarator", + "id": { + "type": "Identifier", + "name": "nul", + "typeAnnotation": { + "type": "ETSTypeReference", + "part": { + "type": "ETSTypeReferencePart", + "name": { + "type": "Identifier", + "name": "null", + "decorators": [], + "loc": { + "start": { + "line": 18, + "column": 15 + }, + "end": { + "line": 18, + "column": 19 + } + } + }, + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + }, + "loc": { + "start": { + "line": 18, + "column": 15 + }, + "end": { + "line": 18, + "column": 19 + } + } + }, + "decorators": [], + "loc": { + "start": { + "line": 18, + "column": 9 + }, + "end": { + "line": 18, + "column": 12 + } + } + }, + "init": null, + "loc": { + "start": { + "line": 18, + "column": 9 + }, + "end": { + "line": 18, + "column": 12 + } + } + } + ], + "kind": "let", + "loc": { + "start": { + "line": 18, + "column": 5 + }, + "end": { + "line": 18, + "column": 20 + } + } + }, + { + "type": "ExpressionStatement", + "expression": { + "type": "AssignmentExpression", + "operator": "=", + "left": { + "type": "Identifier", + "name": "und", + "decorators": [], + "loc": { + "start": { + "line": 19, + "column": 5 + }, + "end": { + "line": 19, + "column": 8 + } + } + }, + "right": { + "type": "UndefinedLiteral", + "value": undefined, + "loc": { + "start": { + "line": 19, + "column": 11 + }, + "end": { + "line": 19, + "column": 20 + } + } + }, + "loc": { + "start": { + "line": 19, + "column": 5 + }, + "end": { + "line": 19, + "column": 20 + } + } + }, + "loc": { + "start": { + "line": 19, + "column": 5 + }, + "end": { + "line": 19, + "column": 21 + } + } + }, + { + "type": "ExpressionStatement", + "expression": { + "type": "AssignmentExpression", + "operator": "=", + "left": { + "type": "Identifier", + "name": "nul", + "decorators": [], + "loc": { + "start": { + "line": 20, + "column": 5 + }, + "end": { + "line": 20, + "column": 8 + } + } + }, + "right": { + "type": "NullLiteral", + "value": null, + "loc": { + "start": { + "line": 20, + "column": 11 + }, + "end": { + "line": 20, + "column": 15 + } + } + }, + "loc": { + "start": { + "line": 20, + "column": 5 + }, + "end": { + "line": 20, + "column": 15 + } + } + }, + "loc": { + "start": { + "line": 20, + "column": 5 + }, + "end": { + "line": 20, + "column": 16 + } + } + } + ], + "loc": { + "start": { + "line": 16, + "column": 16 + }, + "end": { + "line": 21, + "column": 2 + } + } + }, + "loc": { + "start": { + "line": 16, + "column": 14 + }, + "end": { + "line": 21, + "column": 2 + } + } + }, + "loc": { + "start": { + "line": 16, + "column": 14 + }, + "end": { + "line": 21, + "column": 2 + } + } + }, + "overloads": [], + "decorators": [], + "loc": { + "start": { + "line": 16, + "column": 1 + }, + "end": { + "line": 21, + "column": 2 + } + } + } + ], + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + }, + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 1, + "column": 1 + } + } + } + ], + "loc": { + "start": { + "line": 1, + "column": 1 + }, + "end": { + "line": 22, + "column": 1 + } + } +} diff --git a/ets2panda/test/parser/ets/undefinedNullTypeAlias.ets b/ets2panda/test/parser/ets/undefinedNullTypeAlias.ets new file mode 100644 index 00000000000..c76d66a0660 --- /dev/null +++ b/ets2panda/test/parser/ets/undefinedNullTypeAlias.ets @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2024 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. + */ + +function main(){ + let und : undefined; + let nul : null; + und = undefined; + nul = null; +} diff --git a/ets2panda/test/parser/ets/var_declare-expected.txt b/ets2panda/test/parser/ets/var_declare-expected.txt index 24fa8c76393..ad98c3727f6 100644 --- a/ets2panda/test/parser/ets/var_declare-expected.txt +++ b/ets2panda/test/parser/ets/var_declare-expected.txt @@ -208,35 +208,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 20 - }, - "end": { - "line": 19, - "column": 24 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 20 - }, - "end": { - "line": 19, - "column": 26 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -244,7 +216,7 @@ }, "end": { "line": 19, - "column": 26 + "column": 24 } } }, diff --git a/ets2panda/test/parser/ets/variable_throw_function_1-expected.txt b/ets2panda/test/parser/ets/variable_throw_function_1-expected.txt index cab900f77a2..604de34c49e 100644 --- a/ets2panda/test/parser/ets/variable_throw_function_1-expected.txt +++ b/ets2panda/test/parser/ets/variable_throw_function_1-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, @@ -297,35 +269,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 29 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -333,7 +277,7 @@ }, "end": { "line": 18, - "column": 29 + "column": 22 } } }, @@ -441,35 +385,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 23 - }, - "end": { - "line": 20, - "column": 27 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 23 - }, - "end": { - "line": 20, - "column": 34 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -477,7 +393,7 @@ }, "end": { "line": 20, - "column": 34 + "column": 27 } } } @@ -489,7 +405,7 @@ }, "end": { "line": 20, - "column": 34 + "column": 27 } } }, @@ -501,7 +417,7 @@ }, "end": { "line": 20, - "column": 34 + "column": 27 } } }, @@ -512,41 +428,13 @@ }, "end": { "line": 20, - "column": 34 + "column": 27 } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 38 - }, - "end": { - "line": 20, - "column": 42 - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 38 - }, - "end": { - "line": 20, - "column": 51 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -554,7 +442,7 @@ }, "end": { "line": 20, - "column": 51 + "column": 42 } } }, @@ -654,35 +542,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 18 - }, - "end": { - "line": 22, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -690,7 +550,7 @@ }, "end": { "line": 22, - "column": 24 + "column": 22 } } }, @@ -709,35 +569,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 26 - }, - "end": { - "line": 23, - "column": 30 - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 26 - }, - "end": { - "line": 23, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -745,7 +577,7 @@ }, "end": { "line": 23, - "column": 37 + "column": 30 } } } @@ -757,7 +589,7 @@ }, "end": { "line": 23, - "column": 37 + "column": 30 } } }, @@ -824,35 +656,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 25, - "column": 26 - }, - "end": { - "line": 25, - "column": 30 - } - } - }, - "loc": { - "start": { - "line": 25, - "column": 26 - }, - "end": { - "line": 25, - "column": 37 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 25, @@ -860,7 +664,7 @@ }, "end": { "line": 25, - "column": 37 + "column": 30 } } } @@ -872,7 +676,7 @@ }, "end": { "line": 25, - "column": 37 + "column": 30 } } }, @@ -947,35 +751,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 27, - "column": 30 - }, - "end": { - "line": 27, - "column": 34 - } - } - }, - "loc": { - "start": { - "line": 27, - "column": 30 - }, - "end": { - "line": 27, - "column": 41 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 27, @@ -983,7 +759,7 @@ }, "end": { "line": 27, - "column": 41 + "column": 34 } } } @@ -995,7 +771,7 @@ }, "end": { "line": 27, - "column": 41 + "column": 34 } } }, @@ -1007,7 +783,7 @@ }, "end": { "line": 27, - "column": 41 + "column": 34 } } }, @@ -1018,41 +794,13 @@ }, "end": { "line": 27, - "column": 41 + "column": 34 } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 27, - "column": 46 - }, - "end": { - "line": 27, - "column": 50 - } - } - }, - "loc": { - "start": { - "line": 27, - "column": 46 - }, - "end": { - "line": 27, - "column": 57 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 27, @@ -1060,7 +808,7 @@ }, "end": { "line": 27, - "column": 57 + "column": 50 } } } @@ -1072,7 +820,7 @@ }, "end": { "line": 27, - "column": 57 + "column": 50 } } }, diff --git a/ets2panda/test/parser/ets/variable_throw_function_2-expected.txt b/ets2panda/test/parser/ets/variable_throw_function_2-expected.txt index a0cc39d9676..ab6aff19a71 100644 --- a/ets2panda/test/parser/ets/variable_throw_function_2-expected.txt +++ b/ets2panda/test/parser/ets/variable_throw_function_2-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 29 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 29 + "column": 22 } } }, @@ -298,35 +270,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 18 - }, - "end": { - "line": 18, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -334,7 +278,7 @@ }, "end": { "line": 18, - "column": 24 + "column": 22 } } }, @@ -353,35 +297,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 29 - }, - "end": { - "line": 19, - "column": 33 - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 29 - }, - "end": { - "line": 19, - "column": 35 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -389,7 +305,7 @@ }, "end": { "line": 19, - "column": 35 + "column": 33 } } }, @@ -400,7 +316,7 @@ }, "end": { "line": 19, - "column": 35 + "column": 33 } } }, diff --git a/ets2panda/test/parser/ets/void-expected.txt b/ets2panda/test/parser/ets/void-expected.txt index f50e36f037e..8f4c35becc0 100644 --- a/ets2panda/test/parser/ets/void-expected.txt +++ b/ets2panda/test/parser/ets/void-expected.txt @@ -162,35 +162,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "void", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 22 - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 18 - }, - "end": { - "line": 16, - "column": 24 - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -198,7 +170,7 @@ }, "end": { "line": 16, - "column": 24 + "column": 22 } } }, diff --git a/ets2panda/test/test-lists/parser/parser-js-ignored.txt b/ets2panda/test/test-lists/parser/parser-js-ignored.txt index a0cac35d0e8..80046b8af4e 100644 --- a/ets2panda/test/test-lists/parser/parser-js-ignored.txt +++ b/ets2panda/test/test-lists/parser/parser-js-ignored.txt @@ -78,3 +78,7 @@ parser/ets/static_function_hide_2.ets # 14595 compiler/ets/n_assignGenericWithNullableTypeParamToNonNullable.ets + +# Related to void revert +compiler/ets/lambda_infer_type/lambda_cast_infer_type_void.ets +compiler/ets/promiseVoid.ets diff --git a/ets2panda/varbinder/ETSBinder.cpp b/ets2panda/varbinder/ETSBinder.cpp index f54c6943f72..74a0fa129d7 100644 --- a/ets2panda/varbinder/ETSBinder.cpp +++ b/ets2panda/varbinder/ETSBinder.cpp @@ -94,6 +94,9 @@ void ETSBinder::LookupTypeArgumentReferences(ir::ETSTypeReference *typeRef) void ETSBinder::LookupTypeReference(ir::Identifier *ident, bool allowDynamicNamespaces) { const auto &name = ident->Name(); + if (name == compiler::Signatures::UNDEFINED || name == compiler::Signatures::NULL_LITERAL) { + return; + } auto *iter = GetScope(); while (iter != nullptr) { -- Gitee