Merge pull request #42 from literally-bug-creator/41

Fix repo layout

Author: yegor256

.github/workflows/cpp.yml

@@ -14,6 +14,8 @@ jobs:
       - uses: actions/checkout@v5
       - run: sudo apt-get install libboost-all-dev
       - run: make style
-      - run: make slow
       - run: make fast
+      - run: make fast-test
+      - run: make slow
+      - run: make slow-test
       - run: make clean

.github/workflows/eolang.yml

@@ -13,5 +13,5 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - run: npm install -g eolang
-      - run: make eo-compile
+      - run: make eo
       - run: make clean

.typos.toml

@@ -0,0 +1,11 @@
+# SPDX-FileCopyrightText: Copyright (c) 2022 Anton Shatokhin
+# SPDX-License-Identifier: MIT
+
+[default]
+extend-ignore-identifiers-re = [
+    # Ignore compiler flags like -Iinclude, -Lpath, etc.
+    "-[IL][a-zA-Z0-9_/.-]+",
+]
+
+[default.extend-words]
+Iinclude = "Iinclude" # This is a compiler flag -Iinclude

Makefile

@@ -1,53 +1,28 @@
 # SPDX-FileCopyrightText: Copyright (c) 2022 Anton Shatokhin
 # SPDX-License-Identifier: MIT
 
