From c6a020a8cce91c468cb3848605cbf0096ab53e27 Mon Sep 17 00:00:00 2001 From: Boglarka Haag Date: Wed, 16 Jul 2025 16:00:15 +0200 Subject: [PATCH] Align typeof for numeric types to latest spec Issue: https://gitee.com/openharmony/arkcompiler_ets_frontend/issues/ICLSAP Reason: Typeof output needs to be changed in case of numerics. Description: Extra checks added, tests modified. Fixed internal issue: #27651 Change-Id: I203b320adeb342caaa784788b0ee97f914f1c5ca Signed-off-by: Haag Boglarka --- ets2panda/checker/ETSAnalyzer.cpp | 6 + ets2panda/lsp/src/inlay_hints.cpp | 35 ++ ets2panda/lsp/src/quick_info.cpp | 4 + ets2panda/parser/ETSparser.cpp | 1 + ets2panda/parser/ETSparserTypes.cpp | 1 + .../annotation_for_type_parameter02.ets | 4 +- .../ets/ambient_declaration-expected.txt | 40 +- ...ed_conditional_expression_not-expected.txt | 40 +- ...with_ambiguous_rest_parameter-expected.txt | 34 +- .../generic_class_getter_setter-expected.txt | 112 +---- .../package_module_1-expected.txt | 354 +------------ .../package_module_2-expected.txt | 346 +------------ .../separate_module_1-expected.txt | 36 +- .../package_module_1-expected.txt | 140 +----- .../package_module_2-expected.txt | 142 +----- .../separate_module_1-expected.txt | 36 +- .../generic_typealias_func_type-expected.txt | 40 +- ...neric_typealias_func_type_lib-expected.txt | 36 +- ...ambda_infer_type_return_array-expected.txt | 68 +-- .../ets/memberExprInLambda-expected.txt | 34 +- .../compiler/ets/nullableTuple-expected.txt | 36 +- .../compiler/ets/requiredType_11-expected.txt | 36 +- .../compiler/ets/requiredType_9-expected.txt | 38 +- .../compiler/ets/tuple_types_1-expected.txt | 248 +--------- .../compiler/ets/tuple_types_12-expected.txt | 36 +- .../compiler/ets/tuple_types_13-expected.txt | 36 +- .../compiler/ets/tuple_types_15-expected.txt | 216 +------- .../compiler/ets/tuple_types_19-expected.txt | 72 +-- .../compiler/ets/tuple_types_7-expected.txt | 72 +-- .../ets/InferTypeParamFromParam1-expected.txt | 40 +- .../StaticFieldAndMethodSameName-expected.txt | 36 +- ...dAndMethodSameNameInheritance-expected.txt | 36 +- .../ets/ambient_call_signature-expected.txt | 78 +-- .../parser/ets/ambient_indexer_1-expected.txt | 68 +-- .../parser/ets/ambient_indexer_6-expected.txt | 68 +-- .../ets/arrayLiteralReassign-expected.txt | 34 +- .../array_creation_expression-expected.txt | 112 +---- .../ets/await_complex_promise-expected.txt | 226 +-------- .../ets/genericDefaultParam_1-expected.txt | 468 +----------------- .../ets/genericDefaultParam_3-expected.txt | 36 +- .../test/parser/ets/generics_3-expected.txt | 72 +-- .../test/parser/ets/generics_4-expected.txt | 72 +-- .../test/parser/ets/generics_5-expected.txt | 72 +-- .../test/parser/ets/generics_6-expected.txt | 144 +----- .../test/parser/ets/generics_7-expected.txt | 216 +------- ...rics_type_param_constraint_11-expected.txt | 36 +- ...rics_type_param_constraint_12-expected.txt | 36 +- .../parser/ets/getterOverride-expected.txt | 76 +-- .../globalVarInLambdaInStatic-expected.txt | 156 +----- .../module1/src/export_file-expected.txt | 38 +- ...overriding_method_return_type-expected.txt | 36 +- .../ets/lambdaAsFunctionParam-expected.txt | 194 +------- .../ets/lambda_optional_param_1-expected.txt | 82 +-- .../parser/ets/localTypeAlias-expected.txt | 72 +-- .../parser/ets/tupleAsTypeParam1-expected.txt | 216 +------- .../parser/ets/tupleAsTypeParam2-expected.txt | 216 +------- .../ets/tupleIndexWithNumbers-expected.txt | 72 +-- .../parser/ets/user_defined_22-expected.txt | 36 +- .../test/runtime/ets/TypeInferObject1.ets | 12 +- .../test/runtime/ets/TypeInferObject2.ets | 12 +- .../test/runtime/ets/TypeInferObject3.ets | 2 +- ets2panda/test/runtime/ets/Typeof.ets | 50 +- .../unit/lsp/class_hierarchy_info_test.cpp | 16 +- ...plement_inherited_abstract_member_test.cpp | 6 +- .../unit/lsp/get_class_property_info_test.cpp | 8 +- .../lsp/get_completions_entry_details.cpp | 8 +- ets2panda/test/unit/lsp/inlay_hints_test.cpp | 8 +- .../test/unit/lsp/quick_info_api_test.cpp | 2 +- ets2panda/test/unit/lsp/quick_info_test_1.cpp | 6 +- ...eed_to_state_create_ets_new_expression.cpp | 4 +- ..._proceed_to_state_is_accessor-expected.txt | 2 +- ...ceed_to_state_misc_expression-expected.txt | 2 +- 72 files changed, 428 insertions(+), 5053 deletions(-) diff --git a/ets2panda/checker/ETSAnalyzer.cpp b/ets2panda/checker/ETSAnalyzer.cpp index 74631ae976..8f68d272dc 100644 --- a/ets2panda/checker/ETSAnalyzer.cpp +++ b/ets2panda/checker/ETSAnalyzer.cpp @@ -2641,11 +2641,17 @@ static checker::Type *GetTypeOfStringType(checker::Type *argType, ETSChecker *ch case TypeFlag::ETS_BOOLEAN: return checker->CreateETSStringLiteralType("boolean"); case TypeFlag::BYTE: + return checker->CreateETSStringLiteralType("byte"); case TypeFlag::CHAR: + return checker->CreateETSStringLiteralType("char"); case TypeFlag::SHORT: + return checker->CreateETSStringLiteralType("short"); case TypeFlag::INT: + return checker->CreateETSStringLiteralType("int"); case TypeFlag::LONG: + return checker->CreateETSStringLiteralType("long"); case TypeFlag::FLOAT: + return checker->CreateETSStringLiteralType("float"); case TypeFlag::DOUBLE: return checker->CreateETSStringLiteralType("number"); default: diff --git a/ets2panda/lsp/src/inlay_hints.cpp b/ets2panda/lsp/src/inlay_hints.cpp index 4aecc7a552..5d1d749810 100644 --- a/ets2panda/lsp/src/inlay_hints.cpp +++ b/ets2panda/lsp/src/inlay_hints.cpp @@ -291,6 +291,32 @@ void GetFunctionReturnTypeForHints(const ir::AstNode *decl, InlayHintList *resul } } +std::string PrimitiveTypeToString(ir::PrimitiveType type) +{ + switch (type) { + case ir::PrimitiveType::BYTE: + return "byte"; + case ir::PrimitiveType::INT: + return "int"; + case ir::PrimitiveType::LONG: + return "long"; + case ir::PrimitiveType::SHORT: + return "short"; + case ir::PrimitiveType::FLOAT: + return "float"; + case ir::PrimitiveType::DOUBLE: + return "double"; + case ir::PrimitiveType::BOOLEAN: + return "boolean"; + case ir::PrimitiveType::CHAR: + return "char"; + case ir::PrimitiveType::VOID: + return "void"; + default: + UNREACHABLE(); + } +} + void AddTypeParamIfTypeRef(const ir::AstNode *childNode, const ir::AstNode *param, InlayHintList *result) { if (childNode->IsETSTypeReference()) { @@ -299,6 +325,14 @@ void AddTypeParamIfTypeRef(const ir::AstNode *childNode, const ir::AstNode *para } } +void AddTypeParamIfPrimitiveType(const ir::AstNode *childNode, const ir::AstNode *param, InlayHintList *result) +{ + if (childNode->IsETSPrimitiveType()) { + AddTypeHints(PrimitiveTypeToString(childNode->AsETSPrimitiveType()->GetPrimitiveType()), param->End().index, + result); + } +} + void GetFunctionParameterTypeForHints(const ir::AstNode *node, InlayHintList *result) { const auto nodeParams = node->AsMethodDefinition()->Function()->Params(); @@ -309,6 +343,7 @@ void GetFunctionParameterTypeForHints(const ir::AstNode *node, InlayHintList *re if (param->IsETSParameterExpression()) { param->AsETSParameterExpression()->FindChild([param, &result](ark::es2panda::ir::AstNode *childNode) { AddTypeParamIfTypeRef(childNode, param, result); + AddTypeParamIfPrimitiveType(childNode, param, result); return false; }); } diff --git a/ets2panda/lsp/src/quick_info.cpp b/ets2panda/lsp/src/quick_info.cpp index 9b4c6bdf56..722027a0f1 100644 --- a/ets2panda/lsp/src/quick_info.cpp +++ b/ets2panda/lsp/src/quick_info.cpp @@ -785,6 +785,10 @@ std::vector CreateDisplayOfReturnType(ark::es2panda::ir::Type if (returnType->Type() == ir::AstNodeType::TS_THIS_TYPE) { displayParts.emplace_back(CreateReturnType("this")); } + if (returnType->Type() == ir::AstNodeType::ETS_PRIMITIVE_TYPE) { + auto typeName = PrimitiveTypeToName(returnType->AsETSPrimitiveType()->GetPrimitiveType()); + displayParts.emplace_back(CreateReturnType(typeName)); + } return displayParts; } diff --git a/ets2panda/parser/ETSparser.cpp b/ets2panda/parser/ETSparser.cpp index d997007463..8aea67ed0b 100644 --- a/ets2panda/parser/ETSparser.cpp +++ b/ets2panda/parser/ETSparser.cpp @@ -1429,6 +1429,7 @@ bool TypedParser::IsPrimitiveType(const lexer::TokenType &tokenType) case lexer::TokenType::KEYW_BYTE: case lexer::TokenType::KEYW_CHAR: case lexer::TokenType::KEYW_DOUBLE: + case lexer::TokenType::KEYW_NUMBER: case lexer::TokenType::KEYW_FLOAT: case lexer::TokenType::KEYW_INT: case lexer::TokenType::KEYW_LONG: diff --git a/ets2panda/parser/ETSparserTypes.cpp b/ets2panda/parser/ETSparserTypes.cpp index 209397b1df..512e4596c5 100644 --- a/ets2panda/parser/ETSparserTypes.cpp +++ b/ets2panda/parser/ETSparserTypes.cpp @@ -136,6 +136,7 @@ ir::TypeNode *ETSParser::GetTypeAnnotationOfPrimitiveType([[maybe_unused]] lexer typeAnnotation = ParsePrimitiveType(options, ir::PrimitiveType::BOOLEAN); break; case lexer::TokenType::KEYW_DOUBLE: + case lexer::TokenType::KEYW_NUMBER: typeAnnotation = ParsePrimitiveType(options, ir::PrimitiveType::DOUBLE); break; case lexer::TokenType::KEYW_BYTE: diff --git a/ets2panda/test/ast/compiler/ets/annotation_tests/annotation_for_type_parameter02.ets b/ets2panda/test/ast/compiler/ets/annotation_tests/annotation_for_type_parameter02.ets index 86cf1c3590..931391a4f8 100644 --- a/ets2panda/test/ast/compiler/ets/annotation_tests/annotation_for_type_parameter02.ets +++ b/ets2panda/test/ast/compiler/ets/annotation_tests/annotation_for_type_parameter02.ets @@ -20,8 +20,8 @@ let array1: Array<@Anno() Int > = new Array < @Anno() Int > () class A { foo() { } bar() { - foo < @Anno number > () - this.foo < @Anno number > () + foo < @Anno Number > () + this.foo < @Anno Number > () } } diff --git a/ets2panda/test/compiler/ets/ambient_declaration-expected.txt b/ets2panda/test/compiler/ets/ambient_declaration-expected.txt index fdab2a6c85..9d18cdb6c8 100644 --- a/ets2panda/test/compiler/ets/ambient_declaration-expected.txt +++ b/ets2panda/test/compiler/ets/ambient_declaration-expected.txt @@ -232,39 +232,7 @@ "type": "Identifier", "name": "y", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 36, - "program": "ambient_declaration.ets" - }, - "end": { - "line": 16, - "column": 42, - "program": "ambient_declaration.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 36, - "program": "ambient_declaration.ets" - }, - "end": { - "line": 16, - "column": 43, - "program": "ambient_declaration.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -273,7 +241,7 @@ }, "end": { "line": 16, - "column": 43, + "column": 42, "program": "ambient_declaration.ets" } } @@ -287,7 +255,7 @@ }, "end": { "line": 16, - "column": 43, + "column": 42, "program": "ambient_declaration.ets" } } @@ -300,7 +268,7 @@ }, "end": { "line": 16, - "column": 43, + "column": 42, "program": "ambient_declaration.ets" } } diff --git a/ets2panda/test/compiler/ets/extended_conditional_expression_not-expected.txt b/ets2panda/test/compiler/ets/extended_conditional_expression_not-expected.txt index 81df745797..8415fb3086 100644 --- a/ets2panda/test/compiler/ets/extended_conditional_expression_not-expected.txt +++ b/ets2panda/test/compiler/ets/extended_conditional_expression_not-expected.txt @@ -291,39 +291,7 @@ "type": "Identifier", "name": "n", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 15, - "program": "extended_conditional_expression_not.ets" - }, - "end": { - "line": 16, - "column": 21, - "program": "extended_conditional_expression_not.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 15, - "program": "extended_conditional_expression_not.ets" - }, - "end": { - "line": 16, - "column": 22, - "program": "extended_conditional_expression_not.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -332,7 +300,7 @@ }, "end": { "line": 16, - "column": 22, + "column": 21, "program": "extended_conditional_expression_not.ets" } } @@ -346,7 +314,7 @@ }, "end": { "line": 16, - "column": 22, + "column": 21, "program": "extended_conditional_expression_not.ets" } } @@ -359,7 +327,7 @@ }, "end": { "line": 16, - "column": 22, + "column": 21, "program": "extended_conditional_expression_not.ets" } } diff --git a/ets2panda/test/compiler/ets/functions_with_ambiguous_rest_parameter-expected.txt b/ets2panda/test/compiler/ets/functions_with_ambiguous_rest_parameter-expected.txt index 062eb8492b..48b7fc3c3c 100644 --- a/ets2panda/test/compiler/ets/functions_with_ambiguous_rest_parameter-expected.txt +++ b/ets2panda/test/compiler/ets/functions_with_ambiguous_rest_parameter-expected.txt @@ -225,39 +225,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 3, - "program": "functions_with_ambiguous_rest_parameter.ets" - }, - "end": { - "line": 1, - "column": 3, - "program": "functions_with_ambiguous_rest_parameter.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 3, - "program": "functions_with_ambiguous_rest_parameter.ets" - }, - "end": { - "line": 1, - "column": 3, - "program": "functions_with_ambiguous_rest_parameter.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 1, 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 a1392dbfaf..e3394264d2 100644 --- a/ets2panda/test/compiler/ets/generic_class_getter_setter-expected.txt +++ b/ets2panda/test/compiler/ets/generic_class_getter_setter-expected.txt @@ -123,39 +123,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 17, - "program": "generic_class_getter_setter.ets" - }, - "end": { - "line": 17, - "column": 23, - "program": "generic_class_getter_setter.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 17, - "program": "generic_class_getter_setter.ets" - }, - "end": { - "line": 17, - "column": 25, - "program": "generic_class_getter_setter.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -164,7 +132,7 @@ }, "end": { "line": 17, - "column": 25, + "column": 23, "program": "generic_class_getter_setter.ets" } } @@ -299,39 +267,7 @@ "type": "Identifier", "name": "a0", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 18, - "program": "generic_class_getter_setter.ets" - }, - "end": { - "line": 18, - "column": 24, - "program": "generic_class_getter_setter.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 18, - "program": "generic_class_getter_setter.ets" - }, - "end": { - "line": 18, - "column": 25, - "program": "generic_class_getter_setter.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -340,7 +276,7 @@ }, "end": { "line": 18, - "column": 25, + "column": 24, "program": "generic_class_getter_setter.ets" } } @@ -354,7 +290,7 @@ }, "end": { "line": 18, - "column": 25, + "column": 24, "program": "generic_class_getter_setter.ets" } } @@ -367,7 +303,7 @@ }, "end": { "line": 18, - "column": 25, + "column": 24, "program": "generic_class_getter_setter.ets" } } @@ -782,39 +718,7 @@ "type": "Identifier", "name": "memb", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 15, - "program": "generic_class_getter_setter.ets" - }, - "end": { - "line": 22, - "column": 21, - "program": "generic_class_getter_setter.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 15, - "program": "generic_class_getter_setter.ets" - }, - "end": { - "line": 22, - "column": 23, - "program": "generic_class_getter_setter.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -823,7 +727,7 @@ }, "end": { "line": 22, - "column": 23, + "column": 21, "program": "generic_class_getter_setter.ets" } } diff --git a/ets2panda/test/compiler/ets/implicit_package_import/package_test_1/package_module_1-expected.txt b/ets2panda/test/compiler/ets/implicit_package_import/package_test_1/package_module_1-expected.txt index 9088eefd25..c83dd385a7 100644 --- a/ets2panda/test/compiler/ets/implicit_package_import/package_test_1/package_module_1-expected.txt +++ b/ets2panda/test/compiler/ets/implicit_package_import/package_test_1/package_module_1-expected.txt @@ -723,39 +723,7 @@ "optional": false, "computed": false, "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 13, - "program": "package_module_1.ets" - }, - "end": { - "line": 18, - "column": 19, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 13, - "program": "package_module_1.ets" - }, - "end": { - "line": 18, - "column": 20, - "program": "package_module_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -764,7 +732,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 19, "program": "package_module_1.ets" } } @@ -810,39 +778,7 @@ "optional": false, "computed": false, "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 13, - "program": "package_module_1.ets" - }, - "end": { - "line": 20, - "column": 19, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 13, - "program": "package_module_1.ets" - }, - "end": { - "line": 20, - "column": 21, - "program": "package_module_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -851,7 +787,7 @@ }, "end": { "line": 20, - "column": 21, + "column": 19, "program": "package_module_1.ets" } } @@ -1092,39 +1028,7 @@ "type": "Identifier", "name": "b", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 12, - "program": "package_module_1.ets" - }, - "end": { - "line": 24, - "column": 18, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 12, - "program": "package_module_1.ets" - }, - "end": { - "line": 24, - "column": 20, - "program": "package_module_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -1133,7 +1037,7 @@ }, "end": { "line": 24, - "column": 20, + "column": 18, "program": "package_module_1.ets" } } @@ -1206,39 +1110,7 @@ "type": "Identifier", "name": "c", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 25, - "column": 12, - "program": "package_module_1.ets" - }, - "end": { - "line": 25, - "column": 18, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 25, - "column": 12, - "program": "package_module_1.ets" - }, - "end": { - "line": 25, - "column": 20, - "program": "package_module_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 25, @@ -1247,7 +1119,7 @@ }, "end": { "line": 25, - "column": 20, + "column": 18, "program": "package_module_1.ets" } } @@ -1320,39 +1192,7 @@ "type": "Identifier", "name": "d", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 26, - "column": 12, - "program": "package_module_1.ets" - }, - "end": { - "line": 26, - "column": 18, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 26, - "column": 12, - "program": "package_module_1.ets" - }, - "end": { - "line": 26, - "column": 20, - "program": "package_module_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 26, @@ -1361,7 +1201,7 @@ }, "end": { "line": 26, - "column": 20, + "column": 18, "program": "package_module_1.ets" } } @@ -1434,39 +1274,7 @@ "type": "Identifier", "name": "e", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 27, - "column": 12, - "program": "package_module_1.ets" - }, - "end": { - "line": 27, - "column": 18, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 27, - "column": 12, - "program": "package_module_1.ets" - }, - "end": { - "line": 27, - "column": 20, - "program": "package_module_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 27, @@ -1475,7 +1283,7 @@ }, "end": { "line": 27, - "column": 20, + "column": 18, "program": "package_module_1.ets" } } @@ -1548,39 +1356,7 @@ "type": "Identifier", "name": "f", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 28, - "column": 12, - "program": "package_module_1.ets" - }, - "end": { - "line": 28, - "column": 18, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 28, - "column": 12, - "program": "package_module_1.ets" - }, - "end": { - "line": 28, - "column": 20, - "program": "package_module_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 28, @@ -1589,7 +1365,7 @@ }, "end": { "line": 28, - "column": 20, + "column": 18, "program": "package_module_1.ets" } } @@ -1899,39 +1675,7 @@ "optional": false, "computed": false, "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 17, - "program": "package_module_2.ets" - }, - "end": { - "line": 19, - "column": 17, - "program": "package_module_2.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 17, - "program": "package_module_2.ets" - }, - "end": { - "line": 19, - "column": 17, - "program": "package_module_2.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -2010,39 +1754,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 17, - "program": "package_module_2.ets" - }, - "end": { - "line": 22, - "column": 17, - "program": "package_module_2.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 17, - "program": "package_module_2.ets" - }, - "end": { - "line": 22, - "column": 17, - "program": "package_module_2.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -2068,39 +1780,7 @@ "type": "Identifier", "name": "local_var", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 40, - "program": "package_module_2.ets" - }, - "end": { - "line": 23, - "column": 40, - "program": "package_module_2.ets" - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 40, - "program": "package_module_2.ets" - }, - "end": { - "line": 23, - "column": 40, - "program": "package_module_2.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, diff --git a/ets2panda/test/compiler/ets/implicit_package_import/package_test_1/package_module_2-expected.txt b/ets2panda/test/compiler/ets/implicit_package_import/package_test_1/package_module_2-expected.txt index 4a7b7b6d6f..ba92f87046 100644 --- a/ets2panda/test/compiler/ets/implicit_package_import/package_test_1/package_module_2-expected.txt +++ b/ets2panda/test/compiler/ets/implicit_package_import/package_test_1/package_module_2-expected.txt @@ -723,39 +723,7 @@ "optional": false, "computed": false, "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 13, - "program": "package_module_2.ets" - }, - "end": { - "line": 19, - "column": 19, - "program": "package_module_2.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 13, - "program": "package_module_2.ets" - }, - "end": { - "line": 19, - "column": 20, - "program": "package_module_2.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -764,7 +732,7 @@ }, "end": { "line": 19, - "column": 20, + "column": 19, "program": "package_module_2.ets" } } @@ -834,39 +802,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 17, - "program": "package_module_2.ets" - }, - "end": { - "line": 22, - "column": 23, - "program": "package_module_2.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 17, - "program": "package_module_2.ets" - }, - "end": { - "line": 22, - "column": 25, - "program": "package_module_2.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -875,7 +811,7 @@ }, "end": { "line": 22, - "column": 25, + "column": 23, "program": "package_module_2.ets" } } @@ -892,39 +828,7 @@ "type": "Identifier", "name": "local_var", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 20, - "program": "package_module_2.ets" - }, - "end": { - "line": 23, - "column": 26, - "program": "package_module_2.ets" - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 20, - "program": "package_module_2.ets" - }, - "end": { - "line": 23, - "column": 28, - "program": "package_module_2.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -933,7 +837,7 @@ }, "end": { "line": 23, - "column": 28, + "column": 26, "program": "package_module_2.ets" } } @@ -1110,39 +1014,7 @@ "optional": false, "computed": false, "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 1, - "program": "package_module_1.ets" - }, - "end": { - "line": 18, - "column": 1, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 1, - "program": "package_module_1.ets" - }, - "end": { - "line": 18, - "column": 1, - "program": "package_module_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -1197,39 +1069,7 @@ "optional": false, "computed": false, "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 17, - "program": "package_module_1.ets" - }, - "end": { - "line": 20, - "column": 17, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 17, - "program": "package_module_1.ets" - }, - "end": { - "line": 20, - "column": 17, - "program": "package_module_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -1479,39 +1319,7 @@ "type": "Identifier", "name": "b", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 22, - "program": "package_module_1.ets" - }, - "end": { - "line": 24, - "column": 22, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 22, - "program": "package_module_1.ets" - }, - "end": { - "line": 24, - "column": 22, - "program": "package_module_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -1593,39 +1401,7 @@ "type": "Identifier", "name": "c", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 25, - "column": 2, - "program": "package_module_1.ets" - }, - "end": { - "line": 25, - "column": 2, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 25, - "column": 2, - "program": "package_module_1.ets" - }, - "end": { - "line": 25, - "column": 2, - "program": "package_module_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 25, @@ -1707,39 +1483,7 @@ "type": "Identifier", "name": "d", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 26, - "column": 1, - "program": "package_module_1.ets" - }, - "end": { - "line": 26, - "column": 1, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 26, - "column": 1, - "program": "package_module_1.ets" - }, - "end": { - "line": 26, - "column": 1, - "program": "package_module_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 26, @@ -1821,39 +1565,7 @@ "type": "Identifier", "name": "e", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 27, - "column": 18, - "program": "package_module_1.ets" - }, - "end": { - "line": 27, - "column": 18, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 27, - "column": 18, - "program": "package_module_1.ets" - }, - "end": { - "line": 27, - "column": 18, - "program": "package_module_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 27, @@ -1935,39 +1647,7 @@ "type": "Identifier", "name": "f", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 28, - "column": 27, - "program": "package_module_1.ets" - }, - "end": { - "line": 28, - "column": 27, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 28, - "column": 27, - "program": "package_module_1.ets" - }, - "end": { - "line": 28, - "column": 27, - "program": "package_module_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 28, diff --git a/ets2panda/test/compiler/ets/implicit_package_import/package_test_1/separate_module_1-expected.txt b/ets2panda/test/compiler/ets/implicit_package_import/package_test_1/separate_module_1-expected.txt index ce069d891f..e802d1dcb2 100644 --- a/ets2panda/test/compiler/ets/implicit_package_import/package_test_1/separate_module_1-expected.txt +++ b/ets2panda/test/compiler/ets/implicit_package_import/package_test_1/separate_module_1-expected.txt @@ -327,39 +327,7 @@ "optional": false, "computed": false, "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 24, - "program": "separate_module_1.ets" - }, - "end": { - "line": 16, - "column": 30, - "program": "separate_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 24, - "program": "separate_module_1.ets" - }, - "end": { - "line": 16, - "column": 32, - "program": "separate_module_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -368,7 +336,7 @@ }, "end": { "line": 16, - "column": 32, + "column": 30, "program": "separate_module_1.ets" } } diff --git a/ets2panda/test/compiler/ets/implicit_package_import/package_test_2/subpackage_1/package_module_1-expected.txt b/ets2panda/test/compiler/ets/implicit_package_import/package_test_2/subpackage_1/package_module_1-expected.txt index 4b6dcadf6c..7189db499b 100644 --- a/ets2panda/test/compiler/ets/implicit_package_import/package_test_2/subpackage_1/package_module_1-expected.txt +++ b/ets2panda/test/compiler/ets/implicit_package_import/package_test_2/subpackage_1/package_module_1-expected.txt @@ -225,39 +225,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 2, - "program": "package_module_2.ets" - }, - "end": { - "line": 21, - "column": 2, - "program": "package_module_2.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 2, - "program": "package_module_2.ets" - }, - "end": { - "line": 21, - "column": 2, - "program": "package_module_2.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -608,39 +576,7 @@ "type": "Identifier", "name": "a", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 12, - "program": "package_module_1.ets" - }, - "end": { - "line": 19, - "column": 18, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 12, - "program": "package_module_1.ets" - }, - "end": { - "line": 19, - "column": 20, - "program": "package_module_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -649,7 +585,7 @@ }, "end": { "line": 19, - "column": 20, + "column": 18, "program": "package_module_1.ets" } } @@ -739,39 +675,7 @@ "type": "Identifier", "name": "b", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 12, - "program": "package_module_1.ets" - }, - "end": { - "line": 20, - "column": 18, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 12, - "program": "package_module_1.ets" - }, - "end": { - "line": 20, - "column": 20, - "program": "package_module_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -780,7 +684,7 @@ }, "end": { "line": 20, - "column": 20, + "column": 18, "program": "package_module_1.ets" } } @@ -928,39 +832,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 27, - "program": "package_module_2.ets" - }, - "end": { - "line": 19, - "column": 27, - "program": "package_module_2.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 27, - "program": "package_module_2.ets" - }, - "end": { - "line": 19, - "column": 27, - "program": "package_module_2.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, diff --git a/ets2panda/test/compiler/ets/implicit_package_import/package_test_2/subpackage_1/package_module_2-expected.txt b/ets2panda/test/compiler/ets/implicit_package_import/package_test_2/subpackage_1/package_module_2-expected.txt index b2196585c2..8101733f26 100644 --- a/ets2panda/test/compiler/ets/implicit_package_import/package_test_2/subpackage_1/package_module_2-expected.txt +++ b/ets2panda/test/compiler/ets/implicit_package_import/package_test_2/subpackage_1/package_module_2-expected.txt @@ -225,39 +225,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 15, - "program": "package_module_2.ets" - }, - "end": { - "line": 21, - "column": 21, - "program": "package_module_2.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 15, - "program": "package_module_2.ets" - }, - "end": { - "line": 21, - "column": 24, - "program": "package_module_2.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -266,7 +234,7 @@ }, "end": { "line": 21, - "column": 24, + "column": 21, "program": "package_module_2.ets" } } @@ -576,39 +544,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 16, - "program": "package_module_2.ets" - }, - "end": { - "line": 19, - "column": 22, - "program": "package_module_2.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 16, - "program": "package_module_2.ets" - }, - "end": { - "line": 19, - "column": 23, - "program": "package_module_2.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -617,7 +553,7 @@ }, "end": { "line": 19, - "column": 23, + "column": 22, "program": "package_module_2.ets" } } @@ -630,7 +566,7 @@ }, "end": { "line": 19, - "column": 23, + "column": 22, "program": "package_module_2.ets" } } @@ -711,39 +647,7 @@ "type": "Identifier", "name": "a", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 24, - "program": "package_module_1.ets" - }, - "end": { - "line": 19, - "column": 24, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 24, - "program": "package_module_1.ets" - }, - "end": { - "line": 19, - "column": 24, - "program": "package_module_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -842,39 +746,7 @@ "type": "Identifier", "name": "b", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 9, - "program": "package_module_1.ets" - }, - "end": { - "line": 20, - "column": 9, - "program": "package_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 9, - "program": "package_module_1.ets" - }, - "end": { - "line": 20, - "column": 9, - "program": "package_module_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, diff --git a/ets2panda/test/compiler/ets/implicit_package_import/package_test_2/subpackage_2/separate_module_1-expected.txt b/ets2panda/test/compiler/ets/implicit_package_import/package_test_2/subpackage_2/separate_module_1-expected.txt index e4917aa097..71fb9cc512 100644 --- a/ets2panda/test/compiler/ets/implicit_package_import/package_test_2/subpackage_2/separate_module_1-expected.txt +++ b/ets2panda/test/compiler/ets/implicit_package_import/package_test_2/subpackage_2/separate_module_1-expected.txt @@ -327,39 +327,7 @@ "optional": false, "computed": false, "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 19, - "program": "separate_module_1.ets" - }, - "end": { - "line": 16, - "column": 25, - "program": "separate_module_1.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 19, - "program": "separate_module_1.ets" - }, - "end": { - "line": 16, - "column": 27, - "program": "separate_module_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -368,7 +336,7 @@ }, "end": { "line": 16, - "column": 27, + "column": 25, "program": "separate_module_1.ets" } } diff --git a/ets2panda/test/compiler/ets/import_tests/generic_typealias_func_type-expected.txt b/ets2panda/test/compiler/ets/import_tests/generic_typealias_func_type-expected.txt index 2726b422af..36e12c57ac 100644 --- a/ets2panda/test/compiler/ets/import_tests/generic_typealias_func_type-expected.txt +++ b/ets2panda/test/compiler/ets/import_tests/generic_typealias_func_type-expected.txt @@ -301,39 +301,7 @@ "type": "Identifier", "name": "num", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 14, - "program": "generic_typealias_func_type.ets" - }, - "end": { - "line": 19, - "column": 20, - "program": "generic_typealias_func_type.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 14, - "program": "generic_typealias_func_type.ets" - }, - "end": { - "line": 19, - "column": 21, - "program": "generic_typealias_func_type.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -342,7 +310,7 @@ }, "end": { "line": 19, - "column": 21, + "column": 20, "program": "generic_typealias_func_type.ets" } } @@ -356,7 +324,7 @@ }, "end": { "line": 19, - "column": 21, + "column": 20, "program": "generic_typealias_func_type.ets" } } @@ -369,7 +337,7 @@ }, "end": { "line": 19, - "column": 21, + "column": 20, "program": "generic_typealias_func_type.ets" } } diff --git a/ets2panda/test/compiler/ets/import_tests/generic_typealias_func_type_lib-expected.txt b/ets2panda/test/compiler/ets/import_tests/generic_typealias_func_type_lib-expected.txt index 6b6704bf23..c01ac54533 100644 --- a/ets2panda/test/compiler/ets/import_tests/generic_typealias_func_type_lib-expected.txt +++ b/ets2panda/test/compiler/ets/import_tests/generic_typealias_func_type_lib-expected.txt @@ -571,39 +571,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 35, - "program": "generic_typealias_func_type_lib.ets" - }, - "end": { - "line": 18, - "column": 41, - "program": "generic_typealias_func_type_lib.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 35, - "program": "generic_typealias_func_type_lib.ets" - }, - "end": { - "line": 18, - "column": 42, - "program": "generic_typealias_func_type_lib.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -612,7 +580,7 @@ }, "end": { "line": 18, - "column": 42, + "column": 41, "program": "generic_typealias_func_type_lib.ets" } } diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_array-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_array-expected.txt index 46493e52c9..6e63192539 100644 --- a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_array-expected.txt +++ b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_array-expected.txt @@ -215,39 +215,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 3, - "program": "lambda_infer_type_return_array.ets" - }, - "end": { - "line": 1, - "column": 3, - "program": "lambda_infer_type_return_array.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 3, - "program": "lambda_infer_type_return_array.ets" - }, - "end": { - "line": 1, - "column": 3, - "program": "lambda_infer_type_return_array.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 1, @@ -578,39 +546,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 3, - "program": "lambda_infer_type_return_array.ets" - }, - "end": { - "line": 1, - "column": 3, - "program": "lambda_infer_type_return_array.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 3, - "program": "lambda_infer_type_return_array.ets" - }, - "end": { - "line": 1, - "column": 3, - "program": "lambda_infer_type_return_array.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 1, diff --git a/ets2panda/test/compiler/ets/memberExprInLambda-expected.txt b/ets2panda/test/compiler/ets/memberExprInLambda-expected.txt index 4d8fc13a42..c0a60e17dc 100644 --- a/ets2panda/test/compiler/ets/memberExprInLambda-expected.txt +++ b/ets2panda/test/compiler/ets/memberExprInLambda-expected.txt @@ -399,39 +399,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 3, - "program": "memberExprInLambda.ets" - }, - "end": { - "line": 1, - "column": 3, - "program": "memberExprInLambda.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 3, - "program": "memberExprInLambda.ets" - }, - "end": { - "line": 1, - "column": 3, - "program": "memberExprInLambda.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 1, diff --git a/ets2panda/test/compiler/ets/nullableTuple-expected.txt b/ets2panda/test/compiler/ets/nullableTuple-expected.txt index b8e7ca99db..1a70bec6b9 100644 --- a/ets2panda/test/compiler/ets/nullableTuple-expected.txt +++ b/ets2panda/test/compiler/ets/nullableTuple-expected.txt @@ -24,39 +24,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 27, - "program": "nullableTuple.ets" - }, - "end": { - "line": 16, - "column": 33, - "program": "nullableTuple.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 27, - "program": "nullableTuple.ets" - }, - "end": { - "line": 16, - "column": 34, - "program": "nullableTuple.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -65,7 +33,7 @@ }, "end": { "line": 16, - "column": 34, + "column": 33, "program": "nullableTuple.ets" } } diff --git a/ets2panda/test/compiler/ets/requiredType_11-expected.txt b/ets2panda/test/compiler/ets/requiredType_11-expected.txt index 41e27345ba..0434afe502 100644 --- a/ets2panda/test/compiler/ets/requiredType_11-expected.txt +++ b/ets2panda/test/compiler/ets/requiredType_11-expected.txt @@ -53,39 +53,7 @@ "type": "ETSUnionType", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 12, - "program": "requiredType_11.ets" - }, - "end": { - "line": 17, - "column": 18, - "program": "requiredType_11.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 12, - "program": "requiredType_11.ets" - }, - "end": { - "line": 17, - "column": 19, - "program": "requiredType_11.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -94,7 +62,7 @@ }, "end": { "line": 17, - "column": 19, + "column": 18, "program": "requiredType_11.ets" } } diff --git a/ets2panda/test/compiler/ets/requiredType_9-expected.txt b/ets2panda/test/compiler/ets/requiredType_9-expected.txt index 2b7ed4053e..f2e04bf752 100644 --- a/ets2panda/test/compiler/ets/requiredType_9-expected.txt +++ b/ets2panda/test/compiler/ets/requiredType_9-expected.txt @@ -50,39 +50,7 @@ "optional": false, "computed": false, "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 12, - "program": "requiredType_9.ets" - }, - "end": { - "line": 17, - "column": 18, - "program": "requiredType_9.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 12, - "program": "requiredType_9.ets" - }, - "end": { - "line": 17, - "column": 19, - "program": "requiredType_9.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -91,7 +59,7 @@ }, "end": { "line": 17, - "column": 19, + "column": 18, "program": "requiredType_9.ets" } } @@ -106,7 +74,7 @@ }, "end": { "line": 17, - "column": 19, + "column": 18, "program": "requiredType_9.ets" } } diff --git a/ets2panda/test/compiler/ets/tuple_types_1-expected.txt b/ets2panda/test/compiler/ets/tuple_types_1-expected.txt index f03f541e34..bb9dad7f9e 100644 --- a/ets2panda/test/compiler/ets/tuple_types_1-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_1-expected.txt @@ -592,39 +592,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 26, - "program": "tuple_types_1.ets" - }, - "end": { - "line": 19, - "column": 32, - "program": "tuple_types_1.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 26, - "program": "tuple_types_1.ets" - }, - "end": { - "line": 19, - "column": 33, - "program": "tuple_types_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -633,7 +601,7 @@ }, "end": { "line": 19, - "column": 33, + "column": 32, "program": "tuple_types_1.ets" } } @@ -853,39 +821,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 3, - "program": "tuple_types_1.ets" - }, - "end": { - "line": 1, - "column": 3, - "program": "tuple_types_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 3, - "program": "tuple_types_1.ets" - }, - "end": { - "line": 1, - "column": 3, - "program": "tuple_types_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 1, @@ -2967,39 +2903,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 39, - "column": 17, - "program": "tuple_types_1.ets" - }, - "end": { - "line": 39, - "column": 23, - "program": "tuple_types_1.ets" - } - } - }, - "loc": { - "start": { - "line": 39, - "column": 17, - "program": "tuple_types_1.ets" - }, - "end": { - "line": 39, - "column": 24, - "program": "tuple_types_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 39, @@ -3008,7 +2912,7 @@ }, "end": { "line": 39, - "column": 24, + "column": 23, "program": "tuple_types_1.ets" } } @@ -3177,39 +3081,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 40, - "column": 17, - "program": "tuple_types_1.ets" - }, - "end": { - "line": 40, - "column": 23, - "program": "tuple_types_1.ets" - } - } - }, - "loc": { - "start": { - "line": 40, - "column": 17, - "program": "tuple_types_1.ets" - }, - "end": { - "line": 40, - "column": 24, - "program": "tuple_types_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 40, @@ -3218,7 +3090,7 @@ }, "end": { "line": 40, - "column": 24, + "column": 23, "program": "tuple_types_1.ets" } } @@ -3418,39 +3290,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 41, - "column": 17, - "program": "tuple_types_1.ets" - }, - "end": { - "line": 41, - "column": 23, - "program": "tuple_types_1.ets" - } - } - }, - "loc": { - "start": { - "line": 41, - "column": 17, - "program": "tuple_types_1.ets" - }, - "end": { - "line": 41, - "column": 24, - "program": "tuple_types_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 41, @@ -3459,7 +3299,7 @@ }, "end": { "line": 41, - "column": 24, + "column": 23, "program": "tuple_types_1.ets" } } @@ -3527,39 +3367,7 @@ } }, { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 41, - "column": 42, - "program": "tuple_types_1.ets" - }, - "end": { - "line": 41, - "column": 48, - "program": "tuple_types_1.ets" - } - } - }, - "loc": { - "start": { - "line": 41, - "column": 42, - "program": "tuple_types_1.ets" - }, - "end": { - "line": 41, - "column": 49, - "program": "tuple_types_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 41, @@ -3568,7 +3376,7 @@ }, "end": { "line": 41, - "column": 49, + "column": 48, "program": "tuple_types_1.ets" } } @@ -3858,39 +3666,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 3, - "program": "tuple_types_1.ets" - }, - "end": { - "line": 1, - "column": 3, - "program": "tuple_types_1.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 3, - "program": "tuple_types_1.ets" - }, - "end": { - "line": 1, - "column": 3, - "program": "tuple_types_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 1, diff --git a/ets2panda/test/compiler/ets/tuple_types_12-expected.txt b/ets2panda/test/compiler/ets/tuple_types_12-expected.txt index 64c9f8e3d7..cfae40983f 100644 --- a/ets2panda/test/compiler/ets/tuple_types_12-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_12-expected.txt @@ -906,39 +906,7 @@ } }, { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 23, - "program": "tuple_types_12.ets" - }, - "end": { - "line": 22, - "column": 29, - "program": "tuple_types_12.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 23, - "program": "tuple_types_12.ets" - }, - "end": { - "line": 22, - "column": 30, - "program": "tuple_types_12.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -947,7 +915,7 @@ }, "end": { "line": 22, - "column": 30, + "column": 29, "program": "tuple_types_12.ets" } } diff --git a/ets2panda/test/compiler/ets/tuple_types_13-expected.txt b/ets2panda/test/compiler/ets/tuple_types_13-expected.txt index 20eb7a92ff..a94b03fcac 100644 --- a/ets2panda/test/compiler/ets/tuple_types_13-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_13-expected.txt @@ -24,39 +24,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 21, - "program": "tuple_types_13.ets" - }, - "end": { - "line": 16, - "column": 27, - "program": "tuple_types_13.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 21, - "program": "tuple_types_13.ets" - }, - "end": { - "line": 16, - "column": 28, - "program": "tuple_types_13.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -65,7 +33,7 @@ }, "end": { "line": 16, - "column": 28, + "column": 27, "program": "tuple_types_13.ets" } } diff --git a/ets2panda/test/compiler/ets/tuple_types_15-expected.txt b/ets2panda/test/compiler/ets/tuple_types_15-expected.txt index 9f4319f7ac..9069185e67 100644 --- a/ets2panda/test/compiler/ets/tuple_types_15-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_15-expected.txt @@ -24,39 +24,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 21, - "program": "tuple_types_15.ets" - }, - "end": { - "line": 16, - "column": 27, - "program": "tuple_types_15.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 21, - "program": "tuple_types_15.ets" - }, - "end": { - "line": 16, - "column": 28, - "program": "tuple_types_15.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -65,7 +33,7 @@ }, "end": { "line": 16, - "column": 28, + "column": 27, "program": "tuple_types_15.ets" } } @@ -294,39 +262,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 30, - "program": "tuple_types_15.ets" - }, - "end": { - "line": 18, - "column": 36, - "program": "tuple_types_15.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 30, - "program": "tuple_types_15.ets" - }, - "end": { - "line": 18, - "column": 37, - "program": "tuple_types_15.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -335,7 +271,7 @@ }, "end": { "line": 18, - "column": 37, + "column": 36, "program": "tuple_types_15.ets" } } @@ -416,39 +352,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 15, - "program": "tuple_types_15.ets" - }, - "end": { - "line": 19, - "column": 21, - "program": "tuple_types_15.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 15, - "program": "tuple_types_15.ets" - }, - "end": { - "line": 19, - "column": 22, - "program": "tuple_types_15.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -457,7 +361,7 @@ }, "end": { "line": 19, - "column": 22, + "column": 21, "program": "tuple_types_15.ets" } } @@ -780,39 +684,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 24, - "program": "tuple_types_15.ets" - }, - "end": { - "line": 24, - "column": 30, - "program": "tuple_types_15.ets" - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 24, - "program": "tuple_types_15.ets" - }, - "end": { - "line": 24, - "column": 31, - "program": "tuple_types_15.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -821,7 +693,7 @@ }, "end": { "line": 24, - "column": 31, + "column": 30, "program": "tuple_types_15.ets" } } @@ -889,39 +761,7 @@ } }, { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 49, - "program": "tuple_types_15.ets" - }, - "end": { - "line": 24, - "column": 55, - "program": "tuple_types_15.ets" - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 49, - "program": "tuple_types_15.ets" - }, - "end": { - "line": 24, - "column": 56, - "program": "tuple_types_15.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -930,7 +770,7 @@ }, "end": { "line": 24, - "column": 56, + "column": 55, "program": "tuple_types_15.ets" } } @@ -2127,39 +1967,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 37, - "column": 17, - "program": "tuple_types_15.ets" - }, - "end": { - "line": 37, - "column": 23, - "program": "tuple_types_15.ets" - } - } - }, - "loc": { - "start": { - "line": 37, - "column": 17, - "program": "tuple_types_15.ets" - }, - "end": { - "line": 37, - "column": 24, - "program": "tuple_types_15.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 37, @@ -2168,7 +1976,7 @@ }, "end": { "line": 37, - "column": 24, + "column": 23, "program": "tuple_types_15.ets" } } diff --git a/ets2panda/test/compiler/ets/tuple_types_19-expected.txt b/ets2panda/test/compiler/ets/tuple_types_19-expected.txt index 1dd4cab405..f61a50eedf 100644 --- a/ets2panda/test/compiler/ets/tuple_types_19-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_19-expected.txt @@ -2323,39 +2323,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 30, - "column": 27, - "program": "tuple_types_19.ets" - }, - "end": { - "line": 30, - "column": 33, - "program": "tuple_types_19.ets" - } - } - }, - "loc": { - "start": { - "line": 30, - "column": 27, - "program": "tuple_types_19.ets" - }, - "end": { - "line": 30, - "column": 34, - "program": "tuple_types_19.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 30, @@ -2364,7 +2332,7 @@ }, "end": { "line": 30, - "column": 34, + "column": 33, "program": "tuple_types_19.ets" } } @@ -2450,39 +2418,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 30, - "column": 55, - "program": "tuple_types_19.ets" - }, - "end": { - "line": 30, - "column": 61, - "program": "tuple_types_19.ets" - } - } - }, - "loc": { - "start": { - "line": 30, - "column": 55, - "program": "tuple_types_19.ets" - }, - "end": { - "line": 30, - "column": 62, - "program": "tuple_types_19.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 30, @@ -2491,7 +2427,7 @@ }, "end": { "line": 30, - "column": 62, + "column": 61, "program": "tuple_types_19.ets" } } diff --git a/ets2panda/test/compiler/ets/tuple_types_7-expected.txt b/ets2panda/test/compiler/ets/tuple_types_7-expected.txt index ec5cc856c2..034a388764 100644 --- a/ets2panda/test/compiler/ets/tuple_types_7-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_7-expected.txt @@ -209,39 +209,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 13, - "program": "tuple_types_7.ets" - }, - "end": { - "line": 18, - "column": 19, - "program": "tuple_types_7.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 13, - "program": "tuple_types_7.ets" - }, - "end": { - "line": 18, - "column": 20, - "program": "tuple_types_7.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -250,7 +218,7 @@ }, "end": { "line": 18, - "column": 20, + "column": 19, "program": "tuple_types_7.ets" } } @@ -482,39 +450,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 13, - "program": "tuple_types_7.ets" - }, - "end": { - "line": 19, - "column": 19, - "program": "tuple_types_7.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 13, - "program": "tuple_types_7.ets" - }, - "end": { - "line": 19, - "column": 20, - "program": "tuple_types_7.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -523,7 +459,7 @@ }, "end": { "line": 19, - "column": 20, + "column": 19, "program": "tuple_types_7.ets" } } diff --git a/ets2panda/test/parser/ets/InferTypeParamFromParam1-expected.txt b/ets2panda/test/parser/ets/InferTypeParamFromParam1-expected.txt index 4423a330e5..43b3518bc7 100644 --- a/ets2panda/test/parser/ets/InferTypeParamFromParam1-expected.txt +++ b/ets2panda/test/parser/ets/InferTypeParamFromParam1-expected.txt @@ -1448,39 +1448,7 @@ "type": "Identifier", "name": "arg", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 25, - "column": 42, - "program": "InferTypeParamFromParam1.ets" - }, - "end": { - "line": 25, - "column": 48, - "program": "InferTypeParamFromParam1.ets" - } - } - }, - "loc": { - "start": { - "line": 25, - "column": 42, - "program": "InferTypeParamFromParam1.ets" - }, - "end": { - "line": 25, - "column": 49, - "program": "InferTypeParamFromParam1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 25, @@ -1489,7 +1457,7 @@ }, "end": { "line": 25, - "column": 49, + "column": 48, "program": "InferTypeParamFromParam1.ets" } } @@ -1503,7 +1471,7 @@ }, "end": { "line": 25, - "column": 49, + "column": 48, "program": "InferTypeParamFromParam1.ets" } } @@ -1516,7 +1484,7 @@ }, "end": { "line": 25, - "column": 49, + "column": 48, "program": "InferTypeParamFromParam1.ets" } } diff --git a/ets2panda/test/parser/ets/StaticFieldAndMethodSameName-expected.txt b/ets2panda/test/parser/ets/StaticFieldAndMethodSameName-expected.txt index 583a8f6d7d..447cc8adb7 100644 --- a/ets2panda/test/parser/ets/StaticFieldAndMethodSameName-expected.txt +++ b/ets2panda/test/parser/ets/StaticFieldAndMethodSameName-expected.txt @@ -66,39 +66,7 @@ "optional": false, "computed": false, "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 7, - "program": "StaticFieldAndMethodSameName.ets" - }, - "end": { - "line": 17, - "column": 13, - "program": "StaticFieldAndMethodSameName.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 7, - "program": "StaticFieldAndMethodSameName.ets" - }, - "end": { - "line": 17, - "column": 15, - "program": "StaticFieldAndMethodSameName.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -107,7 +75,7 @@ }, "end": { "line": 17, - "column": 15, + "column": 13, "program": "StaticFieldAndMethodSameName.ets" } } diff --git a/ets2panda/test/parser/ets/StaticFieldAndMethodSameNameInheritance-expected.txt b/ets2panda/test/parser/ets/StaticFieldAndMethodSameNameInheritance-expected.txt index 02df1019bf..2a13e45521 100644 --- a/ets2panda/test/parser/ets/StaticFieldAndMethodSameNameInheritance-expected.txt +++ b/ets2panda/test/parser/ets/StaticFieldAndMethodSameNameInheritance-expected.txt @@ -388,39 +388,7 @@ "optional": false, "computed": false, "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 7, - "program": "StaticFieldAndMethodSameNameInheritance.ets" - }, - "end": { - "line": 21, - "column": 13, - "program": "StaticFieldAndMethodSameNameInheritance.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 7, - "program": "StaticFieldAndMethodSameNameInheritance.ets" - }, - "end": { - "line": 21, - "column": 15, - "program": "StaticFieldAndMethodSameNameInheritance.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -429,7 +397,7 @@ }, "end": { "line": 21, - "column": 15, + "column": 13, "program": "StaticFieldAndMethodSameNameInheritance.ets" } } diff --git a/ets2panda/test/parser/ets/ambient_call_signature-expected.txt b/ets2panda/test/parser/ets/ambient_call_signature-expected.txt index 2af8e374b2..7d9d208717 100644 --- a/ets2panda/test/parser/ets/ambient_call_signature-expected.txt +++ b/ets2panda/test/parser/ets/ambient_call_signature-expected.txt @@ -79,39 +79,7 @@ "type": "Identifier", "name": "a", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 8, - "program": "ambient_call_signature.ets" - }, - "end": { - "line": 17, - "column": 14, - "program": "ambient_call_signature.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 8, - "program": "ambient_call_signature.ets" - }, - "end": { - "line": 17, - "column": 15, - "program": "ambient_call_signature.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -120,7 +88,7 @@ }, "end": { "line": 17, - "column": 15, + "column": 14, "program": "ambient_call_signature.ets" } } @@ -134,7 +102,7 @@ }, "end": { "line": 17, - "column": 15, + "column": 14, "program": "ambient_call_signature.ets" } } @@ -147,46 +115,14 @@ }, "end": { "line": 17, - "column": 15, + "column": 14, "program": "ambient_call_signature.ets" } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 16, - "program": "ambient_call_signature.ets" - }, - "end": { - "line": 17, - "column": 22, - "program": "ambient_call_signature.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 16, - "program": "ambient_call_signature.ets" - }, - "end": { - "line": 18, - "column": 2, - "program": "ambient_call_signature.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -194,8 +130,8 @@ "program": "ambient_call_signature.ets" }, "end": { - "line": 18, - "column": 2, + "line": 17, + "column": 22, "program": "ambient_call_signature.ets" } } diff --git a/ets2panda/test/parser/ets/ambient_indexer_1-expected.txt b/ets2panda/test/parser/ets/ambient_indexer_1-expected.txt index 0cbb526fdc..357e197cd6 100644 --- a/ets2panda/test/parser/ets/ambient_indexer_1-expected.txt +++ b/ets2panda/test/parser/ets/ambient_indexer_1-expected.txt @@ -184,39 +184,7 @@ "type": "Identifier", "name": "index", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "ambient_indexer_1.ets" - }, - "end": { - "line": 18, - "column": 2, - "program": "ambient_indexer_1.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "ambient_indexer_1.ets" - }, - "end": { - "line": 18, - "column": 2, - "program": "ambient_indexer_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -402,39 +370,7 @@ "type": "Identifier", "name": "index", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "ambient_indexer_1.ets" - }, - "end": { - "line": 18, - "column": 2, - "program": "ambient_indexer_1.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "ambient_indexer_1.ets" - }, - "end": { - "line": 18, - "column": 2, - "program": "ambient_indexer_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, diff --git a/ets2panda/test/parser/ets/ambient_indexer_6-expected.txt b/ets2panda/test/parser/ets/ambient_indexer_6-expected.txt index 87d901d090..04766b3115 100644 --- a/ets2panda/test/parser/ets/ambient_indexer_6-expected.txt +++ b/ets2panda/test/parser/ets/ambient_indexer_6-expected.txt @@ -184,39 +184,7 @@ "type": "Identifier", "name": "index", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "ambient_indexer_6.ets" - }, - "end": { - "line": 18, - "column": 2, - "program": "ambient_indexer_6.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "ambient_indexer_6.ets" - }, - "end": { - "line": 18, - "column": 2, - "program": "ambient_indexer_6.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -402,39 +370,7 @@ "type": "Identifier", "name": "index", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "ambient_indexer_6.ets" - }, - "end": { - "line": 18, - "column": 2, - "program": "ambient_indexer_6.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 5, - "program": "ambient_indexer_6.ets" - }, - "end": { - "line": 18, - "column": 2, - "program": "ambient_indexer_6.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, diff --git a/ets2panda/test/parser/ets/arrayLiteralReassign-expected.txt b/ets2panda/test/parser/ets/arrayLiteralReassign-expected.txt index 1ea8384ba8..2327750c74 100644 --- a/ets2panda/test/parser/ets/arrayLiteralReassign-expected.txt +++ b/ets2panda/test/parser/ets/arrayLiteralReassign-expected.txt @@ -215,39 +215,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 1, - "column": 3, - "program": "arrayLiteralReassign.ets" - }, - "end": { - "line": 1, - "column": 3, - "program": "arrayLiteralReassign.ets" - } - } - }, - "loc": { - "start": { - "line": 1, - "column": 3, - "program": "arrayLiteralReassign.ets" - }, - "end": { - "line": 1, - "column": 3, - "program": "arrayLiteralReassign.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 1, diff --git a/ets2panda/test/parser/ets/array_creation_expression-expected.txt b/ets2panda/test/parser/ets/array_creation_expression-expected.txt index 1a0fdd026e..db30c5fe87 100644 --- a/ets2panda/test/parser/ets/array_creation_expression-expected.txt +++ b/ets2panda/test/parser/ets/array_creation_expression-expected.txt @@ -50,39 +50,7 @@ "optional": false, "computed": false, "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 8, - "program": "array_creation_expression.ets" - }, - "end": { - "line": 17, - "column": 14, - "program": "array_creation_expression.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 8, - "program": "array_creation_expression.ets" - }, - "end": { - "line": 17, - "column": 15, - "program": "array_creation_expression.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -91,7 +59,7 @@ }, "end": { "line": 17, - "column": 15, + "column": 14, "program": "array_creation_expression.ets" } } @@ -106,7 +74,7 @@ }, "end": { "line": 17, - "column": 15, + "column": 14, "program": "array_creation_expression.ets" } } @@ -137,39 +105,7 @@ "optional": false, "computed": false, "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 8, - "program": "array_creation_expression.ets" - }, - "end": { - "line": 18, - "column": 14, - "program": "array_creation_expression.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 8, - "program": "array_creation_expression.ets" - }, - "end": { - "line": 18, - "column": 15, - "program": "array_creation_expression.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -178,7 +114,7 @@ }, "end": { "line": 18, - "column": 15, + "column": 14, "program": "array_creation_expression.ets" } } @@ -193,7 +129,7 @@ }, "end": { "line": 18, - "column": 15, + "column": 14, "program": "array_creation_expression.ets" } } @@ -1442,39 +1378,7 @@ "init": { "type": "ETSNewArrayInstanceExpression", "typeReference": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 33, - "column": 17, - "program": "array_creation_expression.ets" - }, - "end": { - "line": 33, - "column": 23, - "program": "array_creation_expression.ets" - } - } - }, - "loc": { - "start": { - "line": 33, - "column": 17, - "program": "array_creation_expression.ets" - }, - "end": { - "line": 33, - "column": 24, - "program": "array_creation_expression.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 33, @@ -1483,7 +1387,7 @@ }, "end": { "line": 33, - "column": 24, + "column": 23, "program": "array_creation_expression.ets" } } diff --git a/ets2panda/test/parser/ets/await_complex_promise-expected.txt b/ets2panda/test/parser/ets/await_complex_promise-expected.txt index 1b5b00439c..8e20958540 100644 --- a/ets2panda/test/parser/ets/await_complex_promise-expected.txt +++ b/ets2panda/test/parser/ets/await_complex_promise-expected.txt @@ -135,39 +135,7 @@ } }, { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 32, - "column": 30, - "program": "await_complex_promise.ets" - }, - "end": { - "line": 32, - "column": 36, - "program": "await_complex_promise.ets" - } - } - }, - "loc": { - "start": { - "line": 32, - "column": 30, - "program": "await_complex_promise.ets" - }, - "end": { - "line": 32, - "column": 37, - "program": "await_complex_promise.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 32, @@ -176,7 +144,7 @@ }, "end": { "line": 32, - "column": 37, + "column": 36, "program": "await_complex_promise.ets" } } @@ -190,7 +158,7 @@ }, "end": { "line": 32, - "column": 37, + "column": 36, "program": "await_complex_promise.ets" } } @@ -1095,39 +1063,7 @@ } }, { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 42, - "program": "await_complex_promise.ets" - }, - "end": { - "line": 20, - "column": 48, - "program": "await_complex_promise.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 42, - "program": "await_complex_promise.ets" - }, - "end": { - "line": 20, - "column": 49, - "program": "await_complex_promise.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -1136,7 +1072,7 @@ }, "end": { "line": 20, - "column": 49, + "column": 48, "program": "await_complex_promise.ets" } } @@ -1150,7 +1086,7 @@ }, "end": { "line": 20, - "column": 49, + "column": 48, "program": "await_complex_promise.ets" } } @@ -1300,39 +1236,7 @@ } }, { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 24, - "program": "await_complex_promise.ets" - }, - "end": { - "line": 21, - "column": 30, - "program": "await_complex_promise.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 24, - "program": "await_complex_promise.ets" - }, - "end": { - "line": 21, - "column": 32, - "program": "await_complex_promise.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -1341,7 +1245,7 @@ }, "end": { "line": 21, - "column": 32, + "column": 30, "program": "await_complex_promise.ets" } } @@ -1355,7 +1259,7 @@ }, "end": { "line": 21, - "column": 32, + "column": 30, "program": "await_complex_promise.ets" } } @@ -1706,39 +1610,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 50, - "program": "await_complex_promise.ets" - }, - "end": { - "line": 24, - "column": 56, - "program": "await_complex_promise.ets" - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 50, - "program": "await_complex_promise.ets" - }, - "end": { - "line": 24, - "column": 58, - "program": "await_complex_promise.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -1747,7 +1619,7 @@ }, "end": { "line": 24, - "column": 58, + "column": 56, "program": "await_complex_promise.ets" } } @@ -1951,39 +1823,7 @@ } }, { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 25, - "column": 24, - "program": "await_complex_promise.ets" - }, - "end": { - "line": 25, - "column": 30, - "program": "await_complex_promise.ets" - } - } - }, - "loc": { - "start": { - "line": 25, - "column": 24, - "program": "await_complex_promise.ets" - }, - "end": { - "line": 25, - "column": 32, - "program": "await_complex_promise.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 25, @@ -1992,7 +1832,7 @@ }, "end": { "line": 25, - "column": 32, + "column": 30, "program": "await_complex_promise.ets" } } @@ -2006,7 +1846,7 @@ }, "end": { "line": 25, - "column": 32, + "column": 30, "program": "await_complex_promise.ets" } } @@ -2933,39 +2773,7 @@ } }, { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 34, - "column": 24, - "program": "await_complex_promise.ets" - }, - "end": { - "line": 34, - "column": 30, - "program": "await_complex_promise.ets" - } - } - }, - "loc": { - "start": { - "line": 34, - "column": 24, - "program": "await_complex_promise.ets" - }, - "end": { - "line": 34, - "column": 32, - "program": "await_complex_promise.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 34, @@ -2974,7 +2782,7 @@ }, "end": { "line": 34, - "column": 32, + "column": 30, "program": "await_complex_promise.ets" } } @@ -2988,7 +2796,7 @@ }, "end": { "line": 34, - "column": 32, + "column": 30, "program": "await_complex_promise.ets" } } diff --git a/ets2panda/test/parser/ets/genericDefaultParam_1-expected.txt b/ets2panda/test/parser/ets/genericDefaultParam_1-expected.txt index 96a72b4e64..ca0fd4e189 100644 --- a/ets2panda/test/parser/ets/genericDefaultParam_1-expected.txt +++ b/ets2panda/test/parser/ets/genericDefaultParam_1-expected.txt @@ -1283,39 +1283,7 @@ } }, "default": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 30, - "column": 20, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 30, - "column": 26, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 30, - "column": 20, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 30, - "column": 27, - "program": "genericDefaultParam_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 30, @@ -1324,7 +1292,7 @@ }, "end": { "line": 30, - "column": 27, + "column": 26, "program": "genericDefaultParam_1.ets" } } @@ -1792,39 +1760,7 @@ } }, "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 11, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 20, - "column": 17, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 11, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 20, - "column": 18, - "program": "genericDefaultParam_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -1833,7 +1769,7 @@ }, "end": { "line": 20, - "column": 18, + "column": 17, "program": "genericDefaultParam_1.ets" } } @@ -1920,39 +1856,7 @@ } }, "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 19, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 21, - "column": 25, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 19, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 21, - "column": 26, - "program": "genericDefaultParam_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -1961,7 +1865,7 @@ }, "end": { "line": 21, - "column": 26, + "column": 25, "program": "genericDefaultParam_1.ets" } } @@ -1985,39 +1889,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 6, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 21, - "column": 12, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 6, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 21, - "column": 13, - "program": "genericDefaultParam_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -2026,7 +1898,7 @@ }, "end": { "line": 21, - "column": 13, + "column": 12, "program": "genericDefaultParam_1.ets" } } @@ -2250,39 +2122,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 31, - "column": 17, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 31, - "column": 23, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 31, - "column": 17, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 31, - "column": 24, - "program": "genericDefaultParam_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 31, @@ -2291,7 +2131,7 @@ }, "end": { "line": 31, - "column": 24, + "column": 23, "program": "genericDefaultParam_1.ets" } } @@ -2425,39 +2265,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 32, - "column": 17, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 32, - "column": 23, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 32, - "column": 17, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 32, - "column": 24, - "program": "genericDefaultParam_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 32, @@ -2466,7 +2274,7 @@ }, "end": { "line": 32, - "column": 24, + "column": 23, "program": "genericDefaultParam_1.ets" } } @@ -2647,39 +2455,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 33, - "column": 17, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 33, - "column": 23, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 33, - "column": 17, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 33, - "column": 24, - "program": "genericDefaultParam_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 33, @@ -2688,7 +2464,7 @@ }, "end": { "line": 33, - "column": 24, + "column": 23, "program": "genericDefaultParam_1.ets" } } @@ -2741,39 +2517,7 @@ } }, { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 33, - "column": 33, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 33, - "column": 39, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 33, - "column": 33, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 33, - "column": 40, - "program": "genericDefaultParam_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 33, @@ -2782,7 +2526,7 @@ }, "end": { "line": 33, - "column": 40, + "column": 39, "program": "genericDefaultParam_1.ets" } } @@ -3121,39 +2865,7 @@ } }, "default": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 19, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 16, - "column": 25, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 19, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 16, - "column": 26, - "program": "genericDefaultParam_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -3162,7 +2874,7 @@ }, "end": { "line": 16, - "column": 26, + "column": 25, "program": "genericDefaultParam_1.ets" } } @@ -3330,39 +3042,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 31, - "column": 17, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 31, - "column": 23, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 31, - "column": 17, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 31, - "column": 24, - "program": "genericDefaultParam_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 31, @@ -3371,7 +3051,7 @@ }, "end": { "line": 31, - "column": 24, + "column": 23, "program": "genericDefaultParam_1.ets" } } @@ -3497,39 +3177,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 32, - "column": 17, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 32, - "column": 23, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 32, - "column": 17, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 32, - "column": 24, - "program": "genericDefaultParam_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 32, @@ -3538,7 +3186,7 @@ }, "end": { "line": 32, - "column": 24, + "column": 23, "program": "genericDefaultParam_1.ets" } } @@ -3711,39 +3359,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 33, - "column": 17, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 33, - "column": 23, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 33, - "column": 17, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 33, - "column": 24, - "program": "genericDefaultParam_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 33, @@ -3752,7 +3368,7 @@ }, "end": { "line": 33, - "column": 24, + "column": 23, "program": "genericDefaultParam_1.ets" } } @@ -3805,39 +3421,7 @@ } }, { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 33, - "column": 33, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 33, - "column": 39, - "program": "genericDefaultParam_1.ets" - } - } - }, - "loc": { - "start": { - "line": 33, - "column": 33, - "program": "genericDefaultParam_1.ets" - }, - "end": { - "line": 33, - "column": 40, - "program": "genericDefaultParam_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 33, @@ -3846,7 +3430,7 @@ }, "end": { "line": 33, - "column": 40, + "column": 39, "program": "genericDefaultParam_1.ets" } } diff --git a/ets2panda/test/parser/ets/genericDefaultParam_3-expected.txt b/ets2panda/test/parser/ets/genericDefaultParam_3-expected.txt index e5fc0bf4fc..5c667be28b 100644 --- a/ets2panda/test/parser/ets/genericDefaultParam_3-expected.txt +++ b/ets2panda/test/parser/ets/genericDefaultParam_3-expected.txt @@ -502,39 +502,7 @@ } }, "default": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 19, - "program": "genericDefaultParam_3.ets" - }, - "end": { - "line": 16, - "column": 25, - "program": "genericDefaultParam_3.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 19, - "program": "genericDefaultParam_3.ets" - }, - "end": { - "line": 16, - "column": 26, - "program": "genericDefaultParam_3.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -543,7 +511,7 @@ }, "end": { "line": 16, - "column": 26, + "column": 25, "program": "genericDefaultParam_3.ets" } } diff --git a/ets2panda/test/parser/ets/generics_3-expected.txt b/ets2panda/test/parser/ets/generics_3-expected.txt index 49f6186bb1..08e853f958 100644 --- a/ets2panda/test/parser/ets/generics_3-expected.txt +++ b/ets2panda/test/parser/ets/generics_3-expected.txt @@ -755,39 +755,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 36, - "program": "generics_3.ets" - }, - "end": { - "line": 19, - "column": 42, - "program": "generics_3.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 36, - "program": "generics_3.ets" - }, - "end": { - "line": 19, - "column": 43, - "program": "generics_3.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -796,7 +764,7 @@ }, "end": { "line": 19, - "column": 43, + "column": 42, "program": "generics_3.ets" } } @@ -1039,39 +1007,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 11, - "program": "generics_3.ets" - }, - "end": { - "line": 19, - "column": 17, - "program": "generics_3.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 11, - "program": "generics_3.ets" - }, - "end": { - "line": 19, - "column": 18, - "program": "generics_3.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -1080,7 +1016,7 @@ }, "end": { "line": 19, - "column": 18, + "column": 17, "program": "generics_3.ets" } } diff --git a/ets2panda/test/parser/ets/generics_4-expected.txt b/ets2panda/test/parser/ets/generics_4-expected.txt index 130c4a1f94..f2782dadd3 100644 --- a/ets2panda/test/parser/ets/generics_4-expected.txt +++ b/ets2panda/test/parser/ets/generics_4-expected.txt @@ -787,39 +787,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 44, - "program": "generics_4.ets" - }, - "end": { - "line": 19, - "column": 50, - "program": "generics_4.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 44, - "program": "generics_4.ets" - }, - "end": { - "line": 19, - "column": 51, - "program": "generics_4.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -828,7 +796,7 @@ }, "end": { "line": 19, - "column": 51, + "column": 50, "program": "generics_4.ets" } } @@ -1118,39 +1086,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 11, - "program": "generics_4.ets" - }, - "end": { - "line": 19, - "column": 17, - "program": "generics_4.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 11, - "program": "generics_4.ets" - }, - "end": { - "line": 19, - "column": 18, - "program": "generics_4.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -1159,7 +1095,7 @@ }, "end": { "line": 19, - "column": 18, + "column": 17, "program": "generics_4.ets" } } diff --git a/ets2panda/test/parser/ets/generics_5-expected.txt b/ets2panda/test/parser/ets/generics_5-expected.txt index c9ec195c16..ef4028c350 100644 --- a/ets2panda/test/parser/ets/generics_5-expected.txt +++ b/ets2panda/test/parser/ets/generics_5-expected.txt @@ -723,39 +723,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 28, - "program": "generics_5.ets" - }, - "end": { - "line": 19, - "column": 34, - "program": "generics_5.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 28, - "program": "generics_5.ets" - }, - "end": { - "line": 19, - "column": 35, - "program": "generics_5.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -764,7 +732,7 @@ }, "end": { "line": 19, - "column": 35, + "column": 34, "program": "generics_5.ets" } } @@ -960,39 +928,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 19, - "column": 11, - "program": "generics_5.ets" - }, - "end": { - "line": 19, - "column": 17, - "program": "generics_5.ets" - } - } - }, - "loc": { - "start": { - "line": 19, - "column": 11, - "program": "generics_5.ets" - }, - "end": { - "line": 19, - "column": 19, - "program": "generics_5.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -1001,7 +937,7 @@ }, "end": { "line": 19, - "column": 19, + "column": 17, "program": "generics_5.ets" } } diff --git a/ets2panda/test/parser/ets/generics_6-expected.txt b/ets2panda/test/parser/ets/generics_6-expected.txt index 0f2f38d503..06c8106f6a 100644 --- a/ets2panda/test/parser/ets/generics_6-expected.txt +++ b/ets2panda/test/parser/ets/generics_6-expected.txt @@ -959,39 +959,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 42, - "program": "generics_6.ets" - }, - "end": { - "line": 22, - "column": 48, - "program": "generics_6.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 42, - "program": "generics_6.ets" - }, - "end": { - "line": 22, - "column": 49, - "program": "generics_6.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -1000,7 +968,7 @@ }, "end": { "line": 22, - "column": 49, + "column": 48, "program": "generics_6.ets" } } @@ -1030,39 +998,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 55, - "program": "generics_6.ets" - }, - "end": { - "line": 22, - "column": 61, - "program": "generics_6.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 55, - "program": "generics_6.ets" - }, - "end": { - "line": 22, - "column": 63, - "program": "generics_6.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -1071,7 +1007,7 @@ }, "end": { "line": 22, - "column": 63, + "column": 61, "program": "generics_6.ets" } } @@ -1307,39 +1243,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 11, - "program": "generics_6.ets" - }, - "end": { - "line": 22, - "column": 17, - "program": "generics_6.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 11, - "program": "generics_6.ets" - }, - "end": { - "line": 22, - "column": 18, - "program": "generics_6.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -1348,7 +1252,7 @@ }, "end": { "line": 22, - "column": 18, + "column": 17, "program": "generics_6.ets" } } @@ -1378,39 +1282,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 24, - "program": "generics_6.ets" - }, - "end": { - "line": 22, - "column": 30, - "program": "generics_6.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 24, - "program": "generics_6.ets" - }, - "end": { - "line": 22, - "column": 33, - "program": "generics_6.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -1419,7 +1291,7 @@ }, "end": { "line": 22, - "column": 33, + "column": 30, "program": "generics_6.ets" } } diff --git a/ets2panda/test/parser/ets/generics_7-expected.txt b/ets2panda/test/parser/ets/generics_7-expected.txt index 42af81815f..6fedb9254d 100644 --- a/ets2panda/test/parser/ets/generics_7-expected.txt +++ b/ets2panda/test/parser/ets/generics_7-expected.txt @@ -959,39 +959,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 68, - "program": "generics_7.ets" - }, - "end": { - "line": 22, - "column": 74, - "program": "generics_7.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 68, - "program": "generics_7.ets" - }, - "end": { - "line": 22, - "column": 75, - "program": "generics_7.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -1000,7 +968,7 @@ }, "end": { "line": 22, - "column": 75, + "column": 74, "program": "generics_7.ets" } } @@ -1030,39 +998,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 80, - "program": "generics_7.ets" - }, - "end": { - "line": 22, - "column": 86, - "program": "generics_7.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 80, - "program": "generics_7.ets" - }, - "end": { - "line": 22, - "column": 87, - "program": "generics_7.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -1071,7 +1007,7 @@ }, "end": { "line": 22, - "column": 87, + "column": 86, "program": "generics_7.ets" } } @@ -1101,39 +1037,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 92, - "program": "generics_7.ets" - }, - "end": { - "line": 22, - "column": 98, - "program": "generics_7.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 92, - "program": "generics_7.ets" - }, - "end": { - "line": 22, - "column": 99, - "program": "generics_7.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -1142,7 +1046,7 @@ }, "end": { "line": 22, - "column": 99, + "column": 98, "program": "generics_7.ets" } } @@ -1529,39 +1433,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 11, - "program": "generics_7.ets" - }, - "end": { - "line": 22, - "column": 17, - "program": "generics_7.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 11, - "program": "generics_7.ets" - }, - "end": { - "line": 22, - "column": 18, - "program": "generics_7.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -1570,7 +1442,7 @@ }, "end": { "line": 22, - "column": 18, + "column": 17, "program": "generics_7.ets" } } @@ -1600,39 +1472,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 23, - "program": "generics_7.ets" - }, - "end": { - "line": 22, - "column": 29, - "program": "generics_7.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 23, - "program": "generics_7.ets" - }, - "end": { - "line": 22, - "column": 30, - "program": "generics_7.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -1641,7 +1481,7 @@ }, "end": { "line": 22, - "column": 30, + "column": 29, "program": "generics_7.ets" } } @@ -1671,39 +1511,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 35, - "program": "generics_7.ets" - }, - "end": { - "line": 22, - "column": 41, - "program": "generics_7.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 35, - "program": "generics_7.ets" - }, - "end": { - "line": 22, - "column": 42, - "program": "generics_7.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -1712,7 +1520,7 @@ }, "end": { "line": 22, - "column": 42, + "column": 41, "program": "generics_7.ets" } } diff --git a/ets2panda/test/parser/ets/generics_type_param_constraint_11-expected.txt b/ets2panda/test/parser/ets/generics_type_param_constraint_11-expected.txt index f9da1689fb..8214671a49 100644 --- a/ets2panda/test/parser/ets/generics_type_param_constraint_11-expected.txt +++ b/ets2panda/test/parser/ets/generics_type_param_constraint_11-expected.txt @@ -873,39 +873,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 28, - "program": "generics_type_param_constraint_11.ets" - }, - "end": { - "line": 20, - "column": 34, - "program": "generics_type_param_constraint_11.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 28, - "program": "generics_type_param_constraint_11.ets" - }, - "end": { - "line": 20, - "column": 35, - "program": "generics_type_param_constraint_11.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -914,7 +882,7 @@ }, "end": { "line": 20, - "column": 35, + "column": 34, "program": "generics_type_param_constraint_11.ets" } } diff --git a/ets2panda/test/parser/ets/generics_type_param_constraint_12-expected.txt b/ets2panda/test/parser/ets/generics_type_param_constraint_12-expected.txt index de3ba5217b..f6702d39ae 100644 --- a/ets2panda/test/parser/ets/generics_type_param_constraint_12-expected.txt +++ b/ets2panda/test/parser/ets/generics_type_param_constraint_12-expected.txt @@ -1856,39 +1856,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 37, - "column": 25, - "program": "generics_type_param_constraint_12.ets" - }, - "end": { - "line": 37, - "column": 31, - "program": "generics_type_param_constraint_12.ets" - } - } - }, - "loc": { - "start": { - "line": 37, - "column": 25, - "program": "generics_type_param_constraint_12.ets" - }, - "end": { - "line": 37, - "column": 32, - "program": "generics_type_param_constraint_12.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 37, @@ -1897,7 +1865,7 @@ }, "end": { "line": 37, - "column": 32, + "column": 31, "program": "generics_type_param_constraint_12.ets" } } diff --git a/ets2panda/test/parser/ets/getterOverride-expected.txt b/ets2panda/test/parser/ets/getterOverride-expected.txt index f0a3f22378..7239302ccc 100644 --- a/ets2panda/test/parser/ets/getterOverride-expected.txt +++ b/ets2panda/test/parser/ets/getterOverride-expected.txt @@ -56,39 +56,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 18, - "column": 19, - "program": "getterOverride.ets" - }, - "end": { - "line": 18, - "column": 25, - "program": "getterOverride.ets" - } - } - }, - "loc": { - "start": { - "line": 18, - "column": 19, - "program": "getterOverride.ets" - }, - "end": { - "line": 18, - "column": 26, - "program": "getterOverride.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -97,7 +65,7 @@ }, "end": { "line": 18, - "column": 26, + "column": 25, "program": "getterOverride.ets" } } @@ -110,7 +78,7 @@ }, "end": { "line": 18, - "column": 26, + "column": 25, "program": "getterOverride.ets" } } @@ -123,7 +91,7 @@ }, "end": { "line": 18, - "column": 26, + "column": 25, "program": "getterOverride.ets" } } @@ -324,39 +292,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 28, - "program": "getterOverride.ets" - }, - "end": { - "line": 22, - "column": 34, - "program": "getterOverride.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 28, - "program": "getterOverride.ets" - }, - "end": { - "line": 22, - "column": 36, - "program": "getterOverride.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -365,7 +301,7 @@ }, "end": { "line": 22, - "column": 36, + "column": 34, "program": "getterOverride.ets" } } diff --git a/ets2panda/test/parser/ets/globalVarInLambdaInStatic-expected.txt b/ets2panda/test/parser/ets/globalVarInLambdaInStatic-expected.txt index 3d009e987b..cb41af60d6 100644 --- a/ets2panda/test/parser/ets/globalVarInLambdaInStatic-expected.txt +++ b/ets2panda/test/parser/ets/globalVarInLambdaInStatic-expected.txt @@ -79,39 +79,7 @@ "type": "Identifier", "name": "n", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 23, - "program": "globalVarInLambdaInStatic.ets" - }, - "end": { - "line": 22, - "column": 29, - "program": "globalVarInLambdaInStatic.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 23, - "program": "globalVarInLambdaInStatic.ets" - }, - "end": { - "line": 22, - "column": 30, - "program": "globalVarInLambdaInStatic.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -120,7 +88,7 @@ }, "end": { "line": 22, - "column": 30, + "column": 29, "program": "globalVarInLambdaInStatic.ets" } } @@ -134,7 +102,7 @@ }, "end": { "line": 22, - "column": 30, + "column": 29, "program": "globalVarInLambdaInStatic.ets" } } @@ -147,7 +115,7 @@ }, "end": { "line": 22, - "column": 30, + "column": 29, "program": "globalVarInLambdaInStatic.ets" } } @@ -469,39 +437,7 @@ "type": "Identifier", "name": "len", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 31, - "column": 30, - "program": "globalVarInLambdaInStatic.ets" - }, - "end": { - "line": 31, - "column": 36, - "program": "globalVarInLambdaInStatic.ets" - } - } - }, - "loc": { - "start": { - "line": 31, - "column": 30, - "program": "globalVarInLambdaInStatic.ets" - }, - "end": { - "line": 31, - "column": 37, - "program": "globalVarInLambdaInStatic.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 31, @@ -510,7 +446,7 @@ }, "end": { "line": 31, - "column": 37, + "column": 36, "program": "globalVarInLambdaInStatic.ets" } } @@ -524,7 +460,7 @@ }, "end": { "line": 31, - "column": 37, + "column": 36, "program": "globalVarInLambdaInStatic.ets" } } @@ -537,7 +473,7 @@ }, "end": { "line": 31, - "column": 37, + "column": 36, "program": "globalVarInLambdaInStatic.ets" } } @@ -1232,39 +1168,7 @@ "type": "Identifier", "name": "len", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 37, - "program": "globalVarInLambdaInStatic.ets" - }, - "end": { - "line": 16, - "column": 43, - "program": "globalVarInLambdaInStatic.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 37, - "program": "globalVarInLambdaInStatic.ets" - }, - "end": { - "line": 16, - "column": 44, - "program": "globalVarInLambdaInStatic.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -1273,7 +1177,7 @@ }, "end": { "line": 16, - "column": 44, + "column": 43, "program": "globalVarInLambdaInStatic.ets" } } @@ -1287,7 +1191,7 @@ }, "end": { "line": 16, - "column": 44, + "column": 43, "program": "globalVarInLambdaInStatic.ets" } } @@ -1300,7 +1204,7 @@ }, "end": { "line": 16, - "column": 44, + "column": 43, "program": "globalVarInLambdaInStatic.ets" } } @@ -1374,39 +1278,7 @@ "type": "Identifier", "name": "length", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 17, - "program": "globalVarInLambdaInStatic.ets" - }, - "end": { - "line": 17, - "column": 23, - "program": "globalVarInLambdaInStatic.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 17, - "program": "globalVarInLambdaInStatic.ets" - }, - "end": { - "line": 17, - "column": 25, - "program": "globalVarInLambdaInStatic.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -1415,7 +1287,7 @@ }, "end": { "line": 17, - "column": 25, + "column": 23, "program": "globalVarInLambdaInStatic.ets" } } diff --git a/ets2panda/test/parser/ets/import_tests/modules/module1/src/export_file-expected.txt b/ets2panda/test/parser/ets/import_tests/modules/module1/src/export_file-expected.txt index 51dad8f55e..b6a4e878df 100644 --- a/ets2panda/test/parser/ets/import_tests/modules/module1/src/export_file-expected.txt +++ b/ets2panda/test/parser/ets/import_tests/modules/module1/src/export_file-expected.txt @@ -21,39 +21,7 @@ } }, "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 16, - "column": 19, - "program": "export_file.ets" - }, - "end": { - "line": 16, - "column": 25, - "program": "export_file.ets" - } - } - }, - "loc": { - "start": { - "line": 16, - "column": 19, - "program": "export_file.ets" - }, - "end": { - "line": 17, - "column": 1, - "program": "export_file.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -61,8 +29,8 @@ "program": "export_file.ets" }, "end": { - "line": 17, - "column": 1, + "line": 16, + "column": 25, "program": "export_file.ets" } } diff --git a/ets2panda/test/parser/ets/infer_overriding_method_return_type-expected.txt b/ets2panda/test/parser/ets/infer_overriding_method_return_type-expected.txt index ca446caa96..c45a2983e8 100644 --- a/ets2panda/test/parser/ets/infer_overriding_method_return_type-expected.txt +++ b/ets2panda/test/parser/ets/infer_overriding_method_return_type-expected.txt @@ -74,39 +74,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 24, - "program": "infer_overriding_method_return_type.ets" - }, - "end": { - "line": 17, - "column": 30, - "program": "infer_overriding_method_return_type.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 24, - "program": "infer_overriding_method_return_type.ets" - }, - "end": { - "line": 17, - "column": 31, - "program": "infer_overriding_method_return_type.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -115,7 +83,7 @@ }, "end": { "line": 17, - "column": 31, + "column": 30, "program": "infer_overriding_method_return_type.ets" } } diff --git a/ets2panda/test/parser/ets/lambdaAsFunctionParam-expected.txt b/ets2panda/test/parser/ets/lambdaAsFunctionParam-expected.txt index 6911e73854..9b43b528c7 100644 --- a/ets2panda/test/parser/ets/lambdaAsFunctionParam-expected.txt +++ b/ets2panda/test/parser/ets/lambdaAsFunctionParam-expected.txt @@ -290,39 +290,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 27, - "program": "lambdaAsFunctionParam.ets" - }, - "end": { - "line": 17, - "column": 33, - "program": "lambdaAsFunctionParam.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 27, - "program": "lambdaAsFunctionParam.ets" - }, - "end": { - "line": 17, - "column": 34, - "program": "lambdaAsFunctionParam.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -331,7 +299,7 @@ }, "end": { "line": 17, - "column": 34, + "column": 33, "program": "lambdaAsFunctionParam.ets" } } @@ -344,7 +312,7 @@ }, "end": { "line": 17, - "column": 34, + "column": 33, "program": "lambdaAsFunctionParam.ets" } } @@ -358,7 +326,7 @@ }, "end": { "line": 17, - "column": 34, + "column": 33, "program": "lambdaAsFunctionParam.ets" } } @@ -371,7 +339,7 @@ }, "end": { "line": 17, - "column": 34, + "column": 33, "program": "lambdaAsFunctionParam.ets" } } @@ -1009,39 +977,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 19, - "program": "lambdaAsFunctionParam.ets" - }, - "end": { - "line": 23, - "column": 25, - "program": "lambdaAsFunctionParam.ets" - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 19, - "program": "lambdaAsFunctionParam.ets" - }, - "end": { - "line": 23, - "column": 26, - "program": "lambdaAsFunctionParam.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -1050,7 +986,7 @@ }, "end": { "line": 23, - "column": 26, + "column": 25, "program": "lambdaAsFunctionParam.ets" } } @@ -1208,39 +1144,7 @@ "type": "Identifier", "name": "a", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 13, - "program": "lambdaAsFunctionParam.ets" - }, - "end": { - "line": 24, - "column": 19, - "program": "lambdaAsFunctionParam.ets" - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 13, - "program": "lambdaAsFunctionParam.ets" - }, - "end": { - "line": 24, - "column": 20, - "program": "lambdaAsFunctionParam.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -1249,7 +1153,7 @@ }, "end": { "line": 24, - "column": 20, + "column": 19, "program": "lambdaAsFunctionParam.ets" } } @@ -1263,7 +1167,7 @@ }, "end": { "line": 24, - "column": 20, + "column": 19, "program": "lambdaAsFunctionParam.ets" } } @@ -1276,7 +1180,7 @@ }, "end": { "line": 24, - "column": 20, + "column": 19, "program": "lambdaAsFunctionParam.ets" } } @@ -1287,39 +1191,7 @@ "type": "Identifier", "name": "b", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 24, - "program": "lambdaAsFunctionParam.ets" - }, - "end": { - "line": 24, - "column": 30, - "program": "lambdaAsFunctionParam.ets" - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 24, - "program": "lambdaAsFunctionParam.ets" - }, - "end": { - "line": 24, - "column": 31, - "program": "lambdaAsFunctionParam.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -1328,7 +1200,7 @@ }, "end": { "line": 24, - "column": 31, + "column": 30, "program": "lambdaAsFunctionParam.ets" } } @@ -1342,7 +1214,7 @@ }, "end": { "line": 24, - "column": 31, + "column": 30, "program": "lambdaAsFunctionParam.ets" } } @@ -1355,46 +1227,14 @@ }, "end": { "line": 24, - "column": 31, + "column": 30, "program": "lambdaAsFunctionParam.ets" } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 33, - "program": "lambdaAsFunctionParam.ets" - }, - "end": { - "line": 24, - "column": 39, - "program": "lambdaAsFunctionParam.ets" - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 33, - "program": "lambdaAsFunctionParam.ets" - }, - "end": { - "line": 24, - "column": 42, - "program": "lambdaAsFunctionParam.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -1403,7 +1243,7 @@ }, "end": { "line": 24, - "column": 42, + "column": 39, "program": "lambdaAsFunctionParam.ets" } } diff --git a/ets2panda/test/parser/ets/lambda_optional_param_1-expected.txt b/ets2panda/test/parser/ets/lambda_optional_param_1-expected.txt index 0707e523d5..58334b60a5 100644 --- a/ets2panda/test/parser/ets/lambda_optional_param_1-expected.txt +++ b/ets2panda/test/parser/ets/lambda_optional_param_1-expected.txt @@ -148,39 +148,7 @@ "type": "Identifier", "name": "y", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 35, - "program": "lambda_optional_param_1.ets" - }, - "end": { - "line": 17, - "column": 41, - "program": "lambda_optional_param_1.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 35, - "program": "lambda_optional_param_1.ets" - }, - "end": { - "line": 17, - "column": 42, - "program": "lambda_optional_param_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -189,7 +157,7 @@ }, "end": { "line": 17, - "column": 42, + "column": 41, "program": "lambda_optional_param_1.ets" } } @@ -203,7 +171,7 @@ }, "end": { "line": 17, - "column": 42, + "column": 41, "program": "lambda_optional_param_1.ets" } } @@ -216,46 +184,14 @@ }, "end": { "line": 17, - "column": 42, + "column": 41, "program": "lambda_optional_param_1.ets" } } } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 44, - "program": "lambda_optional_param_1.ets" - }, - "end": { - "line": 17, - "column": 50, - "program": "lambda_optional_param_1.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 44, - "program": "lambda_optional_param_1.ets" - }, - "end": { - "line": 17, - "column": 51, - "program": "lambda_optional_param_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -264,7 +200,7 @@ }, "end": { "line": 17, - "column": 51, + "column": 50, "program": "lambda_optional_param_1.ets" } } @@ -277,7 +213,7 @@ }, "end": { "line": 17, - "column": 51, + "column": 50, "program": "lambda_optional_param_1.ets" } } @@ -291,7 +227,7 @@ }, "end": { "line": 17, - "column": 51, + "column": 50, "program": "lambda_optional_param_1.ets" } } @@ -304,7 +240,7 @@ }, "end": { "line": 17, - "column": 51, + "column": 50, "program": "lambda_optional_param_1.ets" } } diff --git a/ets2panda/test/parser/ets/localTypeAlias-expected.txt b/ets2panda/test/parser/ets/localTypeAlias-expected.txt index 5a63a7ed34..d5adebfa15 100644 --- a/ets2panda/test/parser/ets/localTypeAlias-expected.txt +++ b/ets2panda/test/parser/ets/localTypeAlias-expected.txt @@ -1089,39 +1089,7 @@ } }, "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 37, - "column": 24, - "program": "localTypeAlias.ets" - }, - "end": { - "line": 37, - "column": 30, - "program": "localTypeAlias.ets" - } - } - }, - "loc": { - "start": { - "line": 37, - "column": 24, - "program": "localTypeAlias.ets" - }, - "end": { - "line": 37, - "column": 31, - "program": "localTypeAlias.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 37, @@ -1130,7 +1098,7 @@ }, "end": { "line": 37, - "column": 31, + "column": 30, "program": "localTypeAlias.ets" } } @@ -1312,39 +1280,7 @@ } }, "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 42, - "column": 20, - "program": "localTypeAlias.ets" - }, - "end": { - "line": 42, - "column": 26, - "program": "localTypeAlias.ets" - } - } - }, - "loc": { - "start": { - "line": 42, - "column": 20, - "program": "localTypeAlias.ets" - }, - "end": { - "line": 42, - "column": 27, - "program": "localTypeAlias.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 42, @@ -1353,7 +1289,7 @@ }, "end": { "line": 42, - "column": 27, + "column": 26, "program": "localTypeAlias.ets" } } diff --git a/ets2panda/test/parser/ets/tupleAsTypeParam1-expected.txt b/ets2panda/test/parser/ets/tupleAsTypeParam1-expected.txt index 9d0c979f2c..1cef9d1d33 100644 --- a/ets2panda/test/parser/ets/tupleAsTypeParam1-expected.txt +++ b/ets2panda/test/parser/ets/tupleAsTypeParam1-expected.txt @@ -656,39 +656,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 16, - "program": "tupleAsTypeParam1.ets" - }, - "end": { - "line": 21, - "column": 22, - "program": "tupleAsTypeParam1.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 16, - "program": "tupleAsTypeParam1.ets" - }, - "end": { - "line": 21, - "column": 23, - "program": "tupleAsTypeParam1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -697,45 +665,13 @@ }, "end": { "line": 21, - "column": 23, + "column": 22, "program": "tupleAsTypeParam1.ets" } } }, { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 21, - "column": 24, - "program": "tupleAsTypeParam1.ets" - }, - "end": { - "line": 21, - "column": 30, - "program": "tupleAsTypeParam1.ets" - } - } - }, - "loc": { - "start": { - "line": 21, - "column": 24, - "program": "tupleAsTypeParam1.ets" - }, - "end": { - "line": 21, - "column": 31, - "program": "tupleAsTypeParam1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -744,7 +680,7 @@ }, "end": { "line": 21, - "column": 31, + "column": 30, "program": "tupleAsTypeParam1.ets" } } @@ -866,39 +802,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 17, - "program": "tupleAsTypeParam1.ets" - }, - "end": { - "line": 22, - "column": 23, - "program": "tupleAsTypeParam1.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 17, - "program": "tupleAsTypeParam1.ets" - }, - "end": { - "line": 22, - "column": 24, - "program": "tupleAsTypeParam1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -907,45 +811,13 @@ }, "end": { "line": 22, - "column": 24, + "column": 23, "program": "tupleAsTypeParam1.ets" } } }, { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 22, - "column": 25, - "program": "tupleAsTypeParam1.ets" - }, - "end": { - "line": 22, - "column": 31, - "program": "tupleAsTypeParam1.ets" - } - } - }, - "loc": { - "start": { - "line": 22, - "column": 25, - "program": "tupleAsTypeParam1.ets" - }, - "end": { - "line": 22, - "column": 32, - "program": "tupleAsTypeParam1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -954,7 +826,7 @@ }, "end": { "line": 22, - "column": 32, + "column": 31, "program": "tupleAsTypeParam1.ets" } } @@ -1146,39 +1018,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 10, - "program": "tupleAsTypeParam1.ets" - }, - "end": { - "line": 23, - "column": 16, - "program": "tupleAsTypeParam1.ets" - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 10, - "program": "tupleAsTypeParam1.ets" - }, - "end": { - "line": 23, - "column": 17, - "program": "tupleAsTypeParam1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -1187,45 +1027,13 @@ }, "end": { "line": 23, - "column": 17, + "column": 16, "program": "tupleAsTypeParam1.ets" } } }, { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 23, - "column": 18, - "program": "tupleAsTypeParam1.ets" - }, - "end": { - "line": 23, - "column": 24, - "program": "tupleAsTypeParam1.ets" - } - } - }, - "loc": { - "start": { - "line": 23, - "column": 18, - "program": "tupleAsTypeParam1.ets" - }, - "end": { - "line": 23, - "column": 25, - "program": "tupleAsTypeParam1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -1234,7 +1042,7 @@ }, "end": { "line": 23, - "column": 25, + "column": 24, "program": "tupleAsTypeParam1.ets" } } diff --git a/ets2panda/test/parser/ets/tupleAsTypeParam2-expected.txt b/ets2panda/test/parser/ets/tupleAsTypeParam2-expected.txt index 0b6ee5fa97..a840e5de55 100644 --- a/ets2panda/test/parser/ets/tupleAsTypeParam2-expected.txt +++ b/ets2panda/test/parser/ets/tupleAsTypeParam2-expected.txt @@ -792,39 +792,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 16, - "program": "tupleAsTypeParam2.ets" - }, - "end": { - "line": 24, - "column": 22, - "program": "tupleAsTypeParam2.ets" - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 16, - "program": "tupleAsTypeParam2.ets" - }, - "end": { - "line": 24, - "column": 23, - "program": "tupleAsTypeParam2.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -833,45 +801,13 @@ }, "end": { "line": 24, - "column": 23, + "column": 22, "program": "tupleAsTypeParam2.ets" } } }, { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 24, - "column": 24, - "program": "tupleAsTypeParam2.ets" - }, - "end": { - "line": 24, - "column": 30, - "program": "tupleAsTypeParam2.ets" - } - } - }, - "loc": { - "start": { - "line": 24, - "column": 24, - "program": "tupleAsTypeParam2.ets" - }, - "end": { - "line": 24, - "column": 31, - "program": "tupleAsTypeParam2.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -880,7 +816,7 @@ }, "end": { "line": 24, - "column": 31, + "column": 30, "program": "tupleAsTypeParam2.ets" } } @@ -1002,39 +938,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 25, - "column": 17, - "program": "tupleAsTypeParam2.ets" - }, - "end": { - "line": 25, - "column": 23, - "program": "tupleAsTypeParam2.ets" - } - } - }, - "loc": { - "start": { - "line": 25, - "column": 17, - "program": "tupleAsTypeParam2.ets" - }, - "end": { - "line": 25, - "column": 24, - "program": "tupleAsTypeParam2.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 25, @@ -1043,45 +947,13 @@ }, "end": { "line": 25, - "column": 24, + "column": 23, "program": "tupleAsTypeParam2.ets" } } }, { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 25, - "column": 25, - "program": "tupleAsTypeParam2.ets" - }, - "end": { - "line": 25, - "column": 31, - "program": "tupleAsTypeParam2.ets" - } - } - }, - "loc": { - "start": { - "line": 25, - "column": 25, - "program": "tupleAsTypeParam2.ets" - }, - "end": { - "line": 25, - "column": 32, - "program": "tupleAsTypeParam2.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 25, @@ -1090,7 +962,7 @@ }, "end": { "line": 25, - "column": 32, + "column": 31, "program": "tupleAsTypeParam2.ets" } } @@ -1252,39 +1124,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 26, - "column": 20, - "program": "tupleAsTypeParam2.ets" - }, - "end": { - "line": 26, - "column": 26, - "program": "tupleAsTypeParam2.ets" - } - } - }, - "loc": { - "start": { - "line": 26, - "column": 20, - "program": "tupleAsTypeParam2.ets" - }, - "end": { - "line": 26, - "column": 27, - "program": "tupleAsTypeParam2.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 26, @@ -1293,45 +1133,13 @@ }, "end": { "line": 26, - "column": 27, + "column": 26, "program": "tupleAsTypeParam2.ets" } } }, { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 26, - "column": 28, - "program": "tupleAsTypeParam2.ets" - }, - "end": { - "line": 26, - "column": 34, - "program": "tupleAsTypeParam2.ets" - } - } - }, - "loc": { - "start": { - "line": 26, - "column": 28, - "program": "tupleAsTypeParam2.ets" - }, - "end": { - "line": 26, - "column": 35, - "program": "tupleAsTypeParam2.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 26, @@ -1340,7 +1148,7 @@ }, "end": { "line": 26, - "column": 35, + "column": 34, "program": "tupleAsTypeParam2.ets" } } diff --git a/ets2panda/test/parser/ets/tupleIndexWithNumbers-expected.txt b/ets2panda/test/parser/ets/tupleIndexWithNumbers-expected.txt index f8561bc609..670207d21a 100644 --- a/ets2panda/test/parser/ets/tupleIndexWithNumbers-expected.txt +++ b/ets2panda/test/parser/ets/tupleIndexWithNumbers-expected.txt @@ -351,39 +351,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 15, - "program": "tupleIndexWithNumbers.ets" - }, - "end": { - "line": 20, - "column": 21, - "program": "tupleIndexWithNumbers.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 15, - "program": "tupleIndexWithNumbers.ets" - }, - "end": { - "line": 20, - "column": 22, - "program": "tupleIndexWithNumbers.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -392,45 +360,13 @@ }, "end": { "line": 20, - "column": 22, + "column": 21, "program": "tupleIndexWithNumbers.ets" } } }, { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 20, - "column": 23, - "program": "tupleIndexWithNumbers.ets" - }, - "end": { - "line": 20, - "column": 29, - "program": "tupleIndexWithNumbers.ets" - } - } - }, - "loc": { - "start": { - "line": 20, - "column": 23, - "program": "tupleIndexWithNumbers.ets" - }, - "end": { - "line": 20, - "column": 30, - "program": "tupleIndexWithNumbers.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -439,7 +375,7 @@ }, "end": { "line": 20, - "column": 30, + "column": 29, "program": "tupleIndexWithNumbers.ets" } } diff --git a/ets2panda/test/parser/ets/user_defined_22-expected.txt b/ets2panda/test/parser/ets/user_defined_22-expected.txt index 75ff8d5431..6196cf4b5f 100644 --- a/ets2panda/test/parser/ets/user_defined_22-expected.txt +++ b/ets2panda/test/parser/ets/user_defined_22-expected.txt @@ -66,39 +66,7 @@ "optional": false, "computed": false, "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "decorators": [], - "loc": { - "start": { - "line": 17, - "column": 9, - "program": "user_defined_22.ets" - }, - "end": { - "line": 17, - "column": 15, - "program": "user_defined_22.ets" - } - } - }, - "loc": { - "start": { - "line": 17, - "column": 9, - "program": "user_defined_22.ets" - }, - "end": { - "line": 17, - "column": 17, - "program": "user_defined_22.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -107,7 +75,7 @@ }, "end": { "line": 17, - "column": 17, + "column": 15, "program": "user_defined_22.ets" } } diff --git a/ets2panda/test/runtime/ets/TypeInferObject1.ets b/ets2panda/test/runtime/ets/TypeInferObject1.ets index c25166f08a..178a236fc1 100644 --- a/ets2panda/test/runtime/ets/TypeInferObject1.ets +++ b/ets2panda/test/runtime/ets/TypeInferObject1.ets @@ -36,7 +36,7 @@ class B { } function func1(arg: A, arg1: K){ - arktest.assertEQ(typeof arg1, "number") + arktest.assertEQ(typeof arg1, "int") return new A(arg.value2, arg.value1); } @@ -51,21 +51,21 @@ function func3(arg: A){ function main(): void { let a = new A(10, "Test"); arktest.assertEQ(typeof a, "object") - arktest.assertEQ(typeof a.value1, "number") + arktest.assertEQ(typeof a.value1, "int") arktest.assertEQ(typeof a.value2, "string") let funcValue1 = func1(a, 12); arktest.assertEQ(typeof funcValue1.value1, "string") - arktest.assertEQ(typeof funcValue1.value2, "number", `got ${typeof funcValue1.value2}`) + arktest.assertEQ(typeof funcValue1.value2, "int", `got ${typeof funcValue1.value2}`) let b = new B(10, "Test", 40); let funcValue2 = func2(b); arktest.assertEQ(typeof funcValue2.value1, "string") - arktest.assertEQ(typeof funcValue2.value2, "number") - arktest.assertEQ(typeof funcValue2.value3, "number") + arktest.assertEQ(typeof funcValue2.value2, "int") + arktest.assertEQ(typeof funcValue2.value3, "int") let c = new A(10, "Test"); let funcValue3 = func3(c); arktest.assertEQ(typeof funcValue3.value1, "string") - arktest.assertEQ(typeof funcValue3.value2, "number") + arktest.assertEQ(typeof funcValue3.value2, "int") } diff --git a/ets2panda/test/runtime/ets/TypeInferObject2.ets b/ets2panda/test/runtime/ets/TypeInferObject2.ets index afde846f63..d162145e09 100644 --- a/ets2panda/test/runtime/ets/TypeInferObject2.ets +++ b/ets2panda/test/runtime/ets/TypeInferObject2.ets @@ -26,9 +26,9 @@ class A { } function foo>(a: A, b: U, c: K, d: U, e: L) { - arktest.assertEQ(typeof a.a, "number") + arktest.assertEQ(typeof a.a, "int") arktest.assertEQ(typeof a.b, "string") - arktest.assertEQ(typeof a.c, "number") + arktest.assertEQ(typeof a.c, "int") arktest.assertEQ(typeof b, "number") arktest.assertEQ(typeof c, "string") arktest.assertEQ(typeof d, "number") @@ -37,9 +37,9 @@ function foo>(a: A, b: U } function bar(a: A, b : U) { - arktest.assertEQ(typeof a.a, "number") + arktest.assertEQ(typeof a.a, "int") arktest.assertEQ(typeof a.b, "string") - arktest.assertEQ(typeof a.c, "number") + arktest.assertEQ(typeof a.c, "int") arktest.assertEQ(typeof b, "number") return new A(a.a, b, a.b); } @@ -48,11 +48,11 @@ function main() { let a = new A(10, "Test", 40); let b: number = 20; let c = foo(a, b, "Test", 20, a); - arktest.assertEQ(typeof c.a, "number") + arktest.assertEQ(typeof c.a, "int") arktest.assertEQ(typeof c.b, "number") arktest.assertEQ(typeof c.c, "string") let d = bar(a, b); - arktest.assertEQ(typeof d.a, "number") + arktest.assertEQ(typeof d.a, "int") arktest.assertEQ(typeof d.b, "number") arktest.assertEQ(typeof d.c, "string") } diff --git a/ets2panda/test/runtime/ets/TypeInferObject3.ets b/ets2panda/test/runtime/ets/TypeInferObject3.ets index 2bb54ca5bb..49622448db 100644 --- a/ets2panda/test/runtime/ets/TypeInferObject3.ets +++ b/ets2panda/test/runtime/ets/TypeInferObject3.ets @@ -35,7 +35,7 @@ function foo(a: A, String, K>): void { arktest.assertEQ((typeof a.c), "boolean") arktest.assertEQ((typeof a.a.a), "boolean") arktest.assertEQ((typeof a.a.b), "string") - arktest.assertEQ((typeof a.a.c), "number") + arktest.assertEQ((typeof a.a.c), "int") } function main(): void { diff --git a/ets2panda/test/runtime/ets/Typeof.ets b/ets2panda/test/runtime/ets/Typeof.ets index aa64c3aae3..3e399d5ca9 100644 --- a/ets2panda/test/runtime/ets/Typeof.ets +++ b/ets2panda/test/runtime/ets/Typeof.ets @@ -50,12 +50,12 @@ function main() { let x07: double let x08: bigint = 123456789n arktest.assertEQ(typeof x00, "boolean") - arktest.assertEQ(typeof x01, "number") - arktest.assertEQ(typeof x02, "number") - arktest.assertEQ(typeof x03, "number") - arktest.assertEQ(typeof x04, "number") - arktest.assertEQ(typeof x05, "number") - arktest.assertEQ(typeof x06, "number") + arktest.assertEQ(typeof x01, "byte") + arktest.assertEQ(typeof x02, "char") + arktest.assertEQ(typeof x03, "short") + arktest.assertEQ(typeof x04, "int") + arktest.assertEQ(typeof x05, "long") + arktest.assertEQ(typeof x06, "float") arktest.assertEQ(typeof x07, "number") arktest.assertEQ(typeof x08, "bigint") @@ -69,12 +69,12 @@ function main() { let x007: Double = new Double() let x008: BigInt = new BigInt() arktest.assertEQ(typeof x000, "boolean") - arktest.assertEQ(typeof x001, "number") - arktest.assertEQ(typeof x002, "number") - arktest.assertEQ(typeof x003, "number") - arktest.assertEQ(typeof x004, "number") - arktest.assertEQ(typeof x005, "number") - arktest.assertEQ(typeof x006, "number") + arktest.assertEQ(typeof x001, "byte") + arktest.assertEQ(typeof x002, "char") + arktest.assertEQ(typeof x003, "short") + arktest.assertEQ(typeof x004, "int") + arktest.assertEQ(typeof x005, "long") + arktest.assertEQ(typeof x006, "float") arktest.assertEQ(typeof x007, "number") arktest.assertEQ(typeof x008, "bigint") @@ -88,12 +88,12 @@ function main() { let x7 = new Double() let x8 = new BigInt() arktest.assertEQ(typeof x0, "boolean") - arktest.assertEQ(typeof x1, "number") - arktest.assertEQ(typeof x2, "number") - arktest.assertEQ(typeof x3, "number") - arktest.assertEQ(typeof x4, "number") - arktest.assertEQ(typeof x5, "number") - arktest.assertEQ(typeof x6, "number") + arktest.assertEQ(typeof x1, "byte") + arktest.assertEQ(typeof x2, "char") + arktest.assertEQ(typeof x3, "short") + arktest.assertEQ(typeof x4, "int") + arktest.assertEQ(typeof x5, "long") + arktest.assertEQ(typeof x6, "float") arktest.assertEQ(typeof x7, "number") arktest.assertEQ(typeof x8, "bigint") @@ -144,12 +144,12 @@ function main() { // exprs with numbers (objects) arktest.assertEQ(typeof new Boolean(), "boolean") - arktest.assertEQ(typeof new Byte(), "number") - arktest.assertEQ(typeof new Char(), "number") - arktest.assertEQ(typeof new Short(), "number") - arktest.assertEQ(typeof new Int(), "number") - arktest.assertEQ(typeof new Long(), "number") - arktest.assertEQ(typeof new Float(), "number") + arktest.assertEQ(typeof new Byte(), "byte") + arktest.assertEQ(typeof new Char(), "char") + arktest.assertEQ(typeof new Short(), "short") + arktest.assertEQ(typeof new Int(), "int") + arktest.assertEQ(typeof new Long(), "long") + arktest.assertEQ(typeof new Float(), "float") arktest.assertEQ(typeof new Number(), "number") arktest.assertEQ(typeof new BigInt(), "bigint") @@ -175,7 +175,7 @@ function main() { arktest.assertEQ(typeof ("123" + "124"), "string") x004 = 9 x4 = 6 - arktest.assertEQ(typeof (x4 + x004), "number") + arktest.assertEQ(typeof (x4 + x004), "int") x8 = 1n x08 = new BigInt(10) arktest.assertEQ(typeof (x8 + x08), "bigint") diff --git a/ets2panda/test/unit/lsp/class_hierarchy_info_test.cpp b/ets2panda/test/unit/lsp/class_hierarchy_info_test.cpp index 231e38ae56..2802d072e7 100644 --- a/ets2panda/test/unit/lsp/class_hierarchy_info_test.cpp +++ b/ets2panda/test/unit/lsp/class_hierarchy_info_test.cpp @@ -62,7 +62,7 @@ private privateMethod(): void { ASSERT_TRUE(it->second != nullptr); ASSERT_EQ(it->second->GetSetterStyle(), ark::es2panda::lsp::SetterStyle::NONE); ASSERT_EQ(it->second->GetAccessModifierStyle(), ark::es2panda::lsp::AccessModifierStyle::PUBLIC); - it = methods.find("action(fileName: string, position: number): number"); + it = methods.find("action(fileName: string, position: double): double"); ASSERT_TRUE(it != methods.end()); ASSERT_TRUE(it->second != nullptr); ASSERT_EQ(it->second->GetSetterStyle(), ark::es2panda::lsp::SetterStyle::NONE); @@ -233,9 +233,9 @@ class A extends B {/*1*/};)"; auto classCItems = classHierarchy[1].GetMethodItemList(); ASSERT_TRUE(classCItems.find("func1(): void") != classCItems.end()); ASSERT_TRUE(classCItems.find("func2(): string") != classCItems.end()); - ASSERT_TRUE(classCItems.find("func3(): number") != classCItems.end()); + ASSERT_TRUE(classCItems.find("func3(): double") != classCItems.end()); ASSERT_TRUE(classCItems.find("func4(): boolean") != classCItems.end()); - ASSERT_TRUE(classCItems.find("func5(): Array") != classCItems.end()); + ASSERT_TRUE(classCItems.find("func5(): Array") != classCItems.end()); initializer.DestroyContext(context); } @@ -267,8 +267,8 @@ class A extends B {/*1*/};)"; ASSERT_FALSE(classHierarchy.empty()); ASSERT_EQ(classHierarchy[0].GetClassName(), "B"); auto classBItems = classHierarchy[0].GetMethodItemList(); - ASSERT_TRUE(classBItems.find("method1(parameter1: number): parameter") != classBItems.end()); - ASSERT_TRUE(classBItems.find("method2(parameter1: number): number") != classBItems.end()); + ASSERT_TRUE(classBItems.find("method1(parameter1: double): parameter") != classBItems.end()); + ASSERT_TRUE(classBItems.find("method2(parameter1: double): double") != classBItems.end()); ASSERT_TRUE(classBItems.find("method3(parameter1: string): Promise") != classBItems.end()); initializer.DestroyContext(context); } @@ -356,11 +356,11 @@ class GrandSon extends Son {/*1*/ auto sonItems = classHierarchy[0].GetPropertyItemList(); size_t expectPropertyListSize = 2; ASSERT_EQ(sonItems.size(), expectPropertyListSize); - ASSERT_TRUE(sonItems.find("property1: number") != sonItems.end()); - ASSERT_TRUE(sonItems.find("ChildExtraProperty2: number") != sonItems.end()); + ASSERT_TRUE(sonItems.find("property1: double") != sonItems.end()); + ASSERT_TRUE(sonItems.find("ChildExtraProperty2: double") != sonItems.end()); auto parentItems = classHierarchy[1].GetPropertyItemList(); ASSERT_EQ(parentItems.size(), 1); - ASSERT_TRUE(parentItems.find("property4: number") != parentItems.end()); + ASSERT_TRUE(parentItems.find("property4: double") != parentItems.end()); initializer.DestroyContext(context); } } // namespace diff --git a/ets2panda/test/unit/lsp/fix_class_doesnt_implement_inherited_abstract_member_test.cpp b/ets2panda/test/unit/lsp/fix_class_doesnt_implement_inherited_abstract_member_test.cpp index be40871cb8..b2027ef3fa 100644 --- a/ets2panda/test/unit/lsp/fix_class_doesnt_implement_inherited_abstract_member_test.cpp +++ b/ets2panda/test/unit/lsp/fix_class_doesnt_implement_inherited_abstract_member_test.cpp @@ -92,7 +92,7 @@ class B extends A { const size_t start = 109; ark::es2panda::lsp::FixClassNotImplementingInheritedMembers handle; auto result = handle.MakeTextChange(ctx, start); - std::string expectedNewText = " foo1(a: number, b: number) {}\n"; + std::string expectedNewText = " foo1(a: double, b: double) {}\n"; const size_t expectedStart = 122; const size_t expectedLength = 0; ASSERT_EQ(result.newText, expectedNewText); @@ -117,7 +117,7 @@ class C extends A { const size_t start = 109; const size_t length = 20; auto result = MockGetCodeActions(ctx, {start, length}); - std::string expectedNewText = " foo(a: number, b: number): number {}\n foo1(a: number, b: number) {}\n"; + std::string expectedNewText = " foo(a: double, b: double): double {}\n foo1(a: double, b: double) {}\n"; std::string expectedFileName = "LspFixAbstractMemberTests_002.ets"; const size_t expectedStart = 122; const size_t expectedLength = 0; @@ -142,7 +142,7 @@ class B extends A { class C extends A { })"); auto result = MockGetAllCodeActions(ctx); - std::string expectedNewText = " foo(a: number, b: number): number {}\n foo1(a: number, b: number) {}\n"; + std::string expectedNewText = " foo(a: double, b: double): double {}\n foo1(a: double, b: double) {}\n"; std::string expectedFileName = "LspFixAbstractMemberTests_003.ets"; const size_t expectedStart = 122; const size_t expectedStart2 = 145; diff --git a/ets2panda/test/unit/lsp/get_class_property_info_test.cpp b/ets2panda/test/unit/lsp/get_class_property_info_test.cpp index 039281bfc6..f5f72ab798 100644 --- a/ets2panda/test/unit/lsp/get_class_property_info_test.cpp +++ b/ets2panda/test/unit/lsp/get_class_property_info_test.cpp @@ -632,7 +632,7 @@ TEST_F(LspGetClassPropertyInfoTests, GetClassPropertyInfoMethod5) } std::vector>> expectedResult6 = { - {"jkk", 195, 207, "classField", {"public"}}, {"wwa", 210, 222, "classField", {"public"}}}; + {"jkk", 195, 207, "classField", {"public"}}, {"wwa", 210, 221, "classField", {"public"}}}; TEST_F(LspGetClassPropertyInfoTests, GetClassPropertyInfoMethod6) { @@ -780,7 +780,7 @@ TEST_F(LspGetClassPropertyInfoTests, GetClassPropertyInfoMethod9) } std::vector>> expectedResult10 = { - {"a", 17, 34, "classField", {"public"}}}; + {"a", 17, 33, "classField", {"public"}}}; TEST_F(LspGetClassPropertyInfoTests, GetClassPropertyInfoMethod10) { @@ -817,7 +817,7 @@ TEST_F(LspGetClassPropertyInfoTests, GetClassPropertyInfoMethod10) } std::vector>> expectedResult11 = { - {"a", 32, 49, "classField", {"public"}}}; + {"a", 32, 48, "classField", {"public"}}}; TEST_F(LspGetClassPropertyInfoTests, GetClassPropertyInfoMethod11) { @@ -893,7 +893,7 @@ TEST_F(LspGetClassPropertyInfoTests, GetClassPropertyInfoMethod12) } std::vector>> expectedResult13 = { - {"aa", 216, 227, "classField", {"public"}}}; + {"aa", 216, 226, "classField", {"public"}}}; TEST_F(LspGetClassPropertyInfoTests, GetClassPropertyInfoMethod13) { diff --git a/ets2panda/test/unit/lsp/get_completions_entry_details.cpp b/ets2panda/test/unit/lsp/get_completions_entry_details.cpp index 8f565a60e6..bb19001e5f 100644 --- a/ets2panda/test/unit/lsp/get_completions_entry_details.cpp +++ b/ets2panda/test/unit/lsp/get_completions_entry_details.cpp @@ -238,11 +238,11 @@ TEST_F(LSPCompletionsEntryDetailsTests, GetCompletionEntryDetails5) expected.emplace_back("value", "functionParameter"); expected.emplace_back(":", "punctuation"); expected.emplace_back(" ", "space"); - expected.emplace_back("string | number | boolean", "typeParameter"); + expected.emplace_back("string | double | boolean", "typeParameter"); expected.emplace_back(")", "punctuation"); expected.emplace_back(":", "punctuation"); expected.emplace_back(" ", "space"); - expected.emplace_back("number", "returnType"); + expected.emplace_back("double", "returnType"); auto expectedCompletionEntryDetails = CompletionEntryDetails(entryName, kind, kindModifiers, expected, document, source, sourceDisplay, expectedFileName); @@ -272,7 +272,7 @@ TEST_F(LSPCompletionsEntryDetailsTests, GetCompletionEntryDetails6) expected.emplace_back("mqw1", "property"); expected.emplace_back(":", "punctuation"); expected.emplace_back(" ", "space"); - expected.emplace_back("[string, number, number]", "typeName"); + expected.emplace_back("[string, double, double]", "typeName"); auto expectedCompletionEntryDetails = CompletionEntryDetails(entryName, kind, kindModifiers, expected, document, source, sourceDisplay, expectedFileName); initializer.DestroyContext(ctx); @@ -358,7 +358,7 @@ TEST_F(LSPCompletionsEntryDetailsTests, CreateDisplayForUnionTypeAlias) expected.emplace_back(" ", "space"); expected.emplace_back("=", "operator"); expected.emplace_back(" ", "space"); - expected.emplace_back("string | number", "typeName"); + expected.emplace_back("string | double", "typeName"); ASSERT_EQ(expected, display); initializer.DestroyContext(ctx); } diff --git a/ets2panda/test/unit/lsp/inlay_hints_test.cpp b/ets2panda/test/unit/lsp/inlay_hints_test.cpp index dbea5dad24..058aa4f6a3 100644 --- a/ets2panda/test/unit/lsp/inlay_hints_test.cpp +++ b/ets2panda/test/unit/lsp/inlay_hints_test.cpp @@ -160,12 +160,12 @@ TEST_F(LSPInlayHintsTests, VisitFunctionLikeForParameterTypeTest) let message = greet("Alice", 30); )"}; const std::string voidString = "void"; - const std::string numberString = "number"; + const std::string numberString = "double"; const std::string stdString = "string"; - const size_t index1 = 32; - const size_t index2 = 43; + const size_t index1 = 31; + const size_t index2 = 42; const size_t index3 = 127; - const size_t index4 = 140; + const size_t index4 = 139; const size_t i0 = 0; const size_t i1 = 1; const size_t i2 = 2; diff --git a/ets2panda/test/unit/lsp/quick_info_api_test.cpp b/ets2panda/test/unit/lsp/quick_info_api_test.cpp index 2a71e8248f..e6332b8511 100644 --- a/ets2panda/test/unit/lsp/quick_info_api_test.cpp +++ b/ets2panda/test/unit/lsp/quick_info_api_test.cpp @@ -357,7 +357,7 @@ QuickInfo ExpectResultImport1() expected.emplace_back("a", "functionParameter"); expected.emplace_back(":", "punctuation"); expected.emplace_back(" ", "space"); - expected.emplace_back("number", "typeParameter"); + expected.emplace_back("double", "typeParameter"); expected.emplace_back(")", "punctuation"); expected.emplace_back(":", "punctuation"); expected.emplace_back(" ", "space"); diff --git a/ets2panda/test/unit/lsp/quick_info_test_1.cpp b/ets2panda/test/unit/lsp/quick_info_test_1.cpp index 5312b176b5..081752d17c 100644 --- a/ets2panda/test/unit/lsp/quick_info_test_1.cpp +++ b/ets2panda/test/unit/lsp/quick_info_test_1.cpp @@ -173,7 +173,7 @@ TEST_F(LspQuickInfoTests, CreateDisplayForUnionTypeAlias) expected.emplace_back(" ", "space"); expected.emplace_back("=", "operator"); expected.emplace_back(" ", "space"); - expected.emplace_back("string | number", "typeName"); + expected.emplace_back("string | double", "typeName"); ASSERT_EQ(expected, display); initializer.DestroyContext(ctx); } @@ -308,7 +308,7 @@ TEST_F(LspQuickInfoTests, CreateDisplayForMethodDefinition) expected.emplace_back("a", "functionParameter"); expected.emplace_back(":", "punctuation"); expected.emplace_back(" ", "space"); - expected.emplace_back("number", "typeParameter"); + expected.emplace_back("double", "typeParameter"); expected.emplace_back(")", "punctuation"); expected.emplace_back(":", "punctuation"); expected.emplace_back(" ", "space"); @@ -404,7 +404,7 @@ TEST_F(LspQuickInfoTests, CreateDisplayForClassProperty2) expected.emplace_back("myProp", "property"); expected.emplace_back(":", "punctuation"); expected.emplace_back(" ", "space"); - expected.emplace_back("number", "typeName"); + expected.emplace_back("double", "typeName"); ASSERT_EQ(expected, display); initializer.DestroyContext(ctx); diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_create_ets_new_expression.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_create_ets_new_expression.cpp index c1d8d9290a..d8c9098f18 100644 --- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_create_ets_new_expression.cpp +++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_create_ets_new_expression.cpp @@ -142,7 +142,7 @@ void FindE(es2panda_AstNode *ast, es2panda_AstNode *declarator, char *name) } g_impl->AstNodeSetParent(g_ctx, typeReference, expression); auto str = g_impl->AstNodeDumpEtsSrcConst(g_ctx, declarator); - if (strcmp(str, "e = new number[5][5]") == 0) { + if (strcmp(str, "e = new double[5][5]") == 0) { g_count--; } } @@ -162,7 +162,7 @@ void FindF(es2panda_AstNode *ast, es2panda_AstNode *declarator, char *name) } g_impl->AstNodeSetParent(g_ctx, typeReference, expression); auto str = g_impl->AstNodeDumpEtsSrcConst(g_ctx, declarator); - if (strcmp(str, "f = new number[5][5]") == 0) { + if (strcmp(str, "f = new double[5][5]") == 0) { g_count--; } } diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_is_accessor-expected.txt b/ets2panda/test/unit/plugin/plugin_proceed_to_state_is_accessor-expected.txt index 5f87b4030e..6ceeee85ee 100644 --- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_is_accessor-expected.txt +++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_is_accessor-expected.txt @@ -1,7 +1,7 @@ LOAD SUCCESS PROCEED TO PARSE SUCCESS SETTER: -public set member(value: number) { +public set member(value: double) { this.m = value; } diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_misc_expression-expected.txt b/ets2panda/test/unit/plugin/plugin_proceed_to_state_misc_expression-expected.txt index 63eef7873c..a03c05490e 100644 --- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_misc_expression-expected.txt +++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_misc_expression-expected.txt @@ -2,7 +2,7 @@ LOAD SUCCESS PROCEED TO PARSE SUCCESS PROGRAM NODE: -function add(a: number, b: number) { +function add(a: double, b: double) { return ((a) + (b)); } -- Gitee