Author | Jakob Wakeling <[email protected]> |
Date | 2022-03-06 01:59:43 |
Commit | 281158b5eb9c03f2c32dfc6d4342720a0bd750b7 |
Parent | a4712dd6e12381d7e685c19ab1bffacefc93323c |
meta: Minor formatting changes
Diffstat
M | CMakeLists.txt | | | 14 | +++++++------- |
M | README.md | | | 1 | - |
M | examples/map.g | | | 2 | -- |
M | src/compile.c | | | 2 | -- |
M | src/compile.h | | | 2 | -- |
M | src/init.c | | | 2 | -- |
M | src/init.h | | | 2 | -- |
M | src/keyword.c | | | 2 | -- |
M | src/keyword.h | | | 2 | -- |
M | src/lex.c | | | 2 | -- |
M | src/lex.h | | | 2 | -- |
M | src/llvm/gen.c | | | 2 | -- |
M | src/llvm/llvm.h | | | 2 | -- |
M | src/llvm/type.c | | | 2 | -- |
M | src/main.c | | | 7 | ++----- |
M | src/parse.c | | | 2 | -- |
M | src/parse.h | | | 2 | -- |
M | src/symbol.c | | | 2 | -- |
M | src/symbol.h | | | 2 | -- |
M | src/type.c | | | 2 | -- |
M | src/type.h | | | 2 | -- |
M | src/value.c | | | 2 | -- |
M | src/value.h | | | 2 | -- |
23 files changed, 9 insertions, 53 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 74214ac..26d87f9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,12 +1,12 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 3.12) -PROJECT(G VERSION 0.1.0 LANGUAGES C) +cmake_minimum_required(VERSION 3.12) +project(G VERSION 0.1.0 LANGUAGES C) -SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin) -ADD_COMPILE_DEFINITIONS(PROJECT_VERSION="${PROJECT_VERSION}") +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin) +add_compile_definitions(PROJECT_VERSION="${PROJECT_VERSION}") -FIND_PACKAGE(LLVM REQUIRED) +find_package(LLVM REQUIRED) -FILE(GLOB SRC ${PROJECT_SOURCE_DIR}/src/*.c ${PROJECT_SOURCE_DIR}/src/**/*.c) +file(GLOB SRC ${PROJECT_SOURCE_DIR}/src/*.c ${PROJECT_SOURCE_DIR}/src/**/*.c) -ADD_EXECUTABLE(g ${SRC}) -TARGET_LINK_LIBRARIES(g LLVM) +add_executable(g ${SRC}) +target_link_libraries(g LLVM) diff --git a/README.md b/README.md index 53de332..422ddef 100644 --- a/README.md +++ b/README.md @@ -79,5 +79,4 @@ command. The second command will output an executable file, *a.out* by default. ## Meta Copyright (C) 2021, Jakob Wakeling -All rights reserved. All rights reserved. diff --git a/examples/map.g b/examples/map.g index 394d5cb..1a8b1ea 100644 --- a/examples/map.g +++ b/examples/map.g @@ -3,8 +3,6 @@ // Copyright (C) 2021, Jakob Wakeling // All rights reserved. -/**/ - /* This example is *very* unrefined and exists solely as a syntax experiment. I am certain that this would be completely nonfunctional, as I have diff --git a/src/compile.c b/src/compile.c index bb64d7f..53ac772 100644 --- a/src/compile.c +++ b/src/compile.c @@ -3,8 +3,6 @@ // Copyright (C) 2021, Jakob Wakeling // All rights reserved. - - #include "compile.h" #include "init.h" #include "llvm/llvm.h" diff --git a/src/compile.h b/src/compile.h index 9ccb5ba..58c7808 100644 --- a/src/compile.h +++ b/src/compile.h @@ -3,8 +3,6 @@ // Copyright (C) 2021, Jakob Wakeling // All rights reserved. - - #ifndef G_COMPILE_H_DSDZQ0ZM #define G_COMPILE_H_DSDZQ0ZM diff --git a/src/init.c b/src/init.c index 74741f3..6305081 100644 --- a/src/init.c +++ b/src/init.c @@ -3,8 +3,6 @@ // Copyright (C) 2021, Jakob Wakeling // All rights reserved. - - #include "init.h" #include "symbol.h" #include "type.h" diff --git a/src/init.h b/src/init.h index b2da599..47a3b61 100644 --- a/src/init.h +++ b/src/init.h @@ -3,8 +3,6 @@ // Copyright (C) 2021, Jakob Wakeling // All rights reserved. - - #ifndef G_INIT_H_9Q2WGC4Z #define G_INIT_H_9Q2WGC4Z diff --git a/src/keyword.c b/src/keyword.c index f560b2c..c416042 100644 --- a/src/keyword.c +++ b/src/keyword.c @@ -3,8 +3,6 @@ // Copyright (C) 2021, Jakob Wakeling // All rights reserved. - - #include "keyword.h" #include "util/fnv.h" #include "util/util.h" diff --git a/src/keyword.h b/src/keyword.h index 239ecd9..3fb7834 100644 --- a/src/keyword.h +++ b/src/keyword.h @@ -3,8 +3,6 @@ // Copyright (C) 2021, Jakob Wakeling // All rights reserved. - - #ifndef G_KEYWORD_H_UEY4FULO #define G_KEYWORD_H_UEY4FULO diff --git a/src/lex.c b/src/lex.c index 5c31709..93e2151 100644 --- a/src/lex.c +++ b/src/lex.c @@ -3,8 +3,6 @@ // Copyright (C) 2021, Jakob Wakeling // All rights reserved. - - #include "keyword.h" #include "lex.h" #include "symbol.h" diff --git a/src/lex.h b/src/lex.h index 7e4336e..8fe312e 100644 --- a/src/lex.h +++ b/src/lex.h @@ -3,8 +3,6 @@ // Copyright (C) 2021, Jakob Wakeling // All rights reserved. - - #ifndef G_LEX_H_H356P5AM #define G_LEX_H_H356P5AM diff --git a/src/llvm/gen.c b/src/llvm/gen.c index b317dd7..6324609 100644 --- a/src/llvm/gen.c +++ b/src/llvm/gen.c @@ -3,8 +3,6 @@ // Copyright (C) 2021, Jakob Wakeling // All rights reserved. - - #include "../parse.h" #include "../type.h" #include "../util/error.h" diff --git a/src/llvm/llvm.h b/src/llvm/llvm.h index c72c0d7..92ab8df 100644 --- a/src/llvm/llvm.h +++ b/src/llvm/llvm.h @@ -3,8 +3,6 @@ // Copyright (C) 2021, Jakob Wakeling // All rights reserved. - - #ifndef G_LLVM_LLVM_H_CZUMSHFW #define G_LLVM_LLVM_H_CZUMSHFW diff --git a/src/llvm/type.c b/src/llvm/type.c index 083003a..6906d8b 100644 --- a/src/llvm/type.c +++ b/src/llvm/type.c @@ -3,8 +3,6 @@ // Copyright (C) 2021, Jakob Wakeling // All rights reserved. - - #include "../type.h" #include <llvm-c/Core.h> diff --git a/src/main.c b/src/main.c index 3541ca6..3b89a42 100644 --- a/src/main.c +++ b/src/main.c @@ -3,8 +3,6 @@ // Copyright (C) 2021, Jakob Wakeling // All rights reserved. - - #include "compile.h" #include "util/error.h" #include "util/optget.h" @@ -49,6 +47,7 @@ int main(int ac, char *av[]) { (void)(ac); A0 = av[0]; return 0; } +/* Print help information. */ static void hlp(void) { puts("G - G Compiler\n"); puts("Usage: g\n"); @@ -57,13 +56,11 @@ static void hlp(void) { puts(" --version Display version information"); puts(" --debug-lex Print lexer debug output and exit"); puts(" --debug-parse Print parser debug output and exit"); - return; } +/* Print version information. */ static void ver(void) { puts("G, version " PROJECT_VERSION); puts("Copyright (C) 2021, Jakob Wakeling"); puts("All rights reserved."); - puts("All rights reserved."); - return; } diff --git a/src/parse.c b/src/parse.c index 81d8f1f..0344bcd 100644 --- a/src/parse.c +++ b/src/parse.c @@ -3,8 +3,6 @@ // Copyright (C) 2021, Jakob Wakeling // All rights reserved. - - #include "init.h" #include "lex.h" #include "parse.h" diff --git a/src/parse.h b/src/parse.h index eed8a09..2c77d63 100644 --- a/src/parse.h +++ b/src/parse.h @@ -3,8 +3,6 @@ // Copyright (C) 2021, Jakob Wakeling // All rights reserved. - - #ifndef G_PARSE_H_VB50JOSX #define G_PARSE_H_VB50JOSX diff --git a/src/symbol.c b/src/symbol.c index 461fe30..d33f6d1 100644 --- a/src/symbol.c +++ b/src/symbol.c @@ -3,8 +3,6 @@ // Copyright (C) 2021, Jakob Wakeling // All rights reserved. - - /* This file uses the currently non-standard 'typeof' operator. Its use is considered acceptable because it is supported by both GCC and Clang, and diff --git a/src/symbol.h b/src/symbol.h index 121d39b..859948b 100644 --- a/src/symbol.h +++ b/src/symbol.h @@ -3,8 +3,6 @@ // Copyright (C) 2021, Jakob Wakeling // All rights reserved. - - #ifndef G_SYMBOL_H_Q1VLFKFE #define G_SYMBOL_H_Q1VLFKFE diff --git a/src/type.c b/src/type.c index 472dd57..3d90809 100644 --- a/src/type.c +++ b/src/type.c @@ -3,8 +3,6 @@ // Copyright (C) 2021, Jakob Wakeling // All rights reserved. - - #include "type.h" type types[] = { diff --git a/src/type.h b/src/type.h index 00e2933..ec7bb41 100644 --- a/src/type.h +++ b/src/type.h @@ -3,8 +3,6 @@ // Copyright (C) 2021, Jakob Wakeling // All rights reserved. - - #ifndef G_TYPE_H_QHH0TJJQ #define G_TYPE_H_QHH0TJJQ diff --git a/src/value.c b/src/value.c index 89ebfc4..2836148 100644 --- a/src/value.c +++ b/src/value.c @@ -3,8 +3,6 @@ // Copyright (C) 2021, Jakob Wakeling // All rights reserved. - - #include "util/util.h" #include "value.h" diff --git a/src/value.h b/src/value.h index 97de8b9..548c536 100644 --- a/src/value.h +++ b/src/value.h @@ -3,8 +3,6 @@ // Copyright (C) 2021, Jakob Wakeling // All rights reserved. - - #ifndef G_VALUE_H_X2RKXBBA #define G_VALUE_H_X2RKXBBA