-FAST_SOURCES := $(wildcard Fast/src/*.cpp)
-FAST_HEADERS := $(wildcard Fast/**/*.h)
-FAST_OBJECTS := ${FAST_SOURCES:.cpp=.o}
+ALL_SOURCES := $(wildcard cpp/*/src/*.cpp)
+ALL_HEADERS := $(wildcard cpp/*/include/*.h cpp/*/src/*.h)
 
-FAST_TEST_SOURCES := $(filter-out Fast/src/main.cpp, $(shell find Fast/  -type f -name *.cpp))
+.PHONY: all style fast fast-test slow slow-test eo clean fix test
 
-FAST_TEST_OBJECTS := ${FAST_TEST_SOURCES:.cpp=.o}
+all: style fast slow eo
 
-.PHONY: all style slow fast eo-compile compile cpp java eo run clean test
+fast:
+	$(MAKE) -C cpp/fast
 
-all: style slow fast eo-compile
+fast-test:
+	$(MAKE) -C cpp/fast test
 
-compile: cpp java eo
+slow:
+	$(MAKE) -C cpp/slow
 
-slow: slow_life slow_test
+slow-test:
+	$(MAKE) -C cpp/slow test
 
-fast: fast_life fast_test
+eo:
+	$(MAKE) -C eo
 
-fast_life: $(FAST_OBJECTS)
-	@g++ $(FAST_OBJECTS) -lboost_program_options -o fast_life
-
-fast_test: $(FAST_TEST_OBJECTS)
-	@g++ $(FAST_TEST_OBJECTS) -lboost_unit_test_framework -o fast_test
-	./fast_test --log_level=all
-
-%.o: Fast/**/%.cpp  $(FAST_HEADERS)
-	@g++ $@ -o $<
-
-SLOW_SOURCES := $(wildcard Slow/src/*.cpp)
-SLOW_HEADERS := $(wildcard Slow/**/*.h)
-SLOW_OBJECTS := ${SLOW_SOURCES:.cpp=.o}
-SLOW_TEST_SOURCES := $(filter-out Slow/src/main.cpp, $(shell find Slow/  -type f -name *.cpp))
-SLOW_TEST_OBJECTS := ${SLOW_TEST_SOURCES:.cpp=.o}
-
-slow_life: $(SLOW_OBJECTS)
-	g++ $(SLOW_OBJECTS) -lboost_program_options -o slow_life
-
-slow_test: $(SLOW_TEST_OBJECTS)
-	g++ $(SLOW_TEST_OBJECTS) -lboost_unit_test_framework -lboost_program_options -o slow_test
-	./slow_test --log_level=all
-
-%.o:  Slow/**/%.cpp  $(SLOW_HEADERS)
-	g++ $@ -o $<
-
-
-ALL_SOURCES := $(SLOW_SOURCES) $(FAST_SOURCES)
-ALL_HEADERS := $(FAST_HEADERS) $(SLOW_HEADERS)
 style:
 	bash -c "diff -u <(cat $(ALL_SOURCES)) <(clang-format --style=file $(ALL_SOURCES))"
 	clang-tidy -header-filter=none '-warnings-as-errors=*' '-checks=*,-readability-magic-numbers,-altera-id-dependent-backward-branch,-cert-err34-c,-cppcoreguidelines-avoid-non-const-global-variables,-readability-function-cognitive-complexity,-misc-no-recursion,-llvm-header-guard,-cppcoreguidelines-init-variables,-altera-unroll-loops,-clang-analyzer-valist.Uninitialized,-llvmlibc-callee-namespace,-cppcoreguidelines-no-malloc,-hicpp-no-malloc,-llvmlibc-implementation-in-namespace,-bugprone-easily-swappable-parameters,-llvmlibc-restrict-system-libc-headers,-llvm-include-order,-modernize-use-trailing-return-type,-cppcoreguidelines-special-member-functions,-hicpp-special-member-functions,-cppcoreguidelines-owning-memory,-cppcoreguidelines-pro-type-vararg,-hicpp-vararg,-fuchsia-default-arguments-calls' $(ALL_SOURCES)
@@ -56,12 +31,7 @@ fix:
 	clang-format -i --style=file $(ALL_SOURCES) $(ALL_HEADERS)
 	clang-tidy -fix -header-filter=none '-warnings-as-errors=*' '-checks=*,-readability-magic-numbers,-altera-id-dependent-backward-branch,-cert-err34-c,-cppcoreguidelines-avoid-non-const-global-variables,-readability-function-cognitive-complexity,-misc-no-recursion,-llvm-header-guard,-cppcoreguidelines-init-variables,-altera-unroll-loops,-clang-analyzer-valist.Uninitialized,-llvmlibc-callee-namespace,-cppcoreguidelines-no-malloc,-hicpp-no-malloc,-llvmlibc-implementation-in-namespace,-bugprone-easily-swappable-parameters,-llvmlibc-restrict-system-libc-headers,-llvm-include-order,-modernize-use-trailing-return-type,-cppcoreguidelines-special-member-functions,-hicpp-special-member-functions,-cppcoreguidelines-owning-memory,-cppcoreguidelines-pro-type-vararg,-hicpp-vararg,-fuchsia-default-arguments-calls' $(ALL_SOURCES)
 
-eo-compile:
-	eoc dataize life cycle 0
-
 clean:
-	rm -f **/src/*.o
-	rm -f **/tests/**/*.o
-	rm -f *_life
-	rm -f *_test
-	rm -fr .eoc/
+	$(MAKE) -C eo clean
+	$(MAKE) -C cpp/fast clean
+	$(MAKE) -C cpp/slow clean

cpp/fast/Makefile

@@ -0,0 +1,30 @@
+# SPDX-FileCopyrightText: Copyright (c) 2022 Anton Shatokhin
+# SPDX-License-Identifier: MIT
+
+SOURCES := $(wildcard src/*.cpp)
+HEADERS := $(wildcard include/*.h src/*.h)
+OBJECTS := ${SOURCES:.cpp=.o}
+
+LIB_SOURCES := $(filter-out src/main.cpp, $(SOURCES))
+LIB_OBJECTS := ${LIB_SOURCES:.cpp=.o}
+
+TEST_SOURCES := $(shell find tests -type f -name "*.cpp" 2>/dev/null || true)
+TEST_OBJECTS := ${TEST_SOURCES:.cpp=.o}
+
+.PHONY: all build test clean
+
+all: build
+
+build: $(OBJECTS)
+	g++ $(OBJECTS) -lboost_program_options -o fast_life
+
+test: $(LIB_OBJECTS) $(TEST_OBJECTS)
+	g++ $(LIB_OBJECTS) $(TEST_OBJECTS) -lboost_unit_test_framework -lboost_program_options -o fast_test
+	./fast_test --log_level=all
+
+%.o: %.cpp $(HEADERS)
+	g++ -c -Iinclude $< -o $@
+
+clean:
+	rm -f src/*.o tests/**/*.o
+	rm -f fast_life fast_test