diff --git a/.gitignore b/.gitignore index 0fe5af9..c7dc5e1 100644 --- a/.gitignore +++ b/.gitignore @@ -15,8 +15,8 @@ docs/theme # Generated using only the Github workflow benchmark_result.json -singleheader/lexer.h -singleheader/lexer.cpp +singleheader/merve.h +singleheader/merve.cpp #ignore VScode .vscode/ diff --git a/CMakeLists.txt b/CMakeLists.txt index 3207507..2919e3c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -131,13 +131,13 @@ if(NOT MERVE_COVERAGE AND NOT EMSCRIPTEN) endif() install( - FILES include/lexer.h + FILES include/merve.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" COMPONENT merve_development ) install( - DIRECTORY include/lexer + DIRECTORY include/merve DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" COMPONENT merve_development ) diff --git a/README.md b/README.md index 5eee712..0b000fd 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ Copy `singleheader/merve.h` and `singleheader/merve.cpp` to your project. ## Usage ```cpp -#include "lexer.h" +#include "merve.h" #include int main() { diff --git a/include/lexer.h b/include/merve.h similarity index 67% rename from include/lexer.h rename to include/merve.h index 7c01542..0d48245 100644 --- a/include/lexer.h +++ b/include/merve.h @@ -1,6 +1,6 @@ #ifndef MERVE_H #define MERVE_H -#include "lexer/parser.h" +#include "merve/parser.h" #endif // MERVE_H diff --git a/include/lexer/parser.h b/include/merve/parser.h similarity index 99% rename from include/lexer/parser.h rename to include/merve/parser.h index 9e30bc8..2a2f406 100644 --- a/include/lexer/parser.h +++ b/include/merve/parser.h @@ -1,7 +1,7 @@ #ifndef MERVE_PARSER_H #define MERVE_PARSER_H -#include "lexer/version.h" +#include "merve/version.h" #include #include diff --git a/include/lexer/version.h b/include/merve/version.h similarity index 100% rename from include/lexer/version.h rename to include/merve/version.h diff --git a/singleheader/amalgamate.py b/singleheader/amalgamate.py index 1ded9d6..f0ea379 100644 --- a/singleheader/amalgamate.py +++ b/singleheader/amalgamate.py @@ -37,7 +37,7 @@ ALLCFILES = ["parser.cpp"] # order matters -ALLCHEADERS = ["lexer.h"] +ALLCHEADERS = ["merve.h"] # Output file names OUTPUT_H = "merve.h" @@ -82,7 +82,7 @@ def dofile(fid: str, prepath: str, filename: str) -> None: s = includepattern.search(line) if s: includedfile = s.group(1) - if includedfile == "lexer.h" and filename == "lexer.cpp": + if includedfile == "merve.h" and filename == "merve.cpp": print(line, file=fid) continue diff --git a/src/lexer.cpp b/src/lexer.cpp index 4fb2337..4584537 100644 --- a/src/lexer.cpp +++ b/src/lexer.cpp @@ -1,2 +1,2 @@ -#include "lexer.h" +#include "merve.h" #include "parser.cpp" diff --git a/src/parser.cpp b/src/parser.cpp index 70713e7..86e6503 100644 --- a/src/parser.cpp +++ b/src/parser.cpp @@ -1,4 +1,4 @@ -#include "lexer/parser.h" +#include "merve/parser.h" #include #include #include diff --git a/tests/real_world_tests.cpp b/tests/real_world_tests.cpp index 0bea0b5..61f0c43 100644 --- a/tests/real_world_tests.cpp +++ b/tests/real_world_tests.cpp @@ -1,4 +1,4 @@ -#include "lexer.h" +#include "merve.h" #include "gtest/gtest.h" TEST(real_world_tests, esbuild_hint_style) {