Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Restructure lib/Runtime/Library directory #6709

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Restructure lib/Runtime/Library directory #6709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8aaf480
Restructure lib/Runtime/Library directory
MadProbe Apr 19, 2021
7b8780c
Restructure lib/Runtime/Library directory
MadProbe Apr 19, 2021
b293959
Merge branch 'structurization' of https://github.com/MadProbe/ChakraC…
MadProbe Apr 19, 2021
2ee2230
Fix include errors
MadProbe Apr 19, 2021
fc4ebce
Merge branch 'master' of https://github.com/chakra-core/ChakraCore in…
MadProbe Apr 27, 2021
f64e2b3
Move builtins list and args from Functions dir
MadProbe Apr 27, 2021
03775d4
Merge branch 'master' of https://github.com/chakra-core/ChakraCore in…
MadProbe May 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions lib/Backend/Backend.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
//-------------------------------------------------------------------------------------------------------
// Copyright (C) Microsoft. All rights reserved.
// Copyright (c) 2021 ChakraCore Project Contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
//-------------------------------------------------------------------------------------------------------
#pragma once
Expand All @@ -20,15 +21,15 @@
#include "Language/JavascriptMathOperators.inl"
#include "Language/JavascriptStackWalker.h"
#include "Language/CodeGenRecyclableData.h"
#include "Library/JavascriptGenerator.h"
#include "Library/JavascriptRegularExpression.h"
#include "Library/StackScriptFunction.h"
#include "Library/Generators/JavascriptGenerator.h"
#include "Library/Regex/JavascriptRegularExpression.h"
#include "Library/Functions/StackScriptFunction.h"
#include "Library/JavascriptProxy.h"
#include "Library/JavascriptGeneratorFunction.h"
#include "Library/Generators/JavascriptGeneratorFunction.h"

#include "Language/InterpreterStackFrame.h"

#include "Library/StackScriptFunction.h"
#include "Library/Functions/StackScriptFunction.h"

// SIMD
#include "Language/SimdOps.h"
Expand Down
7 changes: 4 additions & 3 deletions lib/Backend/JnHelperMethod.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
//-------------------------------------------------------------------------------------------------------
// Copyright (C) Microsoft Corporation and contributors. All rights reserved.
// Copyright (C) Microsoft. All rights reserved.
// Copyright (c) 2021 ChakraCore Project Contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
//-------------------------------------------------------------------------------------------------------
#include "Backend.h"
#include "ExternalHelperMethod.h"
// Parser includes
#include "RegexCommon.h"

#include "Library/RegexHelper.h"
#include "Library/Regex/RegexHelper.h"

#ifdef ENABLE_SCRIPT_DEBUGGING
#include "Debug/DiagHelperMethodWrapper.h"
#endif
#include "Math/CrtSSE2Math.h"
#include "Library/JavascriptGeneratorFunction.h"
#include "Library/Generators/JavascriptGeneratorFunction.h"
#include "RuntimeMathPch.h"

namespace IR
Expand Down
5 changes: 3 additions & 2 deletions lib/Backend/amd64/LowererMDArch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
//-------------------------------------------------------------------------------------------------------
// Copyright (C) Microsoft Corporation and contributors. All rights reserved.
// Copyright (C) Microsoft. All rights reserved.
// Copyright (c) 2021 ChakraCore Project Contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
//-------------------------------------------------------------------------------------------------------

#include "Backend.h"
#include "LowererMDArch.h"
#include "Library/JavascriptGeneratorFunction.h"
#include "Library/Generators/JavascriptGeneratorFunction.h"

const Js::OpCode LowererMD::MDExtend32Opcode = Js::OpCode::MOVSXD;

Expand Down
5 changes: 3 additions & 2 deletions lib/Backend/i386/LowererMDArch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
//-------------------------------------------------------------------------------------------------------
// Copyright (C) Microsoft Corporation and contributors. All rights reserved.
// Copyright (C) Microsoft. All rights reserved.
// Copyright (c) 2021 ChakraCore Project Contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
//-------------------------------------------------------------------------------------------------------

