From d2e7265dcb700c55581b851948ff6e8da8b6eb0f Mon Sep 17 00:00:00 2001 From: xingshunxiang Date: Tue, 5 Aug 2025 11:49:20 +0800 Subject: [PATCH] Correct source range of class method and fix capi Issue: https://gitee.com/openharmony/arkcompiler_ets_frontend/issues/ICR68A?from=project-issue Description: 1. class method source range incorrect 2. fix the api: GetLicenseFromRootNode, when the 'use static' string is at the very front of the files, we need also get the license string behind it. Reason: 1. class method source range incorrect 2. fix the api: GetLicenseFromRootNode, when the 'use static' string is at the very front of the files, we need also get the license string behind it. Tests: ninja tests passed tests/tests-u-runner/runner.sh --ets-cts --show-progress --build-dir x64.release --processes=all passed tests/tests-u-runner/runner.sh --ets-func-tests --show-progress --build-dir x64.release --processes=all passed tests/tests-u-runner/runner.sh --astchecker --show-progress --build-dir x64.release --processes=all passed tests/tests-u-runner/runner.sh --ets-runtime --show-progress --build-dir x64.release --processes=all passed tests/tests-u-runner/runner.sh --parser --no-js --show-progress --build-dir x64.release --processes=all passed Signed-off-by: xingshunxiang --- ets2panda/parser/ETSparser.cpp | 4 +- ets2panda/parser/JsdocHelper.cpp | 14 +++-- ..._specific_method_with_empty_rest_param.ets | 2 +- .../test/ast/parser/ets/InvalidClasses.ets | 16 +++--- .../parser/ets/method_modifier_check_1.ets | 2 +- .../parser/ets/method_modifier_check_10.ets | 6 +-- .../parser/ets/method_modifier_check_13.ets | 2 +- .../parser/ets/method_modifier_check_15.ets | 6 +-- .../parser/ets/method_modifier_check_2.ets | 2 +- .../parser/ets/method_modifier_check_3.ets | 2 +- .../parser/ets/method_modifier_check_4.ets | 2 +- .../parser/ets/method_modifier_check_5.ets | 2 +- .../parser/ets/method_modifier_check_6.ets | 6 +-- .../parser/ets/method_modifier_check_7.ets | 2 +- .../parser/ets/method_modifier_check_9.ets | 2 +- .../ast/parser/ets/visible_signatures_1.ets | 2 +- ...ctMethodDeclaredInParentClass-expected.txt | 8 +-- ...actNewClassInstanceExpression-expected.txt | 4 +- .../ets/class_def_varargs_1-expected.txt | 2 +- .../ets/delete-non-keyword-expected.txt | 2 +- .../ets/func-ref-private-expected.txt | 2 +- .../ets/generic_arrayaslist-expected.txt | 38 +++++++------- .../ets/generic_deadlock-expected.txt | 4 +- .../ets/generic_override_3-expected.txt | 2 +- .../generics_implicit_lambda1-expected.txt | 4 +- .../ets/generics_instantiation_1-expected.txt | 8 +-- .../ets/generics_instantiation_3-expected.txt | 2 +- .../asyncfun_lambda_lib-expected.txt | 2 +- .../ets/lambda_unresolved_ref_1-expected.txt | 2 +- ...erExpressionFromStaticContext-expected.txt | 12 ++--- .../methodOverrideAsyncMethod-expected.txt | 2 +- ...odOverrideCovariantReturnType-expected.txt | 8 +-- ...hodOverrideDifferentSignature-expected.txt | 10 ++-- ...methodOverrideWithoutModifier-expected.txt | 4 +- .../ets/multipleMethodOverride-expected.txt | 6 +-- .../ets/overload_with_generics-expected.txt | 4 +- .../test/compiler/ets/override-expected.txt | 8 +-- .../test/compiler/ets/override10-expected.txt | 2 +- .../test/compiler/ets/override12-expected.txt | 4 +- .../test/compiler/ets/override13-expected.txt | 2 +- .../test/compiler/ets/override16-expected.txt | 2 +- .../test/compiler/ets/override17-expected.txt | 4 +- .../test/compiler/ets/override19-expected.txt | 4 +- .../test/compiler/ets/override2-expected.txt | 2 +- .../test/compiler/ets/override5-expected.txt | 4 +- .../test/compiler/ets/override6-expected.txt | 2 +- .../test/compiler/ets/override8-expected.txt | 2 +- .../test/compiler/ets/override9-expected.txt | 2 +- .../ets/returnTypeGenericArray-expected.txt | 2 +- .../compiler/ets/tuple_types_19-expected.txt | 4 +- ...arReferenceFromStaticContext2-expected.txt | 2 +- .../parser/ets/AccessBinaryTrees-expected.txt | 6 +-- .../parser/ets/AccessFannkuch-expected.txt | 4 +- .../test/parser/ets/AccessNBody-expected.txt | 18 +++---- .../test/parser/ets/AccessNSieve-expected.txt | 8 +-- .../ets/Bitops3BitBitsInByte-expected.txt | 4 +- .../parser/ets/BitopsBitsInByte-expected.txt | 4 +- .../parser/ets/BitopsBitwiseAnd-expected.txt | 2 +- .../parser/ets/BitopsNSieveBits-expected.txt | 6 +-- .../ets/ControlFlowRecursive-expected.txt | 8 +-- .../ets/InferTypeParamFromParam1-expected.txt | 4 +- .../ets/InferTypeParamFromParam3-expected.txt | 2 +- .../test/parser/ets/MathCordic-expected.txt | 12 ++--- .../parser/ets/MathPartialSums-expected.txt | 4 +- .../parser/ets/MathSpectralNorm-expected.txt | 12 ++--- .../test/parser/ets/Morph3d-expected.txt | 6 +-- .../StaticFieldAndMethodSameName-expected.txt | 2 +- ...dAndMethodSameNameInheritance-expected.txt | 2 +- .../test/parser/ets/StringBase64-expected.txt | 2 +- .../parser/ets/access_modifier_2-expected.txt | 2 +- .../ets/ambient_object_iterable-expected.txt | 4 +- .../test/parser/ets/assignments-expected.txt | 2 +- .../parser/ets/async_function-expected.txt | 2 +- .../parser/ets/async_overload-expected.txt | 4 +- .../calling_superclass_methods-expected.txt | 4 +- .../parser/ets/declare_class-expected.txt | 2 +- .../modules/module-expected.txt | 4 +- .../parser/ets/empty_statement-expected.txt | 4 +- ...unction_implicit_return_type5-expected.txt | 2 +- ...unction_implicit_return_type9-expected.txt | 2 +- .../parser/ets/generic_resolve-expected.txt | 2 +- .../test/parser/ets/generics_2-expected.txt | 4 +- ...rics_type_param_constraint_12-expected.txt | 2 +- .../globalVarInLambdaInStatic-expected.txt | 2 +- .../ets/global_const_vars3-expected.txt | 2 +- ets2panda/test/parser/ets/if-expected.txt | 2 +- ...overriding_method_return_type-expected.txt | 2 +- .../parser/ets/internalParsing-expected.txt | 2 +- .../ets/internalProtectedParsing-expected.txt | 2 +- ets2panda/test/parser/ets/launch-expected.txt | 4 +- .../test/parser/ets/launch_super-expected.txt | 4 +- .../ets/launch_this_callee-expected.txt | 8 +-- .../launch_with_call_expression-expected.txt | 2 +- .../test/parser/ets/method_empty-expected.txt | 6 +-- .../ets/method_modifier_check_14-expected.txt | 2 +- .../ets/method_modifier_check_8-expected.txt | 2 +- .../ets/optional_union_paramter-expected.txt | 2 +- .../test/parser/ets/override-expected.txt | 2 +- .../ets/overrideStaticFunc-expected.txt | 2 +- .../static_function_override_1-expected.txt | 4 +- .../static_function_override_2-expected.txt | 2 +- .../static_function_override_3-expected.txt | 2 +- .../ets/test-type-alias-call1-expected.txt | 2 +- .../ets/test-type-alias-call2-expected.txt | 2 +- .../ets/test-type-alias-call3-expected.txt | 2 +- .../ets/test-type-alias-call4-expected.txt | 2 +- .../ets/test-type-alias-call5-expected.txt | 2 +- .../ets/test-type-alias-call6-expected.txt | 2 +- .../ets/test-type-alias-call8-expected.txt | 2 +- .../test/parser/ets/this_callee-expected.txt | 8 +-- .../parser/ets/this_cmp_object-expected.txt | 2 +- .../parser/ets/type_variance1-expected.txt | 4 +- .../test/parser/ets/var_declare-expected.txt | 2 +- .../plugin_proceed_to_state_check_jsdoc.cpp | 3 +- ...d_to_state_parse_and_verifier_position.cpp | 52 +++++++++++++++---- 115 files changed, 284 insertions(+), 245 deletions(-) diff --git a/ets2panda/parser/ETSparser.cpp b/ets2panda/parser/ETSparser.cpp index eb1fabd6b9..624644ed4e 100644 --- a/ets2panda/parser/ETSparser.cpp +++ b/ets2panda/parser/ETSparser.cpp @@ -695,10 +695,10 @@ ir::AstNode *ETSParser::ParseInnerRest(const ArenaVector &propert return ParseClassGetterSetterMethod(properties, modifiers, memberModifiers, isDefault); } - auto parseClassMethod = [&memberModifiers, &startLoc, isDefault, this](ir::Identifier *methodName) { + auto parseClassMethod = [&memberModifiers, isDefault, this](ir::Identifier *methodName) { auto *classMethod = ParseClassMethodDefinition(methodName, memberModifiers, isDefault); ES2PANDA_ASSERT(classMethod != nullptr); - classMethod->SetStart(startLoc); + classMethod->SetStart(methodName->Start()); return classMethod; }; diff --git a/ets2panda/parser/JsdocHelper.cpp b/ets2panda/parser/JsdocHelper.cpp index e825a0d536..1823498a41 100644 --- a/ets2panda/parser/JsdocHelper.cpp +++ b/ets2panda/parser/JsdocHelper.cpp @@ -169,10 +169,18 @@ util::StringView JsdocHelper::GetJsdocBackward() util::StringView JsdocHelper::GetLicenseStringFromStart() { - if (!sourceCode_.StartsWith(LICENSES_START) && !sourceCode_.StartsWith(JSDOC_START)) { + size_t startPos = START_POS; + auto sv = SourceView(startPos, sourceCode_.Length()); + static constexpr std::string_view MANDATORY_PREFIX = "\'use static\'\n"; + static constexpr std::string_view MANDATORY_PREFIX_DOUBLE_QUOTE = "\"use static\"\n"; + if (sv.StartsWith(MANDATORY_PREFIX) || sv.StartsWith(MANDATORY_PREFIX_DOUBLE_QUOTE)) { + startPos += MANDATORY_PREFIX.length(); + sv = SourceView(startPos, sourceCode_.Length()); + } + + if (!sv.StartsWith(LICENSES_START) && !sv.StartsWith(JSDOC_START)) { return EMPTY_LICENSE; } - Iterator().Reset(START_POS); Forward(LICENSES_START.length()); do { @@ -197,6 +205,6 @@ util::StringView JsdocHelper::GetLicenseStringFromStart() break; } while (true); - return SourceView(START_POS, Iterator().Index()); + return SourceView(startPos, Iterator().Index()); } } // namespace ark::es2panda::parser diff --git a/ets2panda/test/ast/compiler/ets/most_specific_method_with_empty_rest_param.ets b/ets2panda/test/ast/compiler/ets/most_specific_method_with_empty_rest_param.ets index 7ec8ba7d89..28f72a3b38 100644 --- a/ets2panda/test/ast/compiler/ets/most_specific_method_with_empty_rest_param.ets +++ b/ets2panda/test/ast/compiler/ets/most_specific_method_with_empty_rest_param.ets @@ -27,4 +27,4 @@ function main() { c.met() } -/* @@? 20:5 Error TypeError: Function met with this assembly signature already declared. */ +/* @@? 20:12 Error TypeError: Function met with this assembly signature already declared. */ diff --git a/ets2panda/test/ast/parser/ets/InvalidClasses.ets b/ets2panda/test/ast/parser/ets/InvalidClasses.ets index ce65f5f10f..131be93eea 100644 --- a/ets2panda/test/ast/parser/ets/InvalidClasses.ets +++ b/ets2panda/test/ast/parser/ets/InvalidClasses.ets @@ -85,21 +85,21 @@ interface I1 { /* @@? 18:30 Error TypeError: Native, Abstract and Declare methods cannot have body. */ /* @@? 19:21 Error TypeError: Static property 'f' must be accessed through it's class 'A' */ /* @@? 22:12 Error SyntaxError: Access modifier must precede field and method modifiers. */ -/* @@? 22:20 Error TypeError: Invalid method modifier(s): an abstract method can't have private, override, static, final or native modifier. */ +/* @@? 22:36 Error TypeError: Invalid method modifier(s): an abstract method can't have private, override, static, final or native modifier. */ /* @@? 22:46 Error TypeError: Native, Abstract and Declare methods cannot have body. */ /* @@? 26:18 Error SyntaxError: Native method cannot be async. */ -/* @@? 27:5 Error TypeError: Non abstract class has abstract method. */ /* @@? 27:20 Error SyntaxError: Abstract method cannot be async. */ +/* @@? 27:20 Error TypeError: Non abstract class has abstract method. */ /* @@? 35:5 Error SyntaxError: Only one static block is allowed in one namespace or class. */ /* @@? 38:10 Error SyntaxError: Duplicated modifier is not allowed. */ -/* @@? 41:5 Error SyntaxError: The special predefined method '$_get' should have exactly one required parameter. */ -/* @@? 41:5 Error SyntaxError: The special predefined method '$_get' cannot be asynchronous. */ +/* @@? 41:11 Error SyntaxError: The special predefined method '$_get' should have exactly one required parameter. */ +/* @@? 41:11 Error SyntaxError: The special predefined method '$_get' cannot be asynchronous. */ /* @@? 41:16 Error TypeError: Return type of async function must be 'Promise'. */ -/* @@? 45:5 Error SyntaxError: The special predefined method '$_set' should have exactly two required parameter. */ -/* @@? 45:5 Error SyntaxError: The special predefined method '$_set' cannot be asynchronous. */ +/* @@? 45:11 Error SyntaxError: The special predefined method '$_set' should have exactly two required parameter. */ +/* @@? 45:11 Error SyntaxError: The special predefined method '$_set' cannot be asynchronous. */ /* @@? 45:16 Error TypeError: Only abstract or native methods can't have body. */ -/* @@? 47:5 Error SyntaxError: The special predefined method '$_iterator' cannot be asynchronous. */ -/* @@? 47:5 Error SyntaxError: The special predefined method '$_iterator' should not have parameters. */ +/* @@? 47:11 Error SyntaxError: The special predefined method '$_iterator' cannot be asynchronous. */ +/* @@? 47:11 Error SyntaxError: The special predefined method '$_iterator' should not have parameters. */ /* @@? 47:21 Error TypeError: The return type of '$_iterator' must be a type that implements Iterator interface. */ /* @@? 47:21 Error TypeError: Return type of async function must be 'Promise'. */ /* @@? 54:21 Error TypeError: Initializers are not allowed in ambient contexts: x */ diff --git a/ets2panda/test/ast/parser/ets/method_modifier_check_1.ets b/ets2panda/test/ast/parser/ets/method_modifier_check_1.ets index 821072dfef..b7dc7a4833 100644 --- a/ets2panda/test/ast/parser/ets/method_modifier_check_1.ets +++ b/ets2panda/test/ast/parser/ets/method_modifier_check_1.ets @@ -14,7 +14,7 @@ */ abstract class A { - /* @@ label */abstract static foo(): void /* @@ label1 */{} + abstract static /* @@ label */foo(): void /* @@ label1 */{} } /* @@@ label Error TypeError: Invalid method modifier(s): an abstract method can't have private, override, static, final or native modifier. */ diff --git a/ets2panda/test/ast/parser/ets/method_modifier_check_10.ets b/ets2panda/test/ast/parser/ets/method_modifier_check_10.ets index ab3775e63a..213f10bfdb 100644 --- a/ets2panda/test/ast/parser/ets/method_modifier_check_10.ets +++ b/ets2panda/test/ast/parser/ets/method_modifier_check_10.ets @@ -14,8 +14,8 @@ */ class A { - final static foo() : void {} + final static /* @@ label */foo() : void {} } -/* @@? 17:5 Error TypeError: Invalid method modifier(s): a final method can't have abstract or static modifier. */ -/* @@? 17:5 Error TypeError: Invalid method modifier(s): a static method can't have abstract, final or override modifier. */ +/* @@@ label Error TypeError: Invalid method modifier(s): a final method can't have abstract or static modifier. */ +/* @@@ label Error TypeError: Invalid method modifier(s): a static method can't have abstract, final or override modifier. */ diff --git a/ets2panda/test/ast/parser/ets/method_modifier_check_13.ets b/ets2panda/test/ast/parser/ets/method_modifier_check_13.ets index a4d21bce02..8d596511c7 100644 --- a/ets2panda/test/ast/parser/ets/method_modifier_check_13.ets +++ b/ets2panda/test/ast/parser/ets/method_modifier_check_13.ets @@ -14,7 +14,7 @@ */ abstract class A { - /* @@ label */native abstract foo() : void; + native abstract /* @@ label */foo() : void; } /* @@@ label Error TypeError: Invalid method modifier(s): an abstract method can't have private, override, static, final or native modifier. */ diff --git a/ets2panda/test/ast/parser/ets/method_modifier_check_15.ets b/ets2panda/test/ast/parser/ets/method_modifier_check_15.ets index d9ddd68e77..2ce06b448a 100644 --- a/ets2panda/test/ast/parser/ets/method_modifier_check_15.ets +++ b/ets2panda/test/ast/parser/ets/method_modifier_check_15.ets @@ -15,8 +15,8 @@ class A { native final foo() : void; - static final foo2() : void {}; + static final /* @@ label */foo2() : void {}; } -/* @@? 18:5 Error TypeError: Invalid method modifier(s): a final method can't have abstract or static modifier. */ -/* @@? 18:5 Error TypeError: Invalid method modifier(s): a static method can't have abstract, final or override modifier. */ \ No newline at end of file +/* @@@ label Error TypeError: Invalid method modifier(s): a final method can't have abstract or static modifier. */ +/* @@@ label Error TypeError: Invalid method modifier(s): a static method can't have abstract, final or override modifier. */ \ No newline at end of file diff --git a/ets2panda/test/ast/parser/ets/method_modifier_check_2.ets b/ets2panda/test/ast/parser/ets/method_modifier_check_2.ets index 134d8fae47..2f3b401762 100644 --- a/ets2panda/test/ast/parser/ets/method_modifier_check_2.ets +++ b/ets2panda/test/ast/parser/ets/method_modifier_check_2.ets @@ -14,7 +14,7 @@ */ abstract class A { - /* @@ label */abstract final foo(): void /* @@ label1 */{} + abstract final /* @@ label */foo(): void /* @@ label1 */{} } /* @@@ label Error TypeError: Invalid method modifier(s): an abstract method can't have private, override, static, final or native modifier. */ diff --git a/ets2panda/test/ast/parser/ets/method_modifier_check_3.ets b/ets2panda/test/ast/parser/ets/method_modifier_check_3.ets index 04ca1b3e84..477dbe2f37 100644 --- a/ets2panda/test/ast/parser/ets/method_modifier_check_3.ets +++ b/ets2panda/test/ast/parser/ets/method_modifier_check_3.ets @@ -14,7 +14,7 @@ */ abstract class A { - /* @@ label */abstract override foo(): void /* @@ label1 */{} + abstract override /* @@ label */foo(): void /* @@ label1 */{} } /* @@@ label Error TypeError: Invalid method modifier(s): an abstract method can't have private, override, static, final or native modifier. */ diff --git a/ets2panda/test/ast/parser/ets/method_modifier_check_4.ets b/ets2panda/test/ast/parser/ets/method_modifier_check_4.ets index 35b31adb7e..a2c56ede00 100644 --- a/ets2panda/test/ast/parser/ets/method_modifier_check_4.ets +++ b/ets2panda/test/ast/parser/ets/method_modifier_check_4.ets @@ -14,7 +14,7 @@ */ abstract class A { - /* @@ label */abstract native foo(): void /* @@ label1 */{} + abstract native /* @@ label */foo(): void /* @@ label1 */{} } /* @@@ label Error TypeError: Invalid method modifier(s): an abstract method can't have private, override, static, final or native modifier. */ diff --git a/ets2panda/test/ast/parser/ets/method_modifier_check_5.ets b/ets2panda/test/ast/parser/ets/method_modifier_check_5.ets index fd5a2f5635..cc9f684ee9 100644 --- a/ets2panda/test/ast/parser/ets/method_modifier_check_5.ets +++ b/ets2panda/test/ast/parser/ets/method_modifier_check_5.ets @@ -14,7 +14,7 @@ */ abstract class A { - /* @@ label */static abstract foo(): void /* @@ label1 */{} + static abstract /* @@ label */foo(): void /* @@ label1 */{} } /* @@@ label Error TypeError: Invalid method modifier(s): an abstract method can't have private, override, static, final or native modifier. */ diff --git a/ets2panda/test/ast/parser/ets/method_modifier_check_6.ets b/ets2panda/test/ast/parser/ets/method_modifier_check_6.ets index 43793d5207..8b927eca6b 100644 --- a/ets2panda/test/ast/parser/ets/method_modifier_check_6.ets +++ b/ets2panda/test/ast/parser/ets/method_modifier_check_6.ets @@ -14,8 +14,8 @@ */ class A { - static final foo(): void {} + static final /* @@ label */foo(): void {} } -/* @@? 17:5 Error TypeError: Invalid method modifier(s): a final method can't have abstract or static modifier. */ -/* @@? 17:5 Error TypeError: Invalid method modifier(s): a static method can't have abstract, final or override modifier. */ +/* @@@ label Error TypeError: Invalid method modifier(s): a final method can't have abstract or static modifier. */ +/* @@@ label Error TypeError: Invalid method modifier(s): a static method can't have abstract, final or override modifier. */ diff --git a/ets2panda/test/ast/parser/ets/method_modifier_check_7.ets b/ets2panda/test/ast/parser/ets/method_modifier_check_7.ets index eb889baf01..8ade465440 100644 --- a/ets2panda/test/ast/parser/ets/method_modifier_check_7.ets +++ b/ets2panda/test/ast/parser/ets/method_modifier_check_7.ets @@ -14,7 +14,7 @@ */ class A { - /* @@ label */static override foo(): void {} + static override /* @@ label */foo(): void {} } /* @@@ label Error TypeError: Invalid method modifier(s): a static method can't have abstract, final or override modifier. */ diff --git a/ets2panda/test/ast/parser/ets/method_modifier_check_9.ets b/ets2panda/test/ast/parser/ets/method_modifier_check_9.ets index 4b48b2eb56..b820366759 100644 --- a/ets2panda/test/ast/parser/ets/method_modifier_check_9.ets +++ b/ets2panda/test/ast/parser/ets/method_modifier_check_9.ets @@ -14,7 +14,7 @@ */ abstract class A { - /* @@ label */final abstract foo() : void; + final abstract /* @@ label */foo() : void; } /* @@@ label Error TypeError: Invalid method modifier(s): an abstract method can't have private, override, static, final or native modifier. */ diff --git a/ets2panda/test/ast/parser/ets/visible_signatures_1.ets b/ets2panda/test/ast/parser/ets/visible_signatures_1.ets index 829fc98702..7be7ca46ca 100644 --- a/ets2panda/test/ast/parser/ets/visible_signatures_1.ets +++ b/ets2panda/test/ast/parser/ets/visible_signatures_1.ets @@ -27,6 +27,6 @@ function main(): void { } -/* @@? 20:5 Error TypeError: Function foo with this assembly signature already declared. */ +/* @@? 20:13 Error TypeError: Function foo with this assembly signature already declared. */ /* @@? 26:5 Error TypeError: Signature foo(a: Double|undefined): Int is not visible here. */ /* @@? 26:5 Error TypeError: No matching call signature for foo(Double) */ diff --git a/ets2panda/test/compiler/ets/abstractMethodDeclaredInParentClass-expected.txt b/ets2panda/test/compiler/ets/abstractMethodDeclaredInParentClass-expected.txt index e9c2649b99..b8144feab0 100644 --- a/ets2panda/test/compiler/ets/abstractMethodDeclaredInParentClass-expected.txt +++ b/ets2panda/test/compiler/ets/abstractMethodDeclaredInParentClass-expected.txt @@ -647,7 +647,7 @@ "loc": { "start": { "line": 20, - "column": 5, + "column": 14, "program": "abstractMethodDeclaredInParentClass.ets" }, "end": { @@ -816,7 +816,7 @@ "loc": { "start": { "line": 24, - "column": 5, + "column": 14, "program": "abstractMethodDeclaredInParentClass.ets" }, "end": { @@ -1577,7 +1577,7 @@ "loc": { "start": { "line": 38, - "column": 5, + "column": 14, "program": "abstractMethodDeclaredInParentClass.ets" }, "end": { @@ -2861,7 +2861,7 @@ "loc": { "start": { "line": 55, - "column": 5, + "column": 14, "program": "abstractMethodDeclaredInParentClass.ets" }, "end": { diff --git a/ets2panda/test/compiler/ets/abstractNewClassInstanceExpression-expected.txt b/ets2panda/test/compiler/ets/abstractNewClassInstanceExpression-expected.txt index 9798e81dae..fb714c45f7 100644 --- a/ets2panda/test/compiler/ets/abstractNewClassInstanceExpression-expected.txt +++ b/ets2panda/test/compiler/ets/abstractNewClassInstanceExpression-expected.txt @@ -119,7 +119,7 @@ "loc": { "start": { "line": 17, - "column": 5, + "column": 14, "program": "abstractNewClassInstanceExpression.ets" }, "end": { @@ -700,7 +700,7 @@ "loc": { "start": { "line": 27, - "column": 9, + "column": 18, "program": "abstractNewClassInstanceExpression.ets" }, "end": { diff --git a/ets2panda/test/compiler/ets/class_def_varargs_1-expected.txt b/ets2panda/test/compiler/ets/class_def_varargs_1-expected.txt index e1f38b4664..eedfeb7511 100644 --- a/ets2panda/test/compiler/ets/class_def_varargs_1-expected.txt +++ b/ets2panda/test/compiler/ets/class_def_varargs_1-expected.txt @@ -931,7 +931,7 @@ "loc": { "start": { "line": 18, - "column": 5, + "column": 12, "program": "class_def_varargs_1.ets" }, "end": { diff --git a/ets2panda/test/compiler/ets/delete-non-keyword-expected.txt b/ets2panda/test/compiler/ets/delete-non-keyword-expected.txt index 29cda5aafe..8f4336238a 100644 --- a/ets2panda/test/compiler/ets/delete-non-keyword-expected.txt +++ b/ets2panda/test/compiler/ets/delete-non-keyword-expected.txt @@ -202,7 +202,7 @@ "loc": { "start": { "line": 17, - "column": 5, + "column": 12, "program": "delete-non-keyword.ets" }, "end": { diff --git a/ets2panda/test/compiler/ets/func-ref-private-expected.txt b/ets2panda/test/compiler/ets/func-ref-private-expected.txt index 37bf0bf103..58adac78d3 100644 --- a/ets2panda/test/compiler/ets/func-ref-private-expected.txt +++ b/ets2panda/test/compiler/ets/func-ref-private-expected.txt @@ -168,7 +168,7 @@ "loc": { "start": { "line": 21, - "column": 4, + "column": 12, "program": "func-ref-private.ets" }, "end": { diff --git a/ets2panda/test/compiler/ets/generic_arrayaslist-expected.txt b/ets2panda/test/compiler/ets/generic_arrayaslist-expected.txt index 1f93b34eb8..66fb2f4f43 100644 --- a/ets2panda/test/compiler/ets/generic_arrayaslist-expected.txt +++ b/ets2panda/test/compiler/ets/generic_arrayaslist-expected.txt @@ -4836,7 +4836,7 @@ "loc": { "start": { "line": 39, - "column": 5, + "column": 13, "program": "generic_arrayaslist.ets" }, "end": { @@ -6634,7 +6634,7 @@ "loc": { "start": { "line": 58, - "column": 5, + "column": 12, "program": "generic_arrayaslist.ets" }, "end": { @@ -7226,7 +7226,7 @@ "loc": { "start": { "line": 68, - "column": 5, + "column": 13, "program": "generic_arrayaslist.ets" }, "end": { @@ -8770,7 +8770,7 @@ "loc": { "start": { "line": 79, - "column": 5, + "column": 21, "program": "generic_arrayaslist.ets" }, "end": { @@ -9886,7 +9886,7 @@ "loc": { "start": { "line": 92, - "column": 5, + "column": 21, "program": "generic_arrayaslist.ets" }, "end": { @@ -11334,7 +11334,7 @@ "loc": { "start": { "line": 102, - "column": 5, + "column": 21, "program": "generic_arrayaslist.ets" }, "end": { @@ -11926,7 +11926,7 @@ "loc": { "start": { "line": 114, - "column": 5, + "column": 21, "program": "generic_arrayaslist.ets" }, "end": { @@ -12112,7 +12112,7 @@ "loc": { "start": { "line": 120, - "column": 5, + "column": 21, "program": "generic_arrayaslist.ets" }, "end": { @@ -12474,7 +12474,7 @@ "loc": { "start": { "line": 124, - "column": 5, + "column": 21, "program": "generic_arrayaslist.ets" }, "end": { @@ -13201,7 +13201,7 @@ "loc": { "start": { "line": 128, - "column": 5, + "column": 21, "program": "generic_arrayaslist.ets" }, "end": { @@ -14166,7 +14166,7 @@ "loc": { "start": { "line": 141, - "column": 5, + "column": 21, "program": "generic_arrayaslist.ets" }, "end": { @@ -15296,7 +15296,7 @@ "loc": { "start": { "line": 148, - "column": 5, + "column": 21, "program": "generic_arrayaslist.ets" }, "end": { @@ -16728,7 +16728,7 @@ "loc": { "start": { "line": 156, - "column": 5, + "column": 21, "program": "generic_arrayaslist.ets" }, "end": { @@ -17823,7 +17823,7 @@ "loc": { "start": { "line": 170, - "column": 5, + "column": 21, "program": "generic_arrayaslist.ets" }, "end": { @@ -19904,7 +19904,7 @@ "loc": { "start": { "line": 178, - "column": 5, + "column": 21, "program": "generic_arrayaslist.ets" }, "end": { @@ -20621,7 +20621,7 @@ "loc": { "start": { "line": 198, - "column": 5, + "column": 21, "program": "generic_arrayaslist.ets" }, "end": { @@ -21234,7 +21234,7 @@ "loc": { "start": { "line": 203, - "column": 5, + "column": 13, "program": "generic_arrayaslist.ets" }, "end": { @@ -23277,7 +23277,7 @@ "loc": { "start": { "line": 207, - "column": 5, + "column": 20, "program": "generic_arrayaslist.ets" }, "end": { @@ -24857,7 +24857,7 @@ "loc": { "start": { "line": 225, - "column": 5, + "column": 20, "program": "generic_arrayaslist.ets" }, "end": { diff --git a/ets2panda/test/compiler/ets/generic_deadlock-expected.txt b/ets2panda/test/compiler/ets/generic_deadlock-expected.txt index 2ea5d957b2..37f7b8aca7 100644 --- a/ets2panda/test/compiler/ets/generic_deadlock-expected.txt +++ b/ets2panda/test/compiler/ets/generic_deadlock-expected.txt @@ -364,7 +364,7 @@ "loc": { "start": { "line": 17, - "column": 5, + "column": 19, "program": "generic_deadlock.ets" }, "end": { @@ -714,7 +714,7 @@ "loc": { "start": { "line": 20, - "column": 5, + "column": 19, "program": "generic_deadlock.ets" }, "end": { diff --git a/ets2panda/test/compiler/ets/generic_override_3-expected.txt b/ets2panda/test/compiler/ets/generic_override_3-expected.txt index d82e215fac..abc1f04d13 100644 --- a/ets2panda/test/compiler/ets/generic_override_3-expected.txt +++ b/ets2panda/test/compiler/ets/generic_override_3-expected.txt @@ -2100,7 +2100,7 @@ "loc": { "start": { "line": 25, - "column": 5, + "column": 21, "program": "generic_override_3.ets" }, "end": { diff --git a/ets2panda/test/compiler/ets/generics_implicit_lambda1-expected.txt b/ets2panda/test/compiler/ets/generics_implicit_lambda1-expected.txt index 1e486d79ef..75757cf4f9 100644 --- a/ets2panda/test/compiler/ets/generics_implicit_lambda1-expected.txt +++ b/ets2panda/test/compiler/ets/generics_implicit_lambda1-expected.txt @@ -541,7 +541,7 @@ "loc": { "start": { "line": 22, - "column": 5, + "column": 12, "program": "generics_implicit_lambda1.ets" }, "end": { @@ -1068,7 +1068,7 @@ "loc": { "start": { "line": 28, - "column": 5, + "column": 12, "program": "generics_implicit_lambda1.ets" }, "end": { diff --git a/ets2panda/test/compiler/ets/generics_instantiation_1-expected.txt b/ets2panda/test/compiler/ets/generics_instantiation_1-expected.txt index b8b74934c4..617978c42b 100644 --- a/ets2panda/test/compiler/ets/generics_instantiation_1-expected.txt +++ b/ets2panda/test/compiler/ets/generics_instantiation_1-expected.txt @@ -699,7 +699,7 @@ "loc": { "start": { "line": 21, - "column": 5, + "column": 12, "program": "generics_instantiation_1.ets" }, "end": { @@ -1304,7 +1304,7 @@ "loc": { "start": { "line": 27, - "column": 5, + "column": 12, "program": "generics_instantiation_1.ets" }, "end": { @@ -1911,7 +1911,7 @@ "loc": { "start": { "line": 30, - "column": 5, + "column": 13, "program": "generics_instantiation_1.ets" }, "end": { @@ -2143,7 +2143,7 @@ "loc": { "start": { "line": 35, - "column": 5, + "column": 13, "program": "generics_instantiation_1.ets" }, "end": { diff --git a/ets2panda/test/compiler/ets/generics_instantiation_3-expected.txt b/ets2panda/test/compiler/ets/generics_instantiation_3-expected.txt index aceea53fa2..cd4bdaddf2 100644 --- a/ets2panda/test/compiler/ets/generics_instantiation_3-expected.txt +++ b/ets2panda/test/compiler/ets/generics_instantiation_3-expected.txt @@ -442,7 +442,7 @@ "loc": { "start": { "line": 17, - "column": 5, + "column": 12, "program": "generics_instantiation_3.ets" }, "end": { diff --git a/ets2panda/test/compiler/ets/import_tests/asyncfun_lambda_lib-expected.txt b/ets2panda/test/compiler/ets/import_tests/asyncfun_lambda_lib-expected.txt index ae9bb2e03a..1848e77fcc 100644 --- a/ets2panda/test/compiler/ets/import_tests/asyncfun_lambda_lib-expected.txt +++ b/ets2panda/test/compiler/ets/import_tests/asyncfun_lambda_lib-expected.txt @@ -295,7 +295,7 @@ "loc": { "start": { "line": 16, - "column": 19, + "column": 25, "program": "asyncfun_lambda_lib.ets" }, "end": { diff --git a/ets2panda/test/compiler/ets/lambda_unresolved_ref_1-expected.txt b/ets2panda/test/compiler/ets/lambda_unresolved_ref_1-expected.txt index 384e306625..1edc4a6c58 100644 --- a/ets2panda/test/compiler/ets/lambda_unresolved_ref_1-expected.txt +++ b/ets2panda/test/compiler/ets/lambda_unresolved_ref_1-expected.txt @@ -577,7 +577,7 @@ "loc": { "start": { "line": 17, - "column": 5, + "column": 12, "program": "lambda_unresolved_ref_1.ets" }, "end": { diff --git a/ets2panda/test/compiler/ets/memberExpressionFromStaticContext-expected.txt b/ets2panda/test/compiler/ets/memberExpressionFromStaticContext-expected.txt index d7379dffb5..293198068d 100644 --- a/ets2panda/test/compiler/ets/memberExpressionFromStaticContext-expected.txt +++ b/ets2panda/test/compiler/ets/memberExpressionFromStaticContext-expected.txt @@ -256,7 +256,7 @@ "loc": { "start": { "line": 18, - "column": 5, + "column": 12, "program": "memberExpressionFromStaticContext.ets" }, "end": { @@ -624,7 +624,7 @@ "loc": { "start": { "line": 20, - "column": 5, + "column": 12, "program": "memberExpressionFromStaticContext.ets" }, "end": { @@ -1021,7 +1021,7 @@ "loc": { "start": { "line": 28, - "column": 5, + "column": 12, "program": "memberExpressionFromStaticContext.ets" }, "end": { @@ -1668,7 +1668,7 @@ "loc": { "start": { "line": 30, - "column": 5, + "column": 12, "program": "memberExpressionFromStaticContext.ets" }, "end": { @@ -2111,7 +2111,7 @@ "loc": { "start": { "line": 42, - "column": 5, + "column": 12, "program": "memberExpressionFromStaticContext.ets" }, "end": { @@ -2841,7 +2841,7 @@ "loc": { "start": { "line": 44, - "column": 5, + "column": 12, "program": "memberExpressionFromStaticContext.ets" }, "end": { diff --git a/ets2panda/test/compiler/ets/methodOverrideAsyncMethod-expected.txt b/ets2panda/test/compiler/ets/methodOverrideAsyncMethod-expected.txt index ba95703b1a..7c7074103e 100644 --- a/ets2panda/test/compiler/ets/methodOverrideAsyncMethod-expected.txt +++ b/ets2panda/test/compiler/ets/methodOverrideAsyncMethod-expected.txt @@ -1086,7 +1086,7 @@ "loc": { "start": { "line": 25, - "column": 3, + "column": 9, "program": "methodOverrideAsyncMethod.ets" }, "end": { diff --git a/ets2panda/test/compiler/ets/methodOverrideCovariantReturnType-expected.txt b/ets2panda/test/compiler/ets/methodOverrideCovariantReturnType-expected.txt index b6fe78b2f8..588222a15e 100644 --- a/ets2panda/test/compiler/ets/methodOverrideCovariantReturnType-expected.txt +++ b/ets2panda/test/compiler/ets/methodOverrideCovariantReturnType-expected.txt @@ -151,7 +151,7 @@ "loc": { "start": { "line": 17, - "column": 5, + "column": 14, "program": "methodOverrideCovariantReturnType.ets" }, "end": { @@ -754,7 +754,7 @@ "loc": { "start": { "line": 25, - "column": 5, + "column": 14, "program": "methodOverrideCovariantReturnType.ets" }, "end": { @@ -892,7 +892,7 @@ "loc": { "start": { "line": 28, - "column": 5, + "column": 14, "program": "methodOverrideCovariantReturnType.ets" }, "end": { @@ -1989,7 +1989,7 @@ "loc": { "start": { "line": 38, - "column": 5, + "column": 14, "program": "methodOverrideCovariantReturnType.ets" }, "end": { diff --git a/ets2panda/test/compiler/ets/methodOverrideDifferentSignature-expected.txt b/ets2panda/test/compiler/ets/methodOverrideDifferentSignature-expected.txt index 02bf5b60ba..541fb88b67 100644 --- a/ets2panda/test/compiler/ets/methodOverrideDifferentSignature-expected.txt +++ b/ets2panda/test/compiler/ets/methodOverrideDifferentSignature-expected.txt @@ -353,7 +353,7 @@ "loc": { "start": { "line": 21, - "column": 5, + "column": 14, "program": "methodOverrideDifferentSignature.ets" }, "end": { @@ -597,7 +597,7 @@ "loc": { "start": { "line": 25, - "column": 5, + "column": 14, "program": "methodOverrideDifferentSignature.ets" }, "end": { @@ -781,7 +781,7 @@ "loc": { "start": { "line": 24, - "column": 5, + "column": 14, "program": "methodOverrideDifferentSignature.ets" }, "end": { @@ -1258,7 +1258,7 @@ "loc": { "start": { "line": 35, - "column": 5, + "column": 14, "program": "methodOverrideDifferentSignature.ets" }, "end": { @@ -1273,7 +1273,7 @@ "loc": { "start": { "line": 32, - "column": 5, + "column": 14, "program": "methodOverrideDifferentSignature.ets" }, "end": { diff --git a/ets2panda/test/compiler/ets/methodOverrideWithoutModifier-expected.txt b/ets2panda/test/compiler/ets/methodOverrideWithoutModifier-expected.txt index 3542cd7533..b58d8a37be 100644 --- a/ets2panda/test/compiler/ets/methodOverrideWithoutModifier-expected.txt +++ b/ets2panda/test/compiler/ets/methodOverrideWithoutModifier-expected.txt @@ -135,7 +135,7 @@ "loc": { "start": { "line": 17, - "column": 5, + "column": 12, "program": "methodOverrideWithoutModifier.ets" }, "end": { @@ -457,7 +457,7 @@ "loc": { "start": { "line": 23, - "column": 5, + "column": 12, "program": "methodOverrideWithoutModifier.ets" }, "end": { diff --git a/ets2panda/test/compiler/ets/multipleMethodOverride-expected.txt b/ets2panda/test/compiler/ets/multipleMethodOverride-expected.txt index 3aab31ccb7..031babe619 100644 --- a/ets2panda/test/compiler/ets/multipleMethodOverride-expected.txt +++ b/ets2panda/test/compiler/ets/multipleMethodOverride-expected.txt @@ -135,7 +135,7 @@ "loc": { "start": { "line": 17, - "column": 5, + "column": 13, "program": "multipleMethodOverride.ets" }, "end": { @@ -457,7 +457,7 @@ "loc": { "start": { "line": 23, - "column": 5, + "column": 21, "program": "multipleMethodOverride.ets" }, "end": { @@ -980,7 +980,7 @@ "loc": { "start": { "line": 34, - "column": 5, + "column": 21, "program": "multipleMethodOverride.ets" }, "end": { diff --git a/ets2panda/test/compiler/ets/overload_with_generics-expected.txt b/ets2panda/test/compiler/ets/overload_with_generics-expected.txt index b9f327529e..fb6b102173 100644 --- a/ets2panda/test/compiler/ets/overload_with_generics-expected.txt +++ b/ets2panda/test/compiler/ets/overload_with_generics-expected.txt @@ -611,7 +611,7 @@ "loc": { "start": { "line": 18, - "column": 5, + "column": 19, "program": "overload_with_generics.ets" }, "end": { @@ -626,7 +626,7 @@ "loc": { "start": { "line": 17, - "column": 5, + "column": 19, "program": "overload_with_generics.ets" }, "end": { diff --git a/ets2panda/test/compiler/ets/override-expected.txt b/ets2panda/test/compiler/ets/override-expected.txt index c6bb156134..db5b5f4cf0 100644 --- a/ets2panda/test/compiler/ets/override-expected.txt +++ b/ets2panda/test/compiler/ets/override-expected.txt @@ -924,7 +924,7 @@ "loc": { "start": { "line": 24, - "column": 3, + "column": 12, "program": "override.ets" }, "end": { @@ -1237,7 +1237,7 @@ "loc": { "start": { "line": 25, - "column": 3, + "column": 12, "program": "override.ets" }, "end": { @@ -1471,7 +1471,7 @@ "loc": { "start": { "line": 26, - "column": 3, + "column": 12, "program": "override.ets" }, "end": { @@ -1737,7 +1737,7 @@ "loc": { "start": { "line": 27, - "column": 3, + "column": 12, "program": "override.ets" }, "end": { diff --git a/ets2panda/test/compiler/ets/override10-expected.txt b/ets2panda/test/compiler/ets/override10-expected.txt index f71899b72a..8cc4736760 100644 --- a/ets2panda/test/compiler/ets/override10-expected.txt +++ b/ets2panda/test/compiler/ets/override10-expected.txt @@ -732,7 +732,7 @@ "loc": { "start": { "line": 21, - "column": 3, + "column": 12, "program": "override10.ets" }, "end": { diff --git a/ets2panda/test/compiler/ets/override12-expected.txt b/ets2panda/test/compiler/ets/override12-expected.txt index 8fa610e91c..f141e0adc8 100644 --- a/ets2panda/test/compiler/ets/override12-expected.txt +++ b/ets2panda/test/compiler/ets/override12-expected.txt @@ -1126,7 +1126,7 @@ "loc": { "start": { "line": 22, - "column": 3, + "column": 12, "program": "override12.ets" }, "end": { @@ -1443,7 +1443,7 @@ "loc": { "start": { "line": 25, - "column": 3, + "column": 12, "program": "override12.ets" }, "end": { diff --git a/ets2panda/test/compiler/ets/override13-expected.txt b/ets2panda/test/compiler/ets/override13-expected.txt index 41aed5b469..a4559ea260 100644 --- a/ets2panda/test/compiler/ets/override13-expected.txt +++ b/ets2panda/test/compiler/ets/override13-expected.txt @@ -845,7 +845,7 @@ "loc": { "start": { "line": 21, - "column": 3, + "column": 12, "program": "override13.ets" }, "end": { diff --git a/ets2panda/test/compiler/ets/override16-expected.txt b/ets2panda/test/compiler/ets/override16-expected.txt index 28e49dc4fd..c99c2661d0 100644 --- a/ets2panda/test/compiler/ets/override16-expected.txt +++ b/ets2panda/test/compiler/ets/override16-expected.txt @@ -167,7 +167,7 @@ "loc": { "start": { "line": 17, - "column": 3, + "column": 10, "program": "override16.ets" }, "end": { diff --git a/ets2panda/test/compiler/ets/override17-expected.txt b/ets2panda/test/compiler/ets/override17-expected.txt index 6cfdf15623..68146d9252 100644 --- a/ets2panda/test/compiler/ets/override17-expected.txt +++ b/ets2panda/test/compiler/ets/override17-expected.txt @@ -167,7 +167,7 @@ "loc": { "start": { "line": 17, - "column": 3, + "column": 10, "program": "override17.ets" }, "end": { @@ -590,7 +590,7 @@ "loc": { "start": { "line": 23, - "column": 3, + "column": 10, "program": "override17.ets" }, "end": { diff --git a/ets2panda/test/compiler/ets/override19-expected.txt b/ets2panda/test/compiler/ets/override19-expected.txt index 39b8700737..2b230b42e9 100644 --- a/ets2panda/test/compiler/ets/override19-expected.txt +++ b/ets2panda/test/compiler/ets/override19-expected.txt @@ -199,7 +199,7 @@ "loc": { "start": { "line": 17, - "column": 5, + "column": 14, "program": "override19.ets" }, "end": { @@ -352,7 +352,7 @@ "loc": { "start": { "line": 20, - "column": 5, + "column": 14, "program": "override19.ets" }, "end": { diff --git a/ets2panda/test/compiler/ets/override2-expected.txt b/ets2panda/test/compiler/ets/override2-expected.txt index a1238b2ade..4309080327 100644 --- a/ets2panda/test/compiler/ets/override2-expected.txt +++ b/ets2panda/test/compiler/ets/override2-expected.txt @@ -322,7 +322,7 @@ "loc": { "start": { "line": 21, - "column": 3, + "column": 10, "program": "override2.ets" }, "end": { diff --git a/ets2panda/test/compiler/ets/override5-expected.txt b/ets2panda/test/compiler/ets/override5-expected.txt index d67021c936..5337c65e23 100644 --- a/ets2panda/test/compiler/ets/override5-expected.txt +++ b/ets2panda/test/compiler/ets/override5-expected.txt @@ -167,7 +167,7 @@ "loc": { "start": { "line": 17, - "column": 3, + "column": 11, "program": "override5.ets" }, "end": { @@ -521,7 +521,7 @@ "loc": { "start": { "line": 21, - "column": 3, + "column": 12, "program": "override5.ets" }, "end": { diff --git a/ets2panda/test/compiler/ets/override6-expected.txt b/ets2panda/test/compiler/ets/override6-expected.txt index 608592351d..701aa38f51 100644 --- a/ets2panda/test/compiler/ets/override6-expected.txt +++ b/ets2panda/test/compiler/ets/override6-expected.txt @@ -497,7 +497,7 @@ "loc": { "start": { "line": 23, - "column": 3, + "column": 19, "program": "override6.ets" }, "end": { diff --git a/ets2panda/test/compiler/ets/override8-expected.txt b/ets2panda/test/compiler/ets/override8-expected.txt index 9ece98b7fb..3bf33bfedc 100644 --- a/ets2panda/test/compiler/ets/override8-expected.txt +++ b/ets2panda/test/compiler/ets/override8-expected.txt @@ -448,7 +448,7 @@ "loc": { "start": { "line": 21, - "column": 3, + "column": 19, "program": "override8.ets" }, "end": { diff --git a/ets2panda/test/compiler/ets/override9-expected.txt b/ets2panda/test/compiler/ets/override9-expected.txt index 691a51b7a0..b2175d8978 100644 --- a/ets2panda/test/compiler/ets/override9-expected.txt +++ b/ets2panda/test/compiler/ets/override9-expected.txt @@ -560,7 +560,7 @@ "loc": { "start": { "line": 23, - "column": 3, + "column": 19, "program": "override9.ets" }, "end": { diff --git a/ets2panda/test/compiler/ets/returnTypeGenericArray-expected.txt b/ets2panda/test/compiler/ets/returnTypeGenericArray-expected.txt index 04311c1709..0462fcd792 100644 --- a/ets2panda/test/compiler/ets/returnTypeGenericArray-expected.txt +++ b/ets2panda/test/compiler/ets/returnTypeGenericArray-expected.txt @@ -897,7 +897,7 @@ "loc": { "start": { "line": 21, - "column": 5, + "column": 14, "program": "returnTypeGenericArray.ets" }, "end": { diff --git a/ets2panda/test/compiler/ets/tuple_types_19-expected.txt b/ets2panda/test/compiler/ets/tuple_types_19-expected.txt index 2ab7264905..92e052e53e 100644 --- a/ets2panda/test/compiler/ets/tuple_types_19-expected.txt +++ b/ets2panda/test/compiler/ets/tuple_types_19-expected.txt @@ -876,7 +876,7 @@ "loc": { "start": { "line": 19, - "column": 5, + "column": 12, "program": "tuple_types_19.ets" }, "end": { @@ -1756,7 +1756,7 @@ "loc": { "start": { "line": 25, - "column": 5, + "column": 12, "program": "tuple_types_19.ets" }, "end": { diff --git a/ets2panda/test/compiler/ets/typeVarReferenceFromStaticContext2-expected.txt b/ets2panda/test/compiler/ets/typeVarReferenceFromStaticContext2-expected.txt index 3fac9cb519..f7bafdd20c 100644 --- a/ets2panda/test/compiler/ets/typeVarReferenceFromStaticContext2-expected.txt +++ b/ets2panda/test/compiler/ets/typeVarReferenceFromStaticContext2-expected.txt @@ -472,7 +472,7 @@ "loc": { "start": { "line": 17, - "column": 5, + "column": 12, "program": "typeVarReferenceFromStaticContext2.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/AccessBinaryTrees-expected.txt b/ets2panda/test/parser/ets/AccessBinaryTrees-expected.txt index 86440b56c5..59f8b0e55d 100644 --- a/ets2panda/test/parser/ets/AccessBinaryTrees-expected.txt +++ b/ets2panda/test/parser/ets/AccessBinaryTrees-expected.txt @@ -1583,7 +1583,7 @@ "loc": { "start": { "line": 27, - "column": 3, + "column": 10, "program": "AccessBinaryTrees.ets" }, "end": { @@ -2722,7 +2722,7 @@ "loc": { "start": { "line": 40, - "column": 3, + "column": 10, "program": "AccessBinaryTrees.ets" }, "end": { @@ -5161,7 +5161,7 @@ "loc": { "start": { "line": 51, - "column": 3, + "column": 10, "program": "AccessBinaryTrees.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/AccessFannkuch-expected.txt b/ets2panda/test/parser/ets/AccessFannkuch-expected.txt index 2c9c386bef..1140779574 100644 --- a/ets2panda/test/parser/ets/AccessFannkuch-expected.txt +++ b/ets2panda/test/parser/ets/AccessFannkuch-expected.txt @@ -5627,7 +5627,7 @@ "loc": { "start": { "line": 24, - "column": 5, + "column": 12, "program": "AccessFannkuch.ets" }, "end": { @@ -6083,7 +6083,7 @@ "loc": { "start": { "line": 84, - "column": 5, + "column": 12, "program": "AccessFannkuch.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/AccessNBody-expected.txt b/ets2panda/test/parser/ets/AccessNBody-expected.txt index 2586ff7f1e..e2fd028d27 100644 --- a/ets2panda/test/parser/ets/AccessNBody-expected.txt +++ b/ets2panda/test/parser/ets/AccessNBody-expected.txt @@ -2597,7 +2597,7 @@ "loc": { "start": { "line": 38, - "column": 6, + "column": 14, "program": "AccessNBody.ets" }, "end": { @@ -9159,7 +9159,7 @@ "loc": { "start": { "line": 64, - "column": 6, + "column": 14, "program": "AccessNBody.ets" }, "end": { @@ -12139,7 +12139,7 @@ "loc": { "start": { "line": 95, - "column": 6, + "column": 14, "program": "AccessNBody.ets" }, "end": { @@ -12951,7 +12951,7 @@ "loc": { "start": { "line": 124, - "column": 5, + "column": 12, "program": "AccessNBody.ets" }, "end": { @@ -13363,7 +13363,7 @@ "loc": { "start": { "line": 127, - "column": 5, + "column": 12, "program": "AccessNBody.ets" }, "end": { @@ -13775,7 +13775,7 @@ "loc": { "start": { "line": 130, - "column": 5, + "column": 12, "program": "AccessNBody.ets" }, "end": { @@ -14187,7 +14187,7 @@ "loc": { "start": { "line": 133, - "column": 5, + "column": 12, "program": "AccessNBody.ets" }, "end": { @@ -14567,7 +14567,7 @@ "loc": { "start": { "line": 136, - "column": 5, + "column": 12, "program": "AccessNBody.ets" }, "end": { @@ -16445,7 +16445,7 @@ "loc": { "start": { "line": 140, - "column": 5, + "column": 13, "program": "AccessNBody.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/AccessNSieve-expected.txt b/ets2panda/test/parser/ets/AccessNSieve-expected.txt index 2bedee7c9f..5347dfe292 100644 --- a/ets2panda/test/parser/ets/AccessNSieve-expected.txt +++ b/ets2panda/test/parser/ets/AccessNSieve-expected.txt @@ -612,7 +612,7 @@ "loc": { "start": { "line": 22, - "column": 3, + "column": 10, "program": "AccessNSieve.ets" }, "end": { @@ -1967,7 +1967,7 @@ "loc": { "start": { "line": 26, - "column": 3, + "column": 18, "program": "AccessNSieve.ets" }, "end": { @@ -2678,7 +2678,7 @@ "loc": { "start": { "line": 44, - "column": 3, + "column": 17, "program": "AccessNSieve.ets" }, "end": { @@ -3066,7 +3066,7 @@ "loc": { "start": { "line": 53, - "column": 3, + "column": 10, "program": "AccessNSieve.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/Bitops3BitBitsInByte-expected.txt b/ets2panda/test/parser/ets/Bitops3BitBitsInByte-expected.txt index 48f0e5eeac..fad4b8f987 100644 --- a/ets2panda/test/parser/ets/Bitops3BitBitsInByte-expected.txt +++ b/ets2panda/test/parser/ets/Bitops3BitBitsInByte-expected.txt @@ -945,7 +945,7 @@ "loc": { "start": { "line": 17, - "column": 3, + "column": 18, "program": "Bitops3BitBitsInByte.ets" }, "end": { @@ -2086,7 +2086,7 @@ "loc": { "start": { "line": 30, - "column": 3, + "column": 10, "program": "Bitops3BitBitsInByte.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/BitopsBitsInByte-expected.txt b/ets2panda/test/parser/ets/BitopsBitsInByte-expected.txt index 3ca02a5e29..35b141918e 100644 --- a/ets2panda/test/parser/ets/BitopsBitsInByte-expected.txt +++ b/ets2panda/test/parser/ets/BitopsBitsInByte-expected.txt @@ -687,7 +687,7 @@ "loc": { "start": { "line": 17, - "column": 3, + "column": 18, "program": "BitopsBitsInByte.ets" }, "end": { @@ -1828,7 +1828,7 @@ "loc": { "start": { "line": 33, - "column": 3, + "column": 10, "program": "BitopsBitsInByte.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/BitopsBitwiseAnd-expected.txt b/ets2panda/test/parser/ets/BitopsBitwiseAnd-expected.txt index 614115c9e4..2953e2e04d 100644 --- a/ets2panda/test/parser/ets/BitopsBitwiseAnd-expected.txt +++ b/ets2panda/test/parser/ets/BitopsBitwiseAnd-expected.txt @@ -819,7 +819,7 @@ "loc": { "start": { "line": 20, - "column": 3, + "column": 10, "program": "BitopsBitwiseAnd.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/BitopsNSieveBits-expected.txt b/ets2panda/test/parser/ets/BitopsNSieveBits-expected.txt index a56f3926be..ef700c6bb0 100644 --- a/ets2panda/test/parser/ets/BitopsNSieveBits-expected.txt +++ b/ets2panda/test/parser/ets/BitopsNSieveBits-expected.txt @@ -1801,7 +1801,7 @@ "loc": { "start": { "line": 17, - "column": 3, + "column": 10, "program": "BitopsNSieveBits.ets" }, "end": { @@ -2522,7 +2522,7 @@ "loc": { "start": { "line": 35, - "column": 3, + "column": 18, "program": "BitopsNSieveBits.ets" }, "end": { @@ -3697,7 +3697,7 @@ "loc": { "start": { "line": 46, - "column": 3, + "column": 10, "program": "BitopsNSieveBits.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/ControlFlowRecursive-expected.txt b/ets2panda/test/parser/ets/ControlFlowRecursive-expected.txt index 05524201b8..722aa9d5ff 100644 --- a/ets2panda/test/parser/ets/ControlFlowRecursive-expected.txt +++ b/ets2panda/test/parser/ets/ControlFlowRecursive-expected.txt @@ -1089,7 +1089,7 @@ "loc": { "start": { "line": 21, - "column": 3, + "column": 18, "program": "ControlFlowRecursive.ets" }, "end": { @@ -1639,7 +1639,7 @@ "loc": { "start": { "line": 31, - "column": 3, + "column": 18, "program": "ControlFlowRecursive.ets" }, "end": { @@ -2558,7 +2558,7 @@ "loc": { "start": { "line": 38, - "column": 3, + "column": 18, "program": "ControlFlowRecursive.ets" }, "end": { @@ -3734,7 +3734,7 @@ "loc": { "start": { "line": 45, - "column": 3, + "column": 17, "program": "ControlFlowRecursive.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/InferTypeParamFromParam1-expected.txt b/ets2panda/test/parser/ets/InferTypeParamFromParam1-expected.txt index d3595fb50d..52af532976 100644 --- a/ets2panda/test/parser/ets/InferTypeParamFromParam1-expected.txt +++ b/ets2panda/test/parser/ets/InferTypeParamFromParam1-expected.txt @@ -1651,7 +1651,7 @@ "loc": { "start": { "line": 25, - "column": 5, + "column": 19, "program": "InferTypeParamFromParam1.ets" }, "end": { @@ -1666,7 +1666,7 @@ "loc": { "start": { "line": 21, - "column": 5, + "column": 19, "program": "InferTypeParamFromParam1.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/InferTypeParamFromParam3-expected.txt b/ets2panda/test/parser/ets/InferTypeParamFromParam3-expected.txt index 5e7e8adbcd..5b1120da3d 100644 --- a/ets2panda/test/parser/ets/InferTypeParamFromParam3-expected.txt +++ b/ets2panda/test/parser/ets/InferTypeParamFromParam3-expected.txt @@ -1886,7 +1886,7 @@ "loc": { "start": { "line": 21, - "column": 5, + "column": 19, "program": "InferTypeParamFromParam3.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/MathCordic-expected.txt b/ets2panda/test/parser/ets/MathCordic-expected.txt index 4fee71fabf..802d01d283 100644 --- a/ets2panda/test/parser/ets/MathCordic-expected.txt +++ b/ets2panda/test/parser/ets/MathCordic-expected.txt @@ -1617,7 +1617,7 @@ "loc": { "start": { "line": 22, - "column": 5, + "column": 12, "program": "MathCordic.ets" }, "end": { @@ -1851,7 +1851,7 @@ "loc": { "start": { "line": 26, - "column": 5, + "column": 12, "program": "MathCordic.ets" }, "end": { @@ -2085,7 +2085,7 @@ "loc": { "start": { "line": 30, - "column": 5, + "column": 12, "program": "MathCordic.ets" }, "end": { @@ -4657,7 +4657,7 @@ "loc": { "start": { "line": 34, - "column": 5, + "column": 12, "program": "MathCordic.ets" }, "end": { @@ -5270,7 +5270,7 @@ "loc": { "start": { "line": 60, - "column": 5, + "column": 12, "program": "MathCordic.ets" }, "end": { @@ -5859,7 +5859,7 @@ "loc": { "start": { "line": 70, - "column": 5, + "column": 13, "program": "MathCordic.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/MathPartialSums-expected.txt b/ets2panda/test/parser/ets/MathPartialSums-expected.txt index 00abdda712..dc79e0b7fc 100644 --- a/ets2panda/test/parser/ets/MathPartialSums-expected.txt +++ b/ets2panda/test/parser/ets/MathPartialSums-expected.txt @@ -4268,7 +4268,7 @@ "loc": { "start": { "line": 22, - "column": 3, + "column": 18, "program": "MathPartialSums.ets" }, "end": { @@ -5215,7 +5215,7 @@ "loc": { "start": { "line": 72, - "column": 3, + "column": 17, "program": "MathPartialSums.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/MathSpectralNorm-expected.txt b/ets2panda/test/parser/ets/MathSpectralNorm-expected.txt index e23fab3c9d..7f6764fb66 100644 --- a/ets2panda/test/parser/ets/MathSpectralNorm-expected.txt +++ b/ets2panda/test/parser/ets/MathSpectralNorm-expected.txt @@ -523,7 +523,7 @@ "loc": { "start": { "line": 17, - "column": 3, + "column": 18, "program": "MathSpectralNorm.ets" }, "end": { @@ -1728,7 +1728,7 @@ "loc": { "start": { "line": 21, - "column": 3, + "column": 18, "program": "MathSpectralNorm.ets" }, "end": { @@ -2933,7 +2933,7 @@ "loc": { "start": { "line": 31, - "column": 3, + "column": 18, "program": "MathSpectralNorm.ets" }, "end": { @@ -3625,7 +3625,7 @@ "loc": { "start": { "line": 41, - "column": 3, + "column": 18, "program": "MathSpectralNorm.ets" }, "end": { @@ -6010,7 +6010,7 @@ "loc": { "start": { "line": 46, - "column": 3, + "column": 18, "program": "MathSpectralNorm.ets" }, "end": { @@ -6970,7 +6970,7 @@ "loc": { "start": { "line": 80, - "column": 3, + "column": 10, "program": "MathSpectralNorm.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/Morph3d-expected.txt b/ets2panda/test/parser/ets/Morph3d-expected.txt index efa82de7ff..099e63f82f 100644 --- a/ets2panda/test/parser/ets/Morph3d-expected.txt +++ b/ets2panda/test/parser/ets/Morph3d-expected.txt @@ -951,7 +951,7 @@ "loc": { "start": { "line": 24, - "column": 3, + "column": 10, "program": "Morph3d.ets" }, "end": { @@ -2302,7 +2302,7 @@ "loc": { "start": { "line": 32, - "column": 3, + "column": 11, "program": "Morph3d.ets" }, "end": { @@ -3623,7 +3623,7 @@ "loc": { "start": { "line": 43, - "column": 3, + "column": 10, "program": "Morph3d.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/StaticFieldAndMethodSameName-expected.txt b/ets2panda/test/parser/ets/StaticFieldAndMethodSameName-expected.txt index bf69b66fa9..1b5b4f9833 100644 --- a/ets2panda/test/parser/ets/StaticFieldAndMethodSameName-expected.txt +++ b/ets2panda/test/parser/ets/StaticFieldAndMethodSameName-expected.txt @@ -238,7 +238,7 @@ "loc": { "start": { "line": 18, - "column": 2, + "column": 9, "program": "StaticFieldAndMethodSameName.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/StaticFieldAndMethodSameNameInheritance-expected.txt b/ets2panda/test/parser/ets/StaticFieldAndMethodSameNameInheritance-expected.txt index 4ed09144c7..7828b2e9b2 100644 --- a/ets2panda/test/parser/ets/StaticFieldAndMethodSameNameInheritance-expected.txt +++ b/ets2panda/test/parser/ets/StaticFieldAndMethodSameNameInheritance-expected.txt @@ -135,7 +135,7 @@ "loc": { "start": { "line": 17, - "column": 2, + "column": 9, "program": "StaticFieldAndMethodSameNameInheritance.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/StringBase64-expected.txt b/ets2panda/test/parser/ets/StringBase64-expected.txt index 0c52d2cd0d..e6c6ef0eb0 100644 --- a/ets2panda/test/parser/ets/StringBase64-expected.txt +++ b/ets2panda/test/parser/ets/StringBase64-expected.txt @@ -10811,7 +10811,7 @@ "loc": { "start": { "line": 72, - "column": 5, + "column": 13, "program": "StringBase64.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/access_modifier_2-expected.txt b/ets2panda/test/parser/ets/access_modifier_2-expected.txt index 245eb1ec14..e7ba39ad0c 100644 --- a/ets2panda/test/parser/ets/access_modifier_2-expected.txt +++ b/ets2panda/test/parser/ets/access_modifier_2-expected.txt @@ -135,7 +135,7 @@ "loc": { "start": { "line": 17, - "column": 5, + "column": 18, "program": "access_modifier_2.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/ambient_object_iterable-expected.txt b/ets2panda/test/parser/ets/ambient_object_iterable-expected.txt index dbd150acb7..53a3368917 100644 --- a/ets2panda/test/parser/ets/ambient_object_iterable-expected.txt +++ b/ets2panda/test/parser/ets/ambient_object_iterable-expected.txt @@ -656,7 +656,7 @@ "loc": { "start": { "line": 23, - "column": 3, + "column": 12, "program": "ambient_object_iterable.ets" }, "end": { @@ -995,7 +995,7 @@ "loc": { "start": { "line": 29, - "column": 3, + "column": 19, "program": "ambient_object_iterable.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/assignments-expected.txt b/ets2panda/test/parser/ets/assignments-expected.txt index d2f2cbdfc7..c1ff444788 100644 --- a/ets2panda/test/parser/ets/assignments-expected.txt +++ b/ets2panda/test/parser/ets/assignments-expected.txt @@ -1751,7 +1751,7 @@ "loc": { "start": { "line": 19, - "column": 5, + "column": 13, "program": "assignments.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/async_function-expected.txt b/ets2panda/test/parser/ets/async_function-expected.txt index 89e223dc44..2d0baf6c44 100644 --- a/ets2panda/test/parser/ets/async_function-expected.txt +++ b/ets2panda/test/parser/ets/async_function-expected.txt @@ -295,7 +295,7 @@ "loc": { "start": { "line": 17, - "column": 5, + "column": 18, "program": "async_function.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/async_overload-expected.txt b/ets2panda/test/parser/ets/async_overload-expected.txt index 9930044848..a3d661f2f6 100644 --- a/ets2panda/test/parser/ets/async_overload-expected.txt +++ b/ets2panda/test/parser/ets/async_overload-expected.txt @@ -737,7 +737,7 @@ "loc": { "start": { "line": 21, - "column": 5, + "column": 11, "program": "async_overload.ets" }, "end": { @@ -752,7 +752,7 @@ "loc": { "start": { "line": 17, - "column": 5, + "column": 11, "program": "async_overload.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/calling_superclass_methods-expected.txt b/ets2panda/test/parser/ets/calling_superclass_methods-expected.txt index 25be02feee..057ba765d8 100644 --- a/ets2panda/test/parser/ets/calling_superclass_methods-expected.txt +++ b/ets2panda/test/parser/ets/calling_superclass_methods-expected.txt @@ -135,7 +135,7 @@ "loc": { "start": { "line": 19, - "column": 5, + "column": 13, "program": "calling_superclass_methods.ets" }, "end": { @@ -524,7 +524,7 @@ "loc": { "start": { "line": 23, - "column": 5, + "column": 21, "program": "calling_superclass_methods.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/declare_class-expected.txt b/ets2panda/test/parser/ets/declare_class-expected.txt index de2146e910..4cab1f1e42 100644 --- a/ets2panda/test/parser/ets/declare_class-expected.txt +++ b/ets2panda/test/parser/ets/declare_class-expected.txt @@ -496,7 +496,7 @@ "loc": { "start": { "line": 20, - "column": 5, + "column": 12, "program": "declare_class.ets" }, "end": { 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 70d09366d7..d37b3daf8f 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 @@ -758,7 +758,7 @@ "loc": { "start": { "line": 26, - "column": 5, + "column": 12, "program": "module.ets" }, "end": { @@ -1982,7 +1982,7 @@ "loc": { "start": { "line": 36, - "column": 5, + "column": 14, "program": "module.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/empty_statement-expected.txt b/ets2panda/test/parser/ets/empty_statement-expected.txt index b943d266bf..14654c8721 100644 --- a/ets2panda/test/parser/ets/empty_statement-expected.txt +++ b/ets2panda/test/parser/ets/empty_statement-expected.txt @@ -595,7 +595,7 @@ "loc": { "start": { "line": 18, - "column": 5, + "column": 13, "program": "empty_statement.ets" }, "end": { @@ -716,7 +716,7 @@ "loc": { "start": { "line": 29, - "column": 5, + "column": 13, "program": "empty_statement.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/function_implicit_return_type5-expected.txt b/ets2panda/test/parser/ets/function_implicit_return_type5-expected.txt index b96de3632a..85b3978a53 100644 --- a/ets2panda/test/parser/ets/function_implicit_return_type5-expected.txt +++ b/ets2panda/test/parser/ets/function_implicit_return_type5-expected.txt @@ -152,7 +152,7 @@ "loc": { "start": { "line": 18, - "column": 3, + "column": 10, "program": "function_implicit_return_type5.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/function_implicit_return_type9-expected.txt b/ets2panda/test/parser/ets/function_implicit_return_type9-expected.txt index e5393a8751..2030c5c88d 100644 --- a/ets2panda/test/parser/ets/function_implicit_return_type9-expected.txt +++ b/ets2panda/test/parser/ets/function_implicit_return_type9-expected.txt @@ -199,7 +199,7 @@ "loc": { "start": { "line": 18, - "column": 3, + "column": 19, "program": "function_implicit_return_type9.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/generic_resolve-expected.txt b/ets2panda/test/parser/ets/generic_resolve-expected.txt index b5fe484181..603c21ca60 100644 --- a/ets2panda/test/parser/ets/generic_resolve-expected.txt +++ b/ets2panda/test/parser/ets/generic_resolve-expected.txt @@ -1306,7 +1306,7 @@ "loc": { "start": { "line": 29, - "column": 5, + "column": 20, "program": "generic_resolve.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/generics_2-expected.txt b/ets2panda/test/parser/ets/generics_2-expected.txt index 5cdfec0435..afe9c9a843 100644 --- a/ets2panda/test/parser/ets/generics_2-expected.txt +++ b/ets2panda/test/parser/ets/generics_2-expected.txt @@ -939,7 +939,7 @@ "loc": { "start": { "line": 22, - "column": 5, + "column": 14, "program": "generics_2.ets" }, "end": { @@ -1313,7 +1313,7 @@ "loc": { "start": { "line": 25, - "column": 5, + "column": 14, "program": "generics_2.ets" }, "end": { 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 8178b0092c..e1ca32b214 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 @@ -1015,7 +1015,7 @@ "loc": { "start": { "line": 27, - "column": 5, + "column": 12, "program": "generics_type_param_constraint_12.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/globalVarInLambdaInStatic-expected.txt b/ets2panda/test/parser/ets/globalVarInLambdaInStatic-expected.txt index bf93a8f322..bf3492fb0f 100644 --- a/ets2panda/test/parser/ets/globalVarInLambdaInStatic-expected.txt +++ b/ets2panda/test/parser/ets/globalVarInLambdaInStatic-expected.txt @@ -792,7 +792,7 @@ "loc": { "start": { "line": 30, - "column": 5, + "column": 12, "program": "globalVarInLambdaInStatic.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/global_const_vars3-expected.txt b/ets2panda/test/parser/ets/global_const_vars3-expected.txt index 0a34a26a4c..abb53198de 100644 --- a/ets2panda/test/parser/ets/global_const_vars3-expected.txt +++ b/ets2panda/test/parser/ets/global_const_vars3-expected.txt @@ -472,7 +472,7 @@ "loc": { "start": { "line": 26, - "column": 5, + "column": 12, "program": "global_const_vars3.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/if-expected.txt b/ets2panda/test/parser/ets/if-expected.txt index f9582adc85..b012cb5e14 100644 --- a/ets2panda/test/parser/ets/if-expected.txt +++ b/ets2panda/test/parser/ets/if-expected.txt @@ -2858,7 +2858,7 @@ "loc": { "start": { "line": 17, - "column": 5, + "column": 13, "program": "if.ets" }, "end": { 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 cc13f0c26b..1dcfc9592f 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 @@ -151,7 +151,7 @@ "loc": { "start": { "line": 17, - "column": 5, + "column": 14, "program": "infer_overriding_method_return_type.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/internalParsing-expected.txt b/ets2panda/test/parser/ets/internalParsing-expected.txt index 4cf727587d..3eea539048 100644 --- a/ets2panda/test/parser/ets/internalParsing-expected.txt +++ b/ets2panda/test/parser/ets/internalParsing-expected.txt @@ -641,7 +641,7 @@ "loc": { "start": { "line": 25, - "column": 3, + "column": 12, "program": "internalParsing.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/internalProtectedParsing-expected.txt b/ets2panda/test/parser/ets/internalProtectedParsing-expected.txt index 704d04d011..e69d6f3286 100644 --- a/ets2panda/test/parser/ets/internalProtectedParsing-expected.txt +++ b/ets2panda/test/parser/ets/internalProtectedParsing-expected.txt @@ -878,7 +878,7 @@ "loc": { "start": { "line": 29, - "column": 3, + "column": 22, "program": "internalProtectedParsing.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/launch-expected.txt b/ets2panda/test/parser/ets/launch-expected.txt index c9008b0089..1556793616 100755 --- a/ets2panda/test/parser/ets/launch-expected.txt +++ b/ets2panda/test/parser/ets/launch-expected.txt @@ -410,7 +410,7 @@ "loc": { "start": { "line": 20, - "column": 5, + "column": 19, "program": "launch.ets" }, "end": { @@ -642,7 +642,7 @@ "loc": { "start": { "line": 24, - "column": 5, + "column": 19, "program": "launch.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/launch_super-expected.txt b/ets2panda/test/parser/ets/launch_super-expected.txt index c23ea9fa11..80b3fc5bd2 100755 --- a/ets2panda/test/parser/ets/launch_super-expected.txt +++ b/ets2panda/test/parser/ets/launch_super-expected.txt @@ -217,7 +217,7 @@ "loc": { "start": { "line": 19, - "column": 5, + "column": 12, "program": "launch_super.ets" }, "end": { @@ -702,7 +702,7 @@ "loc": { "start": { "line": 23, - "column": 5, + "column": 14, "program": "launch_super.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/launch_this_callee-expected.txt b/ets2panda/test/parser/ets/launch_this_callee-expected.txt index 7d7c137236..1ac3b4a087 100755 --- a/ets2panda/test/parser/ets/launch_this_callee-expected.txt +++ b/ets2panda/test/parser/ets/launch_this_callee-expected.txt @@ -717,7 +717,7 @@ "loc": { "start": { "line": 20, - "column": 3, + "column": 11, "program": "launch_this_callee.ets" }, "end": { @@ -983,7 +983,7 @@ "loc": { "start": { "line": 24, - "column": 3, + "column": 11, "program": "launch_this_callee.ets" }, "end": { @@ -1585,7 +1585,7 @@ "loc": { "start": { "line": 28, - "column": 3, + "column": 11, "program": "launch_this_callee.ets" }, "end": { @@ -1898,7 +1898,7 @@ "loc": { "start": { "line": 32, - "column": 3, + "column": 11, "program": "launch_this_callee.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/launch_with_call_expression-expected.txt b/ets2panda/test/parser/ets/launch_with_call_expression-expected.txt index 6702a2fd77..0e55c3cd27 100644 --- a/ets2panda/test/parser/ets/launch_with_call_expression-expected.txt +++ b/ets2panda/test/parser/ets/launch_with_call_expression-expected.txt @@ -120,7 +120,7 @@ "loc": { "start": { "line": 17, - "column": 5, + "column": 12, "program": "launch_with_call_expression.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/method_empty-expected.txt b/ets2panda/test/parser/ets/method_empty-expected.txt index 5ff7ee0eee..a8eabac839 100644 --- a/ets2panda/test/parser/ets/method_empty-expected.txt +++ b/ets2panda/test/parser/ets/method_empty-expected.txt @@ -290,7 +290,7 @@ "loc": { "start": { "line": 19, - "column": 5, + "column": 13, "program": "method_empty.ets" }, "end": { @@ -305,7 +305,7 @@ "loc": { "start": { "line": 17, - "column": 5, + "column": 13, "program": "method_empty.ets" }, "end": { @@ -474,7 +474,7 @@ "loc": { "start": { "line": 21, - "column": 5, + "column": 12, "program": "method_empty.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/method_modifier_check_14-expected.txt b/ets2panda/test/parser/ets/method_modifier_check_14-expected.txt index 4561f88dd7..4c67bf4343 100644 --- a/ets2panda/test/parser/ets/method_modifier_check_14-expected.txt +++ b/ets2panda/test/parser/ets/method_modifier_check_14-expected.txt @@ -119,7 +119,7 @@ "loc": { "start": { "line": 17, - "column": 5, + "column": 19, "program": "method_modifier_check_14.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/method_modifier_check_8-expected.txt b/ets2panda/test/parser/ets/method_modifier_check_8-expected.txt index 5d6ec8c4db..89a21d70b5 100644 --- a/ets2panda/test/parser/ets/method_modifier_check_8-expected.txt +++ b/ets2panda/test/parser/ets/method_modifier_check_8-expected.txt @@ -119,7 +119,7 @@ "loc": { "start": { "line": 17, - "column": 5, + "column": 19, "program": "method_modifier_check_8.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/optional_union_paramter-expected.txt b/ets2panda/test/parser/ets/optional_union_paramter-expected.txt index 2e763877c5..7033f89955 100644 --- a/ets2panda/test/parser/ets/optional_union_paramter-expected.txt +++ b/ets2panda/test/parser/ets/optional_union_paramter-expected.txt @@ -655,7 +655,7 @@ "loc": { "start": { "line": 17, - "column": 5, + "column": 12, "program": "optional_union_paramter.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/override-expected.txt b/ets2panda/test/parser/ets/override-expected.txt index 6351965866..8031f12c82 100644 --- a/ets2panda/test/parser/ets/override-expected.txt +++ b/ets2panda/test/parser/ets/override-expected.txt @@ -1371,7 +1371,7 @@ "loc": { "start": { "line": 20, - "column": 3, + "column": 12, "program": "override.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/overrideStaticFunc-expected.txt b/ets2panda/test/parser/ets/overrideStaticFunc-expected.txt index 17f88feab8..a739c85984 100644 --- a/ets2panda/test/parser/ets/overrideStaticFunc-expected.txt +++ b/ets2panda/test/parser/ets/overrideStaticFunc-expected.txt @@ -135,7 +135,7 @@ "loc": { "start": { "line": 17, - "column": 5, + "column": 12, "program": "overrideStaticFunc.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/static_function_override_1-expected.txt b/ets2panda/test/parser/ets/static_function_override_1-expected.txt index ee28cd5722..240980eabb 100644 --- a/ets2panda/test/parser/ets/static_function_override_1-expected.txt +++ b/ets2panda/test/parser/ets/static_function_override_1-expected.txt @@ -135,7 +135,7 @@ "loc": { "start": { "line": 17, - "column": 5, + "column": 12, "program": "static_function_override_1.ets" }, "end": { @@ -457,7 +457,7 @@ "loc": { "start": { "line": 21, - "column": 5, + "column": 12, "program": "static_function_override_1.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/static_function_override_2-expected.txt b/ets2panda/test/parser/ets/static_function_override_2-expected.txt index 984303723e..2e5acdb346 100644 --- a/ets2panda/test/parser/ets/static_function_override_2-expected.txt +++ b/ets2panda/test/parser/ets/static_function_override_2-expected.txt @@ -457,7 +457,7 @@ "loc": { "start": { "line": 21, - "column": 5, + "column": 12, "program": "static_function_override_2.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/static_function_override_3-expected.txt b/ets2panda/test/parser/ets/static_function_override_3-expected.txt index dc1ba36f83..6f785b59b9 100644 --- a/ets2panda/test/parser/ets/static_function_override_3-expected.txt +++ b/ets2panda/test/parser/ets/static_function_override_3-expected.txt @@ -135,7 +135,7 @@ "loc": { "start": { "line": 17, - "column": 5, + "column": 12, "program": "static_function_override_3.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/test-type-alias-call1-expected.txt b/ets2panda/test/parser/ets/test-type-alias-call1-expected.txt index fc12b2ec7f..111b160dd5 100644 --- a/ets2panda/test/parser/ets/test-type-alias-call1-expected.txt +++ b/ets2panda/test/parser/ets/test-type-alias-call1-expected.txt @@ -548,7 +548,7 @@ "loc": { "start": { "line": 19, - "column": 5, + "column": 12, "program": "test-type-alias-call1.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/test-type-alias-call2-expected.txt b/ets2panda/test/parser/ets/test-type-alias-call2-expected.txt index d30c212e38..212c267329 100644 --- a/ets2panda/test/parser/ets/test-type-alias-call2-expected.txt +++ b/ets2panda/test/parser/ets/test-type-alias-call2-expected.txt @@ -706,7 +706,7 @@ "loc": { "start": { "line": 21, - "column": 5, + "column": 12, "program": "test-type-alias-call2.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/test-type-alias-call3-expected.txt b/ets2panda/test/parser/ets/test-type-alias-call3-expected.txt index 300dc0438b..b7bf1683f2 100644 --- a/ets2panda/test/parser/ets/test-type-alias-call3-expected.txt +++ b/ets2panda/test/parser/ets/test-type-alias-call3-expected.txt @@ -550,7 +550,7 @@ "loc": { "start": { "line": 19, - "column": 5, + "column": 12, "program": "test-type-alias-call3.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/test-type-alias-call4-expected.txt b/ets2panda/test/parser/ets/test-type-alias-call4-expected.txt index 478f55d36f..aea8f78015 100644 --- a/ets2panda/test/parser/ets/test-type-alias-call4-expected.txt +++ b/ets2panda/test/parser/ets/test-type-alias-call4-expected.txt @@ -550,7 +550,7 @@ "loc": { "start": { "line": 19, - "column": 5, + "column": 19, "program": "test-type-alias-call4.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/test-type-alias-call5-expected.txt b/ets2panda/test/parser/ets/test-type-alias-call5-expected.txt index 5fb7886cb2..43bb699fe3 100644 --- a/ets2panda/test/parser/ets/test-type-alias-call5-expected.txt +++ b/ets2panda/test/parser/ets/test-type-alias-call5-expected.txt @@ -770,7 +770,7 @@ "loc": { "start": { "line": 22, - "column": 5, + "column": 12, "program": "test-type-alias-call5.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/test-type-alias-call6-expected.txt b/ets2panda/test/parser/ets/test-type-alias-call6-expected.txt index e19126d293..537158d735 100644 --- a/ets2panda/test/parser/ets/test-type-alias-call6-expected.txt +++ b/ets2panda/test/parser/ets/test-type-alias-call6-expected.txt @@ -849,7 +849,7 @@ "loc": { "start": { "line": 23, - "column": 5, + "column": 12, "program": "test-type-alias-call6.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/test-type-alias-call8-expected.txt b/ets2panda/test/parser/ets/test-type-alias-call8-expected.txt index 9792565229..ce3e096381 100644 --- a/ets2panda/test/parser/ets/test-type-alias-call8-expected.txt +++ b/ets2panda/test/parser/ets/test-type-alias-call8-expected.txt @@ -519,7 +519,7 @@ "loc": { "start": { "line": 20, - "column": 5, + "column": 12, "program": "test-type-alias-call8.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/this_callee-expected.txt b/ets2panda/test/parser/ets/this_callee-expected.txt index b9fe847572..75144c1642 100644 --- a/ets2panda/test/parser/ets/this_callee-expected.txt +++ b/ets2panda/test/parser/ets/this_callee-expected.txt @@ -265,7 +265,7 @@ "loc": { "start": { "line": 17, - "column": 3, + "column": 10, "program": "this_callee.ets" }, "end": { @@ -531,7 +531,7 @@ "loc": { "start": { "line": 21, - "column": 3, + "column": 10, "program": "this_callee.ets" }, "end": { @@ -798,7 +798,7 @@ "loc": { "start": { "line": 25, - "column": 3, + "column": 10, "program": "this_callee.ets" }, "end": { @@ -1111,7 +1111,7 @@ "loc": { "start": { "line": 29, - "column": 3, + "column": 10, "program": "this_callee.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/this_cmp_object-expected.txt b/ets2panda/test/parser/ets/this_cmp_object-expected.txt index 38f5b46dd9..1a0b8b1d1c 100644 --- a/ets2panda/test/parser/ets/this_cmp_object-expected.txt +++ b/ets2panda/test/parser/ets/this_cmp_object-expected.txt @@ -375,7 +375,7 @@ "loc": { "start": { "line": 17, - "column": 3, + "column": 10, "program": "this_cmp_object.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/type_variance1-expected.txt b/ets2panda/test/parser/ets/type_variance1-expected.txt index 3ec232b6b8..792afa1273 100644 --- a/ets2panda/test/parser/ets/type_variance1-expected.txt +++ b/ets2panda/test/parser/ets/type_variance1-expected.txt @@ -1405,7 +1405,7 @@ "loc": { "start": { "line": 30, - "column": 5, + "column": 14, "program": "type_variance1.ets" }, "end": { @@ -1637,7 +1637,7 @@ "loc": { "start": { "line": 31, - "column": 5, + "column": 14, "program": "type_variance1.ets" }, "end": { diff --git a/ets2panda/test/parser/ets/var_declare-expected.txt b/ets2panda/test/parser/ets/var_declare-expected.txt index e78e94dbf3..90be5126db 100644 --- a/ets2panda/test/parser/ets/var_declare-expected.txt +++ b/ets2panda/test/parser/ets/var_declare-expected.txt @@ -638,7 +638,7 @@ "loc": { "start": { "line": 17, - "column": 5, + "column": 12, "program": "var_declare.ets" }, "end": { diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_check_jsdoc.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_check_jsdoc.cpp index 466e93626e..ac4569d12c 100644 --- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_check_jsdoc.cpp +++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_check_jsdoc.cpp @@ -64,7 +64,8 @@ static es2panda_AstNode *exportSingleNamedDecl = nullptr; static es2panda_AstNode *reExportedDecl = nullptr; static es2panda_AstNode *importDecl = nullptr; -static std::string g_source = R"(/* +static std::string g_source = R"('use static' +/* * Copyright (c) 2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ets2panda/test/unit/plugin/plugin_proceed_to_state_parse_and_verifier_position.cpp b/ets2panda/test/unit/plugin/plugin_proceed_to_state_parse_and_verifier_position.cpp index 5146723f04..5fce343537 100644 --- a/ets2panda/test/unit/plugin/plugin_proceed_to_state_parse_and_verifier_position.cpp +++ b/ets2panda/test/unit/plugin/plugin_proceed_to_state_parse_and_verifier_position.cpp @@ -90,6 +90,24 @@ export declare function fooDecl( options: number, myop: string ): void + +export declare abstract class ABClass { + @exportAnno + static $_instantiate( + factory: () => T, + initializers?: number, + reuseId?: string, + @exportAnno content?: () => void + ): T +} + +export declare interface InterfaceTest { + @exportAnno + private interfaceFoo5( + initializers?: number, + reuseId?: string, + ):number | string[] +} )"; constexpr size_t NS_START_LINE = 11; @@ -108,6 +126,7 @@ constexpr size_t CLASS_PROP3_START_LINE = 51; constexpr size_t CLASS_FOO1_START_LINE = 24; constexpr size_t CLASS_FOO2_START_LINE = 45; constexpr size_t CLASS_FOO3_START_LINE = 47; +constexpr size_t CLASS_INSTANTIATE_START_LINE = 73; constexpr size_t INTERFACE_PROP1_START_LINE = 18; constexpr size_t INTERFACE_PROP2_START_LINE = 20; constexpr size_t INTERFACE_PROP3_START_LINE = 35; @@ -116,6 +135,7 @@ constexpr size_t INTERFACE_FOO1_START_LINE = 14; constexpr size_t INTERFACE_FOO2_START_LINE = 16; constexpr size_t INTERFACE_FOO3_START_LINE = 33; constexpr size_t INTERFACE_FOO4_START_LINE = 37; +constexpr size_t INTERFACE_FOO5_START_LINE = 83; constexpr size_t FUNCTION_PARAM1_START_LINE = 55; constexpr size_t FUNCTION_PARAM2_START_LINE = 56; constexpr size_t FUNCTION_PARAM3_START_LINE = 43; @@ -137,6 +157,7 @@ constexpr size_t CLASS_PROP3_END_LINE = 51; constexpr size_t CLASS_FOO1_END_LINE = 24; constexpr size_t CLASS_FOO2_END_LINE = 45; constexpr size_t CLASS_FOO3_END_LINE = 47; +constexpr size_t CLASS_INSTANTIATE_END_LINE = 78; constexpr size_t INTERFACE_PROP1_END_LINE = 18; constexpr size_t INTERFACE_PROP2_END_LINE = 20; constexpr size_t INTERFACE_PROP3_END_LINE = 35; @@ -145,6 +166,7 @@ constexpr size_t INTERFACE_FOO1_END_LINE = 14; constexpr size_t INTERFACE_FOO2_END_LINE = 16; constexpr size_t INTERFACE_FOO3_END_LINE = 33; constexpr size_t INTERFACE_FOO4_END_LINE = 37; +constexpr size_t INTERFACE_FOO5_END_LINE = 86; constexpr size_t FUNCTION_PARAM1_END_LINE = 55; constexpr size_t FUNCTION_PARAM2_END_LINE = 56; constexpr size_t FUNCTION_PARAM3_END_LINE = 43; @@ -166,6 +188,7 @@ constexpr size_t CLASS_PROP3_START_COL = 5; constexpr size_t CLASS_FOO1_START_COL = 5; constexpr size_t CLASS_FOO2_START_COL = 5; constexpr size_t CLASS_FOO3_START_COL = 5; +constexpr size_t CLASS_INSTANTIATE_START_COL = 10; constexpr size_t INTERFACE_PROP1_START_COL = 13; constexpr size_t INTERFACE_PROP2_START_COL = 5; constexpr size_t INTERFACE_PROP3_START_COL = 5; @@ -174,6 +197,7 @@ constexpr size_t INTERFACE_FOO1_START_COL = 5; constexpr size_t INTERFACE_FOO2_START_COL = 5; constexpr size_t INTERFACE_FOO3_START_COL = 13; constexpr size_t INTERFACE_FOO4_START_COL = 5; +constexpr size_t INTERFACE_FOO5_START_COL = 13; constexpr size_t FUNCTION_PARAM1_START_COL = 3; constexpr size_t FUNCTION_PARAM2_START_COL = 3; constexpr size_t FUNCTION_PARAM3_START_COL = 11; @@ -195,6 +219,7 @@ constexpr size_t CLASS_PROP3_END_COL = 26; constexpr size_t CLASS_FOO1_END_COL = 24; constexpr size_t CLASS_FOO2_END_COL = 24; constexpr size_t CLASS_FOO3_END_COL = 24; +constexpr size_t CLASS_INSTANTIATE_END_COL = 7; constexpr size_t INTERFACE_PROP1_END_COL = 34; constexpr size_t INTERFACE_PROP2_END_COL = 37; constexpr size_t INTERFACE_PROP3_END_COL = 26; @@ -203,6 +228,7 @@ constexpr size_t INTERFACE_FOO1_END_COL = 43; constexpr size_t INTERFACE_FOO2_END_COL = 25; constexpr size_t INTERFACE_FOO3_END_COL = 46; constexpr size_t INTERFACE_FOO4_END_COL = 25; +constexpr size_t INTERFACE_FOO5_END_COL = 24; constexpr size_t FUNCTION_PARAM1_END_COL = 16; constexpr size_t FUNCTION_PARAM2_END_COL = 16; constexpr size_t FUNCTION_PARAM3_END_COL = 21; @@ -232,10 +258,12 @@ static std::map startLineMap = {{"exportNamedDecl", EXPORT_ {"interfaceFoo2", INTERFACE_FOO2_START_LINE}, {"interfaceFoo3", INTERFACE_FOO3_START_LINE}, {"interfaceFoo4", INTERFACE_FOO4_START_LINE}, + {"interfaceFoo5", INTERFACE_FOO5_START_LINE}, {"fooP1", FUNCTION_PARAM1_START_LINE}, {"fooP2", FUNCTION_PARAM2_START_LINE}, {"p3", FUNCTION_PARAM3_START_LINE}, - {"fooDecl", FUNCTION_DECL_START_LINE}}; + {"fooDecl", FUNCTION_DECL_START_LINE}, + {"$_instantiate", CLASS_INSTANTIATE_START_LINE}}; static std::map startColMap = {{"exportNamedDecl", EXPORT_NAMED_DECL_START_COL}, {"exportSingleNamedDecl", EXPORT_SINGLE_NAMED_DECL_START_COL}, @@ -261,10 +289,12 @@ static std::map startColMap = {{"exportNamedDecl", EXPORT_N {"interfaceFoo2", INTERFACE_FOO2_START_COL}, {"interfaceFoo3", INTERFACE_FOO3_START_COL}, {"interfaceFoo4", INTERFACE_FOO4_START_COL}, + {"interfaceFoo5", INTERFACE_FOO5_START_COL}, {"fooP1", FUNCTION_PARAM1_START_COL}, {"fooP2", FUNCTION_PARAM2_START_COL}, {"p3", FUNCTION_PARAM3_START_COL}, - {"fooDecl", FUNCTION_DECL_START_COL}}; + {"fooDecl", FUNCTION_DECL_START_COL}, + {"$_instantiate", CLASS_INSTANTIATE_START_COL}}; static std::map endLineMap = {{"exportNamedDecl", EXPORT_NAMED_DECL_END_LINE}, {"exportSingleNamedDecl", EXPORT_SINGLE_NAMED_DECL_END_LINE}, @@ -290,10 +320,12 @@ static std::map endLineMap = {{"exportNamedDecl", EXPORT_NA {"interfaceFoo2", INTERFACE_FOO2_END_LINE}, {"interfaceFoo3", INTERFACE_FOO3_END_LINE}, {"interfaceFoo4", INTERFACE_FOO4_END_LINE}, + {"interfaceFoo5", INTERFACE_FOO5_END_LINE}, {"fooP1", FUNCTION_PARAM1_END_LINE}, {"fooP2", FUNCTION_PARAM2_END_LINE}, {"p3", FUNCTION_PARAM3_END_LINE}, - {"fooDecl", FUNCTION_DECL_END_LINE}}; + {"fooDecl", FUNCTION_DECL_END_LINE}, + {"$_instantiate", CLASS_INSTANTIATE_END_LINE}}; static std::map endColMap = {{"exportNamedDecl", EXPORT_NAMED_DECL_END_COL}, {"exportSingleNamedDecl", EXPORT_SINGLE_NAMED_DECL_END_COL}, @@ -319,10 +351,12 @@ static std::map endColMap = {{"exportNamedDecl", EXPORT_NAM {"interfaceFoo2", INTERFACE_FOO2_END_COL}, {"interfaceFoo3", INTERFACE_FOO3_END_COL}, {"interfaceFoo4", INTERFACE_FOO4_END_COL}, + {"interfaceFoo5", INTERFACE_FOO5_END_COL}, {"fooP1", FUNCTION_PARAM1_END_COL}, {"fooP2", FUNCTION_PARAM2_END_COL}, {"p3", FUNCTION_PARAM3_END_COL}, - {"fooDecl", FUNCTION_DECL_END_COL}}; + {"fooDecl", FUNCTION_DECL_END_COL}, + {"$_instantiate", CLASS_INSTANTIATE_END_COL}}; static es2panda_Impl *impl = nullptr; es2panda_Context *context = nullptr; @@ -456,8 +490,9 @@ static void FindEnumMember(es2panda_AstNode *ast, [[maybe_unused]] void *ctx) } static std::map methodMap = { - {"interfaceFoo1", nullptr}, {"interfaceFoo2", nullptr}, {"interfaceFoo3", nullptr}, {"interfaceFoo4", nullptr}, - {"classFoo1", nullptr}, {"classFoo2", nullptr}, {"classFoo3", nullptr}}; + {"interfaceFoo1", nullptr}, {"interfaceFoo2", nullptr}, {"interfaceFoo3", nullptr}, + {"interfaceFoo4", nullptr}, {"interfaceFoo5", nullptr}, {"classFoo1", nullptr}, + {"classFoo2", nullptr}, {"classFoo3", nullptr}, {"$_instantiate", nullptr}}; static void FindMethodDef(es2panda_AstNode *ast, [[maybe_unused]] void *ctx) { if (!impl->IsMethodDefinition(ast)) { @@ -512,11 +547,6 @@ static bool CheckLineAndCol(es2panda_AstNode *ast, std::string name) { auto start = impl->AstNodeStartConst(context, ast); auto end = impl->AstNodeEndConst(context, ast); - [[maybe_unused]] auto a = impl->SourcePositionLine(context, start); - [[maybe_unused]] auto b = impl->SourcePositionCol(context, start); - [[maybe_unused]] auto c = impl->SourcePositionLine(context, end); - [[maybe_unused]] auto d = impl->SourcePositionCol(context, end); - auto res = startLineMap[name] == impl->SourcePositionLine(context, start); ASSERT(startLineMap[name] == impl->SourcePositionLine(context, start)); -- Gitee