From 1caea08cd510e4cc76a47f8a5190a7651493b9eb Mon Sep 17 00:00:00 2001 From: dongchao Date: Wed, 9 Jul 2025 14:42:43 +0800 Subject: [PATCH] Change any to ESObject in declgen_ets2ts Issue: https://gitee.com/openharmony/arkcompiler_ets_frontend/issues/ICL1JU Signed-off-by: dongchao Change-Id: Icd708bb87052b8c9041b036f449fb883b4b3f273 --- ets2panda/declgen_ets2ts/declgenEts2Ts.cpp | 14 +++++++------- .../ets-runtime/declgen-ets2ts-runtime-ignored.txt | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ets2panda/declgen_ets2ts/declgenEts2Ts.cpp b/ets2panda/declgen_ets2ts/declgenEts2Ts.cpp index b37db2b236..bb99982b9a 100644 --- a/ets2panda/declgen_ets2ts/declgenEts2Ts.cpp +++ b/ets2panda/declgen_ets2ts/declgenEts2Ts.cpp @@ -444,7 +444,7 @@ bool TSDeclGen::HandleETSSpecificTypes(const checker::Type *checkerType) GenTupleType(checkerType->AsETSTupleType()); return true; case checker::TypeFlag::ETS_ANY: - OutDts("any"); + OutDts("ESObject"); return true; default: LogError(diagnostic::UNSUPPORTED_TYPE, {GetDebugTypeName(checkerType)}); @@ -604,7 +604,7 @@ void TSDeclGen::ProcessFuncParameter(varbinder::LocalVariable *param) ProcessTypeAnnotationType(typeAnnotation, paramType); return; } - OutDts("any"); + OutDts("ESObject"); } void TSDeclGen::ProcessFuncParameters(const checker::Signature *sig) @@ -822,7 +822,7 @@ void TSDeclGen::GenObjectType(const checker::ETSObjectType *objectType) std::string typeStr = objectType->Name().Mutf8(); if (objectType->Name().Empty()) { LogWarning(diagnostic::EMPTY_TYPE_NAME); - OutDts("any"); + OutDts("ESObject"); } else { if (typeStr == "Exception" || typeStr == "NullPointerError") { OutDts("Error"); @@ -1383,7 +1383,7 @@ bool TSDeclGen::ProcessTypeAnnotationSpecificTypes(const checker::Type *checkerT OutDts(checkerType->ToString()); return true; case checker::TypeFlag::ETS_ANY: - OutDts("any"); + OutDts("ESObject"); return true; default: return false; @@ -1759,7 +1759,7 @@ void TSDeclGen::GenPartName(std::string &partName) } else if (partName == "Exception" || partName == "NullPointerError") { partName = "Error"; } else if (partName == "Any") { - partName = "any"; + partName = "ESObject"; } } @@ -2080,7 +2080,7 @@ void TSDeclGen::GenMethodSignature(const ir::MethodDefinition *methodDef, const if (methodDef->TsType() == nullptr) { LogWarning(diagnostic::UNTYPED_METHOD, {methodName}, methodIdent->Start()); - OutDts(": any"); + OutDts(": ESObject"); return; } if (methodDef->TsType()->IsETSFunctionType()) { @@ -2181,7 +2181,7 @@ void TSDeclGen::ProcessClassPropDeclaration(const ir::ClassProperty *classProp) OutDts(propName); OutDts(": "); if (!state_.inNamespace) { - classProp->IsStatic() ? OutDts("any") : GenType(classProp->TsType()); + classProp->IsStatic() ? OutDts("ESObject") : GenType(classProp->TsType()); } else { ProcessClassPropertyType(classProp); } diff --git a/ets2panda/test/test-lists/declgenets2ts/ets-runtime/declgen-ets2ts-runtime-ignored.txt b/ets2panda/test/test-lists/declgenets2ts/ets-runtime/declgen-ets2ts-runtime-ignored.txt index 2bfb00fa8a..8eccf1e96e 100644 --- a/ets2panda/test/test-lists/declgenets2ts/ets-runtime/declgen-ets2ts-runtime-ignored.txt +++ b/ets2panda/test/test-lists/declgenets2ts/ets-runtime/declgen-ets2ts-runtime-ignored.txt @@ -19,3 +19,4 @@ static-invoke.ets top_level_03.ets multisource_inheritance.ets as_string.ets +function_type_with_receiver/extensionFunctionType_return_this.ets -- Gitee