#include "Backend.h"
#include "LowererMDArch.h"
#include "Library/JavascriptGeneratorFunction.h"
#include "Library/Generators/JavascriptGeneratorFunction.h"

const Js::OpCode LowererMD::MDExtend32Opcode = Js::OpCode::MOV;

Expand Down
3 changes: 2 additions & 1 deletion lib/Parser/ParserPch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
//-------------------------------------------------------------------------------------------------------
// Copyright (C) Microsoft. All rights reserved.
// Copyright (c) 2021 ChakraCore Project Contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
//-------------------------------------------------------------------------------------------------------
#pragma once
Expand All @@ -25,5 +26,5 @@
#include "ByteCode/FuncInfo.h"
#include "ByteCode/ScopeInfo.h"

#include "Library/JavascriptFunction.h"
#include "Library/Functions/JavascriptFunction.h"
#include "Language/JavascriptStackWalker.h"
5 changes: 3 additions & 2 deletions lib/Runtime/Base/CharStringCache.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
//-------------------------------------------------------------------------------------------------------
// Copyright (C) Microsoft. All rights reserved.
// Copyright (c) 2021 ChakraCore Project Contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
//-------------------------------------------------------------------------------------------------------
#include "RuntimeBasePch.h"

#include "Library/ProfileString.h"
#include "Library/SingleCharString.h"
#include "Library/String/ProfileString.h"
#include "Library/String/SingleCharString.h"

using namespace Js;

Expand Down
2 changes: 1 addition & 1 deletion lib/Runtime/Base/FunctionBody.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include "Parser.h"
#include "RegexCommon.h"
#include "RegexPattern.h"
#include "Library/RegexHelper.h"
#include "Library/Regex/RegexHelper.h"

#include "Language/InterpreterStackFrame.h"
#include "Library/ModuleRoot.h"
Expand Down
3 changes: 2 additions & 1 deletion lib/Runtime/Base/ScriptContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
//-------------------------------------------------------------------------------------------------------
// Copyright (C) Microsoft. All rights reserved.
// Copyright (c) 2021 ChakraCore Project Contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
//-------------------------------------------------------------------------------------------------------
#include "RuntimeBasePch.h"
Expand All @@ -11,7 +12,7 @@

#include "ConfigFlagsList.h"
#include "ByteCode/ByteCodeApi.h"
#include "Library/ProfileString.h"
#include "Library/String/ProfileString.h"
#ifdef ENABLE_SCRIPT_DEBUGGING
#include "Debug/DiagHelperMethodWrapper.h"
#endif
Expand Down
2 changes: 1 addition & 1 deletion lib/Runtime/ByteCode/ByteCodeGenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
//-------------------------------------------------------------------------------------------------------
#include "RuntimeByteCodePch.h"
#include "FormalsUtil.h"
#include "Library/StackScriptFunction.h"
#include "Library/Functions/StackScriptFunction.h"

#if DBG
#include "pnodewalk.h"
Expand Down
6 changes: 3 additions & 3 deletions lib/Runtime/ByteCode/ByteCodeSerializer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//-------------------------------------------------------------------------------------------------------
// Copyright (C) Microsoft Corporation and contributors. All rights reserved.
// Copyright (C) Microsoft. All rights reserved.
// Copyright (c) 2021 ChakraCore Project Contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
//-------------------------------------------------------------------------------------------------------
Expand All @@ -8,7 +8,7 @@

#include "RegexCommon.h"
#include "RegexPattern.h"
#include "Library/RegexHelper.h"
#include "Library/Regex/RegexHelper.h"

#include "DataStructures/Option.h"
#include "DataStructures/ImmutableList.h"
Expand All @@ -17,7 +17,7 @@
#include "ByteCode/ByteCodeSerializer.h"

#include "Language/AsmJsModule.h"
#include "Library/ES5Array.h"
#include "Library/Array/ES5Array.h"

