Finished OOP conversion.

This commit is contained in:
2024-02-14 23:39:35 -08:00
parent c3eb95e8f3
commit 669b6d66a3
20 changed files with 769 additions and 820 deletions

View File

@@ -1,156 +0,0 @@
{
"inputs" :
[
{
"path" : "CMakeLists.txt"
},
{
"isGenerated" : true,
"path" : "cmake-build-debug/CMakeFiles/3.27.8/CMakeSystem.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "/home/karutoh/.local/share/JetBrains/Toolbox/apps/clion/bin/cmake/linux/x64/share/cmake-3.27/Modules/CMakeSystemSpecificInitialize.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "/home/karutoh/.local/share/JetBrains/Toolbox/apps/clion/bin/cmake/linux/x64/share/cmake-3.27/Modules/Platform/Linux-Initialize.cmake"
},
{
"isGenerated" : true,
"path" : "cmake-build-debug/CMakeFiles/3.27.8/CMakeCCompiler.cmake"
},
{
"isGenerated" : true,
"path" : "cmake-build-debug/CMakeFiles/3.27.8/CMakeCXXCompiler.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "/home/karutoh/.local/share/JetBrains/Toolbox/apps/clion/bin/cmake/linux/x64/share/cmake-3.27/Modules/CMakeSystemSpecificInformation.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "/home/karutoh/.local/share/JetBrains/Toolbox/apps/clion/bin/cmake/linux/x64/share/cmake-3.27/Modules/CMakeGenericSystem.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "/home/karutoh/.local/share/JetBrains/Toolbox/apps/clion/bin/cmake/linux/x64/share/cmake-3.27/Modules/CMakeInitializeConfigs.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "/home/karutoh/.local/share/JetBrains/Toolbox/apps/clion/bin/cmake/linux/x64/share/cmake-3.27/Modules/Platform/Linux.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "/home/karutoh/.local/share/JetBrains/Toolbox/apps/clion/bin/cmake/linux/x64/share/cmake-3.27/Modules/Platform/UnixPaths.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "/home/karutoh/.local/share/JetBrains/Toolbox/apps/clion/bin/cmake/linux/x64/share/cmake-3.27/Modules/CMakeCInformation.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "/home/karutoh/.local/share/JetBrains/Toolbox/apps/clion/bin/cmake/linux/x64/share/cmake-3.27/Modules/CMakeLanguageInformation.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "/home/karutoh/.local/share/JetBrains/Toolbox/apps/clion/bin/cmake/linux/x64/share/cmake-3.27/Modules/Compiler/GNU-C.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "/home/karutoh/.local/share/JetBrains/Toolbox/apps/clion/bin/cmake/linux/x64/share/cmake-3.27/Modules/Compiler/GNU.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "/home/karutoh/.local/share/JetBrains/Toolbox/apps/clion/bin/cmake/linux/x64/share/cmake-3.27/Modules/Compiler/CMakeCommonCompilerMacros.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "/home/karutoh/.local/share/JetBrains/Toolbox/apps/clion/bin/cmake/linux/x64/share/cmake-3.27/Modules/Platform/Linux-GNU-C.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "/home/karutoh/.local/share/JetBrains/Toolbox/apps/clion/bin/cmake/linux/x64/share/cmake-3.27/Modules/Platform/Linux-GNU.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "/home/karutoh/.local/share/JetBrains/Toolbox/apps/clion/bin/cmake/linux/x64/share/cmake-3.27/Modules/CMakeCommonLanguageInclude.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "/home/karutoh/.local/share/JetBrains/Toolbox/apps/clion/bin/cmake/linux/x64/share/cmake-3.27/Modules/CMakeCXXInformation.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "/home/karutoh/.local/share/JetBrains/Toolbox/apps/clion/bin/cmake/linux/x64/share/cmake-3.27/Modules/CMakeLanguageInformation.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "/home/karutoh/.local/share/JetBrains/Toolbox/apps/clion/bin/cmake/linux/x64/share/cmake-3.27/Modules/Compiler/GNU-CXX.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "/home/karutoh/.local/share/JetBrains/Toolbox/apps/clion/bin/cmake/linux/x64/share/cmake-3.27/Modules/Compiler/GNU.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "/home/karutoh/.local/share/JetBrains/Toolbox/apps/clion/bin/cmake/linux/x64/share/cmake-3.27/Modules/Platform/Linux-GNU-CXX.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "/home/karutoh/.local/share/JetBrains/Toolbox/apps/clion/bin/cmake/linux/x64/share/cmake-3.27/Modules/Platform/Linux-GNU.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "/home/karutoh/.local/share/JetBrains/Toolbox/apps/clion/bin/cmake/linux/x64/share/cmake-3.27/Modules/CMakeCommonLanguageInclude.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "/home/karutoh/.local/share/JetBrains/Toolbox/apps/clion/bin/cmake/linux/x64/share/cmake-3.27/Modules/FindVulkan.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "/home/karutoh/.local/share/JetBrains/Toolbox/apps/clion/bin/cmake/linux/x64/share/cmake-3.27/Modules/FindPackageHandleStandardArgs.cmake"
},
{
"isCMake" : true,
"isExternal" : true,
"path" : "/home/karutoh/.local/share/JetBrains/Toolbox/apps/clion/bin/cmake/linux/x64/share/cmake-3.27/Modules/FindPackageMessage.cmake"
}
],
"kind" : "cmakeFiles",
"paths" :
{
"build" : "/home/karutoh/CLionProjects/Compiler/cmake-build-debug",
"source" : "/home/karutoh/CLionProjects/Compiler"
},
"version" :
{
"major" : 1,
"minor" : 0
}
}

