Skip to content

Commit 8f31c25

Browse files
committed
Revise TypeHandler names for consistency
1 parent d0f361c commit 8f31c25

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

lib/Runtime/Library/JavascriptLibrary.cpp

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -937,7 +937,7 @@ namespace Js
937937
return JavascriptLibrary::GetDeferredAsyncFunctionTypeHandlerBase</*isNameAvailable*/ true>();
938938
}
939939

940-
DynamicTypeHandler * JavascriptLibrary::GetDeferredAnonymousPrototypeFunctionTypeHandler()
940+
DynamicTypeHandler * JavascriptLibrary::GetDeferredAnonymousPrototypeFunctionWithLengthTypeHandler()
941941
{
942942
return JavascriptLibrary::GetDeferredFunctionTypeHandlerBase</*isNameAvailable*/ false, /* isPrototypeAvailable */ true, /* isLengthAvailable */ true>();
943943
}
@@ -957,17 +957,22 @@ namespace Js
957957
return DeferredTypeHandler<Js::JavascriptExternalFunction::DeferredLengthInitializer, InitializeFunctionDeferredTypeHandlerFilter</* isNameAvailable */ true, /* isPrototypeAvailable */ true, /* isLengthAvailable */ true>>::GetDefaultInstance();
958958
}
959959

960-
DynamicTypeHandler * JavascriptLibrary::GetDeferredAnonymousFunctionTypeHandler()
960+
DynamicTypeHandler * JavascriptLibrary::GetDeferredAnonymousFunctionWithLengthTypeHandler()
961961
{
962962
return JavascriptLibrary::GetDeferredFunctionTypeHandlerBase</* isNameAvailable */ false, /* isPrototypeAvailable */ false, /* isLengthAvailable */ true>();
963963
}
964964

965+
DynamicTypeHandler * JavascriptLibrary::GetDeferredAnonymousFunctionTypeHandler()
966+
{
967+
return JavascriptLibrary::GetDeferredFunctionTypeHandlerBase</* isNameAvailable */ false, /* isPrototypeAvailable */ false, /* isLengthAvailable */ false>();
968+
}
969+
965970
DynamicTypeHandler * JavascriptLibrary::GetDeferredFunctionTypeHandler()
966971
{
967972
return GetDeferredFunctionTypeHandlerBase</*isNameAvailable*/ true, /*isPrototypeAvailable*/ false, /* isLengthAvailable */ false>();
968973
}
969974

970-
DynamicTypeHandler * JavascriptLibrary::GetDeferredFunctionTypeHandlerNoPrototype()
975+
DynamicTypeHandler * JavascriptLibrary::GetDeferredFunctionWithLengthTypeHandler()
971976
{
972977
return GetDeferredFunctionTypeHandlerBase</*isNameAvailable*/ true, /*isPrototypeAvailable*/ false, /* isLengthAvailable */ true>();
973978
}
@@ -979,13 +984,13 @@ namespace Js
979984
if (noPrototypeProperty)
980985
{
981986
scriptFunctionTypeHandler = isAnonymousFunction ?
982-
this->GetDeferredAnonymousFunctionTypeHandler() :
983-
this->GetDeferredFunctionTypeHandlerNoPrototype();
987+
this->GetDeferredAnonymousFunctionWithLengthTypeHandler() :
988+
this->GetDeferredFunctionWithLengthTypeHandler();
984989
}
985990
else
986991
{
987992
scriptFunctionTypeHandler = isAnonymousFunction ?
988-
JavascriptLibrary::GetDeferredAnonymousPrototypeFunctionTypeHandler() :
993+
JavascriptLibrary::GetDeferredAnonymousPrototypeFunctionWithLengthTypeHandler() :
989994
JavascriptLibrary::GetDeferredPrototypeFunctionWithNameAndLengthTypeHandler();
990995
}
991996
return scriptFunctionTypeHandler;

lib/Runtime/Library/JavascriptLibrary.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -918,14 +918,15 @@ namespace Js
918918

919919
static DynamicTypeHandler * GetDeferredPrototypeFunctionTypeHandler(ScriptContext* scriptContext);
920920
static DynamicTypeHandler * GetDeferredPrototypeFunctionWithLengthTypeHandler(ScriptContext* scriptContext);
921-
static DynamicTypeHandler * GetDeferredAnonymousPrototypeFunctionTypeHandler();
921+
static DynamicTypeHandler * GetDeferredAnonymousPrototypeFunctionWithLengthTypeHandler();
922922
static DynamicTypeHandler * GetDeferredAnonymousPrototypeGeneratorFunctionTypeHandler();
923923
static DynamicTypeHandler * GetDeferredAnonymousPrototypeAsyncFunctionTypeHandler();
924924

925925
DynamicTypeHandler * GetDeferredFunctionTypeHandler();
926-
DynamicTypeHandler * GetDeferredFunctionTypeHandlerNoPrototype();
926+
DynamicTypeHandler * GetDeferredFunctionWithLengthTypeHandler();
927927
DynamicTypeHandler * GetDeferredPrototypeFunctionWithNameAndLengthTypeHandler();
928928
DynamicTypeHandler * ScriptFunctionTypeHandler(bool noPrototypeProperty, bool isAnonymousFunction);
929+
DynamicTypeHandler * GetDeferredAnonymousFunctionWithLengthTypeHandler();
929930
DynamicTypeHandler * GetDeferredAnonymousFunctionTypeHandler();
930931
template<bool isNameAvailable, bool isPrototypeAvailable = true, bool isLengthAvailable = false>
931932
static DynamicTypeHandler * GetDeferredFunctionTypeHandlerBase();

0 commit comments

Comments
 (0)