void ChakraBinaryBuildDateTimeHash(DWORD * buildDateHash, DWORD * buildTimeHash);

Expand Down
7 changes: 4 additions & 3 deletions lib/Runtime/Debug/DiagObjectModel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
//-------------------------------------------------------------------------------------------------------
// Copyright (C) Microsoft. All rights reserved.
// Copyright (c) 2021 ChakraCore Project Contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
//-------------------------------------------------------------------------------------------------------
#include "RuntimeDebugPch.h"
Expand All @@ -13,8 +14,8 @@
// Runtime includes
#include "Library/ObjectPrototypeObject.h"
#include "Library/JavascriptNumberObject.h"
#include "Library/BoundFunction.h"
#include "Library/JavascriptRegExpConstructor.h"
#include "Library/Functions/BoundFunction.h"
#include "Library/Regex/JavascriptRegExpConstructor.h"
#include "Library/SameValueComparer.h"
#include "Library/MapOrSetDataList.h"
#include "Library/JavascriptPromise.h"
Expand All @@ -28,7 +29,7 @@
#include "Types/DynamicObjectPropertyEnumerator.h"
#include "Types/JavascriptStaticEnumerator.h"
#include "Library/ForInObjectEnumerator.h"
#include "Library/ES5Array.h"
#include "Library/Array/ES5Array.h"