View File

@@ -1,60 +0,0 @@
{
"configurations" :
[
{
"directories" :
[
{
"build" : ".",
"jsonFile" : "directory-.-Debug-f5ebdc15457944623624.json",
"minimumCMakeVersion" :
{
"string" : "3.18.4"
},
"projectIndex" : 0,
"source" : ".",
"targetIndexes" :
[
0
]
}
],
"name" : "Debug",
"projects" :
[
{
"directoryIndexes" :
[
0
],
"name" : "Compiler",
"targetIndexes" :
[
0
]
}
],
"targets" :
[
{
"directoryIndex" : 0,
"id" : "Compiler::@6890427a1f51a3e7e1df",
"jsonFile" : "target-Compiler-Debug-b504b707cc3938b58fc6.json",
"name" : "Compiler",
"projectIndex" : 0
}
]
}
],
"kind" : "codemodel",
"paths" :
{
"build" : "/home/karutoh/CLionProjects/Compiler/cmake-build-debug",
"source" : "/home/karutoh/CLionProjects/Compiler"
},
"version" :
{
"major" : 2,
"minor" : 6
}
}

View File

@@ -1,108 +0,0 @@
{
"cmake" :
{
"generator" :
{
"multiConfig" : false,
"name" : "Ninja"
},
"paths" :
{
"cmake" : "/home/karutoh/.local/share/JetBrains/Toolbox/apps/clion/bin/cmake/linux/x64/bin/cmake",
"cpack" : "/home/karutoh/.local/share/JetBrains/Toolbox/apps/clion/bin/cmake/linux/x64/bin/cpack",
"ctest" : "/home/karutoh/.local/share/JetBrains/Toolbox/apps/clion/bin/cmake/linux/x64/bin/ctest",
"root" : "/home/karutoh/.local/share/JetBrains/Toolbox/apps/clion/bin/cmake/linux/x64/share/cmake-3.27"
},
"version" :
{
"isDirty" : false,
"major" : 3,
"minor" : 27,
"patch" : 8,
"string" : "3.27.8",
"suffix" : ""
}
},
"objects" :
[
{
"jsonFile" : "codemodel-v2-7763de202a4897ee489a.json",
"kind" : "codemodel",
"version" :
{
"major" : 2,
"minor" : 6
}
},
{
"jsonFile" : "cache-v2-525bf0c12142f71983da.json",
"kind" : "cache",
"version" :
{
"major" : 2,
"minor" : 0
}
},
{
"jsonFile" : "cmakeFiles-v1-c002049034cb93e91036.json",
"kind" : "cmakeFiles",
"version" :
{
"major" : 1,
"minor" : 0
}
},
{
"jsonFile" : "toolchains-v1-17c20dde199508adeef8.json",
"kind" : "toolchains",
"version" :
{
"major" : 1,
"minor" : 0
}
}
],
"reply" :
{
"cache-v2" :
{
"jsonFile" : "cache-v2-525bf0c12142f71983da.json",
"kind" : "cache",
"version" :
{
"major" : 2,
"minor" : 0
}
},
"cmakeFiles-v1" :
{
"jsonFile" : "cmakeFiles-v1-c002049034cb93e91036.json",
"kind" : "cmakeFiles",
"version" :
{
"major" : 1,
"minor" : 0
}
},
"codemodel-v2" :
{
"jsonFile" : "codemodel-v2-7763de202a4897ee489a.json",
"kind" : "codemodel",
"version" :
{
"major" : 2,
"minor" : 6
}
},
"toolchains-v1" :
{
"jsonFile" : "toolchains-v1-17c20dde199508adeef8.json",
"kind" : "toolchains",
"version" :
{
"major" : 1,
"minor" : 0
}
}
}
}

