chore: small changes

Author: budchirp

.github/workflows/build-test.yml

@@ -0,0 +1,23 @@
+name: Build test
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Build
+        run: cmake ${{ github.workspace }}
+
+      - name: Compile
+        run: make -j$(nproc)
+
+      - name: Run
+        run: ./calcplusplus

.github/workflows/tests.yml

@@ -1,4 +1,5 @@
 .idea/
+.cache/
 
 build/
 out/

.gitignore

@@ -1,22 +1,41 @@
-cmake_minimum_required(VERSION 3.28)
+cmake_minimum_required(VERSION 3.25)
 
-set(EXEC_NAME "calcplusplus")
-project(calcplusplus VERSION 0.1.0)
+project(calcplusplus VERSION 0.1.0 LANGUAGES CXX)
+
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 if(NOT DEFINED CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE "Debug")
 endif()
 
-set(ENABLE_SAMPLES OFF)
-set(BUILD_TESTING OFF)
-set(ENABLE_OPENMP OFF)
+add_compile_options(
+  -Wall -Wextra -Wpedantic
+)
+
+file(GLOB HEADERS "include/*.h" "include/*.hpp" "include/*.hh" "include/*.hxx")
+message(STATUS "Found headers: ${HEADERS}")
+file(GLOB SOURCES "src/*.c" "src/*.cpp" "src/*.cc" "src/*.cxx")
+message(STATUS "Found sources: ${SOURCES}")
+
+add_executable(${PROJECT_NAME} ${HEADERS} ${SOURCES})
+target_include_directories(${PROJECT_NAME} PRIVATE include)
 
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-  set(FTXUI_DEV_WARNINGS ON)
-  
-  set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+  target_compile_definitions(${PROJECT_NAME} PRIVATE DEBUG_MODE=1)
+  target_compile_options(${PROJECT_NAME} PRIVATE -Og -g3 -DDEBUG)
+  target_link_options(${PROJECT_NAME} PRIVATE -fsanitize=address)
+elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
+  target_compile_options(${PROJECT_NAME} PRIVATE -O3 -march=native -flto -DNDEBUG)
+  target_link_options(${PROJECT_NAME} PRIVATE -flto)
 endif()
 
+source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/include PREFIX "Header Files" FILES ${HEADERS})
+source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/src PREFIX "Source Files" FILES ${SOURCES})
+
 include(FetchContent)
 
 FetchContent_Declare(ftxui
@@ -39,30 +58,7 @@ if(NOT muparser_POPULATED)
   add_subdirectory(${muparser_SOURCE_DIR} ${muparser_BINARY_DIR} EXCLUDE_FROM_ALL)
 endif()
 
-file(GLOB HEADERS
-  "include/*.h"
-  "include/*.hh"
-  "include/*.hpp"
-  "include/*.hxx"
-)
-
-file(GLOB SRC
-  "src/*.c"
-  "src/*.cc"
-  "src/*.cpp"
-  "src/*.cxx"
-)
-
-include_directories(include)
-
-add_executable(${EXEC_NAME} ${SRC} ${HEADERS})
-target_include_directories(${EXEC_NAME} PRIVATE ${HEADERS})
-
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-  target_link_options(${EXEC_NAME} PRIVATE -fsanitize=address)
-endif()
-
-target_link_libraries(${EXEC_NAME}
+target_link_libraries(${PROJECT_NAME}
   PRIVATE ftxui::screen
   PRIVATE ftxui::dom
   PRIVATE ftxui::component

CMakeLists.txt

@@ -1,21 +1,21 @@
 <h1 align="center">calcplusplus</h1>
 <h2 align="center">TUI calculator written in C++ using FTXUI</h2>
 
-<div align="center">
+<p align="center">
   <img alt="Stargazers" src="https://img.shields.io/github/stars/budchirp/calcplusplus?style=for-the-badge&colorA=0b1221&colorB=ff8e8e" />
   <img alt="Last commit" src="https://img.shields.io/github/last-commit/budchirp/calcplusplus?style=for-the-badge&colorA=0b1221&colorB=BDB0E4" />
   <img alt="Issues" src="https://img.shields.io/github/issues/budchirp/calcplusplus?style=for-the-badge&colorA=0b1221&colorB=FBC19D" />
-</div>
+</p>
 
 
-## 💾 Installation
+## 💾 Getting started
 
 ### Requirements
 
-1. C compiler
+1. C++ compiler
 2. CMake & Make
 
-### How to install?
+### How to start?
 
 1. Clone the repo
 
@@ -26,8 +26,8 @@ git clone https://github.com/budchirp/calcplusplus && cd calcplusplus
 2. Compile the code
 
 ```sh
-mkdir -p build && cd build
-cmake ../ && make -j$(nproc)
+mkdir build && cd build
+cmake .. && make -j$(nproc)
 ```
 
 > NOTE: If you're using fish, remove the `$` sign.
@@ -36,4 +36,4 @@ cmake ../ && make -j$(nproc)
 
 ```sh
 ./calcplusplus
-```
+```

README.md

@@ -1,4 +1,3 @@
-#include <csignal>
 #include <string>
 
 #include "ftxui/component/component.hpp"
@@ -12,7 +11,7 @@ using namespace std;
 using namespace ftxui;
 using namespace mu;
 
-string calculate(const string& expression) {
+string calculate(const string &expression) {
   try {
     if (!expression.empty()) {
       Parser parser;
@@ -30,7 +29,7 @@ string calculate(const string& expression) {
     } else {
       return "";
     }
-  } catch (Parser::exception_type& e) {
+  } catch (Parser::exception_type &e) {
     return e.GetMsg();
   }
 }
@@ -56,7 +55,8 @@ int main() {
     calculated = "";
   });
   Component removeButton = Button(" R ", [&] {
-    if (!expression.empty()) expression.pop_back();
+    if (!expression.empty())
+      expression.pop_back();
   });
   Component plusButton = Button(" + ", [&] { expression.append("+"); });
   Component minusButton = Button(" - ", [&] { expression.append("-"); });
@@ -96,9 +96,9 @@ int main() {
                hbox(text(" "), bold(text("calc++")), text(" "),
                     filler() | borderEmpty, quitButton->Render()),
                vbox(
-                   vbox(hbox(
-                       hbox(expressionsInput->Render()) | flex | border,
-                       hbox(text(" "), text(calculated), text(" ")) | border)),
+                   vbox(hbox(hbox(expressionsInput->Render()) | flex | border,
+                             hbox(text(" "), text(calculated), text(" ")) |
+                                 border)),
                    vbox(hbox(clearButton->Render(), removeButton->Render(),
                              emptyButton2->Render(), dividedByButton->Render()),
                         hbox(button7->Render(), button8->Render(),