diff --git a/static_core/plugins/ets/runtime/ets_panda_file_items.h b/static_core/plugins/ets/runtime/ets_panda_file_items.h index 7c39e33d64f5cdbc02aae6ebc5c82e1ef7765329..cf66f409e1a8cc9513426c5254ed3d03d954f647 100644 --- a/static_core/plugins/ets/runtime/ets_panda_file_items.h +++ b/static_core/plugins/ets/runtime/ets_panda_file_items.h @@ -26,7 +26,7 @@ namespace class_descriptors { // Base classes static constexpr std::string_view ERROR = "Lescompat/Error;"; static constexpr std::string_view ARRAY_BUFFER = "Lescompat/ArrayBuffer;"; -static constexpr std::string_view BIG_INT = "Lescompat/BigInt;"; +static constexpr std::string_view BIG_INT = "Lstd/core/BigInt;"; static constexpr std::string_view ASYNC = "Lets/coroutine/Async;"; static constexpr std::string_view EXCEPTION = "Lstd/core/Exception;"; static constexpr std::string_view OBJECT = "Lstd/core/Object;"; diff --git a/static_core/plugins/ets/runtime/ets_platform_types.cpp b/static_core/plugins/ets/runtime/ets_platform_types.cpp index ac3cdaa49551cc9e65c0a07bc15afd62778b5df5..1c65eaf7ec45ee598872a761d9ab4dc96797cc27 100644 --- a/static_core/plugins/ets/runtime/ets_platform_types.cpp +++ b/static_core/plugins/ets/runtime/ets_platform_types.cpp @@ -164,7 +164,7 @@ EtsPlatformTypes::EtsPlatformTypes([[maybe_unused]] EtsCoroutine *coro) findType(&EtsPlatformTypes::coreFloat, BOX_FLOAT); findType(&EtsPlatformTypes::coreDouble, BOX_DOUBLE); - findType(&EtsPlatformTypes::escompatBigint, BIG_INT); + findType(&EtsPlatformTypes::coreBigint, BIG_INT); findType(&EtsPlatformTypes::escompatError, ERROR); findType(&EtsPlatformTypes::coreFunction, FUNCTION); diff --git a/static_core/plugins/ets/runtime/ets_platform_types.h b/static_core/plugins/ets/runtime/ets_platform_types.h index ad7f0473a998e0c0b50e77521663d02767756630..862397021831eb8881286471e82a52907aa52785 100644 --- a/static_core/plugins/ets/runtime/ets_platform_types.h +++ b/static_core/plugins/ets/runtime/ets_platform_types.h @@ -56,7 +56,7 @@ public: EtsClass *coreDouble {}; /* ets base language classes */ - EtsClass *escompatBigint {}; + EtsClass *coreBigint {}; EtsClass *escompatError {}; EtsClass *coreFunction {}; std::array coreFunctions {}; diff --git a/static_core/plugins/ets/runtime/interop_js/intrinsics/std_js_jsruntime.yaml b/static_core/plugins/ets/runtime/interop_js/intrinsics/std_js_jsruntime.yaml index 55c75c3d92fb542b2182c6f37ad060a6d29579d7..d62b9f34cdea23275fbfecdc0132a832942b99bf 100644 --- a/static_core/plugins/ets/runtime/interop_js/intrinsics/std_js_jsruntime.yaml +++ b/static_core/plugins/ets/runtime/interop_js/intrinsics/std_js_jsruntime.yaml @@ -27,7 +27,7 @@ coretypes: - managed_class: std.interop.js.JSValue mirror_class: ark::ets::interop::js::JSValue -- managed_class: escompat.BigInt +- managed_class: std.core.BigInt mirror_class: ark::ets::EtsBigInt - managed_class: std.core.Type @@ -116,7 +116,7 @@ intrinsics: ret: u1 args: [ std.core.Object ] impl: ark::ets::interop::js::intrinsics::JSRuntimeIsJSValueIntrinsic - clear_flags: [can_throw, heap_inv, no_cse] + clear_flags: [can_throw, heap_inv, no_cse] - name: JSRuntimeNewJSValueBigInt space: ets @@ -125,7 +125,7 @@ intrinsics: static: true signature: ret: std.interop.js.JSValue - args: [ escompat.BigInt ] + args: [ std.core.BigInt ] impl: ark::ets::interop::js::intrinsics::JSRuntimeNewJSValueBigIntIntrinsic clear_flags: [can_throw, heap_inv, no_cse] @@ -641,7 +641,7 @@ intrinsics: static: true signature: ret: std.core.Object - args: + args: - std.core.Object - std.core.Object[] impl: ark::ets::interop::js::intrinsics::JSRuntimeInvokeDynamicFunctionIntrinsic diff --git a/static_core/plugins/ets/runtime/intrinsics/escompat_TypedArrays.cpp b/static_core/plugins/ets/runtime/intrinsics/escompat_TypedArrays.cpp index d4a979296bc53421508766267b1750b9c693495b..51c8ab9fe9ef7f47d3947e951935dd1c78a7062d 100644 --- a/static_core/plugins/ets/runtime/intrinsics/escompat_TypedArrays.cpp +++ b/static_core/plugins/ets/runtime/intrinsics/escompat_TypedArrays.cpp @@ -330,7 +330,7 @@ class BigInt64ArrayElement { public: using Type = typename ArrayType::ElementType; - BigInt64ArrayElement() : escompatBigIntClass_(PlatformTypes(EtsCoroutine::GetCurrent())->escompatBigint) {} + BigInt64ArrayElement() : stdCoreBigIntClass_(PlatformTypes(EtsCoroutine::GetCurrent())->coreBigint) {} std::optional GetTyped(EtsObject *object) const { @@ -361,7 +361,7 @@ private: const EtsBigInt *Cast(EtsObject *object) const { - if (CheckCastedClass([](const EtsClass *klass) { return klass->IsBigInt(); }, escompatBigIntClass_, + if (CheckCastedClass([](const EtsClass *klass) { return klass->IsBigInt(); }, stdCoreBigIntClass_, object->GetClass())) { return EtsBigInt::FromEtsObject(object); } @@ -372,7 +372,7 @@ private: friend ArrayElement; - const EtsClass *escompatBigIntClass_; + const EtsClass *stdCoreBigIntClass_; }; template <> diff --git a/static_core/plugins/ets/runtime/static_type_converter.cpp b/static_core/plugins/ets/runtime/static_type_converter.cpp index 11bc00f1a627a8103ff7e28eae0069e5adca96d3..d3f006ace95a8694dbe014133295e0d103ee6c56 100644 --- a/static_core/plugins/ets/runtime/static_type_converter.cpp +++ b/static_core/plugins/ets/runtime/static_type_converter.cpp @@ -68,9 +68,9 @@ common::BoxedValue StaticTypeConverter::WrapBoxed(common::BaseType value) for (uint32_t i = 0; i < len; i++) { etsIntArray->Set(i, static_cast(arg.data[i])); } - ASSERT(ptypes->escompatBigint != nullptr); + ASSERT(ptypes->coreBigint != nullptr); VMHandle arrHandle(coro, etsIntArray->GetCoreType()); - auto bigInt = EtsBigInt::FromEtsObject(EtsObject::Create(ptypes->escompatBigint)); + auto bigInt = EtsBigInt::FromEtsObject(EtsObject::Create(ptypes->coreBigint)); bigInt->SetFieldObject(EtsBigInt::GetBytesOffset(), reinterpret_cast(arrHandle.GetPtr())); bigInt->SetFieldPrimitive(EtsBigInt::GetSignOffset(), arg.data.empty() ? 0 : sign == 0 ? 1 : -1); etsObject = reinterpret_cast(bigInt); @@ -113,7 +113,7 @@ common::BaseType StaticTypeConverter::UnwrapBoxed(common::BoxedValue value) return EtsBoxPrimitive::Unbox(etsObj); } else if (cls == ptypes->coreChar) { return EtsBoxPrimitive::Unbox(etsObj); - } else if (cls == ptypes->escompatBigint) { + } else if (cls == ptypes->coreBigint) { common::BaseBigInt baseBigInt; auto bigInt = EtsBigInt::FromEtsObject(etsObj); auto etsValue = bigInt->GetBytes(); @@ -130,4 +130,4 @@ common::BaseType StaticTypeConverter::UnwrapBoxed(common::BoxedValue value) return reinterpret_cast(etsObj); } // NOLINTEND(readability-else-after-return) -} // namespace ark::ets \ No newline at end of file +} // namespace ark::ets diff --git a/static_core/plugins/ets/stdlib/escompat/_initializerBlock_.ets b/static_core/plugins/ets/stdlib/escompat/_initializerBlock_.ets index 7b1ded4b077de37a3d6a5a93019fdf570ba69551..6bb70e7d6a3fc720bf3c26742b05d931c8da141c 100644 --- a/static_core/plugins/ets/stdlib/escompat/_initializerBlock_.ets +++ b/static_core/plugins/ets/stdlib/escompat/_initializerBlock_.ets @@ -25,18 +25,6 @@ static { NaN = Double.NaN; Infinity = Double.POSITIVE_INFINITY; IS_LITTLE_ENDIAN = Runtime.isLittleEndianPlatform() - MAX_REGULAR_INTEGER = new BigInt(Number.MAX_SAFE_INTEGER) - - FAST_TO_STRING_HANDLER_MAP = () => { - let result = new ToStringHandlerMap - result[2] = (instance: BigInt):string => { return instance.toStringAsBinary() } - result[4] = (instance: BigInt):string => { return instance.toStringAsPowerOfTwoRadix(4) } - result[8] = (instance: BigInt):string => { return instance.toStringAsPowerOfTwoRadix(8) } - result[10] = (instance: BigInt):string => { return instance.toStringAsDecimal() } - result[16] = (instance: BigInt):string => { return instance.toStringAsPowerOfTwoRadix(16) } - result[32] = (instance: BigInt):string => { return instance.toStringAsPowerOfTwoRadix(32) } - return result - }() dayNames = [ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" diff --git a/static_core/plugins/ets/stdlib/escompat/BigInt.ets b/static_core/plugins/ets/stdlib/std/core/BigInt.ets similarity index 99% rename from static_core/plugins/ets/stdlib/escompat/BigInt.ets rename to static_core/plugins/ets/stdlib/std/core/BigInt.ets index afc69b3b61f4c5a8f2dfba884411d6802e6854c2..0dedd15b020fab626cce888b4fa2eb7a1cab8a01 100644 --- a/static_core/plugins/ets/stdlib/escompat/BigInt.ets +++ b/static_core/plugins/ets/stdlib/std/core/BigInt.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -package escompat +package std.core; /** * `bigint` is an alias for type `BigInt` diff --git a/static_core/plugins/ets/stdlib/std/core/_initializerBlock_.ets b/static_core/plugins/ets/stdlib/std/core/_initializerBlock_.ets index 2a46f54938dbd7a1101ff8e2acab87f114033a3c..caeb9d3a4063cf5fbd769ec2f30c399c3d754aed 100644 --- a/static_core/plugins/ets/stdlib/std/core/_initializerBlock_.ets +++ b/static_core/plugins/ets/stdlib/std/core/_initializerBlock_.ets @@ -18,8 +18,20 @@ package std.core; static { // 5 lower bits stores kind's id TypeKindMask = ((1 << 6) - 1).toByte(); - + ObjectType = Type.of(new Object()) as ClassType; console = new Console(); coroutine = new Coroutine(); + + MAX_REGULAR_INTEGER = new BigInt(Number.MAX_SAFE_INTEGER) + FAST_TO_STRING_HANDLER_MAP = () => { + let result = new ToStringHandlerMap + result[2] = (instance: BigInt):string => { return instance.toStringAsBinary() } + result[4] = (instance: BigInt):string => { return instance.toStringAsPowerOfTwoRadix(4) } + result[8] = (instance: BigInt):string => { return instance.toStringAsPowerOfTwoRadix(8) } + result[10] = (instance: BigInt):string => { return instance.toStringAsDecimal() } + result[16] = (instance: BigInt):string => { return instance.toStringAsPowerOfTwoRadix(16) } + result[32] = (instance: BigInt):string => { return instance.toStringAsPowerOfTwoRadix(32) } + return result + }() } diff --git a/static_core/plugins/ets/tests/ani/tests/class_ops/class_find_method_test.cpp b/static_core/plugins/ets/tests/ani/tests/class_ops/class_find_method_test.cpp index 68f5be4e4baf087b7381d0bacf40a4c95498f190..de0e5f468409dced385d083384b68035aa4e55ee 100644 --- a/static_core/plugins/ets/tests/ani/tests/class_ops/class_find_method_test.cpp +++ b/static_core/plugins/ets/tests/ani/tests/class_ops/class_find_method_test.cpp @@ -143,7 +143,7 @@ public: void BigintCreator(ani_class *cls, ani_object *result) { - ASSERT_EQ(env_->FindClass("escompat.BigInt", cls), ANI_OK); + ASSERT_EQ(env_->FindClass("std.core.BigInt", cls), ANI_OK); ASSERT_NE(cls, nullptr); ani_method ctor; diff --git a/static_core/plugins/ets/tests/checked/optimize_istrue.ets b/static_core/plugins/ets/tests/checked/optimize_istrue.ets index 800b228ea3c2cdaa9b9b03bb6a5471219e3dd67b..20a7d8d872d122442948e8b1677b4bb05e615d16 100644 --- a/static_core/plugins/ets/tests/checked/optimize_istrue.ets +++ b/static_core/plugins/ets/tests/checked/optimize_istrue.ets @@ -492,11 +492,11 @@ //! # testBigInt //! METHOD "optimize_istrue.ETSGLOBAL::testBigIntFalse" //! PASS_BEFORE "Peepholes" -//! INST_NOT /LoadObject.*escompat\.BigInt\.sign/ +//! INST_NOT /LoadObject.*std\.core\.BigInt\.sign/ //! INST_NOT "Compare NE i32" //! INST_COUNT "Intrinsic.CompilerEtsIstrue", 1 //! PASS_AFTER "Peepholes" -//! INST /LoadObject.*escompat\.BigInt\.sign/ +//! INST /LoadObject.*std\.core\.BigInt\.sign/ //! INST_NEXT "Compare NE i32" //! INST_NEXT "Intrinsic.CompilerEtsIstrue" //! PASS_AFTER_NEXT "Cleanup" @@ -504,11 +504,11 @@ //! //! METHOD "optimize_istrue.ETSGLOBAL::testBigIntTrue" //! PASS_BEFORE "Peepholes" -//! INST_NOT /LoadObject.*escompat\.BigInt\.sign/ +//! INST_NOT /LoadObject.*std\.core\.BigInt\.sign/ //! INST_NOT "Compare NE i32" //! INST_COUNT "Intrinsic.CompilerEtsIstrue", 1 //! PASS_AFTER "Peepholes" -//! INST /LoadObject.*escompat\.BigInt\.sign/ +//! INST /LoadObject.*std\.core\.BigInt\.sign/ //! INST_NEXT "Compare NE i32" //! INST_NEXT "Intrinsic.CompilerEtsIstrue" //! PASS_AFTER_NEXT "Cleanup" @@ -516,11 +516,11 @@ //! //! METHOD "optimize_istrue.ETSGLOBAL::__noinline__testBigIntTrue2" //! PASS_BEFORE "Peepholes" -//! INST_NOT /LoadObject.*escompat\.BigInt\.sign/ +//! INST_NOT /LoadObject.*std\.core\.BigInt\.sign/ //! INST_COUNT "Compare NE i32", 1 //! INST_COUNT "Intrinsic.CompilerEtsIstrue", 1 //! PASS_AFTER "Peepholes" -//! INST /LoadObject.*escompat\.BigInt\.sign/ +//! INST /LoadObject.*std\.core\.BigInt\.sign/ //! INST_NEXT "Compare NE i32" //! INST_NEXT "Intrinsic.CompilerEtsIstrue" //! INST_COUNT "Compare NE i32", 2 @@ -1180,11 +1180,11 @@ //! # testBigInt //! METHOD "optimize_istrue.ETSGLOBAL::testBigIntFalse" //! PASS_BEFORE "Peepholes" -//! INST_NOT /LoadObject.*escompat\.BigInt\.sign/ +//! INST_NOT /LoadObject.*std\.core\.BigInt\.sign/ //! INST_NOT "Compare NE i32" //! INST_COUNT "Intrinsic.CompilerEtsIstrue", 1 //! PASS_AFTER "Peepholes" -//! INST /LoadObject.*escompat\.BigInt\.sign/ +//! INST /LoadObject.*std\.core\.BigInt\.sign/ //! INST_NEXT "Compare NE i32" //! INST_NEXT "Intrinsic.CompilerEtsIstrue" //! PASS_AFTER_NEXT "Cleanup" @@ -1192,11 +1192,11 @@ //! //! METHOD "optimize_istrue.ETSGLOBAL::testBigIntTrue" //! PASS_BEFORE "Peepholes" -//! INST_NOT /LoadObject.*escompat\.BigInt\.sign/ +//! INST_NOT /LoadObject.*std\.core\.BigInt\.sign/ //! INST_NOT "Compare NE i32" //! INST_COUNT "Intrinsic.CompilerEtsIstrue", 1 //! PASS_AFTER "Peepholes" -//! INST /LoadObject.*escompat\.BigInt\.sign/ +//! INST /LoadObject.*std\.core\.BigInt\.sign/ //! INST_NEXT "Compare NE i32" //! INST_NEXT "Intrinsic.CompilerEtsIstrue" //! PASS_AFTER_NEXT "Cleanup" @@ -1204,11 +1204,11 @@ //! //! METHOD "optimize_istrue.ETSGLOBAL::__noinline__testBigIntTrue2" //! PASS_BEFORE "Peepholes" -//! INST_NOT /LoadObject.*escompat\.BigInt\.sign/ +//! INST_NOT /LoadObject.*std\.core\.BigInt\.sign/ //! INST_COUNT "Compare NE i32", 1 //! INST_COUNT "Intrinsic.CompilerEtsIstrue", 1 //! PASS_AFTER "Peepholes" -//! INST /LoadObject.*escompat\.BigInt\.sign/ +//! INST /LoadObject.*std\.core\.BigInt\.sign/ //! INST_NEXT "Compare NE i32" //! INST_NEXT "Intrinsic.CompilerEtsIstrue" //! INST_COUNT "Compare NE i32", 2 diff --git a/static_core/plugins/ets/tests/ets-common-tests/intrinsics/typed_arrays_from.ets b/static_core/plugins/ets/tests/ets-common-tests/intrinsics/typed_arrays_from.ets index acf45aaf1d18b60a598174fb6486397f30226a14..e870b80b696af8cd329f1c852df7447a2f526193 100644 --- a/static_core/plugins/ets/tests/ets-common-tests/intrinsics/typed_arrays_from.ets +++ b/static_core/plugins/ets/tests/ets-common-tests/intrinsics/typed_arrays_from.ets @@ -471,7 +471,7 @@ function __noinline__BigInt64ArrayFromCheckException(obj: Object, factType: stri { let arr: Array = obj as Array; arktest.expectThrow(() => { BigInt64Array.from(arr); }, (e: Error) => { - return e instanceof ClassCastError && e.message == factType + ' cannot be cast to escompat.BigInt'; + return e instanceof ClassCastError && e.message == factType + ' cannot be cast to std.core.BigInt'; }); } diff --git a/static_core/plugins/ets/tests/ets-templates/20.implementation_details/03.getting_type_via_reflection/how_to_get_type_via_reflection_ext.params.yaml b/static_core/plugins/ets/tests/ets-templates/20.implementation_details/03.getting_type_via_reflection/how_to_get_type_via_reflection_ext.params.yaml index 370c88a068d5ca60e01678ce16ab26abe088b450..b5cb81861f57e915152a98e511ab94360795a997 100644 --- a/static_core/plugins/ets/tests/ets-templates/20.implementation_details/03.getting_type_via_reflection/how_to_get_type_via_reflection_ext.params.yaml +++ b/static_core/plugins/ets/tests/ets-templates/20.implementation_details/03.getting_type_via_reflection/how_to_get_type_via_reflection_ext.params.yaml @@ -28,7 +28,7 @@ cases: - desc: How to get bigint via reflection. logic: |- let type_of_bigint: Type = Type.from(); - arktest.assertEQ(type_of_bigint.toString(), "escompat.BigInt"); + arktest.assertEQ(type_of_bigint.toString(), "std.core.BigInt"); - desc: How to get RegExp[] via reflection. logic: |- let type_of_Array_RegExp: Type = Type.from(); diff --git a/static_core/plugins/ets/tests/runtime/static_type_converter_test.cpp b/static_core/plugins/ets/tests/runtime/static_type_converter_test.cpp index 02a85e2bf0ff3df79994d6e88f10e280fc53c33f..8715c9adbe243873a968e8b0b7a4f4914312821d 100644 --- a/static_core/plugins/ets/tests/runtime/static_type_converter_test.cpp +++ b/static_core/plugins/ets/tests/runtime/static_type_converter_test.cpp @@ -316,8 +316,8 @@ TEST_F(StaticTypeConverterTest, UnwrapBaseBigInt) for (uint32_t i = 0; i < LENGTH; i++) { etsIntArray->Set(i, static_cast(digits[i])); } - ASSERT(ptypes->escompatBigint != nullptr); - auto bigInt = EtsBigInt::FromEtsObject(EtsObject::Create(ptypes->escompatBigint)); + ASSERT(ptypes->coreBigint != nullptr); + auto bigInt = EtsBigInt::FromEtsObject(EtsObject::Create(ptypes->coreBigint)); bigInt->SetFieldObject(EtsBigInt::GetBytesOffset(), reinterpret_cast(etsIntArray)); bigInt->SetFieldPrimitive(EtsBigInt::GetSignOffset(), tarSign); @@ -361,4 +361,4 @@ TEST_F(StaticTypeConverterTest, UnwrapBoxedObject) EXPECT_EQ(std::get(result), reinterpret_cast(testObj)); } // NOLINTEND(readability-identifier-naming, readability-magic-numbers) -} // namespace ark::ets::test \ No newline at end of file +} // namespace ark::ets::test diff --git a/static_core/plugins/ets/tests/stdlib-templates/escompat/list.escompat_BigInt_instance.yaml b/static_core/plugins/ets/tests/stdlib-templates/std/core/list.std_core_BigInt_instance.yaml similarity index 100% rename from static_core/plugins/ets/tests/stdlib-templates/escompat/list.escompat_BigInt_instance.yaml rename to static_core/plugins/ets/tests/stdlib-templates/std/core/list.std_core_BigInt_instance.yaml diff --git a/static_core/plugins/ets/tests/stdlib-templates/escompat/list.escompat_BigInt_static.yaml b/static_core/plugins/ets/tests/stdlib-templates/std/core/list.std_core_BigInt_static.yaml similarity index 100% rename from static_core/plugins/ets/tests/stdlib-templates/escompat/list.escompat_BigInt_static.yaml rename to static_core/plugins/ets/tests/stdlib-templates/std/core/list.std_core_BigInt_static.yaml diff --git a/static_core/plugins/ets/tests/stdlib-templates/escompat/escompat_BigInt.ets b/static_core/plugins/ets/tests/stdlib-templates/std/core/std_core_BigInt.ets similarity index 92% rename from static_core/plugins/ets/tests/stdlib-templates/escompat/escompat_BigInt.ets rename to static_core/plugins/ets/tests/stdlib-templates/std/core/std_core_BigInt.ets index b23cfa09ea51893914518e36bfedebd8875931b3..7a1a596492831ef3bb15d9ec4dd8bb2782102216 100644 --- a/static_core/plugins/ets/tests/stdlib-templates/escompat/escompat_BigInt.ets +++ b/static_core/plugins/ets/tests/stdlib-templates/std/core/std_core_BigInt.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -{% for item in escompat_BigInt_instance %} +{% for item in std_core_BigInt_instance %} /*--- desc: {function: instance_{{.item.object_type}}_{{.item.method_name}}} ---*/ @@ -22,7 +22,7 @@ desc: {function: instance_{{.item.object_type}}_{{.item.method_name}}} {% endfor %} -{% for item in escompat_BigInt_static %} +{% for item in std_core_BigInt_static %} /*--- desc: {function: static_{{.item.object_type}}_{{.item.method_name}}} ---*/ diff --git a/static_core/plugins/ets/tests/test-lists/ets-func-tests/ets-func-tests-excluded.txt b/static_core/plugins/ets/tests/test-lists/ets-func-tests/ets-func-tests-excluded.txt index 785881df02a0a4c9475996a681534649411451c2..ae966e9e014fca74baa50ccea33c75e335fa9a69 100644 --- a/static_core/plugins/ets/tests/test-lists/ets-func-tests/ets-func-tests-excluded.txt +++ b/static_core/plugins/ets/tests/test-lists/ets-func-tests/ets-func-tests-excluded.txt @@ -117,7 +117,7 @@ std/core/TypeCreateErasedBodyTest.ets std/core/TypeMethodInvoke.ets std/core/std_core_string_String_repeat_int.ets std/core/std_core_string_String_repeat_number.ets -escompat/escompat_BigInt_instance_BigInt_toString_011.ets +std/core/std_core_BigInt_instance_BigInt_toString_011.ets std/core/std_core_string_String_codePointCount_number_number.ets # 3. diff --git a/static_core/plugins/ets/tests/test-lists/ets-func-tests/ets-func-tests-ignored.txt b/static_core/plugins/ets/tests/test-lists/ets-func-tests/ets-func-tests-ignored.txt index 8269bd0e7c7a490efc25f9b4d453b4105910f977..547b366ad91ad886988fd855784c446507737cac 100644 --- a/static_core/plugins/ets/tests/test-lists/ets-func-tests/ets-func-tests-ignored.txt +++ b/static_core/plugins/ets/tests/test-lists/ets-func-tests/ets-func-tests-ignored.txt @@ -462,7 +462,7 @@ std/core/NumberTest.ets # 9. # other fails escompat/JsonStringifyTest.ets -escompat/escompat_BigInt_instance_BigInt_toString_011.ets +std/core/std_core_BigInt_instance_BigInt_toString_011.ets spec/03.types/References_Types/Bigint/bigint-arithmetic-comparison-11.ets spec/03.types/References_Types/Bigint/bigint-arithmetic-comparison-12.ets spec/03.types/References_Types/Bigint/bigint-arithmetic-comparison-13.ets