From 8bd92a2221da79593cd7ee27a4f66a2e8ad8cc92 Mon Sep 17 00:00:00 2001 From: Ivan Tyulyandin Date: Wed, 18 Jun 2025 15:07:46 +0300 Subject: [PATCH] [StdLib] Move Function under namespace Reason: stdlib reorganization Tesing: all tests are passed, see GGW for results Issue: https://gitee.com/openharmony/arkcompiler_runtime_core/issues/ICEHLJ?from=project-issue Signed-off-by: Ivan Tyulyandin --- .../checker/types/ets/etsFunctionType.cpp | 2 +- ets2panda/compiler/scripts/signatures.yaml | 146 +++++++++--------- 2 files changed, 74 insertions(+), 74 deletions(-) diff --git a/ets2panda/checker/types/ets/etsFunctionType.cpp b/ets2panda/checker/types/ets/etsFunctionType.cpp index 0ec3b4ecac..d6130b61a6 100644 --- a/ets2panda/checker/types/ets/etsFunctionType.cpp +++ b/ets2panda/checker/types/ets/etsFunctionType.cpp @@ -379,7 +379,7 @@ void ETSFunctionType::ToAssemblerType([[maybe_unused]] std::stringstream &ss) co // #22952: some function types are still in AST static std::string FunctionAssemblyTypeFromArity(uint32_t arity) { - return "std.core.Function" + std::to_string(arity); + return "std.core.functions.Function" + std::to_string(arity); } void ETSFunctionType::ToDebugInfoType([[maybe_unused]] std::stringstream &ss) const diff --git a/ets2panda/compiler/scripts/signatures.yaml b/ets2panda/compiler/scripts/signatures.yaml index 5366d99f38..69f0b1c331 100644 --- a/ets2panda/compiler/scripts/signatures.yaml +++ b/ets2panda/compiler/scripts/signatures.yaml @@ -30,7 +30,7 @@ defines: ref: SET_INDEX_METHOD - name: $_iterator ref: ITERATOR_METHOD - - name: Iterator + - name: Iterator ref: ITERATOR_CLASS - name: 'ambient_indexer' ref: AMBIENT_INDEXER @@ -209,7 +209,7 @@ defines: ref: FROM - name: 'Numeric' ref: NUMERIC - - name: 'functions' + - name: 'functional' ref: DEFAULT_ANNO_QUALIFIED_LEFT - name: 'OptionalParametersAnnotation' ref: DEFAULT_ANNO_FOR_FUNC @@ -435,221 +435,221 @@ builtins: - name: DoubleBox package: PKG_STD_CORE ref: BUILTIN_DOUBLE_BOX - - name: Function + - name: functions.Function package: PKG_STD_CORE ref: BUILTIN_FUNCTION - - name: Function0 + - name: functions.Function0 package: PKG_STD_CORE ref: BUILTIN_FUNCTION0 - - name: Function1 + - name: functions.Function1 package: PKG_STD_CORE ref: BUILTIN_FUNCTION1 - - name: Function2 + - name: functions.Function2 package: PKG_STD_CORE ref: BUILTIN_FUNCTION2 - - name: Function3 + - name: functions.Function3 package: PKG_STD_CORE ref: BUILTIN_FUNCTION3 - - name: Function4 + - name: functions.Function4 package: PKG_STD_CORE ref: BUILTIN_FUNCTION4 - - name: Function5 + - name: functions.Function5 package: PKG_STD_CORE ref: BUILTIN_FUNCTION5 - - name: Function6 + - name: functions.Function6 package: PKG_STD_CORE ref: BUILTIN_FUNCTION6 - - name: Function7 + - name: functions.Function7 package: PKG_STD_CORE ref: BUILTIN_FUNCTION7 - - name: Function8 + - name: functions.Function8 package: PKG_STD_CORE ref: BUILTIN_FUNCTION8 - - name: Function9 + - name: functions.Function9 package: PKG_STD_CORE ref: BUILTIN_FUNCTION9 - - name: Function10 + - name: functions.Function10 package: PKG_STD_CORE ref: BUILTIN_FUNCTION10 - - name: Function11 + - name: functions.Function11 package: PKG_STD_CORE ref: BUILTIN_FUNCTION11 - - name: Function12 + - name: functions.Function12 package: PKG_STD_CORE ref: BUILTIN_FUNCTION12 - - name: Function13 + - name: functions.Function13 package: PKG_STD_CORE ref: BUILTIN_FUNCTION13 - - name: Function14 + - name: functions.Function14 package: PKG_STD_CORE ref: BUILTIN_FUNCTION14 - - name: Function15 + - name: functions.Function15 package: PKG_STD_CORE ref: BUILTIN_FUNCTION15 - - name: Function16 + - name: functions.Function16 package: PKG_STD_CORE ref: BUILTIN_FUNCTION16 - - name: FunctionN + - name: functions.FunctionN package: PKG_STD_CORE ref: BUILTIN_FUNCTIONN - - name: Lambda0 + - name: functions.Lambda0 package: PKG_STD_CORE ref: BUILTIN_LAMBDA0 - - name: Lambda1 + - name: functions.Lambda1 package: PKG_STD_CORE ref: BUILTIN_LAMBDA1 - - name: Lambda2 + - name: functions.Lambda2 package: PKG_STD_CORE ref: BUILTIN_LAMBDA2 - - name: Lambda3 + - name: functions.Lambda3 package: PKG_STD_CORE ref: BUILTIN_LAMBDA3 - - name: Lambda4 + - name: functions.Lambda4 package: PKG_STD_CORE ref: BUILTIN_LAMBDA4 - - name: Lambda5 + - name: functions.Lambda5 package: PKG_STD_CORE ref: BUILTIN_LAMBDA5 - - name: Lambda6 + - name: functions.Lambda6 package: PKG_STD_CORE ref: BUILTIN_LAMBDA6 - - name: Lambda7 + - name: functions.Lambda7 package: PKG_STD_CORE ref: BUILTIN_LAMBDA7 - - name: Lambda8 + - name: functions.Lambda8 package: PKG_STD_CORE ref: BUILTIN_LAMBDA8 - - name: Lambda9 + - name: functions.Lambda9 package: PKG_STD_CORE ref: BUILTIN_LAMBDA9 - - name: Lambda10 + - name: functions.Lambda10 package: PKG_STD_CORE ref: BUILTIN_LAMBDA10 - - name: Lambda11 + - name: functions.Lambda11 package: PKG_STD_CORE ref: BUILTIN_LAMBDA11 - - name: Lambda12 + - name: functions.Lambda12 package: PKG_STD_CORE ref: BUILTIN_LAMBDA12 - - name: Lambda13 + - name: functions.Lambda13 package: PKG_STD_CORE ref: BUILTIN_LAMBDA13 - - name: Lambda14 + - name: functions.Lambda14 package: PKG_STD_CORE ref: BUILTIN_LAMBDA14 - - name: Lambda15 + - name: functions.Lambda15 package: PKG_STD_CORE ref: BUILTIN_LAMBDA15 - - name: Lambda16 + - name: functions.Lambda16 package: PKG_STD_CORE ref: BUILTIN_LAMBDA16 - - name: LambdaN + - name: functions.LambdaN package: PKG_STD_CORE ref: BUILTIN_LAMBDAN - - name: FunctionR0 + - name: functions.FunctionR0 package: PKG_STD_CORE ref: BUILTIN_FUNCTIONR0 - - name: FunctionR1 + - name: functions.FunctionR1 package: PKG_STD_CORE ref: BUILTIN_FUNCTIONR1 - - name: FunctionR2 + - name: functions.FunctionR2 package: PKG_STD_CORE ref: BUILTIN_FUNCTIONR2 - - name: FunctionR3 + - name: functions.FunctionR3 package: PKG_STD_CORE ref: BUILTIN_FUNCTIONR3 - - name: FunctionR4 + - name: functions.FunctionR4 package: PKG_STD_CORE ref: BUILTIN_FUNCTIONR4 - - name: FunctionR5 + - name: functions.FunctionR5 package: PKG_STD_CORE ref: BUILTIN_FUNCTIONR5 - - name: FunctionR6 + - name: functions.FunctionR6 package: PKG_STD_CORE ref: BUILTIN_FUNCTIONR6 - - name: FunctionR7 + - name: functions.FunctionR7 package: PKG_STD_CORE ref: BUILTIN_FUNCTIONR7 - - name: FunctionR8 + - name: functions.FunctionR8 package: PKG_STD_CORE ref: BUILTIN_FUNCTIONR8 - - name: FunctionR9 + - name: functions.FunctionR9 package: PKG_STD_CORE ref: BUILTIN_FUNCTIONR9 - - name: FunctionR10 + - name: functions.FunctionR10 package: PKG_STD_CORE ref: BUILTIN_FUNCTIONR10 - - name: FunctionR11 + - name: functions.FunctionR11 package: PKG_STD_CORE ref: BUILTIN_FUNCTIONR11 - - name: FunctionR12 + - name: functions.FunctionR12 package: PKG_STD_CORE ref: BUILTIN_FUNCTIONR12 - - name: FunctionR13 + - name: functions.FunctionR13 package: PKG_STD_CORE ref: BUILTIN_FUNCTIONR13 - - name: FunctionR14 + - name: functions.FunctionR14 package: PKG_STD_CORE ref: BUILTIN_FUNCTIONR14 - - name: FunctionR15 + - name: functions.FunctionR15 package: PKG_STD_CORE ref: BUILTIN_FUNCTIONR15 - - name: FunctionR16 + - name: functions.FunctionR16 package: PKG_STD_CORE ref: BUILTIN_FUNCTIONR16 - - name: LambdaR0 + - name: functions.LambdaR0 package: PKG_STD_CORE ref: BUILTIN_LAMBDAR0 - - name: LambdaR1 + - name: functions.LambdaR1 package: PKG_STD_CORE ref: BUILTIN_LAMBDAR1 - - name: LambdaR2 + - name: functions.LambdaR2 package: PKG_STD_CORE ref: BUILTIN_LAMBDAR2 - - name: LambdaR3 + - name: functions.LambdaR3 package: PKG_STD_CORE ref: BUILTIN_LAMBDAR3 - - name: LambdaR4 + - name: functions.LambdaR4 package: PKG_STD_CORE ref: BUILTIN_LAMBDAR4 - - name: LambdaR5 + - name: functions.LambdaR5 package: PKG_STD_CORE ref: BUILTIN_LAMBDAR5 - - name: LambdaR6 + - name: functions.LambdaR6 package: PKG_STD_CORE ref: BUILTIN_LAMBDAR6 - - name: LambdaR7 + - name: functions.LambdaR7 package: PKG_STD_CORE ref: BUILTIN_LAMBDAR7 - - name: LambdaR8 + - name: functions.LambdaR8 package: PKG_STD_CORE ref: BUILTIN_LAMBDAR8 - - name: LambdaR9 + - name: functions.LambdaR9 package: PKG_STD_CORE ref: BUILTIN_LAMBDAR9 - - name: LambdaR10 + - name: functions.LambdaR10 package: PKG_STD_CORE ref: BUILTIN_LAMBDAR10 - - name: LambdaR11 + - name: functions.LambdaR11 package: PKG_STD_CORE ref: BUILTIN_LAMBDAR11 - - name: LambdaR12 + - name: functions.LambdaR12 package: PKG_STD_CORE ref: BUILTIN_LAMBDAR12 - - name: LambdaR13 + - name: functions.LambdaR13 package: PKG_STD_CORE ref: BUILTIN_LAMBDAR13 - - name: LambdaR14 + - name: functions.LambdaR14 package: PKG_STD_CORE ref: BUILTIN_LAMBDAR14 - - name: LambdaR15 + - name: functions.LambdaR15 package: PKG_STD_CORE ref: BUILTIN_LAMBDAR15 - - name: LambdaR16 + - name: functions.LambdaR16 package: PKG_STD_CORE ref: BUILTIN_LAMBDAR16 -- Gitee