diff --git a/ets2panda/checker/ETSAnalyzer.cpp b/ets2panda/checker/ETSAnalyzer.cpp index c6d3ae4fb587d2a93cb19c9299a6e3db89c8ecc7..2610ad81cc84a8cb312905a8ece6b9faee6a1228 100644 --- a/ets2panda/checker/ETSAnalyzer.cpp +++ b/ets2panda/checker/ETSAnalyzer.cpp @@ -2658,11 +2658,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/ir/ets/etsPrimitiveType.h b/ets2panda/ir/ets/etsPrimitiveType.h index e26ae82974b0d964dccf4b8f9fd30ae9e4f50c38..11419a47e39ccea1e99447e59d8b61a0ea35bf83 100644 --- a/ets2panda/ir/ets/etsPrimitiveType.h +++ b/ets2panda/ir/ets/etsPrimitiveType.h @@ -53,6 +53,32 @@ public: [[nodiscard]] ETSPrimitiveType *Clone(ArenaAllocator *allocator, AstNode *parent) override; + std::string PrimitiveTypeToString() const + { + 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: + ES2PANDA_UNREACHABLE(); + } + } + protected: ETSPrimitiveType *Construct(ArenaAllocator *allocator) override { diff --git a/ets2panda/lsp/src/inlay_hints.cpp b/ets2panda/lsp/src/inlay_hints.cpp index 4aecc7a552c694a4bf1ea0453506da112d0da80c..ac92d86dac64d3eb720b015ef12da24d6da3950c 100644 --- a/ets2panda/lsp/src/inlay_hints.cpp +++ b/ets2panda/lsp/src/inlay_hints.cpp @@ -299,6 +299,13 @@ 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(childNode->AsETSPrimitiveType()->PrimitiveTypeToString(), param->End().index, result); + } +} + void GetFunctionParameterTypeForHints(const ir::AstNode *node, InlayHintList *result) { const auto nodeParams = node->AsMethodDefinition()->Function()->Params(); @@ -309,6 +316,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 9b4c6bdf5651fb7b8ddc66d3d9345b0ef3878334..71bc3a5780b3da7ddb1e52daa100aae851908df3 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 = returnType->AsETSPrimitiveType()->PrimitiveTypeToString(); + displayParts.emplace_back(CreateReturnType(typeName)); + } return displayParts; } diff --git a/ets2panda/lsp/src/register_code_fix/fix_add_function_return_statement.cpp b/ets2panda/lsp/src/register_code_fix/fix_add_function_return_statement.cpp index 51beebf135f06381ca8df9a5ad6711611bc1bba1..aa629900cb825b2d191558188db963adc2735066 100644 --- a/ets2panda/lsp/src/register_code_fix/fix_add_function_return_statement.cpp +++ b/ets2panda/lsp/src/register_code_fix/fix_add_function_return_statement.cpp @@ -75,7 +75,7 @@ Info GetInfo(es2panda_Context *context, size_t position) return Info(nullptr, nullptr, {}); } const auto returnTypeNode = declaration->AsFunctionExpression()->Function()->ReturnTypeAnnotation(); - if (returnTypeNode == nullptr || !returnTypeNode->IsETSTypeReference()) { + if (returnTypeNode == nullptr || !(returnTypeNode->IsETSTypeReference() || returnTypeNode->IsETSPrimitiveType())) { return Info(nullptr, nullptr, {}); } if (!declaration->AsFunctionExpression()->Function()->Body()->IsBlockStatement()) { diff --git a/ets2panda/parser/ETSparser.cpp b/ets2panda/parser/ETSparser.cpp index 19e4c45f9e9afc5964b62a0b2aff493a0ca02129..f5f58471f5271c94b95a4d6657216a1b19432b52 100644 --- a/ets2panda/parser/ETSparser.cpp +++ b/ets2panda/parser/ETSparser.cpp @@ -1439,6 +1439,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 2dbfa97bb65708681b09e5271489d70c5b62779a..49d286c9d1e0ce28d2333a97d32fafbef06bc261 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 86cf1c35907347104d3aa79dbcd03f23c507edde..931391a4f828c51674c115437be91f4cd76600f9 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 f7106d19ffa27a6cc09c2c9b85b34666c0c7e000..9d18cdb6c88849a0a7f6ddd19080608b5e14884d 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": 42, - "program": "ambient_declaration.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, diff --git a/ets2panda/test/compiler/ets/extended_conditional_expression_not-expected.txt b/ets2panda/test/compiler/ets/extended_conditional_expression_not-expected.txt index c75e1bfea3dd1fd58f7a7acc5b58dc581c5fcce2..8415fb308664fe7c2dde16791abd685fbe291033 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": 21, - "program": "extended_conditional_expression_not.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, diff --git a/ets2panda/test/compiler/ets/functions_with_ambiguous_rest_parameter-expected.txt b/ets2panda/test/compiler/ets/functions_with_ambiguous_rest_parameter-expected.txt index 062eb8492bb45228d472c070137916f911d406a3..48b7fc3c3c43af8da92f0c976016ba61fe23fb90 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 e052767fdef99921285232b7ec7dedfe30833ab6..a892f5a3a618e85fc6c869f0961decd0a0843326 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": 23, - "program": "generic_class_getter_setter.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -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": 24, - "program": "generic_class_getter_setter.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -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": 21, - "program": "generic_class_getter_setter.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, diff --git a/ets2panda/test/compiler/ets/implicit_package_import/package_test_1/package_module_1-expected.txt b/ets2panda/test/compiler/ets/implicit_package_import/package_test_1/package_module_1-expected.txt index fe9fcbe7649c15d678e598e42bea303e5ca74d3d..50183d9c1746368fc8c25e242956884f697740a7 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": 19, - "program": "package_module_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -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": 19, - "program": "package_module_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -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": 18, - "program": "package_module_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -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": 18, - "program": "package_module_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 25, @@ -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": 18, - "program": "package_module_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 26, @@ -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": 18, - "program": "package_module_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 27, @@ -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": 18, - "program": "package_module_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 28, @@ -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 d15a9fd865c3a8a8b2906c8415d5576c258f5514..3a1bc8e92f5a822c1a91defbda6be9f00b7493df 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": 19, - "program": "package_module_2.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -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": 23, - "program": "package_module_2.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -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": 26, - "program": "package_module_2.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -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 63ecb4ba5647644d986d805cff59dd9ba1f3f928..e802d1dcb2084f7c07e07aece5464e5d84918e3d 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": 30, - "program": "separate_module_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, diff --git a/ets2panda/test/compiler/ets/implicit_package_import/package_test_2/subpackage_1/package_module_1-expected.txt b/ets2panda/test/compiler/ets/implicit_package_import/package_test_2/subpackage_1/package_module_1-expected.txt index 054fe4733be5c29a7169ade4bf924652ae797d4d..c04ed274305086fc239f7d041ec547b512fc2fa4 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": 18, - "program": "package_module_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -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": 18, - "program": "package_module_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -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 21cb115e1c9e965637632dae44bc6b55f02ba218..eeb60206f5b78f9a3480e48512a7157ee2bd21fb 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": 21, - "program": "package_module_2.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -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": 22, - "program": "package_module_2.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -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 19601ac067ea14cc30cde5f721af0ab0a05ff46a..71fb9cc5121a724736bff6c3bcf1f4e675eaf890 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": 25, - "program": "separate_module_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, diff --git a/ets2panda/test/compiler/ets/import_tests/generic_typealias_func_type-expected.txt b/ets2panda/test/compiler/ets/import_tests/generic_typealias_func_type-expected.txt index 777a955287d4094a12e3aca13fb6433d21bd18d5..9e436a9a1d12b330b135c73b3a6fe616b7d21e45 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": 20, - "program": "generic_typealias_func_type.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, diff --git a/ets2panda/test/compiler/ets/import_tests/generic_typealias_func_type_lib-expected.txt b/ets2panda/test/compiler/ets/import_tests/generic_typealias_func_type_lib-expected.txt index d701d4946ba15f17a39fa8bfbd318bd682f1eb00..c6752c3ead1dde53062da5514e2d1832d7627cd3 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": 41, - "program": "generic_typealias_func_type_lib.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, diff --git a/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_array-expected.txt b/ets2panda/test/compiler/ets/lambda_infer_type/lambda_infer_type_return_array-expected.txt index 962b451faba6d0c8a54559be31df771fce546c9d..651adbc60679369c1a1a10711e01c69a65d3817d 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 1b860e11cafe97d999d2bb8937371a66c35806ef..e48656a32666258a3eeb0b6df8d2fd76a3ca77be 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 38ba719834b50c4fd351903397b6d5b3a977226f..b22bea78fc74953975927a0041bfa18b5f38eacb 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": 33, - "program": "nullableTuple.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, diff --git a/ets2panda/test/compiler/ets/requiredType_11-expected.txt b/ets2panda/test/compiler/ets/requiredType_11-expected.txt index 2b29e7ecd961b74d38ecd9471f598df3556f9caa..6d13c4f5e4cb2dc7c57f9fe45e9f25b796b98880 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": 18, - "program": "requiredType_11.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, diff --git a/ets2panda/test/compiler/ets/requiredType_9-expected.txt b/ets2panda/test/compiler/ets/requiredType_9-expected.txt index 6acb9904d878fed216f0fd99615f2106ffd815a7..12d2b270726944a5481646d264db60f1437f6d68 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": 18, - "program": "requiredType_9.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, diff --git a/ets2panda/test/compiler/ets/tuple_types_1-expected.txt b/ets2panda/test/compiler/ets/tuple_types_1-expected.txt index 78dbf2657cee84a80fd4ed0b68fe7f6eedc49b31..1e66593d2f98b30b1bb5531c5d329b16321c6449 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": 32, - "program": "tuple_types_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -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": 23, - "program": "tuple_types_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 39, @@ -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": 23, - "program": "tuple_types_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 40, @@ -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": 23, - "program": "tuple_types_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 41, @@ -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": 48, - "program": "tuple_types_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 41, @@ -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 561479485e32636239df13462524ef6f00dddda2..7808497974de8384b7849740169e64190a9c7d40 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": 29, - "program": "tuple_types_12.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, diff --git a/ets2panda/test/compiler/ets/tuple_types_13-expected.txt b/ets2panda/test/compiler/ets/tuple_types_13-expected.txt index bc526212dd30535e088c26f6ca5270015842672c..fbfb4ccfee4a0c2a02946b6f75c4f8e0dfc32f78 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": 27, - "program": "tuple_types_13.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, diff --git a/ets2panda/test/compiler/ets/tuple_types_15-expected.txt b/ets2panda/test/compiler/ets/tuple_types_15-expected.txt index f09d55ff9ae996674978b9d806407902beeefa9e..b45ca8c17d2534dca42fc2315aa5a80870c30b5b 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": 27, - "program": "tuple_types_15.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -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": 36, - "program": "tuple_types_15.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -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": 21, - "program": "tuple_types_15.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -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": 30, - "program": "tuple_types_15.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -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": 55, - "program": "tuple_types_15.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -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": 23, - "program": "tuple_types_15.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 37, diff --git a/ets2panda/test/compiler/ets/tuple_types_19-expected.txt b/ets2panda/test/compiler/ets/tuple_types_19-expected.txt index 2ab7264905b26d318ba720d9160efd512e6b2eaf..884e97795adccc0f681f1bd7beea87794e427fe6 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": 33, - "program": "tuple_types_19.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 30, @@ -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": 61, - "program": "tuple_types_19.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 30, diff --git a/ets2panda/test/compiler/ets/tuple_types_7-expected.txt b/ets2panda/test/compiler/ets/tuple_types_7-expected.txt index 8edfc5520f7d77ecbe4648e25bb43698af7e7a38..527de67e4aa7d0731daa1b473dd3d0ca070c9fab 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": 19, - "program": "tuple_types_7.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -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": 19, - "program": "tuple_types_7.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, diff --git a/ets2panda/test/parser/ets/InferTypeParamFromParam1-expected.txt b/ets2panda/test/parser/ets/InferTypeParamFromParam1-expected.txt index d3595fb50d3fda397adedbac878d86f84ffd0e06..4ff9a35c1fbfb1ffedd1e9d5ea85afcb69dc33a2 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": 48, - "program": "InferTypeParamFromParam1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 25, diff --git a/ets2panda/test/parser/ets/StaticFieldAndMethodSameName-expected.txt b/ets2panda/test/parser/ets/StaticFieldAndMethodSameName-expected.txt index bf69b66fa948d6860445f590ad2eee8c7aa051ad..2f587868e47c6285c6dc1f179cdc1dd9ff5bb697 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": 13, - "program": "StaticFieldAndMethodSameName.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, diff --git a/ets2panda/test/parser/ets/StaticFieldAndMethodSameNameInheritance-expected.txt b/ets2panda/test/parser/ets/StaticFieldAndMethodSameNameInheritance-expected.txt index 4ed09144c7cca2f024a47f96e541511f9327a4c3..7c9a9c12a30f407c75c05eb0e52d4539a7515d64 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": 13, - "program": "StaticFieldAndMethodSameNameInheritance.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, diff --git a/ets2panda/test/parser/ets/ambient_call_signature-expected.txt b/ets2panda/test/parser/ets/ambient_call_signature-expected.txt index cac03c53accbad9b91c8b279b277ba1c22d8a477..7d9d208717a8f12e3bea1b828113bb4b6c5f7081 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": 14, - "program": "ambient_call_signature.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -154,39 +122,7 @@ } ], "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": 17, - "column": 22, - "program": "ambient_call_signature.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, diff --git a/ets2panda/test/parser/ets/ambient_indexer_1-expected.txt b/ets2panda/test/parser/ets/ambient_indexer_1-expected.txt index 94274e8f4bbbcc9fcaf428f992cf3ed6cc218303..83b96dab4535e9e68a56cc8e999a15d6db0b6915 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 c4b51ab23cd56efc09ca10065c05962278f3d64d..a39cbdb1d9481cc2b38e3bda3f9aba5032888ae7 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 1ea8384ba86c8ac4444b8eb35b100abc35a67c50..2327750c74b952aba379015d6fce5e8ad631bab0 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 233d966ca8b6cab97f5ca34a3e335b54751c885c..32bc3cba12b9e5ecf3e502a1424dd0f6fda9dfe9 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": 14, - "program": "array_creation_expression.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -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": 14, - "program": "array_creation_expression.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -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": 23, - "program": "array_creation_expression.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 33, diff --git a/ets2panda/test/parser/ets/await_complex_promise-expected.txt b/ets2panda/test/parser/ets/await_complex_promise-expected.txt index 1a81850799003b49deca4d9d8cb1896b03660969..4f75d534430918e0c56f55c90f58c92376cb43f3 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": 36, - "program": "await_complex_promise.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 32, @@ -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": 48, - "program": "await_complex_promise.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -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": 30, - "program": "await_complex_promise.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -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": 56, - "program": "await_complex_promise.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -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": 30, - "program": "await_complex_promise.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 25, @@ -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": 30, - "program": "await_complex_promise.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 34, diff --git a/ets2panda/test/parser/ets/genericDefaultParam_1-expected.txt b/ets2panda/test/parser/ets/genericDefaultParam_1-expected.txt index 022219faa3134bfe7f6de5f80f45df53cc7dc106..1cfc8b5552cb3385b17cb874cef7574c0a1ca513 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": 26, - "program": "genericDefaultParam_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 30, @@ -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": 17, - "program": "genericDefaultParam_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -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": 25, - "program": "genericDefaultParam_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -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": 12, - "program": "genericDefaultParam_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -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": 23, - "program": "genericDefaultParam_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 31, @@ -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": 23, - "program": "genericDefaultParam_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 32, @@ -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": 23, - "program": "genericDefaultParam_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 33, @@ -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": 39, - "program": "genericDefaultParam_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 33, @@ -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": 25, - "program": "genericDefaultParam_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -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": 23, - "program": "genericDefaultParam_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 31, @@ -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": 23, - "program": "genericDefaultParam_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 32, @@ -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": 23, - "program": "genericDefaultParam_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 33, @@ -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": 39, - "program": "genericDefaultParam_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 33, diff --git a/ets2panda/test/parser/ets/genericDefaultParam_3-expected.txt b/ets2panda/test/parser/ets/genericDefaultParam_3-expected.txt index 9fa6b86ddb2ed55bd8548d9bd8e09b7e11fc7e91..49878d321ae67c4c2cc4fd02af23e97fd7ce2580 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": 25, - "program": "genericDefaultParam_3.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, diff --git a/ets2panda/test/parser/ets/generics_3-expected.txt b/ets2panda/test/parser/ets/generics_3-expected.txt index b0d5cd0252fbe53c59f26b309f151d2a3eb7bc2d..03db40eadc1dac01127af09361e81557f2af34e6 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": 42, - "program": "generics_3.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -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": 17, - "program": "generics_3.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, diff --git a/ets2panda/test/parser/ets/generics_4-expected.txt b/ets2panda/test/parser/ets/generics_4-expected.txt index 9d105c2638e58112b10133908d2ce606ef5fb41c..c167e05871ca24b458584508c29894b302001b24 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": 50, - "program": "generics_4.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -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": 17, - "program": "generics_4.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, diff --git a/ets2panda/test/parser/ets/generics_5-expected.txt b/ets2panda/test/parser/ets/generics_5-expected.txt index f115af832bf85cee29888ad24851cf0fd5d7df7e..304d0ea556c58f0312acf877f1b2bb1faf7d883b 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": 34, - "program": "generics_5.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -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": 17, - "program": "generics_5.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, diff --git a/ets2panda/test/parser/ets/generics_6-expected.txt b/ets2panda/test/parser/ets/generics_6-expected.txt index dbd36d722dddd3b7c7c3023c3dbdc08bca7700ef..e9a7d7afda1405ca559abddceef9a76baf1ebddd 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": 48, - "program": "generics_6.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -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": 61, - "program": "generics_6.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -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": 17, - "program": "generics_6.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -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": 30, - "program": "generics_6.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, diff --git a/ets2panda/test/parser/ets/generics_7-expected.txt b/ets2panda/test/parser/ets/generics_7-expected.txt index ddb4cb95c10aa09e8b108e10d170d146cd9157dc..177179a050e06535da8a9c9cf247fd34e0d1f88f 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": 74, - "program": "generics_7.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -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": 86, - "program": "generics_7.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -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": 98, - "program": "generics_7.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -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": 17, - "program": "generics_7.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -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": 29, - "program": "generics_7.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -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": 41, - "program": "generics_7.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, diff --git a/ets2panda/test/parser/ets/generics_type_param_constraint_11-expected.txt b/ets2panda/test/parser/ets/generics_type_param_constraint_11-expected.txt index fd28ce034b425f561e83cc0b49e978562c644ef4..2c55953fc832295af7522f5408d8172b14a98991 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": 34, - "program": "generics_type_param_constraint_11.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, 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 8178b0092cf028604f3251be8f1f0de94da425d3..ecb7408e57249e120e5794a7b8224cbb7af13cff 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": 31, - "program": "generics_type_param_constraint_12.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 37, diff --git a/ets2panda/test/parser/ets/getterOverride-expected.txt b/ets2panda/test/parser/ets/getterOverride-expected.txt index b25e62b3f72ab14d6ee361e037970c0562a214ac..8d24c94d69438f65c106ca9ebfdda737517e9e07 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": 25, - "program": "getterOverride.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -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": 34, - "program": "getterOverride.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, diff --git a/ets2panda/test/parser/ets/globalVarInLambdaInStatic-expected.txt b/ets2panda/test/parser/ets/globalVarInLambdaInStatic-expected.txt index bf93a8f322e1ea80c730215280181d7f69d249b5..693081334777f3f99a7219de8985317d612cfff1 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": 29, - "program": "globalVarInLambdaInStatic.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -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": 36, - "program": "globalVarInLambdaInStatic.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 31, @@ -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": 43, - "program": "globalVarInLambdaInStatic.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, @@ -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": 23, - "program": "globalVarInLambdaInStatic.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, 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 f818b10de843cfc8ec04182026ca261bd67ce48a..b6a4e878df45c804b51fe8e413716d4171a1c2ca 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": 16, - "column": 25, - "program": "export_file.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 16, 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 cc13f0c26b214b88d7c7f8538df6415a61bd92bc..e65ceeeeda0777537fb3a67ad09e26359c29a785 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": 30, - "program": "infer_overriding_method_return_type.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, diff --git a/ets2panda/test/parser/ets/lambdaAsFunctionParam-expected.txt b/ets2panda/test/parser/ets/lambdaAsFunctionParam-expected.txt index 180bf4785e0a4c16ff54be2ec51993db1a356fc3..d9458f74f574e6411768038a8648b45920578a21 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": 33, - "program": "lambdaAsFunctionParam.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -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": 25, - "program": "lambdaAsFunctionParam.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -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": 19, - "program": "lambdaAsFunctionParam.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -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": 30, - "program": "lambdaAsFunctionParam.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -1362,39 +1234,7 @@ } ], "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": 39, - "program": "lambdaAsFunctionParam.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, diff --git a/ets2panda/test/parser/ets/lambda_optional_param_1-expected.txt b/ets2panda/test/parser/ets/lambda_optional_param_1-expected.txt index 83244026aba40d059b36fcc1cc8ccb28c6a62973..26991e6711c6cbebea83a42ea32e149722f71b8f 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": 41, - "program": "lambda_optional_param_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, @@ -223,39 +191,7 @@ } ], "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": 50, - "program": "lambda_optional_param_1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, diff --git a/ets2panda/test/parser/ets/tupleAsTypeParam1-expected.txt b/ets2panda/test/parser/ets/tupleAsTypeParam1-expected.txt index 389237f5c8fef573c1f892dc126d384dfdd3746f..e311e786fe5c854046d601f00da3a74ffe18dcb5 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": 22, - "program": "tupleAsTypeParam1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -703,39 +671,7 @@ } }, { - "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": 30, - "program": "tupleAsTypeParam1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 21, @@ -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": 23, - "program": "tupleAsTypeParam1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -913,39 +817,7 @@ } }, { - "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": 31, - "program": "tupleAsTypeParam1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 22, @@ -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": 16, - "program": "tupleAsTypeParam1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, @@ -1193,39 +1033,7 @@ } }, { - "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": 24, - "program": "tupleAsTypeParam1.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 23, diff --git a/ets2panda/test/parser/ets/tupleAsTypeParam2-expected.txt b/ets2panda/test/parser/ets/tupleAsTypeParam2-expected.txt index c4ba6083bfd72affeb19de11471ad447672e0dc8..5a6205e0679ba0bf51682b288ed417d3e87cee43 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": 22, - "program": "tupleAsTypeParam2.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -839,39 +807,7 @@ } }, { - "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": 30, - "program": "tupleAsTypeParam2.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 24, @@ -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": 23, - "program": "tupleAsTypeParam2.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 25, @@ -1049,39 +953,7 @@ } }, { - "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": 31, - "program": "tupleAsTypeParam2.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 25, @@ -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": 26, - "program": "tupleAsTypeParam2.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 26, @@ -1299,39 +1139,7 @@ } }, { - "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": 34, - "program": "tupleAsTypeParam2.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 26, diff --git a/ets2panda/test/parser/ets/tupleIndexWithNumbers-expected.txt b/ets2panda/test/parser/ets/tupleIndexWithNumbers-expected.txt index aab3c5af767b75f7ffd2252c954beca7e75ad924..670207d21aaf6f775ddb0dc63e9680f30261063d 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": 21, - "program": "tupleIndexWithNumbers.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, @@ -398,39 +366,7 @@ } }, { - "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": 29, - "program": "tupleIndexWithNumbers.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 20, diff --git a/ets2panda/test/parser/ets/user_defined_22-expected.txt b/ets2panda/test/parser/ets/user_defined_22-expected.txt index b62ff44fcc43e1cf049096623fe52c2a3269eac5..6c409c79aa02a98ff525c02f3deb289e61738bb9 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": 15, - "program": "user_defined_22.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 17, diff --git a/ets2panda/test/runtime/ets/TypeInferObject1.ets b/ets2panda/test/runtime/ets/TypeInferObject1.ets index c25166f08a6755c7d27a19ec50b64d1d717ff583..178a236fc1b70bc73d1b89f6aed1500b8f9d3f10 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 afde846f637da99b71ac5f4f1543c12f2b7badb7..d162145e0932e050f5936b4cc8c876327120b8b7 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 2bb54ca5bb3ceb902aaf09f5f3bd39b37f344fe2..49622448db702bb9976ef05ea30739b885bd8b79 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 aa64c3aae38d961a2264ac23ce511f1c34aa9e14..3e399d5ca9e142b274e77af1408eec9461a1780f 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 231e38ae5658c12547f273c480e2ca334ff58cbd..2802d072e721ac2cf6485f9c206017f72c79b66e 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_add_function_return_statement_test.cpp b/ets2panda/test/unit/lsp/fix_add_function_return_statement_test.cpp index 1fe8540a8ae853336cd6bdb06cd9159e05b94e23..a5e8d62f13c098d29b8376ed767fb4e8567536c9 100644 --- a/ets2panda/test/unit/lsp/fix_add_function_return_statement_test.cpp +++ b/ets2panda/test/unit/lsp/fix_add_function_return_statement_test.cpp @@ -34,7 +34,7 @@ a * b; const size_t position = 20; // Position of the function body start const auto wordA = "a"; const auto wordB = "b"; - const auto wordNum = "number"; + const auto wordNum = "double"; auto info = ark::es2panda::lsp::GetInfo(ctx, position); const auto type = info.GetStatements().at(0)->AsExpressionStatement()->GetExpression()->Type(); EXPECT_EQ(type, ark::es2panda::ir::AstNodeType::BINARY_EXPRESSION); @@ -44,8 +44,14 @@ a * b; const auto right = info.GetStatements().at(0)->AsExpressionStatement()->GetExpression()->AsBinaryExpression()->Right()->ToString(); EXPECT_EQ(right, wordB); - const auto returnTypeNode = info.GetReturnTypeNode()->AsETSTypeReference()->BaseName()->Name(); - EXPECT_EQ(returnTypeNode, wordNum); + const auto returnTypeNode = info.GetReturnTypeNode(); + std::string returnTypeString; + if (returnTypeNode->IsETSTypeReference()) { + returnTypeString = returnTypeNode->AsETSTypeReference()->BaseName()->Name().Mutf8(); + } else if (returnTypeNode->IsETSPrimitiveType()) { + returnTypeString = returnTypeNode->AsETSPrimitiveType()->PrimitiveTypeToString(); + } + EXPECT_EQ(returnTypeString, wordNum); initializer.DestroyContext(ctx); } 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 be40871cb8d15e5b24c202edd135b4d81cbb1e84..b2027ef3fa3bbc4f90d404bb302e5533e65a47ad 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_completions_entry_details.cpp b/ets2panda/test/unit/lsp/get_completions_entry_details.cpp index 8f565a60e65641d8d45c0b42c214429eed80b911..bb19001e5fa864f8f6e76e44ed7cdb5a5e416e87 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 de404eae342dac6d6b918be5ee93099ae393f955..6770c270f14a18bc5861a734b3e4ca7109e3f2ab 100644 --- a/ets2panda/test/unit/lsp/inlay_hints_test.cpp +++ b/ets2panda/test/unit/lsp/inlay_hints_test.cpp @@ -160,7 +160,7 @@ 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 = 31; const size_t index2 = 42; diff --git a/ets2panda/test/unit/lsp/quick_info_api_test.cpp b/ets2panda/test/unit/lsp/quick_info_api_test.cpp index 2a71e8248fbe35b0af9c66df3c634c3c10c17db0..e6332b8511a6b7fc1ed37a8724b5dc4db52018ba 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 5312b176b57a7a2d33e3dc3ef74436b039687a39..081752d17c6f963dc75799e00fe7e6513cae2497 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 c1d8d9290aeb0d231ada09dbd7b6711a46fdb9b3..d8c9098f18f270a7ad727f6d52593a71b97f5b05 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 5f87b4030e8c41ba44451a366b7df97e47e3ea3a..6ceeee85ee6e945c8df97ec5b6df4927f9a607c3 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 63eef7873c4280e9e87b0287c8b82617965cb7e5..a03c05490e0c1659083a54e898223ce712abaad8 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)); }