namespace Js
{
Expand Down
2 changes: 1 addition & 1 deletion lib/Runtime/Debug/TTSnapObjects.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
//-------------------------------------------------------------------------------------------------------
#include "RuntimeDebugPch.h"
#include "Library/JavascriptGenerator.h"
#include "Library/Generators/JavascriptGenerator.h"
#include "Language/InterpreterStackFrame.h"
#include "Library/JavascriptPromise.h"

Expand Down
5 changes: 3 additions & 2 deletions lib/Runtime/Language/AsmJsLink.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
//-------------------------------------------------------------------------------------------------------
// Copyright (C) Microsoft Corporation and contributors. All rights reserved.
// Copyright (C) Microsoft. All rights reserved.
// Copyright (c) 2021 ChakraCore Project Contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
//-------------------------------------------------------------------------------------------------------

#include "RuntimeLanguagePch.h"

#ifdef ASMJS_PLAT
#include "Library/BoundFunction.h"
#include "Library/Functions/BoundFunction.h"
namespace Js{
bool ASMLink::CheckArrayBuffer(ScriptContext* scriptContext, Var bufferView, const AsmJsModuleInfo * info)
{
Expand Down
6 changes: 3 additions & 3 deletions lib/Runtime/Language/InterpreterStackFrame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
//-------------------------------------------------------------------------------------------------------
// Copyright (C) Microsoft Corporation and contributors. All rights reserved.
// Copyright (C) Microsoft. All rights reserved.
// Copyright (c) 2021 ChakraCore Project Contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
//-------------------------------------------------------------------------------------------------------

#include "RuntimeLanguagePch.h"
#include "RuntimeMathPch.h"
#include "EHBailoutData.h"
#include "Library/JavascriptRegularExpression.h"
#include "Library/Regex/JavascriptRegularExpression.h"
#if DBG_DUMP
#include "ByteCode/OpCodeUtilAsmJs.h"
#endif

#include "Language/InterpreterStackFrame.h"
#include "Library/JavascriptGeneratorFunction.h"
#include "Library/Generators/JavascriptGeneratorFunction.h"
#include "Library/ForInObjectEnumerator.h"
#include "Library/AtomicsOperations.h"
#include "../../WasmReader/WasmParseTree.h"
Expand Down
3 changes: 2 additions & 1 deletion lib/Runtime/Language/JavascriptConversion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
//-------------------------------------------------------------------------------------------------------
// Copyright (C) Microsoft. All rights reserved.
// Copyright (c) 2021 ChakraCore Project Contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
//-------------------------------------------------------------------------------------------------------
#include "RuntimeLanguagePch.h"
#include "RuntimeMathPch.h"
#include "Library/JavascriptNumberObject.h"
#include "Library/JavascriptStringObject.h"
#include "Library/String/JavascriptStringObject.h"
#include "Library/DateImplementation.h"
#include "Library/JavascriptDate.h"

Expand Down
3 changes: 2 additions & 1 deletion lib/Runtime/Language/JavascriptExceptionObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
//-------------------------------------------------------------------------------------------------------
// Copyright (C) Microsoft. All rights reserved.
// Copyright (c) 2021 ChakraCore Project Contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
//-------------------------------------------------------------------------------------------------------
#include "RuntimeLanguagePch.h"
#include "Library/StackScriptFunction.h"
#include "Library/Functions/StackScriptFunction.h"

namespace Js
{
Expand Down
8 changes: 4 additions & 4 deletions lib/Runtime/Language/JavascriptOperators.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
#include "Types/UnscopablesWrapperObject.h"
#include "Types/SpreadArgument.h"
#include "Library/JavascriptPromise.h"
#include "Library/JavascriptRegularExpression.h"
#include "Library/Regex/JavascriptRegularExpression.h"
#include "Library/ThrowErrorObject.h"
#include "Library/JavascriptGeneratorFunction.h"
#include "Library/JavascriptAsyncFunction.h"
#include "Library/Generators/JavascriptGeneratorFunction.h"
#include "Library/Generators/JavascriptAsyncFunction.h"

#include "Library/ForInObjectEnumerator.h"
#include "Library/ES5Array.h"
#include "Library/Array/ES5Array.h"
#include "Types/SimpleDictionaryPropertyDescriptor.h"
#include "Types/SimpleDictionaryTypeHandler.h"
#include "Language/ModuleNamespace.h"
Expand Down
7 changes: 4 additions & 3 deletions lib/Runtime/Language/RuntimeLanguagePch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
//-------------------------------------------------------------------------------------------------------
// Copyright (C) Microsoft. All rights reserved.
// Copyright (c) 2021 ChakraCore Project Contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
//-------------------------------------------------------------------------------------------------------
#pragma once
Expand Down Expand Up @@ -33,14 +34,14 @@
#include "Library/ArgumentsObject.h"

#include "Types/TypePropertyCache.h"
#include "Library/JavascriptAsyncFromSyncIterator.h"
#include "Library/Iterators/JavascriptAsyncFromSyncIterator.h"
#ifdef _CHAKRACOREBUILD
#include "Library/CustomExternalWrapperObject.h"
#endif
#include "Library/JavascriptProxy.h"
#include "Library/JavascriptSymbolObject.h"
#include "Library/JavascriptGenerator.h"
#include "Library/StackScriptFunction.h"
#include "Library/Generators/JavascriptGenerator.h"
#include "Library/Functions/StackScriptFunction.h"
#include "Library/HostObjectBase.h"

#ifdef ENABLE_MUTATION_BREAKPOINT
Expand Down
2 changes: 1 addition & 1 deletion lib/Runtime/Library/ArgumentsObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//-------------------------------------------------------------------------------------------------------
#include "RuntimeLibraryPch.h"

#include "Library/ArgumentsObjectEnumerator.h"
#include "ArgumentsObjectEnumerator.h"

namespace Js
{
Expand Down
2 changes: 1 addition & 1 deletion lib/Runtime/Library/ArgumentsObjectEnumerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//-------------------------------------------------------------------------------------------------------
#include "RuntimeLibraryPch.h"

#include "Library/ArgumentsObjectEnumerator.h"
#include "ArgumentsObjectEnumerator.h"

namespace Js
{
Expand Down
0 lib/Runtime/Library/ES5Array.cpp → lib/Runtime/Library/Array/ES5Array.cpp
View file
Open in desktop
File renamed without changes.
0 lib/Runtime/Library/ES5Array.h → lib/Runtime/Library/Array/ES5Array.h
View file
Open in desktop
File renamed without changes.
0 ...ntime/Library/ES5ArrayIndexEnumerator.cpp → ...Library/Array/ES5ArrayIndexEnumerator.cpp
View file
Open in desktop
File renamed without changes.
0 ...Runtime/Library/ES5ArrayIndexEnumerator.h → ...e/Library/Array/ES5ArrayIndexEnumerator.h
View file
Open in desktop
File renamed without changes.
0 ...e/Library/ES5ArrayIndexStaticEnumerator.h → ...ary/Array/ES5ArrayIndexStaticEnumerator.h
View file
Open in desktop
File renamed without changes.
0 lib/Runtime/Library/JavascriptArray.cpp → ...Runtime/Library/Array/JavascriptArray.cpp
View file
Open in desktop
File renamed without changes.
0 lib/Runtime/Library/JavascriptArray.h → lib/Runtime/Library/Array/JavascriptArray.h
View file
Open in desktop
File renamed without changes.
0 lib/Runtime/Library/JavascriptArray.inl → ...Runtime/Library/Array/JavascriptArray.inl
View file
Open in desktop
File renamed without changes.
0 ...ibrary/JavascriptArrayIndexEnumerator.cpp → .../Array/JavascriptArrayIndexEnumerator.cpp
View file
Open in desktop
File renamed without changes.
0 .../Library/JavascriptArrayIndexEnumerator.h → ...ry/Array/JavascriptArrayIndexEnumerator.h
View file
Open in desktop
File renamed without changes.
0 ...ry/JavascriptArrayIndexEnumeratorBase.cpp → ...ay/JavascriptArrayIndexEnumeratorBase.cpp
View file
Open in desktop
File renamed without changes.
0 ...rary/JavascriptArrayIndexEnumeratorBase.h → ...rray/JavascriptArrayIndexEnumeratorBase.h
View file
Open in desktop
File renamed without changes.
0 ...avascriptArrayIndexSnapshotEnumerator.cpp → ...avascriptArrayIndexSnapshotEnumerator.cpp
View file
Open in desktop
File renamed without changes.
0 .../JavascriptArrayIndexSnapshotEnumerator.h → .../JavascriptArrayIndexSnapshotEnumerator.h
View file
Open in desktop
File renamed without changes.
0 ...ry/JavascriptArrayIndexStaticEnumerator.h → ...ay/JavascriptArrayIndexStaticEnumerator.h
View file
Open in desktop
File renamed without changes.
0 lib/Runtime/Library/SparseArraySegment.cpp → ...time/Library/Array/SparseArraySegment.cpp
View file
Open in desktop
File renamed without changes.
0 lib/Runtime/Library/SparseArraySegment.h → ...untime/Library/Array/SparseArraySegment.h
View file
Open in desktop
File renamed without changes.
0 lib/Runtime/Library/SparseArraySegment.inl → ...time/Library/Array/SparseArraySegment.inl
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion lib/Runtime/Library/TypedArray.cpp → lib/Runtime/Library/Array/TypedArray.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// can share the same array buffer.
//----------------------------------------------------------------------------
#include "RuntimeLibraryPch.h"
#include "AtomicsOperations.h"
#include "Library/AtomicsOperations.h"

#define INSTANTIATE_BUILT_IN_ENTRYPOINTS(typeName) \
template Var typeName::NewInstance(RecyclableObject* function, CallInfo callInfo, ...); \
Expand Down
0 lib/Runtime/Library/TypedArray.h → lib/Runtime/Library/Array/TypedArray.h
View file
Open in desktop
File renamed without changes.
0 ...ime/Library/TypedArrayIndexEnumerator.cpp → ...brary/Array/TypedArrayIndexEnumerator.cpp
View file
Open in desktop
File renamed without changes.
0 ...ntime/Library/TypedArrayIndexEnumerator.h → ...Library/Array/TypedArrayIndexEnumerator.h
View file
Open in desktop
File renamed without changes.
Loading