View File

@@ -1,186 +0,0 @@
{
"artifacts" :
[
{
"path" : "Compiler"
}
],
"backtrace" : 1,
"backtraceGraph" :
{
"commands" :
[
"add_executable",
"target_link_directories",
"target_link_libraries",
"add_compile_options",
"add_compile_definitions"
],
"files" :
[
"CMakeLists.txt"
],
"nodes" :
[
{
"file" : 0
},
{
"command" : 0,
"file" : 0,
"line" : 29,
"parent" : 0
},
{
"command" : 1,
"file" : 0,
"line" : 39,
"parent" : 0
},
{
"command" : 2,
"file" : 0,
"line" : 44,
"parent" : 0
},
{
"command" : 3,
"file" : 0,
"line" : 11,
"parent" : 0
},
{
"command" : 4,
"file" : 0,
"line" : 36,
"parent" : 0
}
]
},
"compileGroups" :
[
{
"compileCommandFragments" :
[
{
"fragment" : " -fPIC -g -std=gnu++20 -fdiagnostics-color=always"
},
{
"backtrace" : 4,
"fragment" : "-Wno-stringop-overflow"
}
],
"defines" :
[
{
"backtrace" : 5,
"define" : "LWE_WS_XCB"
},
{
"backtrace" : 5,
"define" : "VK_USE_PLATFORM_XCB_KHR"
}
],
"language" : "CXX",
"languageStandard" :
{
"backtraces" :
[
1
],
"standard" : "20"
},
"sourceIndexes" :
[
0
]
}
],
"id" : "Compiler::@6890427a1f51a3e7e1df",
"link" :
{
"commandFragments" :
[
{
"fragment" : "-fPIC -g",
"role" : "flags"
},
{
"fragment" : "",
"role" : "flags"
},
{
"backtrace" : 2,
"fragment" : "-L/home/karutoh/.local/lib",
"role" : "libraryPath"
},
{
"fragment" : "-Wl,-rpath,/home/karutoh/.local/lib",
"role" : "libraries"
},
{
"backtrace" : 3,
"fragment" : "-lxcb",
"role" : "libraries"
},
{
"backtrace" : 3,
"fragment" : "-lxcb-cursor",
"role" : "libraries"
},
{
"backtrace" : 3,
"fragment" : "-lxcb-xfixes",
"role" : "libraries"
},
{
"backtrace" : 3,
"fragment" : "-lxcb-xinput",
"role" : "libraries"
},
{
"backtrace" : 3,
"fragment" : "-lz",
"role" : "libraries"
},
{
"backtrace" : 3,
"fragment" : "-lasound",
"role" : "libraries"
},
{
"backtrace" : 3,
"fragment" : "-lEHS",
"role" : "libraries"
}
],
"language" : "CXX"
},
"name" : "Compiler",
"nameOnDisk" : "Compiler",
"paths" :
{
"build" : ".",
"source" : "."
},
"sourceGroups" :
[
{
"name" : "Source Files",
"sourceIndexes" :
[
0
]
}
],
"sources" :
[
{
"backtrace" : 1,
"compileGroupIndex" : 0,
"path" : "main.cpp",
"sourceGroupIndex" : 0
}
],
"type" : "EXECUTABLE"
}

