From bd7c743e937e1fbeaf71a0c5d86c84a5fced027d Mon Sep 17 00:00:00 2001 From: Christoffer Lerno Date: Mon, 15 Jul 2019 16:38:31 +0200 Subject: [PATCH] Updated project structure. Updated README. --- CMakeLists.txt | 13 ++++++++++++- README.md | 8 +++++++- {build => src/build}/build_options.c | 0 {build => src/build}/build_options.h | 0 {build => src/build}/project_creation.c | 1 - {build => src/build}/project_creation.h | 0 main.c => src/main.c | 0 {utils => src/utils}/errors.c | 0 {utils => src/utils}/errors.h | 0 {utils => src/utils}/file_utils.c | 0 {utils => src/utils}/file_utils.h | 0 {utils => src/utils}/string_utils.c | 0 {utils => src/utils}/string_utils.h | 0 13 files changed, 19 insertions(+), 3 deletions(-) rename {build => src/build}/build_options.c (100%) rename {build => src/build}/build_options.h (100%) rename {build => src/build}/project_creation.c (99%) rename {build => src/build}/project_creation.h (100%) rename main.c => src/main.c (100%) rename {utils => src/utils}/errors.c (100%) rename {utils => src/utils}/errors.h (100%) rename {utils => src/utils}/file_utils.c (100%) rename {utils => src/utils}/file_utils.h (100%) rename {utils => src/utils}/string_utils.c (100%) rename {utils => src/utils}/string_utils.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 78aba0016..b0f16fc05 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,4 +3,15 @@ project(c3c C) set(CMAKE_C_STANDARD 11) -add_executable(c3c main.c build/build_options.c build/build_options.h build/project_creation.c build/project_creation.h utils/string_utils.c utils/string_utils.h utils/file_utils.c utils/file_utils.h utils/errors.c utils/errors.h) \ No newline at end of file +include_directories( + "${CMAKE_SOURCE_DIR}/src/" + "${CMAKE_SOURCE_DIR}/build/") + +add_executable(c3c + src/main.c + src/build/build_options.c + src/build/project_creation.c + src/utils/errors.c + src/utils/file_utils.c + src/utils/string_utils.c + ) \ No newline at end of file diff --git a/README.md b/README.md index 92910dff7..108fd43c7 100644 --- a/README.md +++ b/README.md @@ -1 +1,7 @@ -# c3c \ No newline at end of file +# C3 Language + +This is a prototype language branched off C2. It goes further than C2 in several regards, while still embracing the goals of C2. + +As of now, very little code towards the compiler will be added here. + +There is a "work-in-progress" C2 compiler in C called Titanos, which an eventual compiler might be based on. \ No newline at end of file diff --git a/build/build_options.c b/src/build/build_options.c similarity index 100% rename from build/build_options.c rename to src/build/build_options.c diff --git a/build/build_options.h b/src/build/build_options.h similarity index 100% rename from build/build_options.h rename to src/build/build_options.h diff --git a/build/project_creation.c b/src/build/project_creation.c similarity index 99% rename from build/project_creation.c rename to src/build/project_creation.c index b126bbc0a..7340c11b7 100644 --- a/build/project_creation.c +++ b/src/build/project_creation.c @@ -9,7 +9,6 @@ #include #include "project_creation.h" #include "build_options.h" -#include "string.h" #include "../utils/string_utils.h" const char* TOML = diff --git a/build/project_creation.h b/src/build/project_creation.h similarity index 100% rename from build/project_creation.h rename to src/build/project_creation.h diff --git a/main.c b/src/main.c similarity index 100% rename from main.c rename to src/main.c diff --git a/utils/errors.c b/src/utils/errors.c similarity index 100% rename from utils/errors.c rename to src/utils/errors.c diff --git a/utils/errors.h b/src/utils/errors.h similarity index 100% rename from utils/errors.h rename to src/utils/errors.h diff --git a/utils/file_utils.c b/src/utils/file_utils.c similarity index 100% rename from utils/file_utils.c rename to src/utils/file_utils.c diff --git a/utils/file_utils.h b/src/utils/file_utils.h similarity index 100% rename from utils/file_utils.h rename to src/utils/file_utils.h diff --git a/utils/string_utils.c b/src/utils/string_utils.c similarity index 100% rename from utils/string_utils.c rename to src/utils/string_utils.c diff --git a/utils/string_utils.h b/src/utils/string_utils.h similarity index 100% rename from utils/string_utils.h rename to src/utils/string_utils.h