From 74034c7b764a5af5b0f1b5f32002193b5ce917f4 Mon Sep 17 00:00:00 2001 From: Danila Fedorin Date: Sun, 11 Feb 2018 22:32:42 -0800 Subject: [PATCH] Rename header files. --- CMakeLists.txt | 2 +- include/lexer.h | 2 +- include/libabacus.h | 2 +- include/{libabacus_result.h => result.h} | 0 include/table.h | 2 +- include/tree.h | 2 +- include/{libabacus_util.h => util.h} | 2 +- src/lexer.c | 2 +- src/parser.c | 4 ++-- src/{libabacus_util.c => util.c} | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) rename include/{libabacus_result.h => result.h} (100%) rename include/{libabacus_util.h => util.h} (94%) rename src/{libabacus_util.c => util.c} (95%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3794a22..03c98d1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ project(libabacus) add_compile_options(-pedantic -Wall) -add_library(abacus STATIC src/lexer.c src/libabacus_util.c src/table.c src/parser.c src/libabacus.c) +add_library(abacus STATIC src/lexer.c src/util.c src/table.c src/parser.c src/libabacus.c) add_executable(libabacus src/main.c) add_subdirectory(external/liblex) diff --git a/include/lexer.h b/include/lexer.h index bded969..aa6b389 100644 --- a/include/lexer.h +++ b/include/lexer.h @@ -2,7 +2,7 @@ #define LIBABACUS_LEXER_H #include "eval.h" -#include "libabacus_result.h" +#include "result.h" /** * The lexer used for reading diff --git a/include/libabacus.h b/include/libabacus.h index edcbfca..2719834 100644 --- a/include/libabacus.h +++ b/include/libabacus.h @@ -5,7 +5,7 @@ #include "lexer.h" #include "table.h" #include "parser.h" -#include "libabacus_result.h" +#include "result.h" /** * A function pointer that is called diff --git a/include/libabacus_result.h b/include/result.h similarity index 100% rename from include/libabacus_result.h rename to include/result.h diff --git a/include/table.h b/include/table.h index a598fbb..8164231 100644 --- a/include/table.h +++ b/include/table.h @@ -2,7 +2,7 @@ #define LIBABACUS_TABLE_H #include "ht.h" -#include "libabacus_result.h" +#include "result.h" /** * A struct that represents a structure diff --git a/include/tree.h b/include/tree.h index 2b6b06c..0ce7ebb 100644 --- a/include/tree.h +++ b/include/tree.h @@ -1,7 +1,7 @@ #ifndef LIBABACUS_TREE_H #define LIBABACUS_TREE_H -#include "libabacus_result.h" +#include "result.h" #include "vec.h" /** diff --git a/include/libabacus_util.h b/include/util.h similarity index 94% rename from include/libabacus_util.h rename to include/util.h index 9ed2780..4384d4e 100644 --- a/include/libabacus_util.h +++ b/include/util.h @@ -3,7 +3,7 @@ #include "libds.h" #include "liblex.h" -#include "libabacus_result.h" +#include "result.h" /** * Converts a result code from liblex to libabacus. diff --git a/src/lexer.c b/src/lexer.c index ff71104..f6e0b34 100644 --- a/src/lexer.c +++ b/src/lexer.c @@ -1,6 +1,6 @@ #include "lexer.h" #include "ll.h" -#include "libabacus_util.h" +#include "util.h" #include #include diff --git a/src/parser.c b/src/parser.c index 8266d6c..013a940 100644 --- a/src/parser.c +++ b/src/parser.c @@ -1,6 +1,6 @@ #include "parser.h" -#include "libabacus_util.h" -#include "libabacus_result.h" +#include "util.h" +#include "result.h" #include "lexer.h" #include #include diff --git a/src/libabacus_util.c b/src/util.c similarity index 95% rename from src/libabacus_util.c rename to src/util.c index 5d336a6..a155aa8 100644 --- a/src/libabacus_util.c +++ b/src/util.c @@ -1,4 +1,4 @@ -#include "libabacus_util.h" +#include "util.h" libab_result libab_convert_lex_result(liblex_result to_convert) { libab_result result = LIBAB_SUCCESS;