diff --git a/ets2panda/checker/ETSAnalyzer.cpp b/ets2panda/checker/ETSAnalyzer.cpp index 53f045d8b84f4feedbdf7c350911eba60bbd1529..3e06bc185cb323505da47c9623a612111d1a9038 100644 --- a/ets2panda/checker/ETSAnalyzer.cpp +++ b/ets2panda/checker/ETSAnalyzer.cpp @@ -2830,24 +2830,35 @@ checker::Type *ETSAnalyzer::Check(ir::ThisExpression *expr) const return expr->TsType(); } +static checker::Type *checkUnboxedTypeKind(TypeFlag unboxedFlag, ETSChecker *checker) +{ + switch (unboxedFlag) { + 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: + ES2PANDA_UNREACHABLE(); + } +} + // Get string literal type as potential typeof result type with respect to spec p.7.17 static checker::Type *GetTypeOfStringType(checker::Type *argType, ETSChecker *checker) { if (auto unboxed = checker->MaybeUnboxType(argType); unboxed->IsETSPrimitiveType()) { - switch (checker->TypeKind(unboxed)) { - case TypeFlag::ETS_BOOLEAN: - return checker->CreateETSStringLiteralType("boolean"); - case TypeFlag::BYTE: - case TypeFlag::CHAR: - case TypeFlag::SHORT: - case TypeFlag::INT: - case TypeFlag::LONG: - case TypeFlag::FLOAT: - case TypeFlag::DOUBLE: - return checker->CreateETSStringLiteralType("number"); - default: - ES2PANDA_UNREACHABLE(); - } + return checkUnboxedTypeKind(checker->TypeKind(unboxed), checker); } if (argType->IsETSUndefinedType()) { return checker->CreateETSStringLiteralType("undefined"); 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 c7ac6bf677b265b616236d9bb38c3185474bf553..43bbda0b5abb4db951e089cd1650dcf5b91763e2 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 0e9894d3ff9049608f84ef1a124be46a353a58fc..84c465216466065db3bd2f4b27079d8aa29cd85b 100644 --- a/ets2panda/parser/ETSparser.cpp +++ b/ets2panda/parser/ETSparser.cpp @@ -1472,6 +1472,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 fc82ce37bf3bcfdf7657c325f745f9a730f5357d..155ec5ccb65d023ee661366f6e26e33a034f3ef1 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/ast/compiler/ets/type_as_value.ets b/ets2panda/test/ast/compiler/ets/type_as_value.ets index fb69b217cc56efed69c8c6f0e06d7c424c79a45c..b231f8b43cff0c783025b6b127bb9957e589a9fc 100644 --- a/ets2panda/test/ast/compiler/ets/type_as_value.ets +++ b/ets2panda/test/ast/compiler/ets/type_as_value.ets @@ -15,4 +15,4 @@ let a = number[][] -/* @@? 16:9 Error SyntaxError: Unexpected token 'number'. */ \ No newline at end of file +/* @@? 16:9 Error SyntaxError: Unexpected token 'number'. */ diff --git a/ets2panda/test/compiler/ets/ambient_declaration-expected.txt b/ets2panda/test/compiler/ets/ambient_declaration-expected.txt index 9749257459eb1b8e606803b89eb8649679026bdd..eedf48b193086a621cf270b4eb71c0bf6b85b97c 100644 --- a/ets2panda/test/compiler/ets/ambient_declaration-expected.txt +++ b/ets2panda/test/compiler/ets/ambient_declaration-expected.txt @@ -122,38 +122,7 @@ "type": "Identifier", "name": "y", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 d10f25bdb337f35a765cec35a4bf568e1e7c5ff7..d954b5f03e8d7545e0c35c7d43cf6b2f84457d3b 100644 --- a/ets2panda/test/compiler/ets/extended_conditional_expression_not-expected.txt +++ b/ets2panda/test/compiler/ets/extended_conditional_expression_not-expected.txt @@ -179,38 +179,7 @@ "type": "Identifier", "name": "n", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 bba7486bd0d81fb5254798f00adc13b418b83e9b..61ce49153a0075b23bfff7e45dd738ede8e19bde 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 @@ -114,38 +114,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 cf9f714c2feb5d14e79e973c8157803fa22946f0..a77d42a518dc1b1913d824569f475323e48cb821 100644 --- a/ets2panda/test/compiler/ets/generic_class_getter_setter-expected.txt +++ b/ets2panda/test/compiler/ets/generic_class_getter_setter-expected.txt @@ -119,38 +119,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -292,38 +261,7 @@ "type": "Identifier", "name": "a0", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -659,38 +597,7 @@ "type": "Identifier", "name": "memb", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 ecdc89ed165128cd80b350a4d48d5214d4b8f618..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 @@ -6,6 +6,7 @@ "name": { "type": "Identifier", "name": "mypackage", + "decorators": [], "loc": { "start": { "line": 16, @@ -56,6 +57,7 @@ "local": { "type": "Identifier", "name": "myexported", + "decorators": [], "loc": { "start": { "line": 17, @@ -72,6 +74,7 @@ "imported": { "type": "Identifier", "name": "myexported", + "decorators": [], "loc": { "start": { "line": 17, @@ -118,6 +121,7 @@ "id": { "type": "Identifier", "name": "TestClass", + "decorators": [], "loc": { "start": { "line": 27, @@ -139,6 +143,7 @@ "key": { "type": "Identifier", "name": "memb", + "decorators": [], "loc": { "start": { "line": 28, @@ -181,6 +186,7 @@ "name": { "type": "Identifier", "name": "string", + "decorators": [], "loc": { "start": { "line": 28, @@ -221,6 +227,7 @@ } }, "definite": false, + "decorators": [], "loc": { "start": { "line": 28, @@ -239,6 +246,7 @@ "key": { "type": "Identifier", "name": "constructor", + "decorators": [], "loc": { "start": { "line": 27, @@ -263,6 +271,7 @@ "id": { "type": "Identifier", "name": "constructor", + "decorators": [], "loc": { "start": { "line": 27, @@ -323,6 +332,7 @@ } }, "overloads": [], + "decorators": [], "loc": { "start": { "line": 1, @@ -369,6 +379,7 @@ "id": { "type": "Identifier", "name": "ETSGLOBAL", + "decorators": [], "loc": { "start": { "line": 1, @@ -386,62 +397,333 @@ "implements": [], "body": [ { - "type": "ClassProperty", + "type": "MethodDefinition", "key": { "type": "Identifier", - "name": "myvar1", + "name": "_$init$_", + "decorators": [], "loc": { "start": { - "line": 18, - "column": 5, - "program": "package_module_1.ets" + "line": 1, + "column": 1, + "program": null }, "end": { - "line": 18, - "column": 11, - "program": "package_module_1.ets" + "line": 1, + "column": 1, + "program": null } } }, + "kind": "method", "accessibility": "public", "static": true, - "readonly": false, - "declare": false, "optional": false, "computed": false, - "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { + "value": { + "type": "FunctionExpression", + "function": { + "type": "ScriptFunction", + "id": { "type": "Identifier", - "name": "number", + "name": "_$init$_", + "decorators": [], "loc": { "start": { - "line": 18, - "column": 13, - "program": "package_module_1.ets" + "line": 1, + "column": 1, + "program": null }, "end": { - "line": 18, - "column": 19, - "program": "package_module_1.ets" + "line": 1, + "column": 1, + "program": null + } + } + }, + "generator": false, + "async": false, + "expression": false, + "params": [], + "body": { + "type": "BlockStatement", + "statements": [ + { + "type": "ExpressionStatement", + "expression": { + "type": "AssignmentExpression", + "operator": "=", + "left": { + "type": "Identifier", + "name": "myvar1", + "decorators": [], + "loc": { + "start": { + "line": 19, + "column": 1, + "program": "package_module_1.ets" + }, + "end": { + "line": 19, + "column": 7, + "program": "package_module_1.ets" + } + } + }, + "right": { + "type": "Identifier", + "name": "myvar3", + "decorators": [], + "loc": { + "start": { + "line": 19, + "column": 10, + "program": "package_module_1.ets" + }, + "end": { + "line": 19, + "column": 16, + "program": "package_module_1.ets" + } + } + }, + "loc": { + "start": { + "line": 19, + "column": 1, + "program": "package_module_1.ets" + }, + "end": { + "line": 19, + "column": 16, + "program": "package_module_1.ets" + } + } + }, + "loc": { + "start": { + "line": 19, + "column": 1, + "program": "package_module_1.ets" + }, + "end": { + "line": 19, + "column": 17, + "program": "package_module_1.ets" + } + } + }, + { + "type": "ExpressionStatement", + "expression": { + "type": "AssignmentExpression", + "operator": "=", + "left": { + "type": "Identifier", + "name": "myvar2", + "decorators": [], + "loc": { + "start": { + "line": 20, + "column": 5, + "program": "package_module_1.ets" + }, + "end": { + "line": 20, + "column": 11, + "program": "package_module_1.ets" + } + } + }, + "right": { + "type": "NumberLiteral", + "value": 42, + "loc": { + "start": { + "line": 20, + "column": 22, + "program": "package_module_1.ets" + }, + "end": { + "line": 20, + "column": 24, + "program": "package_module_1.ets" + } + } + }, + "loc": { + "start": { + "line": 20, + "column": 5, + "program": "package_module_1.ets" + }, + "end": { + "line": 20, + "column": 24, + "program": "package_module_1.ets" + } + } + }, + "loc": { + "start": { + "line": 20, + "column": 5, + "program": "package_module_1.ets" + }, + "end": { + "line": 20, + "column": 24, + "program": "package_module_1.ets" + } + } + }, + { + "type": "ExpressionStatement", + "expression": { + "type": "AssignmentExpression", + "operator": "=", + "left": { + "type": "Identifier", + "name": "myvar3", + "decorators": [], + "loc": { + "start": { + "line": 20, + "column": 25, + "program": "package_module_2.ets" + }, + "end": { + "line": 20, + "column": 25, + "program": "package_module_2.ets" + } + } + }, + "right": { + "type": "Identifier", + "name": "myvar2", + "decorators": [], + "loc": { + "start": { + "line": 20, + "column": 25, + "program": "package_module_2.ets" + }, + "end": { + "line": 20, + "column": 25, + "program": "package_module_2.ets" + } + } + }, + "loc": { + "start": { + "line": 20, + "column": 25, + "program": "package_module_2.ets" + }, + "end": { + "line": 20, + "column": 25, + "program": "package_module_2.ets" + } + } + }, + "loc": { + "start": { + "line": 20, + "column": 25, + "program": "package_module_2.ets" + }, + "end": { + "line": 20, + "column": 25, + "program": "package_module_2.ets" + } + } + } + ], + "loc": { + "start": { + "line": 19, + "column": 1, + "program": "package_module_2.ets" + }, + "end": { + "line": 20, + "column": 25, + "program": "package_module_2.ets" } } }, "loc": { "start": { - "line": 18, - "column": 13, - "program": "package_module_1.ets" + "line": 19, + "column": 1, + "program": "package_module_2.ets" }, "end": { - "line": 18, - "column": 19, - "program": "package_module_1.ets" + "line": 20, + "column": 25, + "program": "package_module_2.ets" } } }, + "loc": { + "start": { + "line": 19, + "column": 1, + "program": "package_module_2.ets" + }, + "end": { + "line": 20, + "column": 25, + "program": "package_module_2.ets" + } + } + }, + "overloads": [], + "decorators": [], + "loc": { + "start": { + "line": 19, + "column": 1, + "program": "package_module_2.ets" + }, + "end": { + "line": 20, + "column": 25, + "program": "package_module_2.ets" + } + } + }, + { + "type": "ClassProperty", + "key": { + "type": "Identifier", + "name": "myvar1", + "decorators": [], + "loc": { + "start": { + "line": 18, + "column": 5, + "program": "package_module_1.ets" + }, + "end": { + "line": 18, + "column": 11, + "program": "package_module_1.ets" + } + } + }, + "accessibility": "public", + "static": true, + "readonly": false, + "declare": false, + "optional": false, + "computed": false, + "typeAnnotation": { + "type": "ETSPrimitiveType", "loc": { "start": { "line": 18, @@ -456,6 +738,7 @@ } }, "definite": false, + "decorators": [], "loc": { "start": { "line": 18, @@ -474,6 +757,7 @@ "key": { "type": "Identifier", "name": "myvar2", + "decorators": [], "loc": { "start": { "line": 20, @@ -494,38 +778,7 @@ "optional": false, "computed": false, "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -540,6 +793,7 @@ } }, "definite": false, + "decorators": [], "loc": { "start": { "line": 20, @@ -548,7 +802,7 @@ }, "end": { "line": 20, - "column": 22, + "column": 24, "program": "package_module_1.ets" } } @@ -558,6 +812,7 @@ "key": { "type": "Identifier", "name": "main", + "decorators": [], "loc": { "start": { "line": 22, @@ -583,6 +838,7 @@ "id": { "type": "Identifier", "name": "main", + "decorators": [], "loc": { "start": { "line": 22, @@ -618,6 +874,7 @@ "name": { "type": "Identifier", "name": "TestClass", + "decorators": [], "loc": { "start": { "line": 23, @@ -657,6 +914,7 @@ } } }, + "decorators": [], "loc": { "start": { "line": 23, @@ -679,6 +937,7 @@ "name": { "type": "Identifier", "name": "TestClass", + "decorators": [], "loc": { "start": { "line": 23, @@ -769,38 +1028,7 @@ "type": "Identifier", "name": "b", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -814,6 +1042,7 @@ } } }, + "decorators": [], "loc": { "start": { "line": 24, @@ -830,6 +1059,7 @@ "init": { "type": "Identifier", "name": "myvar1", + "decorators": [], "loc": { "start": { "line": 24, @@ -880,38 +1110,7 @@ "type": "Identifier", "name": "c", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -925,6 +1124,7 @@ } } }, + "decorators": [], "loc": { "start": { "line": 25, @@ -941,6 +1141,7 @@ "init": { "type": "Identifier", "name": "myvar2", + "decorators": [], "loc": { "start": { "line": 25, @@ -991,38 +1192,7 @@ "type": "Identifier", "name": "d", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -1036,6 +1206,7 @@ } } }, + "decorators": [], "loc": { "start": { "line": 26, @@ -1052,6 +1223,7 @@ "init": { "type": "Identifier", "name": "myvar3", + "decorators": [], "loc": { "start": { "line": 26, @@ -1102,38 +1274,7 @@ "type": "Identifier", "name": "e", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -1147,6 +1288,7 @@ } } }, + "decorators": [], "loc": { "start": { "line": 27, @@ -1163,6 +1305,7 @@ "init": { "type": "Identifier", "name": "myexported", + "decorators": [], "loc": { "start": { "line": 27, @@ -1213,38 +1356,7 @@ "type": "Identifier", "name": "f", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -1258,6 +1370,7 @@ } } }, + "decorators": [], "loc": { "start": { "line": 28, @@ -1276,6 +1389,7 @@ "callee": { "type": "Identifier", "name": "bar", + "decorators": [], "loc": { "start": { "line": 28, @@ -1347,6 +1461,7 @@ "name": { "type": "Identifier", "name": "string", + "decorators": [], "loc": { "start": { "line": 29, @@ -1386,6 +1501,7 @@ } } }, + "decorators": [], "loc": { "start": { "line": 29, @@ -1404,6 +1520,7 @@ "object": { "type": "Identifier", "name": "a", + "decorators": [], "loc": { "start": { "line": 29, @@ -1420,6 +1537,7 @@ "property": { "type": "Identifier", "name": "memb", + "decorators": [], "loc": { "start": { "line": 29, @@ -1517,6 +1635,7 @@ } }, "overloads": [], + "decorators": [], "loc": { "start": { "line": 22, @@ -1535,6 +1654,7 @@ "key": { "type": "Identifier", "name": "myvar3", + "decorators": [], "loc": { "start": { "line": 19, @@ -1555,38 +1675,7 @@ "optional": false, "computed": false, "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -1601,6 +1690,7 @@ } }, "definite": false, + "decorators": [], "loc": { "start": { "line": 19, @@ -1619,6 +1709,7 @@ "key": { "type": "Identifier", "name": "bar", + "decorators": [], "loc": { "start": { "line": 22, @@ -1644,6 +1735,7 @@ "id": { "type": "Identifier", "name": "bar", + "decorators": [], "loc": { "start": { "line": 22, @@ -1662,38 +1754,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -1719,38 +1780,7 @@ "type": "Identifier", "name": "local_var", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -1764,6 +1794,7 @@ } } }, + "decorators": [], "loc": { "start": { "line": 23, @@ -1780,6 +1811,7 @@ "init": { "type": "Identifier", "name": "myexported", + "decorators": [], "loc": { "start": { "line": 23, @@ -1826,6 +1858,7 @@ "argument": { "type": "Identifier", "name": "local_var", + "decorators": [], "loc": { "start": { "line": 24, @@ -1893,6 +1926,7 @@ } }, "overloads": [], + "decorators": [], "loc": { "start": { "line": 22, 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 1f1106a7928832643c06c8c598fcd5cf32dfb3d9..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 @@ -6,6 +6,7 @@ "name": { "type": "Identifier", "name": "mypackage", + "decorators": [], "loc": { "start": { "line": 16, @@ -56,6 +57,7 @@ "local": { "type": "Identifier", "name": "myexported", + "decorators": [], "loc": { "start": { "line": 17, @@ -72,6 +74,7 @@ "imported": { "type": "Identifier", "name": "myexported", + "decorators": [], "loc": { "start": { "line": 17, @@ -118,6 +121,7 @@ "id": { "type": "Identifier", "name": "TestClass", + "decorators": [], "loc": { "start": { "line": 27, @@ -139,6 +143,7 @@ "key": { "type": "Identifier", "name": "memb", + "decorators": [], "loc": { "start": { "line": 28, @@ -181,6 +186,7 @@ "name": { "type": "Identifier", "name": "string", + "decorators": [], "loc": { "start": { "line": 28, @@ -221,6 +227,7 @@ } }, "definite": false, + "decorators": [], "loc": { "start": { "line": 28, @@ -239,6 +246,7 @@ "key": { "type": "Identifier", "name": "constructor", + "decorators": [], "loc": { "start": { "line": 27, @@ -263,6 +271,7 @@ "id": { "type": "Identifier", "name": "constructor", + "decorators": [], "loc": { "start": { "line": 27, @@ -323,6 +332,7 @@ } }, "overloads": [], + "decorators": [], "loc": { "start": { "line": 1, @@ -369,6 +379,7 @@ "id": { "type": "Identifier", "name": "ETSGLOBAL", + "decorators": [], "loc": { "start": { "line": 1, @@ -386,45 +397,261 @@ "implements": [], "body": [ { - "type": "ClassProperty", + "type": "MethodDefinition", "key": { "type": "Identifier", - "name": "myvar3", + "name": "_$init$_", + "decorators": [], "loc": { "start": { - "line": 19, - "column": 5, - "program": "package_module_2.ets" + "line": 1, + "column": 1, + "program": null }, "end": { - "line": 19, - "column": 11, - "program": "package_module_2.ets" + "line": 1, + "column": 1, + "program": null } } }, + "kind": "method", "accessibility": "public", "static": true, - "readonly": false, - "declare": false, "optional": false, "computed": false, - "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { + "value": { + "type": "FunctionExpression", + "function": { + "type": "ScriptFunction", + "id": { "type": "Identifier", - "name": "number", + "name": "_$init$_", + "decorators": [], + "loc": { + "start": { + "line": 1, + "column": 1, + "program": null + }, + "end": { + "line": 1, + "column": 1, + "program": null + } + } + }, + "generator": false, + "async": false, + "expression": false, + "params": [], + "body": { + "type": "BlockStatement", + "statements": [ + { + "type": "ExpressionStatement", + "expression": { + "type": "AssignmentExpression", + "operator": "=", + "left": { + "type": "Identifier", + "name": "myvar3", + "decorators": [], + "loc": { + "start": { + "line": 20, + "column": 1, + "program": "package_module_2.ets" + }, + "end": { + "line": 20, + "column": 7, + "program": "package_module_2.ets" + } + } + }, + "right": { + "type": "Identifier", + "name": "myvar2", + "decorators": [], + "loc": { + "start": { + "line": 20, + "column": 10, + "program": "package_module_2.ets" + }, + "end": { + "line": 20, + "column": 16, + "program": "package_module_2.ets" + } + } + }, + "loc": { + "start": { + "line": 20, + "column": 1, + "program": "package_module_2.ets" + }, + "end": { + "line": 20, + "column": 16, + "program": "package_module_2.ets" + } + } + }, + "loc": { + "start": { + "line": 20, + "column": 1, + "program": "package_module_2.ets" + }, + "end": { + "line": 20, + "column": 17, + "program": "package_module_2.ets" + } + } + }, + { + "type": "ExpressionStatement", + "expression": { + "type": "AssignmentExpression", + "operator": "=", + "left": { + "type": "Identifier", + "name": "myvar1", + "decorators": [], + "loc": { + "start": { + "line": 19, + "column": 20, + "program": "package_module_1.ets" + }, + "end": { + "line": 19, + "column": 20, + "program": "package_module_1.ets" + } + } + }, + "right": { + "type": "Identifier", + "name": "myvar3", + "decorators": [], + "loc": { + "start": { + "line": 19, + "column": 20, + "program": "package_module_1.ets" + }, + "end": { + "line": 19, + "column": 20, + "program": "package_module_1.ets" + } + } + }, + "loc": { + "start": { + "line": 19, + "column": 20, + "program": "package_module_1.ets" + }, + "end": { + "line": 19, + "column": 20, + "program": "package_module_1.ets" + } + } + }, + "loc": { + "start": { + "line": 19, + "column": 20, + "program": "package_module_1.ets" + }, + "end": { + "line": 19, + "column": 20, + "program": "package_module_1.ets" + } + } + }, + { + "type": "ExpressionStatement", + "expression": { + "type": "AssignmentExpression", + "operator": "=", + "left": { + "type": "Identifier", + "name": "myvar2", + "decorators": [], + "loc": { + "start": { + "line": 20, + "column": 17, + "program": "package_module_1.ets" + }, + "end": { + "line": 20, + "column": 17, + "program": "package_module_1.ets" + } + } + }, + "right": { + "type": "NumberLiteral", + "value": 42, + "loc": { + "start": { + "line": 20, + "column": 17, + "program": "package_module_1.ets" + }, + "end": { + "line": 20, + "column": 17, + "program": "package_module_1.ets" + } + } + }, + "loc": { + "start": { + "line": 20, + "column": 17, + "program": "package_module_1.ets" + }, + "end": { + "line": 20, + "column": 17, + "program": "package_module_1.ets" + } + } + }, + "loc": { + "start": { + "line": 20, + "column": 17, + "program": "package_module_1.ets" + }, + "end": { + "line": 20, + "column": 17, + "program": "package_module_1.ets" + } + } + } + ], "loc": { "start": { "line": 19, - "column": 13, + "column": 20, "program": "package_module_2.ets" }, "end": { - "line": 19, - "column": 19, + "line": 20, + "column": 17, "program": "package_module_2.ets" } } @@ -432,16 +659,71 @@ "loc": { "start": { "line": 19, - "column": 13, + "column": 20, "program": "package_module_2.ets" }, "end": { - "line": 19, - "column": 19, + "line": 20, + "column": 17, "program": "package_module_2.ets" } } }, + "loc": { + "start": { + "line": 19, + "column": 20, + "program": "package_module_2.ets" + }, + "end": { + "line": 20, + "column": 17, + "program": "package_module_2.ets" + } + } + }, + "overloads": [], + "decorators": [], + "loc": { + "start": { + "line": 19, + "column": 20, + "program": "package_module_2.ets" + }, + "end": { + "line": 20, + "column": 17, + "program": "package_module_2.ets" + } + } + }, + { + "type": "ClassProperty", + "key": { + "type": "Identifier", + "name": "myvar3", + "decorators": [], + "loc": { + "start": { + "line": 19, + "column": 5, + "program": "package_module_2.ets" + }, + "end": { + "line": 19, + "column": 11, + "program": "package_module_2.ets" + } + } + }, + "accessibility": "public", + "static": true, + "readonly": false, + "declare": false, + "optional": false, + "computed": false, + "typeAnnotation": { + "type": "ETSPrimitiveType", "loc": { "start": { "line": 19, @@ -456,6 +738,7 @@ } }, "definite": false, + "decorators": [], "loc": { "start": { "line": 19, @@ -474,6 +757,7 @@ "key": { "type": "Identifier", "name": "bar", + "decorators": [], "loc": { "start": { "line": 22, @@ -499,6 +783,7 @@ "id": { "type": "Identifier", "name": "bar", + "decorators": [], "loc": { "start": { "line": 22, @@ -517,38 +802,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -574,38 +828,7 @@ "type": "Identifier", "name": "local_var", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -619,6 +842,7 @@ } } }, + "decorators": [], "loc": { "start": { "line": 23, @@ -635,6 +859,7 @@ "init": { "type": "Identifier", "name": "myexported", + "decorators": [], "loc": { "start": { "line": 23, @@ -681,6 +906,7 @@ "argument": { "type": "Identifier", "name": "local_var", + "decorators": [], "loc": { "start": { "line": 24, @@ -748,6 +974,7 @@ } }, "overloads": [], + "decorators": [], "loc": { "start": { "line": 22, @@ -766,6 +993,7 @@ "key": { "type": "Identifier", "name": "myvar1", + "decorators": [], "loc": { "start": { "line": 18, @@ -786,38 +1014,7 @@ "optional": false, "computed": false, "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -832,6 +1029,7 @@ } }, "definite": false, + "decorators": [], "loc": { "start": { "line": 18, @@ -850,6 +1048,7 @@ "key": { "type": "Identifier", "name": "myvar2", + "decorators": [], "loc": { "start": { "line": 20, @@ -870,38 +1069,7 @@ "optional": false, "computed": false, "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -916,6 +1084,7 @@ } }, "definite": false, + "decorators": [], "loc": { "start": { "line": 20, @@ -934,6 +1103,7 @@ "key": { "type": "Identifier", "name": "main", + "decorators": [], "loc": { "start": { "line": 22, @@ -959,6 +1129,7 @@ "id": { "type": "Identifier", "name": "main", + "decorators": [], "loc": { "start": { "line": 22, @@ -994,6 +1165,7 @@ "name": { "type": "Identifier", "name": "TestClass", + "decorators": [], "loc": { "start": { "line": 23, @@ -1033,6 +1205,7 @@ } } }, + "decorators": [], "loc": { "start": { "line": 23, @@ -1055,6 +1228,7 @@ "name": { "type": "Identifier", "name": "TestClass", + "decorators": [], "loc": { "start": { "line": 23, @@ -1145,38 +1319,7 @@ "type": "Identifier", "name": "b", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -1190,6 +1333,7 @@ } } }, + "decorators": [], "loc": { "start": { "line": 24, @@ -1206,6 +1350,7 @@ "init": { "type": "Identifier", "name": "myvar1", + "decorators": [], "loc": { "start": { "line": 24, @@ -1256,38 +1401,7 @@ "type": "Identifier", "name": "c", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -1301,6 +1415,7 @@ } } }, + "decorators": [], "loc": { "start": { "line": 25, @@ -1317,6 +1432,7 @@ "init": { "type": "Identifier", "name": "myvar2", + "decorators": [], "loc": { "start": { "line": 25, @@ -1367,38 +1483,7 @@ "type": "Identifier", "name": "d", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -1412,6 +1497,7 @@ } } }, + "decorators": [], "loc": { "start": { "line": 26, @@ -1428,6 +1514,7 @@ "init": { "type": "Identifier", "name": "myvar3", + "decorators": [], "loc": { "start": { "line": 26, @@ -1478,38 +1565,7 @@ "type": "Identifier", "name": "e", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -1523,6 +1579,7 @@ } } }, + "decorators": [], "loc": { "start": { "line": 27, @@ -1539,6 +1596,7 @@ "init": { "type": "Identifier", "name": "myexported", + "decorators": [], "loc": { "start": { "line": 27, @@ -1589,38 +1647,7 @@ "type": "Identifier", "name": "f", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -1634,6 +1661,7 @@ } } }, + "decorators": [], "loc": { "start": { "line": 28, @@ -1652,6 +1680,7 @@ "callee": { "type": "Identifier", "name": "bar", + "decorators": [], "loc": { "start": { "line": 28, @@ -1723,6 +1752,7 @@ "name": { "type": "Identifier", "name": "string", + "decorators": [], "loc": { "start": { "line": 29, @@ -1762,6 +1792,7 @@ } } }, + "decorators": [], "loc": { "start": { "line": 29, @@ -1780,6 +1811,7 @@ "object": { "type": "Identifier", "name": "a", + "decorators": [], "loc": { "start": { "line": 29, @@ -1796,6 +1828,7 @@ "property": { "type": "Identifier", "name": "memb", + "decorators": [], "loc": { "start": { "line": 29, @@ -1893,6 +1926,7 @@ } }, "overloads": [], + "decorators": [], "loc": { "start": { "line": 22, 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 1f9351e7368e34ca530b5d6db3a1e8c806ba7464..f63ed4989c4b5cf69aa861d2bbe6fe67ce60e784 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 @@ -151,38 +151,7 @@ "optional": false, "computed": false, "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 de43615ff156a124b60a9aad512ae6524e880090..249071901e0af78f92b085d4ec2732c0b34d8b7a 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 @@ -218,38 +218,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -490,38 +459,7 @@ "type": "Identifier", "name": "a", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -618,38 +556,7 @@ "type": "Identifier", "name": "b", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -802,38 +709,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 4ccbafd535351e28eba37dc281f522775293e7b7..86518a703ccb5f744f6de627dab92e7092913ff7 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 @@ -218,38 +218,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -459,38 +428,7 @@ "type": "ETSFunctionType", "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -590,38 +528,7 @@ "type": "Identifier", "name": "a", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -718,38 +625,7 @@ "type": "Identifier", "name": "b", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 e19f072a84b7e010d5622e96b9ab0685b5d684c7..d9a7860261a6e9791064f90cf6ad15684c81d085 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 @@ -151,38 +151,7 @@ "optional": false, "computed": false, "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 3f5b3677bd39cb34dbabf46eeb048bc002735a4b..1f079515590b83e6654adfece9393f130a6b8b57 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 @@ -189,38 +189,7 @@ "type": "Identifier", "name": "num", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 ec5729512e0bb28f442b616c9bcedf803029c30e..46d944a0b1c85dcba74286763e363827b6e3ac22 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 @@ -452,38 +452,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 c433950ff57ea361e82b4fce5e96acdbeb65e423..d7967e62ae311b7d2609ea48c9e1d65c8b607d58 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 @@ -105,38 +105,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -463,38 +432,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 95a9582d25d62660cb2d279b8a31048a3086423c..e623badccc7222fc6e250bc2d8c4b8ea498a132a 100644 --- a/ets2panda/test/compiler/ets/memberExprInLambda-expected.txt +++ b/ets2panda/test/compiler/ets/memberExprInLambda-expected.txt @@ -285,38 +285,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 6fd55cbce29bad523d2c5f06e3c95518b83a81f5..1a9fadfbd71fec871e9a935882a13a245f83fbcc 100644 --- a/ets2panda/test/compiler/ets/nullableTuple-expected.txt +++ b/ets2panda/test/compiler/ets/nullableTuple-expected.txt @@ -23,38 +23,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 928d444bf567fabd57b2e2b6591f142d7021f825..61606102751138d462f9b01cb455a1bc90767e33 100644 --- a/ets2panda/test/compiler/ets/requiredType_11-expected.txt +++ b/ets2panda/test/compiler/ets/requiredType_11-expected.txt @@ -51,38 +51,7 @@ "type": "ETSUnionType", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 09a5ac29720bc19d41b4efdbbac29e9e43e63d3e..9029b7a8a2d8f8cd749a65d2d1029d0288e3a81b 100644 --- a/ets2panda/test/compiler/ets/requiredType_9-expected.txt +++ b/ets2panda/test/compiler/ets/requiredType_9-expected.txt @@ -48,38 +48,7 @@ "optional": false, "computed": false, "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 4c1948783f440c276bfb4af5793a7de165e50054..3186438b6b057ea766d9d0f428c927089ca91c5a 100644 --- a/ets2panda/test/compiler/ets/tuple_types_1-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_1-expected.txt @@ -576,38 +576,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -831,38 +800,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -2817,38 +2755,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -3024,38 +2931,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -3262,38 +3138,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -3369,38 +3214,7 @@ } }, { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -3695,38 +3509,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 fb79c6134ae4922daa9d3684b0383a0513764a53..9ee78fb97ae1cd5feb9cedb86af45204bb2fde20 100644 --- a/ets2panda/test/compiler/ets/tuple_types_12-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_12-expected.txt @@ -780,38 +780,7 @@ } }, { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 e6bb7e071f74a2a12d8e533d7090cd9680f3c968..795000ac525764b954dd61a9efa59afb6a1d411e 100644 --- a/ets2panda/test/compiler/ets/tuple_types_13-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_13-expected.txt @@ -23,38 +23,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 9793b92d2cd6268e5fc03124c43fa21ffb21ea8a..5014ea976fa8fef85cfcef969aeaf5660f8b986f 100644 --- a/ets2panda/test/compiler/ets/tuple_types_15-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_15-expected.txt @@ -23,38 +23,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -183,38 +152,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -303,38 +241,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -660,38 +567,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -767,38 +643,7 @@ } }, { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -1991,38 +1836,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 cb14ed722e17bbc3415699bef7e32558677d4bf7..490b83da9e284d299f612f47a249b5cd9e193bee 100644 --- a/ets2panda/test/compiler/ets/tuple_types_19-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_19-expected.txt @@ -2166,38 +2166,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -2290,38 +2259,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 62d7ea9a66d00a2302d2fa3321ee821817a18853..ee3e2835faa897a7108fc323e85ae30fa586b7a5 100644 --- a/ets2panda/test/compiler/ets/tuple_types_7-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_7-expected.txt @@ -100,38 +100,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -369,38 +338,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 5e1f153a79065bd97a3c692be627d69387a38875..6becf899093d08bcff33f69d6f88b7c9657e5e8a 100644 --- a/ets2panda/test/parser/ets/InferTypeParamFromParam1-expected.txt +++ b/ets2panda/test/parser/ets/InferTypeParamFromParam1-expected.txt @@ -1419,38 +1419,7 @@ "type": "Identifier", "name": "arg", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 1ea433e19d8dad76757c86a495e8847edadd30a6..35bfb2716d19bc9797936a474c76b983c20fa25d 100644 --- a/ets2panda/test/parser/ets/StaticFieldAndMethodSameName-expected.txt +++ b/ets2panda/test/parser/ets/StaticFieldAndMethodSameName-expected.txt @@ -64,38 +64,7 @@ "optional": false, "computed": false, "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 a0e17eb58e0a25101ae23c8955c3befdc3195b3b..0d07386c325b5452fe5d1d79921fb2c57f2a80a8 100644 --- a/ets2panda/test/parser/ets/StaticFieldAndMethodSameNameInheritance-expected.txt +++ b/ets2panda/test/parser/ets/StaticFieldAndMethodSameNameInheritance-expected.txt @@ -378,38 +378,7 @@ "optional": false, "computed": false, "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 62f3f9962bf2bdb7cb72b03433f3e105d9bc2b4d..2addd9736d1f2eb9b6ca89aaf7e48820ff858c66 100644 --- a/ets2panda/test/parser/ets/ambient_call_signature-expected.txt +++ b/ets2panda/test/parser/ets/ambient_call_signature-expected.txt @@ -76,38 +76,7 @@ "type": "Identifier", "name": "a", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -149,38 +118,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 9a3309bd9abe00e43ba8a603aa61ba52e5428185..54be8c5712239c4315bb613daf1a836a3b8a52f8 100644 --- a/ets2panda/test/parser/ets/ambient_indexer_1-expected.txt +++ b/ets2panda/test/parser/ets/ambient_indexer_1-expected.txt @@ -178,38 +178,7 @@ "type": "Identifier", "name": "index", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -390,38 +359,7 @@ "type": "Identifier", "name": "index", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 4322543cef619593c71c39e5ef5851b9c9f81541..e57067b171ddc78c324891c23e4281787884b78a 100644 --- a/ets2panda/test/parser/ets/ambient_indexer_6-expected.txt +++ b/ets2panda/test/parser/ets/ambient_indexer_6-expected.txt @@ -178,38 +178,7 @@ "type": "Identifier", "name": "index", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -390,38 +359,7 @@ "type": "Identifier", "name": "index", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 088b039f5ef97812eb919bf6dd68478f39a94235..45a00bdb3810cbed2c414becfa6c4f0edb23befb 100644 --- a/ets2panda/test/parser/ets/arrayLiteralReassign-expected.txt +++ b/ets2panda/test/parser/ets/arrayLiteralReassign-expected.txt @@ -105,38 +105,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 499532b58add38a0f68290fc70151b17263b60c9..bb90d80d2f636dae7ea693f0e6830b6b8ba9e74c 100644 --- a/ets2panda/test/parser/ets/array_creation_expression-expected.txt +++ b/ets2panda/test/parser/ets/array_creation_expression-expected.txt @@ -48,38 +48,7 @@ "optional": false, "computed": false, "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -132,38 +101,7 @@ "optional": false, "computed": false, "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -1305,38 +1243,7 @@ "init": { "type": "ETSNewArrayInstanceExpression", "typeReference": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 480f9b5143480bce1307ae2f1188185cf49bd3be..e2091420b3a8892f59d0f685fd6aef141babbd09 100644 --- a/ets2panda/test/parser/ets/await_complex_promise-expected.txt +++ b/ets2panda/test/parser/ets/await_complex_promise-expected.txt @@ -132,38 +132,7 @@ } }, { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -966,38 +935,7 @@ } }, { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -1168,38 +1106,7 @@ } }, { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -1564,38 +1471,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -1806,38 +1682,7 @@ } }, { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -2768,38 +2613,7 @@ } }, { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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/dynamic_import_tests/modules/module-expected.txt b/ets2panda/test/parser/ets/dynamic_import_tests/modules/module-expected.txt index 82fb53dad3e94d45fc1de928eb7c7204a55f5000..e48680721c30b7f255ce0e47d1df2bd97801afac 100644 --- a/ets2panda/test/parser/ets/dynamic_import_tests/modules/module-expected.txt +++ b/ets2panda/test/parser/ets/dynamic_import_tests/modules/module-expected.txt @@ -3249,38 +3249,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "loc": { - "start": { - "line": 52, - "column": 10, - "program": "module.ets" - }, - "end": { - "line": 52, - "column": 16, - "program": "module.ets" - } - } - }, - "loc": { - "start": { - "line": 52, - "column": 10, - "program": "module.ets" - }, - "end": { - "line": 52, - "column": 16, - "program": "module.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 52, @@ -3374,38 +3343,7 @@ "type": "Identifier", "name": "age", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "loc": { - "start": { - "line": 52, - "column": 10, - "program": "module.ets" - }, - "end": { - "line": 52, - "column": 16, - "program": "module.ets" - } - } - }, - "loc": { - "start": { - "line": 52, - "column": 10, - "program": "module.ets" - }, - "end": { - "line": 52, - "column": 16, - "program": "module.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 52, @@ -3698,38 +3636,7 @@ "optional": false, "computed": false, "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "loc": { - "start": { - "line": 60, - "column": 13, - "program": "module.ets" - }, - "end": { - "line": 60, - "column": 19, - "program": "module.ets" - } - } - }, - "loc": { - "start": { - "line": 60, - "column": 13, - "program": "module.ets" - }, - "end": { - "line": 60, - "column": 19, - "program": "module.ets" - } - } - }, + "type": "ETSPrimitiveType", "loc": { "start": { "line": 60, diff --git a/ets2panda/test/parser/ets/genericDefaultParam_1-expected.txt b/ets2panda/test/parser/ets/genericDefaultParam_1-expected.txt index a3ee7163a7d8a2f8de482c48b001a01260975a5d..70f0c8ea629e9050922b62892f05273c44ab8191 100644 --- a/ets2panda/test/parser/ets/genericDefaultParam_1-expected.txt +++ b/ets2panda/test/parser/ets/genericDefaultParam_1-expected.txt @@ -1253,38 +1253,7 @@ } }, "default": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -1852,38 +1821,7 @@ } }, "default": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -2056,38 +1994,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -2219,38 +2126,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -2428,38 +2304,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -2520,38 +2365,7 @@ } }, { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 7c860a573943fe8cb3d7a111a7b408ed23c82c14..f4af67a668775d7bc0c4ea785d567025ed9c779a 100644 --- a/ets2panda/test/parser/ets/genericDefaultParam_3-expected.txt +++ b/ets2panda/test/parser/ets/genericDefaultParam_3-expected.txt @@ -319,38 +319,7 @@ } }, "default": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 bace8eb46cb7dc32eee2af8288fd17cad3af3d0d..70824df4970f5df926e9666a07ebcf6a9b09dcf5 100644 --- a/ets2panda/test/parser/ets/generics_3-expected.txt +++ b/ets2panda/test/parser/ets/generics_3-expected.txt @@ -632,38 +632,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -912,38 +881,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 fe8df7e92a2f5f0e5e4fdc6ae29788272f170d5c..6d68b65620c11f8c102b76bfb1901eac8b4dc896 100644 --- a/ets2panda/test/parser/ets/generics_4-expected.txt +++ b/ets2panda/test/parser/ets/generics_4-expected.txt @@ -663,38 +663,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -989,38 +958,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 34fb393355f6da30fdfae0d3b389c0555237dedf..6c80dcad509703bbb3a73ae1965502e7835e1340 100644 --- a/ets2panda/test/parser/ets/generics_5-expected.txt +++ b/ets2panda/test/parser/ets/generics_5-expected.txt @@ -601,38 +601,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -835,38 +804,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 ca0dda2c78aebf6bef0faacc3e4b36f6bf7e42cd..0b91596ef33900e1c0c51c57c588e4cf64f2bea7 100644 --- a/ets2panda/test/parser/ets/generics_6-expected.txt +++ b/ets2panda/test/parser/ets/generics_6-expected.txt @@ -831,38 +831,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -900,38 +869,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -1174,38 +1112,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -1243,38 +1150,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 72a997f363519cde597ce85dadcc158cd64c8bd6..cd610f2ca01fa3864f73eda339f62ec72b51a499 100644 --- a/ets2panda/test/parser/ets/generics_7-expected.txt +++ b/ets2panda/test/parser/ets/generics_7-expected.txt @@ -831,38 +831,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -900,38 +869,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -969,38 +907,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -1392,38 +1299,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -1461,38 +1337,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -1530,38 +1375,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 a35edae70c745df9ec5a66f899c1126d8d45fed1..4e250e5c6a56062c07d422730083fb39f36841d9 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 @@ -850,38 +850,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 147b102aff4a06786ee8869a02b34fdbea4dfb53..7d4e23a4bd232b02a30a320e139add994ae7e1ec 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 @@ -1706,38 +1706,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 786c10a4eb0b0150aa7af3cc202c76ad5d488ad5..42311758f6b51b5d07028310cefe65cf5a9500a4 100644 --- a/ets2panda/test/parser/ets/getterOverride-expected.txt +++ b/ets2panda/test/parser/ets/getterOverride-expected.txt @@ -54,38 +54,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -315,38 +284,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 4496494da595bf6f6ad327e80ccef0d0f23eed6c..1eeea896c1696017907e229af1ca4007006a8683 100644 --- a/ets2panda/test/parser/ets/globalVarInLambdaInStatic-expected.txt +++ b/ets2panda/test/parser/ets/globalVarInLambdaInStatic-expected.txt @@ -76,38 +76,7 @@ "type": "Identifier", "name": "n", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -456,38 +425,7 @@ "type": "Identifier", "name": "len", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -1098,38 +1036,7 @@ "type": "Identifier", "name": "len", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -1237,38 +1144,7 @@ "type": "Identifier", "name": "length", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 ab92227861a7d4e4d32858f8f29c3e8d92ce54b8..ab08492d24dd73e7c37ad12633b2b0a05bbab67b 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 @@ -20,38 +20,7 @@ } }, "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 8a881a554f1601749a02754f2ac380883c3a618d..e0a1686da7cacd964c1dd5d101cdf04a4e690d15 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 @@ -71,38 +71,7 @@ "expression": false, "params": [], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 98174478e48cf2aba5fb6edc8b582ca723c4dc4b..bc921209599c62b99b2552c358a0542e039c014c 100644 --- a/ets2panda/test/parser/ets/lambdaAsFunctionParam-expected.txt +++ b/ets2panda/test/parser/ets/lambdaAsFunctionParam-expected.txt @@ -282,38 +282,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -880,38 +849,7 @@ "type": "TSTypeParameterInstantiation", "params": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -1076,38 +1014,7 @@ "type": "Identifier", "name": "a", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -1153,38 +1060,7 @@ "type": "Identifier", "name": "b", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -1226,38 +1102,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 7482e76ab7c29b10503b23f24412c2feb5af1a3d..739c863bfde8b360cea51451e66fb3e27c795ec8 100644 --- a/ets2panda/test/parser/ets/lambda_optional_param_1-expected.txt +++ b/ets2panda/test/parser/ets/lambda_optional_param_1-expected.txt @@ -144,38 +144,7 @@ "type": "Identifier", "name": "y", "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -217,38 +186,7 @@ } ], "returnType": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 4ac1f0d88d92b0c53ab18c53ef15e2d4e12cabab..b772a6c55ac545192ced763e4c46d0fa42e4e284 100644 --- a/ets2panda/test/parser/ets/tupleAsTypeParam1-expected.txt +++ b/ets2panda/test/parser/ets/tupleAsTypeParam1-expected.txt @@ -537,38 +537,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -583,38 +552,7 @@ } }, { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -744,38 +682,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -790,38 +697,7 @@ } }, { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -1018,38 +894,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -1064,38 +909,7 @@ } }, { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 92939865b2c04d725a96aa1b3737ab14737d1710..55d377c6c57aafe4f5f792509a326f37e7ed50ff 100644 --- a/ets2panda/test/parser/ets/tupleAsTypeParam2-expected.txt +++ b/ets2panda/test/parser/ets/tupleAsTypeParam2-expected.txt @@ -669,38 +669,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -715,38 +684,7 @@ } }, { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -876,38 +814,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -922,38 +829,7 @@ } }, { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -1121,38 +997,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -1167,38 +1012,7 @@ } }, { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 7494acb297dd5fe27b0eba40150cee56f3069a3f..28ff0b34f4f248dd937d67624429e1996df3d556 100644 --- a/ets2panda/test/parser/ets/tupleIndexWithNumbers-expected.txt +++ b/ets2panda/test/parser/ets/tupleIndexWithNumbers-expected.txt @@ -238,38 +238,7 @@ "type": "ETSTuple", "types": [ { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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, @@ -284,38 +253,7 @@ } }, { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 84e3416b044481ce5a4f575618b041f293d48d74..2b60317a75d191ba6bbe56a83713363203f31fc5 100644 --- a/ets2panda/test/parser/ets/user_defined_22-expected.txt +++ b/ets2panda/test/parser/ets/user_defined_22-expected.txt @@ -64,38 +64,7 @@ "optional": false, "computed": false, "typeAnnotation": { - "type": "ETSTypeReference", - "part": { - "type": "ETSTypeReferencePart", - "name": { - "type": "Identifier", - "name": "number", - "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 5509bb55eea4f3b3886ea68aeea7cf11c387de1b..e72091babdf9a93bcc69b8a243f89ab3ec0d658e 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 @@ -84,7 +84,7 @@ class B extends A { auto result = ark::es2panda::lsp::GetCodeFixesAtPositionImpl(ctx, start, length, errorCodes, options); ASSERT_EQ(result[0].changes_[0].fileName, expectedFileName); - ASSERT_EQ(result[0].changes_[0].textChanges[0].newText, " foo1(a: number, b: number) {}\n"); + ASSERT_EQ(result[0].changes_[0].textChanges[0].newText, " foo1(a: double, b: double) {}\n"); ASSERT_EQ(result[0].changes_[0].textChanges[0].span.start, expectedTextChangeStart); ASSERT_EQ(result[0].fixName_, EXPECTED_FIX_NAME); ASSERT_EQ(result[0].fixId_, EXPECTED_FIX_NAME); @@ -106,7 +106,7 @@ class B extends A { class C extends A { })"); - 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 expectedTextChangeStart1 = 122; const size_t expectedTextChangeStart2 = 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 2fd224497dcb7776bced06ee284486c98d64c18f..739e9d690c7c01f6d52585771578391b48cdb6d1 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 67ebc36f98f0bc58efe0eec1d989f46e70f468eb..bb98dabd109e850fafc0c28e3e057d9e035f7bb1 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)); }