Binary file not shown.

View File

@@ -1,7 +1,18 @@
# ninja log v5
167 224 1707921734641901585 Compiler 415d67d1a4aaa864
0 57 1707955165530194762 build.ninja 8efbe7f6ed9511af
0 167 1707921734585234642 CMakeFiles/Compiler.dir/main.cpp.o de3174f74a65d11b
0 3 0 clean aa1517684869203c
0 222 1707982539439184710 CMakeFiles/Compiler.dir/src/ELF64.cpp.o 7203a7b7f92d3a
0 161 1707978871138561402 CMakeFiles/Compiler.dir/src/ELF64_Program.cpp.o 6531657353b15e1e
1 171 1707981742781983377 CMakeFiles/Compiler.dir/src/ELF64_Section.cpp.o 886965ebb1584f45
222 286 1707982539502518597 Compiler ed968931e95b249c
0 57 1707982626129941948 build.ninja 8efbe7f6ed9511af
1 166 1707955167336856399 CMakeFiles/Compiler.dir/main.cpp.o 7e18d66cc0ec0bf7
166 250 1707955167420189502 Compiler 9828d719de1a93e2
0 167 1707980675233295598 CMakeFiles/Compiler.dir/src/main.cpp.o d6e32444f822aba9
0 151 1707965004973740575 CMakeFiles/Compiler.dir/src/ELF.cpp.o bd59b885017e2e72
0 4 0 clean aa1517684869203c
0 163 1707982629519971506 CMakeFiles/Compiler.dir/src/main.cpp.o d6e32444f822aba9
163 223 1707982629579972029 Compiler 6d7a3ac418bcbfae
0 4 0 clean aa1517684869203c
1 155 1707982632830000361 CMakeFiles/Compiler.dir/src/ELF64_Program.cpp.o 6531657353b15e1e
1 168 1707982632843333811 CMakeFiles/Compiler.dir/src/ELF64_Section.cpp.o 886965ebb1584f45
1 176 1707982632850000536 CMakeFiles/Compiler.dir/src/main.cpp.o d6e32444f822aba9
1 230 1707982632903334334 CMakeFiles/Compiler.dir/src/ELF64.cpp.o 7203a7b7f92d3a
230 290 1707982632963334857 Compiler 6d7a3ac418bcbfae

Binary file not shown.

View File

@@ -1,3 +1,3 @@
Start testing: Feb 14 06:42 PST
Start testing: Feb 14 23:37 PST
----------------------------------------------------------
End testing: Feb 14 06:42 PST
End testing: Feb 14 23:37 PST

View File

