LibJS: Add "Heap" and "Runtime" subdirectories

Let's try to keep LibJS tidy as it expands. :^)

Libraries/LibJS/AST.cpp

@@ -28,9 +28,9 @@
 #include <AK/StringBuilder.h>
 #include <LibJS/AST.h>
 #include <LibJS/Interpreter.h>
-#include <LibJS/PrimitiveString.h>
-#include <LibJS/ScriptFunction.h>
-#include <LibJS/Value.h>
+#include <LibJS/Runtime/PrimitiveString.h>
+#include <LibJS/Runtime/ScriptFunction.h>
+#include <LibJS/Runtime/Value.h>
 #include <stdio.h>
 
 namespace JS {

Libraries/LibJS/AST.h

@@ -31,7 +31,7 @@
 #include <AK/String.h>
 #include <AK/Vector.h>
 #include <LibJS/Forward.h>
-#include <LibJS/Value.h>
+#include <LibJS/Runtime/Value.h>
 
 namespace JS {
 

Libraries/LibJS/Heap/Heap.cpp

@@ -26,10 +26,10 @@
 
 #include <AK/Badge.h>
 #include <AK/HashTable.h>
-#include <LibJS/Heap.h>
-#include <LibJS/HeapBlock.h>
+#include <LibJS/Heap/Heap.h>
+#include <LibJS/Heap/HeapBlock.h>
 #include <LibJS/Interpreter.h>
-#include <LibJS/Object.h>
+#include <LibJS/Runtime/Object.h>
 
 #define HEAP_DEBUG
 

Libraries/LibJS/Heap/Heap.h

@@ -30,8 +30,8 @@
 #include <AK/NonnullOwnPtr.h>
 #include <AK/Types.h>
 #include <AK/Vector.h>
-#include <LibJS/Cell.h>
 #include <LibJS/Forward.h>
+#include <LibJS/Runtime/Cell.h>
 
 namespace JS {
 

Libraries/LibJS/Heap/HeapBlock.cpp

@@ -27,7 +27,7 @@
 #include <AK/Assertions.h>
 #include <AK/NonnullOwnPtr.h>
 #include <AK/kmalloc.h>
-#include <LibJS/HeapBlock.h>
+#include <LibJS/Heap/HeapBlock.h>
 #include <sys/mman.h>
 
 namespace JS {

Libraries/LibJS/Heap/HeapBlock.h

@@ -27,8 +27,8 @@
 #pragma once
 
 #include <AK/Types.h>
-#include <LibJS/Cell.h>
 #include <LibJS/Forward.h>
+#include <LibJS/Runtime/Cell.h>
 
 namespace JS {
 

Libraries/LibJS/Interpreter.cpp

@@ -26,13 +26,13 @@
 
 #include <AK/Badge.h>
 #include <LibJS/AST.h>
-#include <LibJS/GlobalObject.h>
 #include <LibJS/Interpreter.h>
-#include <LibJS/NativeFunction.h>
-#include <LibJS/Object.h>
-#include <LibJS/ObjectPrototype.h>
-#include <LibJS/StringPrototype.h>
-#include <LibJS/Value.h>
+#include <LibJS/Runtime/GlobalObject.h>
+#include <LibJS/Runtime/NativeFunction.h>
+#include <LibJS/Runtime/Object.h>
+#include <LibJS/Runtime/ObjectPrototype.h>
+#include <LibJS/Runtime/StringPrototype.h>
+#include <LibJS/Runtime/Value.h>
 
 namespace JS {
 

Libraries/LibJS/Interpreter.h

@@ -30,8 +30,8 @@
 #include <AK/String.h>
 #include <AK/Vector.h>
 #include <LibJS/Forward.h>
-#include <LibJS/Heap.h>
-#include <LibJS/Value.h>
+#include <LibJS/Heap/Heap.h>
+#include <LibJS/Runtime/Value.h>
 
 namespace JS {
 

Libraries/LibJS/Makefile

@@ -1,23 +1,23 @@
 OBJS = \
     AST.o \
-    Cell.o \
-    Function.o \
-    GlobalObject.o \
-    Heap.o \
-    HeapBlock.o \
+    Heap/Heap.o \
+    Heap/HeapBlock.o \
     Interpreter.o \
     Lexer.o \
-    NativeFunction.o \
-    NativeProperty.o \
-    Object.o \
-    ObjectPrototype.o \
     Parser.o \
-    PrimitiveString.o \
-    ScriptFunction.o \
-    StringObject.o \
-    StringPrototype.o \
-    Token.o \
-    Value.o
+    Runtime/Cell.o \
+    Runtime/Function.o \
+    Runtime/GlobalObject.o \
+    Runtime/NativeFunction.o \
+    Runtime/NativeProperty.o \
+    Runtime/Object.o \
+    Runtime/ObjectPrototype.o \
+    Runtime/PrimitiveString.o \
+    Runtime/ScriptFunction.o \
+    Runtime/StringObject.o \
+    Runtime/StringPrototype.o \
+    Runtime/Value.o \
+    Token.o
 
 LIBRARY = libjs.a
 

Libraries/LibJS/Runtime/Cell.cpp

@@ -25,12 +25,12 @@
  */
 
 #include <AK/LogStream.h>
-#include <LibJS/Cell.h>
-#include <LibJS/Heap.h>
-#include <LibJS/HeapBlock.h>
-#include <LibJS/Object.h>
-#include <LibJS/PrimitiveString.h>
-#include <LibJS/Value.h>
+#include <LibJS/Heap/Heap.h>
+#include <LibJS/Heap/HeapBlock.h>
+#include <LibJS/Runtime/Cell.h>
+#include <LibJS/Runtime/Object.h>
+#include <LibJS/Runtime/PrimitiveString.h>
+#include <LibJS/Runtime/Value.h>
 
 namespace JS {
 

Libraries/LibJS/Runtime/Function.cpp

@@ -24,8 +24,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibJS/Function.h>
-#include <LibJS/Value.h>
+#include <LibJS/Runtime/Function.h>
+#include <LibJS/Runtime/Value.h>
 
 namespace JS {
 

Libraries/LibJS/Runtime/Function.h

@@ -27,7 +27,7 @@
 #pragma once
 
 #include <AK/String.h>
-#include <LibJS/Object.h>
+#include <LibJS/Runtime/Object.h>
 
 namespace JS {
 

Libraries/LibJS/Runtime/GlobalObject.cpp

@@ -1,10 +1,11 @@
 #include <AK/LogStream.h>
 #include <AK/String.h>
-#include <LibJS/GlobalObject.h>
-#include <LibJS/Heap.h>
+#include <LibJS/Heap/Heap.h>
 #include <LibJS/Interpreter.h>
-#include <LibJS/NativeFunction.h>
-#include <LibJS/Value.h>
+#include <LibJS/Runtime/ConsoleObject.h>
+#include <LibJS/Runtime/GlobalObject.h>
+#include <LibJS/Runtime/NativeFunction.h>
+#include <LibJS/Runtime/Value.h>
 #include <stdio.h>
 
 namespace JS {

Libraries/LibJS/Runtime/GlobalObject.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <LibJS/Object.h>
+#include <LibJS/Runtime/Object.h>
 
 namespace JS {
 

Libraries/LibJS/Runtime/NativeFunction.cpp

@@ -25,8 +25,8 @@
  */
 
 #include <LibJS/Interpreter.h>
-#include <LibJS/NativeFunction.h>
-#include <LibJS/Value.h>
+#include <LibJS/Runtime/NativeFunction.h>
+#include <LibJS/Runtime/Value.h>
 
 namespace JS {
 

Libraries/LibJS/Runtime/NativeFunction.h

@@ -27,7 +27,7 @@
 #pragma once
 
 #include <AK/Function.h>
-#include <LibJS/Function.h>
+#include <LibJS/Runtime/Function.h>
 
 namespace JS {
 

Libraries/LibJS/Runtime/NativeProperty.cpp

@@ -24,8 +24,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibJS/NativeProperty.h>
-#include <LibJS/Value.h>
+#include <LibJS/Runtime/NativeProperty.h>
+#include <LibJS/Runtime/Value.h>
 
 namespace JS {
 

Libraries/LibJS/Runtime/NativeProperty.h

@@ -27,7 +27,7 @@
 #pragma once
 
 #include <AK/Function.h>
-#include <LibJS/Object.h>
+#include <LibJS/Runtime/Object.h>
 
 namespace JS {
 

Libraries/LibJS/Runtime/Object.cpp

@@ -25,12 +25,12 @@
  */
 
 #include <AK/String.h>
-#include <LibJS/Heap.h>
+#include <LibJS/Heap/Heap.h>
 #include <LibJS/Interpreter.h>
-#include <LibJS/NativeFunction.h>
-#include <LibJS/NativeProperty.h>
-#include <LibJS/Object.h>
-#include <LibJS/Value.h>
+#include <LibJS/Runtime/NativeFunction.h>
+#include <LibJS/Runtime/NativeProperty.h>
+#include <LibJS/Runtime/Object.h>
+#include <LibJS/Runtime/Value.h>
 
 namespace JS {
 

Libraries/LibJS/Runtime/Object.h

@@ -28,10 +28,10 @@
 
 #include <AK/HashMap.h>
 #include <AK/String.h>
-#include <LibJS/Cell.h>
 #include <LibJS/Forward.h>
-#include <LibJS/PrimitiveString.h>
-#include <LibJS/Value.h>
+#include <LibJS/Runtime/Cell.h>
+#include <LibJS/Runtime/PrimitiveString.h>
+#include <LibJS/Runtime/Value.h>
 
 namespace JS {
 

Libraries/LibJS/Runtime/ObjectPrototype.cpp

@@ -26,10 +26,10 @@
 
 #include <AK/Function.h>
 #include <AK/String.h>
-#include <LibJS/Heap.h>
+#include <LibJS/Heap/Heap.h>
 #include <LibJS/Interpreter.h>
-#include <LibJS/ObjectPrototype.h>
-#include <LibJS/Value.h>
+#include <LibJS/Runtime/ObjectPrototype.h>
+#include <LibJS/Runtime/Value.h>
 
 namespace JS {
 

Libraries/LibJS/Runtime/ObjectPrototype.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibJS/Object.h>
+#include <LibJS/Runtime/Object.h>
 
 namespace JS {
 

Libraries/LibJS/Runtime/PrimitiveString.cpp

@@ -24,8 +24,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibJS/Heap.h>
-#include <LibJS/PrimitiveString.h>
+#include <LibJS/Heap/Heap.h>
+#include <LibJS/Runtime/PrimitiveString.h>
 
 namespace JS {
 

Libraries/LibJS/Runtime/PrimitiveString.h

@@ -27,7 +27,7 @@
 #pragma once
 
 #include <AK/String.h>
-#include <LibJS/Cell.h>
+#include <LibJS/Runtime/Cell.h>
 
 namespace JS {
 

Libraries/LibJS/Runtime/ScriptFunction.cpp

@@ -25,8 +25,8 @@
  */
 
 #include <LibJS/Interpreter.h>
-#include <LibJS/ScriptFunction.h>
-#include <LibJS/Value.h>
+#include <LibJS/Runtime/ScriptFunction.h>
+#include <LibJS/Runtime/Value.h>
 
 namespace JS {
 

Libraries/LibJS/Runtime/ScriptFunction.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibJS/Function.h>
+#include <LibJS/Runtime/Function.h>
 
 namespace JS {
 

Libraries/LibJS/Runtime/StringObject.cpp

@@ -24,12 +24,12 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibJS/Heap.h>
+#include <LibJS/Heap/Heap.h>
 #include <LibJS/Interpreter.h>
-#include <LibJS/PrimitiveString.h>
-#include <LibJS/StringObject.h>
-#include <LibJS/StringPrototype.h>
-#include <LibJS/Value.h>
+#include <LibJS/Runtime/PrimitiveString.h>
+#include <LibJS/Runtime/StringObject.h>
+#include <LibJS/Runtime/StringPrototype.h>
+#include <LibJS/Runtime/Value.h>
 
 namespace JS {
 

Libraries/LibJS/Runtime/StringObject.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibJS/Object.h>
+#include <LibJS/Runtime/Object.h>
 
 namespace JS {
 

Libraries/LibJS/Runtime/StringPrototype.cpp

@@ -26,12 +26,12 @@
 
 #include <AK/Function.h>
 #include <AK/StringBuilder.h>
-#include <LibJS/Heap.h>
+#include <LibJS/Heap/Heap.h>
 #include <LibJS/Interpreter.h>
-#include <LibJS/PrimitiveString.h>
-#include <LibJS/StringObject.h>
-#include <LibJS/StringPrototype.h>
-#include <LibJS/Value.h>
+#include <LibJS/Runtime/PrimitiveString.h>
+#include <LibJS/Runtime/StringObject.h>
+#include <LibJS/Runtime/StringPrototype.h>
+#include <LibJS/Runtime/Value.h>
 
 namespace JS {
 

Libraries/LibJS/Runtime/StringPrototype.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include <LibJS/Object.h>
+#include <LibJS/Runtime/Object.h>
 
 namespace JS {
 

Libraries/LibJS/Runtime/Value.cpp

@@ -25,11 +25,11 @@
  */
 
 #include <AK/String.h>
-#include <LibJS/Heap.h>
-#include <LibJS/Object.h>
-#include <LibJS/PrimitiveString.h>
-#include <LibJS/StringObject.h>
-#include <LibJS/Value.h>
+#include <LibJS/Heap/Heap.h>
+#include <LibJS/Runtime/Object.h>
+#include <LibJS/Runtime/PrimitiveString.h>
+#include <LibJS/Runtime/StringObject.h>
+#include <LibJS/Runtime/Value.h>
 
 namespace JS {
 

Libraries/LibWeb/Bindings/DocumentWrapper.cpp

@@ -24,8 +24,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibJS/PrimitiveString.h>
-#include <LibJS/Value.h>
+#include <LibJS/Runtime/PrimitiveString.h>
+#include <LibJS/Runtime/Value.h>
 #include <LibWeb/Bindings/DocumentWrapper.h>
 #include <LibWeb/DOM/Document.h>
 #include <LibWeb/DOM/Element.h>

Libraries/LibWeb/Bindings/NodeWrapper.cpp

@@ -24,8 +24,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <LibJS/PrimitiveString.h>
-#include <LibJS/Value.h>
+#include <LibJS/Runtime/PrimitiveString.h>
+#include <LibJS/Runtime/Value.h>
 #include <LibWeb/Bindings/NodeWrapper.h>
 #include <LibWeb/DOM/Node.h>
 

Libraries/LibWeb/Bindings/Wrappable.h

@@ -27,7 +27,7 @@
 #pragma once
 
 #include <AK/WeakPtr.h>
-#include <LibJS/Heap.h>
+#include <LibJS/Heap/Heap.h>
 #include <LibWeb/Forward.h>
 
 namespace Web {

Libraries/LibWeb/Bindings/Wrapper.h

@@ -28,7 +28,7 @@
 
 #include <AK/NonnullRefPtr.h>
 #include <AK/Weakable.h>
-#include <LibJS/Object.h>
+#include <LibJS/Runtime/Object.h>
 #include <LibWeb/Forward.h>
 
 namespace Web {

Libraries/LibWeb/DOM/Document.cpp

@@ -29,8 +29,8 @@
 #include <LibCore/Timer.h>
 #include <LibGUI/Application.h>
 #include <LibGUI/MessageBox.h>
-#include <LibJS/GlobalObject.h>
 #include <LibJS/Interpreter.h>
+#include <LibJS/Runtime/GlobalObject.h>
 #include <LibWeb/Bindings/DocumentWrapper.h>
 #include <LibWeb/CSS/StyleResolver.h>
 #include <LibWeb/DOM/Document.h>

Userland/js.cpp

@@ -30,10 +30,10 @@
 #include <LibCore/File.h>
 #include <LibJS/AST.h>
 #include <LibJS/Interpreter.h>
-#include <LibJS/Object.h>
 #include <LibJS/Parser.h>
-#include <LibJS/PrimitiveString.h>
-#include <LibJS/Value.h>
+#include <LibJS/Runtime/Object.h>
+#include <LibJS/Runtime/PrimitiveString.h>
+#include <LibJS/Runtime/Value.h>
 #include <stdio.h>
 
 #define PROGRAM 6