@@ -49,12 +49,37 @@ cmake_ninja_workdir = /home/karutoh/CLionProjects/Compiler/cmake-build-debug/
build cmake_object_order_depends_target_Compiler: phony || CMakeFiles/Compiler.dir
build CMakeFiles/Compiler.dir/main.cpp.o: CXX_COMPILER__Compiler_unscanned_Debug /home/karutoh/CLionProjects/Compiler/main.cpp || cmake_object_order_depends_target_Compiler
build CMakeFiles/Compiler.dir/src/ELF64_Section.cpp.o: CXX_COMPILER__Compiler_unscanned_Debug /home/karutoh/CLionProjects/Compiler/src/ELF64_Section.cpp || cmake_object_order_depends_target_Compiler
DEFINES = -DLWE_WS_XCB
DEP_FILE = CMakeFiles/Compiler.dir/main.cpp.o.d
DEP_FILE = CMakeFiles/Compiler.dir/src/ELF64_Section.cpp.o.d
FLAGS = -g -std=gnu++20 -fdiagnostics-color=always -Wno-stringop-overflow
INCLUDES = -I/home/karutoh/CLionProjects/Compiler/include
OBJECT_DIR = CMakeFiles/Compiler.dir
OBJECT_FILE_DIR = CMakeFiles/Compiler.dir
OBJECT_FILE_DIR = CMakeFiles/Compiler.dir/src
build CMakeFiles/Compiler.dir/src/ELF64_Program.cpp.o: CXX_COMPILER__Compiler_unscanned_Debug /home/karutoh/CLionProjects/Compiler/src/ELF64_Program.cpp || cmake_object_order_depends_target_Compiler
DEFINES = -DLWE_WS_XCB
DEP_FILE = CMakeFiles/Compiler.dir/src/ELF64_Program.cpp.o.d
FLAGS = -g -std=gnu++20 -fdiagnostics-color=always -Wno-stringop-overflow
INCLUDES = -I/home/karutoh/CLionProjects/Compiler/include
OBJECT_DIR = CMakeFiles/Compiler.dir
OBJECT_FILE_DIR = CMakeFiles/Compiler.dir/src
build CMakeFiles/Compiler.dir/src/ELF64.cpp.o: CXX_COMPILER__Compiler_unscanned_Debug /home/karutoh/CLionProjects/Compiler/src/ELF64.cpp || cmake_object_order_depends_target_Compiler
DEFINES = -DLWE_WS_XCB
DEP_FILE = CMakeFiles/Compiler.dir/src/ELF64.cpp.o.d
FLAGS = -g -std=gnu++20 -fdiagnostics-color=always -Wno-stringop-overflow
INCLUDES = -I/home/karutoh/CLionProjects/Compiler/include
OBJECT_DIR = CMakeFiles/Compiler.dir
OBJECT_FILE_DIR = CMakeFiles/Compiler.dir/src
build CMakeFiles/Compiler.dir/src/main.cpp.o: CXX_COMPILER__Compiler_unscanned_Debug /home/karutoh/CLionProjects/Compiler/src/main.cpp || cmake_object_order_depends_target_Compiler
DEFINES = -DLWE_WS_XCB
DEP_FILE = CMakeFiles/Compiler.dir/src/main.cpp.o.d
FLAGS = -g -std=gnu++20 -fdiagnostics-color=always -Wno-stringop-overflow
INCLUDES = -I/home/karutoh/CLionProjects/Compiler/include
OBJECT_DIR = CMakeFiles/Compiler.dir
OBJECT_FILE_DIR = CMakeFiles/Compiler.dir/src
# =============================================================================
@@ -64,7 +89,7 @@ build CMakeFiles/Compiler.dir/main.cpp.o: CXX_COMPILER__Compiler_unscanned_Debug
#############################################
# Link the executable Compiler
build Compiler: CXX_EXECUTABLE_LINKER__Compiler_Debug CMakeFiles/Compiler.dir/main.cpp.o
build Compiler: CXX_EXECUTABLE_LINKER__Compiler_Debug CMakeFiles/Compiler.dir/src/ELF64_Section.cpp.o CMakeFiles/Compiler.dir/src/ELF64_Program.cpp.o CMakeFiles/Compiler.dir/src/ELF64.cpp.o CMakeFiles/Compiler.dir/src/main.cpp.o
FLAGS = -g
LINK_LIBRARIES = -Wl,-rpath,/home/karutoh/.local/lib -lxcb -lxcb-cursor -lxcb-xfixes -lxcb-xinput -lz -lasound -lEHS
LINK_PATH = -L/home/karutoh/.local/lib